commit ea9e7b5569a538123dc4d60ba36b9170ca8e8830 Merge: 980110c... 2300317... Author: Linus Torvalds Date: Mon Dec 17 09:56:29 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (6820): s5h1409: QAM SNR related fixes V4L/DVB (6819): i2c: fix drivers/media/video/bt866.c V4L/DVB (6814): Makefile: always enter video/ V4L/DVB (6798): saa7134: enable LNA in analog mode for Hauppauge WinTV HVR-1110 V4L/DVB (6803): buf-core.c locking fixes commit 980110c5da56cb56d3356f5a5251fdc920f83ba6 Merge: 5cdddec... c4c2833... Author: Linus Torvalds Date: Mon Dec 17 09:53:51 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] add Nano 7240 driver [WATCHDOG] ipmi: add the standard watchdog timeout ioctls [WATCHDOG] IT8212F watchdog driver [WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED [WATCHDOG] bfin_wdt, remove SPIN_LOCK_UNLOCKED [WATCHDOG] Stop looking for device as soon as one is found [WATCHDOG] at32ap700x_wdt: add support for boot status and add fix for silicon errata commit 5cdddecc8b423308798453484149297a503e9cc0 Merge: ac0b50d... 971edcf... Author: Linus Torvalds Date: Mon Dec 17 09:53:07 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild: kbuild: re-enable Makefile generation in a new O=... directory commit ac0b50dd10ac0d30f2732eec0587f3632c2be725 Merge: a12e606... 3d758a4... Author: Linus Torvalds Date: Mon Dec 17 09:52:11 2007 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ehca: Fix lock flag variable location, bump version number IB/ehca: Serialize HCA-related hCalls if necessary IB/ehca: Return correct number of SGEs for SRQ commit a12e60621b553e32711f9ad653aad3c92881c400 Merge: aa62a86... 553876c... Author: Linus Torvalds Date: Mon Dec 17 09:49:24 2007 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4694/1: IXP4xx: Update clockevent support for shutdown and resume [ARM] 4710/1: Fix coprocessor 14 usage for debug messages via ICEDCC [ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code [ARM] 4667/1: CM-X270 fixes commit 553876c802249b21267b78a9b3857d1341a3df87 Author: Kevin Hilman Date: Wed Dec 12 00:32:58 2007 +0100 [ARM] 4694/1: IXP4xx: Update clockevent support for shutdown and resume Add proper support for CLOCK_EVT_MODE_RESUME and in the process fix CLOCK_EVT_MODE_SHUTDOWN so that only the enable bits are toggled for both. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit 41a9e680717e82c745b1ead979ea008e9134ea68 Author: Uwe Kleine-König Date: Thu Dec 13 09:31:34 2007 +0100 [ARM] 4710/1: Fix coprocessor 14 usage for debug messages via ICEDCC According to ARM7TDMI Technical Reference Manual (ARM DDI 0210C) writing to the DCC data write register coproc dest registers are 1 and 0, not 0 and 1. ARM920T TRM (ARM DDI 0151C) agrees on that. Cc: Ben Dooks Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit aa62a869454c5900687822ee117f2d3494e2ea62 Merge: de29cba... a26e01d... Author: Linus Torvalds Date: Mon Dec 17 08:43:49 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA]: irda parameters warning fixes. [IRDA]: stir4200 fixes. [IRDA]: irlmp_unregister_link() needs to free lsaps. [IRDA]: mcs7780 needs to free allocated rx buffer. [IRDA]: Race between open and disconnect in irda-usb. [SCTP]: Flush fragment queue when exiting partial delivery. [AX25]: Locking dependencies fix in ax25_disconnect(). [IPV4]: Make tcp_input_metrics() get minimum RTO via tcp_rto_min() [IPV6]: Fix the return value of ipv6_getsockopt [BRIDGE]: Assign random address. [IPV4]: Updates to nfsroot documentation [ATM]: Fix compiler warning noise with FORE200E driver [NETFILTER]: bridge: fix missing link layer headers on outgoing routed packets [SYNCPPP]: Endianness and 64bit fixes. [TIPC]: Fix semaphore handling. [NETFILTER]: xt_hashlimit should use time_after_eq() [XFRM]: Display the audited SPI value in host byte order. [NETFILTER]: ip_tables: fix compat copy race [NETFILTER]: ctnetlink: set expected bit for related conntracks commit de29cba9c9bb2dc35803e8d5c968a454e297b8f3 Merge: 104064b... e6e0a94... Author: Linus Torvalds Date: Mon Dec 17 08:43:02 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Silence sparc32 warnings on missing syscalls. [SPARC64]: Fix two kernel linear mapping setup bugs. commit 104064b54955addac0fcf9ceb6c68569f2bed6ab Merge: cbd84ec... 0d01792... Author: Linus Torvalds Date: Mon Dec 17 08:42:23 2007 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] pud_present/pmd_present bug. commit cbd84ec0d5cf4ff760caa4b6de2925a21e21437d Merge: 7b286af... 280bb6b... Author: Linus Torvalds Date: Mon Dec 17 08:41:56 2007 -0800 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] Make PS3_SYS_MANAGER default y, not m [POWERPC] Fix rounding bug in emulation for double float operating [POWERPC] iSeries: don't printk with HV spinlock held [POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC [POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset(). [POWERPC] Kill non-existent symbols from ksyms and commproc.h [POWERPC] Fix typo #ifdef -> #ifndef commit 7b286af3921e13da4838cdb451639b959c187c82 Merge: 6e30139... bbaf238... Author: Linus Torvalds Date: Mon Dec 17 08:41:25 2007 -0800 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] Ensure that ST0_FR is never set on a 32 bit kernel [MIPS] time: Delete weak definition of plat_time_init() due to gcc bug. [MIPS] PCI: Make pcibios_fixup_device_resources ignore legacy resources. [MIPS] Atlas, Malta: Don't free firmware memory on free_initmem. [MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr() [MIPS] Alchemy: fix PCI resource conflict [MIPS] time: Set up Cobalt's mips_hpt_frequency commit 0d01792300c4d7425eabac9095c603cdb411d2a5 Author: Martin Schwidefsky Date: Mon Dec 17 16:25:48 2007 +0100 [S390] pud_present/pmd_present bug. Git commit 3610cce87af0693603db171d5b6f6735f5e3dc5b (yeah my own :-/) introduced a bug in regard to pud/pmd table entries. If the address of the page table refered to by a pud/pmd value happens to have zeroes in the lower 32 bits, pud_present and pmd_present return false. The obvious effect is that this triggers the BUG_ON in exit_mmap because some ptes will not get released on process end. Worse is that the next fault for memory covered by that pud/pmd will allocate another pmd/pte table and populate the pud/pmd entry. The old page table entries hanging below this entry are lost! The fix is simple, properly check against 0. The check is added for pud_none/pmd_none as well even if these two functions work because the invalid bit is in the lower 32 bits. Signed-off-by: Martin Schwidefsky commit a26e01d71622a4cecad06ce85bcab3ed878e7f83 Author: Richard Knutsson Date: Sun Dec 16 14:10:33 2007 -0800 [IRDA]: irda parameters warning fixes. This patch fixes: CHECK /home/kernel/src/net/irda/parameters.c /home/kernel/src/net/irda/parameters.c:466:2: warning: Using plain integer as NULL pointer /home/kernel/src/net/irda/parameters.c:520:2: warning: Using plain integer as NULL pointer /home/kernel/src/net/irda/parameters.c:573:2: warning: Using plain integer as NULL pointer Signed-off-by: Richard Knutsson Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit ea332912b8a2e0b2f51ac3b6c197b71d3a18cbb7 Author: Olaf Hartmann Date: Sun Dec 16 14:09:44 2007 -0800 [IRDA]: stir4200 fixes. From: Olaf Hartmann The attached patch observes the stir4200 fifo size and will clear the fifo, if the size is increasing, while it should be transmitting bytes Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 2638698df30b7b57a8dad7029a0c89fe6c4f6783 Author: Hinko Kocevar Date: Sun Dec 16 14:08:58 2007 -0800 [IRDA]: irlmp_unregister_link() needs to free lsaps. While testing the mcs7780 based IrDA USB dongle I've stumbled upon memory leak in irlmp_unregister_link(). Hashbin for lsaps is created in irlmp_register_link and should probably be freed in irlmp_unregister_link(). Signed-off-by: Hinko Kocevar Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 0ff804348d66550e7dd1d6781c65403b312e2da2 Author: Hinko Kocevar Date: Sun Dec 16 14:08:22 2007 -0800 [IRDA]: mcs7780 needs to free allocated rx buffer. While testing the mcs7780 based IrDA USB dongle I've stumbled upon memory leak in mcs_net_close(). Patch below fixes it. Signed-off-by: Hinko Kocevar Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 497ba7f4c8113ed699a4fd793d1437f0c8f2da5e Author: Oliver Neukum Date: Sun Dec 16 14:07:36 2007 -0800 [IRDA]: Race between open and disconnect in irda-usb. It seems to me that irda_usb_net_open() must set self->netopen under spinlock or disconnect() may fail to kill all URBs, if it is called while an interface is opened. Signed-off-by: Oliver Neukum Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit ef5d4cf2f9aae4e09883d2d664e367a16b47d857 Author: Vlad Yasevich Date: Sun Dec 16 14:05:45 2007 -0800 [SCTP]: Flush fragment queue when exiting partial delivery. At the end of partial delivery, we may have complete messages sitting on the fragment queue. These messages are stuck there until a new fragment arrives. This can comletely stall a given association. When clearing partial delivery state, flush any complete messages from the fragment queue and send them on their way up. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller commit 215f7b08f2a142ec19f4bd3d6de263e68b877955 Author: Jarek Poplawski Date: Sun Dec 16 14:02:07 2007 -0800 [AX25]: Locking dependencies fix in ax25_disconnect(). Bernard Pidoux reported these lockdep warnings: [ INFO: possible irq lock inversion dependency detected ] 2.6.23.1 #1 --------------------------------------------------------- fpac/4933 just changed the state of lock: (slock-AF_AX25){--..}, at: [] ax25_disconnect+0x46/0xaf [ax25] but this lock was taken by another, soft-irq-safe lock in the past: (ax25_list_lock){-+..} and interrupts could create inverse lock ordering between them. [...] [ INFO: inconsistent lock state ] 2.6.23.1 #1 --------------------------------- inconsistent {in-softirq-W} -> {softirq-on-W} usage. ax25_call/4005 [HC0[0]:SC0[0]:HE1:SE1] takes: (slock-AF_AX25){-+..}, at: [] ax25_disconnect+0x46/0xaf [ax25] [...] This means slock-AF_AX25 could be taken both from softirq and process context with softirqs enabled, so it's endangered itself, but also makes ax25_list_lock vulnerable. It was not 100% verified if the real lockup can happen, but this fix isn't very costly and looks safe anyway. (It was tested by Bernard with 2.6.23.9 and 2.6.24-rc5 kernels.) Reported_by: Bernard Pidoux Tested_by: Bernard Pidoux Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 488faa2ae32c2f8b1ffda5c7fae5eb7c979acc15 Author: Satoru SATOH Date: Sun Dec 16 14:00:19 2007 -0800 [IPV4]: Make tcp_input_metrics() get minimum RTO via tcp_rto_min() tcp_input_metrics() refers to the built-time constant TCP_RTO_MIN regardless of configured minimum RTO with iproute2. Signed-off-by: Satoru SATOH Signed-off-by: David S. Miller commit cf6fc4a92400decda932e5ab97b46916919142b1 Author: Wei Yongjun Date: Sun Dec 16 13:39:57 2007 -0800 [IPV6]: Fix the return value of ipv6_getsockopt If CONFIG_NETFILTER if not selected when compile the kernel source code, ipv6_getsockopt will returen an EINVAL error if optname is not supported by the kernel. But if CONFIG_NETFILTER is selected, ENOPROTOOPT error will be return. This patch fix to always return ENOPROTOOPT error if optname argument of ipv6_getsockopt is not supported by the kernel. Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 3ae412544cde6d987e0e48778bd87bc96a5749df Author: Stephen Hemminger Date: Sun Dec 16 13:35:51 2007 -0800 [BRIDGE]: Assign random address. Assigning a valid random address to bridge device solves problems when bridge device is brought up before adding real device to bridge. When the first real device is added to the bridge, it's address will overide the bridges random address. Note: any device added to a bridge must already have a valid ethernet address. br_add_if -> br_fdb_insert -> fdb_insert -> is_valid_ether_addr Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f33e1d9fa20381afa3be7e7f560c59845bfa5cec Author: Amos Waterland Date: Fri Dec 14 11:30:22 2007 -0800 [IPV4]: Updates to nfsroot documentation The difference between ip=off and ip=::::::off has been a cause of much confusion. Document how each behaves, and do not contradict ourselves by saying that "off" is the default when in fact "any" is the default and is descibed as being so lower in the file. Signed-off-by: Amos Waterland Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f58adb757be48068e2bded3dd77ba072c22a10ff Author: Tom "spot" Callaway Date: Thu Dec 13 09:33:50 2007 -0800 [ATM]: Fix compiler warning noise with FORE200E driver gcc throws these warnings with: CONFIG_ATM_FORE200E=m # CONFIG_ATM_FORE200E_PCA is not set drivers/atm/fore200e.c:2695: warning: 'fore200e_pca_detect' defined but not used drivers/atm/fore200e.c:2748: warning: 'fore200e_pca_remove_one' defined but not used By moving the #ifdef CONFIG_ATM_FORE200E_PCA around those two functions, the compiler warnings are silenced. Signed-off-by: Tom "spot" Callaway Signed-off-by: David S. Miller commit 4a9ecd5960e6a7814f6e3405807d49010ffe3a88 Author: Patrick McHardy Date: Thu Dec 13 09:32:04 2007 -0800 [NETFILTER]: bridge: fix missing link layer headers on outgoing routed packets As reported by Damien Thebault, the double POSTROUTING hook invocation fix caused outgoing packets routed between two bridges to appear without a link-layer header. The reason for this is that we're skipping the br_nf_post_routing hook for routed packets now and don't save the original link layer header, but nevertheless tries to restore it on output, causing corruption. The root cause for this is that skb->nf_bridge has no clearly defined lifetime and is used to indicate all kind of things, but that is quite complicated to fix. For now simply don't touch these packets and handle them like packets from any other device. Tested-by: Damien Thebault Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6f229d76b4c4a7fae601ea9398b23c2b426ab3b9 Author: Al Viro Date: Wed Dec 12 18:50:18 2007 -0800 [SYNCPPP]: Endianness and 64bit fixes. * trivial annotations * long != 32bit, use __be32 * wrong endianness in sending CISCO_ADDR_REPLY Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 98eb5683fb94c458b3c8d121797bc9aa1baf4e7e Author: Andrew Morton Date: Wed Dec 12 11:24:19 2007 -0800 [TIPC]: Fix semaphore handling. As noted by Kevin, tipc's release() does down_interruptible() and ignores the return value. So if signal_pending() we'll end up doing up() on a non-downed semaphore. Fix. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit cbebc51f7b77d26ec23145d6ef22ac2b209f7955 Author: Eric Dumazet Date: Wed Dec 12 11:11:28 2007 -0800 [NETFILTER]: xt_hashlimit should use time_after_eq() In order to avoid jiffies wraparound and its effect, special care must be taken when doing comparisons ... Signed-off-by: Eric Dumazet Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 9ab4c954ce2b2b3c485bee7e425fda05946893be Author: Paul Moore Date: Wed Dec 12 11:10:16 2007 -0800 [XFRM]: Display the audited SPI value in host byte order. Currently the IPsec protocol SPI values are written to the audit log in network byte order which is different from almost all other values which are recorded in host byte order. This patch corrects this inconsistency by writing the SPI values to the audit record in host byte order. Signed-off-by: Paul Moore Signed-off-by: David S. Miller commit a18aa31b7774d8b36048e256a02d9d689533fc96 Author: Patrick McHardy Date: Wed Dec 12 10:35:16 2007 -0800 [NETFILTER]: ip_tables: fix compat copy race When copying entries to user, the kernel makes two passes through the data, first copying all the entries, then fixing up names and counters. On the second pass it copies the kernel and match data from userspace to the kernel again to find the corresponding structures, expecting that kernel pointers contained in the data are still valid. This is obviously broken, fix by avoiding the second pass completely and fixing names and counters while dumping the ruleset, using the kernel-internal data structures. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f2a89004da23a5ed2d78ac5550ccda5b714fe7d0 Author: Pablo Neira Ayuso Date: Wed Dec 12 10:34:29 2007 -0800 [NETFILTER]: ctnetlink: set expected bit for related conntracks This patch is a fix. It sets IPS_EXPECTED for related conntracks. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6e3013932e97a0e034d55419c60ae4a8a229ceb8 Merge: 5889ba0... 5a21e4f... Author: Len Brown Date: Fri Dec 14 15:14:52 2007 -0500 Pull bugzilla-9362 into release branch commit 5a21e4fe587ebb793bf3a1c02755f8a845170328 Author: Alexey Starikovskiy Date: Sat Dec 8 13:02:46 2007 +0300 ACPI: SBS: Return rate in mW if capacity in mWh klaptopd assumes rate to be in same units as capacity. http://bugzilla.kernel.org/show_bug.cgi?id=9362 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit c2d00f2d1bf8dd721f5557b0df23729addc1898d Author: Alexey Starikovskiy Date: Sat Dec 8 13:02:40 2007 +0300 ACPI: SBS: Ignore alarms coming from unknown devices http://bugzilla.kernel.org/show_bug.cgi?id=9362 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 09f1fb41ad45bc18abe07c62f7b56560571584d1 Author: Alexey Starikovskiy Date: Sat Dec 8 13:02:33 2007 +0300 ACPI: SBS: Reset alarm bit Alarm bit should be cleared in order for other alarms to be sent. http://bugzilla.kernel.org/show_bug.cgi?id=9362 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 5889ba0a6a1174ac38d7045824a2d2ed8e93d756 Merge: d020c36... 6ce7641... Author: Len Brown Date: Fri Dec 14 14:54:09 2007 -0500 Pull hotplug into release branch commit e6e0a94573fb33e6e62b848a24864e6864c45464 Author: Martin Habets Date: Fri Dec 14 10:59:50 2007 -0800 [SPARC32]: Silence sparc32 warnings on missing syscalls. Silence sparc32 warnings on missing syscalls, these won't be added. This patch is based on this mail: http://www.mail-archive.com/linux-arch@vger.kernel.org/msg02571.html Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit bbaf238b5f910f8f3dda4b96cf844f50b2dcc6fa Author: Chris Dearman Date: Thu Dec 13 22:42:19 2007 +0000 [MIPS] Ensure that ST0_FR is never set on a 32 bit kernel Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 4037500ebcfd172a15aed40caa847c52e9906712 Author: Ralf Baechle Date: Fri Dec 14 00:05:34 2007 +0000 [MIPS] time: Delete weak definition of plat_time_init() due to gcc bug. Frank Rowand reports: > In linux-2.6.24-rc4 the Toshiba RBTX4927 hangs on boot. > > The cause is that plat_time_init() from arch/mips/tx4927/common/ > tx4927_setup.c does not override the __weak plat_time_init() from > arch/mips/kernel/time.c. This is due to a compiler bug in gcc 4.1.1. The > bug is reported to not exist in earlier versions of gcc, and to be fixed in > 4.1.2. The problem is that the __weak plat_time_init() is empty and thus > gets optimized out of existence (thus the linker is never given the option > to replace the __weak function). [ He meant the call to plat_time_init() from time_init() gets optimized away ] > For more info on the gcc bug see > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27781 > > The attached patch is one workaround. Another possible workaround [ His patch adds -fno-unit-at-a-time for time.c ] > would be to change the __weak plat_time_init() to be a non-empty > function. The __weak definition of plat_time_init was only ever meant to be a migration helper to keep platforms that don't have a plat_time_init compiling. A few greps says that all platforms now supply their own plat_time_init() so the weak definition is no longer needed. So I instead delete it. Signed-off-by: Ralf Baechle commit d20e47e153dcfddca5a066ff0f8da2d1104d08ea Author: Ralf Baechle Date: Tue Dec 11 19:49:24 2007 +0000 [MIPS] PCI: Make pcibios_fixup_device_resources ignore legacy resources. There might be other reasons why a resource might be marked as fixed such as a PCI UART holding the system console but until we use IORESOURCE_PCI_FIXED that way also this will work. Signed-off-by: Ralf Baechle commit 40c7869b693b18412491fdcff64682215b739f9e Author: Ralf Baechle Date: Tue Dec 11 19:38:12 2007 +0000 [MIPS] Atlas, Malta: Don't free firmware memory on free_initmem. A proper fix for this needs to turn a few MIPS-generic bits which I don't want at this stage. Signed-off-by: Ralf Baechle commit b87bb40b62310328e908d580e013e0575b05886c Author: Sergei Shtylyov Date: Mon Dec 10 20:36:50 2007 +0300 [MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr() the PCI specific code in this function doesn't check for the address range being under the upper bound of the PCI memory window correctly -- fix this, somewhat beautifying the code around the check, while at it... Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit dd99d9661c72fe251b842705f2e7cfaa4918a13c Author: Sergei Shtylyov Date: Mon Dec 10 20:28:51 2007 +0300 [MIPS] Alchemy: fix PCI resource conflict ... by getting the PCI resources back into the 32-bit range -- there's no need therefore for CONFIG_RESOURCES_64BIT either. This makes Alchemy PCI work again while currently the kernel skips the bus scan. Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit 18ca38d26f65c849af109eb911295c7dde71ce3b Author: Yoichi Yuasa Date: Sun Dec 9 21:22:04 2007 +0900 [MIPS] time: Set up Cobalt's mips_hpt_frequency Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 280bb6b1f76aaec29a721b1025ec5d69afba57e8 Merge: eb8dc84... c896862... Author: Paul Mackerras Date: Fri Dec 14 16:46:50 2007 +1100 Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge commit eb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d Author: Michael Ellerman Date: Mon Dec 10 15:17:43 2007 +1100 [POWERPC] Make PS3_SYS_MANAGER default y, not m Currently it's impossible to build a ps3_defconfig which will reboot without modules installed. This makes it all too easy to find yourself with a PS3 that won't reboot. This is because the system manager driver, which provides the reboot mechanism, is only selectable if PS3_ADVANCED is set, else it defaults to m. In ps3_defconfig PS3_ADVANCED is not set, therefore the system manager is built as a module. It would be desirable IMHO for the defconfig to produce a kernel that boots and reboots, without needing modules to be installed. Signed-off-by: Michael Ellerman Acked-by: Geoff Levand Signed-off-by: Paul Mackerras commit c89686210542f6946e48a907772a356b9fce03f0 Author: Liu Yu Date: Mon Dec 10 13:00:52 2007 +0800 [POWERPC] Fix rounding bug in emulation for double float operating This patch fixes rounding bug in emulation for double float operating on PowerPC platform. When pack double float operand, it need to truncate the tail due to the limited precision. If the truncated part is not zero, the last bit of work bit (totally 3 bits) need to '|' 1. This patch is completed in _FP_FRAC_SRS_2(X,N,sz) (arch/powerpc/math-emu/op-2.h). Originally the code leftwards rotates the operand to just keep the truncated part, then check whether it is zero. However, the number it rotates is not correct when N is not smaller than _FP_W_TYPE_SIZE, and it will cause the work bit '|' 1 in the improper case. This patch fixes this issue. Signed-off-by: Liu Yu Signed-off-by: Kumar Gala commit 88f0178e6ec2c73167de973e4af86905b4dbfd45 Author: Stephen Rothwell Date: Wed Dec 12 14:58:12 2007 +1100 [POWERPC] iSeries: don't printk with HV spinlock held Printk was observed to hang during module unload due to a limited window of characters that may be sent to the hypervisor. The window only reexpands when we receive an ack from the HV and the spinlock here prevents us from ever processing that ack. This fixes it by dropping the lock before doing the printk, then looping back to the top to reacquire the lock. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e8b5f43f7b572a898c7b17e9949b26e7362e7f31 Author: Scott Wood Date: Mon Dec 10 11:10:45 2007 -0600 [POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC This was recently made configurable, and needs to be set for these boards. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit cd2150bca97822609fabbb77063a1a20149f5657 Author: Scott Wood Date: Wed Dec 12 16:54:32 2007 -0600 [POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset(). Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 9ac68d379e73e469b62149ee2dcc19547d3d992c Author: Jochen Friedrich Date: Thu Nov 22 17:53:54 2007 +0100 [POWERPC] Kill non-existent symbols from ksyms and commproc.h Remove exports of __res and cpm_install_handler/cpm_free_handler. Remove cpm_install_handler/cpm_free_handler from the commproc.h as well. Both were used for ARCH=ppc and aren't defined for ARCH=powerpc. CC arch/powerpc/kernel/ppc_ksyms.o arch/powerpc/kernel/ppc_ksyms.c:180: error: '__res' undeclared here (not in a function) arch/powerpc/kernel/ppc_ksyms.c:180: warning: type defaults to 'int' in declaration of '__res' make[1]: *** [arch/powerpc/kernel/ppc_ksyms.o] Error 1 make: *** [arch/powerpc/kernel] Error 2 LD .tmp_vmlinux1 arch/powerpc/kernel/built-in.o:(__ksymtab+0x198): undefined reference to `cpm_free_handler' arch/powerpc/kernel/built-in.o:(__ksymtab+0x1a0): undefined reference to `cpm_install_handler' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Jochen Friedrich Signed-off-by: Andrew Morton Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala commit 075b9cd66236191e8f5ce1668e0a601caa8c3570 Author: Jochen Friedrich Date: Thu Nov 22 17:53:47 2007 +0100 [POWERPC] Fix typo #ifdef -> #ifndef fpi->cp_command should be overwritten only if CONFIG_PPC_CPM_NEW_BINDING is NOT set. Otherwise it is already set from the device tree. Signed-off-by: Jochen Friedrich Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Vitaly Bordug Signed-off-by: Kumar Gala commit d020c36685a35f66be89700e911c7d77a67bdc43 Merge: 6790acb... ad40e68... Author: Len Brown Date: Thu Dec 13 22:16:14 2007 -0500 Pull battery-2.6.24 into release branch commit 6790acb14d264d874ff8cbae1a72e72883ec3678 Merge: ffada89... 56a185b... Author: Len Brown Date: Thu Dec 13 22:12:38 2007 -0500 Pull thinkpad-2.6.24 into release branch commit 56a185b43be05e48da7428e6a1d3e2585b232b1d Author: Henrique de Moraes Holschuh Date: Thu Dec 13 12:14:09 2007 -0200 ACPI: thinkpad-acpi: fix lenovo keymap for brightness Starting in 2.6.23... Several reports from X60 users complained that the default Lenovo keymap issuing EV_KEY KEY_BRIGHTNESS_UP/DOWN input events caused major issues when the proper brightness support through ACPI video.c was loaded. Therefore, remove the generation of these events by default, which is the right thing for T60, X60, R60, T61, X61 and R61 with their latest BIOSes. Distros that want to misuse these events into OSD reporting (which requires an ugly hack from hell in HAL) are welcome to set up the key map they need through HAL. That way, we don't break everyone else's systems. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit ffada8913e39e6fd35e95d7040ccac57b45812c9 Author: Jan Beulich Date: Thu Dec 13 08:32:26 2007 +0000 ACPI: fix modpost warnings for sn2_defconfig: WARNING: vmlinux.o(.text+0x4b8601): Section mismatch: reference to .init.data:node_to_pxm_map (between '__acpi_map_pxm_to_node' and 'acpi_get_pxm') WARNING: vmlinux.o(.text+0x4b8741): Section mismatch: reference to .init.data:pxm_to_node_map (between 'acpi_map_pxm_to_node' and 'acpi_get_node') Signed-off-by: Jan Beulich Signed-off-by: Len Brown commit 98934def70b48dac74fac3738b78ab2d1a28edda Author: William Lee Irwin III Date: Wed Dec 12 03:56:55 2007 -0800 ACPI: video_device_list corruption The ->cap fields of struct acpi_video_device and struct acpi_video_bus are 1B each, not 4B. The oversized memset()'s corrupted the subsequent list_head fields. This resulted in silent corruption without CONFIG_DEBUG_LIST and BUG's with it. This patch uses sizeof() to pass the proper bounds to the memset() calls and thereby correct the bugs. Signed-off-by: William Irwin Acked-by: Mikael Pettersson Signed-off-by: Len Brown commit 2300317f30770abd625fb051b0e5d373ce55a6ad Author: Steven Toth Date: Wed Dec 12 22:14:00 2007 -0300 V4L/DVB (6820): s5h1409: QAM SNR related fixes QAM SNR values were incorrect when the cable was disconnected. This patch extends the lookup tables to ensure correct values are being returned. Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4b5ae10c815941fab8e0e3b3801b4cb60ee2383a Author: Andrew Morton Date: Thu Dec 13 02:30:26 2007 -0300 V4L/DVB (6819): i2c: fix drivers/media/video/bt866.c usage_count got removed. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 1c1a8b9cbec2b6a75b8fa0abf6ccfd948229998a Author: Adrian Bunk Date: Wed Dec 12 15:40:32 2007 -0300 V4L/DVB (6814): Makefile: always enter video/ Since not all code under drivers/media/video/ depends on CONFIG_VIDEO_DEV we cannot only enter it depending on CONFIG_VIDEO_DEV. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit b3aa2269bd06681fbd0c47d2007381c35258ce0c Author: Michael Krufky Date: Sun Dec 9 21:13:38 2007 -0300 V4L/DVB (6798): saa7134: enable LNA in analog mode for Hauppauge WinTV HVR-1110 Thanks to Hermann Pitton for noticing that this was missing. Signed-off-by: Michael Krufky Cc: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit 971edcfc8bee41c0b41e21bf10751c5b22028a82 Author: Guillaume Chazarain Date: Tue Dec 11 13:22:08 2007 +0100 kbuild: re-enable Makefile generation in a new O=... directory The commit: 18c32dac75b187d1a4e858f3cfdf03e844129f5e "kbuild: fix building with O=.. options" disabled the creation of a Makefile in a new O=... directory. Restore it. Signed-off-by: Guillaume Chazarain Signed-off-by: Sam Ravnborg commit 3d758a4a48682639d3996968499913ecb1552e06 Author: Joachim Fenkes Date: Thu Dec 13 13:35:57 2007 +0100 IB/ehca: Fix lock flag variable location, bump version number Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 8f361453d8e9a67c85b2cf9b93c642c2d8fe0462 Author: David S. Miller Date: Thu Dec 13 06:13:38 2007 -0800 [SPARC64]: Fix two kernel linear mapping setup bugs. This was caught and identified by Greg Onufer. Since we setup the 256M/4M bitmap table after taking over the trap table, it's possible for some 4M mapping to get loaded in the TLB beforhand which later will be 256M mappings. This can cause illegal TLB multiple-match conditions. Fix this by setting up the bitmap before we take over the trap table. Next, __flush_tlb_all() was not doing anything on hypervisor platforms. Fix by adding sun4v_mmu_demap_all() and calling it. Signed-off-by: David S. Miller commit 3f84307a10b4d9039c5c8f718bcdd0928c9994c1 Author: Adrian Bunk Date: Wed Dec 12 16:44:54 2007 -0300 V4L/DVB (6803): buf-core.c locking fixes After commit 19fb1457990b6b7e15586ec7331541a184233acc the callers in videobuf-core.c that already hold the lock must call __videobuf_read_start() instead of videobuf_read_start(). Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 4faf7757955239c1b259e7dab224d4638a99b456 Author: Joachim Fenkes Date: Mon Dec 10 18:59:10 2007 +0100 IB/ehca: Serialize HCA-related hCalls if necessary Several pSeries firmware versions share a rare locking issue in the HCA-related hCalls. Check for a feature flag that indicates the issue being fixed and serialize all HCA hCalls if not. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 1457edc72d187f452be1374c7d9281f1dfa16f32 Author: Joachim Fenkes Date: Mon Dec 10 12:20:57 2007 +0100 IB/ehca: Return correct number of SGEs for SRQ Firmware would round up the number of SGEs to four, because the WQE structure holds four SGEs. For SRQ, only three are supported, so return a fixed value instead. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit da8cadb31b82c9d41fc593c8deab6aa20b162d6b Merge: 02ec96b... 0de56d1... Author: Linus Torvalds Date: Wed Dec 12 09:52:12 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix endless loop in cheetah_xcall_deliver(). [SERIAL] sparc: Infrastructure to fix section mismatch bugs. commit 02ec96be2b45d9f2712687ad107038ef390b24c2 Merge: 19fb145... 187426e... Author: Linus Torvalds Date: Wed Dec 12 08:43:51 2007 -0800 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c/isp1301_omap: Build fix i2c: Add missing spaces in split log messages i2c-gpio: Initialize adapter class i2c: Delete an outdated piece of documentation commit 0de56d1ab83323d604d95ca193dcbd28388dbabb Author: David S. Miller Date: Wed Dec 12 07:31:46 2007 -0800 [SPARC64]: Fix endless loop in cheetah_xcall_deliver(). We need to mask out the proper bits when testing the dispatch status register else we can see unrelated NACK bits from previous cross call sends. Signed-off-by: David S. Miller commit 58d784a5c754cd66ecd4791222162504d3c16c74 Author: Martin Habets Date: Tue Dec 11 03:37:04 2007 -0800 [SERIAL] sparc: Infrastructure to fix section mismatch bugs. This patch against 2.6.23 sparc-2.6.git contains a number of minor cleanups of the sparc serial drivers. Initially I fixed this build warning: WARNING: vmlinux.o(.text+0x107a2c): Section mismatch: reference to .init.text:add_preferred_console (between 'sunserial_console_match' and 'sunserial_console_termios') which is done by declaring sunserial_console_match() as __init. This resulted in build warnings on sunserial_current_minor. To resolve these the variable was changed so it is no longer global, and to hide operations on it inside 2 new functions. These functions handle the UART minor handling code that is common to all sparc serial drivers. These changes allowed to clean up the uart counters in all the sparc serial drivers, and the administration of minor device numbers. Lastly, sunserial_console_termios() does not need to be exported since it is only called from non-modular code. Sadly, the following build warning still exists: WARNING: vmlinux.o(__ksymtab+0x2910): Section mismatch: reference to .init.text:sunserial_console_match (between '__ksymtab_sunserial_console_match' and '__ksymtab_sunserial_unregister_minors') This could be resolved by not exporting sunserial_console_match(), but this is not possible at the moment because it is being called from modular code. On the other hand, this is a bogus warning since it comes from a ksymtab section. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 187426e69afe0a2ad697c9c5f5f654254da0e3a0 Author: David Brownell Date: Wed Dec 12 13:45:25 2007 +0100 i2c/isp1301_omap: Build fix Build fix to the isp1301_omap driver ... this driver gets built more often in the OMAP tree than in mainline, partly because the defconfig for H2 (plus probably H3 and H4) needs updating. Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit fce3ff03311e0397e2867cce67d4ccf31707a1ea Author: Joe Perches Date: Wed Dec 12 13:45:24 2007 +0100 i2c: Add missing spaces in split log messages Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit 50862d9490e8fbb317040b3faeee7caf56c00025 Author: Atsushi Nemoto Date: Wed Dec 12 13:45:24 2007 +0100 i2c-gpio: Initialize adapter class This is required to let hwmon drivers attach to the adapter. Signed-off-by: Atsushi Nemoto Signed-off-by: Jean Delvare commit 45ccc6c50dfd227b40122fea649b5fc887caa174 Author: Jean Delvare Date: Wed Dec 12 13:45:24 2007 +0100 i2c: Delete an outdated piece of documentation I'm amazed that this old piece of documentation managed to survive until today. Signed-off-by: Jean Delvare commit 19fb1457990b6b7e15586ec7331541a184233acc Author: Mauro Carvalho Chehab Date: Thu Nov 15 23:09:30 2007 -0300 V4L/DVB (6609): Re-adds lock safe videobuf_read_start videobuf_dvb needs videobuf_read_start. The EXPORT_SYMBOL_GPL() were removed by a previous patch. However, videobuf_dvb needs this. This patch re-adds videobuf_read_start, doing the proper lock. Signed-off-by: Mauro Carvalho Chehab commit 4af75653031c6d454b4ace47c1536f0d2e727e3e Author: Linus Torvalds Date: Tue Dec 11 19:28:36 2007 -0800 Revert "make bnx2x select ZLIB_INFLATE" This reverts commit 70eba18b5664f90d7620905e005b89388e5fd94b, as per Jeff Garzik: "That was meant for 2.6.25, and actually (due to patching) applied to a completely unrelated 2.6.24 net driver." Noted-by: Roland Dreier Requested-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 7d44e8921851f460bcacb3ade432a4f5ada20fb6 Author: Adrian Bunk Date: Tue Dec 11 19:23:43 2007 -0300 V4L/DVB (6797): bt8xx/ section fixes This patch fixes the following section mismatch with CONFIG_HOTPLUG=n: <-- snip --> ... ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 056827a49ce65a8d10197d35468500b501d1eec1 Author: Adrian Bunk Date: Tue Dec 11 19:23:49 2007 -0300 V4L/DVB (6796): ivtv/ section fix This patch fixes the following section mismatch with CONFIG_HOTPLUG=n: <-- snip --> ... ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 4a56087f3b7660c9824e9ec69b96ccf8d9b25d1c Author: Mauro Carvalho Chehab Date: Tue Dec 11 14:59:10 2007 -0300 V4L/DVB (6794): Fix compilation when dib3000mc is compiled as a module As reported by Andrew Morton: > ERROR: "dibusb_dib3000mc_frontend_attach" [drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined! > ERROR: "dibusb_dib3000mc_tuner_attach" [drivers/media/dvb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined! > ERROR: "dibusb_dib3000mc_frontend_attach" [drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko] undefined! > ERROR: "dibusb_dib3000mc_tuner_attach" [drivers/media/dvb/dvb-usb/dvb-usb-dibusb-mc.ko] undefined! > ERROR: "dibusb_dib3000mc_frontend_attach" [drivers/media/dvb/dvb-usb/dvb-usb-a800.ko] undefined! > ERROR: "dibusb_dib3000mc_tuner_attach" [drivers/media/dvb/dvb-usb/dvb-usb-a800.ko] undefined Signed-off-by: Mauro Carvalho Chehab commit f6b5cf771afcc96444cab44805e5a73e42f97db2 Author: Jiri Kosina Date: Wed Dec 5 15:14:19 2007 -0300 V4L/DVB (6733): DVB: Compile 3000MC-specific DIB code only for CONFIG_DVB_DIB3000MC On Tue, 4 Dec 2007, Ingo Molnar wrote: > drivers/built-in.o: In function `dibusb_dib3000mc_tuner_attach': > : undefined reference to `dib3000mc_get_tuner_i2c_master' > drivers/built-in.o: In function `dibusb_dib3000mc_tuner_attach': > : undefined reference to `dib3000mc_set_config' Seems like -common part contains also code that is not completely common to all the modules. Signed-off-by: Jiri Kosina Tested-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 8733e29748591ce04f7cf07fc9c177f63e7df6af Author: Mauro Carvalho Chehab Date: Sat Dec 8 09:34:37 2007 -0300 V4L/DVB (6750): Fix in-kernel compilation for cxusb cxusb needs tuner-xc2028*.h files, but Makefile is not adding its patch drivers/media/dvb/dvb-usb/cxusb.c:33:26: error: tuner-xc2028.h: File not found drivers/media/dvb/dvb-usb/cxusb.c:34:32: error: tuner-xc2028-types.h: File not found Signed-off-by: Mauro Carvalho Chehab commit bc5483705ce08795ad64c3fb14aa7cee4847a2ea Author: Benoit Istin Date: Fri Dec 7 02:00:04 2007 -0300 V4L/DVB (6746): saa7134-dvb: fix tuning for WinTV HVR-1110 There are several months my hvr1110 stop working. This is very simple to fix, for my card revision at least, by setting a missing field to the hauppauge_hvr_1110_config. Signed-off-by: Benoit Istin Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0b29669c065f60501e7289e1950fa2a618962358 Author: Brandon Philips Date: Sat Dec 8 23:05:53 2007 -0300 V4L/DVB (6751): V4L: Memory leak! Fix count in videobuf-vmalloc mmap This is pretty serious bug. map->count is never initialized after the call to kmalloc making the count start at some random trash value. The end result is leaking videobufs. Also, fix up the debug statements to print unsigned values. Pushed to http://ifup.org/hg/v4l-dvb too Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 843b1378c2ab47ab1ed9cb471938e0f0ec839fcd Author: Heikki Lindholm Date: Fri Nov 30 13:27:26 2007 -0300 V4L/DVB (6690): saa7134: fix ignored interrupts The saa7134 video driver starts dropping frames when used together with the saa7134-alsa driver. Frames are dropped because when an audio event is waiting the driver simply ignores the interrupt and passes it on to the saa7134-alsa interrupt handler. The alsa interrupt handler in turn acknowledges all types of events thus clearing the pending video events as well. Fix by only masking out the audio event in the video interrupt handler and by only acknowledging the audio event in the alsa driver. Signed-off-by: Heikki Lindholm Signed-off-by: Mauro Carvalho Chehab commit 4aa504a89a140f482ddabb45460e0005bf3e522a Author: Hermann Pitton Date: Wed Nov 28 21:50:26 2007 -0300 V4L/DVB (6686): saa7134: fix composite over s-video input on the Tevion MD 9717 The vmux for composite over s-video input was wrong. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit b730a81c51adc8e87ae3b055fc211af7d5472df2 Author: Richard Knutsson Date: Tue Nov 27 06:59:37 2007 -0300 V4L/DVB (6684): Complement va_start() with va_end() + style fixes Complement va_start() with va_end() + minor style fixes in the same function. Signed-off-by: Richard Knutsson Signed-off-by: Mauro Carvalho Chehab commit 174eb8e8cb1ec97904ddeaae54366a03789162ef Author: Heikki Lindholm Date: Fri Nov 23 18:59:18 2007 -0300 V4L/DVB (6666): saa7134-alsa: fix period handling The period handling in saa7134-alsa is broken in two ways. First, the minimum number of periods of two does not work, because the dma is setup two periods ahead in the irq handler. Fix the minimum to four periods. Second, the code assumes that the number of periods is divisible by two, which isn't always the case on ALSA. Fix by adding a constraint. Signed-off-by: Heikki Lindholm Signed-off-by: Mauro Carvalho Chehab commit 78f3b0b672c79df9ffa55399a7d6fc4b173e9b4b Author: Chris Pascoe Date: Mon Nov 19 03:47:07 2007 -0300 V4L/DVB (6629): zl10353: fix default adc_clock and TRL nominal rate calculation The default adc_clock for the zl10353 is different from what was originally thought to be the case and the TRL nominal rate formula was incorrect as a result. Use a better (and hopefully now correct) formula. Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit 820eacd84cff23b76693f4be1e28feb672f4488f Author: Brandon Philips Date: Mon Nov 19 15:10:48 2007 -0300 V4L/DVB (6615): V4L: Fix VIDIOCGMBUF locking in saa7146 Fallout from videobuf_mmap_setup() locking fixes. Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 053fcb6014eef31c2674d344c704118e0ac229ef Author: Brandon Philips Date: Tue Nov 13 20:11:26 2007 -0300 V4L/DVB (6602): V4L: Convert videobuf drivers to videobuf_stop Drivers were using cookie cutter code for stopping the read/stream. Use the new videobuf_stop function which is lock safe. Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 19bc5133dae9562e8824ef101464061f9854c1d8 Author: Brandon Philips Date: Tue Nov 13 20:05:38 2007 -0300 V4L/DVB (6601): V4L: videobuf-core locking fixes and comments - Add comments to functions that require that caller hold q->lock - Add __videobuf_mmap_free that doesn't hold q->lock for use within videobuf - Add locking to videobuf_mmap_free - Fix linux/drivers/media/common/saa7146_video.c which was holding lock around videobuf_read_stop - Add locking to functions that operate on a queue - Add videobuf_stop to take care of stopping in both the read and stream case TODO: bttv still has an unsafe call to videobuf_queue_is_busy Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 63337dd3f5506628e4831b08e39e09d7f1407769 Author: Mauro Carvalho Chehab Date: Sat Nov 10 10:26:20 2007 -0300 V4L/DVB (6581): Fix: avoids negative vma usage count Signed-off-by: Mauro Carvalho Chehab commit 33f7771411c1f815208f6593d8fde8f9a135cea5 Author: Hartmut Hackmann Date: Thu Nov 8 08:54:53 2007 -0300 V4L/DVB (6579): Fix bug #8824: Correct support for Diseqc on tda10086 This is a modified version of a patch previously posted by Thomas Unverzagt. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit f4b8b3ae13b2246cf7e1b998f0292f3297d03d41 Author: Mauro Carvalho Chehab Date: Sat Nov 3 22:40:24 2007 -0300 V4L/DVB (6542): Fix S-video mode on tvp5150 Thanks to Markus Reichberger to point this. Signed-off-by: Mauro Carvalho Chehab commit 2b2c93ac998896db0d2b754a4fd83479bda7efde Author: Sascha Sommer Date: Sat Nov 3 16:48:01 2007 -0300 V4L/DVB (6540): em28xx: fix failing autodetection after the reboot The attached patch is required so that the autodetecion code also works after a reboot. Setting the I2C speed does not seem to be supported for em2800. Signed-off-by: Sascha Sommer Signed-off-by: Mauro Carvalho Chehab commit 8a75601035848e267baaae76b6e784cf1f899cd0 Author: Hans Verkuil Date: Tue Oct 30 04:16:35 2007 -0300 V4L/DVB (6485): ivtv: fix compile warning Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 75b8c133267053c9986a7c8db5131f0e7349e806 Author: Herbert Xu Date: Tue Dec 11 04:38:08 2007 -0800 [IPSEC]: Fix potential dst leak in xfrm_lookup If we get an error during the actual policy lookup we don't free the original dst while the caller expects us to always free the original dst in case of error. This patch fixes that. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3f03e387893ffa07a4d5dac96772f9db3221a185 Author: Pavel Emelyanov Date: Tue Dec 11 02:41:25 2007 -0800 [VLAN]: Fix potential race in vlan_cleanup_module vs vlan_ioctl_handler. The vlan module cleanup function starts with vlan_netlink_fini(); vlan_ioctl_set(NULL); The first call removes all the vlan devices and the second one closes the vlan ioctl. AFAIS there's a tiny race window between these two calls - after rtnl unregistered all the vlans, but the ioctl handler isn't set to NULL yet, user can manage to call this ioctl and create one vlan device, and that this function will later BUG_ON seeing non-emply hashes. I think, that we must first close the vlan ioctl and only after this remove all the vlans with the vlan_netlink_fini() call. Signed-off-by: Pavel Emelyanov Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit d59b54b150b3b69b721f1e161efd42ecb7619897 Author: Wang Chen Date: Tue Dec 11 02:28:03 2007 -0800 [NET]: Fix wrong comments for unregister_net* There are some return value comments for void functions. Fixed it. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit bbe42974215eb7a483c344fca50652b3b9dd1ae4 Author: Michael Chan Date: Mon Dec 10 17:18:51 2007 -0800 [BNX2]: Update version to 1.6.9. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c09c262783dcac62352293912d82b794063cefc3 Author: Michael Chan Date: Mon Dec 10 17:18:37 2007 -0800 [BNX2]: Fix RX packet rot. Packets can be left in the RX ring if the NAPI budget is reached. This is caused by storing the latest rx index at the beginning of bnx2_rx_int(). We may not process all the work up to this index if the budget is reached and so some packets in the RX ring may rot when we later check for more work using this stored rx index. The fix is to not store this latest hw index and only store the processed rx index. We use a new function bnx2_get_hw_rx_cons() to fetch the latest hw rx index. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fb0c18bd1f61086fcfac90017b59891a356cc288 Author: Michael Chan Date: Mon Dec 10 17:18:23 2007 -0800 [BNX2]: Add PHY_DIS_EARLY_DAC workaround. 5709 Ax and Bx chips all need this workaround. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9b3efc0133a807070dbd21254102995b65969965 Author: Julia Lawall Date: Mon Dec 10 17:17:37 2007 -0800 [S390]: Fix use of skb after netif_rx Recently, Wang Chen submitted a patch (d30f53aeb31d453a5230f526bea592af07944564) to move a call to netif_rx(skb) after a subsequent reference to skb, because netif_rx may call kfree_skb on its argument. netif_rx_ni calls netif_rx, so the same problem occurs in the files below. I have left the updating of dev->last_rx after the calls to netif_rx_ni because it seems time dependent, but moved the other field updates before. This was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) // @@ expression skb, e,e1; @@ ( netif_rx(skb); | netif_rx_ni(skb); ) ... when != skb = e ( skb = e1 | * skb ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 299f590f26da9764f20e905879f0090552ff2e86 Author: Julia Lawall Date: Mon Dec 10 17:16:56 2007 -0800 [XTENSA]: Fix use of skb after netif_rx Recently, Wang Chen submitted a patch (d30f53aeb31d453a5230f526bea592af07944564) to move a call to netif_rx(skb) after a subsequent reference to skb, because netif_rx may call kfree_skb on its argument. The same problem occurs in some other drivers as well. This was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) // @@ expression skb, e,e1; @@ ( netif_rx(skb); | netif_rx_ni(skb); ) ... when != skb = e ( skb = e1 | * skb ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 505a41d43c24345f3fa77ddab152d1f82dd8264d Author: Julia Lawall Date: Mon Dec 10 17:14:46 2007 -0800 [UM]: Fix use of skb after netif_rx Recently, Wang Chen submitted a patch (d30f53aeb31d453a5230f526bea592af07944564) to move a call to netif_rx(skb) after a subsequent reference to skb, because netif_rx may call kfree_skb on its argument. The same problem occurs in some other drivers as well. This was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) // @@ expression skb, e,e1; @@ ( netif_rx(skb); | netif_rx_ni(skb); ) ... when != skb = e ( skb = e1 | * skb ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 95a02cfd4d33886c166d4a5f309120f8d32ced58 Author: Thomas Graf Date: Mon Dec 10 16:53:29 2007 -0800 [IPv6] ESP: Discard dummy packets introduced in rfc4303 RFC4303 introduces dummy packets with a nexthdr value of 59 to implement traffic confidentiality. Such packets need to be dropped silently and the payload may not be attempted to be parsed as it consists of random chunk. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2017a72c070033830b460d31cd4703f9d2ec0d56 Author: Thomas Graf Date: Mon Dec 10 16:53:05 2007 -0800 [IPv4] ESP: Discard dummy packets introduced in rfc4303 RFC4303 introduces dummy packets with a nexthdr value of 59 to implement traffic confidentiality. Such packets need to be dropped silently and the payload may not be attempted to be parsed as it consists of random chunk. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a4e65d36a959005f14142535b58c44cd0f1de8cb Author: Pavel Emelyanov Date: Fri Dec 7 23:55:43 2007 -0800 [IPV4]: Swap the ifa allocation with the"ipv4_devconf_setall" call According to Herbert, the ipv4_devconf_setall should be called only when the ifa is added to the device. However, failed ifa allocation may bring things into inconsistent state. Move the call to ipv4_devconf_setall after the ifa allocation. Fits both net-2.6 (with offsets) and net-2.6.25 (cleanly). Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 1df2e44560c0d72f381126e52a3ba53614c1c484 Author: YOSHIFUJI Hideaki Date: Fri Dec 7 23:50:40 2007 -0800 [IPV6] XFRM: Fix auditing rt6i_flags; use RTF_xxx flags instead of RTCF_xxx. RTCF_xxx flags, defined in include/linux/in_route.h) are available for IPv4 route (rtable) entries only. Use RTF_xxx flags instead, defined in include/linux/ipv6_route.h, for IPv6 route entries (rt6_info). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 1265edb8fd2869d17128f1d60683dd6f4191d550 Merge: 94545ba... 03d14a5... Author: Russell King Date: Sat Dec 8 14:41:29 2007 +0000 Merge branch 'pxa-fixes' commit 03d14a5536cf5611d27a106137a814c8f1135ddd Author: Michael Brunner Date: Tue Dec 4 21:39:20 2007 +0100 [ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code Fix CKEN register corruption in the PXA27x cold reset code located in sound/arm/pxa27x-ac97.c. The problem has been introduced with a pxa_set_cken() function change in linux 2.6.23. This patch is based on patch 4527/1 that fixes the same problem in the ASoC PXA-AC97 driver. Additionally a definition for the CKEN index value is added and applied to both PXA AC97 drivers. Signed-off-by: Michael Brunner Signed-off-by: Russell King commit a0113a99cc3cd1a63153d11b7fcf9c1a2000df57 Author: Mike Rapoport Date: Sun Nov 25 08:55:34 2007 +0100 [ARM] 4667/1: CM-X270 fixes Change printk to dev_dbg in ITE 8152 driver and remove printk in ITE 8152 ISR. Move PCI intialization from ->scan to ->preinit method Signed-off-by: Mike Rapoport Signed-off-by: Russell King commit ad40e68bf5c54831cd6b2199fd24d616bac179f7 Author: Andrey Borzenkov Date: Sat Nov 10 20:02:49 2007 +0300 ACPI: battery: fix ACPI battery technology reporting At least some systems report technology information with trailing spaces: {pts/1}% cat -E /var/tmp/bat/2.6.23 | grep type battery type: Li-ION $ Use strncasecmp to compare model string to skip trailing part Signed-off-by: Andrey Borzenkov Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown commit c4c283357d865aad1f124c069f5f6e3f39e76790 Author: Gilles Gigan Date: Wed Oct 31 16:31:42 2007 +1000 [WATCHDOG] add Nano 7240 driver Adds support for the built-in watchdog on EPIC Nano 7240 boards from IEI. Tested on Nano-7240RS. Hardware documentation of the platform (including watchdog) can be found on the IEI website: http://www.ieiworld.com Signed-off-by: Gilles Gigan Signed-off-by: Wim Van Sebroeck commit 783e6bcde4e6a7c849fa5fa7f35b0fba721ac5f4 Author: Corey Minyard Date: Tue Nov 20 12:14:46 2007 -0800 [WATCHDOG] ipmi: add the standard watchdog timeout ioctls Add the standard IOCTLs to the IPMI driver for setting and getting the pretimeout. Tested by Benoit Guillon. Signed off by: Corey Minyard Cc: Benoit Guillon Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 6ce7641b879e4b9ead46e14275d9d3645b47fa63 Author: Gary Hade Date: Tue Nov 20 12:19:12 2007 -0800 ACPI: acpiphp: Remove dmesg spam on device remove In cases where acpi_pci_bind() does not attach device data, acpi_pci_unbind() complains via an ACPI exception about the missing data when the device is removed. For example, acpi_pci_bind() does not attach data for non-existent device functions so when the device is removed using the ACPI PCI hotplug driver 'acpiphp' an ACPI exception is logged for every non-existent function. This patch avoids the confusing log messages by removing the unnecessary ACPI exception. Signed-off-by: Gary Hade Signed-off-by: Len Brown commit 38ff6fd2fa4959925cf217ccaebea90fabd8ce04 Author: Jorge Boncompte [DTI2] Date: Mon Nov 19 15:09:21 2007 +0100 [WATCHDOG] IT8212F watchdog driver This patch adds support for the ITE Tech Inc. IT8712F EC-LPC Super I/O chipset found on many Pentium III and AMD motherboards. Developed using code from other watchdog drivers and the datasheet on ITE Tech homepage. Signed-off-by: Jorge Boncompte Signed-off-by: Wim Van Sebroeck commit 6027f661f8da653f084df80f4aade21359bcea35 Author: Jiri Slaby Date: Sat Nov 10 04:32:45 2007 +0100 [WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED cpwatchdog, remove SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED is deprecated, use __SPIN_LOCK_UNLOCKED with an unique name instead Signed-off-by: Jiri Slaby Cc: "David S. Miller" Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit bf6350a3dfcbd0a0811d7c210beacb66e90eca47 Author: Jiri Slaby Date: Sat Nov 10 05:58:44 2007 +0100 [WATCHDOG] bfin_wdt, remove SPIN_LOCK_UNLOCKED bfin_wdt, remove SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED is deprecated, use DEFINE_SPINLOCK instead Signed-off-by: Jiri Slaby Acked-by: Mike Frysinger Cc: Bryan Wu Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 3ff6eb4a2fe5757cbe7c5d57c8eb60ab0775f2f0 Author: Samuel Tardieu Date: Sun Nov 4 20:20:23 2007 +0100 [WATCHDOG] Stop looking for device as soon as one is found If no address is given for the W83697HF/HG watchdog IO port, stop looping through possible locations when a watchdog device has been found. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit bb133450ee95746a9387f12de8bd738e79c21433 Author: Hans-Christian Egtvedt Date: Tue Oct 30 14:56:20 2007 +0100 [WATCHDOG] at32ap700x_wdt: add support for boot status and add fix for silicon errata This patch enables the watchdog to read out the reset cause after a boot and provide this to the user. The driver will now also return -EIO if probed when booting from a watchdog reset. This is due to a silicon errata in the AT32AP700x devices. Detailed description and work-arounds can be found in the errata section of the datasheet avilable from http://www.atmel.com/dyn/products/datasheets.asp?family_id=682 Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton