Jeff Garzik
75a95178da
Merge upstream into 'upstream' branch of netdev-2.6.git.
...
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
2005-08-24 01:03:34 -04:00
Linus Torvalds
005940ead6
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2005-08-23 20:00:17 -07:00
lepton
2bbfb16bf3
[PATCH] usbnet oops fix
...
There's a "return the wrong SKB" error in the GL620A cable minidriver
(for "usbnet") which can oops. This would not appear when talking
Linux-to-Linux, only Linux-to-Windows (for recent Linuxes).
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 19:59:38 -07:00
Al Viro
17566c3c5e
[PATCH] s390 __CHECKER__ ifdefs
...
remove the bogus games with explicit ifdefs on __CHECKER__
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:46 -07:00
Al Viro
fa53bb650e
[PATCH] Kconfig fix (non-modular SCSI drivers)
...
non-modular scsi drivers depend on built-in scsi
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:46 -07:00
Al Viro
ade31f38f2
[PATCH] typo fix in qdio.c
...
dumb typo: u32 volatile * mistyped as u32 * volatile
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:45 -07:00
Al Viro
530d8e9738
[PATCH] emac netpoll fix
...
netpoll is void(struct net_device *), not int(struct net_device *)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:45 -07:00
Al Viro
a828b8e4e6
[PATCH] m32r_sio gcc4 fixes
...
extern declaration followed by static in drivers/serial/m32r_sio.c
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:44 -07:00
Al Viro
531e5ca62b
[PATCH] missing include in pcmcia_resource.c
...
missing include of asm/irq.h
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:43 -07:00
Al Viro
a238b56350
[PATCH] Kconfig fix (sparc32 drivers/char dependencies)
...
since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating
its parts) we need several new dependencies there to exclude the stuff
broken on sparc32 and not excluded by existing dependencies.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:43 -07:00
Al Viro
997183dc2a
[PATCH] Kconfig fix (emac dependencient)
...
emac doesn't build modular; ibm_emac_debug doesn't build at all (missing
headers).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:43 -07:00
Al Viro
51583cf108
[PATCH] Kconfig fix (VGA console on arm/versatile)
...
VGA console doesn't exist (or build) on arm/versatile; dependency fixed.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:42 -07:00
Al Viro
84b6a2323a
[PATCH] Kconfig fix (amba on arm/versatile)
...
AMBA_PL010 is broken on arm/versatile; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:42 -07:00
Al Viro
a838e543db
[PATCH] Kconfig fix (acornscsi)
...
acornscsi had been broken for a long time; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:42 -07:00
Al Viro
9ff658589b
[PATCH] Kconfig fix (M32R_PLDSIO dependecies)
...
M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and
friends.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:42 -07:00
Al Viro
14d891d203
[PATCH] Kconfig fix (parport_pc on m32r)
...
parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:41 -07:00
Al Viro
ab62c1e1da
[PATCH] Kconfig fix (airo_cs on m32r)
...
airo_cs is broken on m32r; marked as such. [Proper fix would involve
separating PCI-dependent parts and making sure they don't get in the
way _and_ arranging for asm/scatterlist.h getting picked on m32r]
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:41 -07:00
Al Viro
a4d544fdd3
[PATCH] Kconfig fix (tms380tr and ISA_DMA_API)
...
ISA parts of tms380tr are using ISA DMA helpers and should depend on
ISA_DMA_API.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:41 -07:00
Al Viro
b545d48ca0
[PATCH] Kconfig fix (arv)
...
arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h
It won't build for any subarchitecture other than M32700UT; marked as such.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:41 -07:00
Al Viro
a2b2f45be7
[PATCH] Kconfig fix (infiniband and PCI)
...
infiniband uses PCI helpers all over the place (including the core parts) and
won't build without PCI.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:41 -07:00
Al Viro
897874fa9c
[PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)
...
PMAC_BACKLIGHT is broken on ppc64; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:40 -07:00
Al Viro
6622b8c780
[PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64)
...
HISAX_FRITZPCI is broken on ppc64; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:40 -07:00
Al Viro
253a9c3308
[PATCH] Kconfig fix (m32r genrtc)
...
genrtc is not for m32r; marked as such. Probably ought to put that into
arch/* - list of "don't build it on <platform>" is getting too long.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:40 -07:00
Al Viro
e9bcb173dd
[PATCH] Kconfig fix (epca on 64bit)
...
epca is broken on 64bit; marked as such
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 18:43:39 -07:00
Alexey Dobriyan
81065e2f41
[PATCH] zd1201 kmalloc size fix
...
Noticed by Coverity checker.
(akpm: I stole this from Greg's tree and used the (IMO) tidier sizeof(*p)
construct).
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de >
Signed-off-by: Andrew Morton <akpm@osdl.org >
Signed-off-by: Linus Torvalds <torvalds@osdl.org >
2005-08-23 11:44:30 -07:00