|
Revision tags: v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3, v2.6.19-rc2, v2.6.19-rc1 |
|
| #
8a84fc15 |
| 01-Oct-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
|
| #
2dc94310 |
| 27-Sep-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
|
| #
363e065c |
| 25-Sep-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
show more ...
|
| #
02b25fcf |
| 24-Sep-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
23930fa1 |
| 24-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
91925175 |
| 23-Sep-2006 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
Merge branch 'mainline' into upstream-linus
|
| #
28eb177d |
| 23-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
|
| #
db392219 |
| 23-Sep-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (65 commits)
IB: Fix typo
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (65 commits)
IB: Fix typo in kerneldoc for ib_set_client_data()
IPoIB: Add some likely/unlikely annotations in hot path
IPoIB: Remove unused include of vmalloc.h
IPoIB: Rejoin all multicast groups after a port event
IPoIB: Create MCGs with all attributes required by RFC
IB/sa: fix ib_sa_selector names
IB/iser: INFINIBAND_ISER depends on INET
IB/mthca: Simplify calls to mthca_cq_clean()
RDMA/cma: Document rdma_accept() error handling
IB/mthca: Recover from catastrophic errors
RDMA/cma: Document rdma_destroy_id() function
IB/cm: Do not track remote QPN in timewait state
IB/sa: Require SA registration
IPoIB: Refactor completion handling
IB/iser: Do not use FMR for a single dma entry sg
IB/iser: fix some debug prints
IB/iser: make FMR "page size" be 4K and not PAGE_SIZE
IB/iser: Limit the max size of a scsi command
IB/iser: fix a check of SG alignment for RDMA
RDMA/cma: Protect against adding device during destruction
...
show more ...
|
|
Revision tags: v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5 |
|
| #
b3b30f5e |
| 15-Aug-2006 |
Jack Morgenstein <jackm@mellanox.co.il> |
IB/mthca: Recover from catastrophic errors
Trigger device remove and then add when a catastrophic error is
detected in hardware. This, in turn, will cause a device reset, which
we hope will recover
IB/mthca: Recover from catastrophic errors
Trigger device remove and then add when a catastrophic error is
detected in hardware. This, in turn, will cause a device reset, which
we hope will recover from the catastrophic condition.
Since this might interefere with debugging the root cause, add a
module option to suppress this behaviour.
Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
show more ...
|
|
Revision tags: v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1, v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1, v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1 |
|
| #
97f2aab6 |
| 03-Jan-2006 |
Dave Airlie <airlied@starflyer.(none)> |
drm: merge in Linus mainline
|
|
Revision tags: v2.6.15, v2.6.15-rc7, v2.6.15-rc6 |
|
| #
3d5271f9 |
| 06-Dec-2005 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
|
Revision tags: v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2 |
|
| #
a9931a6e |
| 18-Nov-2005 |
Jody McIntyre <scjody@modernduck.com> |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
f4256e30 |
| 12-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
0da36b34 |
| 12-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.15-rc1 |
|
| #
ca869912 |
| 11-Nov-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
e532c378 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
0192d697 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
3b621ee5 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
f85272a9 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
9551583e |
| 11-Nov-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
78b9c0f9 |
| 10-Nov-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
|
| #
0b4ff2c0 |
| 08-Nov-2005 |
Roland Dreier <rolandd@cisco.com> |
[IB] mthca: fix typo in catastrophic error polling
Fix a typo in the rearming of the catastrophic error polling timer: we
should rearm the timer as long as the stop flag is _not_ set.
Signed-off-by
[IB] mthca: fix typo in catastrophic error polling
Fix a typo in the rearming of the catastrophic error polling timer: we
should rearm the timer as long as the stop flag is _not_ set.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
show more ...
|
| #
2f67bdb2 |
| 10-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
e82b3aec |
| 09-Nov-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
8006fdd6 |
| 09-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|