commit 4ed4b5475211fab6a0ad00eed2f9297395e7598e tree 9849dc8e2bc0ad68ed03a48d686f8c0ed65995a7 parent 79e453d49bd49ba1b576f89310cc565c9e4ca379 parent 5c2d97cb31fb77981797fec46230ca005b865799 author Linus Torvalds Tue, 19 Sep 2006 09:46:53 -0700 committer Linus Torvalds Tue, 19 Sep 2006 09:46:53 -0700 Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 * 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6: NFS: Fix nfs_page use after free issues in fs/nfs/write.c NFSv4: Fix incorrect semaphore release in _nfs4_do_open() NFS: Fix Oopsable condition in nfs_readpage_sync() commit 5c2d97cb31fb77981797fec46230ca005b865799 tree 8393101586bc3ed4e7577eeae215fc305b1999de parent 76723de0cf5b186afe2f329eeef304c321d52bf8 author Trond Myklebust Mon, 18 Sep 2006 23:20:35 -0400 committer Trond Myklebust Tue, 19 Sep 2006 11:59:10 -0400 NFS: Fix nfs_page use after free issues in fs/nfs/write.c Signed-off-by: Trond Myklebust commit 76723de0cf5b186afe2f329eeef304c321d52bf8 tree 677768d360a5288086aa6965ce4db67d556fac03 parent 7a52411107e1ac8f5be6967936ec237f40a1c7e4 author Trond Myklebust Fri, 15 Sep 2006 08:11:51 -0400 committer Trond Myklebust Tue, 19 Sep 2006 11:54:53 -0400 NFSv4: Fix incorrect semaphore release in _nfs4_do_open() Signed-off-by: Trond Myklebust commit 7a52411107e1ac8f5be6967936ec237f40a1c7e4 tree 155ba22e3d333f7e0f6cf1fcbb3d9538f75375fe parent 47a5c6fa0e204a2b63309c648bb2fde36836c826 author Trond Myklebust Fri, 15 Sep 2006 16:03:45 -0400 committer Trond Myklebust Tue, 19 Sep 2006 11:54:39 -0400 NFS: Fix Oopsable condition in nfs_readpage_sync() Signed-off-by: Trond Myklebust commit 79e453d49bd49ba1b576f89310cc565c9e4ca379 tree 690353097ed789d691c072edd3a7259e3477d511 parent ab5cfd2aa3af40b35d7a948de8e279dc82c5b9f6 author Linus Torvalds Tue, 19 Sep 2006 08:15:22 -0700 committer Linus Torvalds Tue, 19 Sep 2006 08:15:22 -0700 Revert mmiocfg heuristics and blacklist changes This reverts commits 11012d419cfc0e0f78ca356aca03674217910124 and 40dd2d20f220eda1cd0da8ea3f0f9db8971ba237, which allowed us to use the MMIO accesses for PCI config cycles even without the area being marked reserved in the e820 memory tables. Those changes were needed for EFI-environment Intel macs, but broke some newer Intel 965 boards, so for now it's better to revert to our old 2.6.17 behaviour and at least avoid introducing any new breakage. Andi Kleen has a set of patches that work with both EFI and the broken Intel 965 boards, which will be applied once they get wider testing. Cc: Arjan van de Ven Cc: Edgar Hucek Cc: Andi Kleen Signed-off-by: Linus Torvalds commit ab5cfd2aa3af40b35d7a948de8e279dc82c5b9f6 tree 3684691bcc62688cecd1f90f7ddcc052e2e601a5 parent 833f73299fdf4497af1552e219e95661f4d2cdca parent ea59830db01b6b3d6bda9f84e3d272a346115e8e author Linus Torvalds Tue, 19 Sep 2006 08:01:58 -0700 committer Linus Torvalds Tue, 19 Sep 2006 08:01:58 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [MTD] Use SEEK_{SET,CUR,END} instead of hardcoded values in mtdchar lseek() MTD: Fix bug in fixup_convert_atmel_pri [JFFS2][SUMMARY] Fix a summary collecting bug. [PATCH] [MTD] DEVICES: Fill more device IDs in the structure of m25p80 MTD: Add lock/unlock operations for Atmel AT49BV6416 MTD: Convert Atmel PRI information to AMD format fs/jffs2/xattr.c: remove dead code [PATCH] [MTD] Maps: Add dependency on alternate probe methods to physmap [PATCH] MTD: Add Macronix MX29F040 to JEDEC [MTD] Fixes of performance and stability issues in CFI driver. block2mtd.c: Make kernel boot command line arguments work (try 4) [MTD NAND] Fix lookup error in nand_get_flash_type() remove #error on !PCI from pmc551.c MTD: [NAND] Fix the sharpsl driver after breakage from a core conversion [MTD] NAND: OOB buffer offset fixups make fs/jffs2/nodelist.c:jffs2_obsolete_node_frag() static [PATCH] [MTD] NAND: fix dead URL in Kconfig commit 833f73299fdf4497af1552e219e95661f4d2cdca tree 3a8cbf486dce86116ada64d170896141ceee4692 parent ac7fb273ca1d0b4fb354575bb6e101ffd09e0b54 author Dave Kleikamp Mon, 18 Sep 2006 20:12:33 -0700 committer Linus Torvalds Tue, 19 Sep 2006 07:59:59 -0700 [PATCH] EXT2: Remove superblock lock contention in ext2_statfs Fix a performance degradation introduced in 2.6.17. (30% degradation running dbench with 16 threads) Commit 21730eed11de42f22afcbd43f450a1872a0b5ea1, which claims to make EXT2_DEBUG work again, moves the taking of the kernel lock out of debug-only code in ext2_count_free_inodes and ext2_count_free_blocks and into ext2_statfs. The same problem was fixed in ext3 by removing the lock completely (commit 5b11687924e40790deb0d5f959247ade82196665) Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac7fb273ca1d0b4fb354575bb6e101ffd09e0b54 tree 7c6d78e7200598fa13f8dea6de05d82b4fc28be0 parent 020d8c063b4d850b53dfbaee843c8335b7a90d26 author Matthew Wilcox Mon, 18 Sep 2006 20:12:27 -0700 committer Linus Torvalds Tue, 19 Sep 2006 07:59:59 -0700 [PATCH] headers_check: Clean up asm-parisc/page.h for user headers Remove definitions of PAGE_* from the user view Delete unnecessary comments referring to the size of pages Only include if we're in __KERNEL__ Signed-off-by: David Woodhouse Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 020d8c063b4d850b53dfbaee843c8335b7a90d26 tree be1565f8cde71597dced996c0abc730e13e46095 parent 271fc18eead0aa330758a3b9d8a57ffe315a1978 author Geert Uytterhoeven Mon, 18 Sep 2006 20:12:23 -0700 committer Linus Torvalds Tue, 19 Sep 2006 07:59:59 -0700 [PATCH] Fix 'make headers_check' on ia64 Fix 'make headers_check' on m68k Signed-off-by: Geert Uytterhoeven Cc: Roman Zippel Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 271fc18eead0aa330758a3b9d8a57ffe315a1978 tree ba424de8de1ca4307328593d9309094dce29e616 parent 86998aa6534e839ec003ed2ef7067d6fe8696ccc author David Woodhouse Mon, 18 Sep 2006 20:12:19 -0700 committer Linus Torvalds Tue, 19 Sep 2006 07:59:59 -0700 [PATCH] Add headers_check' target to output of 'make help' Signed-off-by: David Woodhouse Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86998aa6534e839ec003ed2ef7067d6fe8696ccc tree ca2e8fff9371ef26f339f2893c6c1d50c5f4e2fe parent 47a5c6fa0e204a2b63309c648bb2fde36836c826 author Ingo Molnar Tue, 19 Sep 2006 11:14:34 +0200 committer Linus Torvalds Tue, 19 Sep 2006 07:57:20 -0700 [PATCH] genirq core: fix handle_level_irq() while porting the -rt tree to 2.6.18-rc7 i noticed the following screaming-IRQ scenario on an SMP system: 2274 0Dn.:1 0.001ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.010ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.020ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.029ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.039ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.048ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.058ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.068ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.077ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.087ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) 2274 0Dn.:1 0.097ms: do_IRQ+0xc/0x103 <= (ret_from_intr+0x0/0xf) as it turns out, the bug is caused by handle_level_irq(), which if it races with another CPU already handling this IRQ, it _unmasks_ the IRQ line on the way out. This is not how 2.6.17 works, and we introduced this bug in one of the early genirq cleanups right before it went into -mm. (the bug was not in the genirq patchset for a long time, and we didnt notice the bug due to the lack of -rt rebase to the new genirq code. -rt, and hardirq-preemption in particular opens up such races much wider than anything else.) Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Acked-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 47a5c6fa0e204a2b63309c648bb2fde36836c826 tree 688b6c12c72fed720dc4a047f310cd292e88a6f1 parent 1d19f176a2884d31c4fe2c7018349ff884a819b1 author Linus Torvalds Mon, 18 Sep 2006 16:20:40 -0700 committer Linus Torvalds Mon, 18 Sep 2006 16:20:40 -0700 x86: save/restore eflags in context switch (And reset it on new thread creation) It turns out that eflags is important to save and restore not just because of iopl, but due to the magic bits like the NT bit, which we don't want leaking between different threads. Tested-by: Mike Galbraith Signed-off-by: Linus Torvalds commit 1d19f176a2884d31c4fe2c7018349ff884a819b1 tree f0f02160cb954d3d7bd4417548ca997f0a88fd45 parent 20bf94e266969f91c623ed8b51da4109e3f57bcb parent fe26109a9dfd9327fdbe630fc819e1b7450986b2 author Linus Torvalds Mon, 18 Sep 2006 16:16:05 -0700 committer Linus Torvalds Mon, 18 Sep 2006 16:16:05 -0700 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: [ATM] CLIP: Do not refer freed skbuff in clip_mkip(). [NET]: Drop tx lock in dev_watchdog_up [PACKET]: Don't truncate non-linear skbs with mmaped IO [NET]: Mark frame diverter for future removal. [NETFILTER]: Add secmark headers to header-y [ATM]: linux-atm-general mailing list is subscribers only [ATM]: [he] when transmit fails, unmap the dma regions [TCP] tcp-lp: update information to MAINTAINERS [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6 [BRIDGE]: random extra bytes on STP TCN packet [IPV6]: Accept -1 for IPV6_TCLASS [IPV6]: Fix tclass setting for raw sockets. [IPVS]: remove the debug option go ip_vs_ftp [IPVS]: Make sure ip_vs_ftp ports are valid [IPVS]: auto-help for ip_vs_ftp [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt [TCP]: Turn ABC off. [NEIGH]: neigh_table_clear() doesn't free stats commit 20bf94e266969f91c623ed8b51da4109e3f57bcb tree 4aead8959e49802b454d9c650a86ee04ae94ad47 parent 77e2782f9b683893c9341e9cf05c88b0caac7382 parent b9c54f91a48146778fe91423d4d467a0ee8c719b author Linus Torvalds Mon, 18 Sep 2006 16:15:40 -0700 committer Linus Torvalds Mon, 18 Sep 2006 16:15:40 -0700 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: [SPARC]: Fix regression in sys_getdomainname() [OPENPROMIO]: Handle current_node being NULL correctly. commit 77e2782f9b683893c9341e9cf05c88b0caac7382 tree de65fd4477b104c64b55c144529fa6185fc70853 parent 803db244b9f71102e366fd689000c1417b9a7508 parent e40b1074af46d53740320f88dfffd9fb2f78bdf3 author Linus Torvalds Mon, 18 Sep 2006 16:15:16 -0700 committer Linus Torvalds Mon, 18 Sep 2006 16:15:16 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3815/1: headers_install support for ARM [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM [ARM] 3793/1: S3C2412: fix wrong serial info struct [ARM] 3780/1: Fix iop321 cpuid [ARM] 3786/1: pnx4008: update defconfig [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413 commit e40b1074af46d53740320f88dfffd9fb2f78bdf3 tree a3809ce5543118430361ed3fcaef65619bdaa7f2 parent a9c3685b2f0515bffd8d13ea9e3417664ff22a07 author Ralph Siemsen Mon, 18 Sep 2006 16:28:50 +0100 committer Russell King Mon, 18 Sep 2006 16:28:50 +0100 [ARM] 3815/1: headers_install support for ARM Move kernel-only #includes into #ifdef __KERNEL__, so that headers_install target can be used on ARM. Signed-off-by: Ralph Siemsen Signed-off-by: Russell King commit b9c54f91a48146778fe91423d4d467a0ee8c719b tree f123be6ee2fb44b5795a3aa6f0ccbc8e9ea19d2b parent b9b64e6e89fc5a6ef220747115c5b7764614ca3f author Andy Walker Mon, 18 Sep 2006 07:11:36 -0700 committer David S. Miller Mon, 18 Sep 2006 07:11:36 -0700 [SPARC]: Fix regression in sys_getdomainname() This patch corrects the buffer length checking in the sys_getdomainname() implementation for sparc/sparc64. Signed-off-by: Andy Walker Signed-off-by: David S. Miller commit fe26109a9dfd9327fdbe630fc819e1b7450986b2 tree c8e2e446a2756f6c55aa8faa45de6a0f1a216f56 parent d7811e623dd4be3e3bdba2d6330f7f15541ee45f author YOSHIFUJI Hideaki Mon, 18 Sep 2006 06:37:58 -0700 committer David S. Miller Mon, 18 Sep 2006 06:37:58 -0700 [ATM] CLIP: Do not refer freed skbuff in clip_mkip(). In clip_mkip(), skb->dev is dereferenced after clip_push(), which frees up skb. Advisory: AD_LAB-06009 (). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit a9c3685b2f0515bffd8d13ea9e3417664ff22a07 tree 358a877cbd770157d9483251937da6ae74189bbb parent 71aa7054d3df0f74d9ffbef3dd1486764c7f592a author Ben Dooks Mon, 18 Sep 2006 13:30:20 +0100 committer Russell King Mon, 18 Sep 2006 13:30:20 +0100 [ARM] 3794/1: S3C24XX: do not defined set_irq_wake when no CONFIG_PM Patch from Ben Dooks Do not define set_irq_wake as a real function if the CONFIG_PM option is not set. Fixes bug reported by Thomas Gleixner. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 71aa7054d3df0f74d9ffbef3dd1486764c7f592a tree e809f36621b135d07e9a5dac0e063bc648a99a78 parent 36694a4c22767ee09c91ccda63810086c65c810b author Ben Dooks Mon, 18 Sep 2006 13:30:17 +0100 committer Russell King Mon, 18 Sep 2006 13:30:17 +0100 [ARM] 3793/1: S3C2412: fix wrong serial info struct Patch from Ben Dooks The S3C2440 serial info struct is being passed through the S3C2412 serial info struct probe routine. Signed-off-by: Ben Dooks Signed-off-by: Thomas Glexiner Signed-off-by: Russell King commit b9b64e6e89fc5a6ef220747115c5b7764614ca3f tree 2d28434f793807b4a83bd5dc139e165c7c317389 parent 803db244b9f71102e366fd689000c1417b9a7508 author David S. Miller Mon, 18 Sep 2006 01:47:13 -0700 committer David S. Miller Mon, 18 Sep 2006 01:47:13 -0700 [OPENPROMIO]: Handle current_node being NULL correctly. If the user tries to traverse to the next node of the last node, we get NULL in current_node and a zero phandle returned. That's fine, but if the user tries to obtain properties in that state, we try to dereference a NULL pointer in the downcall to the of_*() routines. So protect against that. Signed-off-by: David S. Miller commit d7811e623dd4be3e3bdba2d6330f7f15541ee45f tree f43bafe2e8d7e43b2cc3f4cb7dcda4c5e8815630 parent cbe21d8fefca605b90e34f0f019505e599712f9b author Herbert Xu Mon, 18 Sep 2006 00:22:30 -0700 committer David S. Miller Mon, 18 Sep 2006 00:22:30 -0700 [NET]: Drop tx lock in dev_watchdog_up Fix lockdep warning with GRE, iptables and Speedtouch ADSL, PPP over ATM. On Sat, Sep 02, 2006 at 08:39:28PM +0000, Krzysztof Halasa wrote: > > ======================================================= > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > swapper/0 is trying to acquire lock: > (&dev->queue_lock){-+..}, at: [] dev_queue_xmit+0x56/0x290 > > but task is already holding lock: > (&dev->_xmit_lock){-+..}, at: [] dev_queue_xmit+0x224/0x290 > > which lock already depends on the new lock. This turns out to be a genuine bug. The queue lock and xmit lock are intentionally taken out of order. Two things are supposed to prevent dead-locks from occuring: 1) When we hold the queue_lock we're supposed to only do try_lock on the tx_lock. 2) We always drop the queue_lock after taking the tx_lock and before doing anything else. > > the existing dependency chain (in reverse order) is: > > -> #1 (&dev->_xmit_lock){-+..}: > [] lock_acquire+0x76/0xa0 > [] _spin_lock_bh+0x31/0x40 > [] dev_activate+0x69/0x120 This path obviously breaks assumption 1) and therefore can lead to ABBA dead-locks. I've looked at the history and there seems to be no reason for the lock to be held at all in dev_watchdog_up. The lock appeared in day one and even there it was unnecessary. In fact, people added __dev_watchdog_up precisely in order to get around the tx lock there. The function dev_watchdog_up is already serialised by rtnl_lock since its only caller dev_activate is always called under it. So here is a simple patch to remove the tx lock from dev_watchdog_up. In 2.6.19 we can eliminate the unnecessary __dev_watchdog_up and replace it with dev_watchdog_up. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit cbe21d8fefca605b90e34f0f019505e599712f9b tree b30a61468e18c04c91549231d4ca3b2cb67cb52b parent 080f22c0dc544e498e57ad281a9de063fa839957 author Patrick McHardy Sun, 17 Sep 2006 23:59:57 -0700 committer David S. Miller Sun, 17 Sep 2006 23:59:57 -0700 [PACKET]: Don't truncate non-linear skbs with mmaped IO Non-linear skbs are truncated to their linear part with mmaped IO. Fix by using skb_copy_bits instead of memcpy. Signed-off-by: Patrick McHardy Acked-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 080f22c0dc544e498e57ad281a9de063fa839957 tree e97dbbcdec76f3e50c3957c2d850ceec8c3cd237 parent dc36251037ae4f69f2f764efd9b57136e3b9848d author Stephen Hemminger Wed, 13 Sep 2006 21:13:54 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:14 -0700 [NET]: Mark frame diverter for future removal. The code for frame diverter is unmaintained and has bitrotted. The number of users is very small and the code has lots of problems. If anyone is using it, they maybe exposing themselves to bad packet attacks. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit dc36251037ae4f69f2f764efd9b57136e3b9848d tree 3b97a0e7b542a22326565edf1566e2d01ec524ad parent f37bf90ec115d92549984438a2d157add7ae85a4 author James Morris Wed, 13 Sep 2006 21:04:55 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:13 -0700 [NETFILTER]: Add secmark headers to header-y This patch includes xt_SECMARK.h and xt_CONNSECMARK.h to the kernel headers which are exported via 'make headers_install'. This is needed to allow userland code to be built correctly with these features. Please apply, and consider for inclusion with 2.6.18 as a bugfix. Signed-off-by: James Morris Signed-off-by: David S. Miller commit f37bf90ec115d92549984438a2d157add7ae85a4 tree cb4c1a76c400c6479d5818a0cc1102261ae47f3e parent d730e1033f81fefd3176f53e070b2b64cd146db0 author Roland Dreier Wed, 13 Sep 2006 20:39:33 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:12 -0700 [ATM]: linux-atm-general mailing list is subscribers only As the automated reply I got to my last ATM patch shows, the linux-atm-general mailing list is subscribers-only. Signed-off-by: Roland Dreier Signed-off-by: David S. Miller commit d730e1033f81fefd3176f53e070b2b64cd146db0 tree 3370c9194e2d35165a5dca3e1ae394b0f6b98d47 parent 5067f08abad451661dd154be4193ba231a61e747 author Chas Williams Wed, 13 Sep 2006 20:33:40 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:11 -0700 [ATM]: [he] when transmit fails, unmap the dma regions Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 5067f08abad451661dd154be4193ba231a61e747 tree 8d83f2da28c1d0d0a6c042311b163a3d39a81e30 parent 3795da47e82ee0596174f52817d6d3ecd91f68ea author Wong Hoi Sing Edison Wed, 13 Sep 2006 20:31:13 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:10 -0700 [TCP] tcp-lp: update information to MAINTAINERS Signed-off-by: Wong Hoi Sing Edison Signed-off-by: David S. Miller commit 3795da47e82ee0596174f52817d6d3ecd91f68ea tree 73a37568349bcefb554af606fa2363091f9828ad parent 485c2967d622449f4bbfae305a6fc4e185b5b094 author Wong Hoi Sing Edison Wed, 13 Sep 2006 20:30:30 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:09 -0700 [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6 Sorry that the patch submited yesterday still contain a small bug. This version have already been test for hours with BT connections. The oops is now difficult to reproduce. Signed-off-by: Wong Hoi Sing Edison Signed-off-by: David S. Miller commit 485c2967d622449f4bbfae305a6fc4e185b5b094 tree 4f06861f759258ab1594758e05bfc51d05d6baf8 parent d0ee011f7290b51974e4d058cf4455a5ef91177d author Stephen Hemminger Wed, 13 Sep 2006 20:12:40 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:08 -0700 [BRIDGE]: random extra bytes on STP TCN packet We seem to send 3 extra bytes in a TCN, which will be whatever happens to be on the stack. Thanks to Aji_Srinivas@emc.com for seeing. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d0ee011f7290b51974e4d058cf4455a5ef91177d tree acbf283e13a48a242ac255b88d0db4a68d122d0c parent e012d51cbc41c5e603d7850c82acb0dad9e450dd author Remi Denis-Courmont Wed, 13 Sep 2006 20:08:07 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:08 -0700 [IPV6]: Accept -1 for IPV6_TCLASS This patch should add support for -1 as "default" IPv6 traffic class, as specified in IETF RFC3542 §6.5. Within the kernel, it seems tclass < 0 is already handled, but setsockopt, getsockopt and recvmsg calls won't accept it from userland. Signed-off-by: Remi Denis-Courmont Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e012d51cbc41c5e603d7850c82acb0dad9e450dd tree 90dbb35873b853725a4de13cfe16990430a5d6aa parent b552216ff1340a056aa0e12da68203902ae81d2c author YOSHIFUJI Hideaki Wed, 13 Sep 2006 20:01:28 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:07 -0700 [IPV6]: Fix tclass setting for raw sockets. np->cork.tclass is used only in cork'ed context. Otherwise, np->tclass should be used. Bug#7096 reported by Remi Denis-Courmont . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b552216ff1340a056aa0e12da68203902ae81d2c tree 1cf2732adbd019bd261140ac8ba58e0dce4df34b parent 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc author Simon Horman Wed, 13 Sep 2006 19:59:23 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:06 -0700 [IPVS]: remove the debug option go ip_vs_ftp This patch makes the debuging behaviour of this code more consistent with the rest of IPVS. Signed-Off-By: Simon Horman Signed-off-by: David S. Miller commit 3f5af5b353ca36aca4f8a46e3da2172f669dbbbc tree 25e92e2d951e8d6d709208a71fca6cc738e7cbcd parent 70e76b768bac81149c8c189e781c3f130ea2eba5 author Simon Horman Wed, 13 Sep 2006 19:58:44 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:05 -0700 [IPVS]: Make sure ip_vs_ftp ports are valid I'm not entirely sure what happens in the case of a valid port, at best it'll be silently ignored. This patch ignores them a little more verbosely. Signed-Off-By: Simon Horman Signed-off-by: David S. Miller commit 70e76b768bac81149c8c189e781c3f130ea2eba5 tree 75d0211feabb6f068df26df490d28ed4afb8f9b1 parent 72c4a13aaa0f6271e6b962a66befd68bac923bc3 author Simon Horman Wed, 13 Sep 2006 19:57:54 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:04 -0700 [IPVS]: auto-help for ip_vs_ftp Fill in a help message for the ports option to ip_vs_ftp Signed-Off-By: Simon Horman Signed-off-by: David S. Miller commit 72c4a13aaa0f6271e6b962a66befd68bac923bc3 tree a1b49e135589aac9583088e25c967ad30cad65fe parent b3a8a40da5751525936c88f60bbc6a007f9eee37 author Simon Horman Wed, 13 Sep 2006 19:57:18 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:03 -0700 [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt I'm not sure if documenting this here is appropriate, but if it is, here is some text to put there. Signed-Off-By: Simon Horman Signed-off-by: David S. Miller commit b3a8a40da5751525936c88f60bbc6a007f9eee37 tree 4ddbfab5a63407ed9955598834008500d5bcad45 parent 3fcde74b3877756f4b4725a883d0b48696c0d369 author Stephen Hemminger Wed, 13 Sep 2006 19:51:02 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:02 -0700 [TCP]: Turn ABC off. Turn Appropriate Byte Count off by default because it unfairly penalizes applications that do small writes. Add better documentation to describe what it is so users will understand why they might want to turn it on. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3fcde74b3877756f4b4725a883d0b48696c0d369 tree afadd7d4d1a3b01f0941b8e1039bad6b2ba222af parent 803db244b9f71102e366fd689000c1417b9a7508 author Kirill Korotaev Fri, 01 Sep 2006 01:34:10 -0700 committer David S. Miller Sun, 17 Sep 2006 23:21:01 -0700 [NEIGH]: neigh_table_clear() doesn't free stats neigh_table_clear() doesn't free tbl->stats. Found by Alexey Kuznetsov. Though Alexey considers this leak minor for mainstream, I still believe that cleanup code should not forget to free some of the resources :) At least, this is critical for OpenVZ with virtualized neighbour tables. Signed-Off-By: Kirill Korotaev Signed-off-by: David S. Miller commit ea59830db01b6b3d6bda9f84e3d272a346115e8e tree 85fe1044ae7aad2ef75c3afcbe7db388a8d92957 parent de591dacf3034977b3fb94b61d08240c8b35c39d author Josef 'Jeff' Sipek Sat, 16 Sep 2006 21:09:29 -0400 committer David Woodhouse Sun, 17 Sep 2006 17:04:23 +0100 [MTD] Use SEEK_{SET,CUR,END} instead of hardcoded values in mtdchar lseek() Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: David Woodhouse commit 803db244b9f71102e366fd689000c1417b9a7508 tree 2fe1abfd16cded8074905b6b91d9d1943e15325e parent 8b98a37c4b00f3fbcf162281bd4595777e61241b parent f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a author Jeff Garzik Sun, 17 Sep 2006 01:05:43 -0400 committer Jeff Garzik Sun, 17 Sep 2006 01:05:43 -0400 Merge branch 'master' into upstream-fixes commit 8b98a37c4b00f3fbcf162281bd4595777e61241b tree 3d3dfe8a3d1872dbc6bd6cca37a4454952310203 parent f956b6902eabbff249000287c7b36cd65761d8b8 author Frank Pavlic Fri, 15 Sep 2006 16:27:02 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:08 -0400 [PATCH] s390: qeth driver fixes [6/6] [PATCH 9/9] s390: qeth driver fixes [6/6] From: Frank Pavlic - Hipersockets has no IPV6 support, thus prevent issueing SETRTG_IPV6 control commands on Hipersockets devices. - fixed error handling in qeth_sysfs_(un)register Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f956b6902eabbff249000287c7b36cd65761d8b8 tree 8452e831e5361be54e392cf678abefa55716a719 parent 09d2d38a152419467f764c0f730821e896766c1f author Frank Pavlic Fri, 15 Sep 2006 16:26:52 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: qeth driver fixes [5/6] [PATCH 8/9] s390: qeth driver fixes [5/6] From: Frank Pavlic fix kernel panic in qdio queue handling. qeth_qdio_clear_card() could be invoked by 2 CPUs simultaneously (for example reboot event and recovery). Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 09d2d38a152419467f764c0f730821e896766c1f tree 56001b9b3573a9a2fc05f74a4e2d0571607d0a19 parent f7b65d70a3e6f1c97eb614964270816992d0d4b4 author Frank Pavlic Fri, 15 Sep 2006 16:26:34 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: qeth driver fixes [4/6] [PATCH 7/9] s390: qeth driver fixes [4/6] From: Frank Pavlic - fix kernel crash due to race, set card->state to SOFTSETUP after card and card->dev are initialized properly. - remove CONFIG_QETH_PERF_STATS, use sysfs attribute instead, as we want to have the ability to turn on/off the statistics at runtime. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f7b65d70a3e6f1c97eb614964270816992d0d4b4 tree fae68b2d6c215abacd3074b81bc320f5b3e3a0e0 parent 1fda1a120b7dcddf382ad105b4783a69e81c7a2b author Frank Pavlic Fri, 15 Sep 2006 16:26:19 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: qeth driver fixes [3/6] [PATCH 6/9] s390: qeth driver fixes [3/6] From: Frank Pavlic fixed kernel panic caused by qeth driver: Using a bonding device qeth driver will realloc headroom for every skb coming from the bond device. Once this happens qeth frees the original skb and set the skb pointer to the new realloced skb. Under heavy transmit workload (e.g.UDP streams) through bond network device the qdio output queue might get full. In this case we return with EBUSY from qeth_send_packet. Returning to qeth_hard_start_xmit routine the skb address on the stack still points to the old address, which has been freed before. Returning from qeth_hard_start_xmit with EBUSY results in requeuing the skb. In this case it corrupts the qdisc queue and results in kernel panic. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 1fda1a120b7dcddf382ad105b4783a69e81c7a2b tree 46da9fa7105ca5594d94d55ec47e2a7dac7302e7 parent 330b636908b44e73c714fb2632602ddd96f72c01 author Frank Pavlic Fri, 15 Sep 2006 16:26:07 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: qeth driver fixes [2/6] [PATCH 5/9] s390: qeth driver fixes [2/6] From: Frank Pavlic - fixed error handling in create_device_attributes - fixed some minor bugs in IPv4 and IPv6 address checking Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 330b636908b44e73c714fb2632602ddd96f72c01 tree 684d601d2ed50ed91f1057b2eea2d5cd485b2ebd parent f449c565ea324397f83adb65e9d0b599cfbc7dab author Frank Pavlic Fri, 15 Sep 2006 16:25:56 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: qeth driver fixes [1/6] [PATCH 4/9] s390: qeth driver fixes [1/6] From: Frank Pavlic - Drop incoming packets with vlan_tag set if card->vlangrp is not set. - use always vlan_hwaccel_rx to pass vlan frames to the stack. - fix recovery problem. Device was recovered properly but still not working. netif_carrier_on call right before recovery start fixes it. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f449c565ea324397f83adb65e9d0b599cfbc7dab tree 1fd36e35dd1f3ca7d2afc121b44a4ac5601f7060 parent 16a83b30772ad9f20d4233f8872405ad52165cd0 author Frank Pavlic Fri, 15 Sep 2006 16:25:39 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: Makefile cleanup [PATCH 3/9] s390: Makefile cleanup From: Frank Pavlic remove CONFIG_MPC from Makefile which was introduced accidently in the past. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 16a83b30772ad9f20d4233f8872405ad52165cd0 tree 1cb9ff33f3dfe46ef5fa956c59fe7bc331443129 parent 4c7ae6ea595aef732d029647d708eaeac7238036 author Frank Pavlic Fri, 15 Sep 2006 16:25:19 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:07 -0400 [PATCH] s390: netiucv driver fixes [PATCH 2/9] s390: netiucv driver fixes From: Frank Pavlic - missing lock initialization added - avoid duplicate iucv-interfaces to the same peer - rw-lock added for manipulating the list of defined iucv connections Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 4c7ae6ea595aef732d029647d708eaeac7238036 tree 8875abb0310f38a82b818e92c5a6deeecf39527b parent 71d28725548be203e8b8f6ad63b1f64fd7f02d4d author Frank Pavlic Fri, 15 Sep 2006 16:25:03 +0200 committer Jeff Garzik Sun, 17 Sep 2006 01:03:06 -0400 [PATCH] s390: minor s390 network driver fixes Hi Jeff, this is a RESEND of the nine s390 network driver patches. I finally found that my kmail corrupted almost every patch I sent the last time. Please apply these 9 patches and forget about my first attempt! Sorry for the delay, I had some fights with sendmail, IMAP and mutt configuration. Frank [RESEND PATCH 1/9] s390: minor s390 network driver fixes From: Frank Pavlic - iucv driver: use do { } while (0) constructs instead of empty defines to avoid compile bugs. - ctc driver: missing lock initialization added - lcs driver: BUG_ON usage was removed accidently with the last lcs patch. Put them back in place. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a tree 48ed1289bbba1cb0220d3f17cecc9ec0a8cf5a29 parent 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f author Benjamin LaHaise Sat, 16 Sep 2006 16:35:46 -0700 committer Linus Torvalds Sat, 16 Sep 2006 21:37:48 -0700 [PATCH] i386/x86-64: Add core 2 to oprofile Add the CPU identification needed by oprofile for Intel (r) Core (tm) 2 CPUs. Signed-off-by: Benjamin LaHaise Signed-off-by: Andi Kleen Cc: "Arun Sharma" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f tree 91a9a27ca6aabd7f1ba57112029b662a9ee3d109 parent 27bea3275515e5bd748ed7a492d0df605f5e824a parent d5bb75999cb5733ad936ff000023221fe7a13c59 author Linus Torvalds Sat, 16 Sep 2006 21:35:15 -0700 committer Linus Torvalds Sat, 16 Sep 2006 21:35:15 -0700 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: RDMA/cma: Increase the IB CM retry count in CMA IPoIB: Retry failed send-only multicast group joins IB/srp: Don't schedule reconnect from srp commit 27bea3275515e5bd748ed7a492d0df605f5e824a tree eea0bc13de3a00717a78c6dfa860d09172a09919 parent 96da96065bd66164acc3c8a1ea6db4ee765537e9 author Zoltan Sogor Sat, 16 Sep 2006 12:15:59 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] JFFS2: SUMMARY: fix a summary collecting bug In some special case (padding because of sync or umount) it can be possible that summary information is not fit to the end of the erase block. In these cases the collecting of summary is disabled for this erase block. The problem was that this was not respected by jffs2_sum_add_kvec(). This patch fix this bug. Signed-off-by: Ferenc Havasi Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96da96065bd66164acc3c8a1ea6db4ee765537e9 tree baa607c16c0cb2034cb9eb881fa840ad2f3ef2b5 parent 20acaa18d0c002fec180956f87adeb3f11f635a6 author Vitaly Wool Sat, 16 Sep 2006 12:15:58 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] MTD NAND: OOB buffer offset fixups In the case of data-pad-ecc-pad-data... layout the oob start position has to be sizeof(data) in nand_write_oob_syndrom(). In nand_fill_oob() we need to copy to buf + buffer offset instead of buf + write offset. Signed-off-by: Vitaly Wool Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20acaa18d0c002fec180956f87adeb3f11f635a6 tree 2cd2f21530150e8248a0217e380d58d42e79d89d parent e4b69aa2a1bcee21f8d5e089b8682dd8aaace5eb author Suparna Bhattacharya Sat, 16 Sep 2006 12:15:58 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] ext3 sequential read regression fix ext3-get-blocks support caused ~20% degrade in Sequential read performance (tiobench). Problem is with marking the buffer boundary so IO can be submitted right away. Here is the patch to fix it. 2.6.18-rc6: ----------- # ./iotest 1048576+0 records in 1048576+0 records out 4294967296 bytes (4.3 GB) copied, 75.2726 seconds, 57.1 MB/s real 1m15.285s user 0m0.276s sys 0m3.884s 2.6.18-rc6 + fix: ----------------- [root@elm3a241 ~]# ./iotest 1048576+0 records in 1048576+0 records out 4294967296 bytes (4.3 GB) copied, 62.9356 seconds, 68.2 MB/s The boundary block check in ext3_get_blocks_handle needs to be adjusted against the count of blocks mapped in this call, now that it can map more than one block. Signed-off-by: Suparna Bhattacharya Tested-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4b69aa2a1bcee21f8d5e089b8682dd8aaace5eb tree ccc3ff548d892965999d2ec2d64617e6daff41ac parent 1ab7a1f3b496aae5b1e062a6f50d62830c248190 author Kenneth Lee Sat, 16 Sep 2006 12:15:55 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] bug fix in kernel/kmod.c I think there is a bug in kmod.c: In __call_usermodehelper(), when kernel_thread(wait_for_helper, ...) return success, since wait_for_helper() might call complete() at any time, the sub_info should not be used any more. Normally wait_for_helper() take a long time to finish, you may not get problem for most of the case. But if you remove /sbin/modprobe, it may become easier for you to get a oop in khelper. Cc: Matt Helsley Cc: Martin Schwidefsky Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ab7a1f3b496aae5b1e062a6f50d62830c248190 tree 6dc9840ccc8d83705894c3bdc4b397c4e2ac25d2 parent ae81f9e3791a30fc2dcfb38b7733b423f24571f7 author David Woodhouse Sat, 16 Sep 2006 12:15:55 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] headers_check: use a different default directory `make headers_check' wants to go and write stuff in /lib/modules, which requires root, whic is unfortunate. In fact, there's no _particular_ reason for headers_install to put it there either -- it can go into a subdirectory of the build tree in both cases. It's not intended to go directly into /usr/include, which is why we didn't put it there -- and we certainly don't want people screwing around with symlinking to it. It's for distributors to take away and do stuff with, so leaving it in $(objtree) is fine, even in the headers_install case. I picked $(objtree)/usr/include but I have no _particular_ preference for that; it just seemed reasonable. Signed-off-by: David Woodhouse Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae81f9e3791a30fc2dcfb38b7733b423f24571f7 tree db7a53d6a0e9d1f7b791626994d1d392ca1e8a06 parent 7f9d77d75895c0d7e326d75263af21d7e2759879 author Chuck Ebbert <76306.1226@compuserve.com> Sat, 16 Sep 2006 12:15:53 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] Kconfig: move CONFIG_EMBEDDED options to submenu Fix two problems with the CONFIG_EMBEDDED submenu: (1) The menu was split in two by the rt_mutex patch, which moved half the items into the "General setup" menu. (2) CONFIG_SYSCTL and CONFIG_UID16 were added to the main menu instead of the submenu. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Sam Ravnborg Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f9d77d75895c0d7e326d75263af21d7e2759879 tree 3b07576e26cd9e0a4ac19c3e98b6e979481cf1c5 parent 75da736fb3dc5cc8add98da0d02fe5103d7ce059 author David Woodhouse Sat, 16 Sep 2006 12:15:49 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] Fix 'make headers_check' for Alpha Alpha currently fails 'make headers_check' in the 2.6.18-rc kernels. This patch fixes it, by moving the existing #ifdef __KERNEL__ in asm/page.h so that it covers everything that userspace shouldn't so, and by adding asm/compiler.h to the list of exported files so that its use within asm/byteorder.h is successful. [ Note that at least with GCC 4, doesn't do the forced inlining about which there are nasty comments (and a workaround) in , unless you set CONFIG_FORCED_INLINING. Rather than keep the mess you have in you could perhaps just make sure CONFIG_FORCED_INLINING=n is also honoured with GCC3, and make sure it cannot be set for Alpha? ] Signed-off-by: David Woodhouse Cc: Sam Ravnborg Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75da736fb3dc5cc8add98da0d02fe5103d7ce059 tree cc257924ebeef75b650b79ea6a33429a6eac84b8 parent e5fa6d70318e4a6a644edbb7d574059e5b326de1 author David Woodhouse Sat, 16 Sep 2006 12:15:48 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] Fix 'make headers_check' on x86_64 On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote: > asm-x86_64/elf.h requires asm/processor.h, which does not exist > asm-x86_64/signal.h requires linux/linkage.h, which does not exist > asm-x86_64/unistd.h requires linux/linkage.h, which does not exist > asm-x86_64/vsyscall.h requires linux/seqlock.h, which does not exist Again, move stuff which shouldn't be visible inside (mostly already existing) #ifdef __KERNEL__. This fixes a bunch of mislabelled and unlabelled #endifs in unistd.h and also cleans that up to conform with what's visible on other architectures, since the minimal fix for the error reported about would have involved a more intrusive patch, renesting other ifdefs. Signed-off-by: David Woodhouse Cc: Sam Ravnborg Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5fa6d70318e4a6a644edbb7d574059e5b326de1 tree 75277f4c238b0d2a0718d5e8e089e381ef158e17 parent d5759641f5809b19bad4e2af6ca97b830545aaba author David Woodhouse Sat, 16 Sep 2006 12:15:48 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] Fix 'make headers_check' on i386 This brings i386 asm/unistd.h into consistency with other architectures by not exporting functionality which is not necessary. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5759641f5809b19bad4e2af6ca97b830545aaba tree 0e61191f5cc28d5497871c8f53e21e12d247f5e7 parent 124b51c7a8a2b47f1c4739905a28ab3ea5f17faa author David Woodhouse Sat, 16 Sep 2006 12:15:47 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:32 -0700 [PATCH] Fix 'make headers_check' on ia64 On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote: > asm-ia64/ptrace.h requires asm/asm-offsets.h, which does not exist > asm-ia64/resource.h requires asm/ustack.h, which does not exist Hide parts which shouldn't be visible to userspace. Signed-off-by: David Woodhouse Cc: Sam Ravnborg Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 124b51c7a8a2b47f1c4739905a28ab3ea5f17faa tree d7963242d67bfe82b327ed32af686e8317f28609 parent b512217736049cef3e681bbd3ff6696c1cca567d author David Woodhouse Sat, 16 Sep 2006 12:15:46 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Fix 'make headers_check' on s390 On Tue, 2006-09-12 at 17:44 +0100, David Woodhouse wrote: > asm-s390/debug.h requires linux/string.h, which does not exist > asm-s390/elf.h requires asm/system.h, which does not exist Move things around slightly so the right things end up within #ifdef __KERNEL__ and thus don't pollute the exported headers. Signed-off-by: David Woodhouse Cc: Sam Ravnborg Acked-by: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b512217736049cef3e681bbd3ff6696c1cca567d tree 41011b351a88f7fec688a9f5019378aaac2896a9 parent ac3b719cc373a7873e0f7173a9abc50f13650637 author David Woodhouse Sat, 16 Sep 2006 12:15:45 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Fix 'make headers_check' on biarch architectures We generate an which includes either or as appropriate. But we were doing this dependent on whether the file in question existed in the _unexported_ tree, not the exported tree. So if a file was exported to userspace in one asm- directory but not the other, the generated file in asm/ was incorrect. This only changed the failure mode if it _was_ included from a nice #error to a less explicable #include failure -- but it also gave false errors in 'make headers_check' output. Fix it by looking in the right place instead. Signed-off-by: David Woodhouse Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac3b719cc373a7873e0f7173a9abc50f13650637 tree 15c3ae02c47d81cc237b21c68584e5c6847bfffe parent 87dedbda0ed9d005c2d049487e0e522797c18764 author Josh Triplett Sat, 16 Sep 2006 12:15:44 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Add symbol type files (*.symtypes) to .gitignore The kernel build system supports making symbol type files (*.symtypes) from C source files. Add these files to .gitignore. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87dedbda0ed9d005c2d049487e0e522797c18764 tree 4f2b059d67bb7aad8fc99194b5ac7c528f23ecf2 parent 0f71a3738c91c3b8da60c63b04557ebd6060a1ea author Josh Triplett Sat, 16 Sep 2006 12:15:43 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Add mixed source and assembly listings (*.lst) to .gitignore The kernel build system supports making mixed source and assembly listings (*.lst) from C source files. Add these files to .gitignore. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f71a3738c91c3b8da60c63b04557ebd6060a1ea tree 8cb0c83a987c9b519e63943abb4bb822c8b768f2 parent 4064d5ef26a04d9e34e4c0f348e30f14ab6828d8 author Josh Triplett Sat, 16 Sep 2006 12:15:42 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Add preprocessed files (*.i) to .gitignore The kernel build system supports making preprocessed files (*.i) from C source files. Add these files to .gitignore. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4064d5ef26a04d9e34e4c0f348e30f14ab6828d8 tree 7d5cf7cd499c6d0089aa85667424f0913579a6fb parent 8f5cbd7e4810df382029ecaaa98535452da5d15e author Corey Minyard Sat, 16 Sep 2006 12:15:41 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] IPMI: fix handling of OEM flags If one of the OEM flags becomes set in the flags from the hardware, the driver could hang if no OEM handler was set. Fix the code to handle this. This was tested by setting the flags by hand after they were fetched. Signed-off-by: Corey Minyard Ackde-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f5cbd7e4810df382029ecaaa98535452da5d15e tree 15cca8524c677332ef30ecb0f8b858f56f27fbdf parent b64074e46a9c2a7d5c66eff066a7c0b58377a143 author Ross Biro Sat, 16 Sep 2006 12:15:39 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] Add a missing space that prevents building modules that require host programs Signed-off-by: Ross Biro Acked-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b64074e46a9c2a7d5c66eff066a7c0b58377a143 tree 625cb0413eae4f25bad402da2de93851c9915f60 parent fdb36673a9d6accf93b11e7eff3a7e34cd284616 author Andrew Morton Sat, 16 Sep 2006 12:15:38 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] hvc_console suspend fix Fix http://bugzilla.kernel.org/show_bug.cgi?id=7152 Cc: Michael Tautschnig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdb36673a9d6accf93b11e7eff3a7e34cd284616 tree 3e34c42fc03b4606f834e0516a62417082fd1ab0 parent ecaff756ff540f3821e2b00b8fa19aca07c7c3e5 author NeilBrown Sat, 16 Sep 2006 12:15:38 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:31 -0700 [PATCH] knfsd: Make ext3 reject filehandles referring to invalid inode number Inodes earlier than the 'first' inode (e.g. journal, resize) should be rejected early - except the root inode. Also inode numbers that are too big should be rejected early. [akpm@osdl.org: cleanup] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecaff756ff540f3821e2b00b8fa19aca07c7c3e5 tree 80c40b24ad9228dcd7cf48c798250a9ccc74887a parent 55ebcc38a5f6d40e4c41447e413ef842b803980f author NeilBrown Sat, 16 Sep 2006 12:15:37 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:30 -0700 [PATCH] knfsd: Have ext2 reject file handles with bad inode numbers early This prevents bad inode numbers from triggering errors in ext2_get_inode. [akpm@osdl.org: speedup, cleanup] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55ebcc38a5f6d40e4c41447e413ef842b803980f tree 88958844c61fd9772e86a70bde2f274fb8f0d814 parent e1ed7ac77b63abb6b3a2c0b4b070f50da5b1fb2f author Arnaud Patard Sat, 16 Sep 2006 12:15:36 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:30 -0700 [PATCH] IPMI: Fix oops on ipmi_msghandler removal for non ipmi systems When the ipmi_si module is loaded on a system without any ipmi device, it fails with nodev. It would be fine if all resources were freed. A call to device_unregister() is missing, resulting to a oops when you remove the ipmi_msghandler. Signed-off-by: Arnaud Patard Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1ed7ac77b63abb6b3a2c0b4b070f50da5b1fb2f tree f82b0558b445cdae2ebf377c19e6409cef7679e0 parent 63b98080daa35f0d682db04f4fb7ada010888752 author Imre Deak Sat, 16 Sep 2006 12:15:35 -0700 committer Linus Torvalds Sat, 16 Sep 2006 12:54:30 -0700 [PATCH] genirq: fix typo in IRQ resend Fix a bug where the IRQ_PENDING flag is never cleared and the ISR is called endlessly without an actual interrupt. Signed-off-by: Imre Deak Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de591dacf3034977b3fb94b61d08240c8b35c39d tree dea9eb00d70b85c5bafba142ee0ea77369f4e4a5 parent d882687c51b52424a56992578ce7636b3f3c8d41 author Håvard Skinnemoen Fri, 15 Sep 2006 17:19:31 +0200 committer David Woodhouse Sat, 16 Sep 2006 13:54:17 +0100 MTD: Fix bug in fixup_convert_atmel_pri The memset() in fixup_convert_atmel_pri is supposed to zero out everything except the first 5 bytes in *extp, but it ends up zeroing out something way outside the struct instead. Fix this potentially dangerous code by casting the pointer to char * before doing arithmetic. Signed-off-by: Håvard Skinnemoen Signed-off-by: David Woodhouse commit d882687c51b52424a56992578ce7636b3f3c8d41 tree 8fe45bdeb4dbd36ad25e4d6764ede7431d4a1dd8 parent fa6c220a7f01257b1c2c4203d48aaaedb0c4416f author Havasi Ferenc Tue, 05 Sep 2006 16:08:58 +0200 committer David Woodhouse Sat, 16 Sep 2006 09:08:12 +0100 [JFFS2][SUMMARY] Fix a summary collecting bug. In some special case (padding because of sync or umount) it can be possible that summary information is not fit to the end of the erase block. In these cases the collecting of summary is disabled for this erase block. The problem was that this was not respected by jffs2_sum_add_kvec(). This patch fix this bug. From: Zoltan Sogor Signed-off-by: Ferenc Havasi Signed-off-by: David Woodhouse commit d5bb75999cb5733ad936ff000023221fe7a13c59 tree 5e1daa8a9192788b9211e9fe7bd55f9137e14f06 parent c11bd42a7676b49d41c780f2ede3709204f8da83 author Michael S. Tsirkin Wed, 13 Sep 2006 15:01:54 +0300 committer Roland Dreier Thu, 14 Sep 2006 13:55:30 -0700 RDMA/cma: Increase the IB CM retry count in CMA 3 seems like a low number of IB Communication Manager retries to set; we see connections failing under stress, and in any case 3 just looks like an arbitrary number. 15 is the max value allowed by the InfiniBand spec. Signed-off-by: Michael S. Tsirkin Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit c11bd42a7676b49d41c780f2ede3709204f8da83 tree fded697bd64eb3aa9796d1a2a363b8568d7fc64e parent add7afc756eddd5d02fd986d19e6300b3e1a5ae8 author Eli Cohen Thu, 14 Sep 2006 13:51:41 -0700 committer Roland Dreier Thu, 14 Sep 2006 13:51:41 -0700 IPoIB: Retry failed send-only multicast group joins When a send-only multicast group join fails, mcast->query must be set to NULL. Otherwise, IPoIB will never retry the join and the multicast group will never be reachable. Signed-off-by: Eli Cohen Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit add7afc756eddd5d02fd986d19e6300b3e1a5ae8 tree 78b79105cae9166ed194180dc9d6f3c8d4dc8fb3 parent 63b98080daa35f0d682db04f4fb7ada010888752 author Ishai Rabinovitz Thu, 07 Sep 2006 15:00:01 +0300 committer Roland Dreier Thu, 14 Sep 2006 13:51:40 -0700 IB/srp: Don't schedule reconnect from srp If there is a problem in the connection, the SCSI mid-layer will eventually call srp_reset_host(), which will call srp_reconnect(), so we do not need to schedule a call to srp_reconnect_work() from srp_completion(). Removing this prevents srp_reset_host() from failing if a reconnect scheduled from srp_completion() is already in progress, which in turn was causing crashes as both SCSI midlayer and srp_reconnect() were cancelling commands. Signed-off-by: Ishai Rabinovitz Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 36694a4c22767ee09c91ccda63810086c65c810b tree e1096d02c0eed080b8a04647b0126b09bfb01fa6 parent 0ce046dfca26f098286b9b154a8de7976cbbf1c0 author Dan Williams Thu, 14 Sep 2006 17:45:16 +0100 committer Russell King Thu, 14 Sep 2006 17:45:16 +0100 [ARM] 3780/1: Fix iop321 cpuid Patch from Dan Williams commit a6a38a66224c7c578cfed2f584b440c81af0c3ae changed the iop321 id to a value that does not work with all platforms. Change the mask to permit bit 11. Tested on an iq80321 600Mhz CRB. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 0ce046dfca26f098286b9b154a8de7976cbbf1c0 tree 741033f6ec23bf8c10af4d8117126be7d83d5db4 parent c84cbb246e5a5235af30ddbe49d23bb1eaf64add author Vitaly Wool Thu, 14 Sep 2006 13:32:08 +0100 committer Russell King Thu, 14 Sep 2006 13:32:08 +0100 [ARM] 3786/1: pnx4008: update defconfig Patch from Vitaly Wool This patch updates the default configuration file for PNX4008. arch/arm/configs/pnx4008_defconfig | 715 +++++++------------------------------ 1 file changed, 154 insertions(+), 561 deletions(-) Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit c84cbb246e5a5235af30ddbe49d23bb1eaf64add tree 90ba1f16e562a64d4efe6e23470a90c74f9006e5 parent a55ee0ea51ae8f622cb3d69d81a47cb772952f73 author Ben Dooks Thu, 14 Sep 2006 13:29:15 +0100 committer Russell King Thu, 14 Sep 2006 13:29:15 +0100 [ARM] 3785/1: S3C2412: Fix idle code as default uses wrong clocks Patch from Ben Dooks Fix the idle code on the s3c2412 as the default code is using bits in the CLKCON register that are no-longer there. Provide an override for the idle code, and ensure that the power configuration is set to allow idle instead of stop or sleep. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a55ee0ea51ae8f622cb3d69d81a47cb772952f73 tree 833cb59e7a9730757fe22a708b6edb8814f76bcb parent 63b98080daa35f0d682db04f4fb7ada010888752 author Ben Dooks Thu, 14 Sep 2006 13:29:13 +0100 committer Russell King Thu, 14 Sep 2006 13:29:13 +0100 [ARM] 3784/1: S3C2413: fix config for MACH_S3C2413/MACH_SMDK2413 Patch from Ben Dooks These two machines are identical, and supported by the SMDK2413 configuration. When MACH_SMDK2413 is selected, we must also select MACH_S3C2413 to allow machine_is_smdk2413() or machine_is_s3c2413() to work. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 71d28725548be203e8b8f6ad63b1f64fd7f02d4d tree 7246cf38c4c4b392b7c167026c1967c8ca45ddbc parent eff68d452f1a6842fb05218fd93c774ffc4dbc5a author Dale Farnsworth Wed, 13 Sep 2006 09:21:08 -0700 committer Jeff Garzik Wed, 13 Sep 2006 12:26:03 -0400 [PATCH] mv643xx_eth: Unmap DMA buffers in receive path Fix a missing call to dma_unmap_single() in the receive path. Without this call, errors have been observed on non-cache-coherent systems. Signed-off-by Dale Farnsworth Signed-off-by: Jeff Garzik commit 63b98080daa35f0d682db04f4fb7ada010888752 tree 213e124c89a51bbb99dd8e07fb6eacc970bbdc99 parent 1883c5aba9973331e3ff0050e05707fe8e84fe0d parent eeac5c142b8687e35780b11b54b4c2f95b1a2436 author Linus Torvalds Wed, 13 Sep 2006 08:01:41 -0700 committer Linus Torvalds Wed, 13 Sep 2006 08:01:41 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption [POWERPC] Fix MMIO ops to provide expected barrier behaviour [POWERPC] Fix interrupt clearing in kdump shutdown sequence [POWERPC] update prep_defconfig [POWERPC] kdump: Support kernels having 64k page size. [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. [POWERPC] Update defconfigs commit 1883c5aba9973331e3ff0050e05707fe8e84fe0d tree 3ef47d3499c9bc74898cb883f4c6668532146ea4 parent a2aa3e2304e21e2b8bf52b69ac9f1e0cb0320909 author Mike Miller Tue, 12 Sep 2006 20:36:07 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] cciss: version update, new hw Add support for new hardware and bumps the version to 3.6.10. It seems there were several changes introduced including soft_irq. I decided to bump the major number to reflect these changes. Since we're still supporting older vendor kernels I need some way differentiate between kernel versions <=2.6.10 and newer kernels >=2.6.16. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2aa3e2304e21e2b8bf52b69ac9f1e0cb0320909 tree 67bf4deebf807ee939ad5f91491c2e1b312e6e62 parent f01f0f052d1255dcdcf11d4872c4bca95e46b36c author David Woodhouse Tue, 12 Sep 2006 20:36:06 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] headers_check: fix userspace build of asm-mips/page.h MIPS asm/page.h unconditionally includes , which doesn't exist in userspace. Move an #endif /* __KERNEL__ */ down a few lines to prevent that. Also, remove the broken definition of PAGE_SIZE which is never going to be correct -- in the absence of PAGE_SIZE, non-broken userspace will fall back to using sysconf() or getpagesize() instead. Signed-off-by: David Woodhouse Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f01f0f052d1255dcdcf11d4872c4bca95e46b36c tree 813950ac98390893ede57af6693ffe42bc5609a5 parent 651c923a4446dc5aee385d81c2436d6edf8c9a0c author David Woodhouse Tue, 12 Sep 2006 20:36:05 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] headers_check: don't expose PFN stuff to userspace in The header file doesn't exist in userspace and probably shouldn't -- but it's used unconditionally in . Protect it with #ifdef __KERNEL__ and move setup.h from $(header-y) to $(unifdef-y) in Kbuild accordingly. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 651c923a4446dc5aee385d81c2436d6edf8c9a0c tree b1323fa960c2af80d87af40d8597d72d4e61e4f0 parent b40c274a03f70d1f758753c56452bed506e47a09 author David Woodhouse Tue, 12 Sep 2006 20:36:04 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: move kernel-only #includes within Some files which don't exist in userspace were being included unconditionally in asm-i386/elf.h. Move the offending #includes down a few lines so that they're protected by #ifdef __KERNEL__ In fact, we probably want to kill off all userspace use of asm/elf.h -- but we aren't there yet, so we should at least make it possible to include it for now. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b40c274a03f70d1f758753c56452bed506e47a09 tree 0a2084d2bc69580703ddde93e77d160c69d92ba1 parent ee6baf884b27739cca110e5167a2edfa061ca19f author David Woodhouse Tue, 12 Sep 2006 20:36:04 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: move inclusion of in Because doesn't exist in userspace, it should be only included from within #ifdef __KERNEL__. Move the corresponding #include Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee6baf884b27739cca110e5167a2edfa061ca19f tree 27db3ed3a2d2c441fe0cda5811954421b5e0512c parent 7f1cbe51ffc1273bcded36742ede4b6ebef1b640 author David Woodhouse Tue, 12 Sep 2006 20:36:03 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: remove from user export There's useful stuff in but has nothing for userspace. Stop exporting it, and include it only from within the existing #ifdef __KERNEL__ part of This fixes a 'make headers_check' failure on i386 because asm-i386/timex.h includes both asm-i386/tsc.h and asm-i386/processor.h, neither of which are exported to userspace. It's not entirely clear _why_ it includes either of these, but it does. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f1cbe51ffc1273bcded36742ede4b6ebef1b640 tree c9b02340f7f0884164026ce1e494d585490b0ad7 parent d5e064a6c733d3902302dbaca33dd3c76af77f38 author David Woodhouse Tue, 12 Sep 2006 20:36:02 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: reduce user-visible noise in We don't need any of this crap included from the user-visible part of nfs_fs.h -- remove it all. In fact, we probably don't need anything but NFS_SUPER_MAGIC to be defined; is there any need for anything else? And magic numbers should probably move to rather than being strewn across various fs-specific include files which exist in userspace for solely that purpose. With this patch, 'make header_check' works again at least on PowerPC. Signed-off-by: David Woodhouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5e064a6c733d3902302dbaca33dd3c76af77f38 tree 29f589a7aa8847a57d09278e80712d65e3177430 parent 120e2a97268c312bf81ee3d8cacc75d1f75ef8b5 author Alexey Dobriyan Tue, 12 Sep 2006 20:36:01 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: clarify error message Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 120e2a97268c312bf81ee3d8cacc75d1f75ef8b5 tree 1c7f2aa0bc0ebb3f34edfe33eae02be0f2da507a parent 354332ee44834819ff31a0afbeffda0c32244f8f author Alexey Dobriyan Tue, 12 Sep 2006 20:36:00 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: improve #include regexp The following combinations of pp-tokens are used #include #include # include so, script'd better check for all of them. Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 354332ee44834819ff31a0afbeffda0c32244f8f tree d2ebd322ed731164dae55157528ad6b6672d6160 parent dd9daa221e77f642954849a795fa7c59533a9b2f author Jeremy Fitzhardinge Tue, 12 Sep 2006 20:35:57 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] x86: reserve a boot-loader ID number for Xen Claim an ID number for Xen in the LOADER_TYPE field. Also, keep the table in zero-page.txt consistent with boot.txt. [hpa says: 6 was skipped because I couldn't rule out that it hadn't been unofficially used. It seemed easier to skip it for now.] Signed-off-by: Jeremy Fitzhardinge Acked-by: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd9daa221e77f642954849a795fa7c59533a9b2f tree 6b207a5296063e1a773f36fb724402ea7cbab7eb parent 7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a author Oleg Nesterov Tue, 12 Sep 2006 20:35:55 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] rcu_do_batch: make ->qlen decrement irq safe rcu_do_batch() decrements rdp->qlen with irqs enabled. This is not good, it can also be modified by call_rcu() from interrupt. Decrement ->qlen once with irqs disabled, after a main loop. Signed-off-by: Oleg Nesterov Cc: Dipankar Sarma Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a tree 407afc82b2560a785592a6cb052f3124504fcf12 parent e11db063d86d0ef9d7903cb463bb542b5d4e9ddd author Stefan Richter Tue, 12 Sep 2006 20:35:54 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd Fixup for lockdep enabled kernels: Annotate an on-stack completion. Signed-off-by: Stefan Richter Acked-by: Ingo Molnar Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e11db063d86d0ef9d7903cb463bb542b5d4e9ddd tree 646a193a8e8b8a20a8a9836a2ed7760f21a776f1 parent af45f32d25cc1e374184675eadc9f740221d8392 author Michael De Backer Tue, 12 Sep 2006 20:35:53 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] alim15x3.c: M5229 (rev c8) support for DMA cd-writer Configuration bits are not set properly for DMA on some chipset revisions. It has already been corrected for M5229 (rev c7) but not for M5229 (rev c8). This leads to the bug described at http://bugzilla.kernel.org/show_bug.cgi?id=5786 (lost interrupt + ide bus hangs). Signed-off-by: Michael De Backer Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af45f32d25cc1e374184675eadc9f740221d8392 tree 54e804d974dbd1d262fe78d14c8d384cfaea9df4 parent 9bb25bf36f0d7b06368432e2324dbbc2e98b5e60 author Greg KH Tue, 12 Sep 2006 20:35:52 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] We can not allow anonymous contributions to the kernel The DCO does not mean anything if we allow anonymous contributors to the kernel. As this is an open source project, we need to do everything in the open. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bb25bf36f0d7b06368432e2324dbbc2e98b5e60 tree c788a094599f6d1d82bd1263290757d7a6a1d7c7 parent a4f5749ba6e3f23ae4a137cee10324830db4d081 author Ingo Molnar Tue, 12 Sep 2006 20:35:50 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] lockdep: double the number of stack-trace entries Miles Lane reported the "BUG: MAX_STACK_TRACE_ENTRIES too low!" message, which means that during normal use his system produced enough lockdep events so that the 128-thousand entries stack-trace array got exhausted. Double the size of the array. Signed-off-by: Ingo Molnar Cc: Miles Lane Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4f5749ba6e3f23ae4a137cee10324830db4d081 tree 5f3908d5bf29f97b65c01a140bb62a9ef9e3003a parent 95064a75ebf8744e1ff595e8cd7ff9b6c851523e author Tejun Heo Tue, 12 Sep 2006 20:35:49 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] libata: ignore CFA signature while sanity-checking an ATAPI device 0x848a in ID word 0 indicates CFA device iff the ID data is obtained from IDENTIFY DEVICE. For ATAPI devices, 0x848a in ID work 0 indicates valid ATAPI device. Fix sanity check in ata_dev_read_id() such that ATAPI devices reporting 0x848a in ID word 0 is not handled as error. The problem is identified by J.A. Magallon with HL-DT-ST DVDRAM GSA-4120B. Signed-off-by: Tejun Helo Cc: J.A. Magallon Acked-by: Jeff Garzik Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eeac5c142b8687e35780b11b54b4c2f95b1a2436 tree c0df8f3f5b154d41a63bff1a4e49f2bf5172b079 parent f007cacffc8870702a1473d83ba5e4922d54e17c author Benjamin Herrenschmidt Wed, 13 Sep 2006 22:12:52 +1000 committer Paul Mackerras Wed, 13 Sep 2006 22:12:52 +1000 [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption It seems that the occasional data corruption observed with the tg3 driver wasn't due to missing barriers after all, but rather seems to be due to the DART (= IOMMU) in the U4 northbridge reading stale IOMMU table entries from memory due to a race. This fixes it by making the CPU read the entry back from memory before using it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f007cacffc8870702a1473d83ba5e4922d54e17c tree 7faa1dbd7ccd2c4536f29852e0fedf7499d90508 parent 2e8e8dacc566cc91cd8707cb092e76c7bbfab178 author Paul Mackerras Wed, 13 Sep 2006 22:08:26 +1000 committer Paul Mackerras Wed, 13 Sep 2006 22:08:26 +1000 [POWERPC] Fix MMIO ops to provide expected barrier behaviour This changes the writeX family of functions to have a sync instruction before the MMIO store rather than after, because the generally expected behaviour is that the device receiving the MMIO store can be guaranteed to see the effects of any preceding writes to normal memory. To preserve ordering between writeX and readX, and to preserve ordering between preceding stores and the readX, the readX family of functions have had an sync added before the load. Although writeX followed by spin_unlock is not officially guaranteed to keep the writeX inside the spin-locked region unless an mmiowb() is used, there are currently drivers that depend on the previous behaviour on powerpc, which was that the mmiowb wasn't actually required. Therefore we have a per-cpu flag that is set by writeX, cleared by __raw_spin_lock and mmiowb, and tested by __raw_spin_unlock. If it is set, __raw_spin_unlock does a sync and clears it. This changes both 32-bit and 64-bit readX/writeX. 32-bit already has a sync in __raw_spin_unlock (since lwsync doesn't exist on 32-bit), and thus doesn't need the per-cpu flag. Tested on G5 (PPC970) and POWER5. Signed-off-by: Paul Mackerras commit 2e8e8dacc566cc91cd8707cb092e76c7bbfab178 tree ccb14c4d73874782bef530877f3e0066284bce3f parent ebf2ed283897b752daa743952aff43d78b725183 author Mohan Kumar M Tue, 12 Sep 2006 17:48:21 +0530 committer Paul Mackerras Wed, 13 Sep 2006 18:31:23 +1000 [POWERPC] Fix interrupt clearing in kdump shutdown sequence Call chip->eoi(irq) to clear any pending interrupt in case of kdump shutdown sequence. chip->end(irq) does not serve this purpose. Signed-off-by: Mohan Kumar M Signed-off-by: Paul Mackerras commit ebf2ed283897b752daa743952aff43d78b725183 tree b8355873a18afd892b6d2fd5746628a25ca27aef parent e269d269e0b53a7a6cb1d04290f8174bf0488cb4 author Olaf Hering Thu, 07 Sep 2006 14:44:45 +0200 committer Paul Mackerras Wed, 13 Sep 2006 18:30:08 +1000 [POWERPC] update prep_defconfig Update PReP defconfig, disable some drivers for hardware that is not used on those systems; enable SL82C105 IDE driver for Powerstack. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit e269d269e0b53a7a6cb1d04290f8174bf0488cb4 tree 387a80fdf9a3ca1ff052911bc3990126e3f0d9ca parent 69588298188b40ed7f75c98a6fd328d82f23ca21 author Sachin P. Sant Fri, 08 Sep 2006 07:59:52 +0530 committer Paul Mackerras Wed, 13 Sep 2006 18:30:04 +1000 [POWERPC] kdump: Support kernels having 64k page size. This is required to generate proper core files using kdump on ppc64. Create a backup region of 64K size irrespective of the PAGE SIZE. At present 32K was used as backup size. In the case of 64K page size, second PT_LOAD segments starts at 32K and the first one is not page aligned. __ioremap() (crash_dump.c) fails if pfn = 0 which is the case for the second PT_LOAD segment. This is not an issue for 4K page size because the the first page (32K backup) is copied to second kernel memory and thus referencing with the second kernel pfn. Signed-off-by: Sachin Sant Signed-off-by: Paul Mackerras commit 69588298188b40ed7f75c98a6fd328d82f23ca21 tree 4b8f8846cc3f4a0f4ae9eb04e4b2de2c12da75fe parent 20fb96e2aa009ae9892fde9ef7ffa82f56eebd11 author David Woodhouse Mon, 04 Sep 2006 21:53:14 -0700 committer Paul Mackerras Wed, 13 Sep 2006 18:28:41 +1000 [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). The sys_[gs]et_robust_list() syscalls were wired up on PowerPC but didn't work correctly because futex_atomic_cmpxchg_inatomic() wasn't implemented. Implement it, based on __cmpxchg_u32(). Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 20fb96e2aa009ae9892fde9ef7ffa82f56eebd11 tree 7e1cbaeb9dc72d1e332fe9a68435eb00ddda4e82 parent fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 author Jon Loeliger Fri, 01 Sep 2006 10:17:20 -0500 committer Paul Mackerras Wed, 13 Sep 2006 18:28:28 +1000 [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. Ben speaks; we follow. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit eff68d452f1a6842fb05218fd93c774ffc4dbc5a tree dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 parent 6a9516989f94df10d9a27ba543c6b53b3e69c84a parent 95064a75ebf8744e1ff595e8cd7ff9b6c851523e author Jeff Garzik Wed, 13 Sep 2006 00:34:34 -0400 committer Jeff Garzik Wed, 13 Sep 2006 00:34:34 -0400 Merge branch 'master' into upstream-fixes commit 6a9516989f94df10d9a27ba543c6b53b3e69c84a tree b476d50e8b8126181847fb00326a871489457964 parent 1802ca745280b916cda4090e459741b8c9b3e8d0 author Auke Kok Mon, 11 Sep 2006 14:00:21 -0700 committer Jeff Garzik Tue, 12 Sep 2006 11:46:39 -0400 [PATCH] e1000: fix TX timout hang regression for 82542rev3 Commit 581d708eb47cccb5f41bc0817e50c9b004011ba8 (oct. 5 2005) introduced partial Multiqueue support for e1000 which broke macro smartness in setting up head/tail registers for 82542 rev3 chipsets, making these adapters completely non-working since 2.6.15. This commit sets the proper head and tail registers for read and write descriptor rings. Ths fix was tested on an 82542 rev3 NIC and newer NICs. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 1802ca745280b916cda4090e459741b8c9b3e8d0 tree eda781119a372cb05da7ba9dbbc44502ad222a01 parent 05ff0e291af086f4325bac76abad250690bbbd63 parent db888aed7e83559d61cff04bf002d0fb80ecbfa7 author Jeff Garzik Tue, 12 Sep 2006 11:42:33 -0400 committer Jeff Garzik Tue, 12 Sep 2006 11:42:33 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit db888aed7e83559d61cff04bf002d0fb80ecbfa7 tree 4c8795f5924ce440ddc79cf0e2d7ae25d633d5ad parent 38f5745c5a90641079fd5b48600ae63f7ab6edcd author Ulrich Kunitz Tue, 29 Aug 2006 23:50:29 +0100 committer John W. Linville Mon, 11 Sep 2006 16:11:08 -0400 [PATCH] zd1211rw: Fix of signal strength and quality measurement Caused by a documentation issue I mixed up fields of the zd_status structure. This patch fixes it and improves also the average computation, which is now using only measurements of packets sent by the access point. Signed-off-by: Ulrich Kunitz Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 tree 5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 parent 10387e5eb45c6e48d67102b88229f5bc6037461c author Paul Mackerras Sun, 10 Sep 2006 11:04:36 +1000 committer Paul Mackerras Sun, 10 Sep 2006 11:04:36 +1000 [POWERPC] Update defconfigs Signed-off-by: Paul Mackerras commit fa6c220a7f01257b1c2c4203d48aaaedb0c4416f tree b656f44310fc58de6ccf2db77f5e4b25696fe559 parent 0a7d5f8ce960e74fa22986bda4af488539796e49 author Aubrey Lee Tue, 05 Sep 2006 05:55:07 -0500 committer Josh Boyer Tue, 05 Sep 2006 05:55:07 -0500 [PATCH] [MTD] DEVICES: Fill more device IDs in the structure of m25p80 The flash_info structure has a bunch of missing fields which causes problems when actually tryin to use some ST parts as it gets detected incorrectly. Signed-off-by: Aubrey L1 Signed-off-by: Josh Boyer commit 0a7d5f8ce960e74fa22986bda4af488539796e49 tree e29ad17808a5c3410518e22dae8dfe94801b59f3 parent 0165508c80a2b5d5268d9c5dfa9b30c534a33693 parent dc709bd190c130b299ac19d596594256265c042a author David Woodhouse Wed, 30 Aug 2006 23:30:38 +0100 committer David Woodhouse Wed, 30 Aug 2006 23:30:38 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 0165508c80a2b5d5268d9c5dfa9b30c534a33693 tree 255a014b260457d19bc52070fa7b2d72a61750bb parent 5b0c5c2c0d04c29f85abb485378ba5476c7aeec2 author Haavard Skinnemoen Wed, 09 Aug 2006 11:06:07 +0200 committer Josh Boyer Wed, 16 Aug 2006 20:16:43 -0500 MTD: Add lock/unlock operations for Atmel AT49BV6416 The AT49BV6416 is locked by default, so we really need to provide at least the unlock() operation for write and erase to work. This patch implements both ->lock() and ->unlock() and provides a fixup to install them when an AT49BV6416 chip is detected. These functions are probably valid on more Atmel chips, but I believe it's mostly obsolete ones. The AT49BV6416 is in fact obsolete, but it's used on all current AT32STK1000 development boards. Signed-off-by: Haavard Skinnemoen Signed-off-by: Josh Boyer commit 5b0c5c2c0d04c29f85abb485378ba5476c7aeec2 tree c83b1e4f3947b23c24b6cacb2cc1ac8f2f0cd012 parent 0b6c0bb3f9621b128011bcd5f65047c73afdde3b author Haavard Skinnemoen Wed, 09 Aug 2006 10:54:44 +0200 committer Josh Boyer Wed, 16 Aug 2006 20:13:06 -0500 MTD: Convert Atmel PRI information to AMD format Atmel flash chips don't have PRI information in the same format as AMD flash chips. This patch installs a fixup for all Atmel chips that converts the relevant PRI fields into AMD format. Only the fields that are actually used by the command set is actually converted. The rest are initialized to zero (which should be safe) Signed-off-by: Haavard Skinnemoen Signed-off-by: Josh Boyer commit 0b6c0bb3f9621b128011bcd5f65047c73afdde3b tree 23508365ae8ef004d2d828f9692403c6c16ced5e parent 79b9cd586f534f3f40ee66b6c27732149a5915ad author Adrian Bunk Tue, 15 Aug 2006 02:42:25 +0200 committer Josh Boyer Tue, 15 Aug 2006 19:10:19 -0500 fs/jffs2/xattr.c: remove dead code This patch removes some obvious dead code spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Josh Boyer commit 79b9cd586f534f3f40ee66b6c27732149a5915ad tree 10d0eb53a206d0d69210798668278f6e21fc66c1 parent c4e6952ffd71b263a64d1a9d79812446130560a5 author Takashi YOSHII Tue, 15 Aug 2006 07:26:32 -0500 committer Josh Boyer Tue, 15 Aug 2006 07:26:32 -0500 [PATCH] [MTD] Maps: Add dependency on alternate probe methods to physmap map/physmap.c tries to probe "cfi_probe", "jedec_probe" and "map_rom", but map/Kconfig says it depends on MTD_CFI only. This patch adds MTD_JEDECPROBE and MTD_ROM to the dependency condition. Signed-off-by: Takashi YOSHII Signed-off-by: Josh Boyer commit c4e6952ffd71b263a64d1a9d79812446130560a5 tree c7eb922c6f9c38c92c7d567c5402d863b92a8ac3 parent 46a1652c28fc4f4e9d46ea12b0c36b5b6b600f58 author Takashi YOSHI Mon, 14 Aug 2006 19:48:30 -0500 committer Josh Boyer Mon, 14 Aug 2006 19:48:30 -0500 [PATCH] MTD: Add Macronix MX29F040 to JEDEC Signed-off-by: Takashi YOSHII Signed-off-by: Josh Boyer commit 46a1652c28fc4f4e9d46ea12b0c36b5b6b600f58 tree 1efde18ca7addfe8cd3cbb828ad6c44b578265c4 parent c4e7fb313771ac03dfdca26d30e8b721731c562b author Alexey Korolev Wed, 28 Jun 2006 19:22:07 +0100 committer David Woodhouse Sat, 15 Jul 2006 13:43:59 +0100 [MTD] Fixes of performance and stability issues in CFI driver. Fix of performance and stability issues on Intel NOR chips. It fixes: 1. Very low write performance on Sibley (perf tests demonstrated write performance less than 100Kb/sec when it should be over 400Kb/sec). 2. Low erase performance. (perf tests on Sibleuy demonstrated erase performance 246Kb/sec when it should be over 300Kb/sec). 3. Error on JFFS2 tests with CPU loading application when MTD returns "block erase error: (status timeout)" To fix the issue it does the following: 1. Removes the timeout tuning from inval_cache_and_wait_for_operation. 2. Waiting conditions in inval_cache_and_wait_for_operation now is based on timer resolution If timeout is lower than timer resolution then we do in cycle "Checking the status" udelay(1); cond_resched(); If timeout is greater than timer resolution (probably erase operation) We do the following sleep for half of operation timeout and do in cycle the following "Checking the status" sleep for timer resolution Signed-off-by: Nicolas Pitre Signed-off-by: Alexey Korolev Signed-off-by: David Woodhouse commit c4e7fb313771ac03dfdca26d30e8b721731c562b tree ce57227007ea980dcd37e5f7af3bc6b83a91a3bf parent 9a909867d2eca7727d0d5884df96e791e3531f24 author Ville Herva Fri, 14 Jul 2006 00:31:16 +0300 committer David Woodhouse Sat, 15 Jul 2006 13:39:10 +0100 block2mtd.c: Make kernel boot command line arguments work (try 4) Trying to pass kernel command line arguments to block2mtd at boot-time does not work currently. block2mtd_setup() is called so early that kmalloc() fails nevermind being able to do open_bdev_excl() (which requires rootfs to be mounted. This patch only saves the option string at the early boot stage, and parses them later when block2mtd_init() is called. If open_bdev_excl() fails, open_by_devnum(name_to_dev_t()) is tried instead, which makes it possible to initialize the driver before rootfs has been mounted. Also gets rid of the superfluous parse_name() that only checks if name is longer than 80 chars and copies it to a string that is not kfreed. With this patch, I can boot statically compiled block2mtd, and mount jffs2 as rootfs (without modules or initrd), with lilo config like this: root=/dev/mtdblock0 append="rootfstype=jffs2 block2mtd.block2mtd=/dev/hdc2,65536" (Note that rootfstype=jffs2 is required, since the kernel only tries filesystems without "nodev" attribute by default, and jffs is "nodev"). Compared to first version of this patch, this one does not copy the parameters to the global buffer if init has already been called, and the global array is marked as __initdata. Compared to the second version of this patch, module build is fixed. Compared to the third version of this patch, statically compiled block2mtd driver with no boot-time parameter no longer gives spurious error 'cannot open device ""' Signed-off-by: Ville Herva Acked-by: Jörn Engel Signed-off-by: David Woodhouse commit 9a909867d2eca7727d0d5884df96e791e3531f24 tree 4ce1a83dd5b6fb8c6a5a1d4cd0f7b8257e64e675 parent 9d05cd51780c3855976b26cbee265490a0a10be9 author David Woodhouse Sat, 15 Jul 2006 13:26:18 +0100 committer David Woodhouse Sat, 15 Jul 2006 13:26:18 +0100 [MTD NAND] Fix lookup error in nand_get_flash_type() Spotted by liyu Signed-off-by: David Woodhouse commit 9d05cd51780c3855976b26cbee265490a0a10be9 tree f662b2c674e642350e36a86218880b1b773e2cf9 parent 6a5a297cf78e64ed68577f3e3480bc10abf0124b author Rolf Eike Beer Fri, 14 Jul 2006 14:39:06 +0200 committer David Woodhouse Sat, 15 Jul 2006 13:19:55 +0100 remove #error on !PCI from pmc551.c PMC551 depends on PCI in Kconfig so there is no need to #error in code if PCI is not set. Signed-off-by: Rolf Eike Beer Signed-off-by: David Woodhouse commit 6a5a297cf78e64ed68577f3e3480bc10abf0124b tree 0351c473d3bcc7b883ed22aef9cb3cad14fdede7 parent 8b0036eefd7a96f23244b969417684c8627f5ad6 author Richard Purdie Sat, 15 Jul 2006 13:05:24 +0100 committer David Woodhouse Sat, 15 Jul 2006 13:19:24 +0100 MTD: [NAND] Fix the sharpsl driver after breakage from a core conversion The CNE bits are inverted on the device and writeb function is missing a NOT operation. Signed-off-by: Richard Purdie Signed-off-by: David Woodhouse commit 8b0036eefd7a96f23244b969417684c8627f5ad6 tree 765e2a201ebecdde7c89dc27e09f1a6038480eb2 parent 90a18fab4ae07b77bf053b75a4d1285cd94faa79 author Vitaly Wool Tue, 11 Jul 2006 09:11:25 +0200 committer Thomas Gleixner Tue, 11 Jul 2006 09:11:25 +0200 [MTD] NAND: OOB buffer offset fixups In the case of data-pad-ecc-pad-data... layout the oob start position has to be sizeof(data) in nand_write_oob_syndrom(). In nand_fill_oob() we need to copy to buf + buffer offset instead of buf + write offset. From: Vitaly Wool Signed-off-by: Thomas Gleixner commit 90a18fab4ae07b77bf053b75a4d1285cd94faa79 tree 1bc94232b58b51c38fa40c36d7797d3eb08573a0 parent 220b0f5755f86745e4e16d001fe6f46b448565fa author Adrian Bunk Thu, 06 Jul 2006 22:37:43 +0200 committer David Woodhouse Fri, 07 Jul 2006 00:02:10 +0100 make fs/jffs2/nodelist.c:jffs2_obsolete_node_frag() static This patch makes the needlessly global jffs2_obsolete_node_frag() static. Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit 220b0f5755f86745e4e16d001fe6f46b448565fa tree ea4769113ce8fa0280a3fdefed14411c16b5904c parent ca78f6baca863afe2e6a244a0fe94b3a70211d46 author Artem B. Bityutskiy Wed, 05 Jul 2006 11:04:02 +0400 committer David Woodhouse Wed, 05 Jul 2006 14:45:11 +0100 [PATCH] [MTD] NAND: fix dead URL in Kconfig Signed-off-by: Artem B. Bityutskiy