commit f89f5948fc10bb973cd452d2e334da207828e228 Author: Linus Torvalds Date: Sat Dec 24 15:47:48 2005 -0800 Linux v2.6.15-rc7 Ho ho ho. commit 01e33b5a2a153eec74dd87522e264948030b88c1 Author: Kurt Huwig Date: Sun Dec 25 00:13:08 2005 +0100 [PATCH] n_r3964: fixed usage of HZ; removed bad include Fix n_r3964 timeouts (hardcoded for 100Hz) Also the include of in 'n_r3964.h' is unnecessary and prevents using the header file in any application that has to include due to duplicate definition of 'struct termio'. Signed-off-by: Linus Torvalds commit e5c34a57c8b3a94b8d2b329936f8b1cbcc765307 Author: Ben Collins Date: Fri Dec 23 09:10:03 2005 -0500 [PATCH] Fix typo in x86_64 __build_write_lock_const assembly Based on __build_read_lock_const, this looked like a bug. [ Indeed. Maybe nobody uses this version? Worth fixing up anyway ] Signed-off-by: Linus Torvalds commit c660439ba90aaaa056f68a5b0fc79f6b9e0506f5 Author: Ravikiran G Thirumalai Date: Thu Dec 22 14:21:34 2005 -0800 [PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu Fixes a compiler error in node_to_first_cpu, __ffs expects unsigned long as a parameter; instead cpumask_t was being passed. The macro node_to_first_cpu was not yet used in x86_64 and ia64 arches, and so we never hit this. This patch replaces __ffs with first_cpu macro, similar to other arches. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran G Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Linus Torvalds commit 1224b375ed7982128602a3fa1da53eeeac1750b4 Author: Linus Torvalds Date: Sat Dec 24 12:19:38 2005 -0800 Fix silly typo ("smb" vs "smp") Introduced by commit 6003a93e7bf6c02f33c02976ff364785d4273295 commit 8e31108b9f41069d55cb9b019ac8262c55fd2616 Author: Andrew Morton Date: Fri Dec 23 19:54:46 2005 -0800 [PATCH] Fix memory ordering problem in wake_futex() Fix a memory ordering problem that occurs on IA64. The "store" to q->lock_ptr in wake_futex() can become visible before wake_up_all() clears the lock in the futex_q. Signed-off-by: Jack Steiner Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 6003a93e7bf6c02f33c02976ff364785d4273295 Author: Manfred Spraul Date: Fri Dec 23 23:57:41 2005 +0100 [PATCH] add missing memory barriers to ipc/sem.c Two smp_wmb() statements are missing in the sysv sem code: This could cause stack corruptions. The attached patch adds them. Signed-Off-By: Manfred Spraul Signed-off-by: Linus Torvalds commit e445ee65cbefaa19131c972ae7fe221c95cf4cc4 Author: David S. Miller Date: Sat Dec 24 12:06:10 2005 -0800 [VIDEO] sbuslib: Disallow private mmaps. The COW semantics just do not make any sense especially with the physically discontiguous I/O mappings possible here. Signed-off-by: David S. Miller commit 1836098f97d22c81652aeeec64d1819dc2177bdb Author: Manfred Spraul Date: Sat Dec 24 14:19:24 2005 +0100 [PATCH] forcedeth: fix random memory scribbling bug Two critical bugs were found in forcedeth 0.47: - TSO doesn't work. - pci_map_single() for the rx buffers is called with size==0. This bug is critical, it causes random memory corruptions on systems with an iommu. Below is a minimal fix for both bugs, for 2.6.15. TSO will be fixed properly in the next version. Tested on x86-64. Signed-Off-By: Manfred Spraul Signed-off-by: Linus Torvalds commit 3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7 Author: Frank Pavlic Date: Tue Dec 13 08:23:26 2005 +0100 [PATCH] s390: remove redundant and useless code in qeth [patch 3/3] s390: remove redundant and useless code in qeth From: Frank Pavlic - remove redundant and useless code in qeth for procfs operations. - update Revision numbers Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 6 - qeth_mpc.c | 2 qeth_mpc.h | 2 qeth_proc.c | 250 ++++++------------------------------------------------------ qeth_sys.c | 4 qeth_tso.h | 4 6 files changed, 38 insertions(+), 230 deletions(-) Signed-off-by: Jeff Garzik commit 4965e97fd36041d19483843c66286b9800a57c15 Author: Frank Pavlic Date: Tue Dec 13 08:22:30 2005 +0100 [PATCH] s390: minor qeth network driver fixes [patch 2/3] s390: minor qeth network driver fixes From: Frank Pavlic - use netif_carrier_on/off calls to tell network stack link carrier state - fix possible kfree on NULL - PDU_LEN2 is at offset 0x29 otherwise OSN chpid won't initialize Signed-off-by: Frank Pavlic diffstat: qeth_eddp.c | 3 ++- qeth_main.c | 17 +++++++---------- qeth_mpc.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) Signed-off-by: Jeff Garzik commit 6c6b3e7c4f93d330b920e6531b579b1f6bae5ac1 Author: Frank Pavlic Date: Tue Dec 13 08:21:47 2005 +0100 [PATCH] s390: some minor qeth driver fixes [patch 1/3] s390: some minor qeth driver fixes From: Frank Pavlic - let's have just one function for both ,input and output queue to check qdio errors - add /proc/s390dbf/qeth_qerr entries for outbound processing - check removed for layer2 device in qeth_add_multicast_ipv6 - NULL pointer dereference with bonding and VLAN device fixed - minimum length check for portname fixed Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 42 +++++++++++++++++++++--------------------- qeth_sys.c | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) Signed-off-by: Jeff Garzik commit afcceaa3c7b7fbf7e2b95c5f0dd43547b03292d2 Author: Olaf Hering Date: Wed Dec 14 00:33:49 2005 +0100 [PATCH] missing license for libphy.ko Andy, libphy has no license tag. Something like the attached (untested!) patch is needed. Hopefully such a change finds its way into 2.6.15. filename: /lib/modules/2.6.15-rc5-3-ppc64/kernel/drivers/net/phy/libphy.ko vermagic: 2.6.15-rc5-3-ppc64 SMP gcc-4.1 depends: srcversion: ACC921B5E82701BE1E6F603 drivers/net/phy/phy_device.c | 4 ++++ 1 files changed, 4 insertions(+) Signed-off-by: Jeff Garzik commit d495657200bd3ce10f9cb52401056804bf365811 Author: Pavel Roskin Date: Fri Dec 16 18:57:10 2005 -0500 [PATCH] orinoco_nortel: Add Symbol LA-4123 ID Add ID for Symbol LA-4123. Reported by Tomas Novak Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit c8cb00f6ac9aa13b0575726163b165fd2276ff25 Author: Pavel Roskin Date: Fri Dec 16 18:49:53 2005 -0500 [PATCH] orinoco_nortel: Fix incorrect PCI resource use orinoco_nortel was broken during conversion to iomem API. Wrong PCI BAR is used for chipset registers. Reported by Tomas Novak Signed-off-by: Pavel Roskin Signed-off-by: Jeff Garzik commit fd71da468dd8897fe3f565dfd3743a87d8678e3a Author: Tony Battersby Date: Wed Dec 21 16:35:44 2005 -0500 [PATCH] fix libata inquiry VPD for ATAPI devices The following patch prevents libata from incorrectly modifying inquiry VPD pages and command support data from ATAPI devices. I have tested the patch with a SATA ATAPI tape drive on an AHCI controller. Patch is against kernel 2.4.32 with 2.4.32-libata1.patch applied. Anthony J. Battersby Cybernetics Signed-off-by: Jeff Garzik commit 291d809ba5c8d4d6d8812e3f185bdf57d539f594 Author: Hiroyuki YAMAMORI Date: Fri Dec 23 11:24:05 2005 -0800 [IPV6]: Fix Temporary Address Generation From: Hiroyuki YAMAMORI Since regen_count is stored in the public address, we need to reset it when we start renewing temporary address. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 3dd3bf83574e38578fc9741c0e23e4fa7f7ff96e Author: YOSHIFUJI Hideaki Date: Fri Dec 23 11:23:21 2005 -0800 [IPV6]: Fix dead lock. We need to relesae ifp->lock before we call addrconf_dad_stop(), which will hold ifp->lock. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 597d1f0622d21ffe54aceef8da9682e776f51cc2 Author: David S. Miller Date: Thu Dec 22 23:04:39 2005 -0800 [SPARC]: Kill CHILD_MAX. It's definition is wrong (-1 means "no limit" not 999), only the Sparc SunOS/Solaris compat code uses it, so let's just kill it off completely from limits.h and all referencing code. Noticed by Ulrich Drepper. Signed-off-by: David S. Miller commit 0b57ee9e55373a27e45549e82b0c43621480a71b Author: Adrian Bunk Date: Thu Dec 22 21:03:47 2005 -0800 [SPARC]: introduce a SPARC Kconfig symbol Introduce a Kconfig symbol SPARC that is defined on both the sparc and sparc64 architectures. This symbol makes some dependencies more readable. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 14904398e5b573d13f8c8dbd43a452ff34c0efc2 Author: Adrian Bunk Date: Wed Dec 21 18:50:12 2005 -0800 [SUNGEM]: Fix link error with CONFIG_HOTPLUG disabled. gem_remove_one() is called from the __devinit gem_init_one(). Therefore, gem_remove_one() mustn't be __devexit. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9d6be4bed65a3bd36ab2de12923bff4f4530bd86 Author: Len Brown Date: Thu Dec 22 22:23:06 2005 -0500 [ACPI] fix build warning from owner_id patch Signed-off-by: Len Brown commit 75b245b3259133360845bc6de3aecb8a6bd6ab59 Author: Thomas Renninger Date: Wed Dec 21 01:29:00 2005 -0500 [ACPI] fix passive cooling regression Return logic was inverted. Going for changing the return value to not return zero as it is makes more sense regarding the naming of the function (cpu_has_cpufreq()). http://bugzilla.kernel.org/show_bug.cgi?id=3410 Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 0800c5f7a499a8961c3868e95cc4cf1715166457 Author: ASANO Masahiro Date: Thu Dec 22 13:24:54 2005 +0900 [PATCH] fix posix lock on NFS NFS client prevents mandatory lock, but there is a flaw on it; Locks are possibly left if the mode is changed while locking. This permits unlocking even if the mandatory lock bits are set. Signed-off-by: ASANO Masahiro Signed-off-by: Linus Torvalds commit d6f029130fb83b36fb709a187275b0494035d689 Author: Nicolas Pitre Date: Wed Dec 21 12:26:25 2005 -0500 [PATCH] fix race with preempt_enable() Currently a simple void foo(void) { preempt_enable(); } produces the following code on ARM: foo: bic r3, sp, #8128 bic r3, r3, #63 ldr r2, [r3, #4] ldr r1, [r3, #0] sub r2, r2, #1 tst r1, #4 str r2, [r3, #4] blne preempt_schedule mov pc, lr The problem is that the TIF_NEED_RESCHED flag is loaded _before_ the preemption count is stored back, hence any interrupt coming within that 3 instruction window causing TIF_NEED_RESCHED to be set won't be seen and scheduling won't happen as it should. Nothing currently prevents gcc from performing that reordering. There is already a barrier() before the decrement of the preemption count, but another one is needed between this and the TIF_NEED_RESCHED flag test for proper code ordering. Signed-off-by: Nicolas Pitre Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit 9b78a82c1cf19aa813bdaa184fa840a3ba811750 Author: David S. Miller Date: Thu Dec 22 07:39:48 2005 -0800 [IPSEC]: Fix policy updates missed by sockets The problem is that when new policies are inserted, sockets do not see the update (but all new route lookups do). This bug is related to the SA insertion stale route issue solved recently, and this policy visibility problem can be fixed in a similar way. The fix is to flush out the bundles of all policies deeper than the policy being inserted. Consider beginning state of "outgoing" direction policy list: policy A --> policy B --> policy C --> policy D First, realize that inserting a policy into a list only potentially changes IPSEC routes for that direction. Therefore we need not bother considering the policies for other directions. We need only consider the existing policies in the list we are doing the inserting. Consider new policy "B'", inserted after B. policy A --> policy B --> policy B' --> policy C --> policy D Two rules: 1) If policy A or policy B matched before the insertion, they appear before B' and thus would still match after inserting B' 2) Policy C and D, now "shadowed" and after policy B', potentially contain stale routes because policy B' might be selected instead of them. Therefore we only need flush routes assosciated with policies appearing after a newly inserted policy, if any. Signed-off-by: David S. Miller commit 8b1af56b29b9b81538b4d0d4fd9515618618ead1 Author: Paul Mackerras Date: Thu Dec 22 21:55:37 2005 +1100 powerpc: Fix i8259 cascade on pSeries with XICS interrupt controller It turns out that commit f9bd170a87948a9e077149b70fb192c563770fdf broke the cascade from XICS to i8259 on pSeries machines; specifically we ended up not ever doing the EOI on the XICS for the cascade. The result was that interrupts from the serial ports (and presumably any other devices using ISA interrupts) didn't get through. This fixes it and also simplifies the code, by doing the EOI on the XICS in the xics_get_irq routine after reading and acking the interrupt on the i8259. Signed-off-by: Paul Mackerras commit 515432aa7ae75ea493099f38adc14a99436fa1ac Author: Hans Verkuil Date: Tue Dec 20 09:48:29 2005 -0200 V4L/DVB (3191): Fix CC output - CC data was swapped the wrong way around. - Enabling CC disabled XDS and vice versa: these two should be independent from one another. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7bb9529602f8bb41a92275825b808a42ed33e5be Author: Ricardo Cerqueira Date: Tue Dec 20 18:26:26 2005 -0200 V4L/DVB (3200): Fix saa7134 ALSA/OSS collisions - When ALSA or OSS are loaded, check if the other is present Fixed hotplug notifiers cleanup on module removal - The saa7134 DMA sound modules now have their own Kconfig entries, and if built statically enforce exclusivity - SND_PCM_OSS isn't necessary for the OSS driver Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 4c7e6895027362889422e5dc437dc3238b6b4745 Author: Ian McDonald Date: Wed Dec 21 19:02:39 2005 -0800 [DCCP]: Comment typo I hope to actually change this behaviour shortly but this will help anybody grepping code at present. Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit 1d1428045c54ef3d172d480806e2066dde0b4b76 Author: Kristian Slavov Date: Wed Dec 21 18:47:24 2005 -0800 [IPV6]: Fix address deletion If you add more than one IPv6 address belonging to the same prefix and delete the address that was last added, routing table entry for that prefix is also deleted. Tested on 2.6.14.4 To reproduce: ip addr add 3ffe::1/64 dev eth0 ip addr add 3ffe::2/64 dev eth0 /* wait DAD */ sleep 1 ip addr del 3ffe::2/64 dev eth0 ip -6 route (route to 3ffe::/64 should be gone) In ipv6_del_addr(), if ifa == ifp, we set ifa->if_next to NULL, and later assign ifap = &ifa->if_next, effectively terminating the for-loop. This prevents us from checking if there are other addresses using the same prefix that are valid, and thus resulting in deletion of the prefix. This applies only if the first entry in idev->addr_list is the address to be deleted. Signed-off-by: Kristian Slavov Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 7eb1b3d372a53fe9220b9e3b579886db0fe2f897 Author: Mika Kukkonen Date: Wed Dec 21 18:39:49 2005 -0800 [VLAN]: Add two missing checks to vlan_ioctl_handler() In vlan_ioctl_handler() the code misses couple checks for error return values. Signed-off-by: Mika Kukkonen Signed-off-by: David S. Miller commit 0d77d59f6293438f25e0560172699c0d3e4ef5ac Author: Mika Kukkonen Date: Wed Dec 21 18:38:26 2005 -0800 [NETROM]: Fix three if-statements in nr_state1_machine() I found these while compiling with extra gcc warnings; considering the indenting surely they are not intentional? Signed-off-by: Mika Kukkonen Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit c7ac6b42ffba28c350cbcd48268f46689f6eb1cc Author: Linus Torvalds Date: Wed Dec 21 14:52:32 2005 -0800 Initialize drivers/media/video/saa7134 late When compiled-in, make sure the sound system has initialized before these drivers do. Reported by Adrian Bunk (The right fix would be to make the sound core use "subsys_initcall()" and thus initialize before all normal drivers, but this is the quick and limited safe fix for 2.6.15). Signed-off-by: Linus Torvalds commit 5a9191ff683ce4ebfd2c6a15e2989f5b1f420321 Author: Alan Stern Date: Wed Dec 21 14:28:11 2005 -0800 [PATCH] usbcore: allow suspend/resume even if drivers don't support it This patch (as618) changes usbcore to prevent derailing the suspend/resume sequence when a USB driver doesn't include support for it. This is a workaround rather than a true fix; the core needs to be changed so that URB submissions from suspended drivers can be refused and outstanding URBs cancelled. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 28120be5d6830cd7c7777d8bf570bdb20abef58a Author: Paul Walmsley Date: Wed Dec 21 14:28:06 2005 -0800 [PATCH] USB Storage: Force starget->scsi_level in usb-storage scsiglue.c When the usb-storage module forces sdev->scsi_level to SCSI_2, it should also force starget->scsi_level to the same value. Otherwise, the SCSI layer may attempt to issue SCSI-3 commands to the device, such as REPORT LUNS, which it cannot handle. This can prevent the device from working with Linux. The AMS Venus DS3 DS2316SU2S SATA-to-SATA+USB enclosure, based on the Oxford Semiconductor OXU921S chip, requires this patch to function correctly on Linux. The enclosure reports a SCSI-3 SPC-2 command set level, but does not correctly handle the REPORT LUNS SCSI command - probably due to a bug in its firmware. It seems likely that other USB storage enclosures with similar bugs will also benefit from this patch. Tony Lindgren collaborated in the development of this patch. Signed-off-by: Paul Walmsley Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 23f9b317e0ba4fbc5fc9524275d0105fa87e2027 Author: Adrian Bunk Date: Wed Dec 21 02:27:50 2005 +0100 [PATCH] include/linux/irq.h: #include Jan's crosscompile page [1] shows, that one regression in 2.6.15-rc is that the v850 defconfig does no longer compile. The compile error is: <-- snip --> ... CC arch/v850/kernel/setup.o In file included from /usr/src/ctest/rc/kernel/arch/v850/kernel/setup.c:17: /usr/src/ctest/rc/kernel/include/linux/irq.h:13:43: asm/smp.h: No such file or directory make[2]: *** [arch/v850/kernel/setup.o] Error 1 <-- snip --> The #include in irq.h was intruduced in 2.6.15-rc. Since include/linux/irq.h needs code from asm/smp.h only in the CONFIG_SMP=y case and linux/smp.h #include's asm/smp.h only in the CONFIG_SMP=y case, I'm suggesting this patch to #include in irq.h. I've tested the compilation with both CONFIG_SMP=y and CONFIG_SMP=n on i386. Signed-off-by: Adrian Bunk Acked-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b3ae80a63e47f6e97d68a1ddd520e3509e62821 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:58:01 2005 +0900 [IPV6]: Don't select a tentative address as a source address. A tentative address is not considered "assigned to an interface" in the traditional sense (RFC2462 Section 4). Don't try to select such an address for the source address. Signed-off-by: YOSHIFUJI Hideaki commit c5e33bddd3c798f681f8f3027270127be6b61a3b Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:44 2005 +0900 [IPV6]: Run DAD when the link becomes ready. If the link was not available when the interface was created, run DAD for pending tentative addresses when the link becomes ready. Signed-off-by: YOSHIFUJI Hideaki commit 3c21edbd113788b110116141c8078623a0900b6a Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:24 2005 +0900 [IPV6]: Defer IPv6 device initialization until the link becomes ready. NETDEV_UP might be sent even if the link attached to the interface was not ready. DAD does not make sense in such case, so we won't do so. After interface Signed-off-by: YOSHIFUJI Hideaki commit 8de3351e6e0a1081fbf6864ae37839e327699a08 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:57:06 2005 +0900 [IPV6]: Try not to send icmp to anycast address. Signed-off-by: YOSHIFUJI Hideaki commit 58c4fb86eabcbc385d954843a635b7f4327be6b0 Author: YOSHIFUJI Hideaki Date: Wed Dec 21 22:56:42 2005 +0900 [IPV6]: Flag RTF_ANYCAST for anycast routes. Signed-off-by: YOSHIFUJI Hideaki commit 05465fd5622202d65634b3a9a8bcc9cbb384a82a Author: Alex Williamson Date: Thu Dec 8 15:37:00 2005 -0500 [ACPI] increase owner_id limit to 64 from 32 This is an interim patch until changes in an updated ACPICA core increase the limit to 255. Signed-off-by: Alex Williamson Signed-off-by: Len Brown commit fd30fc3256824f03c2ff9317269d66f72f7042ca Author: Tom Zanussi Date: Tue Dec 20 13:10:22 2005 -0600 [PATCH] relayfs: remove warning printk() in relay_switch_subbuf() There's currently a diagnostic printk in relay_switch_subbuf() meant as a warning if you accidentally try to log an event larger than the sub-buffer size. The problem is if this happens while logging from somewhere it's not safe to be doing printks, such as in the scheduler, you can end up with a deadlock. This patch removes the warning from relay_switch_subbuf() and instead prints some diagnostic info when the channel is closed. Thanks to Mathieu Desnoyers for pointing out the problem and suggesting a fix. Signed-off-by: Tom Zanussi Signed-off-by: Linus Torvalds commit a9c9dff1bc64750c81ee99779164d304c35d2ff3 Author: David S. Miller Date: Tue Dec 20 14:53:05 2005 -0800 [SPARC64]: Stop putting -finline-limit=XXX into CFLAGS It was a stupid workaround for the "static inline" vs. "extern inline" issues of long ago, and it is what causes schedule() to be inlined like crazy into kernel/sched.c when -Os is specified. MIPS and S390 should probably do the same. Now CC_OPTIMIZE_FOR_SIZE can be safely used on sparc64 once more. Signed-off-by: David S. Miller commit bb44f116a14c4c932f15c79acfafd46bcb43ca9a Author: Ingo Molnar Date: Tue Dec 20 11:54:17 2005 +0100 [PATCH] fix spinlock-debugging smp_processor_id() usage When a spinlock debugging check hits, we print the CPU number as an informational thing - but there is no guarantee that preemption is off at that point - hence we should use raw_smp_processor_id(). Otherwise DEBUG_PREEMPT will print a warning. With this fix the warning goes away and only the spinlock-debugging info is printed. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 391eadeec836463a4e6e3843953bbe40f6522593 Author: Andi Kleen Date: Tue Dec 20 07:23:47 2005 +0100 [PATCH] Fix build with CONFIG_PCI_MMCONFIG Now needs to include the type 1 functions ("direct") too. Reported by Pavel Roskin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b7964c3d88668cef57e1a99861477168eeff4743 Author: Andreas Gruenbacher Date: Tue Dec 20 16:29:05 2005 +0100 [PATCH] nfsd: check for read-only exports before setting acls We must check for MAY_SATTR before setting acls, which includes checking for read-only exports: the lower-level setxattr operation that eventually sets the acl cannot check export-level restrictions. Bug reported by Martin Walter . Signed-off-by: Andreas Gruenbacher Acked-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 9e28393998d3d0733097306762f6d1c083fc92c6 Author: Jason Wessel Date: Tue Dec 20 15:21:24 2005 +0100 [PATCH] kernel/params.c: fix sysfs access with CONFIG_MODULES=n All the work was done to setup the file and maintain the file handles but the access functions were zeroed out due to the #ifdef. Removing the #ifdef allows full access to all the parameters when CONFIG_MODULES=n. akpm: put it back again, but use CONFIG_SYSFS instead. Signed-off-by: Jason Wessel Signed-off-by: Andrew Morton Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 7e8702334841b6da4b8f564dc1771ca17c59a621 Author: Andi Kleen Date: Tue Dec 20 14:45:19 2005 +0100 [PATCH] Fix swiotlb pci_map_sg error handling The overflow checking condition in lib/swiotlb.c was wrong. It would first run a NULL pointer through virt_to_phys before testing it. Since pci_map_sg overflow is not that uncommon and causes data corruption (including broken file systems) when not properly detected I think it's better to fix it in 2.6.15. This affects x86-64 and IA64. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ca0b3bf695632003a2a0f98b9fc1451b0483346 Author: Knut Petersen Date: Tue Dec 20 08:18:09 2005 +0100 [PATCH] Fix framebuffer console upside-down ywrap scrolling Whenever ywrap scrolling is selected together with 180 degree screen rotation, 2.6.15-rc6 and earlier versions are broken. fb_pan_display() expects non-negative yoffsets, but ud_update_start() calls it with yoffsets down to -(yres - font height). This patch transforms yoffset to the correct range 0 ... vyres-1. Some obviously unneeded parentheses are removed, too. Verified with cyblafb, should be applied before 2.6.15-final because it does fix the framebuffer rotation code introduced early in the 2.6.15 release cycle. Signed-off-by: Knut Petersen Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 33c37c06f8066342764bd1568c9f3524efe889a5 Author: Antonino A. Daplas Date: Mon Dec 19 15:11:49 2005 +0800 [PATCH] intelfb: Fix oops when changing video mode Reported by: janis huang (Bugzilla Bug 5747) Fix on oops in intelfb. Not sure what's happening, looks like dinfo->name pointer is invalidated after initialization. Remove intelfb_get_fix, it's not needed and move the majority of the code to the initialization routine. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 4b3760ce3d448d4af3036cd6c650d651a16ee02d Author: Antonino A. Daplas Date: Mon Dec 19 15:11:40 2005 +0800 [PATCH] intelfb: Fix freeing of nonexistent resource Fix intelfb trying to free a non-existent resource in its error path. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6ee7fb7e363aa8828b3920422416707c79f39007 Author: Benjamin Herrenschmidt Date: Mon Dec 19 11:24:53 2005 +1100 [PATCH] powerpc: g5 thermal overtemp bug The g5 thermal control for liquid cooled machines has a small bug, when the temperatures gets too high, it boosts all fans to the max, but incorrectly sets the liquids pump to the min instead of the max speed, thus causing the overtemp condition not to clear and the machine to shut down after a while. This fixes it to set the pumps to max speed instead. This problem might explain some of the reports of random shutdowns that some g5 users have been reporting in the past. Many thanks to Marcus Rothe for spending a lot of time trying various patches & sending log logs before I found out that typo. Note that overtemp handling is still not perfect and the machine might still shutdown, that patch should reduce if not eliminate such occcurences in "normal" conditions with high load. I'll implement a better handling with proper slowing down of the CPUs later. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 5a1244e9ddb77eafb1de69a1be14e06ca04e733a Author: Paul Mackerras Date: Tue Dec 20 16:00:17 2005 +1100 powerpc: update defconfigs Signed-off-by: Paul Mackerras commit b273ed266a353ee6b238856e1ae705660dafdd70 Author: Edson Seabra Date: Mon Dec 19 09:16:50 2005 -0600 [PATCH] powerpc: CPM2 interrupt handler failure after 100,000 interrupts The CPM2 interrupt handler does not return success to the IRQ subsystem, which causes it to kill the IRQ line after 100,000 interrupts. Signed-off-by: Edson Seabra Signed-off-by: Marcelo Tosatti Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 3eb6f26bcd0d2ce53498deda988e68d663e1c9c2 Author: Paul Mackerras Date: Tue Dec 20 15:38:47 2005 +1100 powerpc: correct register usage in 64-bit syscall exit path Since we don't restore the volatile registers in the syscall exit path, we need to make sure we don't leak any potentially interesting values from the kernel to userspace. This was already the case for all except r11. This makes it use r11 for an MSR value, so r11 will have an (uninteresting) MSR value in it on return to userspace. Signed-off-by: Paul Mackerras commit 9b5b1f5bf9dcdb6f23abf65977a675eb4deba3c0 Author: Trond Myklebust Date: Mon Dec 19 17:11:25 2005 -0500 NLM: Fix Oops in nlmclnt_mark_reclaim() When mixing -olock and -onolock mounts on the same client, we have to check that fl->fl_u.nfs_fl.owner is set before dereferencing it. Signed-off-by: Trond Myklebust commit 48e49187753ec3b4fa84a7165c9b7a59f3875b56 Author: Trond Myklebust Date: Mon Dec 19 17:11:22 2005 -0500 SUNRPC: Fix "EPIPE" error on mount of rpcsec_gss-protected partitions gss_create_upcall() should not error just because rpc.gssd closed the pipe on its end. Instead, it should requeue the pending requests and then retry. Signed-off-by: Trond Myklebust commit 29884df0d89c1df0dec3449405bc41569bb44800 Author: Trond Myklebust Date: Tue Dec 13 16:13:54 2005 -0500 NFS: Fix another O_DIRECT race Ensure we call unmap_mapping_range() and sync dirty pages to disk before doing an NFS direct write. Signed-off-by: Trond Myklebust commit b079fa7baa86b47579f3f60f86d03d21c76159b8 Author: Trond Myklebust Date: Tue Dec 13 16:13:52 2005 -0500 RPC: Do not block on skb allocation If we get something like the following, [ 125.300636] [] schedule_timeout+0x54/0xa5 [ 125.305931] [] io_schedule_timeout+0x29/0x33 [ 125.311495] [] blk_congestion_wait+0x70/0x85 [ 125.317058] [] throttle_vm_writeout+0x69/0x7d [ 125.322720] [] shrink_zone+0xe0/0xfa [ 125.327560] [] shrink_caches+0x6d/0x6f [ 125.332581] [] try_to_free_pages+0xd0/0x1b5 [ 125.338056] [] __alloc_pages+0x135/0x2e8 [ 125.343258] [] tcp_sendmsg+0xaa0/0xb78 [ 125.348281] [] inet_sendmsg+0x48/0x53 [ 125.353212] [] sock_sendmsg+0xb8/0xd3 [ 125.358147] [] kernel_sendmsg+0x42/0x4f [ 125.363259] [] sock_no_sendpage+0x5e/0x77 [ 125.368556] [] xs_tcp_send_request+0x2af/0x375 then the socket is blocked until memory is reclaimed, and no progress can ever be made. Try to access the emergency pools by using GFP_ATOMIC. Signed-off-by: Trond Myklebust commit bcb97940f31ded5ac551da8bfc849583203fc6f2 Author: Neil Brown Date: Tue Dec 20 11:07:00 2005 +1100 [PATCH] md: Change case of raid level reported in sys/mdX/md/level I had thought that keeping the reported tail level clearly different from the module name was a good idea, but I've changed my mind. 'raid5' is better and probably less confusing than 'RAID-5'. Signed-off-by: Neil Brown Signed-off-by: Linus Torvalds commit f98d2dfd02183e016a6295f72140c60d691c9188 Author: Ben Collins Date: Mon Dec 19 11:49:24 2005 -0800 [PATCH] block: Cleanup CDROMEJECT ioctl This is just a basic cleanup. No change in functionality. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds commit 38690194bc897dd60a61a71b15e861e13b5d8bdd Author: Michael Chan Date: Mon Dec 19 16:27:28 2005 -0800 [TG3]: Fix ethtool memory test Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test. Overwriting memory in this region can cause ASF problems. Update version and release date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b401e9e2ec44a5fc1d8053546276bff584b7118e Author: Michael Chan Date: Mon Dec 19 16:27:04 2005 -0800 [TG3]: Add tw32_wait_f() for some sensitive registers The tw32_f() function (register write with immediate read flush) can hang when used on some registers to switch clock frequencies and power. A new tw32_wait_f() is added for such registers with the delay before the read and after the read. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit dc56b7d46dd2b303a844166ef931270b882bf08c Author: Michael Chan Date: Mon Dec 19 16:26:28 2005 -0800 [TG3]: Some low power fixes Add some missing workarounds in tg3_set_power_state(): 1. Workaround to prevent overdrawing current on 5714. 2. Do not power down 5700's PHY because of hw limitation. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8c2dc7e1e7213c55f1b97eba09de6c0cee9ad12f Author: Michael Chan Date: Mon Dec 19 16:26:02 2005 -0800 [TG3]: Fix peer device handling Locate the pdev_peer for dual port 5714 NIC devices in addition to 5704 devices. The name is also changed to tg3_find_peer() from tg3_find_5704_peer(). It is also necessary to call netdev_priv() to get to the peer's private tg3 structure. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit ce37e5f90366cb90320a285edd2113fd807f3ab6 Author: Adrian Bunk Date: Mon Dec 19 14:52:24 2005 -0800 [SPARC]: Fix RTC build failure. On sparc and sparc64, the rtc driver doesn't compile with PCI support disabled. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9bffc4ace1ed875667dbe5b29065d96bec558c62 Author: Neil Horman Date: Mon Dec 19 14:24:40 2005 -0800 [SCTP]: Fix sctp to not return erroneous POLLOUT events. Make sctp_writeable() use sk_wmem_alloc rather than sk_wmem_queued to determine the sndbuf space available. It also removes all the modifications to sk_wmem_queued as it is not currently used in SCTP. Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 399c180ac5f0cb66ef9479358e0b8b6bafcbeafe Author: David S. Miller Date: Mon Dec 19 14:23:23 2005 -0800 [IPSEC]: Perform SA switchover immediately. When we insert a new xfrm_state which potentially subsumes an existing one, make sure all cached bundles are flushed so that the new SA is used immediately. Signed-off-by: David S. Miller commit 7c612bfd4ed3064fd48a4877a114c8186547367b Author: Nicolas Pitre Date: Mon Dec 19 22:20:51 2005 +0000 [ARM] 3210/1: add missing memory barrier helper for NPTL support Patch from Nicolas Pitre Strictly speaking, the NPTL kernel helpers are required for pre ARMv6 only. They are available on ARMv6+ as well for obvious compatibility reasons. However there are cases where extra memory barriers are needed when using an SMP ARMv6 machine but not on pre-ARMv6. This patch adds a memory barrier kernel helper that glibc can use as needed for pre-ARMv6 binaries to be forward compatible with an SMP kernel on ARMv6, as well as the necessary dmb instructions to the cmpxchg helper. Signed-off-by: Nicolas Pitre Acked-by: Daniel Jacobowitz Signed-off-by: Russell King commit 9e999993c71e1506378d26d81f842277aff8a250 Author: Patrick McHardy Date: Mon Dec 19 14:03:46 2005 -0800 [XFRM]: Handle DCCP in xfrm{4,6}_decode_session Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3dd4bc68fac5df16b6d3ed6ed3c29cf05f29a47e Author: YOSHIFUJI Hideaki Date: Mon Dec 19 14:02:45 2005 -0800 [IPV6]: Fix route lifetime. The route expiration time is stored in rt6i_expires in jiffies. The argument of rt6_route_add() for adding a route is not the expiration time in jiffies nor in clock_t, but the lifetime (or time left before expiration) in clock_t. Because of the confusion, we sometimes saw several strange errors (FAILs) in TAHI IPv6 Ready Logo Phase-2 Self Test. The symptoms were analyzed by Mitsuru Chinen . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b03664869aa6f84c3c98a06ac9d6905b195909bc Author: Bart De Schuymer Date: Mon Dec 19 14:00:08 2005 -0800 [BRIDGE-NF]: Fix bridge-nf ipv6 length check A typo caused some bridged IPv6 packets to get dropped randomly, as reported by Sebastien Chaumontet. The patch below fixes this (using skb->nh.raw instead of raw) and also makes the jumbo packet length checking up-to-date with the code in net/ipv6/exthdrs.c::ipv6_hop_jumbo. Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller commit 6b80ebedbee87c5b2213fc3635bf0bd7450bce30 Author: Kristian Slavov Date: Mon Dec 19 13:54:44 2005 -0800 [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h I reported a problem and gave hints to the solution, but nobody seemed to react. So I prepared a patch against 2.6.14.4. Tested on 2.6.14.4 with "ip monitor addr" and with the program attached, while adding and removing IPv6 address. Both programs didn't receive any messages. Tested 2.6.14.4 + this patch, and both programs received add and remove messages. Signed-off-by: Kristian Slavov Acked-by: Jamal Hadi salim ACKed-by: Patrick McHardy Signed-off-by: David S. Miller commit 31cb5bd4dc89ba14e6347b094e15a2f6778a01fc Author: Patrick McHardy Date: Mon Dec 19 13:53:26 2005 -0800 [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE IP6_NF_TARGET_NFQUEUE depends on IP6_NF_IPTABLES, not IP_NF_IPTABLES. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0476f171affa6eca62021fca2ae9f5140acc3713 Author: Patrick McHardy Date: Mon Dec 19 13:53:09 2005 -0800 [NETFILTER]: Fix NAT init order As noticed by Phil Oester, the GRE NAT protocol helper is initialized before the NAT core, which makes registration fail. Change the linking order to make NAT be initialized first. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ecfa4fdca15c089e372095325d9e78264224aeb3 Author: Mauro Carvalho Chehab Date: Mon Dec 19 09:15:13 2005 -0200 [PATCH] V4L/DVB SCM Maintainers Update - This patch updates MAINTAINERS file by replacing quilt to git SCM Signed-off-by: Mauro Carvalho Chehab commit 468a0a54aabdac72e9c7bbd4f8372f1df2d9f0ae Author: Mauro Carvalho Chehab Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3189): Fix a broken logic that didn't cover all standards. - Fix a broken logic that didn't cover all standards. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Mauro Carvalho Chehab commit 60edb13759096097b7208843dc9b7582a7d14c61 Author: Oliver Endriss Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3181): Enable SPDIF output for DVB-S rev 2.3 - Enable SPDIF output for DVB-S rev 2.3. Firmware 2623 or higher required. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 3338761e6c52a8dee631dcc69129c625801ab132 Author: Ricardo Cerqueira Date: Mon Dec 19 08:54:11 2005 -0200 [PATCH] V4L/DVB (3180): Fix tuner 100 definition for hauppauge eeprom - Tuner 100 is the TUNER_PHILIPS_FMD1216ME_MK3, not TUNER_ABSENT. This was causing the tuner module to be skipped, and rendered boards with this value in the eeprom (like the HVR1100) unable to tune Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f85c657ff1f712abd5207a95fba8a5fcc282ab04 Author: Jean Delvare Date: Mon Dec 19 08:53:59 2005 -0200 [PATCH] V4L/DVB (3188): Fix compilation failure with gcc 2.95.3. - Fix compilation failure with gcc 2.95.3. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 863a930a40eb7f2d18534c2c166b22582f5c6cfd Author: James Bottomley Date: Thu Dec 15 20:01:43 2005 -0800 [SCSI] fix scsi_reap_target() device_del from atomic context scsi_reap_target() was desgined to be called from any context. However it must do a device_del() of the target device, which may only be called from user context. Thus we have to reimplement scsi_reap_target() via a workqueue. Signed-off-by: James Bottomley commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 Author: Russell King Date: Sat Dec 17 15:25:42 2005 +0000 [ARM] Fix sys_sendto and sys_recvfrom 6-arg syscalls Rather than providing more wrappers for 6-arg syscalls, arrange for them to be supported as standard. This just means that we always store the 6th argument on the stack, rather than in the wrappers. This means we eliminate the wrappers for: * sys_futex * sys_arm_fadvise64_64 * sys_mbind * sys_ipc Signed-off-by: Russell King commit 42e33148df38c60b99d984b76b302c64397ebe4c Author: James.Smart@Emulex.Com Date: Thu Dec 15 09:56:22 2005 -0500 [SCSI] fix for fc transport recursion problem. In the scenario that a link was broken, the devloss timer for each rport was expire at roughly the same time, causing lots of "delete" workqueue items being queued. Depth is dependent upon the number of rports that were on the link. The rport target remove calls were calling flush_scheduled_work(), which would interrupt the stream, and start the next workqueue item, which did the same thing, and so on until recursion depth was large. This fix stops the recursion in the initial delete path, and pushes it off to a host-level work item that reaps the dead rports. Signed-off-by: James Bottomley commit 1e483969930a82e16767884449f3a121a817ef00 Author: David Shaohua Li Date: Thu Dec 1 17:00:00 2005 -0500 [ACPI] correct earlier SMP deep C-states on HT patch http://bugzilla.kernel.org/show_bug.cgi?id=5165 Change polarity of test for PLVL2_UP flag. Skip promotion/demotion code when not needed. Signed-off-by: Shaohua Li Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown