| f89f594 | Linus Torvalds | 24 December 2005, 23:47:48 UTC | Linux v2.6.15-rc7 Ho ho ho. | 24 December 2005, 23:47:48 UTC |
| 01e33b5 | Kurt Huwig | 24 December 2005, 23:13:08 UTC | [PATCH] n_r3964: fixed usage of HZ; removed bad include Fix n_r3964 timeouts (hardcoded for 100Hz) Also the include of <asm/termios.h> in 'n_r3964.h' is unnecessary and prevents using the header file in any application that has to include <termios.h> due to duplicate definition of 'struct termio'. Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 24 December 2005, 23:37:00 UTC |
| cdcdb28 | Linus Torvalds | 24 December 2005, 20:40:43 UTC | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev | 24 December 2005, 20:40:43 UTC |
| 10bb10d | Linus Torvalds | 24 December 2005, 20:32:55 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 | 24 December 2005, 20:32:55 UTC |
| 3bf3959 | Linus Torvalds | 24 December 2005, 20:30:42 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 | 24 December 2005, 20:30:42 UTC |
| e5c34a5 | Ben Collins | 23 December 2005, 14:10:03 UTC | [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 <torvalds@osdl.org> | 24 December 2005, 20:30:22 UTC |
| c660439 | Ravikiran G Thirumalai | 22 December 2005, 22:21:34 UTC | [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 <alokk@calsoftinc.com> Signed-off-by: Ravikiran G Thirumalai <kiran@scalex86.org> Signed-off-by: Shai Fultheim <shai@scalex86.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 24 December 2005, 20:30:22 UTC |
| 1224b37 | Linus Torvalds | 24 December 2005, 20:19:38 UTC | Fix silly typo ("smb" vs "smp") Introduced by commit 6003a93e7bf6c02f33c02976ff364785d4273295 | 24 December 2005, 20:19:38 UTC |
| 8e31108 | Andrew Morton | 24 December 2005, 03:54:46 UTC | [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 <steiner@sgi.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 24 December 2005, 20:13:27 UTC |
| 6003a93 | Manfred Spraul | 23 December 2005, 22:57:41 UTC | [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 <manfred@colorfullife.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 24 December 2005, 20:13:27 UTC |
| e445ee6 | David S. Miller | 24 December 2005, 20:06:10 UTC | [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 <davem@davemloft.net> | 24 December 2005, 20:06:10 UTC |
| a7c2491 | Linus Torvalds | 24 December 2005, 19:55:16 UTC | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 | 24 December 2005, 19:55:16 UTC |
| 1836098 | Manfred Spraul | 24 December 2005, 13:19:24 UTC | [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 <manfred@colorfullife.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 24 December 2005, 19:53:32 UTC |
| 3df3cc6 | Frank Pavlic | 13 December 2005, 07:23:26 UTC | [PATCH] s390: remove redundant and useless code in qeth [patch 3/3] s390: remove redundant and useless code in qeth From: Frank Pavlic <pavlic@de.ibm.com> - remove redundant and useless code in qeth for procfs operations. - update Revision numbers Signed-off-by: Frank Pavlic <pavlic@de.ibm.com> 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 <jgarzik@pobox.com> | 24 December 2005, 15:05:52 UTC |
| 4965e97 | Frank Pavlic | 13 December 2005, 07:22:30 UTC | [PATCH] s390: minor qeth network driver fixes [patch 2/3] s390: minor qeth network driver fixes From: Frank Pavlic <pavlic@de.ibm.com> - 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 <pavlic@de.ibm.com> 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 <jgarzik@pobox.com> | 24 December 2005, 15:05:51 UTC |
| 6c6b3e7 | Frank Pavlic | 13 December 2005, 07:21:47 UTC | [PATCH] s390: some minor qeth driver fixes [patch 1/3] s390: some minor qeth driver fixes From: Frank Pavlic <pavlic@de.ibm.com> - 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 <pavlic@de.ibm.com> diffstat: qeth_main.c | 42 +++++++++++++++++++++--------------------- qeth_sys.c | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com> | 24 December 2005, 15:05:51 UTC |
| afcceaa | Olaf Hering | 13 December 2005, 23:33:49 UTC | [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 <jgarzik@pobox.com> | 24 December 2005, 15:05:51 UTC |
| d495657 | Pavel Roskin | 16 December 2005, 23:57:10 UTC | [PATCH] orinoco_nortel: Add Symbol LA-4123 ID Add ID for Symbol LA-4123. Reported by Tomas Novak <tap@post.cz> Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> | 24 December 2005, 15:05:51 UTC |
| c8cb00f | Pavel Roskin | 16 December 2005, 23:49:53 UTC | [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 <tap@post.cz> Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> | 24 December 2005, 15:05:50 UTC |
| fd71da4 | Tony Battersby | 21 December 2005, 21:35:44 UTC | [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 <jgarzik@pobox.com> | 24 December 2005, 15:02:24 UTC |
| 291d809 | Hiroyuki YAMAMORI | 23 December 2005, 19:24:05 UTC | [IPV6]: Fix Temporary Address Generation From: Hiroyuki YAMAMORI <h-yamamo@db3.so-net.ne.jp> 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 <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 23 December 2005, 19:24:05 UTC |
| 3dd3bf8 | YOSHIFUJI Hideaki | 23 December 2005, 19:23:21 UTC | [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 <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 23 December 2005, 19:23:21 UTC |
| 8f43d8e | Linus Torvalds | 23 December 2005, 18:11:50 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 | 23 December 2005, 18:11:50 UTC |
| 597d1f0 | David S. Miller | 23 December 2005, 07:04:39 UTC | [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 <davem@davemloft.net> | 23 December 2005, 07:10:03 UTC |
| 0b57ee9 | Adrian Bunk | 23 December 2005, 05:03:47 UTC | [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 <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net> | 23 December 2005, 07:09:54 UTC |
| 1490439 | Adrian Bunk | 22 December 2005, 02:50:12 UTC | [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 <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net> | 23 December 2005, 07:09:44 UTC |
| 7b3dad3 | Len Brown | 23 December 2005, 03:26:10 UTC | Pull bug3410 into release branch | 23 December 2005, 03:26:10 UTC |
| 3c058d8 | Len Brown | 23 December 2005, 03:26:01 UTC | Pull owner_id into release branch | 23 December 2005, 03:26:01 UTC |
| 9d6be4b | Len Brown | 23 December 2005, 03:23:06 UTC | [ACPI] fix build warning from owner_id patch Signed-off-by: Len Brown <len.brown@intel.com> | 23 December 2005, 03:24:10 UTC |
| db9ace7 | Len Brown | 23 December 2005, 03:01:55 UTC | Auto-update from upstream | 23 December 2005, 03:01:55 UTC |
| 75b245b | Thomas Renninger | 21 December 2005, 06:29:00 UTC | [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 <trenn@suse.de> Signed-off-by: Len Brown <len.brown@intel.com> | 23 December 2005, 03:00:25 UTC |
| c162eea | Linus Torvalds | 22 December 2005, 17:41:03 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 | 22 December 2005, 17:41:03 UTC |
| b31c78e | Linus Torvalds | 22 December 2005, 17:34:05 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge | 22 December 2005, 17:34:05 UTC |
| fbbde0c | Linus Torvalds | 22 December 2005, 17:33:04 UTC | Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb | 22 December 2005, 17:33:04 UTC |
| 0800c5f | ASANO Masahiro | 22 December 2005, 04:24:54 UTC | [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 <masano@tnes.nec.co.jp> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 22 December 2005, 17:24:05 UTC |
| d6f0291 | Nicolas Pitre | 21 December 2005, 17:26:25 UTC | [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 <nico@cam.org> Acked-by: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 22 December 2005, 17:17:39 UTC |
| e646929 | David S. Miller | 22 December 2005, 15:41:27 UTC | Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+git+ipv6-fix-20051221a | 22 December 2005, 15:41:27 UTC |
| 9b78a82 | David S. Miller | 22 December 2005, 15:39:48 UTC | [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 <davem@davemloft.net> | 22 December 2005, 15:39:48 UTC |
| 8b1af56 | Paul Mackerras | 22 December 2005, 10:55:37 UTC | 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 <paulus@samba.org> | 22 December 2005, 10:55:37 UTC |
| 515432a | Hans Verkuil | 20 December 2005, 11:48:29 UTC | 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 <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 22 December 2005, 09:55:12 UTC |
| 7bb9529 | Ricardo Cerqueira | 20 December 2005, 20:26:26 UTC | 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 <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 22 December 2005, 09:55:06 UTC |
| 4c7e689 | Ian McDonald | 22 December 2005, 03:02:39 UTC | [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 <imcdnzl@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 22 December 2005, 03:02:39 UTC |
| 1d14280 | Kristian Slavov | 22 December 2005, 02:47:24 UTC | [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 <kristian.slavov@nomadiclab.com> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 22 December 2005, 02:47:24 UTC |
| 7eb1b3d | Mika Kukkonen | 22 December 2005, 02:39:49 UTC | [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 <mikukkon@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> | 22 December 2005, 02:39:49 UTC |
| 0d77d59 | Mika Kukkonen | 22 December 2005, 02:38:26 UTC | [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 <mikukkon@iki.fi> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 22 December 2005, 02:38:26 UTC |
| d5ea4e2 | Linus Torvalds | 21 December 2005, 23:09:50 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 | 21 December 2005, 23:09:50 UTC |
| c7ac6b4 | Linus Torvalds | 21 December 2005, 22:52:32 UTC | Initialize drivers/media/video/saa7134 late When compiled-in, make sure the sound system has initialized before these drivers do. Reported by Adrian Bunk <bunk@stusta.de> (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 <torvalds@osdl.org> | 21 December 2005, 22:52:32 UTC |
| 5a9191f | Alan Stern | 21 December 2005, 22:28:11 UTC | [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 <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 21 December 2005, 22:46:35 UTC |
| 28120be | Paul Walmsley | 21 December 2005, 22:28:06 UTC | [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 <tony@atomide.com> collaborated in the development of this patch. Signed-off-by: Paul Walmsley <paul@booyaka.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 21 December 2005, 22:46:34 UTC |
| 23f9b31 | Adrian Bunk | 21 December 2005, 01:27:50 UTC | [PATCH] include/linux/irq.h: #include <linux/smp.h> 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 <asm/smp.h> 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 <linux/smp.h> in irq.h. I've tested the compilation with both CONFIG_SMP=y and CONFIG_SMP=n on i386. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 21 December 2005, 22:45:25 UTC |
| bee5ab3 | Linus Torvalds | 21 December 2005, 19:05:15 UTC | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 | 21 December 2005, 19:05:15 UTC |
| 6b3ae80 | YOSHIFUJI Hideaki | 21 December 2005, 13:58:01 UTC | [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 <yoshfuji@linux-ipv6.org> | 21 December 2005, 13:58:01 UTC |
| c5e33bd | YOSHIFUJI Hideaki | 21 December 2005, 13:57:44 UTC | [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 <yoshfuji@linux-ipv6.org> | 21 December 2005, 13:57:44 UTC |
| 3c21edb | YOSHIFUJI Hideaki | 21 December 2005, 13:57:24 UTC | [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 <yoshfuji@linux-ipv6.org> | 21 December 2005, 13:57:24 UTC |
| 8de3351 | YOSHIFUJI Hideaki | 21 December 2005, 13:57:06 UTC | [IPV6]: Try not to send icmp to anycast address. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 21 December 2005, 13:57:06 UTC |
| 58c4fb8 | YOSHIFUJI Hideaki | 21 December 2005, 13:56:42 UTC | [IPV6]: Flag RTF_ANYCAST for anycast routes. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 21 December 2005, 13:56:42 UTC |
| 05465fd | Alex Williamson | 08 December 2005, 20:37:00 UTC | [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 <alex.williamson@hp.com> Signed-off-by: Len Brown <len.brown@intel.com> | 21 December 2005, 09:52:16 UTC |
| d8bcd8e | Len Brown | 21 December 2005, 09:38:01 UTC | Auto-update from upstream | 21 December 2005, 09:38:01 UTC |
| b05948d | Linus Torvalds | 21 December 2005, 01:33:54 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 | 21 December 2005, 01:33:54 UTC |
| fd30fc3 | Tom Zanussi | 20 December 2005, 19:10:22 UTC | [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 <zanussi@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 21 December 2005, 01:33:22 UTC |
| a9c9dff | David S. Miller | 20 December 2005, 22:53:05 UTC | [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 <davem@davemloft.net> | 20 December 2005, 22:53:05 UTC |
| bb44f11 | Ingo Molnar | 20 December 2005, 10:54:17 UTC | [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 <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 18:47:55 UTC |
| 391eade | Andi Kleen | 20 December 2005, 06:23:47 UTC | [PATCH] Fix build with CONFIG_PCI_MMCONFIG Now needs to include the type 1 functions ("direct") too. Reported by Pavel Roskin <proski@gnu.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 18:41:57 UTC |
| b7964c3 | Andreas Gruenbacher | 20 December 2005, 15:29:05 UTC | [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 <mawa@uni-freiburg.de>. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 18:31:33 UTC |
| 9e28393 | Jason Wessel | 20 December 2005, 14:21:24 UTC | [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 <jason.wessel@windriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 18:31:33 UTC |
| 7e87023 | Andi Kleen | 20 December 2005, 13:45:19 UTC | [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 <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 18:13:54 UTC |
| 7ca0b3b | Knut Petersen | 20 December 2005, 07:18:09 UTC | [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 <Knut_Petersen@t-online.de> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 17:44:20 UTC |
| d5d74ef | Linus Torvalds | 20 December 2005, 17:41:25 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge | 20 December 2005, 17:41:25 UTC |
| fc7e131 | Linus Torvalds | 20 December 2005, 17:35:05 UTC | Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 | 20 December 2005, 17:35:05 UTC |
| 33c37c0 | Antonino A. Daplas | 19 December 2005, 07:11:49 UTC | [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 <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 17:27:15 UTC |
| 4b3760c | Antonino A. Daplas | 19 December 2005, 07:11:40 UTC | [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 <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 17:27:15 UTC |
| 6ee7fb7 | Benjamin Herrenschmidt | 19 December 2005, 00:24:53 UTC | [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 <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 17:25:33 UTC |
| 5a1244e | Paul Mackerras | 20 December 2005, 05:00:17 UTC | powerpc: update defconfigs Signed-off-by: Paul Mackerras <paulus@samba.org> | 20 December 2005, 05:00:17 UTC |
| b273ed2 | Edson Seabra | 19 December 2005, 15:16:50 UTC | [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 <Edson.Seabra@cyclades.com> Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 20 December 2005, 04:39:33 UTC |
| 3eb6f26 | Paul Mackerras | 20 December 2005, 04:38:47 UTC | 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 <paulus@samba.org> | 20 December 2005, 04:38:47 UTC |
| 9b5b1f5 | Trond Myklebust | 19 December 2005, 22:11:25 UTC | 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 <Trond.Myklebust@netapp.com> | 20 December 2005, 04:12:31 UTC |
| 48e4918 | Trond Myklebust | 19 December 2005, 22:11:22 UTC | 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 <Trond.Myklebust@netapp.com> | 20 December 2005, 04:12:21 UTC |
| 29884df | Trond Myklebust | 13 December 2005, 21:13:54 UTC | 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 <Trond.Myklebust@netapp.com> | 20 December 2005, 04:12:09 UTC |
| b079fa7 | Trond Myklebust | 13 December 2005, 21:13:52 UTC | RPC: Do not block on skb allocation If we get something like the following, [ 125.300636] [<c04086e1>] schedule_timeout+0x54/0xa5 [ 125.305931] [<c040866e>] io_schedule_timeout+0x29/0x33 [ 125.311495] [<c02880c4>] blk_congestion_wait+0x70/0x85 [ 125.317058] [<c014136b>] throttle_vm_writeout+0x69/0x7d [ 125.322720] [<c014714d>] shrink_zone+0xe0/0xfa [ 125.327560] [<c01471d4>] shrink_caches+0x6d/0x6f [ 125.332581] [<c01472a6>] try_to_free_pages+0xd0/0x1b5 [ 125.338056] [<c013fa4b>] __alloc_pages+0x135/0x2e8 [ 125.343258] [<c03b74ad>] tcp_sendmsg+0xaa0/0xb78 [ 125.348281] [<c03d4666>] inet_sendmsg+0x48/0x53 [ 125.353212] [<c0388716>] sock_sendmsg+0xb8/0xd3 [ 125.358147] [<c0388773>] kernel_sendmsg+0x42/0x4f [ 125.363259] [<c038bc00>] sock_no_sendpage+0x5e/0x77 [ 125.368556] [<c03ee7af>] 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 <Trond.Myklebust@netapp.com> | 20 December 2005, 04:11:54 UTC |
| 3e1ec1f | Linus Torvalds | 20 December 2005, 02:34:37 UTC | Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb | 20 December 2005, 02:34:37 UTC |
| bcb9794 | Neil Brown | 20 December 2005, 00:07:00 UTC | [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 <neilb@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 00:47:50 UTC |
| f98d2df | Ben Collins | 19 December 2005, 19:49:24 UTC | [PATCH] block: Cleanup CDROMEJECT ioctl This is just a basic cleanup. No change in functionality. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> | 20 December 2005, 00:47:50 UTC |
| 931b11b | Linus Torvalds | 20 December 2005, 00:46:14 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 | 20 December 2005, 00:46:14 UTC |
| 546ac8a | Linus Torvalds | 20 December 2005, 00:43:57 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 | 20 December 2005, 00:43:57 UTC |
| ce7fa1b | Linus Torvalds | 20 December 2005, 00:43:36 UTC | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 | 20 December 2005, 00:43:36 UTC |
| d898d48 | Linus Torvalds | 20 December 2005, 00:43:13 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-arm | 20 December 2005, 00:43:13 UTC |
| 3869019 | Michael Chan | 20 December 2005, 00:27:28 UTC | [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 <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 20 December 2005, 00:27:28 UTC |
| b401e9e | Michael Chan | 20 December 2005, 00:27:04 UTC | [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 <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 20 December 2005, 00:27:04 UTC |
| dc56b7d | Michael Chan | 20 December 2005, 00:26:28 UTC | [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 <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 20 December 2005, 00:26:28 UTC |
| 8c2dc7e | Michael Chan | 20 December 2005, 00:26:02 UTC | [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 <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 20 December 2005, 00:26:02 UTC |
| ce37e5f | Adrian Bunk | 19 December 2005, 22:52:24 UTC | [SPARC]: Fix RTC build failure. On sparc and sparc64, the rtc driver doesn't compile with PCI support disabled. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 22:52:24 UTC |
| 9bffc4a | Neil Horman | 19 December 2005, 22:24:40 UTC | [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 <nhorman@tuxdriver.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 22:24:40 UTC |
| 399c180 | David S. Miller | 19 December 2005, 22:23:23 UTC | [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 <davem@davemloft.net> | 19 December 2005, 22:23:23 UTC |
| 7c612bf | Nicolas Pitre | 19 December 2005, 22:20:51 UTC | [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 <nico@cam.org> Acked-by: Daniel Jacobowitz <dan@codesourcery.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 19 December 2005, 22:20:51 UTC |
| 9e99999 | Patrick McHardy | 19 December 2005, 22:03:46 UTC | [XFRM]: Handle DCCP in xfrm{4,6}_decode_session Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 22:03:46 UTC |
| 3dd4bc6 | YOSHIFUJI Hideaki | 19 December 2005, 22:02:45 UTC | [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 <CHINEN@jp.ibm.com>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 22:02:45 UTC |
| b036648 | Bart De Schuymer | 19 December 2005, 22:00:08 UTC | [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 <bdschuym@pandora.be> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 22:00:08 UTC |
| 6b80ebe | Kristian Slavov | 19 December 2005, 21:54:44 UTC | [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 <kristian.slavov@nomadiclab.com> Acked-by: Jamal Hadi salim <hadi@cyberus.ca> ACKed-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 21:54:44 UTC |
| 31cb5bd | Patrick McHardy | 19 December 2005, 21:53:26 UTC | [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 <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 21:53:26 UTC |
| 0476f17 | Patrick McHardy | 19 December 2005, 21:53:09 UTC | [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 <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> | 19 December 2005, 21:53:09 UTC |
