commit 804b3f9a16e446cb023417faec58b6506c834052 Merge: 3e0ca2f... 991bf52... Author: Linus Torvalds Date: Wed Oct 3 15:44:10 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Ata: pata_marvell, use ioread* for iomap-ped memory libata: fix for sata_mv >64KB DMA segments commit 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 Merge: c7659e2... 529d303... Author: Linus Torvalds Date: Wed Oct 3 15:43:36 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: sky2: jumbo frame regression fix [PATCH] softmac: Fix compiler-warning [PATCH] bcm43xx: Correct printk with PFX before KERN_ commit c7659e2c139d0be4647bef89188a932e0254d709 Merge: 66b1f1a... 9ea0f04... Author: Linus Torvalds Date: Wed Oct 3 15:43:17 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Terminally fix local_{dec,sub}_if_positive [MIPS] Type proof reimplementation of cmpxchg. [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround commit 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4 Merge: bda0233... cda6a20... Author: Linus Torvalds Date: Wed Oct 3 15:34:07 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver Blackfin arch: add some missing syscall binfmt_flat: checkpatch fixing minimum support for the blackfin relocations Binfmt_flat: Add minimum support for the Blackfin relocations commit 991bf528f602882580d0918842b125255d246a19 Author: Scott Thompson Date: Tue Oct 2 13:53:01 2007 -0700 drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Add missing ioremap return checks. Signed-off-by: Scott Thompson hushmail.com> Acked-by: Tejun Heo Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 90925d3050253ff7b4f5d1660071df75f44bd0ff Author: Jiri Slaby Date: Tue Oct 2 13:53:01 2007 -0700 Ata: pata_marvell, use ioread* for iomap-ped memory pata_marvell, use ioread* for iomap-ped memory read* on pci_iomapped memory is incorrect, fix it Signed-off-by: Jiri Slaby Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4007b493ee6e4a52c2b618ab8361847fba5bf116 Author: Olof Johansson Date: Tue Oct 2 20:45:27 2007 -0500 libata: fix for sata_mv >64KB DMA segments Fix bug in sata_mv for cases where the IOMMU layer has merged SG entries to larger than 64KB. They need to be split up before being sent to the driver. Just for simplicity's sake, split up at 64K boundary instead of 64K size, since that's what the common code does anyway. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit bda0233b89c10ae46ccecb78bffdaf0fd7833d17 Author: Sunil Mushran Date: Fri Sep 21 11:41:43 2007 -0700 ocfs2: Unlock mutex in local alloc failure case The fs was not unlocking the local alloc inode mutex in the code path in which it failed to find a window of free bits in the global bitmap. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 529d303e075aa6d988f30935b8995ffb382ad38e Author: Stephen Hemminger Date: Tue Oct 2 18:02:09 2007 -0700 sky2: jumbo frame regression fix Remove unneeded check that caused problems with jumbo frame sizes. The check was recently added and is wrong. When using jumbo frames the sky2 driver does fragmentation, so rx_data_size is less than mtu. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5c55c434917429f229a1bf43def97fd421f444c6 Merge: f778089... ee0a816... Author: Jeff Garzik Date: Wed Oct 3 13:39:16 2007 -0400 Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit cda6a20b68c1f21f4b4bc9cd3ee08494e7ebf0d5 Author: Michael Hennerich Date: Thu Oct 4 00:36:18 2007 +0800 Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki Cc: Kalle Pokki Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit c58c2140f08de4ad0b0dbd48f6e78168dc321042 Author: Michael Hennerich Date: Thu Oct 4 00:35:05 2007 +0800 Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 9ea0f043fec38fadb0101fbf29563a5635f42e93 Author: Ralf Baechle Date: Wed Oct 3 14:29:19 2007 +0100 [MIPS] Terminally fix local_{dec,sub}_if_positive They contain 64-bit instructions so wouldn't work on 32-bit kernels or 32-bit hardware. Since there are no users, blow them away. They probably were only ever created because there are atomic_sub_if_positive and atomic_dec_if_positive which exist only for sake of semaphores. Signed-off-by: Ralf Baechle commit fef74705ea310acd716c2722bfeb0f796cf23640 Author: Ralf Baechle Date: Mon Oct 1 04:15:00 2007 +0100 [MIPS] Type proof reimplementation of cmpxchg. Signed-off-by: Ralf Baechle commit f6a9e6dec537dc1d9d2c62d7b8ad205d0993bddc Author: Maciej W. Rozycki Date: Tue Oct 2 14:47:22 2007 +0100 [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround Restore a load from KSEG1 done as a workaround for an R4600 v2 erratum, dropped with 211be16de99a7424e66c0b6c0d00e2c970508ac2. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit ee0a8169b693e1c708d0f9af0a5e4ade65a65439 Author: Richard Knutsson Date: Mon Oct 1 02:24:38 2007 +0200 [PATCH] softmac: Fix compiler-warning CC net/ieee80211/softmac/ieee80211softmac_wx.o /home/kernel/src/net/ieee80211/softmac/ieee80211softmac_wx.c: In function ‘ieee80211softmac_wx_set_essid’: /home/kernel/src/net/ieee80211/softmac/ieee80211softmac_wx.c:117: warning: label ‘out’ defined but not used due to commit: efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb. Removing the label. Signed-off-by: Richard Knutsson Signed-off-by: John W. Linville commit 4365e99f9587b94010e9818a4237ce2b1c734e91 Author: Joe Perches Date: Tue Oct 2 12:57:11 2007 -0700 [PATCH] bcm43xx: Correct printk with PFX before KERN_ Correct printk with PFX before KERN_ in bcm43xx_wx.c Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit f778089cb2445dfc6dfd30a7a567925fd8589f1e Merge: db7a89d... d136552... Author: Linus Torvalds Date: Tue Oct 2 10:41:06 2007 -0700 Merge branch 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'sas-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: aic94xx: fix DMA data direction for SMP requests commit db7a89db5e3bc6ba131965183577b15fd6fc92cc Merge: 2910ca6... f662fe5... Author: Linus Torvalds Date: Tue Oct 2 10:40:40 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: dm9601: Fix receive MTU mv643xx_eth: Do not modify struct netdev tx_queue_len qla3xxx: bugfix: Fix VLAN rx completion handling. qla3xxx: bugfix: Add memory barrier before accessing rx completion. commit 2910ca6f8ae69648623b3c05b79be87dd7bda73d Merge: d237098... 4c74d4e... Author: Linus Torvalds Date: Tue Oct 2 10:40:20 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata_piix: add another TECRA M3 entry to broken suspend list commit d237098c03eb91cef240e9a1b248c0e1ecd1c80c Merge: 114d5b1... 30084fb... Author: Linus Torvalds Date: Tue Oct 2 10:38:13 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix profile=sleep commit 114d5b1ca265f8a582dcbf0030da20ccdddbe8e1 Merge: 2b3b290... 25e5566... Author: Linus Torvalds Date: Tue Oct 2 10:35:28 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy. [SPARC64]: Fix put_user() calls in binfmt_aout32.c [SPARC]: Fix EBUS use of uninitialized variable. commit 2b3b29080d702e5488f214276170ab46adc40ee5 Merge: e80eaf9... 04045f9... Author: Linus Torvalds Date: Tue Oct 2 10:34:49 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IEEE80211]: avoid integer underflow for runt rx frames [TCP]: secure_tcp_sequence_number() should not use a too fast clock [SFQ]: Remove artificial limitation for queue limit. commit e80eaf9904d5b19512265e1435372b2e12146a5f Merge: 3146b39... e48395f... Author: Linus Torvalds Date: Tue Oct 2 10:33:49 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix xics set_affinity code commit d136552e8beadcf5e59089292e2ba44f09e3aad8 Author: Jeff Garzik Date: Tue Oct 2 13:16:10 2007 -0400 aic94xx: fix DMA data direction for SMP requests DMA-mapped SMP (scsi management protocol) requests going /to/ the device need the PCI DMA data direction to indicate such. Signed-off-by: Jeff Garzik commit f662fe5a0b144efadbfc00e8040e603ec318746e Author: Peter Korsgaard Date: Mon Oct 1 13:36:07 2007 +0200 dm9601: Fix receive MTU dm9601 didn't take the ethernet header into account when calculating RX MTU, causing packets bigger than 1486 to fail. Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit 593ff56ef2a23ed3a66ee87d9c9b33044b9fb193 Author: Dale Farnsworth Date: Mon Oct 1 16:02:18 2007 -0700 mv643xx_eth: Do not modify struct netdev tx_queue_len This driver erroneously zeros dev->tx_queue_len, since mp->tx_ring_size has not yet been initialized. Actually, the driver shouldn't modify tx_queue_len at all and should leave the value set by alloc_etherdev(), currently 1000. Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 50626297b1beb0a29c0f174be39f36485533216c Author: Ron Mercer Date: Mon Oct 1 11:43:23 2007 -0700 qla3xxx: bugfix: Fix VLAN rx completion handling. Fix 4032 chip undocumented "feature" where bit-8 is set if the inbound completion is for a VLAN. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit b323e0e49fe9331ee3a7a336af879d6e303b16b3 Author: Ron Mercer Date: Mon Oct 1 11:43:22 2007 -0700 qla3xxx: bugfix: Add memory barrier before accessing rx completion. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 4c74d4ec3524a8f31deadd115139dd93bc91d598 Author: Tejun Heo Date: Sun Sep 30 01:11:20 2007 -0700 ata_piix: add another TECRA M3 entry to broken suspend list There's a different version of DMI table for TECRA M3 where it has proper vendor and product name entry. Add the entry to the broken suspend list. Angus Turnbull reported and provided initial patch. Signed-off-by: Tejun Heo Cc: Angus Turnbull Signed-off-by: Jeff Garzik commit 30084fbd1caa4b2e1a336fcdef60b68129d1d8f8 Author: Ingo Molnar Date: Tue Oct 2 14:13:08 2007 +0200 sched: fix profile=sleep fix sleep profiling - we lost this chunk in the CFS merge. Found-by: Mel Gorman Signed-off-by: Ingo Molnar commit 25e5566ed38650f7990041fcd20571d6ddd2a040 Author: David S. Miller Date: Tue Oct 2 01:03:09 2007 -0700 [SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy. For the case where the source is not aligned modulo 8 we don't use load-twins to suck the data in and this kills performance since normal loads allocate in the L1 cache (unlike load-twin) and thus big memcpys swipe the entire L1 D-cache. We need to allocate a register window to implement this properly, but that actually simplifies a lot of things as a nice side-effect. Signed-off-by: David S. Miller commit 04045f98e0457aba7d4e6736f37eed189c48a5f7 Author: John W. Linville Date: Mon Oct 1 21:03:54 2007 -0700 [IEEE80211]: avoid integer underflow for runt rx frames Reported by Chris Evans : > The summary is that an evil 80211 frame can crash out a victim's > machine. It only applies to drivers using the 80211 wireless code, and > only then to certain drivers (and even then depends on a card's > firmware not dropping a dubious packet). I must confess I'm not > keeping track of Linux wireless support, and the different protocol > stacks etc. > > Details are as follows: > > ieee80211_rx() does not explicitly check that "skb->len >= hdrlen". > There are other skb->len checks, but not enough to prevent a subtle > off-by-two error if the frame has the IEEE80211_STYPE_QOS_DATA flag > set. > > This leads to integer underflow and crash here: > > if (frag != 0) > flen -= hdrlen; > > (flen is subsequently used as a memcpy length parameter). How about this? Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit 9b42c336d06411e6463949d2dac63949f66ff70b Author: Eric Dumazet Date: Mon Oct 1 13:58:36 2007 -0700 [TCP]: secure_tcp_sequence_number() should not use a too fast clock TCP V4 sequence numbers are 32bits, and RFC 793 assumed a 250 KHz clock. In order to follow network speed increase, we can use a faster clock, but we should limit this clock so that the delay between two rollovers is greater than MSL (TCP Maximum Segment Lifetime : 2 minutes) Choosing a 64 nsec clock should be OK, since the rollovers occur every 274 seconds. Problem spotted by Denys Fedoryshchenko [ This bug was introduced by f85958151900f9d30fa5ff941b0ce71eaa45a7de ] Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 32740ddc1095e5e320bf961dda146bf97bc28adb Author: Alexey Kuznetsov Date: Sun Sep 30 17:51:33 2007 -0700 [SFQ]: Remove artificial limitation for queue limit. This is followup to Patrick's patch. A little optimization to enqueue routine allows to remove artificial limitation on queue length. Plus, testing showed that hash function used by SFQ is too bad or even worse. It does not even sweep the whole range of hash values. Switched to Jenkins' hash. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit e48395f1753cab0fde6c03f1db833cece9ef2ba0 Author: Anton Blanchard Date: Mon Oct 1 07:45:55 2007 +1000 [POWERPC] Fix xics set_affinity code On a POWER6 machine running 2.6.23-rc8 I sometimes see the following error: xics_set_affinity: No online cpus in the mask 00000000,00000000,00000000,00000001 for irq 20 In a desperate attempt to get a changelog entry in 2.6.23, I took a look into it. It turns out we are passing a real and not a virtual irq into get_irq_server. This works for the case where hwirq < NR_IRQS and we set virq = hwirq. In my case however hwirq = 590082 and we try and access irq_desc[590082], slightly past the end at 512 entries. Lucky we ship lots of memory with our machines. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8cc8c28a9acdceda0e60519167a052cc3408c5c3 Author: David S. Miller Date: Sun Sep 30 17:00:34 2007 -0700 [SPARC64]: Fix put_user() calls in binfmt_aout32.c argv and envp are pointers to u32's in userspace, so don't try to put_user() a NULL to them. Aparently gcc-4.2.x now warns about this, and since we use -Werror for arch/sparc64 code, this breaks the build. Signed-off-by: David S. Miller commit 9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0 Author: David S. Miller Date: Thu Sep 27 13:09:28 2007 -0700 [SPARC]: Fix EBUS use of uninitialized variable. If of_get_property() fails, it returns NULL and the 'len' parameter is undefined. So we need to explicitly set len to zero in such cases. Noticed by Al Viro. Signed-off-by: David S. Miller commit 0b95f22bd3b91c7114c6892bbfbb5a8576b27fbe Author: Bryan Wu Date: Sun Sep 23 00:51:32 2007 +0800 Blackfin arch: add some missing syscall When compiling the Blackfin kernel, checksyscalls.pl will report lots of missing syscalls warnings. This patch will add some missing syscalls which make sense on Blackfin arch After appling this patch, toolchain should be rebuilt. Then recompiling the kernel with the new toolchain. Signed-off-by: Bryan Wu commit 576bb9ced2d274446639d7fbeee7125e24daf012 Author: Andrew Morton Date: Wed Oct 3 23:43:57 2007 +0800 binfmt_flat: checkpatch fixing minimum support for the blackfin relocations Cc: Bernd Schmidt Cc: David McCullough Cc: Greg Ungerer Cc: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Bryan Wu commit f9720205d1f847cb59e197e851b5276425363f6b Author: Bernd Schmidt Date: Wed Oct 3 23:41:43 2007 +0800 Binfmt_flat: Add minimum support for the Blackfin relocations Add minimum support for the Blackfin relocations, since we don't have enough space in each reloc. The idea is to store a value with one relocation so that subsequent ones can access it. Actually, this patch is required for Blackfin. Currently if BINFMT_FLAT is enabled, git-tree kernel will fail to compile. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu Cc: David McCullough Cc: Greg Ungerer Cc: Miles Bader Signed-off-by: Andrew Morton