commit 2ddcca36c8bcfa251724fe342c8327451988be0d Author: Linus Torvalds Date: Sat May 3 11:59:44 2008 -0700 Linux 2.6.26-rc1 commit 38e80121bd7d0c493072442ac7eddcba165a07a8 Merge: e098675... 35bf559... Author: Linus Torvalds Date: Sat May 3 10:57:57 2008 -0700 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: PMU battery: filenames in sysfs with spaces pda_power: add init and exit function callbacks commit e098675635479e9267cf2b12fb969c463cf506ab Merge: 2905474... b9095fd... Author: Linus Torvalds Date: Sat May 3 10:54:23 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits) Make constants in kernel/timeconst.h fixed 64 bits types: add C99-style constructors to xtensa: types: use for the xtensa architecture x86: types: use for the x86 architecture v850: types: use for the v850 architecture sparc64: types: use for the sparc64 architecture sparc: types: use for the sparc architecture sh: types: use for the sh architecture s390: types: use for the s390 architecture powerpc: types: use for the powerpc architecture parisc: types: use for the parisc architecture mn10300: types: use for the mn10300 architecture mips: types: use for the mips architecture m68k: types: use for the m68k architecture m32r: types: use for the m32r architecture ia64: types: use for the ia64 architecture h8300: types: use for the h8300 architecture frv: types: use for the frv architecture cris: types: use for the cris architecture blackfin: types: use for the blackfin architecture ... commit 2905474d3842bfab0b9d8197fb1f4576462901da Author: Jesse Barnes Date: Sat May 3 08:35:49 2008 -0700 [MAINTAINERS] PCI list moved Many thanks to Martin for his years of hosting. The pci list has moved to vger, along with what seems like the rest of the major Linux mailing lists. Signed-off-by: Jesse Barnes Signed-off-by: Linus Torvalds commit c402f98c6d43f22b4c6d7b3db9d7099611cdcaec Merge: 4f9faaa... f6acb63... Author: Linus Torvalds Date: Sat May 3 10:18:40 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: #ifdef simplification slabinfo: Support printout of the number of fallbacks slub: Whitespace cleanup and use of strict_strtoul commit 4f9faaace217b854ae1e1746ee4ac44688ddadbd Merge: bf640be... f37f2c6... Author: Linus Torvalds Date: Sat May 3 10:18:21 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits) rose: Wrong list_lock argument in rose_node seqops netns: Fix reassembly timer to use the right namespace netns: Fix device renaming for sysfs bnx2: Update version to 1.7.5. bnx2: Update RV2P firmware for 5709. bnx2: Zero out context memory for 5709. bnx2: Fix register test on 5709. bnx2: Fix remote PHY initial link state. bnx2: Refine remote PHY locking. bridge: forwarding table information for >256 devices tg3: Update version to 3.92 tg3: Add link state reporting to UMP firmware tg3: Fix ethtool loopback test for 5761 BX devices tg3: Fix 5761 NVRAM sizes tg3: Use constant 500KHz MI clock on adapters with a CPMU hci_usb.h: fix hard-to-trigger race dccp: ccid2.c, ccid3.c use clamp(), clamp_t() net: remove NR_CPUS arrays in net/core/dev.c net: use get/put_unaligned_* helpers bluetooth: use get/put_unaligned_* helpers ... commit bf640be423d60d954b9673527e106a461a129eb8 Merge: c36c804... 4a1236a... Author: Linus Torvalds Date: Sat May 3 10:05:11 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: Delete prom_stdin and prom_stdout. sparc32: More memory probing consolidation. sparc32: Kill totally unused memory information tables. sparc64: Fix syscall restart, for real... serial: Fix sparc driver name strings. sparc64: Stop creating dummy root PCI host controller devices. commit c36c804559d3a891a2e655ba8185b4fa7eaee156 Merge: be2e880... 3b57506... Author: Linus Torvalds Date: Sat May 3 10:01:33 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus [POWERPC] PS3: Update ps3_defconfig [POWERPC] PS3: Remove unsupported wakeup sources [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static [POWERPC] PS3: Add time include to lpm [POWERPC] Fix slb.c compile warnings [POWERPC] Xilinx: Fix compile warnings [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c [RAPIDIO] fix current kernel-doc notation [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot Fix a potential issue in mpc52xx uart driver [POWERPC] mpc5200: Allow for fixed speed MII configurations [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board commit f37f2c62a28e848e06399ea2f9be1e098212625c Author: Bernard Pidoux Date: Fri May 2 17:03:22 2008 -0700 rose: Wrong list_lock argument in rose_node seqops In rose_node_start() as well as in rose_node_stop() __acquires() and spin_lock_bh() were wrongly passing rose_neigh_list_lock instead of rose_node_list_lock arguments. Signed-off-by: Bernard Pidoux Signed-off-by: David S. Miller commit 4ac2ccd01646e08d7176185c94e5b19404a25998 Author: Daniel Lezcano Date: Fri May 2 17:02:03 2008 -0700 netns: Fix reassembly timer to use the right namespace This trivial fix retrieves the network namespace from frag queue and use it to get the network device in the right namespace. Signed-off-by: Daniel Lezcano Signed-off-by: David S. Miller commit aaf8cdc34ddba08122f02217d9d684e2f9f5d575 Author: Daniel Lezcano Date: Fri May 2 17:00:58 2008 -0700 netns: Fix device renaming for sysfs When a netdev is moved across namespaces with the 'dev_change_net_namespace' function, the 'device_rename' function is used to fixup kobject and refresh the sysfs tree. The device_rename function will call kobject_rename and this one will check if there is an object with the same name and this is the case because we are renaming the object with the same name. The use of 'device_rename' seems for me wrong because we usually don't rename it but just move it across namespaces. As we just want to do a mini "netdev_[un]register", IMO the functions 'netdev_[un]register_kobject' should be used instead, like an usual network device [un]registering. This patch replace device_rename by netdev_unregister_kobject, followed by netdev_register_kobject. The netdev_register_kobject will call device_initialize and will raise a warning indicating the device was already initialized. In order to fix that, I split the device initialization into a separate function and use it together with 'netdev_register_kobject' into register_netdevice. So we can safely call 'netdev_register_kobject' in 'dev_change_net_namespace'. This fix will allow to properly use the sysfs per namespace which is coming from -mm tree. Signed-off-by: Daniel Lezcano Acked-by: Benjamin Thery Signed-off-by: David S. Miller commit 705d209168681b4408d10fca7257de3343be573d Author: Michael Chan Date: Fri May 2 16:58:18 2008 -0700 bnx2: Update version to 1.7.5. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d25be1d3ecf0b1b95ae29919786372b87b2bfea6 Author: Michael Chan Date: Fri May 2 16:57:59 2008 -0700 bnx2: Update RV2P firmware for 5709. The new RV2P firmware fixes 2 issues: 1. The jumbo rx buffer page size is now configurable and set to the proper PAGE_SIZE. Before, it was assumed to be always 4K. 2. Driver sometimes would crash when receiving jumbo packets mixed with firmware management packets. This was caused by the old firmware DMA'ing to the wrong address. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 352f76879ebde543817360ce9c18c973d4300f4f Author: Michael Chan Date: Fri May 2 16:57:26 2008 -0700 bnx2: Zero out context memory for 5709. We should zero out the context memory for 5709 before each reset. When we resume after suspend for example, the memory may not be zero and the chip may not function correctly. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit 15b169cccff1503a88f12f104e5657c65c53ade7 Author: Michael Chan Date: Fri May 2 16:57:08 2008 -0700 bnx2: Fix register test on 5709. The register BNX2_CTX_STATUS (0x1004) should be skipped on 5709 as it contains reserved bits. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit 543a827d7a5600a71855bd6afacac78536c86822 Author: Michael Chan Date: Fri May 2 16:56:44 2008 -0700 bnx2: Fix remote PHY initial link state. On some remote PHY blade systems, the driver receives no initial link interrupt. As a result, the GMII/MII MAC mode does not get setup properly. To fix this problem, we add an initial poll of the link state after chip reset. With this change, the setting of the initial carrier state in the init code can be eliminated. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit 74ecc62d6e595ca64bbef2471787bf53b94e5d3c Author: Michael Chan Date: Fri May 2 16:56:16 2008 -0700 bnx2: Refine remote PHY locking. bnx2_set_remote_link() should be called under bp->phy_lock to protect against concurrent polling and interrupt calls. This change is needed by the next patch which will add one initial poll of the remote PHY link status. Signed-off-by: Michael Chan Signed-off-by: Benjamin Li Signed-off-by: David S. Miller commit ae4f8fca4030a4e783fa4ccb0c9d8d8a8cf60a32 Author: Stephen Hemminger Date: Fri May 2 16:53:33 2008 -0700 bridge: forwarding table information for >256 devices The forwarding table binary interface (my bad choice), only exposes the port number of the first 8 bits. The bridge code was limited to 256 ports at the time, but now the kernel supports up 1024 ports, so the upper bits are lost when doing: brctl showmacs The fix is to squeeze the extra bits into small hole left in data structure, to maintain binary compatiablity. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 920e37f76b19b4a3d8a1a3144cd6ee24e0e7f5b4 Author: Matt Carlson Date: Fri May 2 16:49:50 2008 -0700 tg3: Update version to 3.92 This patch updates the version number to 3.92. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7c5026aa9b81dd45df8d3f4e0be73e485976a8b6 Author: Matt Carlson Date: Fri May 2 16:49:29 2008 -0700 tg3: Add link state reporting to UMP firmware All variants of the 5714, 5715, and 5780 offer a feature called the "Universal Management Port". This feature is implemented in firmware and is largely transparent to the driver, except... It turns out that the UMP firmware needs to know the current status of the link. Because the firmware cannot touch the PHY registers while the driver is in control of the device, it needs the driver to report link status changes through an additional handshaking mechanism. Without this handshake, it has been observed in the field that the UMP firmware will not operate correctly. This patch implements the new handshake with the UMP firmware. Since the handshake uses the same mechanism ASF heartbeats use, code was added to detect and wait for completion of a pending previous event. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 109115e1991824b88306b374b763d6857b292aeb Author: Matt Carlson Date: Fri May 2 16:48:59 2008 -0700 tg3: Fix ethtool loopback test for 5761 BX devices A CPMU related loopback test bug existed for AX revisions of the 5761. While that errata has been fixed, the CPMU still slows down the core clock too far to run the loopback test successfully. This patch disables the CPMU LINK_SPEED mode just like we do with the AX revisions of the 5761 and all revisions of the 5784. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fd1122a2593d0bbe19856e3943c859ebfe563583 Author: Matt Carlson Date: Fri May 2 16:48:36 2008 -0700 tg3: Fix 5761 NVRAM sizes The 5761 NVRAM sizes assigned to the nvram_size member are half as big as they should be. This patch corrects the NVRAM sizes and replaces the hardcoded constants with preprocessor constants for readability. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8ef214288622bf523a3b3096958292a1c63132ad Author: Matt Carlson Date: Fri May 2 16:47:53 2008 -0700 tg3: Use constant 500KHz MI clock on adapters with a CPMU The MI clock is not configured correctly on adapters with the CPMU present. The tg3 driver has code which statically sets the MI clock to be a fraction of the speed at which the core clock is running. However, the CPMU can change the adapter's core clock frequency based on operating conditions. Consequently, the MI will run slow when the core's clock has been slowed down. There is a new 500KHz constant frequency clock available on adapters with a CPMU. This patch removes the static core clock scaling and configures the MI clock to use this new 500KHz clock instead. Running the MI clock at slower speeds will not directly result in data corruption, but it does challenge the PHY read and write routine timeouts. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 026672d0997c911c9bef9aabe862884fc0add106 Author: Pavel Machek Date: Fri May 2 16:45:10 2008 -0700 hci_usb.h: fix hard-to-trigger race If someone tries to _urb_unlink while _urb_queue_head is running, he'll see _urb->queue == NULL and fail to do any locking. Prevent that from happening by strategically placed barriers. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 84994e16f25dabe234be4fc2d323ec9db95b87cb Author: Harvey Harrison Date: Fri May 2 16:44:07 2008 -0700 dccp: ccid2.c, ccid3.c use clamp(), clamp_t() Makes the intention of the nested min/max clear. Signed-off-by: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0c0b0aca66b3a58e12a216d992a0b534eff210e0 Author: Mike Travis Date: Fri May 2 16:43:08 2008 -0700 net: remove NR_CPUS arrays in net/core/dev.c Remove the fixed size channels[NR_CPUS] array in net/core/dev.c and dynamically allocate array based on nr_cpu_ids. Signed-off-by: Mike Travis Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 35bf559145b6332f5465c15a4e5cd7a363985382 Author: Christian Kujau Date: Fri May 2 13:41:56 2008 -0700 PMU battery: filenames in sysfs with spaces By changing drivers/power/pmu_battery.c I now have '_' instead of ' ' (spaces) in /sys: /sys/devices/platform/pmu-battery.0/power_supply/PMU_battery_0 /sys/class/power_supply/PMU_battery_0 I'm still not sure if some userspace tool out there uses the old paths and will break now. Signed-off-by: Christian Kujau Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Anton Vorontsov commit f6b6b180b4614e57af217045f71caedd94821fc7 Author: Philipp Zabel Date: Sat Apr 12 13:47:45 2008 +0200 pda_power: add init and exit function callbacks This adds init/exit function callbacks to pda_power, to provide a place where the platform code can request/free GPIOs that it wants to use in the is_ac_online, is_usb_online and set_charge functions. Signed-off-by: Philipp Zabel Signed-off-by: Anton Vorontsov commit d3e2ce3bcdbf4319dea308c79b5f72a8ecc8015c Author: Harvey Harrison Date: Fri May 2 16:26:16 2008 -0700 net: use get/put_unaligned_* helpers Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit 83985319393973f280ca2a797047780a7955cf19 Author: Harvey Harrison Date: Fri May 2 16:25:46 2008 -0700 bluetooth: use get/put_unaligned_* helpers Signed-off-by: Harvey Harrison Acked-by: Marcel Holtmann Signed-off-by: David S. Miller commit 260ffeed3fd185d29f08e98fb47c09e71bb59cd8 Author: Harvey Harrison Date: Fri May 2 16:21:52 2008 -0700 irda: use get_unaligned_* helpers Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit b4192bbd85d29eb3bec7f9297d6464250e6a7a90 Author: Arjan van de Ven Date: Fri May 2 16:21:07 2008 -0700 net: Add a WARN_ON_ONCE() to the transmit timeout function WARN_ON_ONCE() gives a stack trace including the full module list. Having this in the kernel dump for the timeout case in the generic netdev watchdog will help us see quicker which driver is involved. It also allows us to collect statistics and patterns in terms of which drivers have this event occuring. Suggested by Andrew Morton Signed-off-by: Arjan van de Ven Signed-off-by: David S. Miller commit 50aab54f3056ba28afc681f71adee41c399dde1e Author: Ilpo Järvinen Date: Fri May 2 16:20:10 2008 -0700 net: Add missing braces to multi-statement if()s One finds all kinds of crazy things with some shell pipelining. Signed-off-by: Ilpo Järvinen Acked-by: David Howells Signed-off-by: David S. Miller commit b9095fd8a7f41dc7ac0b0b7864f74766a3056f96 Author: H. Peter Anvin Date: Fri May 2 16:18:42 2008 -0700 Make constants in kernel/timeconst.h fixed 64 bits Force constants in kernel/timeconst.h (except shift counts) to be 64 bits, using U64_C() constructor macros, and eliminate constants that cannot be represented at all in 64 bits. This avoids warnings with some gcc versions. Drop generating 64-bit constants, since we have no real hope of getting a full set (operation on 64-bit values requires a 128-bit intermediate result, which gcc only supports on 64-bit platforms, and only with libgcc support on some.) Note that the use of these constants does not depend on if we are on a 32- or 64-bit architecture. This resolves Bugzilla 10153. Signed-off-by: H. Peter Anvin commit c25bd29805f4d854c3a0b4176813f3c1bff569d3 Author: H. Peter Anvin Date: Thu Apr 24 13:37:33 2008 -0700 types: add C99-style constructors to Add C99-style constructor macros for fixed types to . Since Linux uses names like "u64" instead of "uint64_t", the constructor macros are called U64_C() instead of UINT64_C() and so forth. These macros allow specific sizes to be specified as U64_C(0x123456789abcdef), without gcc issuing warnings as it will if one writes (u64)0x123456789abcdef. When used from assembly, these macros pass their argument unchanged. Signed-off-by: H. Peter Anvin commit 4cf63c8ac48c63b4c55669d4648506ed2bb8976f Author: H. Peter Anvin Date: Sun Apr 6 10:35:15 2008 -0700 xtensa: types: use for the xtensa architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Chris Zankel commit edfa5cfa3dc5bfa95e6aa82a2b8904e7f6c35ed7 Author: H. Peter Anvin Date: Sun Apr 6 10:35:14 2008 -0700 x86: types: use for the x86 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Thomas Gleixner commit a192da9afa00476ca27edf763922ab0b5d64246e Author: H. Peter Anvin Date: Sun Apr 6 10:35:13 2008 -0700 v850: types: use for the v850 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin commit 0dc794754cba8e3e8eb39bc028cb88c5d6ed506b Author: H. Peter Anvin Date: Sun Apr 6 10:35:13 2008 -0700 sparc64: types: use for the sparc64 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Acked-by: David S. Miller commit a3727dc6c21cd0bed64dbc97212c39d2b391f5af Author: H. Peter Anvin Date: Sun Apr 6 10:35:12 2008 -0700 sparc: types: use for the sparc architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: William L. Irwin Signed-off-by: David S. Miller commit ba6677886e46adcd075f251d8971debf7b5ca3ee Author: H. Peter Anvin Date: Sun Apr 6 10:35:11 2008 -0700 sh: types: use for the sh architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Paul Mundt commit 59df83992b6ec962fdf69e4db4c18951499cc67c Author: H. Peter Anvin Date: Sun Apr 6 10:35:10 2008 -0700 s390: types: use for the s390 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Martin Schwidefsky Cc: Heiko Carstens commit 3f02c4e0e5d20884677a0259de42e553514534f9 Author: H. Peter Anvin Date: Sun Apr 6 10:35:09 2008 -0700 powerpc: types: use for the powerpc architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Paul Mackerras Cc: Anton Blanchard commit 849bf3a09fdcf9dbbe060da0f5bce90231b14625 Author: H. Peter Anvin Date: Sun Apr 6 10:35:09 2008 -0700 parisc: types: use for the parisc architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Kyle McMartin Cc: Matthew Wilcox Cc: Grant Grundler commit 8523437b4c664cfc0f11998c4274846b95182000 Author: H. Peter Anvin Date: Sun Apr 6 10:35:07 2008 -0700 mn10300: types: use for the mn10300 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: David Howells Cc: Koichi Yasutake commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9 Author: H. Peter Anvin Date: Sun Apr 6 10:35:06 2008 -0700 mips: types: use for the mips architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Ralf Baechle commit ad55ed6161c113cc03c04df266e75d484bce8247 Author: H. Peter Anvin Date: Sun Apr 6 10:35:06 2008 -0700 m68k: types: use for the m68k architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Geert Uytterhoeven Cc: Roman Zippel commit ff704db3d4d9354712df2683b62f89dc0611632a Author: H. Peter Anvin Date: Sun Apr 6 10:35:05 2008 -0700 m32r: types: use for the m32r architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Hirokazu Takata commit 4a4bb4cee14905dd8b2b471b6998d62eeae8199c Author: H. Peter Anvin Date: Sun Apr 6 10:35:04 2008 -0700 ia64: types: use for the ia64 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Acked-by: Tony Luck commit 861531555dfac342c1c40668af8ac2f88af26e71 Author: H. Peter Anvin Date: Sun Apr 6 10:35:04 2008 -0700 h8300: types: use for the h8300 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Yoshinori Sato commit 8f337b5399302e41ed44e999e0cc518f92d0a509 Author: H. Peter Anvin Date: Sun Apr 6 10:35:03 2008 -0700 frv: types: use for the frv architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: David Howells commit e3b8cf047eb2702178b8cc16f03f8194af840732 Author: H. Peter Anvin Date: Sun Apr 6 10:35:02 2008 -0700 cris: types: use for the cris architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Mikael Starvik Cc: Jesper Nilsson commit 5424a328d281f54bbc62bf9b5118c45f8113a8b8 Author: H. Peter Anvin Date: Sun Apr 6 10:35:02 2008 -0700 blackfin: types: use for the blackfin architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Bryan Wu commit 63eae0ccacd67fd5ee238c6ba68f83f0ab91a1df Author: H. Peter Anvin Date: Sun Apr 6 10:35:01 2008 -0700 avr32: types: use for the avr32 architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Haavard Skinnemoen commit 4cc1a102b049ff2890e3a97c23ca88e7205b42fd Author: H. Peter Anvin Date: Sun Apr 6 10:35:00 2008 -0700 arm: types: use for the arm architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Russell King Cc: Lennert Buytenhek Cc: Ben Dooks commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00 Author: H. Peter Anvin Date: Sun Apr 6 10:35:00 2008 -0700 alpha: types: use for the alpha architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: Richard Henderson Cc: Ivan Kokshaysky commit d13ff31cfeedbf2fefc7ba13cb753775648eac0c Author: H. Peter Anvin Date: Thu Apr 24 12:56:52 2008 -0700 types: create This creates two generic files with common integer definitions; one where 64 bits is "long" (most 64-bit architectures) and one where 64 bits is "long long" (all 32-bit architectures and x86-64.) Signed-off-by: H. Peter Anvin Cc: Anton Blanchard Cc: Ben Dooks Cc: Bryan Wu Cc: Chris Zankel Cc: David Howells Cc: David S. Miller Cc: Geert Uytterhoeven Cc: Grant Grundler Cc: H. Peter Anvin Cc: Haavard Skinnemoen Cc: Heiko Carstens Cc: Hirokazu Takata Cc: Ingo Molnar Cc: Ivan Kokshaysky Cc: Jesper Nilsson Cc: Koichi Yasutake Cc: Kyle McMartin Cc: Lennert Buytenhek Cc: Martin Schwidefsky Cc: Matthew Wilcox Cc: Mikael Starvik Cc: Paul Mackerras Cc: Paul Mundt Cc: Ralf Baechle Cc: Richard Henderson Cc: Roman Zippel Cc: Russell King Cc: Thomas Gleixner Cc: Tony Luck Cc: William L. Irwin Cc: Yoshinori Sato commit be2e88011bd800222bfd7b477c727966f93186a9 Merge: d626e3b... 4ba1c5b... Author: Linus Torvalds Date: Fri May 2 13:53:07 2008 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: Use GFP_NOFS in kmalloc during localalloc window move ocfs2: Allow uid/gid/perm changes of symlinks ocfs2/dlm: dlmdebug.c: make 2 functions static ocfs2: make struct o2cb_stack_ops static ocfs2: make struct ocfs2_control_device static ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb) commit d626e3bf728c47746f2129aa00c775d4e8c2a73b Merge: b66e1f1... 7ad4a48... Author: Linus Torvalds Date: Fri May 2 13:52:35 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: [SCSI] aic94xx: fix section mismatch [SCSI] u14-34f: Fix 32bit only problem [SCSI] dpt_i2o: sysfs code [SCSI] dpt_i2o: 64 bit support [SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent [SCSI] dpt_i2o: use standard __init / __exit code [SCSI] megaraid_sas: fix suspend/resume sections [SCSI] aacraid: Add Power Management support [SCSI] aacraid: Fix jbod operations scan issues [SCSI] aacraid: Fix warning about macro side-effects [SCSI] add support for variable length extended commands [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer [SCSI] bsg: add large command support [SCSI] aacraid: Fix down_interruptible() to check the return value correctly [SCSI] megaraid_sas; Update the Version and Changelog [SCSI] ibmvscsi: Handle non SCSI error status [SCSI] bug fix for free list handling [SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions [SCSI] megaraid_mbox: fix Dell CERC firmware problem commit 7ad4a485002c141f156a014e89542e01e7f8e36a Author: Sam Ravnborg Date: Fri Apr 18 13:57:22 2008 -0700 [SCSI] aic94xx: fix section mismatch Fix following warnings: WARNING: vmlinux.o(.data+0x17aa88): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup() WARNING: vmlinux.o(.data+0x17aa98): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup() WARNING: vmlinux.o(.data+0x17aaa8): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9405_setup() asd_pcidev_data is only used by __devinit asd_pci_probe. So mark is const and annotate it __devinitconst to fix the warnings. [akpm@linux-foundation.org: fix warning] Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit b66e1f11ebc429569a3784aaf64123633d9e3ed1 Merge: 1be1d6b... 5c598b3... Author: Linus Torvalds Date: Fri May 2 11:23:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: [PATCH] fix sysctl_nr_open bugs [PATCH] sanitize anon_inode_getfd() [PATCH] split linux/file.h [PATCH] make osf_select() use core_sys_select() [PATCH] remove horrors with irix tty ioctls handling [PATCH] fix file and descriptor handling in perfmon commit 392512fbf9407fa1647225143e3f9c28a869ac57 Author: Alan Cox Date: Fri May 2 14:21:50 2008 +0100 [SCSI] u14-34f: Fix 32bit only problem Another user of 32bit time Signed-off-by: Alan Cox Signed-off-by: James Bottomley commit 1ed43910956f5faec690ea3214451779e93bbb52 Author: Miquel van Smoorenburg Date: Fri May 2 01:08:19 2008 +0200 [SCSI] dpt_i2o: sysfs code Create a /sys/class/dpt_i2o directory and populate it with dptiN directories. Each dptiN directory contains a "dev" file that makes udev create /dev/dptiN Signed-off-by: Miquel van Smoorenburg Acked-by: Mark Salyzyn Signed-off-by: James Bottomley commit 62ac5aedc51485d672a5d91c262a001acecbe447 Author: Miquel van Smoorenburg Date: Fri May 2 01:07:27 2008 +0200 [SCSI] dpt_i2o: 64 bit support This is the code to actually support 64 bit platforms. 64 bit DMA is enabled on both x86_32 PAE and 64 bit platforms. This code is based in part on the unofficial adaptec 64-bit dpt_i2o driver update that I got from Mark Salyzyn at Adaptec. Signed-off-by: Miquel van Smoorenburg Acked-by: Mark Salyzyn Signed-off-by: James Bottomley commit 67af2b060e027c84b8e48d77e00b2369d997c0d4 Author: Miquel van Smoorenburg Date: Fri May 2 01:06:39 2008 +0200 [SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent Remove virt_to_bus/bus_to_virt code from dpt_i2o, and use dma_alloc_coherent() / dma_free_coherent(). This is in preparation of 64-bit support, dma_alloc_coherent() can allocate memory in the lower 32 bits of physical memory which is needed because the HBA only supports message blocks under 4GB This code is based in part on the unofficial adaptec 64-bit dpt_i2o driver update that I got from Mark Salyzyn at Adaptec. Signed-off-by: Miquel van Smoorenburg Acked-by: Mark Salyzyn Signed-off-by: James Bottomley commit c864cb145dc2218cfad9fe53d323b54b48dbab6c Author: Miquel van Smoorenburg Date: Fri May 2 01:05:33 2008 +0200 [SCSI] dpt_i2o: use standard __init / __exit code Update dpt_i2o.c to use the standard __init / __exit code instead of the legacy '#include "scsi_module.c"' code. This is needed in preparation of 64-bit support. scsi_module.c calls scsi_add_host() with the device pointer set to NULL, and that crashes code like arch/x64/kernel/pci-gart_64.c::need_iommu(). The reboot_notifier code is deleted because it wasn't compiled in ever anyway, and it would be useless to duplicate it in the new code. Signed-off-by: Miquel van Smoorenburg Acked-by: Mark Salyzyn Signed-off-by: James Bottomley commit 33139b21013aba815924b421159fab35e5175483 Author: Jiri Slaby Date: Thu May 1 17:56:02 2008 +0200 [SCSI] megaraid_sas: fix suspend/resume sections megaraid_sas suspend and resume are inappropriatelly placed in __devinit section. Remove those placements and make the stuff dependent on CONFIG_PM. While at it, mark remove function as __devexit. Signed-off-by: Jiri Slaby Acked-by: "Yang, Bo" Signed-off-by: James Bottomley commit 655d722cf7812078306f975a3afe88b96a1306b8 Author: Mark Salyzyn Date: Wed Apr 30 16:03:42 2008 -0400 [SCSI] aacraid: Add Power Management support For firmware that supports the feature(s), add the ability to start or stop an array using the associated SCSI commands, to automatically manage the spin-up of an array on new I/O reporting back the appropriate check conditions and actions in cooperation with the normal timeout mechanisms and enable the blackout period management in the Firmware associated with the background spin-down of the arrays when the Firmware times out and deems the arrays as idle. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit a4576b5da671563187ac388e36e1d077bd20e43a Author: Mark Salyzyn Date: Wed Apr 30 15:47:35 2008 -0400 [SCSI] aacraid: Fix jbod operations scan issues As JBOD devices (really just Simple Single Drive Volumes exported to the SCSI channel) are managed, they fail to update correctly when the driver triggers a SCSI scan. In addition, the ability to change multiple arrays or JBODs at the same time was resulting in dropped scans, set up a mechanism to issue a list of single target scans on a single configuration change notification from the Firmware. Performed some additional sundry cosmetic code style cleanups. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit e2efe7aa24dc7b430d2ea109fa117bd3c60ae8e6 Author: Mark Salyzyn Date: Wed Apr 30 15:28:32 2008 -0400 [SCSI] aacraid: Fix warning about macro side-effects On some compile environments, warnings are produced regarding the usage of aac_logical_to_phys macro. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 Merge: 37b6a04... 62fd2ca... Author: Linus Torvalds Date: Fri May 2 11:03:08 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits) USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance usb_serial: some coding style fixes USB: Remove redundant dependencies on USB_ATM. USB: UHCI: disable remote wakeup when it's not needed USB: OHCI: work around bogus compiler warning USB: add Cypress c67x00 OTG controller HCD driver USB: add Cypress c67x00 OTG controller core driver USB: add Cypress c67x00 low level interface code USB: airprime: unlock mutex instead of trying to lock it again USB: storage: Update mailling list address USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame. USB: Add the USB 2.0 extension descriptor. USB: add more FTDI device ids USB: fix cannot work usb storage when using ohci-sm501 usb: gadget zero timer init fix usb: gadget zero style fixups (mostly whitespace) usb serial gadget: CDC ACM fixes usb: pxa27x_udc driver USB: INTOVA Pixtreme camera mass storage device ... commit 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8 Merge: 3482a6f... 0691663... Author: Linus Torvalds Date: Fri May 2 11:02:53 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: driver-core: add dev_name() to help transition away from using bus_id commit 62fd2cac5bf5cf9e6fcb2fc40b32e7271e605c53 Author: David Lopo Date: Tue Apr 29 10:14:38 2008 +0100 USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore Gadget tells controller driver to ignore Clear-Feature(HALT_ENDPOINT) Signed-off-by: David Lopo Acked-by: Alan Stern commit a5e54b0dbb6a099793caf508b1d6c7d82f965ec3 Author: David Lopo Date: Tue Apr 29 10:12:37 2008 +0100 USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance Gadget can tell controller driver to ignore Clear-Feature(HALT_ENDPOINT) This API change enables future support for Bulk-Only Transport compliance Signed-off-by: David Lopo Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c4d0f8cbca3a97900f85b082064a63c7a5928bd7 Author: Alan Cox Date: Tue Apr 29 14:35:39 2008 +0100 usb_serial: some coding style fixes Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e5430f889ce04301152044cce15a4a11a3e21e7d Author: Robert P. J. Day Date: Fri Apr 25 17:06:35 2008 -0400 USB: Remove redundant dependencies on USB_ATM. Given that the bulk of the Kconfig file is enclosed in "if USB_ATM", remove the unnecessary dependencies. Signed-off-by: Robert P. J. Day Signed-off-by: Greg Kroah-Hartman commit d8f12ab5d984761726e638a4222299a9fc516233 Author: Alan Stern Date: Tue Apr 22 10:49:15 2008 -0400 USB: UHCI: disable remote wakeup when it's not needed This patch (as1084b) fixes the way uhci-hcd handles polling and remote wakeups for its root hubs. When remote wakeup is disabled, neither interrupts nor polling should be enabled during a root-hub suspend. Likewise, if interrupts are enabled during suspend then polling isn't needed. Furthermore the EGSM (Enter Global Suspend Mode) bit shouldn't be set in the Command register unless remote wakeup is enabled. Apparently some controllers will issue a remote-wakeup interrupt whenever EGSM is on, even if Resume-Detect interrupts are supposedly disabled. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1b7b61c5d4071b9a25f6a9aae6f0a1e0efdbb2ae Author: Alan Stern Date: Tue Apr 22 10:50:18 2008 -0400 USB: OHCI: work around bogus compiler warning The patch (as1086) works around a bogus "uninitialized variable" warning generated by some versions of GCC. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e9b29ffc519b9e63d4e1c0b1278bb951bb418a9d Author: Peter Korsgaard Date: Sun Apr 27 08:59:45 2008 +0200 USB: add Cypress c67x00 OTG controller HCD driver This patch adds HCD support for the Cypress c67x00 family of devices. Signed-off-by: Peter Korsgaard Signed-off-by: Greg Kroah-Hartman commit b02b371e6d14961ad458ca9d88b30eefef77003d Author: Peter Korsgaard Date: Sun Apr 27 08:59:44 2008 +0200 USB: add Cypress c67x00 OTG controller core driver This patch add the core driver for the c67x00 USB OTG controller. The core driver is responsible for the platform bus binding and creating either USB HCD or USB Gadget instances for each of the serial interface engines on the chip. This driver does not directly implement the HCD or gadget behaviours; it just controls access to the chip. Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d6f945044ee3b91a170183e8e34c3db29696d9b8 Author: Peter Korsgaard Date: Sun Apr 27 08:59:43 2008 +0200 USB: add Cypress c67x00 low level interface code This patch adds the low level support code for the Cypress c67x00 family of OTG controllers. The low level code is responsible for register access and implements the software protocol for communicating with the 16bit microcontroller inside the c67x00 device. Communication is done over the HPI interface (16bit SRAM-like parallel bus). Signed-off-by: Peter Korsgaard Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 21ae1dd1d4948968ad2d923c5e104d38fb35b4e4 Author: Leonardo Chiquitto Date: Tue Apr 22 16:02:03 2008 -0300 USB: airprime: unlock mutex instead of trying to lock it again The following patch fixes a [probable] copy & paste mistake in airprime.c. Instead of unlocking an acquired mutex, the actual code tries to lock it again. Signed-off-by: Leonardo Chiquitto Signed-off-by: Greg Kroah-Hartman commit cef03f8f1d5042e85de431d739eeded89d79999b Author: Andrew Lunn Date: Wed Apr 23 22:04:30 2008 +0200 USB: storage: Update mailling list address drivers/usb/storage/unusual_devs.h lists the address linux-usb-devel@lists.sourceforge.net for patches to that file. This address results in a bounce and a pointer to vger. This patch updates the address in the header file. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit f7687217ddb5e20ca855fadef2f9eb3c3202acca Author: Andrew Lunn Date: Thu Apr 24 19:36:39 2008 +0200 USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame. Signed-off-by: Andrew Lunn Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 35e5437e8c8cd013e1e573ac4671d556819edbcb Author: Sarah Sharp Date: Fri Apr 25 16:46:45 2008 -0700 USB: Add the USB 2.0 extension descriptor. This device descriptor was added by the recent USB Link Power Management (LPM) ECN. It indicates whether the USB device supports LPM. This descriptor is grouped under a Binary Device Object Store (BOS) descriptor. Update the BOS comments to indicate any USB device (not just wireless USB devices) can implement BOS descriptors. Signed-off-by: Sarah Sharp Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6e1ab3ed825418320319f44af1b990c9c3f4c45b Author: Peter Mack Date: Tue Apr 22 13:25:11 2008 +0200 USB: add more FTDI device ids Add more usb device ids to the ftdi driver. From: Peter Mack Signed-off-by: Greg Kroah-Hartman commit e2722528ce688eecf574c237f7656d3934d4f23c Author: Yoshihiro Shimoda Date: Mon Apr 21 13:48:22 2008 +0900 USB: fix cannot work usb storage when using ohci-sm501 When I used ohci-sm501, hcd_alloc_coherent() in map_urb_for_dma() is not called, because usb_sg_init() always sets URB_NO_TRANSFER_DMA_MAP. dmesg (CONFIG_USB_STORAGE_DEBUG enabled): usb-storage: Bulk Command S 0x43425355 T 0x1 L 36 F 128 Trg 0 LUN 0 CL 6 usb-storage: usb_stor_bulk_transfer_buf: xfer 31 bytes usb-storage: Status code 0; transferred 31/31 usb-storage: -- transfer complete usb-storage: Bulk command transfer result=0 usb-storage: usb_stor_bulk_transfer_sglist: xfer 36 bytes, 1 entries usb-storage: Status code -75; transferred 0/36 usb-storage: -- babble usb-storage: Bulk data transfer result 0x3 usb-storage: Attempting to get CSW... usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes usb-storage: Status code 0; transferred 13/13 usb-storage: -- transfer complete usb-storage: Bulk status result = 0 usb-storage: Bulk Status S 0x53425355 T 0x1 R 0 Stat 0x0 usb-storage: scsi cmd done, result=0x2 Signed-off-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21 Author: David Lopo Date: Fri Apr 18 18:49:01 2008 -0700 usb: gadget zero timer init fix Initialize timer earlier so if an error occurs allocating USB request or buffer request (zero_bind) Gadget Zero will not hang trying to delete an uninitialized timer (zero_unbind). Signed-off-by: David Lopo Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7472f38b10c884f47241529d1367f77c2e1b3551 Author: David Brownell Date: Fri Apr 18 18:47:54 2008 -0700 usb: gadget zero style fixups (mostly whitespace) Minor updates to "Gadget Zero". - Primarily these are whitespace updates to address the fact that since this was written, Documentation/CodingStyle was changed to disapprove of parts of the original coding style. - Update a few comments that weren't quite correct, notably mentioning the "autoresume" module parameter. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit f371e750c9324f3498842ee833a0242a11b359e6 Author: David Brownell Date: Fri Apr 18 17:37:49 2008 -0700 usb serial gadget: CDC ACM fixes Based on a patch from , this makes the CDC-ACM support in the serial gadget handle the SET_LINE_CODING and SET_CONTROL_LINE_STATE requests ... which should improve interop with at least MS-Windows "usbser.sys" if not some other ACM host drivers. It also adds a few REVISIT comments where this code plays a bit loose with the CDC ACM spec. If this were used to hook up to a real RS232 or modem link, those places would need a bit of work. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d75379a538708c5a8e3dba673d866c3f5f856620 Author: Robert Jarzmik Date: Fri Apr 18 15:56:49 2008 -0700 usb: pxa27x_udc driver Adds pxa27x udc driver to support USB peripherals on pxa27x chips. The driver is compatible with: Gadget Zero, the File Storage gadget, and the Ethernet gadget (only in CDC subset mode). The driver can't properly support multiple interfaces, because of hardware bugs without possible workaround. That means no RNDIS support from g_ether, and no CDC ACM support in g_serial. Signed-off-by: Robert Jarzmik Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d301f528eb7b204fc99fb9ebbf289f84a69bfa19 Author: Rohan Hart Date: Fri Apr 18 21:19:33 2008 +1200 USB: INTOVA Pixtreme camera mass storage device FIX_CAPACITY is all that's needed. Cc: Alan Stern Cc: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 87521c46f63f0e1cac2bf8af08942ac47bb25de5 Author: Roel Kluin <12o3l@tiscali.nl> Date: Thu Apr 17 06:16:24 2008 +0200 USB: mos7840: test and propagate set_uart_reg return value The test for an mos7840_set_uart_reg() error return value only works when status is signed. propagate its error value. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Cc: SL Baur Signed-off-by: Greg Kroah-Hartman commit 28ffd79c31a7bed6f610511a4d104d1255cd1d95 Author: David Brownell Date: Fri Apr 25 18:51:10 2008 -0700 USB: usbtest displays diagnostics again Minor cleanup to the "usbtest" driver, mostly to resolve a regression: all the important diagnostics were at KERN_DEBUG, so that when the "#define DEBUG" was removed from the top of that file it stopped providing diagnostics. Fix by using KERN_ERROR. Also: - Stop using the legacy dbg() calls - Simplify the internal debug macros - Correct some test descriptions: * Test #10 subcase 7 should *always* stall * Test #10 subcase 8 *may* stall - Diagnostic about control queue test failures is more informative - Fix some whitespace "bugs" And add a warning about the rude interaction between usbfs ioctl() and khubd during device disconnect ... don't unplug a device under test, that will wedge. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9029b174ba22918d0a0aa3b71859854bd50c39cc Author: Pete Zaitcev Date: Sat Apr 19 14:45:24 2008 -0700 ub: Cosmetics Fix a few comments and printk statements. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 0da13c8c3dfb1ab6c56f2a70fadfddd57e0d7c42 Author: Pete Zaitcev Date: Sat Apr 19 14:42:49 2008 -0700 ub: Ignore bad residue I hoped to continue to ignore this problem or use libusual, but these days it's simpler to work around than to deal with it. Let's attempt to use bad residue devices and hope that upper level integrity checks catch any problems (e.g. please use sha1sum on your backups). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 82fe26ba7a21d9bcc77e6142c941683eede32940 Author: Pete Zaitcev Date: Sat Apr 19 14:35:30 2008 -0700 ub: Tune retries Make ub to fail faster in hopeless cases. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 2c51ae70ede5a90d8ccb67d965c1b4e20fc4e110 Author: Pete Zaitcev Date: Sat Apr 19 14:32:18 2008 -0700 ub: Fix timeouts The wodim says: "close track/session scsi sendcmd: cmd timeout after 5.000 (480) s" This happened because we ignored the supplied timeout and used 5s. It's not completely correct to apply a timeout meant for the complete command to any single URB, but we don't have many URBs per command, so this is simple and works. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 043042109b24a1bd418db7cd509dadc5d120daf1 Author: Rusty Russell Date: Mon Apr 21 06:38:34 2008 +1000 usb: libusual kthread_run() called with wrong format. Signed-off-by: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit b28884c1729940df83d87c515a5e66e5afbe9dea Author: Alan Stern Date: Mon Apr 28 10:26:13 2008 -0400 usb-storage: add unusual_devs entry for Samsung YP-U3 This patch (as1088) adds an unusual_devs entry for Samsung's YP-U3. Signed-off-by: Alan Stern Cc: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 43c1e98c87013757ef02c50a6e43bafeb6871f68 Author: Adrian Bunk Date: Mon Apr 28 18:39:37 2008 +0300 USB: storage/onetouch.c: make a function static This patch makes the needlessly global onetouch_release_input() static. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit e42dc36b2cf9849362967ea836196c8ef6079ec7 Author: Dmitry Torokhov Date: Mon Apr 28 16:57:14 2008 -0400 usb-storage: fix build failure in OneTouch driver If USB storage is built-in but input subsystem is made modular then OneTouch button functionality can not be selected. Signed-off-by: Dmitry Torokhov Cc: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit ce0d7d3f575fc1ba6a89c3c651e710355590daff Author: Daniel Walker Date: Mon Apr 28 10:34:56 2008 -0700 usb: ldusb: ld_usb semaphore to mutex Signed-off-by: Daniel Walker Acked-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit db11e47dd7b09b7f76c7eaa236277f23391331e7 Author: Sebastian Siewior Date: Thu Apr 24 00:37:04 2008 +0200 USB: ISP1760 HCD driver This driver has been written from scratch and supports the ISP1760. ISP1761 might (should) work as well but the OTG isn't supported. Also ISO packets are not. However, it works on my little PowerPC board. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Kroah-Hartman commit 06916639e2fed9ee475efef2747a1b7429f8fe76 Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 driver-core: add dev_name() to help transition away from using bus_id Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit db4742dd8f0aa9125b74f9b2516336a75f3d9106 Author: Boaz Harrosh Date: Wed Apr 30 11:27:26 2008 +0300 [SCSI] add support for variable length extended commands Add support for variable-length, extended, and vendor specific CDBs to scsi-ml. It is now possible for initiators and ULD's to issue these types of commands. LLDs need not change much. All they need is to raise the .max_cmd_len to the longest command they support (see iscsi patch). - clean-up some code paths that did not expect commands to be larger than 16, and change cmd_len members' type to short as char is not enough. Signed-off-by: Boaz Harrosh Signed-off-by: Benny Halevy Signed-off-by: James Bottomley commit 3482a6f1d1447b618d37049529cf36a8dc3bd3e3 Merge: 59d42c0... 1adb085... Author: Linus Torvalds Date: Fri May 2 08:22:36 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq: genirq: reenable a nobody cared disabled irq when a new driver arrives commit 59d42c0eb1d8fdfeec18f4ff088de8084bda906b Merge: 02cdf08... 62478fa... Author: Linus Torvalds Date: Fri May 2 08:20:43 2008 -0700 Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: cleanup: drop .data.idt section in vmlinux.lds script m32r: use KBUILD_DEFCONFIG commit 02cdf0827b61d51f0e9cc1b5ddd486950830ba08 Merge: 8bec4a5... a007a75... Author: Linus Torvalds Date: Fri May 2 08:20:04 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: make Launcher see device status updates lguest: remove bogus NULL cpu check lguest: avoid using NR_CPUS as a bounds check. virtio: add virtio disk geometry feature virtio: explicit advertisement of driver features virtio: change config to guest endian. virtio: finer-grained features for virtio_net virtio: wean net driver off NETDEV_TX_BUSY virtio-blk: fix remove oops virtio: fix scatterlist sizing in net driver. virtio: de-structify virtio_block status byte virtio: export more headers to userspace virtio: fix sparse return void-valued expression warnings virtio: fix tx_ stats in virtio_net virtio: ignore corrupted virtqueues rather than spinning. commit 64a87b244b9297667ca80264aab849a36f494884 Author: Boaz Harrosh Date: Wed Apr 30 11:19:47 2008 +0300 [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer - struct scsi_cmnd had a 16 bytes command buffer of its own. This is an unnecessary duplication and copy of request's cmd. It is probably left overs from the time that scsi_cmnd could function without a request attached. So clean that up. - Once above is done, few places, apart from scsi-ml, needed adjustments due to changing the data type of scsi_cmnd->cmnd. - Lots of drivers still use MAX_COMMAND_SIZE. So I have left that #define but equate it to BLK_MAX_CDB. The way I see it and is reflected in the patch below is. MAX_COMMAND_SIZE - means: The longest fixed-length (*) SCSI CDB as per the SCSI standard and is not related to the implementation. BLK_MAX_CDB. - The allocated space at the request level - I have audit all ISA drivers and made sure none use ->cmnd in a DMA Operation. Same audit was done by Andi Kleen. (*)fixed-length here means commands that their size can be determined by their opcode and the CDB does not carry a length specifier, (unlike the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly true and the SCSI standard also defines extended commands and vendor specific commands that can be bigger than 16 bytes. The kernel will support these using the same infrastructure used for VARLEN CDB's. So in effect MAX_COMMAND_SIZE means the maximum size command scsi-ml supports without specifying a cmd_len by ULD's Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley commit 8bec4a5d9305c86d028a519b08f05b81cd63cc55 Merge: 886c35f... f8e811b... Author: Linus Torvalds Date: Fri May 2 08:17:58 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix file and descriptor handling in perfmon [IA64] TS_RESTORE_SIGMASK [IA64] smp.c coding style fix [IA64] fix section mismatch in arch/ia64/kernel/topology.c [IA64] fix section mismatch in arch/ia64/kernel/palinfo.c [IA64] fix section mismatch in arch/ia64/kernel/irq.c [IA64] fix section mismatch in arch/ia64/kernel/acpi.c commit 9f5de6b105bfa45911d46566df0b36720b648c42 Author: FUJITA Tomonori Date: Wed Apr 30 13:16:21 2008 +0900 [SCSI] bsg: add large command support This enables bsg to handle the request length larger than BLK_MAX_CDB (mainly for the variable length CDB format). Signed-off-by: FUJITA Tomonori Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 0462590efe9a562dd2aa976ae2dc9cd2e6f5a0c6 Author: Mark Salyzyn Date: Wed Apr 23 08:16:06 2008 -0400 [SCSI] aacraid: Fix down_interruptible() to check the return value correctly On Apr 21, 2008, at 8:42 PM, Yinghai Lu wrote: > bisected to: > > commit e6990c6448ca9359b6d4ad027c0a6efbf4379e64 > Author: Mark Salyzyn > Date: Mon Apr 14 14:20:16 2008 -0400 > > [SCSI] aacraid: Fix down_interruptible() to check the return value The return value for down_interruptible was incorrectly checked! updated patch enclosed. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c Author: David S. Miller Date: Thu May 1 22:33:04 2008 -0700 sparc32: Delete prom_stdin and prom_stdout. They are written, but never used. Signed-off-by: David S. Miller commit 9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8 Author: David S. Miller Date: Thu May 1 22:28:17 2008 -0700 sparc32: More memory probing consolidation. The PROM library function prom_meminit() builds a table, prom_phys_avail[], just so that probe_memory() in arch/sparc/mm/fault.c can copy it into sp_banks[]. Just have prom_meminit() fill in the sp_banks[] array directly, and remove duplicated sort() function. Signed-off-by: David S. Miller commit ccc34028d46230f715eeda4c8cce27e919934fad Author: David S. Miller Date: Thu May 1 21:28:59 2008 -0700 sparc32: Kill totally unused memory information tables. The code in arch/sparc/prom/memory.c computes three tables, the list of total memory, the list of available memory (total minus what firmware is using), and the list of firmware taken memory. Only the available memory list is even used. Therefore, kill those unused tables and make prom_meminfo() return just the available memory list. Signed-off-by: David S. Miller commit 2678fefedbbc03a3ae6f5c254791bf147d6c52fd Author: David S. Miller Date: Thu May 1 03:30:22 2008 -0700 sparc64: Fix syscall restart, for real... The change I put into copy_thread() just papered over the real problem. When we are looking to see if we should do a syscall restart, when deliverying a signal, we should only interpret the syscall return value as an error if the carry condition code(s) are set. Otherwise it's a success return. Also, sigreturn paths should do a pt_regs_clear_trap_type(). It turns out that doing a syscall restart when returning from a fork() does and should happen, from time to time. Even if copy_thread() returns success, copy_process() can still unwind and signal -ERESTARTNOINTR in the parent. Signed-off-by: David S. Miller commit 32039f4954938e4d761032d7046254d08d0db54c Author: David S. Miller Date: Thu May 1 01:14:27 2008 -0700 serial: Fix sparc driver name strings. They were all "serial" so if multiple of these drivers registered, we'd trigger sysfs directory creation errors: [ 1.695793] proc_dir_entry 'serial' already registered [ 1.695839] Call Trace: [ 1.831891] [00000000004f2534] create_proc_entry+0x7c/0x98 [ 1.833608] [00000000004f3a58] proc_tty_register_driver+0x40/0x70 [ 1.833663] [0000000000594700] tty_register_driver+0x1fc/0x208 [ 1.835371] [00000000005aade4] uart_register_driver+0x134/0x16c [ 1.841762] [00000000005ac274] sunserial_register_minors+0x34/0x68 [ 1.841818] [00000000007db2a4] sunsu_init+0xf8/0x150 [ 1.867697] [00000000007c62a4] kernel_init+0x190/0x330 [ 1.939147] [0000000000426cf8] kernel_thread+0x38/0x48 [ 1.939198] [00000000006a0d90] rest_init+0x18/0x5c Signed-off-by: David S. Miller commit c26d3c0138970778fabe114df99dffb34a04b1d7 Author: David S. Miller Date: Thu May 1 01:12:40 2008 -0700 sparc64: Stop creating dummy root PCI host controller devices. It just creates confusion, errors, and bugs. For one thing, this can cause dup sysfs or procfs nodes to get created: [ 1.198015] proc_dir_entry '00.0' already registered [ 1.198036] Call Trace: [ 1.198052] [00000000004f2534] create_proc_entry+0x7c/0x98 [ 1.198092] [00000000005719e4] pci_proc_attach_device+0xa4/0xd4 [ 1.198126] [00000000007d991c] pci_proc_init+0x64/0x88 [ 1.198158] [00000000007c62a4] kernel_init+0x190/0x330 [ 1.198183] [0000000000426cf8] kernel_thread+0x38/0x48 [ 1.198210] [00000000006a0d90] rest_init+0x18/0x5c Signed-off-by: David S. Miller commit a007a751d98fe97142e4724a83a4e31ec66b7532 Author: Rusty Russell Date: Fri May 2 21:50:53 2008 -0500 lguest: make Launcher see device status updates This brings us closer to Real Life, where we'd examine the device features once it's set the DRIVER_OK status bit. Signed-off-by: Rusty Russell commit 9f3f746741d917fe3c6c544c7d319d533176d90b Author: Rusty Russell Date: Fri May 2 21:50:51 2008 -0500 lguest: remove bogus NULL cpu check If lg isn't NULL, and cpu_id is sane, &lg->cpus[cpu_id] can't be NULL. Signed-off-by: Rusty Russell commit 24adf12722b4f2800e5b5f0955d57033f0d0c9e5 Author: Rusty Russell Date: Fri May 2 21:50:51 2008 -0500 lguest: avoid using NR_CPUS as a bounds check. NR_CPUS (being a host number) is an arbitrary limit for the Guest. Using the array size directly (which currently happes to be NR_CPUS) is more futureproof. Signed-off-by: Rusty Russell commit 48e4043d4529523cbc7fa8dd745bd8e2c45ce1d3 Author: Ryan Harper Date: Wed Apr 16 13:56:37 2008 -0500 virtio: add virtio disk geometry feature Rather than faking up some geometry, allow the backend to push the disk geometry via virtio pci config option. Keep the old geo code around for compatibility. Signed-off-by: Ryan Harper Reviewed-by: Anthony Liguori Signed-off-by: Rusty Russell (modified to single struct) commit c45a6816c19dee67b8f725e6646d428901a6dc24 Author: Rusty Russell Date: Fri May 2 21:50:50 2008 -0500 virtio: explicit advertisement of driver features A recent proposed feature addition to the virtio block driver revealed some flaws in the API: in particular, we assume that feature negotiation is complete once a driver's probe function returns. There is nothing in the API to require this, however, and even I didn't notice when it was violated. So instead, we require the driver to specify what features it supports in a table, we can then move the feature negotiation into the virtio core. The intersection of device and driver features are presented in a new 'features' bitmap in the struct virtio_device. Note that this highlights the difference between Linux unsigned-long bitmaps where each unsigned long is in native endian, and a straight-forward little-endian array of bytes. Drivers can still remove feature bits in their probe routine if they really have to. API changes: - dev->config->feature() no longer gets and acks a feature. - drivers should advertise their features in the 'feature_table' field - use virtio_has_feature() for extra sanity when checking feature bits Signed-off-by: Rusty Russell commit 72e61eb40b55dd57031ec5971e810649f82b0259 Author: Rusty Russell Date: Fri May 2 21:50:49 2008 -0500 virtio: change config to guest endian. A recent proposed feature addition to the virtio block driver revealed some flaws in the API, in particular how easy it is to break big endian machines. The virtio config space was originally chosen to be little-endian, because we thought the config might be part of the PCI config space for virtio_pci. It's actually a separate mmio region, so that argument holds little water; as only x86 is currently using the virtio mechanism, we can change this (but must do so now, before the impending s390 merge). API changes: - __virtio_config_val() just becomes a striaght vdev->config_get() call. Signed-off-by: Rusty Russell commit 5539ae9613587e4a4eec42d420b8bdd9ff552a65 Author: Rusty Russell Date: Fri May 2 21:50:46 2008 -0500 virtio: finer-grained features for virtio_net So, we previously had a 'VIRTIO_NET_F_GSO' bit which meant that 'the host can handle csum offload, and any TSO (v4&v6 incl ECN) or UFO packets you might want to send. I thought this was good enough for Linux, but it actually isn't, since we don't do UFO in software. So, add separate feature bits for what the host can handle. Add equivalent ones for the guest to say what it can handle, because LRO is coming too (thanks Herbert!). Signed-off-by: Rusty Russell commit 99ffc696d10b28580fe93441d627cf290ac4484c Author: Rusty Russell Date: Fri May 2 21:50:46 2008 -0500 virtio: wean net driver off NETDEV_TX_BUSY Herbert tells me that returning NETDEV_TX_BUSY from hard_start_xmit is seen as a poor thing to do; we should cache the packet and stop the queue. Signed-off-by: Rusty Russell Acked-by: Herbert Xu commit 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d Author: Marcelo Tosatti Date: Thu Apr 24 15:49:53 2008 -0300 virtio-blk: fix remove oops Do not unregister the major at device remove, since there might be another device instances around. (qemu) pci_del 0 11 (qemu) ACPI: PCI interrupt for device 0000:00:0b.0 disabled (qemu) pci_del 0 10 (qemu) ------------[ cut here ]------------ WARNING: at block/genhd.c:126 unregister_blkdev+0x74/0x9e() ACPI: PCI interrupt for device 0000:00:0a.0 disabled Signed-off-by: Marcelo Tosatti Signed-off-by: Rusty Russell commit 0527168522c25121bdd5d5f1d3c5b484d972ea14 Author: Rusty Russell Date: Fri May 2 21:50:45 2008 -0500 virtio: fix scatterlist sizing in net driver. Herbert Xu points out (within another patch) that my scatterlists are too short: one entry for the gso header, one for the skb->data, and MAX_SKB_FRAGS for all the fragments. Fix both xmit and recv sides (recv currently unused, coming in later patch). Signed-off-by: Rusty Russell commit cb38fa23c17519faf46a76d2f71a8430705fe474 Author: Rusty Russell Date: Fri May 2 21:50:45 2008 -0500 virtio: de-structify virtio_block status byte Ron Minnich points out that a struct containing a char is not always sizeof(char); simplest to remove the structure to avoid confusion. Cc: "ron minnich" Signed-off-by: Rusty Russell commit 81473132878f8a1d0c6a78cffa0cf84c8a19c1be Author: Christian Borntraeger Date: Wed Apr 23 12:57:00 2008 +0200 virtio: export more headers to userspace Rusty, is there a reason why we dont export the virtio headers for 9p, balloon, console, pci, and virtio_ring? kvm uses make sync, but I think it is still useful to heave these headers exported as they might be useful for other userspace tools. I dont export virtio.h, because it does not seem to have useful information for userspace and it requires scatterlist.h which is also not exported. See also my other mail about your "virtio: change config to guest endian." patch. Signed-off-by: Christian Borntraeger Signed-off-by: Rusty Russell commit 597d56e4b51fc3385e097e52d6e92bf596ff21ec Author: Harvey Harrison Date: Mon Mar 31 17:53:55 2008 -0700 virtio: fix sparse return void-valued expression warnings drivers/virtio/virtio_pci.c:148:2: warning: returning void-valued expression drivers/virtio/virtio_pci.c:155:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Rusty Russell commit 655aa31f028c4498e8896576571ee1ea68dd26e0 Author: Rusty Russell Date: Fri May 2 21:50:43 2008 -0500 virtio: fix tx_ stats in virtio_net get_buf() gives the length written by the other side, which will be zero. We want to add the skb length. Signed-off-by: Rusty Russell commit 5ef827526fc01820a7a80827802e9fad3f34f937 Author: Rusty Russell Date: Fri May 2 21:50:43 2008 -0500 virtio: ignore corrupted virtqueues rather than spinning. A corrupt virtqueue (caused by the other end screwing up) can have strange results such as a driver spinning: just bail when we try to get a buffer from a known-broken queue. Signed-off-by: Rusty Russell commit 1adb0850a1254333d81e64121c80af100c6d6e06 Author: Thomas Gleixner Date: Mon Apr 28 17:01:56 2008 +0200 genirq: reenable a nobody cared disabled irq when a new driver arrives Uwe Kleine-Koenig has some strange hardware where one of the shared interrupts can be asserted during boot before the appropriate driver loads. Requesting the shared irq line from another driver result in a spurious interrupt storm which finally disables the interrupt line. I have seen similar behaviour on resume before (the hardware does not work anymore so I can not verify). Change the spurious disable logic to increment the disable depth and mark the interrupt with an extra flag which allows us to reenable the interrupt when a new driver arrives which requests the same irq line. In the worst case this will disable the irq again via the spurious trap, but there is a decent chance that the new driver is the one which can handle the already asserted interrupt and makes the box usable again. Eric Biederman said further: This case also happens on a regular basis in kdump kernels where we deliberately don't shutdown the hardware before starting the new kernel. This patch should reduce the need for using irqpoll in that situation by a small amount. Signed-off-by: Thomas Gleixner Tested-and-Acked-by: Uwe Kleine-König commit 78e92b99ec4eb73755abd4e357b0b211eadafd88 Author: Denis V. Lunev Date: Fri May 2 04:12:41 2008 -0700 netns: assign PDE->data before gluing entry into /proc tree In this unfortunate case, proc_mkdir_mode wrapper can't be used anymore and this is no way to reuse proc_create_data due to nlinks assignment. So, copy the code from proc_mkdir and assign PDE->data at the appropriate moment. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 8b169240e266d7fc58d9b9077d18d50a548d9732 Author: Denis V. Lunev Date: Fri May 2 04:11:52 2008 -0700 netfilter: assign PDE->data before gluing PDE into /proc tree Replace proc_net_fops_create with proc_create_data. Signed-off-by: Denis V. Lunev Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 52c0e111fa082082060c4d43c05f20b756d5f06a Author: Denis V. Lunev Date: Fri May 2 04:10:57 2008 -0700 netfilter: assign PDE->fops before gluing PDE into /proc tree Replace create_proc_entry with specially created for this purpose proc_create. Signed-off-by: Denis V. Lunev Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 84841c3c6cf2ed9a8e0dfd842fb35ef6e2bce091 Author: Denis V. Lunev Date: Fri May 2 04:10:08 2008 -0700 ipv4: assign PDE->data before gluing PDE into /proc tree The check for PDE->data != NULL becomes useless after the replacement of proc_net_fops_create with proc_create_data. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 1d3faa390df9f009d7d76134b2aa1f07990945a4 Author: Denis V. Lunev Date: Fri May 2 04:09:11 2008 -0700 vlan: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 0c89652a741cce71661d561c4466115c60c752d1 Author: Denis V. Lunev Date: Fri May 2 04:08:30 2008 -0700 atm: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. proc_atm_dev_ops holds proper referrence. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca Author: Denis V. Lunev Date: Fri May 2 02:46:55 2008 -0700 ipv6: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 5efdccbcda20d3e5fbaa85f726dcc9cfeb005577 Author: Denis V. Lunev Date: Fri May 2 02:46:22 2008 -0700 net: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Additionally, there is no need to assign NULL to PDE->data after creation, /proc generic has already done this for us. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 6e79d85d9a6b7a149dd3666b079c96cfbf57fdb8 Author: Denis V. Lunev Date: Fri May 2 02:45:42 2008 -0700 netfilter: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit e7fe23363bab0488c7ce09626900e7d621ea2292 Author: Denis V. Lunev Date: Fri May 2 02:44:36 2008 -0700 sunrpc: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539 Author: Paul Mackerras Date: Fri May 2 14:29:12 2008 +1000 [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus This fixes a regression reported by Kamalesh Bulabel where a POWER4 machine would crash because of an SLB miss at a point where the SLB miss exception was unrecoverable. This regression is tracked at: http://bugzilla.kernel.org/show_bug.cgi?id=10082 SLB misses at such points shouldn't happen because the kernel stack is the only memory accessed other than things in the first segment of the linear mapping (which is mapped at all times by entry 0 of the SLB). The context switch code ensures that SLB entry 2 covers the kernel stack, if it is not already covered by entry 0. None of entries 0 to 2 are ever replaced by the SLB miss handler. Where this went wrong is that the context switch code assumes it doesn't have to write to SLB entry 2 if the new kernel stack is in the same segment as the old kernel stack, since entry 2 should already be correct. However, when we start up a secondary cpu, it calls slb_initialize, which doesn't set up entry 2. This is correct for the boot cpu, where we will be using a stack in the kernel BSS at this point (i.e. init_thread_union), but not necessarily for secondary cpus, whose initial stack can be allocated anywhere. This doesn't cause any immediate problem since the SLB miss handler will just create an SLB entry somewhere else to cover the initial stack. In fact it's possible for the cpu to go quite a long time without SLB entry 2 being valid. Eventually, though, the entry created by the SLB miss handler will get overwritten by some other entry, and if the next access to the stack is at an unrecoverable point, we get the crash. This fixes the problem by making slb_initialize create a suitable entry for the kernel stack, if we are on a secondary cpu and the stack isn't covered by SLB entry 0. This requires initializing the get_paca()->kstack field earlier, so I do that in smp_create_idle where the current field is initialized. This also abstracts a bit of the computation that mk_esid_data in slb.c does so that it can be used in slb_initialize. Signed-off-by: Paul Mackerras commit d9f2f3f537acb8aa04280509b2eed50c855fd3ef Author: Geoff Levand Date: Thu May 1 08:25:36 2008 +1000 [POWERPC] PS3: Update ps3_defconfig Update ps3_defconfig. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 5442381cdd311633d18f8bb52a66ede2d0fa502c Author: Geoff Levand Date: Thu May 1 08:25:30 2008 +1000 [POWERPC] PS3: Remove unsupported wakeup sources Other OS wakeup is not supported from the IR controller, the bluetooth controller nor the RTC. Remove references to these in the PS3 sys-manager source. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit fdedb4caea36cfc00571928a727ac87906037712 Author: Geert Uytterhoeven Date: Thu May 1 08:25:18 2008 +1000 [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static The routines ps3_virq_setup() and ps3_virq_destroy() are used in only one file, so make them static. Signed-off-by: Geert Uytterhoeven Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 483d8876f75aa5707a646442377051f1b90db206 Author: FUJITA Tomonori Date: Thu May 1 08:25:09 2008 +1000 [POWERPC] PS3: Add time include to lpm Add an include statement for get_tb(). Signed-off-by: FUJITA Tomonori Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit bbea34606269efedf7d12c608924b47bafb344f5 Author: Geoff Levand Date: Thu May 1 08:24:58 2008 +1000 [POWERPC] Fix slb.c compile warnings Arrange for a syntax check to always be done on the powerpc/mm/slb.c DBG() macro by defining it to pr_debug() for non-debug builds. Also, fix these related compile warnings: slb.c:273: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int slb.c:274: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int' Signed-off-by: Geoff Levand Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5be661a28b12aa43cc83ba935ba2b2c273d0da45 Merge: fbe543b... b17b818... Author: Paul Mackerras Date: Fri May 2 14:45:50 2008 +1000 Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc commit b17b8181c97e88e6fac5aa704879ad61fdd67351 Author: Kumar Gala Date: Wed Apr 30 10:24:44 2008 -0500 [POWERPC] Xilinx: Fix compile warnings arch/powerpc/sysdev/xilinx_intc.c: In function 'xilinx_intc_init': arch/powerpc/sysdev/xilinx_intc.c:111: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'resource_size_t' drivers/char/xilinx_hwicap/xilinx_hwicap.c: In function 'hwicap_setup': drivers/char/xilinx_hwicap/xilinx_hwicap.c:626: warning: cast to pointer from integer of different size drivers/char/xilinx_hwicap/xilinx_hwicap.c:646: warning: format '%x' expects type 'unsigned int', but argument 6 has type 'resource_size_t' Signed-off-by: Kumar Gala commit 128cf7f2eb952a85875834c0d274da05ee0f02aa Author: Becky Bruce Date: Thu May 1 18:15:45 2008 -0500 [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c When resource_size_t is larger than an int, the current code generates a build warning. Kill it. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit 9941d945f491320bc121d86c558b1288ac0ad6ca Author: Randy Dunlap Date: Wed Apr 30 16:45:58 2008 -0700 [RAPIDIO] fix current kernel-doc notation Fix current (-git16) missing docbook/kernel-doc notation in RapidIO files. Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'sys_size' Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'phy_type' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:188): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:224): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:245): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:270): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:311): No description found for parameter 'mport' Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:996): No description found for parameter 'dev' Signed-off-by: Randy Dunlap Signed-off-by: Kumar Gala commit e598477a3a9679bd04565ef2be20cc985b8954ae Author: Anton Vorontsov Date: Tue Apr 29 20:41:12 2008 +0400 [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot This patch adds pcie node which is resposible for PCI-E x8 slot functioning. Though, this was tested using only x1 SKY2 NIC. Signed-off-by: Anton Vorontsov Signed-off-by: Kumar Gala commit fb65f180e02dde224af256b43d3ab2c28b9689d7 Merge: ab59859... 61c2b68... Author: David S. Miller Date: Thu May 1 16:04:59 2008 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 61c2b682b8391f13b67e2d95990a0aba34697d9c Author: Ivo van Doorn Date: Mon Apr 21 19:01:09 2008 +0200 rt2x00: Fix quality/activity led handling There was an obvious typo in LED structure initialization which caused the radio and quality/activity leds to be incorrectly initialized which resulted in the leds not being enabled. Additionally add the rt2x00led_led_activity() handler that will enable TX/RX activity leds when the radio is being enabled. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 44a9809b97ec5acd1c549c3120bdd35613897d7c Author: Ivo van Doorn Date: Mon Apr 21 19:00:17 2008 +0200 rt2x00: Don't enable short preamble for 1MBs The timing settings for 1MBs should exclude the short preamble bit since that only applies to 2MBs, 5.5MBs and 11MBs. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2218228392080f0ca2fc2974604e79f57b12c436 Author: Kirill A. Shutemov Date: Tue Apr 22 16:38:55 2008 +0300 Make linux/wireless.h be able to compile Signed-off-by: Kirill A. Shutemov Signed-off-by: John W. Linville commit 786b4557075ae0d8a23e73c316dc4204b41ccb4d Author: Bill Moss Date: Thu Apr 17 16:03:40 2008 -0700 iwlwifi: fix debug messages during scanning direct_mask will be set when we are not associated and requesting a direct scan. The second debug print will be confusing as priv->essid is not set at that time and it will thus print "" while it is known to which AP a direct scan is requested - as previous debug message also indicates. Now make all debugging consistent. Signed-off-by: Bill Moss Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit f52764886540b16e7962bd1d150bd939aec9248c Author: Guy Cohen Date: Mon Apr 21 15:41:57 2008 -0700 iwlwifi: fix current channel is not scanned All channels should be scanned, including the current channel when the client is associated. Removed also unused flag to scan only active channels. Signed-off-by: Guy Cohen Signed-off-by: Emmanuel Grumbach Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 21a75d7788f4e29b6c6d28e08f9f0310c4de828d Author: Michael Buesch Date: Fri Apr 25 19:29:08 2008 +0200 b43: Fix some TX/RX locking issues This fixes some TX/RX related locking issues. With this patch applied, some of the PHY transmission errors are fixed. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit f8e811b98935f702b48abc92563462a15c226eb8 Author: Al Viro Date: Thu May 1 14:36:36 2008 -0700 [IA64] fix file and descriptor handling in perfmon Races galore... General rule: as soon as it's in descriptor table, it's over; another thread might have started IO on it/dup2() it elsewhere/dup2() something *over* it/etc. fd_install() is the very last step one should take - it's a point of no return. Besides, the damn thing leaked on failure exits... Signed-off-by: Al Viro Signed-off-by: Tony Luck commit 848376c774a941c29e4fa083d96d84a5f2190857 Author: Roland McGrath Date: Wed Apr 30 14:40:14 2008 -0700 [IA64] TS_RESTORE_SIGMASK Replace TIF_RESTORE_SIGMASK with TS_RESTORE_SIGMASK and define our own set_restore_sigmask() function. This saves the costly SMP-safe set_bit operation, which we do not need for the sigmask flag since TIF_SIGPENDING always has to be set too. Signed-off-by: Roland McGrath Signed-off-by: Tony Luck commit c0cd661b1b0ad83dac54420169ec9ca14df409e9 Author: Hidetoshi Seto Date: Wed Apr 30 18:55:48 2008 +0900 [IA64] smp.c coding style fix Fix indenting of switch statement to follow CodingStyle, and pull out handling of call_data into an inlined function. I confirmed that applying this fix doesn't affect assembled code. Signed-off-by: Hidetoshi Seto Signed-off-by: Tony Luck commit f6acb63508700b5f8cd817082b62c96ba907775e Author: Christoph Lameter Date: Tue Apr 29 16:16:06 2008 -0700 slub: #ifdef simplification If we make SLUB_DEBUG depend on SYSFS then we can simplify some #ifdefs and avoid others. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit f715e6f15ee167026581a8a2e09b2ed644b974aa Author: Christoph Lameter Date: Tue Apr 29 16:14:46 2008 -0700 slabinfo: Support printout of the number of fallbacks Add functionality to slabinfo to print out the number of fallbacks that have occurred for each slab cache when the -D option is specified. Also widen the allocation / free field since the numbers became too big after a week. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 0121c619d03820d965745e56f80f6eb5994533fe Author: Christoph Lameter Date: Tue Apr 29 16:11:12 2008 -0700 slub: Whitespace cleanup and use of strict_strtoul Fix some issues with wrapping and use strict_strtoul to make parameter passing from sysfs safer. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a Merge: 6ed7b6a... f32ddad... Author: Linus Torvalds Date: Thu May 1 11:31:38 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fw-sbp2: log scsi_target ID at release ieee1394: fix NULL pointer dereference in sysfs access commit 6ed7b6a05dc4332c391134809387220123e82ea7 Merge: 2c4aabc... 90ebd87... Author: Linus Torvalds Date: Thu May 1 11:31:24 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus: kbuild: fix vmlinux.o link kconfig: made check-lxdialog more portable commit 2c4aabcca847ac4c92aa5e960c3f6053e1051b62 Merge: bcf35af... a98889f... Author: Linus Torvalds Date: Thu May 1 11:15:28 2008 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [MTD][NOR] Add physical address to point() method [JFFS2] Track parent inode for directories (for NFS export) [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean. [JFFS2] Quiet lockdep false positive. [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once() [MTD] Delete long-unused jedec.h header file. [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently. commit fbe543b412cef02350fab35526a6d4dc3d20d182 Author: Andrew Liu Date: Tue Apr 29 17:36:25 2008 +1000 Fix a potential issue in mpc52xx uart driver mpc52xx_uart_int and __uart_put_char both try to acquire the port->lock. Therefore the function sequence of: mpc52xx_uart_int--> ...-->flush_to_ldisc-->...-->__uart_put_char can potentially trigger a deadlock. To avoid this deadlock a fix similar to that found in the 8250.c serial driver is applied. The deadlock is avoided by releasing the lock before pushing a buffer and reacquiring it when completed. Signed-off-by: Andrew Liu Signed-off-by: Grant Likely commit a98889f3d8882995b5aa2255b931cf0202325cc0 Author: Jared Hulbert Date: Tue Apr 29 23:26:49 2008 -0700 [MTD][NOR] Add physical address to point() method Adding the ability to get a physical address from point() in addition to virtual address. This physical address is required for XIP of userspace code from flash. Signed-off-by: Jared Hulbert Reviewed-by: Jörn Engel Acked-by: Nicolas Pitre Acked-by: Greg Ungerer Signed-off-by: David Woodhouse commit f32ddaddf95d8a30be5a41cf681bc8792bc42ec7 Author: Stefan Richter Date: Thu Apr 24 23:17:47 2008 +0200 firewire: fw-sbp2: log scsi_target ID at release Makes the good-by message more informative. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 07c7224cf74c3977c69c7c9a0b0fba264f2df36a Author: Stefan Richter Date: Thu May 1 10:43:04 2008 +0200 ieee1394: fix NULL pointer dereference in sysfs access Regression since "ieee1394: prevent device binding of raw1394, video1394, dv1394", commit d2ace29fa44589da51fedc06a67b3f05301f3bfd: $ cat /sys/bus/ieee1394/drivers/raw1394/device_ids triggers a NULL pointer dereference in fw_show_drv_device_ids. Reported by Miles Lane. Signed-off-by: Stefan Richter Tested-by: Miles Lane commit 27c72b040c0be8f3704ed0b6b84c12cbba24a7e8 Author: David Woodhouse Date: Thu May 1 18:47:17 2008 +0100 [JFFS2] Track parent inode for directories (for NFS export) To support NFS export, we need to know the parent inode of directories. Rather than growing the jffs2_inode_cache structure, share space with the nlink field -- which was always set to 1 for directories anyway. Signed-off-by: David Woodhouse commit 90ebd878a5900839106664fae40a6cc83dbe86ab Author: Sam Ravnborg Date: Thu May 1 19:31:35 2008 +0200 kbuild: fix vmlinux.o link We always linked vmliux.o. Remove init/built-in.o dependency so we avoid this Signed-off-by: Sam Ravnborg commit b44158de9e318fbc92ac6c665ad3d0c948e80ac3 Author: Sam Ravnborg Date: Thu May 1 19:29:47 2008 +0200 kconfig: made check-lxdialog more portable OS-X shell did not like 'echo -e' so implement suggestion from Al Viro to use a more portable construct. Signed-off-by: Sam Ravnborg Cc: Al Viro Acked-By: Timur Tabi commit bcf35afb528109a31264b45d4851fa6ae72dbe18 Author: Christoph Hellwig Date: Thu May 1 18:43:12 2008 +0200 make generic sys_ptrace unconditional With s390 the last arch switched to the generic sys_ptrace yesterday so we can now kill the ifdef around it to enforce every new port it using it instead of introducing new weirdo versions. Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit 5c598b3428c372a1209597cee99a70da20625876 Author: Al Viro Date: Sun Apr 27 20:04:15 2008 -0400 [PATCH] fix sysctl_nr_open bugs * if luser with root sets it to something that is not a multiple of BITS_PER_LONG, the system is screwed. * if it gets decreased at the wrong time, we can get expand_files() returning success and _not_ increasing the size of table as asked. Signed-off-by: Al Viro commit 2030a42cecd4dd1985a2ab03e25f3cd6106a5ca8 Author: Al Viro Date: Sat Feb 23 06:46:49 2008 -0500 [PATCH] sanitize anon_inode_getfd() a) none of the callers even looks at inode or file returned by anon_inode_getfd() b) any caller that would try to look at those would be racy, since by the time it returns we might have raced with close() from another thread and that file would be pining for fjords. Signed-off-by: Al Viro commit 9f3acc3140444a900ab280de942291959f0f615d Author: Al Viro Date: Thu Apr 24 07:44:08 2008 -0400 [PATCH] split linux/file.h Initial splitoff of the low-level stuff; taken to fdtable.h Signed-off-by: Al Viro commit a2dcb44c3c5a8151d2d9f6ac8ad0789efcdbe184 Author: Al Viro Date: Wed Apr 23 14:05:15 2008 -0400 [PATCH] make osf_select() use core_sys_select() ... instead of open-coding it Signed-off-by: Al Viro commit bf7da7bcfb38409b4cdea34b0905bdf344f1b36d Author: Al Viro Date: Wed Apr 23 00:49:25 2008 -0400 [PATCH] remove horrors with irix tty ioctls handling Existing code in there (get_tty(), etc.) is both severely racy *and* pointless: ioctls in question have Linux equivalents and there's no need to play silly buggers in irix_ioctl() - just need to replace arguments and, in case of TIOCGSID, deal with API differences - Linux one expects pid_t __user * while Irix one does unsigned long __user *. BFD... Signed-off-by: Al Viro commit 74d92abc6143b124db03f0d341f02bde72fba6f5 Author: Al Viro Date: Tue Apr 22 19:46:10 2008 -0400 [PATCH] fix file and descriptor handling in perfmon Races galore... General rule: as soon as it's in descriptor table, it's over; another thread might have started IO on it/dup2() it elsewhere/dup2() something *over* it/etc. fd_install() is the very last step one should take - it's a point of no return. Besides, the damn thing leaked on failure exits... Signed-off-by: Al Viro commit 80791be11145f7dd7f68c84741fc66e5164b7353 Author: Grant Likely Date: Thu May 1 11:05:58 2008 -0600 [POWERPC] mpc5200: Allow for fixed speed MII configurations Various improvements for configuring the MPC5200 MII link from the device tree: * Look for 'current-speed' property for fixed speed MII links * Look for 'fsl,7-wire-mode' property for boards using the 7 wire mode * move definition of private data structure out of the header file Signed-off-by: Grant Likely Acked-by: Wolfgang Grandegger commit 1b690b48786229571e590dd22fe01ecc22a8746b Author: David Woodhouse Date: Thu May 1 16:59:24 2008 +0100 [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean. We don't actually care about nlink; we only care whether the inode in question is unlinked or not. Signed-off-by: David Woodhouse commit 9fc3ace937a675bf42cbe6e6ef8950a6731ca16f Merge: c92758c... 23f8e4b... Author: Linus Torvalds Date: Thu May 1 08:45:19 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: fix early setup of hwif->host_flags commit c92758ceda477b1333fde35327cfa867dcc47bd1 Merge: 03fc922... 4f02f82... Author: Linus Torvalds Date: Thu May 1 08:28:26 2008 -0700 Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: (adt7473) minor cleanup / refactoring hwmon: (asb100) Remove some dead code hwmon: (lm75) Fix an incorrect comment hwmon: (w83793) VID and VRM handling cleanups hwmon: (w83l785ts) Don't ask the user to report failures hwmon: (smsc47b397) add a new chip id (0x8c) commit 03fc922f4085a0139f313831fe2dc6fed467cd2d Merge: a0be752... df4b565... Author: Linus Torvalds Date: Thu May 1 08:26:56 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: add MODULE_STATE_GOING notifier call module: Enhance verify_export_symbols module: set unused_gpl_crcs instead of overwriting unused_crcs module: neaten __find_symbol, rename to find_symbol module: reduce module image and resident size module: make module_sect_attrs private to kernel/module.c commit a0be7522b25f17ac2c3964a24b88b5fe7c9404b8 Merge: 3b2b74c... b1145ce... Author: Linus Torvalds Date: Thu May 1 08:15:36 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] cryptd: Correct kzalloc error test [CRYPTO] eseqiv: Fix off-by-one encryption [CRYPTO] api: Fix scatterwalk_sg_chain [CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv() commit 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867 Author: Sebastian Siewior Date: Thu May 1 14:08:12 2008 +1000 m68knommu: fix FEC driver locking It's easy: grab locks before talking to hardware and realease them afterwards. The one big lock has been splitted into a hw_lock and mii_lock. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c1d9615680c3f43a305b1f66dff0f933d5079273 Author: Sebastian Siewior Date: Thu May 1 14:04:02 2008 +1000 m68knommu: kill warnings in FEC driver linux-2.6-mk68/drivers/net/fec.c: In function 'fec_enet_module_init': linux-2.6-mk68/drivers/net/fec.c:2627: warning: unused variable 'j' linux-2.6-mk68/drivers/net/fec.c: At top level: linux-2.6-mk68/drivers/net/fec.c:2136: warning: 'mii_link_interrupt' defined but not used Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 398ec922b9cd5fdec26d2ca75b9389bed2432557 Author: Greg Ungerer Date: Thu May 1 13:47:09 2008 +1000 m68knommu: remove unused interrupts in FEC driver Remove the acquisition of unused interrupt types. We don't need to register all the TX and RX varients used on some ColdFire FEC hardware. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit cc462f7df0a78df568fd4e1d19f0874476f3c002 Author: Greg Ungerer Date: Thu May 1 13:35:34 2008 +1000 m68knommu: fix ColdFire 5272 fec driver hash registers Renamed the 5272 hash_table registers to match the "grp" hash_table registers of the other ColdFire parts. They are actually a group hash. The makes for consistent setup across all ColdFire parts. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 6c5a7d504fb0e27aa90b96267177d434642a393d Author: Sebastian Siewior Date: Thu May 1 12:17:49 2008 +1000 m68knommu: fix compare race in sched related code The interrupts must be disabled before considering the need resched bit of the task struct and they have to be disabled before calling schedule() Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0042a1f7ecbc5d40eb2164f375ec87ecf3494418 Author: Greg Ungerer Date: Thu May 1 12:17:41 2008 +1000 m68knommu: rework definition of HZ Rework the HZ definition to be more consistent with other architectures. Non-kernel includers will see a constant HZ setting of 100. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 6cca49173198e1666cb9852649f66e1dba99d88a Author: Sebastian Siewior Date: Thu May 1 12:17:36 2008 +1000 m68knommu: update MAX_M68K_DMA_CHANNELS for some plattforms include/asm-m68knommu/mcfdma.h defines base0-3 for M523x, M527x and M528x so it looks this has been forgotten. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit cff28b56bdafd314836f4193b638b88d9b3cb5b1 Author: Greg Ungerer Date: Thu May 1 12:17:21 2008 +1000 m68knommu: remove unused CONFIG_DISKtel Remove unused CONFIG_DISKtel support. Missing config definition pointed out by Robert P. J. Day Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 188a9a4841c9b4a56cdd9b58761a882db4873f0c Author: Steve Bennett Date: Thu May 1 12:17:08 2008 +1000 m68knommu: add WilFire and WildfireMod board support This patch adds linux-2.6.x kernel support for the Intec Automation ColdFire 5282-based boards, the WildFire and WildFireMod Signed-Off-By: Steve Bennett Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 653620d6190670a7e2e3a6c7c0a4f78badb0e31f Author: Greg Ungerer Date: Thu May 1 12:17:00 2008 +1000 m68knommu: remove unused CONFIG_MTD_KeyTechnology Remove unused board type CONFIG_MTD_KeyTechnology. Pointed out by Robert P. J. Day Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d259c329835bc1c17eca1dac7604baaf2d895e73 Author: Greg Ungerer Date: Thu May 1 12:16:53 2008 +1000 m68knommu: fix 5206e UART init function naming Fix ColdFire 5206e platform UART init function naming. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 779125c274446e873f262e24853353eaf0002719 Author: Sebastian Siewior Date: Thu May 1 12:16:46 2008 +1000 m68knommu: add some missing sections into the linker script Add some missing sections into the linker script. Those are required for spinlocks & kallsyms. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f6054e2131d8f5d43f6686ecc7687994adecc5a2 Author: Sebastian Siewior Date: Thu May 1 12:16:38 2008 +1000 m68knommu: add pretty back strace With this patch and CONFIG_FRAME_POINTER=y CONFIG_KALLSYMS=y The backtrace shows resolved function names and their numeric address. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 008150f53729d188a5c14b1a86725972e15fe5f4 Author: Sebastian Siewior Date: Thu May 1 12:16:33 2008 +1000 m68knommu: add a missing backslash n in setup code add a missing backslash n in setup code Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a19325a77432338d2710b3ebbe7fd8e6627e81e3 Author: Sebastian Siewior Date: Thu May 1 12:16:29 2008 +1000 m68knommu: ColdFire add support for kernel preemption As the subject says this patch adds the support for kernel preemption on m68knommu Coldfire. I thing the same changes could be applied to 68360 & 68328 but since I don't have the HW for testing, I don't touch it. Signed-off-by: Sebastian Siewior Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 2d7f16d6d12682c41fb287ea8261df8e4679f638 Author: Wilson Callan Date: Thu May 1 12:16:28 2008 +1000 m68knommu: fix signal handling return path The return from software signal handling pushes code on the stack that system calls to the kernels cleanup code. This is borrowed directly from the m68k linux signal handler. The rt signal case is not quite right for the restricted instruction set of the ColdFire parts. And neither the normal signal case or rt signal case properly flushes/pushes the appropriate cache lines. Rework the return path to just call back through some code fragments in the kernel proper (with no MMU in the way we can do this). No cache problems, and less code overall. Original patch submitted by Wilson Callan Greg fixed the rt signal return path to use the proper system call Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 10ed2195bb8aef4358223f07bb00e8cf9b278bf2 Author: Andrew Morton Date: Thu May 1 04:35:20 2008 -0700 drivers/scsi/mvsas.c: fix printk warnings drivers/scsi/mvsas.c: In function `mvs_update_phyinfo': drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 5) drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 6) We do not know what type the arch uses to implement u64. Cc: Ke Wei Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 726792b26b66c41f650e4a0c2f7b9e1fc16473a4 Author: Andrew Morton Date: Thu May 1 04:35:20 2008 -0700 drivers/scsi/ncr53c8xx.c: fix warning drivers/scsi/ncr53c8xx.c: In function 'process_waiting_list': drivers/scsi/ncr53c8xx.c:8225: warning: suggest parentheses around assignment used as truth value recently added by commit 172c122df5186e7cbd413d61757ff90267331002 Author: Harvey Harrison Date: Mon Apr 28 16:50:03 2008 -0700 scsi: fix integer as NULL pointer warnings Cc: James Bottomley Cc: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5098021e1ed91388ab7f3984650e95a5584450c3 Author: Andrew Morton Date: Thu May 1 04:35:19 2008 -0700 drivers-char-synclinkc-inbreak-mgsl_put_char-fix Cc: Alan Cox Cc: Jiri Slaby Cc: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 076482307ff1acfe88d5ad1a3fbfbac5cc8d7ad4 Author: Andrew Morton Date: Thu May 1 04:35:18 2008 -0700 drivers/char/synclink.c: unbreak mgsl_put_char() Repair the effects of commit 55da77899c1472d83452c914fa179d00ea96df65 Author: Alan Cox Date: Wed Apr 30 00:54:07 2008 -0700 synclink series: switch to int put_char method Signed-off-by: Alan Cox Cc: Paul Fulghum Cc: Jiri Slaby drivers/char/synclink_gt.c: In function 'put_char': drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function and do some whitespace repair and unneeded-cast-removal in there as well. Cc: Paul Fulghum Cc: Alan Cox Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24c03d47d0481ed7b172b398f6c9b7ca1fafb9fa Author: Harvey Harrison Date: Thu May 1 04:35:17 2008 -0700 block: remove remaining __FUNCTION__ occurrences __FUNCTION__ is gcc specific, use __func__ Signed-off-by: Harvey Harrison Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e37d05dad7ff9744efd8ea95a70d389e9a65a6fc Author: Mike Travis Date: Thu May 1 04:35:16 2008 -0700 cpu: change cpu_sys_devices from array to per_cpu variable Change cpu_sys_devices from array to per_cpu variable in drivers/base/cpu.c. Signed-off-by: Mike Travis Cc: Ashok Raj Cc: Vivek Goyal Cc: Greg Kroah-Hartman Cc: Suresh Siddha Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd7309677c937bf23296f6c81027123c84c5cc5c Author: Harvey Harrison Date: Thu May 1 04:35:15 2008 -0700 fuse: use clamp() rather than nested min/max clamp() exists for this use. Signed-off-by: Harvey Harrison Cc: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dfcf9c4bf1fda4aa75861bcf6c50607dd322fe5 Author: Denis V. Lunev Date: Thu May 1 04:35:14 2008 -0700 cciss: assign PDE->data before gluing PDE into /proc tree Simply replace proc_create and further data assigned with proc_create_data. Signed-off-by: Denis V. Lunev Cc: Alexey Dobriyan Cc: Eric W. Biederman Acked-by: Mike Miller Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a3e77cc212f3bc8eccc95e0d046405cf2a02764 Author: Andrew Liu Date: Thu May 1 04:35:14 2008 -0700 workqueue: remove redundant function invocation timer_stats_timer_set_start_info is invoked twice, additionally, the invocation of this function can be moved to where it is only called when a delay is really required. Signed-off-by: Andrew Liu Cc: Pavel Machek Cc: Ingo Molnar Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55e462b05b5df4fd113c4a304c4f487d44b0898e Author: Balaji Rao Date: Thu May 1 04:35:12 2008 -0700 memcg: simple stats for memory resource controller Implement trivial statistics for the memory resource controller. Signed-off-by: Balaji Rao Acked-by: Balbir Singh Cc: Dhaval Giani Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f39e578172f30d3bdd4533465c7ec00db738eb9d Author: Will Newton