commit e34efe3b100d0fbdf053128956c3dd0bc68754d6 Author: Haavard Skinnemoen Date: Thu Feb 1 16:49:31 2007 +0100 [PATCH] Remove avr32@atmel.com from MAINTAINERS avr32@atmel.com is a technical support address and is not really appropriate for sending patches. Lots of annoying automatics getting in the way. I'm still the maintainer of all the entries touched by this patch, so nothing changes with regard to the "Supported" status of the AVR32 architecture or the macb driver. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit fb594d31aa2d133ea89d4ead964c51262b331407 Author: Bartlomiej Zolnierkiewicz Date: Thu Feb 1 14:12:27 2007 +0100 [PATCH] via82cxxx: fix typo ("cx7000" should be corrected to "cx700") Noticed by JosephChan@via.com.tw. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds commit d346cce308f7fc99c7ffdb62060ed404fa340a1c Author: Randy Dunlap Date: Wed Jan 31 23:48:17 2007 -0800 [PATCH] sysrq: showBlockedTasks is sysrq-W Change SysRq showBlockedTasks from sysrq-X to sysrq-W and show that in the Help message. It was previously done via X, but X is already used for Xmon on ppc & powerpc platforms and this collision needs to be avoided. All callers of register_sysrq_key() are now marked in the sysrq op/key table. I didn't mark 'h' as Help because Help is just printed for any unknown key, such as '?'. Added some omitted sysrq key entries in the sysrq.txt file. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d8952440f4090522b740257f1c6b2cf96413969 Author: Guillaume Chazarain Date: Wed Jan 31 23:48:14 2007 -0800 [PATCH] procfs: Fix listing of /proc/NOT_A_TGID/task Listing /proc/PID/task were PID is not a TGID should not result in duplicated entries. [g ~]$ pidof thunderbird-bin 2751 [g ~]$ ls /proc/2751/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ ls /proc/2770/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ Signed-off-by: Guillaume Chazarain Acked-by: "Eric W. Biederman" Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 432bd6cbf9f016f5480153b1cdfbd046f8d4fb1e Author: Avi Kivity Date: Wed Jan 31 23:48:13 2007 -0800 [PATCH] KVM: fix lockup on 32-bit intel hosts with nx disabled in the bios Intel hosts, without long mode, and with nx support disabled in the bios have an efer that is readable but not writable. This causes a lockup on switch to guest mode (even though it should exit with reason 34 according to the documentation). Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a4c24ec52128c1f57b7d2d24cf4dd13fc23f474 Author: Andrew Morton Date: Wed Jan 31 23:48:13 2007 -0800 [PATCH] pci: remove warning messages Remove these recently-added warnings. They don't tell us anythng very interesting and Kumar says "On an embedded PPC reference system I see this message 6 times when I've got no cards in the PCI slots." Acked-by: Kumar Gala Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb7468ef4cce8f240604b80b82ac157fa9930e94 Author: Jean Delvare Date: Wed Jan 31 23:48:12 2007 -0800 [PATCH] via quirk update Add special handling for the VT82C686. Signed-off-by: Jean Delvare Cc: Alan Cox Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04add672cf98a788e9e0d753b2ccfa4a3a0caf56 Author: Al Viro Date: Thu Feb 1 13:53:04 2007 +0000 [PATCH] uml-i386: fix build breakage with CONFIG_HIGHMEM missing helper used by arch/i386/mm/highmem.c, which is pulled into build on that configuration. Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 9d6ed92196f7acdd1052b0828bb1e2f1a7241815 Author: Al Viro Date: Thu Feb 1 13:52:59 2007 +0000 [PATCH] radio modems sitting on serial port are not for s390 Won't build (request_irq()/free_irq()), even if you manage to find an s390 box with 8250-compatible UART they are expecting. Signed-off-by: Al Viro Acked-by: Martin Schwidefsky Signed-off-by: Linus Torvalds commit b4cff8464b12b71fd6573c9b9dd762d2d390ef6c Author: Al Viro Date: Thu Feb 1 13:52:33 2007 +0000 [PATCH] sanitize sections for sparc32 smp a) sun4d_boot_one_cpu() should be __cpuinit (called only from __cpuinit __cpu_up(), for one thing, leads to calls of __cpuinit functions for another). b) got externs in arch/sparc/kernel/smp.c to match reality. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 472ba91dd9ce76b586d4d513f7e3448330eec7eb Author: Al Viro Date: Thu Feb 1 13:52:54 2007 +0000 [PATCH] efi_set_rtc_mmss() is not __init fix the extern in efi.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2a3d4f1f1f839e354ebd7d40b2d5d8ac8481a930 Author: Al Viro Date: Thu Feb 1 13:52:23 2007 +0000 [PATCH] __crc_... is intended to be absolute i386 boot/compressed/relocs checks for absolute symbols and warns about unexpected ones. If you build with modversions, you get ~2500 warnings about __crc_. These suckers are really absolute symbols - we do _not_ want to modify them on relocation. They are generated by genksyms - EXPORT_... generates a weak alias, then genksyms produces an ld script with __crc_ = and it's fed to ld to produce the final object file. Their only use is to match kernel and module at modprobe time; they _must_ be absolute. boot/compressed/relocs has a whitelist of known absolute symbols, but it doesn't know about __crc_... stuff. As the result, we get shitloads of false positives on any ld(1) version. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9abcf40b1d1443e6f0ef86e6a822193142a34abc Author: Al Viro Date: Thu Feb 1 13:52:48 2007 +0000 [PATCH] fork_idle() should be __cpuinit, not __devinit Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc2dd2e51a1940acac665696e6a70a1a73dc90a4 Author: Al Viro Date: Thu Feb 1 13:52:43 2007 +0000 [PATCH] endianness bug: ntohl() misspelled as >> 24 in fh_verify(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit eb7972271720bfc64dc8bacc5b15f874c0bcc859 Author: Al Viro Date: Thu Feb 1 13:52:38 2007 +0000 [PATCH] ide section fixes a) cleanup_module() should be __exit b) externs should match reality Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aaba6d4bf6f2a52a0c30ad1da4374ba24bd7163b Author: Al Viro Date: Thu Feb 1 13:52:28 2007 +0000 [PATCH] mca_nmi_hook() can be called at any point ... and having it __init is a bad idea. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e7bc537db9e13adee1f294aa370f16d80f40b73d Author: Al Viro Date: Thu Feb 1 13:08:45 2007 +0000 [PATCH] fix frv headers_check a) registers.h is really needed there b) include of asm-generic/termios should be under __KERNEL__ c) includes of asm-generic/{memory_model,page} should be under __KERNEL (nothing in there that would work in userland) d) a lot of stuff in ptrace.h should be under __KERNEL__. Signed-off-by: Al Viro Acked-by: David Howells Signed-off-by: Linus Torvalds commit 190ff5b3a168b666925897558998b5d97fec8731 Merge: 6fd6b17... 2e55302... Author: Linus Torvalds Date: Wed Jan 31 16:58:12 2007 -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: [NETFILTER]: xt_hashlimit: fix ip6tables dependency [SCTP]: Force update of the rto when processing HB-ACK [IPV6]: fix BUG of ndisc_send_redirect() [IPV6]: Fix up some CONFIG typos [NETFILTER]: SIP conntrack: fix out of bounds memory access [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers [NETFILTER]: xt_connbytes: fix division by zero [MAINTAINERS]: netfilter@ is subscribers-only commit 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e Author: Linus Torvalds Date: Wed Jan 31 16:43:36 2007 -0800 Revert "[PATCH] mm: micro optimise zone_watermark_ok" This reverts commit e80ee884ae0e3794ef2b65a18a767d502ad712ee. Pawel Sikora had a boot-time oops due to it - because the sign change invalidates the following comparisons, since 'free_pages' can be negative. The micro-optimization just isn't worth it. Bisected-by: Pawel Sikora Acked-by: Andrew Morton Cc: Nick Piggin Signed-off-by: Linus Torvalds commit 2e5530236645a042e1481aa19879b819c3e8f5c9 Author: Patrick McHardy Date: Tue Jan 30 21:36:09 2007 -0800 [NETFILTER]: xt_hashlimit: fix ip6tables dependency IP6_NF_IPTABLES=m, CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y results in a linker error since ipv6_find_hdr is defined in ip6_tables.c. Fix similar to Adrian Bunk's H.323 conntrack patch: selecting ip6_tables to be build as module requires hashlimit to be built as module as well. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e533ca16f31f9e5abfaf5d8c7dbe7095f01474b6 Author: Vlad Yasevich Date: Tue Jan 30 14:36:14 2007 -0800 [SCTP]: Force update of the rto when processing HB-ACK When processing a HEARTBEAT-ACK it's possible that the transport rto timers will not be updated because a prior T3-RTX processing would have cleared the rto_pending flag on the transport. However, if we received a valid HEARTBEAT-ACK, we want to force update the rto variables, so re-set the rto_pending flag before calling sctp_transport_update_rto(). Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 29556526b970c2e7d4ca808b6082c33981adfdff Author: Li Yewang Date: Tue Jan 30 14:33:20 2007 -0800 [IPV6]: fix BUG of ndisc_send_redirect() When I tested IPv6 redirect function about kernel 2.6.19.1, and found that the kernel can send redirect packets whose target address is global address, and the target is not the actual endpoint of communication. But the criteria conform to RFC2461, the target address defines as following: Target Address An IP address that is a better first hop to use for he ICMP Destination Address. When the target is the actual endpoint of communication, i.e., the destination is a neighbor, the Target Address field MUST contain the same value as the ICMP Destination Address field. Otherwise the target is a better first-hop router and the Target Address MUST be the router's link-local address so that hosts can uniquely identify routers. According to this definition, when a router redirect to a host, the target address either the better first-hop router's link-local address or the same as the ICMP destination address field. But the function of ndisc_send_redirect() in net/ipv6/ndisc.c, does not check the target address correctly. There is another definition about receive Redirect message in RFC2461: 8.1. Validation of Redirect Messages A host MUST silently discard any received Redirect message that does not satisfy all of the following validity checks: ...... - The ICMP Target Address is either a link-local address (when redirected to a router) or the same as the ICMP Destination Address (when redirected to the on-link destination). ...... And the receive redirect function of ndisc_redirect_rcv() implemented this definition, checks the target address correctly. if (ipv6_addr_equal(dest, target)) { on_link = 1; } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING "ICMPv6 Redirect: target address is not link-local.\n"); return; } So, I think the send redirect function must check the target address also. Signed-off-by: Li Yewang Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit fa03ef38e1516c1f35f6a189100186dded0f8f8c Author: Neil Horman Date: Tue Jan 30 14:30:10 2007 -0800 [IPV6]: Fix up some CONFIG typos Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit adcb4711101dfef89d473f64a913089d303962ae Author: Patrick McHardy Date: Tue Jan 30 14:25:24 2007 -0800 [NETFILTER]: SIP conntrack: fix out of bounds memory access When checking for an @-sign in skp_epaddr_len, make sure not to run over the packet boundaries. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7da5bfbb12e327b3a347ee3e076957cd6564eb56 Author: Lars Immisch Date: Tue Jan 30 14:24:57 2007 -0800 [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers When trying to skip over the username in the Contact header, stop at the end of the line if no @ is found to avoid mangling following headers. We don't need to worry about continuation lines because we search inside a SIP URI. Fixes Netfilter Bugzilla #532. Signed-off-by: Lars Immisch Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fb74a8416022c033e1a950689c264c453f8f98d8 Author: Patrick McHardy Date: Tue Jan 30 14:24:29 2007 -0800 [NETFILTER]: xt_connbytes: fix division by zero When the packet counter of a connection is zero a division by zero occurs in div64_64(). Fix that by using zero as average value, which is correct as long as the packet counter didn't overflow, at which point we have lost anyway. Additionally we're probably going to go back to 64 bit counters in 2.6.21. Based on patch from Jonas Berlin , with suggestions from KOVACS Krisztian . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 24a1dec55073000264f2da6278baef759929a14f Author: Randy Dunlap Date: Sun Jan 28 15:54:42 2007 -0800 [MAINTAINERS]: netfilter@ is subscribers-only netfilter mailing list is subscribers-only. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller