commit 7986824e4e31d6c66f39d2f11ab93fcfed21f593 tree 9ba2ea3d2a4a256e849697a7d757f8b544f4a016 parent d423421cb3e924cf68da231a732c3250c80afa4e parent c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131 author Linus Torvalds Tue, 07 Mar 2006 18:04:54 -0800 committer Linus Torvalds Tue, 07 Mar 2006 18:04:54 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] ip22zilog: Fix oops on runlevel change with serial console [SERIAL] Fix two bugs in parport_serial commit d423421cb3e924cf68da231a732c3250c80afa4e tree 5b4cd07bd86bb3b2a4e249658a50146c867327f8 parent 850a9a4e3c019ce67e3bc29c810ac213ec4c169e parent 744bfe4c25716a7cfc5690aeab8d572b43d7c916 author Linus Torvalds Tue, 07 Mar 2006 18:02:16 -0800 committer Linus Torvalds Tue, 07 Mar 2006 18:02:16 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3353/1: NAS100d: protect nas100d_power_exit() with machine_is_nas100d() [ARM] 3352/1: DSB required for the completion of a TLB maintenance operation commit 850a9a4e3c019ce67e3bc29c810ac213ec4c169e tree e5ecac1ef9c88cdfabea26de440158b526afbe8a parent d0b004840bd3b5ff2f2a0ad14fa0bd43349f5175 author Thomas Graf Tue, 07 Mar 2006 14:56:12 -0800 committer David S. Miller Tue, 07 Mar 2006 14:56:12 -0800 [NETFILTER] ip_queue: Fix wrong skb->len == nlmsg_len assumption The size of the skb carrying the netlink message is not equivalent to the length of the actual netlink message due to padding. ip_queue matches the length of the payload against the original packet size to determine if packet mangling is desired, due to the above wrong assumption arbitary packets may not be mangled depening on their original size. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 744bfe4c25716a7cfc5690aeab8d572b43d7c916 tree 3adae1ee63e4e6283779f789f8de85d1abb6acf2 parent 6a0e243069b09a323255f6e847c87d531961cd96 author Alessandro Zummo Tue, 07 Mar 2006 22:48:29 +0000 committer Russell King Tue, 07 Mar 2006 22:48:29 +0000 [ARM] 3353/1: NAS100d: protect nas100d_power_exit() with machine_is_nas100d() Patch from Alessandro Zummo nas100d_power_exit(void) gets some protection to avoid freeing an irq when it is not appropriate to do so. Signed-off-by: Rod Whitby Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131 tree f47e0db834719e1347a8779483bb06cb848f6243 parent 7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87 author Martin Michlmayr Tue, 07 Mar 2006 21:04:59 +0000 committer Russell King Tue, 07 Mar 2006 21:04:59 +0000 [SERIAL] ip22zilog: Fix oops on runlevel change with serial console Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer. This has been fixed in the sunsab and sunzilog serial drivers in October 2005. Update the ip22zilog, which is based on sunzilog, accordingly. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King Tue, 07 Mar 2006 10:29:54 -0800 committer Linus Torvalds Tue, 07 Mar 2006 10:29:54 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TG3]: Add DMA address workaround commit d19e9974084b4024abcfcfc9d8676c90d26994bb tree 4f97c70129e74730a57cc7988877b2243e1d3a93 parent d11d9b2dd2c43dd99a491df8a83ae28401db0044 author Linus Torvalds Tue, 07 Mar 2006 09:16:35 -0800 committer Linus Torvalds Tue, 07 Mar 2006 09:16:35 -0800 Simplify fifo_open() locking logic We don't do interruptible waits for the pipe mutex anywhere else any more either, so don't do it in fifo_open() either. Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 6a0e243069b09a323255f6e847c87d531961cd96 tree 575a7194c86b2b3e1b9db30e283a2f5705e89e99 parent d11d9b2dd2c43dd99a491df8a83ae28401db0044 author Catalin Marinas Tue, 07 Mar 2006 14:42:27 +0000 committer Russell King Tue, 07 Mar 2006 14:42:27 +0000 [ARM] 3352/1: DSB required for the completion of a TLB maintenance operation Patch from Catalin Marinas Chapter B2.7.3 in the latest ARM ARM (with v6 information) states that the completion of a TLB maintenance operation is only guaranteed by the execution of a DSB (Data Syncronization Barrier, formerly Data Write Barrier or Drain Write Buffer). Note that a DSB is only needed in the flush_tlb_kernel_* functions since the completion is guaranteed by a mode change (i.e. switching back to user mode) for the flush_tlb_user_* functions. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 72f2afb8a6858edd9335cd158eb21053a0c2c39a tree 1cc6884bf4e48822423d23d68d7b2699cd2e68fd parent d11d9b2dd2c43dd99a491df8a83ae28401db0044 author Michael Chan Mon, 06 Mar 2006 19:28:35 -0800 committer David S. Miller Mon, 06 Mar 2006 19:28:35 -0800 [TG3]: Add DMA address workaround Add DMA workaround for chips that do not support full 64-bit DMA addresses. 5714, 5715, and 5780 chips only support DMA addresses less than 40 bits. On 64-bit systems with IOMMU, set the dma_mask to 40-bit so that pci_map_xxx() calls will map the DMA address below 40 bits if necessary. On 64-bit systems without IOMMU, set the dma_mask to 64-bit and check for DMA addresses exceeding the limit in tg3_start_xmit(). 5788 only supports 32-bit DMA so need to set the mask appropriately also. Thanks to Chris Elmquist at SGI for reporting and helping to debug the problem on 5714. Thanks to David Miller for explaining the HIGHMEM and DMA stuff. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d11d9b2dd2c43dd99a491df8a83ae28401db0044 tree 553c220602ee9769b01e2c0343b463c185d097b6 parent 15730ddbf745fbda9001b8bbd71977ac66bf5f41 parent 1285b3a0b0aa2391ac6f6939e6737203c8220f68 author Linus Torvalds Mon, 06 Mar 2006 18:47:07 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:47:07 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/srp: Don't send task management commands after target removal commit 15730ddbf745fbda9001b8bbd71977ac66bf5f41 tree 37860475502b1ecef34cd98900cc8af3aac6952b parent de1d9c033f32ce39bf60e25be3b8624225fa9181 author Cornelia Huck Mon, 06 Mar 2006 15:43:02 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] s390: improve response code handling in chsc_enable_facility() Rather than checking for some known failures, check positively for the success response code 0x0001 and return -EIO for unrecognized failure response codes. Signed-off-by: Cornelia Huck Cc: Greg Smith Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de1d9c033f32ce39bf60e25be3b8624225fa9181 tree b4aa8fd8dc687db7eb98781089b94f15d830ecc7 parent cdd440fe9f2e83b1e268148647126440799b71fc author Bastian Blank Mon, 06 Mar 2006 15:43:00 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] s390: fix match in ccw modalias Fix matching of devmodel in modaliases. It breaks automatic loading of any dasd module. Cc: Heiko Carstens Cc: Martin Schwidefsky Acked-by: Cornelia Huck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdd440fe9f2e83b1e268148647126440799b71fc tree f942ff7b2a2c6af80c5bd0ac05f6907f07fbe654 parent ad820c5dd47dff9397ef1e94388bc6577983f68b author Benjamin Herrenschmidt Mon, 06 Mar 2006 15:42:59 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] windfarm license fix The Windfarm PID module lacks a licence, it should be GPL, here it is Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad820c5dd47dff9397ef1e94388bc6577983f68b tree 37c5386889669dd12899d28d2a38a25d1d9bcea2 parent 5ddfae16bddb12104fff63c36fb5901f1a3729fc author Nick Piggin Mon, 06 Mar 2006 15:42:58 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] smaps: shared fix The point of the smaps "shared" is to count the number of pages that are mapped by more than one process, according to Mauricio Lin. However, smaps uses page_count for this, so it will return a false positive for every page that is mapped by just that one process, which is also in pagecache or swapcache. There are false positive situations for anonymous pages not in swapcache as well: - page reclaim, migration - get_user_pages (eg. direct-io, ptrace) Use page_mapcount instead, to count the number of mappings to the page. Use vm_normal_page so that weird things like /dev/mem aren't counted either. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ddfae16bddb12104fff63c36fb5901f1a3729fc tree 70efe36cb2e33c57108916137c8f916692b30dc8 parent ecbd3a632c8198744655b769c5c2b5a1455c1fba author Nick Piggin Mon, 06 Mar 2006 15:42:57 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] smaps: hugepages fix smaps doesn't have a hugepage pagetable walker. Skip walking hugepage vmas. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecbd3a632c8198744655b769c5c2b5a1455c1fba tree 95e68beb43315ecdcdd1a57393ef76f2779f3ba2 parent e8c3b5a6faf50b426cd8d06912a52e24837a73ad author Peter Staubach Mon, 06 Mar 2006 15:42:56 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] ramfs needs to update directory m/ctime on symlink ramfs neglects to update the directory mtime and ctime fields when creating a new symbolic link. Ramfs was modified in 2.6.15 to update these fields when other types of entries are created. The symlink support is separate from that other support, so that change did not cover quite all of the possibilities. All of the directory content manipulation entry points now seem to be covered with respect to these time field updates. Signed-off-by: Peter Staubach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8c3b5a6faf50b426cd8d06912a52e24837a73ad tree f451afcabdb67cf19f5590d6265b23c2dea918d4 parent 397874dfe9862b494e1fdcd2baef4ac432d224c8 author Edgar Hucek Mon, 06 Mar 2006 15:42:54 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] EFI: Fix gdt load This patch makes the kernel bootable again on ia32 EFI systems. Signed-off-by: Edgar Hucek Cc: Matt Domsch Cc: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 397874dfe9862b494e1fdcd2baef4ac432d224c8 tree a6eff78eb0f3ba641e3c57f24fb8071cb295212c parent 2fbf182ed00a71c35e53329c2010df2baf8a89c6 author Christoph Lameter Mon, 06 Mar 2006 15:42:53 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:45 -0800 [PATCH] numa_maps update Change the format of numa_maps to be more compact and contain additional information that is useful for managing and troubleshooting memory on a NUMA system. Numa_maps can now also support huge pages. Fixes: 1. More compact format. Only display fields if they contain additional information. 2. Always display information for all vmas. The old numa_maps did not display vma with no mapped entries. This was a bit confusing because page migration removes ptes for file backed vmas. After page migration a part of the vmas vanished. 3. Rename maxref to maxmap. This is the maximum mapcount of all the pages in a vma and may be used as an indicator as to how many processes may be using a certain vma. 4. Include the ability to scan over huge page vmas. New items shown: dirty Number of pages in a vma that have either the dirty bit set in the page_struct or in the pte. file= The file backing the pages if any stack Stack area heap Heap area huge Huge page area. The number of pages shows is the number of huge pages not the regular sized pages. swapcache Number of pages with swap references. Must be >0 in order to be shown. active Number of active pages. Only displayed if different from the number of pages mapped. writeback Number of pages under writeback. Only displayed if >0. Sample ouput of a process using huge pages: 00000000 default 2000000000000000 default file=/lib/ld-2.3.90.so mapped=13 mapmax=30 N0=13 2000000000044000 default file=/lib/ld-2.3.90.so anon=2 dirty=2 swapcache=2 N2=2 2000000000064000 default file=/lib/librt-2.3.90.so mapped=2 active=1 N1=1 N3=1 2000000000074000 default file=/lib/librt-2.3.90.so 2000000000080000 default file=/lib/librt-2.3.90.so anon=1 swapcache=1 N2=1 2000000000084000 default 2000000000088000 default file=/lib/libc-2.3.90.so mapped=52 mapmax=32 active=48 N0=52 20000000002bc000 default file=/lib/libc-2.3.90.so 20000000002c8000 default file=/lib/libc-2.3.90.so anon=3 dirty=2 swapcache=3 active=2 N1=1 N2=2 20000000002d4000 default anon=1 swapcache=1 N1=1 20000000002d8000 default file=/lib/libpthread-2.3.90.so mapped=8 mapmax=3 active=7 N2=2 N3=6 20000000002fc000 default file=/lib/libpthread-2.3.90.so 2000000000308000 default file=/lib/libpthread-2.3.90.so anon=1 dirty=1 swapcache=1 N1=1 200000000030c000 default anon=1 dirty=1 swapcache=1 N1=1 2000000000320000 default anon=1 dirty=1 N1=1 200000000071c000 default 2000000000720000 default anon=2 dirty=2 swapcache=1 N1=1 N2=1 2000000000f1c000 default 2000000000f20000 default anon=2 dirty=2 swapcache=1 active=1 N2=1 N3=1 200000000171c000 default 2000000001720000 default anon=1 dirty=1 swapcache=1 N1=1 2000000001b20000 default 2000000001b38000 default file=/lib/libgcc_s.so.1 mapped=2 N1=2 2000000001b48000 default file=/lib/libgcc_s.so.1 2000000001b54000 default file=/lib/libgcc_s.so.1 anon=1 dirty=1 active=0 N1=1 2000000001b58000 default file=/lib/libunwind.so.7.0.0 mapped=2 active=1 N1=2 2000000001b74000 default file=/lib/libunwind.so.7.0.0 2000000001b80000 default file=/lib/libunwind.so.7.0.0 2000000001b84000 default 4000000000000000 default file=/media/huge/test9 mapped=1 N1=1 6000000000000000 default file=/media/huge/test9 anon=1 dirty=1 active=0 N1=1 6000000000004000 default heap 607fffff7fffc000 default anon=1 dirty=1 swapcache=1 N2=1 607fffffff06c000 default stack anon=1 dirty=1 active=0 N1=1 8000000060000000 default file=/mnt/huge/test0 huge dirty=3 N1=3 8000000090000000 default file=/mnt/huge/test1 huge dirty=3 N0=1 N2=2 80000000c0000000 default file=/mnt/huge/test2 huge dirty=3 N1=1 N3=2 Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2fbf182ed00a71c35e53329c2010df2baf8a89c6 tree 5b66a27b68a28b3b9f7e308519cc72315e69f4e7 parent 5aee405c662ca644980c184774277fc6d0769a84 author Takashi Iwai Mon, 06 Mar 2006 15:42:51 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] alsa: fix error paths in snd_ctl_elem_add() Fix bugs in error paths of snd_ctl_elem_add() - NULL reference - double free (already freed in snd_ctl_add()) Signed-off-by: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5aee405c662ca644980c184774277fc6d0769a84 tree e8a74f57b4866e2ab0f6adac5dec174e8dbf17c0 parent a615fa83959896f8eac76c235953fb164cd1a9b9 author Atsushi Nemoto Mon, 06 Mar 2006 15:42:51 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] time: add barrier after updating jiffies_64 Add a compiler barrier so that we don't read jiffies before updating jiffies_64. Signed-off-by: Atsushi Nemoto Cc: Ralf Baechle Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a615fa83959896f8eac76c235953fb164cd1a9b9 tree 535fa704cbb621ce8b7776e131678ab3bff92d02 parent 78679302fe428f4f3dc853a51ee24f306010d874 author Jack Steiner Mon, 06 Mar 2006 15:42:50 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] Increase max kmalloc size for very large systems Systems with extemely large numbers of nodes or cpus need to kmalloc structures larger than is currently supported. This patch increases the maximum supported size for very large systems. This patch should have no effect on current systems. (akpm: why not just use alloc_pages() for sysfs_cpus?) Signed-off-by: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78679302fe428f4f3dc853a51ee24f306010d874 tree 0199651add3645053c523e6aab08a0991582965f parent 47f3fc94cf39c08b1ed29e00e0f8ff6c9095fa12 author KAMEZAWA Hiroyuki Mon, 06 Mar 2006 15:42:49 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] memory-hotplug compile fix include/linux/memory_hotplug.h:53: warning: 'struct page' declared inside parameter list (akpm: I tossed in a couple more possibly-needed-sometime struct decls too) Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47f3fc94cf39c08b1ed29e00e0f8ff6c9095fa12 tree f258db3bef15ea58f51e1664715e4a170dcd4333 parent 5c8338904653365bfb92385b38915becb903d8bb author Adrian Bunk Mon, 06 Mar 2006 15:42:47 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] add missing pm_power_off's Add the missing pm_power_off's for the h8300, v850 and xtensa architectures. Signed-off-by: Adrian Bunk Cc: Yoshinori Sato Cc: Miles Bader Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c8338904653365bfb92385b38915becb903d8bb tree 9155246abe2529b1dc5660af8e6f886556dc1b08 parent 69239749e1ac4f3496906aa4267cb9f61ce52c9c author Jan Blunck Mon, 06 Mar 2006 15:42:46 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] s390: fix compile with VIRT_CPU_ACCOUNTING=n When CONFIG_VIRT_CPU_ACCOUNTING is not defined compiling fails with an undefined reference to account_vtime(). Signed-off-by: Jan Blunck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69239749e1ac4f3496906aa4267cb9f61ce52c9c tree c64bc2c254b7fa81b50b11c851fe5c86ecdd83c1 parent f7c09bd972b7111b8c69bf57a189571edd4d4a7d author Tony Lindgren Mon, 06 Mar 2006 15:42:45 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] fix next_timer_interrupt() for hrtimer Also from Thomas Gleixner Function next_timer_interrupt() got broken with a recent patch 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c as sys_nanosleep() was moved to hrtimer. This broke things as next_timer_interrupt() did not check hrtimer tree for next event. Function next_timer_interrupt() is needed with dyntick (CONFIG_NO_IDLE_HZ, VST) implementations, as the system can be in idle when next hrtimer event was supposed to happen. At least ARM and S390 currently use next_timer_interrupt(). Signed-off-by: Thomas Gleixner Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7c09bd972b7111b8c69bf57a189571edd4d4a7d tree bc06c2cdf607746f8c9858b9771895a02f27a0b2 parent b05121b29e8af45ccb424bf71dadc1d04bd23f03 author Atsushi Nemoto Mon, 06 Mar 2006 15:42:42 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:44 -0800 [PATCH] x86: fix potential jiffies overflow in timer_resume() i386 timer_resume is updating jiffies, not jiffies_64. It looks there is a potential overflow problem. And jiffies_64 and wall_jiffies should be protected by xtime_lock. Signed-off-by: Atsushi Nemoto Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b05121b29e8af45ccb424bf71dadc1d04bd23f03 tree 34355406f3aaf7b08fb6775f6c53c118764da69f parent 7cb9478f0d5b2424af974646dcbe10ce7c19b550 author Karsten Keil Mon, 06 Mar 2006 15:42:41 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:43 -0800 [PATCH] i4l: fix compatiblity issue with big endian systems This patch fix some compatiblity issues with big endian systems Signed-off-by: Martin Bachem Signed-off-by: Karsten Keil Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cb9478f0d5b2424af974646dcbe10ce7c19b550 tree a645f882deef35c0ebe040a9ee0bb8ce7fc6e8c2 parent 1e4b27df55166ce3b276f55bab223fa4ae8c5525 author Karsten Keil Mon, 06 Mar 2006 15:42:39 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:43 -0800 [PATCH] i4l: fix refcounting problem with ttyIx devices If the same ttyIx device was opened by two processes the module was not released and so the usage count went never to zero again. This oneliner fixes the issue. Signed-off-by: Oskar Senft Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e4b27df55166ce3b276f55bab223fa4ae8c5525 tree f73e7b8016f1ab63be67629507120012c554a848 parent ff3aea0e68bfd46120ce2d08bc1f8240fa2bd36a author Karsten Keil Mon, 06 Mar 2006 15:42:37 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:43 -0800 [PATCH] i4l: add new PCI IDs for HFC-S PCI Add new PCI IDs for HFC-S PCI based ISDN TA 'Primux II S0' and 'Primux II S0' from Gerdes AG Signed-off-by: Martin Bachem Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff3aea0e68bfd46120ce2d08bc1f8240fa2bd36a tree 6994ee69f5007218ce5b6cc1b14e372ebffc457f parent 9888e6fa7b68d9c8cc2c162a90979825ab45150a author Dave Johnson Mon, 06 Mar 2006 15:42:36 -0800 committer Linus Torvalds Mon, 06 Mar 2006 18:40:43 -0800 [PATCH] cramfs mounts provide corrupted content since 2.6.15 Fix handling of cramfs images created by util-linux containing empty regular files. Images created by cramfstools 1.x were ok. Fill out inode contents in cramfs_iget5_set() instead of get_cramfs_inode() to prevent issues if cramfs_iget5_test() is called with I_LOCK|I_NEW still set. Signed-off-by: Dave Johnson Cc: Olaf Hering Cc: Chris Mason Cc: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9888e6fa7b68d9c8cc2c162a90979825ab45150a tree 83e46fb733008fa753269d338f90ad255cc59f53 parent f716d8303345698728d9f8ce76a82a795a5be275 author Linus Torvalds Mon, 06 Mar 2006 17:44:43 -0800 committer Linus Torvalds Mon, 06 Mar 2006 17:44:43 -0800 slab: clarify and fix calculate_slab_order() If we triggered the 'offslab_limit' test, we would return with cachep->gfporder incremented once too many times. This clarifies the logic somewhat, and fixes that bug. Signed-off-by: Linus Torvalds commit f716d8303345698728d9f8ce76a82a795a5be275 tree 20004f3dc2f11b83b5debe3a784d3f105c6e4daa parent 8ba7b0a14b2ec19583bedbcdbea7f1c5008fc922 author Linus Torvalds Mon, 06 Mar 2006 17:41:44 -0800 committer Linus Torvalds Mon, 06 Mar 2006 17:41:44 -0800 Allocate 96 bytes for SCSI sense data reply The SCSI layer uses SCSI_SENSE_BUFFERSIZE (96) for the sense buffer size, even though some other code uses "sizeof(struct request_sense)" (which is 64 bytes). Allocate the buffer using the bigger of the two for safety. Signed-off-by: Linus Torvalds commit 8ba7b0a14b2ec19583bedbcdbea7f1c5008fc922 tree 5047966d39ce26f7afd96b794dd4dc6a995458a5 parent 91c0bce29e4050a59ee5fdc1192b60bbf8693a6d author Linus Torvalds Mon, 06 Mar 2006 17:38:49 -0800 committer Linus Torvalds Mon, 06 Mar 2006 17:38:49 -0800 Add early-boot-safety check to cond_resched() Just to be safe, we should not trigger a conditional reschedule during the early boot sequence. We've historically done some questionable early on, and the safety warnings in __might_sleep() are generally turned off during that period, so there might be problems lurking. This affects CONFIG_PREEMPT_VOLUNTARY, which takes over might_sleep() to cause a voluntary conditional reschedule. Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 91c0bce29e4050a59ee5fdc1192b60bbf8693a6d tree e364c095b85e9b90b0e94869065d7be5370c2d00 parent b6f57864eeacd556013c4b40917d50d7c8c38f8c author Greg Kroah-Hartman Mon, 06 Mar 2006 13:25:52 -0800 committer Linus Torvalds Mon, 06 Mar 2006 13:29:00 -0800 [PATCH] USB Serial: fix use-after-free bug in usb-serial core This fixes a use-after-free bug in the usb-serial core. It is simple to trigger this (open a usb-serial port, then yank the device out before closing the port.) Thanks to Stefan Seyfried for reporting this, and to the slab debugging code which enabled it to be tracked down. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b6f57864eeacd556013c4b40917d50d7c8c38f8c tree f06af675059a506bfb0b70489796f97f13214a2f parent 264132bc62fe071d0ff378c1103bae9d33212f10 parent 2d66806d740eeb410aa785bd7fba3bd24bb082c1 author Linus Torvalds Mon, 06 Mar 2006 12:10:42 -0800 committer Linus Torvalds Mon, 06 Mar 2006 12:10:42 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] chelsio: fix kmalloc failure in t1_espi_create Merge branch 'master' s2io: set_multicast_list bug commit 264132bc62fe071d0ff378c1103bae9d33212f10 tree 8b293d7c7465f28b4fe2788df70e25dfda2be088 parent 24ed6e2c7894350d9bc06a559d3c23338ecf3323 author Linus Torvalds Mon, 06 Mar 2006 12:10:07 -0800 committer Linus Torvalds Mon, 06 Mar 2006 12:10:07 -0800 Fix "check_slabp" printout size calculation We want to use the "struct slab" size, not the size of the pointer to same. As it is, we'd not print out the last entry pointers in the slab (where is ~10, depending on whether it's a 32-bit or 64-bit kernel). Gaah, that slab code was written by somebody who likes unreadable crud. Signed-off-by: Linus Torvalds commit 2d66806d740eeb410aa785bd7fba3bd24bb082c1 tree 7e38e871b3848253ac64166d2ddad02461e86c15 parent d033d9345101c07aa6965590109eac0bf7f25b8d author Eric Sesterhenn Sun, 05 Mar 2006 01:16:00 +0300 committer Jeff Garzik Mon, 06 Mar 2006 14:38:00 -0500 [PATCH] chelsio: fix kmalloc failure in t1_espi_create memset() is called before check. Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit d033d9345101c07aa6965590109eac0bf7f25b8d tree 280205c395791ba2316ab3940aed953f89ee7f38 parent a7a80d5ad3735554338199b9d976dfda5c10d3c7 parent 501f74f29498543c27f4f9697f5c1e980dd2de0d author Jeff Garzik Mon, 06 Mar 2006 14:37:47 -0500 committer Jeff Garzik Mon, 06 Mar 2006 14:37:47 -0500 Merge branch 'master' commit 7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87 tree 7e06a79a43ca2a5e8d57d88b80c6ac2b1e72f246 parent 501f74f29498543c27f4f9697f5c1e980dd2de0d author Russell King Sun, 05 Mar 2006 00:31:22 +0000 committer Russell King Sun, 05 Mar 2006 21:25:40 +0000 [SERIAL] Fix two bugs in parport_serial Steinar H. Gunderson reported: - For some reason, it detects the 9845 as a 9735 -- it appears this is simply related to the ordering in parport_serial_pci_tbl[]. If we move the 9845 up above the 9735, it prints out 9710:9845, but no change in behaviour. (We didn't find out why this was the case; we left it alone since it didn't affect our problem.) - The card has no parallel port (at least no physical ones), yet it reports (via its subsystem ID of 0x0014) one parallel port and four serial ports. The probe for the parallel port fails, and the driver just aborts. Thus, it doesn't find the serial ports. Fix the debugging code to use dev_dbg, but don't bother displaying the PCI ID of the detected board (that's accessible via other means.) Also, arrange for parport_register() to return 0 even if it finds no ports. Signed-off-by: Russell King commit 24ed6e2c7894350d9bc06a559d3c23338ecf3323 tree 675baee9b37bf8a1d4322153cd3259229b7431f0 parent 5b10b9a787a981259cca213c8bf1c79333c3c67e parent e77e6f3be93763ef88ccbaa9e0ebda5360d92f7c author Linus Torvalds Sun, 05 Mar 2006 10:03:05 -0800 committer Linus Torvalds Sun, 05 Mar 2006 10:03:05 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Always match oplock break (cache notification) to the right tcp commit 5b10b9a787a981259cca213c8bf1c79333c3c67e tree fd6797cb174d7dc9a01bd6fd33c9033949c4887c parent c09966608da7e8cad3468e925ac9062e44fee831 parent 4d000d5b9689734006d89fe9b7597c758b74a9fb author Linus Torvalds Sun, 05 Mar 2006 10:02:25 -0800 committer Linus Torvalds Sun, 05 Mar 2006 10:02:25 -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]: Mark __ex_table section correctly. commit 4d000d5b9689734006d89fe9b7597c758b74a9fb tree 1336c7805645b29eec0617b4554e5e0b37222123 parent 501f74f29498543c27f4f9697f5c1e980dd2de0d author David S. Miller Sat, 04 Mar 2006 23:23:56 -0800 committer David S. Miller Sat, 04 Mar 2006 23:23:56 -0800 [SPARC64]: Mark __ex_table section correctly. We must use the "a" (allocate) attribute every time we emit an entry into the __ex_table section. For consistency, use "a" instead of #alloc which is some Solaris compat cruft GNU as provides on Sparc. Signed-off-by: David S. Miller commit c09966608da7e8cad3468e925ac9062e44fee831 tree 4e3b04e3aabe5bf5106fe04913ad7b75525d7de4 parent c027f5f995d8b6efc934be384085e3e8425638e4 author Ian McDonald Fri, 03 Mar 2006 17:54:46 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:29 -0800 [DCCP] ccid3: Divide by zero fix In rare circumstances 0 is returned by dccp_li_hist_calc_i_mean which leads to a divide by zero in ccid3_hc_rx_packet_recv. Explicitly check for zero return now. Update copyright notice at same time. Found by Arnaldo. Signed-off-by: Ian McDonald Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit c027f5f995d8b6efc934be384085e3e8425638e4 tree b067b04108d7e231d465c0b5bd7625b6570c4d93 parent 0f8f325b25919619559f0f47aa46cd7dc2dbef92 author Sam Ravnborg Fri, 03 Mar 2006 17:50:37 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:27 -0800 [ATM]: [fore200e] fix section mismatch warnings Signed-off-by: Sam Ravnborg Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 0f8f325b25919619559f0f47aa46cd7dc2dbef92 tree cfe07be8eeb62e87e32a4c3510da3f11936daaf3 parent 125a12ccf3eefebff43e3dbf47225141faa5fbe8 author Chas Williams Fri, 03 Mar 2006 17:49:58 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:25 -0800 [ATM]: keep atmsvc failure messages quiet Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 125a12ccf3eefebff43e3dbf47225141faa5fbe8 tree 5d181e296bf756c271f3b748c8d3f880eb65f9ff parent d32439c0d4cec5c4101477989ee8c7ee1ebfbb0e author Stephen Hemminger Fri, 03 Mar 2006 17:16:15 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:23 -0800 [BRIDGE]: generate kobject remove event The earlier round of kobject/sysfs changes to bridge caused it not to generate a uevent on removal. Don't think any application cares (not sure about Xen) but since it generates add uevent it should generate remove as well. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d32439c0d4cec5c4101477989ee8c7ee1ebfbb0e tree c28284854f8f1aa74f60ed8378c0984fbcae747e parent 6e86b89084a60355f0e1fb876ca0cfbca62ee85c author Stephen Hemminger Fri, 03 Mar 2006 17:15:34 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:21 -0800 [BRIDGE]: port timer initialization Initialize the STP timers for a port when it is created, rather than when it is enabled. This will prevent future race conditions where timer gets started before port is enabled. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6e86b89084a60355f0e1fb876ca0cfbca62ee85c tree 076b621fad864de984661a9a15bd526bc068776b parent 501f74f29498543c27f4f9697f5c1e980dd2de0d author Stephen Hemminger Fri, 03 Mar 2006 17:14:51 -0800 committer David S. Miller Sat, 04 Mar 2006 21:06:19 -0800 [BRIDGE]: fix crash in STP Bridge would crash because of uninitailized timer if STP is used and device was inserted into a bridge before bridge was up. This got introduced when the delayed port checking was added. Fix is to not enable STP on port unless bridge is up. Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=6140 Dup: http://bugzilla.kernel.org/show_bug.cgi?id=6156 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e77e6f3be93763ef88ccbaa9e0ebda5360d92f7c tree 35260c1d1968c448af77c267814d925d3c62f475 parent 501f74f29498543c27f4f9697f5c1e980dd2de0d author Steve French Sun, 05 Mar 2006 03:39:55 +0000 committer Steve French Sun, 05 Mar 2006 03:39:55 +0000 [CIFS] Always match oplock break (cache notification) to the right tcp session when multiply mounted. Fixes slow response when cifs client is mounted to shares on multiple servers and oplock break occurs (usually due to attempt to multiply open a file). When treeids on mutiple mounted shares match and we find the wrong match first, we searched for the wrong cached files to send oplock break response for which usually meant that no matching file was found and thus the server would have to timeout the notification. Oplock break timeout is about 20 seconds on some servers so this could cause significantly slower performance on file open calls in a few cases (in particular when multiple shares are mounted from multiple servers, tree ids match, and we have a cached file which is later opened multiple times). This was the most important of the bugs that was found and fixed at Connectathon (interoperability testing event) this week. Acked-by: Shaggy (shaggy@austin.ibm.com) Signed-off-by: Steve French (sfrench@us.ibm.com) commit 501f74f29498543c27f4f9697f5c1e980dd2de0d tree a73666df60eea38aaf0ee8f9a48adef5ae30e3e7 parent ea088b8d481fcff001f7e628c44daf39a229d9fc parent 28e02bac9c943ed85a29b41ccb9bf95641b2e263 author Linus Torvalds Sat, 04 Mar 2006 18:51:45 -0800 committer Linus Torvalds Sat, 04 Mar 2006 18:51:45 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [PATCH] Add missing ifdef for VIA RNG code commit ea088b8d481fcff001f7e628c44daf39a229d9fc tree bcb75959da3303ffc705885eb6de5d5ed3378ef4 parent c05b47704570b015134522c36142cd17bd48640a parent 732b82886017e9ceccb27c8b69e9210d5305088a author Linus Torvalds Sat, 04 Mar 2006 15:30:32 -0800 committer Linus Torvalds Sat, 04 Mar 2006 15:30:32 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] au1xmmc: Fix a compilation warning ('status' is not used) [MMC] au1xmmc: Fix linking error because mmc_rsp_type doesn't exist [MMC] au1xmmc: Fix compilation error by using platform_driver commit 732b82886017e9ceccb27c8b69e9210d5305088a tree a700d0628b93c15783c0c727b7fbcc51da52e7b7 parent e142c24cf8f471c2a6cb95a4a26923d9621770ff author Martin Michlmayr Sat, 04 Mar 2006 23:02:10 +0000 committer Russell King Sat, 04 Mar 2006 23:02:10 +0000 [MMC] au1xmmc: Fix a compilation warning ('status' is not used) Fix a trivial compilation warning: CC drivers/mmc/au1xmmc.o drivers/mmc/au1xmmc.c: In function ‘au1xmmc_dma_callback’: drivers/mmc/au1xmmc.c:743: warning: unused variable ‘status’ Signed-off-by: Martin Michlmayr Acked-by: Martin Michlmayr Signed-off-by: Russell King commit e142c24cf8f471c2a6cb95a4a26923d9621770ff tree a807b2f1c9b5a9676428aba0599d3573bc198979 parent b256f9df4a7da248263ed95c2517ddb714f9ca95 author Martin Michlmayr Sat, 04 Mar 2006 23:01:39 +0000 committer Russell King Sat, 04 Mar 2006 23:01:39 +0000 [MMC] au1xmmc: Fix linking error because mmc_rsp_type doesn't exist drivers/mmc/au1xmmc.c doesn't compile because commit e92251762d02a46177d4105d1744041e3f8bc465 introduced a typo and passes the wrong argument to the mmc_resp_type macro. Error because of the typo: CC drivers/mmc/au1xmmc.o drivers/mmc/au1xmmc.c: In function ‘au1xmmc_send_command’: drivers/mmc/au1xmmc.c:197: warning: implicit declaration of function ‘mmc_rsp_type’ ... LD .tmp_vmlinux1 drivers/built-in.o: In function `au1xmmc_request':au1xmmc.c:(.text+0x89504): undefined reference to `mmc_rsp_type' :au1xmmc.c:(.text+0x8968c): undefined reference to `mmc_rsp_type' make: *** [.tmp_vmlinux1] Error 1 Error because of the wrong argument: CC drivers/mmc/au1xmmc.o drivers/mmc/au1xmmc.c: In function ‘au1xmmc_send_command’: drivers/mmc/au1xmmc.c:197: error: invalid type argument of ‘->’ Signed-off-by: Martin Michlmayr Acked-by: Jordan Crouse Signed-off-by: Russell King commit b256f9df4a7da248263ed95c2517ddb714f9ca95 tree 3f9baba126313e35fec32a8ade61c08a29bab382 parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Martin Michlmayr Sat, 04 Mar 2006 23:01:13 +0000 committer Russell King Sat, 04 Mar 2006 23:01:13 +0000 [MMC] au1xmmc: Fix compilation error by using platform_driver drivers/mmc/au1xmmc.c currently doesn't compile; it needs to be converted to use platform_driver. I cannot test this change because of lack of hardware but I followed the drivers this one is based on, and the code is certainly not worse than before. drivers/mmc/au1xmmc.c: At top level: drivers/mmc/au1xmmc.c:1002: error: ‘platform_bus_type’ undeclared here (not in a function) make[2]: *** [drivers/mmc/au1xmmc.o] Error 1 Signed-off-by: Martin Michlmayr Acked-by: Jordan Crouse Signed-off-by: Russell King commit c05b47704570b015134522c36142cd17bd48640a tree 11080365ff881392954d0f26f57dffbcbd47f984 parent 3af1efe8a301f5b1c813f5f761cb1e10d6175605 author Linus Torvalds Sat, 04 Mar 2006 15:00:45 -0800 committer Linus Torvalds Sat, 04 Mar 2006 15:00:45 -0800 ppc64: make sure to align stack pointer to 16 bytes at boot yaboot is scrogged and calls us with an invalid stack alignment, it seems. Thanks to David Woodhouse to pointing me to the problem. Signed-off-by: Linus Torvalds commit a7a80d5ad3735554338199b9d976dfda5c10d3c7 tree fb637b295a1614b919a205896612d88673c066c6 parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Jeff Garzik Sat, 04 Mar 2006 12:06:51 -0500 committer Jeff Garzik Sat, 04 Mar 2006 12:06:51 -0500 s2io: set_multicast_list bug The mac_addr variable doesn't get reset between (re)additions of multicast addresses. One byte of all multicast addresses (except the first) can be incorrect. Signed-off-by: Arthur Kepner Signed-off-by: Jeff Garzik commit 28e02bac9c943ed85a29b41ccb9bf95641b2e263 tree ca3e0206b77daf23dcae162a1349a93a6178a110 parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Mark Brown Fri, 03 Mar 2006 21:05:58 -0500 committer Jeff Garzik Fri, 03 Mar 2006 21:05:58 -0500 [PATCH] Add missing ifdef for VIA RNG code Almost all the code for the VIA RNG is guarded with __i386__ #ifdefs, the only exception being the enumeration of RNG types which is used to index into the rng_vector ops array. This patch adds an ifdef around that for consistency and since the guard makes a difference when adding new RNG types on non-i386 hardware. Signed-Off-By: Mark Brown Signed-Off-By: Jeff Garzik commit 1285b3a0b0aa2391ac6f6939e6737203c8220f68 tree b0041f55811fcda35614e6c04cb67e251d05a51f parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Roland Dreier Fri, 03 Mar 2006 15:47:25 -0800 committer Roland Dreier Fri, 03 Mar 2006 17:50:16 -0800 IB/srp: Don't send task management commands after target removal Just fail abort and reset requests that come in after we've already decided to remove a target. Signed-off-by: Roland Dreier commit 3af1efe8a301f5b1c813f5f761cb1e10d6175605 tree 3f2604369c0ea1a742a31eb29cae672b335826cc parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Jeff Mahoney Thu, 02 Mar 2006 13:25:26 -0500 committer Linus Torvalds Thu, 02 Mar 2006 10:37:59 -0800 [PATCH] reiserfs: fix unaligned bitmap usage The bitmaps associated with generation numbers for directory entries are declared as an array of ints. On some platforms, this causes alignment exceptions. The following patch uses the standard bitmap declaration macros to declare the bitmaps, fixing the problem. Originally from Takashi Iwai. Signed-off-by: Takashi Iwai Acked-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit c499ec24c31edf270e777a868ffd0daddcfe7ebd tree bf16f601b5446bb0b9fe3f90030a76ac4e25fc11 parent a57ebfdb2cf9fa60dfa2f403f70ef6c432ca2a62 author Vladimir V. Saveliev Thu, 02 Mar 2006 02:54:39 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:08 -0800 [PATCH] reiserfs: do not check if unsigned < 0 This patch fixes bugs in reiserfs where unsigned integers were checked whether they are less then 0. Signed-off-by: Vladimir V. Saveliev Cc: Neil Brown Signed-off-by: Hans Reiser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a57ebfdb2cf9fa60dfa2f403f70ef6c432ca2a62 tree 1597343f3e9c076fa37ceb2c6442cc9e3ca44656 parent 685db65e422bfa523b8a9dacb5a658b42b254f05 author Christoph Lameter Thu, 02 Mar 2006 02:54:37 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] numa_maps: Fix potential crash on non IA64 platforms numa_maps should not scan over huge vmas in order not to cause problems for non IA64 platforms that may have pte entries pointing to huge pages in a variety of ways in their page tables. Add a simple check to ignore vmas containing huge pages. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 685db65e422bfa523b8a9dacb5a658b42b254f05 tree 0d7eba52e7c9584a2e3b4f2cd1842bf55e67c2d0 parent 7f99f06f01aa9460b5a18f1b0e0900c90d0a84fc author Christoph Lameter Thu, 02 Mar 2006 02:54:35 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] time_interpolator: Use readq_relaxed() instead of readq(). On some platforms readq performs additional work to make sure I/O is done in a coherent way. This is not needed for time retrieval as done by the time interpolator. So we can use readq_relaxed instead which will improve performance. It affects sparc64 and ia64 only. Apparently it makes a significant difference on ia64. Signed-off-by: Christoph Lameter Cc: john stultz Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f99f06f01aa9460b5a18f1b0e0900c90d0a84fc tree f78c227f7a154e6ed0b2d25982d34bf21c53c734 parent 46f6dac259717551916405ee3388de89fb152bca author Stefan Seyfried Thu, 02 Mar 2006 02:54:34 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] fix acpi_video_flags on x86-64 acpi_video_flags variable is unsigned long, so it should be set as such. This actually matters on x86-64. Signed-off-by: Stefan Seyfried Signed-off-by: Pavel Machek Cc: "Brown, Len" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46f6dac259717551916405ee3388de89fb152bca tree 0e6c8b4505339e90c05ec8326220286fd19fe1f4 parent 74b8054c730785cd9db093e48f53337e521b6270 author Eric Van Hensbergen Thu, 02 Mar 2006 02:54:33 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] v9fs: simplify fid mapping v9fs has been plagued by an over-complicated approach trying to map Linux dentry semantics to Plan 9 fid semantics. Our previous approach called for aggressive flushing of the dcache resulting in several problems (including wierd cwd behavior when running /bin/pwd). This patch dramatically simplifies our handling of this fid management. Fids will not be clunked as promptly, but the new approach is more functionally correct. We now clunk un-open fids only when their dentry ref_count reaches 0 (and d_delete is called). Another simplification is we no longer seek to match fids to the process-id or uid of the action initiator. The uid-matching will need to be revisited when we fix the security model. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74b8054c730785cd9db093e48f53337e521b6270 tree d67f4d55de189d39afd82e0de3aa0edbccec4a23 parent 6a3124a3946c16159c3faf83e62ffdb5d1134b3a author Eric Van Hensbergen Thu, 02 Mar 2006 02:54:32 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] v9fs: fix bug in atomic create open fix Lucho's atomic create+open fix had a bug in the super block initialization causing all mounts to fail. He was freeing an fcall too early. This patch fixes that oversight. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a3124a3946c16159c3faf83e62ffdb5d1134b3a tree 989f1e89ed0971824db973af5347b879e12c67cd parent 77a3313551afd53c90012e5a87f7f2b2195fc67e author Latchesar Ionkov Thu, 02 Mar 2006 02:54:30 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] v9fs: fix atomic create open In order to assure atomic create+open v9fs stores the open fid produced by v9fs_vfs_create in the dentry, from where v9fs_file_open retrieves it and associates it with the open file. This patch modifies v9fs to use nameidata.intent.open values to do the atomic create+open. Signed-off-by: Latchesar Ionkov Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77a3313551afd53c90012e5a87f7f2b2195fc67e tree 996a210b97311a1af71c9c9faa71eeb8e4c69c00 parent 140ffcec4def3ee3af7565b2cf1d3b2580f7e180 author John Bowler Thu, 02 Mar 2006 02:54:29 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] "drivers/mtd/redboot.c: recognise a foreign byte sex partition table" update Sync up the recent redboot fix with MTD CVS. It uses the correct swab() functions. Cc: John Bowler Cc: David Woodhouse Cc: Thomas Gleixner Cc: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 140ffcec4def3ee3af7565b2cf1d3b2580f7e180 tree 466da398c345f5b6f2760c124beec84403b35655 parent b1e2d907cb748ef40b180184f36e594d35f12ba6 author Andrew Morton Thu, 02 Mar 2006 02:54:28 -0800 committer Linus Torvalds Thu, 02 Mar 2006 08:33:07 -0800 [PATCH] out_of_memory() locking fix I seem to have lost this read_unlock(). While we're there, let's turn that interruptible sleep unto uninterruptible, so we don't get a busywait if signal_pending(). (Again. We seem to have a habit of doing this). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e2d907cb748ef40b180184f36e594d35f12ba6 tree 19f41aef9a559869bbe7a0ef6e9773e06e657558 parent e0a5c57848f7690a247bb8af4fa412844b0b00bb parent 81f2094a631df1ba275f4d4bd7ea5bacfd8dbcfc author Linus Torvalds Wed, 01 Mar 2006 15:49:50 -0800 committer Linus Torvalds Wed, 01 Mar 2006 15:49:50 -0800 Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 commit e0a5c57848f7690a247bb8af4fa412844b0b00bb tree 3cf1fd6858cab9c030e5cd0d98d04fc0b7bd41b3 parent fe05f54181db868c5720cc4dc0741227b9ba5a60 parent b5b9d6647c1cd5eee90b58941c55f874c2a7e707 author Linus Torvalds Wed, 01 Mar 2006 15:10:45 -0800 committer Linus Torvalds Wed, 01 Mar 2006 15:10:45 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit fe05f54181db868c5720cc4dc0741227b9ba5a60 tree 922b7aaefa56cdd82f2152db57806a7a06dd6425 parent e5cef95d58d1e711b0bd6b00018278a06defb274 parent 67bc620006a30cf5dcbf409dbbd4fd93179ddfb1 author Linus Torvalds Wed, 01 Mar 2006 14:17:59 -0800 committer Linus Torvalds Wed, 01 Mar 2006 14:17:59 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 commit e5cef95d58d1e711b0bd6b00018278a06defb274 tree ce48e7db468adffe0869e03960840c9a895263bc parent 800d11420dfdad3a50630ff424d7782660ad558c author Greg KH Wed, 01 Mar 2006 13:46:00 -0800 committer Linus Torvalds Wed, 01 Mar 2006 13:53:02 -0800 [PATCH] fix build breakage in eeh.c in 2.6.16-rc5-git5 This patch should fixe a problem with eeh_add_device_late() not being defined in the ppc64 build process, causing the build to break. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 81f2094a631df1ba275f4d4bd7ea5bacfd8dbcfc tree 20efc0b486ec9cb260d22dd09f02de13c0e71eb1 parent b7668c72d2ae004363fb0588600bfa942e1b245c author Mark Fasheh Tue, 28 Feb 2006 17:31:22 -0800 committer Mark Fasheh Wed, 01 Mar 2006 12:18:16 -0800 [PATCH] ocfs2: use hlists for lockres hash Switch from list_head to hlist_head. Make the size of the hash dependent upon the allocated area, rather than a constant. Signed-off-by: Mark Fasheh commit b7668c72d2ae004363fb0588600bfa942e1b245c tree f35be6a2fa11afc4e7b2f2c295a8bf6fbf07cc9e parent 110ba90858a7f619ff26c6b9b43c27b3c0872335 author Sunil Mushran Tue, 28 Feb 2006 23:28:01 -0800 committer Mark Fasheh Wed, 01 Mar 2006 12:17:04 -0800 [PATCH] ocfs2: added source addr to bind() in o2net_start_connect() to prevent confusion when a virtual ip is created on the same interface Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 110ba90858a7f619ff26c6b9b43c27b3c0872335 tree 2a28b91a66b7570b576a581f50e512f3f316a8af parent 93cc9ac4555a9b95c78b2f5dfe536fe8196002a7 author Joel Becker Tue, 28 Feb 2006 17:58:36 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:44:50 -0800 ocfs2: Respond to on-disk corruption in the extent map code. The extent map code has long noticed when the on-disk extent information is corrupt. However, so far it has only returned an error. We should take the filesystem read-only, as it is corrupt. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 93cc9ac4555a9b95c78b2f5dfe536fe8196002a7 tree 98777dd8c52bfe5c88a12a3f20f0470e2eeb7de7 parent b4df6ed8db0c387d38292e31f00adc4cd297ed5a author Joel Becker Mon, 27 Feb 2006 16:53:05 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:43:20 -0800 ocfs2: Set .owner on masklog sysfs attributes. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit b4df6ed8db0c387d38292e31f00adc4cd297ed5a tree d7dcaeecfa55b3fd9d6c4844d90e07759182f845 parent 895928b8380cc697ac56e9732cedf549c0a4f79c author Mark Fasheh Wed, 22 Feb 2006 17:35:08 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:32:41 -0800 [PATCH] ocfs2: fix orphan recovery deadlock Orphan dir recovery can deadlock with another process in ocfs2_delete_inode() in some corner cases. Fix this by tracking recovery state more closely and allowing it to handle inode wipes which might deadlock. Signed-off-by: Mark Fasheh commit 895928b8380cc697ac56e9732cedf549c0a4f79c tree 472589e737ff7c3221fee149d7ef4bb11e823a90 parent 362342f68e331f080d0438f08af1e2c570b0b5fe author Jeff Mahoney Tue, 21 Feb 2006 16:54:00 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:29:30 -0800 [PATCH] ocfs2: complete failure recovery for nodemanager init This patch finishes cleaning up the node manager allocations if it fails to initialize. Signed-off-by: Jeff Mahoney Signed-off-by: Mark Fasheh commit 800d11420dfdad3a50630ff424d7782660ad558c tree f13cd691d6f36eb4fbe50f97b9a5ea2156ccfa6c parent 71efa38c0eef581c69c221ceb8645f61d1e93270 author Atsushi Nemoto Wed, 01 Mar 2006 15:16:26 +0900 committer Ralf Baechle Wed, 01 Mar 2006 19:22:22 +0000 [MIPS] Use USECS_PER_SEC / HZ instead of tick_usec in do_gettimeofday. The 'tick_usec' is USER_HZ period in usec. do_gettimeofday() should use kernel HZ value. Here is a patch for MIPS. It seems m32r, m68k and sparc have same problem though their HZ and USER_HZ are same for now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 362342f68e331f080d0438f08af1e2c570b0b5fe tree 18f4a30bbe5af6b716561b1dd08eca4285f5e8d4 parent d267a56c883b350a2fa80f1daf4636809e3f8e67 author Mark Fasheh Tue, 21 Feb 2006 16:46:33 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:19:47 -0800 [PATCH] ocfs2: remove non existing function prototypes Remove some prototypes from tcp.h for functions which have long been gone. Signed-off-by: Mark Fasheh commit d267a56c883b350a2fa80f1daf4636809e3f8e67 tree 85ffceda2a1cdea2ebe957c9026966301729a58c parent d3178bcdd41b050e221337d7f5e30b3c58d4015a author Mark Fasheh Thu, 23 Feb 2006 13:23:39 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:18:22 -0800 [PATCH] ocfs2: remove unused code Remove some #ifdef'd out code which was inadvertantly introduced in our initial merge. Signed-off-by: Mark Fasheh commit d3178bcdd41b050e221337d7f5e30b3c58d4015a tree cf1ef81b009423e5481d1e54b183873248d57285 parent 6b7a6c94c9c15b2664b568ead83e6b3aaf60d65c author Mark Fasheh Fri, 24 Feb 2006 17:23:36 -0800 committer Mark Fasheh Wed, 01 Mar 2006 11:16:58 -0800 [PATCH] ocfs2: remove pointless max journal size limit Signed-off-by: Mark Fasheh commit 6b7a6c94c9c15b2664b568ead83e6b3aaf60d65c tree 4df54f212e9fce05125929f6da25f1661f0d2246 parent 96789ac4b3943fec27fb6bf2713633b01a3903ad author Jeff Mahoney Tue, 21 Feb 2006 11:57:30 -0500 committer Mark Fasheh Wed, 01 Mar 2006 11:15:49 -0800 [PATCH] ocfs2: fix -Wformat warnings when building UML on x86-64 The check to determine which format string is appopriate for u64 and friends works in most cases, but UML on x86_64 doesn't define CONFIG_X86_64, so it results in screen fulls of compile-time warnings. This patch fixes it to handle that case. fs/ocfs2/cluster/masklog.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Mahoney Signed-off-by: Mark Fasheh commit 71efa38c0eef581c69c221ceb8645f61d1e93270 tree 456c1894e26fb3aa362fc8e1fd8382160dfcb344 parent 96789ac4b3943fec27fb6bf2713633b01a3903ad parent e2482fa16e9eef88344a4dca1a390d29432d4add author Linus Torvalds Wed, 01 Mar 2006 10:22:04 -0800 committer Linus Torvalds Wed, 01 Mar 2006 10:22:04 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 commit 67bc620006a30cf5dcbf409dbbd4fd93179ddfb1 tree 166869f4c251da22cd7aca06811250fdaac81ba3 parent 2fe22a8bba0c3a60db58dfdcaa200f8528c057e4 author Harald Welte Tue, 14 Feb 2006 09:21:26 +0100 committer Dominik Brodowski Wed, 01 Mar 2006 11:18:30 +0100 [PATCH] pcmcia: CM4000, CM4040 Driver fixes Using this patch, Omnikey CardMan 4000 and 4040 devices automatically get their device nodes created by udev. Also, we now check for (and handle) failure of pcmcia_register_driver() Signed-off-by: Harald Welte Signed-off-by: Dominik Brodowski commit 2fe22a8bba0c3a60db58dfdcaa200f8528c057e4 tree 64bdaea6c3225f61d006d9aa54776d0acbd0626c parent 40e3cad61197fce63853e778db020f7637d988f2 author Jesse Allen Mon, 20 Feb 2006 22:08:18 -0800 committer Dominik Brodowski Wed, 01 Mar 2006 11:15:45 +0100 [PATCH] pcmcia: add id for AMB8110 PC Card The axnet_cs driver can support the AMB8110 PC Card, so add the id for it. In the old pcmcia-cs config file, this card is listed with the comment "not specific enough". The last entry in the axnet_ids has the same comment. They are disabled, and for good reason as it was originally identified by the MANFID, and that is shared with several cards that use both the pcnet_cs driver and axnet_cs driver. I tried my AMB8110 with pcnet_cs, and found that it works fine, and I cannot find a reason for either, except that the old config file recommended axnet_cs. Signed-off-by: Jesse Allen Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 40e3cad61197fce63853e778db020f7637d988f2 tree 6e086c930e1aef0bb24eb61af42d1f3c1fb7d38c parent f0892b89e3c19c7d805825ca12511d26dcdf6415 author Pavel Roskin Tue, 28 Feb 2006 01:18:31 -0500 committer Dominik Brodowski Wed, 01 Mar 2006 11:12:00 +0100 [PATCH] pcmcia: avoid binding hostap_cs to Orinoco cards Don't just use cards with PCMCIA ID 0x0156, 0x0002. Make sure that the vendor string is "Intersil" or "INTERSIL" Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski commit f0892b89e3c19c7d805825ca12511d26dcdf6415 tree 4af323f059cb9ba4e8f237c7c7a298d713324937 parent 42935656914b813c99f91cbac421fe677a6f34ab author Pavel Roskin Tue, 28 Feb 2006 01:18:29 -0500 committer Dominik Brodowski Wed, 01 Mar 2006 11:11:26 +0100 [PATCH] pcmcia: Add macro to match PCMCIA cards by numeric ID and first vendor string This is needed to distinguish Intersil and non-Intersil cards with numeric ID 0x0156, 0x0002. Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski commit 42935656914b813c99f91cbac421fe677a6f34ab tree d37a0d20998f4d87a4bd014300f707c3852ef5f9 parent 82d56e6d2e616bee0e712330bad06b634f007a46 author David Brownell Wed, 25 Jan 2006 06:36:32 -0800 committer Dominik Brodowski Wed, 01 Mar 2006 10:52:12 +0100 [PATCH] pcmcia: add another ide-cs CF card id Add another CF card ID. Signed-off-by: David Brownell Signed-off-by: Dominik Brodowski commit 82d56e6d2e616bee0e712330bad06b634f007a46 tree e18a81cbe959428aa75e1d99e0760ce827d2c366 parent 96789ac4b3943fec27fb6bf2713633b01a3903ad author Dominik Brodowski Fri, 27 Jan 2006 19:15:02 +0100 committer Dominik Brodowski Wed, 01 Mar 2006 10:52:11 +0100 [PATCH] pcmcia: properly handle pseudo multi-function devices The second pseudo multi-function device of a PCMCIA card may only be configured once the first one is initialized. Therefore, delay the registration of the second device until the first one is initialized. Signed-off-by: Dominik Brodowski Wed, 01 Mar 2006 01:53:32 -0500 committer Jeff Garzik Wed, 01 Mar 2006 01:53:32 -0500 Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6 commit 96789ac4b3943fec27fb6bf2713633b01a3903ad tree 5fa9dce4561072e64e460c8d920851a63a3b0b98 parent 77eebf346dfe87587ee8a54c76349a996e80c24f parent 958ddb75b04b792c701b2b08acdb200d638abf4e author Linus Torvalds Tue, 28 Feb 2006 20:57:20 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:57:20 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 77eebf346dfe87587ee8a54c76349a996e80c24f tree d8b7685cbc7dbc993ec39d3028e6f0246924bf40 parent 2641dfd981e4a3eebf387f21cf10685af06e1641 parent d2b176ed878d4d5fcc0bd35656dfd373f3702af9 author Linus Torvalds Tue, 28 Feb 2006 20:56:24 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:56:24 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 2641dfd981e4a3eebf387f21cf10685af06e1641 tree 2ccabad4e6237d18866da9269c92425ee5fe258a parent d6713e046336ffa98060418c4d2c65243639e107 author Darren Jenkins Tue, 28 Feb 2006 16:59:20 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] synclink_gt: make ->init_error signed Examples of misuse are 3112 info->init_error = -1; 4440 if ((info->init_error = register_test(info)) < 0) { Signed-off-by: Darren Jenkins Signed-off-by: Alexey Dobriyan Acked-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6713e046336ffa98060418c4d2c65243639e107 tree 3c076173875f22069a2e08fb127b4be11d670cb1 parent 0551fbd29e16fccd46e41b7d01bf0f8f39b14212 author Andrew Morton Tue, 28 Feb 2006 16:59:19 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] out_of_memory(): use of uninitialised Under some circumstances `points' can get printed before it's initialised. Spotted by Carlos Martin . Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0551fbd29e16fccd46e41b7d01bf0f8f39b14212 tree 760783df743eec940d6f6cb848498580ddde03d8 parent f61388822a6040ff462c5f7260daa0f1017f2db0 author Benjamin Herrenschmidt Tue, 28 Feb 2006 16:59:19 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] Add mm->task_size and fix powerpc vdso This patch adds mm->task_size to keep track of the task size of a given mm and uses that to fix the powerpc vdso so that it uses the mm task size to decide what pages to fault in instead of the current thread flags (which broke when ptracing). (akpm: I expect that mm_struct.task_size will become the way in which we finally sort out the confusion between 32-bit processes and 32-bit mm's. It may need tweaks, but at this stage this patch is powerpc-only.) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f61388822a6040ff462c5f7260daa0f1017f2db0 tree 51f9b93f4127d94ebbe5bc6321c025bbc4852f7e parent e8788c0cce63e0cc8689a123d1ce0af1e28cd583 author Andrew Morton Tue, 28 Feb 2006 16:59:18 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] nommu: implement vmalloc_node() Fix oprofile linkage. Pointed out by "Luke Yang" . Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8788c0cce63e0cc8689a123d1ce0af1e28cd583 tree 9350d9fc11a5a6ca81d4ee063278999e4dfe869d parent 6af6aab34a88050c8270ef75ddbdefef5c1dca00 author Christoph Lameter Tue, 28 Feb 2006 16:59:16 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] remove_from_swap: fix locking remove_from_swap() currently attempts to use page_lock_anon_vma to obtain an anon_vma lock. That is not working since the page may have been remapped via swap ptes in order to move the page. However, do_migrate_pages() obtain the mmap_sem lock and therefore there is a guarantee that the anonymous vma will not vanish from under us. There is therefore no need to use page_lock_anon_vma. Signed-off-by: Christoph Lameter Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6af6aab34a88050c8270ef75ddbdefef5c1dca00 tree 95e5d813603b25bdad3b83f6c20ab7514caaf216 parent 1f050a19e122100507302a77f1969a014e21650e author Paul Fulghum Tue, 28 Feb 2006 16:59:15 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:44 -0800 [PATCH] tty buffering: comment out debug code Comment out debug code in tty receive buffering. For performance reasons (I'll keep it enabled in -mm). Signed-off-by: Paul Fulghum Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f050a19e122100507302a77f1969a014e21650e tree b86b102b42e8db510301b1a16545fd34193b811b parent 8b613e1ccf1b7ac9acc73eaa07f5aeffd3c2bb8d author Alexey Dobriyan Tue, 28 Feb 2006 16:59:13 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] video1394: fix "return E;" typo Signed-off-by: Alexey Dobriyan Cc: Ben Collins Cc: Jody McIntyre Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b613e1ccf1b7ac9acc73eaa07f5aeffd3c2bb8d tree e4e686791cc9cca374ff5506b58be1dee7a6a451 parent 15b370c95cbc1553eec30a99a5ffb3ac3c8d7b81 author Adam Belay Tue, 28 Feb 2006 16:59:10 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] pnp bus type fix This is Adam's pnp probing fix. It's been reported to fix hangs on several people's machines. I don't know if it's official or final, and Adam isn't contactable at present. But I'm not aware of the patch causing any regressions. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15b370c95cbc1553eec30a99a5ffb3ac3c8d7b81 tree 267315602c0e5304c8b705ede315de53234dc010 parent 9cff3372bf665652e9dd71c09b817c20f58f754a author Pat Gefre Tue, 28 Feb 2006 16:59:09 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] Altix: more ioc3 cleanups and locking fixes Some "inline" removing that Andrew suggested, removed some locking on add/remove at this level - we'll let the callees decide. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cff3372bf665652e9dd71c09b817c20f58f754a tree e2e19cac59e733870e4e334ef2e12854fd32f267 parent 50322fe7d46b544d5649edb58bdbe5c95dd44b98 author John Bowler Tue, 28 Feb 2006 16:59:08 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] drivers/mtd/redboot.c: recognise a foreign byte sex partition table The RedBoot boot loader writes flash partition tables containing native byte sex 32 bit values. When booting an opposite byte sex kernel (e.g. an LE kernel from BE RedBoot) the current MTD driver fails to handle the partition table and therefore is unable to generate the correct partition map for the flash. So far as I am aware this problem is ARM specific, because only ARM supports software change of the CPU (memory system) byte sex, however the partition table parsing is in generic MTD code. The patch below has been tested on NSLU2 (an IXP4XX based system) with a patch, 10-ixp4xx-copy-from.patch (submitted to linux-arm-kernel - it's ARM specific) required to make the maps/ixp4xx.c driver work with an LE kernel. Builds of the patched system are in the 'unstable' release of OpenSlug and UcSlugC available from www.nslu2-linux.org. These builds are BE, the archives at www.nslu2-linux.org and www.handhelds.org (see monotone.vanille.de) can be built LE (currently DISTRO targets nslu-ltu.conf for LE thumb uclibc (32 bit kernel) and nslu2-lau.conf, nslu2-lag.conf for LE arm uclibc/glibc) and this patch has been tested extensively will both BE and LE systems on the NSLU2 (including swapping between BE and LE by reflashing from both RedBoot and Linux). The patch recognises that the FIS directory (the partition table) is byte-reversed by examining the partition table size, which is known to be one erase block (this is an assumption made elsewhere in redboot.c). If the size matches the erase block after byte swapping the value then byte-reversal is assumed, if not no further action is taken. The patched code is fail safe; should redboot.c be changed to support a partition table with a modified size field the test will fail and the partition table will be assumed to have the host byte sex. If byte-reversal is detected the patch byte swaps the remainder of the 32 bit fields in the copy of the table; this copy is then used to set up the MTD partition map. Signed-off-by: John Bowler Cc: David Woodhouse Cc: Thomas Gleixner Cc: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50322fe7d46b544d5649edb58bdbe5c95dd44b98 tree 0d6b61c08b2e61657278b7ff54529013f9e46d85 parent 511030bcd24119fa3759ef3f914d354e107ef839 author Miklos Szeredi Tue, 28 Feb 2006 16:59:03 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] fuse: fix bug in negative lookup If negative entries (nodeid == 0) were sent in reply to LOOKUP requests, two bugs could be triggered: - looking up a negative entry would return -EIO, - revaildate on an entry which turned negative would send a FORGET request with zero nodeid, which would cause an abort() in the library. The above would only happen if the 'negative_timeout=N' option was used, otherwise lookups reply -ENOENT, which worked correctly. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 511030bcd24119fa3759ef3f914d354e107ef839 tree 707edb2c804ad6c42ffbd0ef6685b49e076f0dcd parent 5cf6c541f5b3902bdcc2d311d70f8e730aaff1be author Christoph Lameter Tue, 28 Feb 2006 16:58:57 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] Fix sys_migrate_pages: Move all pages when invoked from root Currently sys_migrate_pages only moves pages belonging to a process. This is okay when invoked from a regular user. But if invoked from root it should move all pages as documented in the migrate_pages manpage. Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cf6c541f5b3902bdcc2d311d70f8e730aaff1be tree 2298029c0e4d0e40853983d4e8f88627bb564947 parent ec72070b1201203387e0c32a23ed17e35a24b170 author Dave Jones Tue, 28 Feb 2006 16:58:53 -0800 committer Linus Torvalds Tue, 28 Feb 2006 20:53:43 -0800 [PATCH] x86 microcode driver vs hotplug CPUs. This driver loops over 'num_online_cpus', but it doesn't account for holes in the online map created by offlined cpus, and assumes that the cpu numbers stay linear. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1415ee65500597e19c0ac44872db66105bad0e7 tree d7c1b8da83d052006335244dfcedd0122a94c470 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Jeff Kirsher Tue, 28 Feb 2006 20:24:07 -0800 committer root Tue, 28 Feb 2006 20:24:07 -0800 [PATCH] e1000: revert to single descriptor for legacy receive path A recent patch attempted to enable more efficient memory usage by using only 2kB descriptors for jumbo frames. The method used to implement this has since been commented upon as "illegal" and in recent kernels even causes a BUG when receiving ip fragments while using jumbo frames. This patch simply goes back to the way things were. We expect some complaints due to order 3 allocations failing to come back due to this change. Signed-off-by: Jesse Brandeburg commit 958ddb75b04b792c701b2b08acdb200d638abf4e tree 8bf0346b654d7d2a9dec60291e0a46535217e501 parent ce7eeb6b52bf1fc2a219503072732f35741d11de author Stephen Hemminger Mon, 27 Feb 2006 13:13:54 -0800 committer Jeff Garzik Tue, 28 Feb 2006 18:06:25 -0500 [PATCH] sky2: remove MSI support Remove Message Signaled Interrupt support (for 2.6.16). MSI is inherently edge-triggered and that is incompatiable (without more work) with NAPI. In future, will replace with smarter lockless-IRQ handling like tg3.c Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit ce7eeb6b52bf1fc2a219503072732f35741d11de tree 313d1d2e7cc1d26ce8ef29087c91f12d1ed4d0ff parent 816fd404718fc6064ddb05e6b310b2bc2ae7a187 parent 4832843d773462643cc471ca715382f5e509afb3 author Jeff Garzik Tue, 28 Feb 2006 18:04:30 -0500 committer Jeff Garzik Tue, 28 Feb 2006 18:04:30 -0500 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 816fd404718fc6064ddb05e6b310b2bc2ae7a187 tree 5b882a42fe51888fe175af28f62ecde5540b0a0c parent ec72070b1201203387e0c32a23ed17e35a24b170 parent 576cfa934e357c44d6259f90c7d065de328a3691 author Jeff Garzik Tue, 28 Feb 2006 18:03:45 -0500 committer Jeff Garzik Tue, 28 Feb 2006 18:03:45 -0500 Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 commit ec72070b1201203387e0c32a23ed17e35a24b170 tree f28d715cb39c145267f0e7c0dd376ee27873f263 parent 436002e3293472e4a7e47e5025999fc312794c4a parent 34d1a8aa882df916e1b078dc935e3d2d3792aea2 author Linus Torvalds Tue, 28 Feb 2006 14:02:10 -0800 committer Linus Torvalds Tue, 28 Feb 2006 14:02:10 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 commit 34d1a8aa882df916e1b078dc935e3d2d3792aea2 tree 0d67d1d4996af41a581c80ed9d40679d1e9c0403 parent 04d52461c6ecfc5b72e688b0eb2ead7b555eca25 author Ian Abbott Mon, 27 Feb 2006 14:05:32 +0000 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:07 -0800 [PATCH] USB: ftdi_sio: new microHAM device IDs This patch adds a bunch of new device IDs to the ftdi_sio driver for various devices from microHAM using FTDI chips. Micheal Studer supplied the PID for the USB-Y9 device. I examined the INF file in microHAM's Windows driver package for the USB-KW, USB-YS, USB-IC, USB-DB9 and USB-RS232 devices. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 04d52461c6ecfc5b72e688b0eb2ead7b555eca25 tree 7c46319f8c3cc7a2a863c00b313dad8a7d94b908 parent 8763716bfe4d8a16bef28c9947cf9d799b1796a5 author Hendrik Schweppe Sun, 19 Feb 2006 19:00:04 +0100 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:07 -0800 [PATCH] USB: visor.c id for gspda smartphone Added the USB vendorID of GSPDA and the productID of GSPDA's palm smartphone 'xplore m68' to the list of known devices. Signed-off-by: Hendrik Schweppe Signed-off-by: Greg Kroah-Hartman commit 8763716bfe4d8a16bef28c9947cf9d799b1796a5 tree f0e8d0dcbf55953ea084f110c013743716b2a068 parent d5ec33490c67affef93aebf76e1238260c82d377 author Shaun Tancheff Wed, 22 Feb 2006 19:47:19 -0800 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:06 -0800 [PATCH] USB: Gadget RNDIS fix alloc bug. (buffer overflow) Remote NDIS response to OID_GEN_SUPPORTED_LIST only allocated space for the data attached to the reply, and not the reply structure itself. This caused other kmalloc'd memory to be corrupted. Signed-off-by: Shaun Tancheff Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d5ec33490c67affef93aebf76e1238260c82d377 tree 3e12575848db0034de60bc44c3e1127aac2c59e3 parent 754501b324fc3c42522a46d3ace205e7a6a50e77 author Franck Bui-Huu Thu, 23 Feb 2006 09:35:06 +0100 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:06 -0800 [PATCH] USB: lh7a40x gadget driver: Fixed a dead lock There is a dead lock in lh7a40x udc driver. When the driver receive a SET_FEATURE HALT request, the dev lock is taken by the interrupt handler lh7a40x_udc_irq then the handler will call lh7a40x_set_halt function which in its turn will try to acquire the dev lock. Signed-off-by: Franck Bui-Huu Signed-off-by: Greg Kroah-Hartman commit 754501b324fc3c42522a46d3ace205e7a6a50e77 tree 86f87be3fd0218d560e0a0f901243caf9a01e824 parent e65335ef187c9cbc50bbc56be0fe966b593beb49 author Alan Stern Thu, 23 Feb 2006 10:19:25 -0500 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:06 -0800 [PATCH] USB: unusual_devs entry for Lyra RCA RD1080 This patch (as656) adds an unusual_devs.h entry for the Lyra RCA RD1080 MP3 player. Its card-reader firmware has the common report-one-too-many-sectors bug. This fixes Novell bug #152175. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e65335ef187c9cbc50bbc56be0fe966b593beb49 tree e3a640d7f6774bde233e644e82b182c0c184ca27 parent 8c450802a3abf0e8a45238fcb7d22ed9d6f191ce author Andrew Fuller Sat, 25 Feb 2006 09:52:27 -0500 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:06 -0800 [PATCH] USB: Wisegroup MP-8866 Dual USB Joypad This patch is for the Dual USB Joypad [0925:8866] from Wisegroup. The HID_QUIRK_NOGET is necessary for it to respond to input, and the HID_QUIRK_MULTI_INPUT is necessary to have two js# nodes appear. Signed-off-by: Andrew Fuller Cc: "Dmitry Torokhov" Signed-off-by: Greg Kroah-Hartman commit 8c450802a3abf0e8a45238fcb7d22ed9d6f191ce tree 7b950d665abb07ef3afd07c6135e685d5a70a817 parent b9756c047ce6b60e3b96aa3c5db958acbdacedde author David Brownell Fri, 24 Feb 2006 16:55:52 -0800 committer Greg Kroah-Hartman Tue, 28 Feb 2006 12:42:06 -0800 [PATCH] USB: fix EHCI BIOS handshake Fix http://bugzilla.kernel.org/show_bug.cgi?id=6128 Finish morphing the "early handoff" version of the EHCI BIOS handshake over to match the previous implementation inside the EHCI driver (except that now we forcibly disable the SMI). The version that had been with the PCI code was surprisingly full of bugs. Signed-off-by: David Brownell Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 436002e3293472e4a7e47e5025999fc312794c4a tree 00194f9a7b662e5e067971fe2b9f7dff0b1fdee3 parent b9756c047ce6b60e3b96aa3c5db958acbdacedde author David S. Miller Tue, 28 Feb 2006 11:55:36 -0800 committer David S. Miller Tue, 28 Feb 2006 11:55:36 -0800 [SUNSU]: Fix locking error in sunsu_stop_rx(). The caller takes the UART port lock, so we shouldn't try to take it again. Signed-off-by: David S. Miller commit d2b176ed878d4d5fcc0bd35656dfd373f3702af9 tree f5febd7d77fc374ddef9cbe549732bcb3b125c8b parent c8c1635faa7c97329111ce32b927d37306521822 author Jes Sorensen Tue, 28 Feb 2006 09:42:23 -0800 committer Tony Luck Tue, 28 Feb 2006 09:42:23 -0800 [IA64] sysctl option to silence unaligned trap warnings Allow sysadmin to disable all warnings about userland apps making unaligned accesses by using: # echo 1 > /proc/sys/kernel/ignore-unaligned-usertrap Rather than having to use prctl on a process by process basis. Default behaivour leaves the warnings enabled. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit e2482fa16e9eef88344a4dca1a390d29432d4add tree 65e321b57683f5b92dcc41ee7ce1a4a3289dfa6c parent 23ff51e9fe24f98c1053ac1cdded434012eee342 author Jürgen E. Fischer Sun, 19 Feb 2006 00:31:51 +0100 committer James Bottomley Tue, 28 Feb 2006 11:20:45 -0600 [SCSI] aha152x: fix variable use before initialisation and other bugs - change interface of the reset functions from Scsi_Cmnd to Scsi_Host. - add functions with the original interface and rename the new functions to reflect the new interface. - call these from the pcmcia driver, thereby avoiding the need to construct a (broken) Scsi_Cmnd from a Scsi_Host. - just run the bh if the interrupt is from the controller and if so ensure that it's only called once per interrupt. Signed-off-by: Juergen E. Fischer Signed-off-by: James Bottomley commit b9756c047ce6b60e3b96aa3c5db958acbdacedde tree 734a96bc44fc9d239935934551d7cba4658a1635 parent b54633056d626590f32912540500c8c20ce6d520 parent 778e2ac5970e445f8c6b7d8aa597ac162afe270a author Linus Torvalds Tue, 28 Feb 2006 09:14:09 -0800 committer Linus Torvalds Tue, 28 Feb 2006 09:14:09 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 778e2ac5970e445f8c6b7d8aa597ac162afe270a tree dfaa3d0d2732ca14e256f5801a9d91359b70497d parent 4debe4f963f9135771a8c5bc66e84396201dcfd8 author Ralf Baechle Tue, 28 Feb 2006 17:04:20 +0000 committer Ralf Baechle Tue, 28 Feb 2006 17:04:20 +0000 [MIPS] Fix build error on processors that don's support copy-on-write. Signed-off-by: Ralf Baechle commit 4debe4f963f9135771a8c5bc66e84396201dcfd8 tree 321b4a6e222d7d27e388125b067484a105cb464a parent 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 author Ralf Baechle Mon, 27 Feb 2006 19:05:55 +0000 committer Ralf Baechle Tue, 28 Feb 2006 17:04:19 +0000 [MIPS] Initialize S-cache function pointers even on S-cache-less CPUs. When a CPU has no scache, the scache flushing functions currently aren't getting initialized and the NULL pointer is eventually called as a function. Initialize the scache flushing functions as a noop when there's no scache. Initial patch by me and most of the debugging done by Martin Michlmayr. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit c8c1635faa7c97329111ce32b927d37306521822 tree 52c1ce94de3e559526842a44fbde08477edb1458 parent 9fe26a74f1e355dd707f09f9e5e9f035bcc6bae2 author Ken Chen Tue, 28 Feb 2006 08:53:32 -0800 committer Tony Luck Tue, 28 Feb 2006 08:53:32 -0800 [IA64] cleanup in fsys.S beautify coding style for zeroing end of fsyscall_table entries. Remove misleading __NR_syscall_last and add more comments. Drop (now unneeded) "guard against failure to increase NR_syscalls" Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit b54633056d626590f32912540500c8c20ce6d520 tree d7c6506b50ff13c215a5d5013ea7feb7777a5ef2 parent 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 parent 56ec6462af9cba56a04439154e5768672d6f390f author Linus Torvalds Tue, 28 Feb 2006 07:38:21 -0800 committer Linus Torvalds Tue, 28 Feb 2006 07:38:21 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 23ff51e9fe24f98c1053ac1cdded434012eee342 tree e9135185f58e34e17e79a340a6bac89c1c48b0bf parent 123fc7fd6f609a000061f586a794c89d1122ede1 author Matthew Wilcox Tue, 28 Feb 2006 06:28:15 -0700 committer James Bottomley Tue, 28 Feb 2006 09:36:14 -0600 [SCSI] Fix uninitialised width and speed in sym2 sym2 boards without NVRAM currently negotiate narrow due to this missed initialisation Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 123fc7fd6f609a000061f586a794c89d1122ede1 tree 180f9c7cdd51efbb77c6e8396309cb449da39bb5 parent 8884efab1516613215816d48132dd724508970bf author Ralf Baechle Thu, 09 Feb 2006 11:16:38 -0500 committer James Bottomley Tue, 28 Feb 2006 09:36:11 -0600 [SCSI] Delete duplicate driver template. Stuborn as compilers are they don't like duplicate definitions. Signed-off-by: Ralf Baechle Signed-off-by: James Bottomley commit 7b14e3b52fe5a2fb1dfa2f1f7dae4fd5f7d3fc47 tree 93a65fa0c9e5a10dea118a9594651264f08e58c6 parent a8b76b491510b7591c584838d0d7922f9ffe5c2c author Jens Axboe Tue, 28 Feb 2006 09:35:11 +0100 committer Linus Torvalds Tue, 28 Feb 2006 00:38:02 -0800 [PATCH] cfq-iosched: slice expiry fixups During testing of SLES10, we encountered a hang in the CFQ io scheduler. Turns out the deferred slice expiry logic is buggy, so remove that for now. We could be left with an idle queue that would never wake up. So kill that logic, always expire immediately. Also fix a potential timer race condition. Patch looks bigger than it is, because it moves a function. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 56ec6462af9cba56a04439154e5768672d6f390f tree b2e63269452da95da566d5f675f1f8b277f7f72d parent 273d2803817c9e050e8d6c3c271db7d61f2fb259 author Michael Ellerman Tue, 28 Feb 2006 14:54:26 +1100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:55 +1100 [PATCH] powerpc/iseries: Fix double phys_to_abs bug in htab_bolt_mapping Before the merge I updated create_pte_mapping() to work for iSeries, by calling iSeries_hpte_bolt_or_insert. (4c55130b2aa93370f1bf52d2304394e91cf8ee39) Later we changed iSeries_hpte_insert to cope with the bolting case, and called that instead from create_pte_mapping() (which was renamed to htab_bolt_mapping) (3c726f8dee6f55e96475574e9f645327e461884c). Unfortunately that change introduced a subtle bug, where we pass an absolute address to iSeries_hpte_insert() where it expects a physical address. This leads to us calling phys_to_abs() twice on the physical address, which is seriously bogus. This only causes a problem if the absolute address from the first translation can be looked up again in the chunk_map, which depends on the size and layout of memory. I've seen it fail on one box, but not others. The minimal fix is to pass the physical address to iSeries_hpte_insert(). For 2.6.17 we should make phys_to_abs() BUG if we try to double-translate an address. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 273d2803817c9e050e8d6c3c271db7d61f2fb259 tree 6ce423e4803571c48de0fd19be1f5be90e69728f parent 634473db86502b6444c3cebd279a06e0b8737527 author Olaf Hering Mon, 27 Feb 2006 15:52:59 +0100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: fix NULL pointer in handle_eeh_events This patch fixes a crash in handle_eeh_events, but ethtool -t still doesnt work right. ... pepino:~ # cpu 0x3: Vector: 300 (Data Access) at [c00000005192bbe0] pc: c00000000004a380: .handle_eeh_events+0xe0/0x23c lr: c00000000004a374: .handle_eeh_events+0xd4/0x23c sp: c00000005192be60 msr: 9000000000009032 dar: 268 dsisr: 40000000 current = 0xc0000001fe7bf1a0 paca = 0xc00000000048b280 pid = 16322, comm = eehd enter ? for help [c00000005192bf00] c00000000004a808 .eeh_event_handler+0xcc/0x130 [c00000005192bf90] c000000000025e00 .kernel_thread+0x4c/0x68 ... (none):/# /usr/sbin/ethtool -i eth0 driver: e100 version: 3.5.10-k2-NAPI firmware-version: N/A bus-info: 0000:21:01.0 (none):/# /usr/sbin/ethtool -t eth0 Call Trace: [C00000000F8DEFF0] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000F8DF0A0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000F8DF150] [C000000000049E58] .eeh_check_failure+0x10c/0x138 [C00000000F8DF1E0] [C0000000002DFDB0] .e100_hw_reset+0x70/0xf4 [C00000000F8DF270] [C0000000002E1BBC] .e100_hw_init+0x2c/0x260 [C00000000F8DF310] [C0000000002E2464] .e100_loopback_test+0x8c/0x220 [C00000000F8DF3C0] [C0000000002E28DC] .e100_diag_test+0xdc/0x16c [C00000000F8DF490] [C000000000420BE0] .dev_ethtool+0xf24/0x14f8 [C00000000F8DF8F0] [C00000000041F4A8] .dev_ioctl+0x5cc/0x740 [C00000000F8DFA20] [C00000000040FEFC] .sock_ioctl+0x3d0/0x404 [C00000000F8DFAC0] [C0000000000D513C] .do_ioctl+0x68/0x108 [C00000000F8DFB50] [C0000000000D56B0] .vfs_ioctl+0x4d4/0x510 [C00000000F8DFC10] [C0000000000D5740] .sys_ioctl+0x54/0x94 [C00000000F8DFCC0] [C0000000000FB6EC] .ethtool_ioctl+0x11c/0x150 [C00000000F8DFD60] [C0000000000F7E40] .compat_sys_ioctl+0x338/0x3bc [C00000000F8DFE30] [C00000000000871C] syscall_exit+0x0/0x40 EEH: Detected PCI bus error on device 0000:21:01.0 EEH: This PCI device has failed 1 times since last reboot: - modprobe: FATAL: Could not load /lib/modules/2.6.16-rc4-git7/modules.dep: No such file or directory Cannot get strings: No such device (none):/# (none):/# EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 (none):/# Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device EEH: This PCI device has failed 1 times since last reboot: - EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device EEH: This PCI device has failed 1 times since last reboot: - EEH: Unable to configure device bridge (-3) for /pci@400000000110/pci@2,2 Call Trace: [C00000000FA17940] [C00000000000F270] .show_stack+0x74/0x1b4 (unreliable) [C00000000FA179F0] [C000000000049D04] .eeh_dn_check_failure+0x290/0x2d8 [C00000000FA17AA0] [C00000000001E114] .rtas_read_config+0x120/0x154 [C00000000FA17B40] [C000000000049664] .early_enable_eeh+0x274/0x2bc [C00000000FA17C00] [C000000000049708] .eeh_add_device_early+0x5c/0x6c [C00000000FA17C90] [C000000000049748] .eeh_add_device_tree_early+0x30/0x5c [C00000000FA17D20] [C000000000046568] .pcibios_add_pci_devices+0x8c/0x1f8 [C00000000FA17DD0] [C00000000004A528] .eeh_reset_device+0xe0/0x110 [C00000000FA17E60] [C00000000004A698] .handle_eeh_events+0x140/0x250 [C00000000FA17F00] [C00000000004AC7C] .eeh_event_handler+0xe8/0x140 [C00000000FA17F90] [C000000000025784] .kernel_thread+0x4c/0x68 EEH: Detected PCI bus error on device and so on Signed-off-by: Olaf Hering Acked-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 634473db86502b6444c3cebd279a06e0b8737527 tree 15b898352bc7fbfbc1a6cc9ef674eef89313dc59 parent 827c1a6c1a5dcb2902fecfb648f9af6a532934eb author Benjamin Herrenschmidt Sun, 26 Feb 2006 08:09:00 +1100 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: vdso 64bits gettimeofday bug A bug in the assembly code of the vdso can cause gettimeofday() to hang or to return incorrect results. The wrong register was used to test for pending updates of the calibration variables and to create a dependency for subsequent loads. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 827c1a6c1a5dcb2902fecfb648f9af6a532934eb tree 7cc96f3b3df746dc8569bc1b0bffd47f11084214 parent a8b76b491510b7591c584838d0d7922f9ffe5c2c author John Rose Fri, 24 Feb 2006 11:34:23 -0600 committer Paul Mackerras Tue, 28 Feb 2006 16:25:54 +1100 [PATCH] powerpc: fix dynamic PCI probe regression Some hotplug driver functions were migrated to the kernel for use by EEH in commit 2bf6a8fa21570f37fd1789610da30f70a05ac5e3. Previously, the PCI Hotplug module had been changed to use the new OFDT-based PCI probe when appropriate: 5fa80fcdca9d20d30c9ecec30d4dbff4ed93a5c6 When rpaphp_pci_config_slot() was moved from the rpaphp driver to the new kernel function pcibios_add_pci_devices(), the OFDT-based probe stuff was dropped. This patch restores it. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit a8b76b491510b7591c584838d0d7922f9ffe5c2c tree b0d9e8b9c428b59beaf3251db17a54dfc1fd1a11 parent 637029c6cb5efcbaa3d5831af4c1972bdd629779 parent c3c013a2c218cdede2d2e73df01ed4f813538941 author Linus Torvalds Mon, 27 Feb 2006 20:43:36 -0800 committer Linus Torvalds Mon, 27 Feb 2006 20:43:36 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 637029c6cb5efcbaa3d5831af4c1972bdd629779 tree cd6d32dceef73f0ad467f495f51f331a459d01db parent d4f0f122ec407bd1b4d1c773d0c87edc6a92cd26 author Linus Torvalds Mon, 27 Feb 2006 20:41:56 -0800 committer Linus Torvalds Mon, 27 Feb 2006 20:41:56 -0800 Revert "[PATCH] x86_64: Only do the clustered systems have unsynchronized TSC assumption on IBM systems" This reverts commit 13a229abc25640813f1480c0478dfc6bdbc1c19e. Quoth Andi: "After some consideration and feedback from various people it turns out this wasn't that good an idea. It has some problems and needs more work. Since it was only an optimization anyways it's best to just back it out again for now." Signed-off-by: Linus Torvalds commit 8884efab1516613215816d48132dd724508970bf tree 613b80a6adea59defeed3a1fa9fdc6dde7313a28 parent 147aab6aa22ce7775be944f8fb9932aa000dda61 author Brian King Fri, 24 Feb 2006 17:10:04 -0600 committer James Bottomley Mon, 27 Feb 2006 21:38:39 -0600 [SCSI] scsi: scsi command retries off by one fix Fix up an off by one error in calculating retries for scsi commands. This bug was discovered when an SG_IO request was sent to scsi core with retries = 0, causing the overall timeout check to go off in scsi_softirq_done. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 147aab6aa22ce7775be944f8fb9932aa000dda61 tree 21e01c0387755e6607e050beac0504ff1f4866cf parent 938050916f57f08e20595b1fa1c1e57c2fbf7243 author Christoph Hellwig Fri, 17 Feb 2006 12:13:48 +0100 committer James Bottomley Mon, 27 Feb 2006 21:36:46 -0600 [SCSI] megaraid_sas: fix physical disk handling This patch hides the devices completely from the midlayer instead. It requires the patch to handle the slave_configure failure I posted earlier. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit c3c013a2c218cdede2d2e73df01ed4f813538941 tree 1e7bfa4c687bb54fd328f06ac141937de1bb0470 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Jeff Garzik Mon, 27 Feb 2006 22:31:19 -0500 committer Jeff Garzik Mon, 27 Feb 2006 22:31:19 -0500 [libata] Disable FUA Until problems are sorted. commit 938050916f57f08e20595b1fa1c1e57c2fbf7243 tree 461104c764c00d7824eaa7df8cba8d9cdd0dbb66 parent 8b097a67264ba3e10620b268979de3be6fe5e3cd author Christoph Hellwig Fri, 17 Feb 2006 12:11:29 +0100 committer James Bottomley Mon, 27 Feb 2006 21:26:45 -0600 [SCSI] scsi: handle ->slave_configure return value When ­>slave_configure fails the scsi midlayer should handle it. Signed-off-by: James Bottomley commit 8b097a67264ba3e10620b268979de3be6fe5e3cd tree a014abfb3e58ddf7b71e1c37dbecdac44020a312 parent eca7be5e1899626db01ae42b0123458d6fb34930 author Andrew Vasquez Tue, 14 Feb 2006 14:22:14 -0800 committer James Bottomley Mon, 27 Feb 2006 21:25:40 -0600 [SCSI] fc_transport: stop creating duplicate rport entries. Current fc_transport consumers initially register rports with an UNKNOWN role-state and follow-up with a call to fc_remote_port_rolechg(). Modify code in fc_remote_port_add() to scan the fc_host_rport_bindings() array for consistent bindings regardless of role-type. Original code would only scan bindings array for targets, causing duplicate fc_remote_ports/rport-X:Y-Z entries to be created for the yet-to-be-role-changed rports. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit eca7be5e1899626db01ae42b0123458d6fb34930 tree b49c5a1f0056ebb5e6a5f71aa4d8c713f17a78d1 parent b9a33cebac70d6f67a769ce8d4078fee2b254ada author Brian King Tue, 14 Feb 2006 12:42:24 -0600 committer James Bottomley Mon, 27 Feb 2006 21:25:40 -0600 [SCSI] sg: Remove aha1542 hack Remove a hack in the sg driver that alters the total buffer length for SG_IO commands to ensure buffers are not odd byte lengths. This breaks on the ipr driver since it requires the request_bufflen to equal the length specified in the cdb. The block layer SG_IO code does not appear to have this hack. Signed-off-by: Douglas Gilbert Signed-off-by: Brian King Signed-off-by: James Bottomley commit d4f0f122ec407bd1b4d1c773d0c87edc6a92cd26 tree d0f99c84737f41d21acdf36f9016707c8c09db20 parent 272a5322d5219b00a1e541ad9d0d76824df1aa2a parent 2353e8e9b6ae29aad77935f21735a30f5cc419b4 author Linus Torvalds Mon, 27 Feb 2006 18:15:43 -0800 committer Linus Torvalds Mon, 27 Feb 2006 18:15:43 -0800 Merge git://oss.sgi.com:8090/oss/git/xfs-rc-fixes commit 2353e8e9b6ae29aad77935f21735a30f5cc419b4 tree 6c3b2b28e1e33ebe26bf12866dccfdeedaf6ea1e parent dae81d4774ecbeb7d24bb9a6a4db9f9baee54d85 author Eric Sandeen Tue, 28 Feb 2006 12:30:30 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:30:30 +1100 [XFS] Don't map non-uptodate buffers in xfs_probe_cluster; also fixes obscure corruption case SGI-PV: 942658 SGI-Modid: xfs-linux-melb:xfs-kern:207119a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit dae81d4774ecbeb7d24bb9a6a4db9f9baee54d85 tree 5166f7d485c833cde45f9b27c3c8bdae2870e69f parent 07ff2fa8fcb3d9207f1c16e5acf9086d5731ed8b author Nathan Scott Tue, 28 Feb 2006 12:30:13 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:30:13 +1100 [XFS] Reduce stack use during quota mounts (caused a panic). This regressed recently via the fix for inherited quota inode attributes. SGI-PV: 947312 SGI-Modid: xfs-linux-melb:xfs-kern:25318a Signed-off-by: Nathan Scott commit 07ff2fa8fcb3d9207f1c16e5acf9086d5731ed8b tree 819bc2fb3e66bbaa91d6164116b96f7c1756d1f8 parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 author Nathan Scott Tue, 28 Feb 2006 12:29:51 +1100 committer Nathan Scott Tue, 28 Feb 2006 12:29:51 +1100 [XFS] Fix a realtime allocator regression introduced by an old iget race fix. Noticed by Roger Willcocks. SGI-PV: 949821 SGI-Modid: xfs-linux-melb:xfs-kern:25257a Signed-off-by: Nathan Scott commit 4832843d773462643cc471ca715382f5e509afb3 tree 342ae6d4ea97b83aa123fdaaac392888d9d3189e parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 author Pete Zaitcev Sun, 26 Feb 2006 23:43:20 -0800 committer John W. Linville Mon, 27 Feb 2006 20:12:02 -0500 [PATCH] ieee80211_rx.c: is_beacon Fix broken is_beacon(). Signed-off-by: Pete Zaitcev Signed-off-by: John W. Linville commit 9fe26a74f1e355dd707f09f9e5e9f035bcc6bae2 tree 6596823c41830e30028a5854d87376ccc8ca33c1 parent e963701a761aede31c9c1bfc74cf8e0ec671f0f4 author Tony Luck Mon, 27 Feb 2006 17:07:14 -0800 committer Tony Luck Mon, 27 Feb 2006 17:07:14 -0800 [IA64] refresh default config files Bring all ia64 config files up to date Signed-off-by: Tony Luck commit e963701a761aede31c9c1bfc74cf8e0ec671f0f4 tree 6aefa708cc240b0d3d6699fa6beb6169ef191be1 parent eb0911e27e8c6778d6c8ec95b7dd60c002d923c3 author Tony Luck Mon, 27 Feb 2006 16:18:58 -0800 committer Tony Luck Mon, 27 Feb 2006 16:18:58 -0800 [IA64] die_if_kernel() can return arch/ia64/kernel/unaligned.c erroneously marked die_if_kernel() with a "noreturn" attribute ... which is silly (it returns whenever the argument regs say that the fault happened in user mode, as one might expect given the "if_kernel" part of its name!). Thanks to Alan and Gareth for pointing this out. Signed-off-by: Tony Luck commit eb0911e27e8c6778d6c8ec95b7dd60c002d923c3 tree 8352395fb9ef1dc5e85bfe8383a682c4a7d4428d parent ac311ac2b7caca000b1501fd24136bdca30e2a51 author Christoph Hellwig Tue, 21 Feb 2006 10:48:41 +0000 committer Tony Luck Mon, 27 Feb 2006 15:41:58 -0800 [IA64-SGI] revert export sn_pcidev_info_get Christoph Hellwig pointed that there are no in-tree uses of this. So revert 9c65cb9be62ac4993a5b392304b82e4f04f010fd Signed-off-by: Tony Luck commit ac311ac2b7caca000b1501fd24136bdca30e2a51 tree 0a960ed38d9f007f52ad4f3cbb5ca75aded15103 parent 18810d1ebac89232d8f218a318ed9ff7ef198e96 author Matthew Wilcox Fri, 24 Feb 2006 12:46:23 -0700 committer Tony Luck Mon, 27 Feb 2006 15:37:41 -0800 [IA64] Fix pcibios_setup pcibios_setup() should return NULL if it handled a parameter. Since ia64 handles no parameters, it should return the string that was passed in, not NULL. This brings ia64 into line with all other architectures that handle no parameters. Signed-off-by: Matthew Wilcox Signed-off-by: Tony Luck commit 18810d1ebac89232d8f218a318ed9ff7ef198e96 tree 83924c9f8e50ce327a8523dbdeaac91aefd2580a parent 312f1f0141627a58bf72c55f0e7bc5d6f118a372 author Jack Steiner Thu, 23 Feb 2006 13:16:44 -0600 committer Tony Luck Mon, 27 Feb 2006 15:32:28 -0800 [IA64-SGI] Make number of TIO nodes configurable Make the limit for the number of TIO nodes a function of the number of C/M nodes in the system instead of a hardcoded constant. The number of TIO nodes should be the same as the number of C/M nodes. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 312f1f0141627a58bf72c55f0e7bc5d6f118a372 tree 5a5bca4b1e7dabffd9c0fc2f34e0c36261e8a19e parent 5d1a88af826b03edaac4d2bd2f25af56a54f26e6 author Horms Wed, 22 Feb 2006 09:57:55 +0900 committer Tony Luck Mon, 27 Feb 2006 15:29:57 -0800 [IA64] Document the "nomca" boot parameter "nomca" can be used to disable machine check handling Signed-Off-By: Horms Signed-off-by: Tony Luck commit 272a5322d5219b00a1e541ad9d0d76824df1aa2a tree 2d27468bdb6b5c777f19c5aed2dafc2ec8682950 parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 parent ba13c98405ba44d37d148376c6615e6c8babbfdc author Linus Torvalds Mon, 27 Feb 2006 15:22:14 -0800 committer Linus Torvalds Mon, 27 Feb 2006 15:22:14 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 5d1a88af826b03edaac4d2bd2f25af56a54f26e6 tree 1cabca0a45f445a8396c3a2f41336cbcbd16903b parent 50e300dead8dadf32e930ebd80d9810d631aa1a0 author Zhang, Yanmin Fri, 17 Feb 2006 12:23:09 +0800 committer Tony Luck Mon, 27 Feb 2006 15:12:42 -0800 [IA64] Delete a redundant instruction in unaligned_access unaligned_access does fetch cr.ipsr, then calls dispatch_unaligned_handler, but dispatch_unaligned_handler fetches cr.ipsr again, so delete the first one. Signed-off-by: Zhang Yanmin Signed-off-by: Tony Luck commit 50e300dead8dadf32e930ebd80d9810d631aa1a0 tree ac8df9f2c8495bf6b3c28330fdce4f498c23e774 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Jes Sorensen Fri, 17 Feb 2006 10:25:39 -0500 committer Tony Luck Mon, 27 Feb 2006 15:06:41 -0800 [IA64] show "SN Devices" menu only if CONFIG_SGI_SN Adrian> On architectures like i386, the "Multimedia Capabilities Port Adrian> drivers" menu is visible, but it can't be visited since it Adrian> contains nothing usable for CONFIG_SGI_SN=n. Jes> Thats only a third of the patch, if you want to do that, you should Jes> remove the redundant SGI_SN checks below. Signed-off-by: Tony Luck commit 576cfa934e357c44d6259f90c7d065de328a3691 tree 1a82797c3c394aa3d0d4c37cebab0f55ad2afc89 parent b3c3e7d7d9795df16012d5c60e5f789e7fade311 author Francois Romieu Mon, 27 Feb 2006 23:15:06 +0100 committer Francois Romieu Mon, 27 Feb 2006 23:15:06 +0100 8139cp: fix broken suspend/resume - check that the device is up before it is enabled again; - the descriptor ring indexes must be set to zero before cp_init_hw() is issued. Add a nice comment to remember that skb allocation failure is still not handled. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=5681 Signed-off-by: Francois Romieu commit b3c3e7d7d9795df16012d5c60e5f789e7fade311 tree 7ad463d353263e765b302060da884a2eefb24173 parent de5f503cfbe4f942492269c6bd97a16a4d61e488 author Francois Romieu Mon, 27 Feb 2006 23:11:08 +0100 committer Francois Romieu Mon, 27 Feb 2006 23:11:08 +0100 via-velocity: fix memory corruption when changing the mtu velocity_rx_refill() only replenishes the descriptor entries which belong to the CPU. It works great in the Rx path but the driver must ensure that all the descriptors are freed before velocity_rx_refill() is used in velocity_change_mtu(). The patch resets the Rx descriptors in velocity_free_rd_ring(). Signed-off-by: Francois Romieu commit ba13c98405ba44d37d148376c6615e6c8babbfdc tree 34bab6d3ae89637192fea5a7e2a59925804840ee parent bafac2a512bf4fd2ce7520f3976ce8aab4435f74 author Arnaldo Carvalho de Melo Mon, 27 Feb 2006 13:30:43 -0800 committer David S. Miller Mon, 27 Feb 2006 13:30:43 -0800 [REQSK]: Don't reset rskq_defer_accept in reqsk_queue_alloc In 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 I moved defer_accept from tcp_sock to request_queue and mistakingly reset it at reqsl_queue_alloc, causing calls to setsockopt(TCP_DEFER_ACCEPT ) to be lost after bind, the fix is to remove the zeroing of rskq_defer_accept from reqsl_queue_alloc. Thanks to Alexandra N. Kossovsky for reporting and testing the suggested fix. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit bafac2a512bf4fd2ce7520f3976ce8aab4435f74 tree ff5c6538eeebceee2b3b5b137d6c66e8d28e77f1 parent 45fe4dc08cbf9510074b97a16606366c1d405f4d author Patrick McHardy Mon, 27 Feb 2006 13:04:17 -0800 committer David S. Miller Mon, 27 Feb 2006 13:04:17 -0800 [NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibility The nfnetlink_log infrastructure changes broke compatiblity of the LOG targets. They currently use whatever log backend was registered first, which means that if ipt_ULOG was loaded first, no messages will be printed to the ring buffer anymore. Restore compatiblity by using the old log functions by default and only use the nf_log backend if the user explicitly said so. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 45fe4dc08cbf9510074b97a16606366c1d405f4d tree 2c629e31e03d62e84c375ad809861806a02840e0 parent e121e9ecb08c3a9843243f461290869ff08be900 author Patrick McHardy Mon, 27 Feb 2006 13:03:55 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:55 -0800 [NETFILTER]: nf_queue: fix end-of-list check The comparison wants to find out if the last list iteration reached the end of the list. It needs to compare the iterator with the list head to do this, not the element it is looking for. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e121e9ecb08c3a9843243f461290869ff08be900 tree 9574002aa4dfffafe16512460f12ef5c79486537 parent 7a11b9848ae27e571f219fab5541bd84700f0d68 author Patrick McHardy Mon, 27 Feb 2006 13:03:39 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:39 -0800 [NETFILTER]: nf_queue: remove unnecessary check for outfn The only point of registering a queue handler is to provide an outfn, so there is no need to check for it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7a11b9848ae27e571f219fab5541bd84700f0d68 tree cd108f9df88ac218c8d9dab3fbda389df92f8d44 parent f92f871989c97a24d284ac60b0f880222ddf87ac author Patrick McHardy Mon, 27 Feb 2006 13:03:24 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:24 -0800 [NETFILTER]: nf_queue: fix rerouting after packet mangling Packets should be rerouted when they come back from userspace, not before. Also move the queue_rerouters to RCU to avoid taking the queue_handler_lock for each reinjected packet. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f92f871989c97a24d284ac60b0f880222ddf87ac tree 8b9232f0e789dd0769b7025d773e6f2346ff5e95 parent e02f7d1603c955126e88cc08149509d00be25cb9 author Patrick McHardy Mon, 27 Feb 2006 13:03:10 -0800 committer David S. Miller Mon, 27 Feb 2006 13:03:10 -0800 [NETFILTER]: nf_queue: check if rerouter is present before using it Every rerouter needs to provide a save and a reroute function, we don't need to check for them. But we do need to check if a rerouter is registered at all for the current family, with bridging for example packets of unregistered families can hit nf_queue. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e02f7d1603c955126e88cc08149509d00be25cb9 tree ebd48da4b8cc55fb8070af70139e62e77a6f423c parent 752c1f4c78fe86d0fd6497387f763306b0d8fc53 author Patrick McHardy Mon, 27 Feb 2006 13:02:52 -0800 committer David S. Miller Mon, 27 Feb 2006 13:02:52 -0800 [NETFILTER]: nf_queue: don't copy registered rerouter data Use the registered data structure instead of copying it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 752c1f4c78fe86d0fd6497387f763306b0d8fc53 tree 50d7e52940d1adf0936805645d52e2419e5922cf parent 4bf05eceecf2efb4c883e9e9b17825682e7330dd author Herbert Xu Mon, 27 Feb 2006 13:00:40 -0800 committer David S. Miller Mon, 27 Feb 2006 13:00:40 -0800 [IPSEC]: Kill post_input hook and do NAT-T in esp_input directly The only reason post_input exists at all is that it gives us the potential to adjust the checksums incrementally in future which we ought to do. However, after thinking about it for a bit we can adjust the checksums without using this post_input stuff at all. The crucial point is that only the inner-most NAT-T SA needs to be considered when adjusting checksums. What's more, the checksum adjustment comes down to a single u32 due to the linearity of IP checksums. We just happen to have a spare u32 lying around in our skb structure :) When ip_summed is set to CHECKSUM_NONE on input, the value of skb->csum is currently unused. All we have to do is to make that the checksum adjustment and voila, there goes all the post_input and decap structures! I've left in the decap data structures for now since it's intricately woven into the sec_path stuff. We can kill them later too. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4bf05eceecf2efb4c883e9e9b17825682e7330dd tree 0cbd4b8a8b972220e97c88aadbee0661b0e88747 parent de5f503cfbe4f942492269c6bd97a16a4d61e488 author Herbert Xu Mon, 27 Feb 2006 13:00:01 -0800 committer David S. Miller Mon, 27 Feb 2006 13:00:01 -0800 [IPSEC] esp: Kill unnecessary block and indentation We used to keep sg on the stack which is why the extra block was useful. We've long since stopped doing that so let's kill the block and save some indentation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 051d3cbd96909b2fe6b5038e7bbe77f41356db05 tree 6decc4a2a4f1c3df66df5d78602ab8b4f971375d parent de5f503cfbe4f942492269c6bd97a16a4d61e488 author David S. Miller Mon, 27 Feb 2006 12:51:27 -0800 committer David S. Miller Mon, 27 Feb 2006 12:51:27 -0800 [TG3]: Fix Sun tg3 variant detection. Some Sun parts don't have PCI_VENDOR_ID_SUN in the subsystem vendor ID. So add another fallback test, which is the name of the OBP firmware device tree node. If it's a Sun part we'll get "network", else it will be named "ethernet". Signed-off-by: David S. Miller commit de5f503cfbe4f942492269c6bd97a16a4d61e488 tree 680d9c6624c9cad72e4654dd6c986f6ea4df21ac parent d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 parent 2fd628fe25e1f3d07996b0dab728ea0702f81306 author Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 committer Linus Torvalds Mon, 27 Feb 2006 09:46:24 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 2fd628fe25e1f3d07996b0dab728ea0702f81306 tree f57882e33f96141ba59f8f188e8797adb40e42b0 parent 92f22c183cd669c8575767fede8fe43bb4f7bce9 author Atsushi Nemoto Tue, 21 Feb 2006 15:59:00 +0900 committer Ralf Baechle Mon, 27 Feb 2006 17:30:37 +0000 [MIPS] Use generic compat routines for readdir, getdents Not just cleanup but also fixes O32 readdir(2) emulation. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 92f22c183cd669c8575767fede8fe43bb4f7bce9 tree df4aae80db1218a8fab613689e99acf96f18f417 parent 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 author Ralf Baechle Thu, 23 Feb 2006 14:10:53 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] Fix atomic*_sub_if_positive return value. Reported and initial fix by Thomas Koeller , rewritten by me. Signed-off-by: Ralf Baechle commit 9b6695a8adfe0916e81ddd810a5b9db3eb8b0e46 tree 62ba9475530c88ccf2149cd58eabd97ebe096aca parent 3e6cb2d38a9c9758170813497a860c64543643d5 author Ralf Baechle Thu, 23 Feb 2006 12:23:27 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:36 +0000 [MIPS] SMP: Fix initialization order bug. A recent change requires cpu_possible_map to be initialized before smp_sched_init() but most MIPS platforms were initializing their processors in the prom_prepare_cpus callback of smp_prepare_cpus. The simple fix of calling prom_prepare_cpus from one of the earlier SMP initialization hooks doesn't work well either since IPIs may require init_IRQ() to have completed, so bit the bullet and split prom_prepare_cpus into two initialization functions, plat_smp_setup which is called early from setup_arch and plat_prepare_cpus called where prom_prepare_cpus used to be called. Signed-off-by: Ralf Baechle commit 3e6cb2d38a9c9758170813497a860c64543643d5 tree 8d1d8f075b516c475c0fae5669a1ead536b1ad51 parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Ralf Baechle Tue, 21 Feb 2006 18:32:14 +0000 committer Ralf Baechle Mon, 27 Feb 2006 17:30:35 +0000 [MIPS] Use "=R" constraint to avoid compiler errors in cmpxchg(). Signed-off-by: Ralf Baechle commit d904ffd6e0c3ab7631b07c21c9f9234a2e72d1f3 tree e872c4fcbbf661cccd40d5c414801544c5ef8a5c parent e95a9ec1bb66e07b138861c743192f06e7b3e4de author Marc Zyngier Mon, 27 Feb 2006 12:08:00 +0100 committer Linus Torvalds Mon, 27 Feb 2006 08:18:04 -0800 [PATCH] Fix Specialix SX corruption With the latest kernels, I experienced some strange corruption, some '*****' being randomly inserted in the character flow, like this: ashes:~# ashes:~# a*******shes:~# ashes:~# ashes:~# Further investigation shows that the problem was introduced during Alan's "TTY layer buffering revamp" patch, the amount of data to be copied being reduced after buffer allocation. Moving the count fixup around solves the problem. Signed-off-by: Marc Zyngier Approved-by: Rogier Wolff Signed-off-by: Linus Torvalds commit e95a9ec1bb66e07b138861c743192f06e7b3e4de tree 8ee8b2c5339af31f9f79423b3c503f30e0651e4a parent 6d6585e490d985d421d7cd3cfc7d77b618c44130 parent e4e10e3e7995f5bd481d2720bf30d3a661d110ca author Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:30 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 6d6585e490d985d421d7cd3cfc7d77b618c44130 tree bf8c941eec540f0e30a37252be031c5504a24e16 parent b9a33cebac70d6f67a769ce8d4078fee2b254ada parent 7bef4b397874eee4484457040e8a1013361d7758 author Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 committer Linus Torvalds Mon, 27 Feb 2006 07:41:11 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 7bef4b397874eee4484457040e8a1013361d7758 tree 9a13e891ade50d32806ad303b80526bef9b9df3f parent a0124d780d06db711e8a92135d774940588a27da author Daniele Venzano Sat, 25 Feb 2006 17:01:09 -0500 committer Jeff Garzik Sat, 25 Feb 2006 17:01:09 -0500 Fix Wake on LAN support in sis900 Fix two bugs in the WoL implementation of sis900. The first causes hangs on some system on driver load, the second causes troubles when disabling WoL support. Both fixes are one liner and really simple. Signed-off-by: Lennert Buytenhek Signed-off-by: Daniele Venzano commit e4e10e3e7995f5bd481d2720bf30d3a661d110ca tree 14dbbab4fcc8c2fd10376751516c2f0088459247 parent 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: implement R_ERR on DMA activate FIS errata fix Silicon Image has disclosed a new sil3114/3152 errata and workaround which causes the controller to return R_ERR on DMA activate FIS if the FIS is received while the next PRD is being fetched. This patch implements the workaround. This errata results in lock up and doesn't trigger if m15w workaround is in effect. We stopped applying m15w to 3512 and 3114 in 2.6.14-rc1 which makes 3512/3114 lock up with some drives on all kernel versions since 2.6.14-rc1 upto now (2.6.16-rc4). This patch should fix the regression. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0ee304d5802dc62746f13f12d4cb4ec4ed285f66 tree f3f7924305c78b714e671e8525de5c1eb02dd268 parent a0124d780d06db711e8a92135d774940588a27da author Tejun Heo Sat, 25 Feb 2006 13:52:30 +0900 committer Jeff Garzik Sat, 25 Feb 2006 16:52:31 -0500 [PATCH] sata_sil: add board ID for 3512 3512 is slightly different from 3112 errata-wise. Differentiate it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik