commit f653c34dd3d8bde2c918316fd5ba2e2c4f95afcf Author: Jens Axboe Date: Tue May 15 19:30:07 2007 +0200 ll_rw_blk: fix gcc 4.2 warning on current_io_context() current_io_context() is both static and exported with EXPORT_SYMBOL(). As there are no users outside of ll_rw_blk.c itself, just kill the export. Problem reported by Martin Michlmayr Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit de7860c3f3272086a4c3a1b4280b11ffae7c32be Merge: cfbf07f... 7c5b9ef... Author: Linus Torvalds Date: Tue May 15 09:52:31 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB/cm: Optimize stale connection detection IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ IB/mthca: Fix posting >255 recv WRs for Tavor RDMA/cma: Add check to validate that cm_id is bound to a device RDMA/cma: Fix synchronization with device removal in cma_iw_handler RDMA/cma: Simplify device removal handling code IB/ehca: Disable scaling code by default, bump version number IB/ehca: Beautify sysfs attribute code and fix compiler warnings IB/ehca: Remove _irqsave, move #ifdef IB/ehca: Fix AQP0/1 QP number IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() IB/ehca: Serialize hypervisor calls in ehca_register_mr() IB/ipath: Shadow the gpio_mask register IB/mlx4: Fix uninitialized spinlock for 32-bit archs mlx4_core: Remove unused doorbell_lock net: Trivial MLX4_DEBUG dependency fix. commit cfbf07f2a80b618c42a42c20d83647ea8fcceca0 Author: Christoph Lameter Date: Tue May 15 01:42:06 2007 -0700 SLUB: CONFIG_LARGE_ALLOCS must consider MAX_ORDER limit Take MAX_ORDER into consideration when determining KMALLOC_SHIFT_HIGH. Otherwise we may run into a situation where we attempt to create general slabs larger than MAX_ORDER. Signed-off-by: Christoph Lameter Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a3ee3d5529c5e66aedf91401bfac65c61998639 Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:59 2007 -0700 i386: fix voyager build This adds an smp_ops for voyager, and hooks things up appropriately. This is the first baby-step to making subarch runtime switchable. Signed-off-by: Jeremy Fitzhardinge Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 297d9c035edd04327fedc0d1da27c2b112b66fcc Author: Jeremy Fitzhardinge Date: Tue May 15 01:41:48 2007 -0700 i386: move common parts of smp into their own file Several parts of kernel/smp.c and smpboot.c are generally useful for other subarchitectures and paravirt_ops implementations, so make them available for reuse. Signed-off-by: Jeremy Fitzhardinge Acked-by: Chris Wright Cc: James Bottomley Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 838c41184fee5e151c09972f2ba90c16493af614 Author: Prarit Bhargava Date: Tue May 15 01:41:43 2007 -0700 Remove cpu hotplug defines for __INIT & __INITDATA After examining what was checked in and the code base I discovered that most of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore.... So here's a patch that reverts the last part of that changeset: Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a. The kernel has moved forward to a state where the original change is not necessary. After porting forward, this final version of the patch was applied and broke non-x86 architectures. Signed-off-by: Prarit Bhargava Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bd2aad2103314a0a09614dc29926a1437db02f7 Author: Stephen Rothwell Date: Tue May 15 01:41:36 2007 -0700 Revert "MAINTAINERS: remove invalid list address for TPM" This reverts commit b6d1c9a44744224d83125a5a89c1a6cc4db27361. Others tell me that this address has worked for them, so I can only assume that I hit a glitch in the sourceforge mail system. Signed-off-by: Stephen Rothwell Cc: Kylene Hall Cc: Marcel Selhorst Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f89441b37536fea92b1ed7004e5e2dda011473d Author: Thomas Gleixner Date: Tue May 15 01:41:32 2007 -0700 clocksource: fix lock order in the resume path lockdep complains about the lock nesting of clocksource and watchdog lock in the resume path. Change the resume marker to a bit operation and remove the lock from this path. Signed-off-by: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c46bdcaec53eda069a8a9cd60621c7431aa7842 Author: Geert Uytterhoeven Date: Tue May 15 01:41:29 2007 -0700 m68k: implement __clear_user() m68k: implement __clear_user(), which is needed by fs/signalfd.c Since we always let the MMU do all checking, clear_user() and __clear_user() are identical. The old clear_user() is renamed to __clear_user() for consistency. Signed-off-by: Geert Uytterhoeven Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fcdf96ca95f81a0e1fd91a2de16dc67c641c958 Author: Simon Horman Date: Tue May 15 01:41:15 2007 -0700 alpha: fix hard_smp_processor_id compile error "Remove hardcoding of hard_smp_processor_id on UP systems", 2f4dfe206a2fc07099dfad77a8ea2f4b4ae2140f in Linus' tree, moved the definition of hard_smp_processor_id linux/smp.h to asm/smp.h for UP systems. This causes a regression on Alpha. cc1: warnings being treated as errors arch/alpha/kernel/setup.c: In function 'setup_arch': arch/alpha/kernel/setup.c:506: warning: implicit declaration of function 'hard_smp_processor_id' make[1]: *** [arch/alpha/kernel/setup.o] error 1 make: *** [arch/alpha/kernel] error 2 By including asm/smp.h non-conditionally in asm/mmu_context.h the problem appears to be resolved. Cc: Fernando Luis Vazquez Cao Signed-off-by: Simon Horman Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b67405bbbba6bbd28dfd5337b29d5bc5a1140afb Author: Yoshinori Sato Date: Tue May 15 01:41:07 2007 -0700 h8300 atomic.h update add atomic_sub_and_test define. Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 218f0aaee8a6b0e5772b95b154dea5b7701b33aa Author: Paul Mundt Date: Tue May 15 01:41:02 2007 -0700 nommu: add ioremap_page_range() lib/ioremap.c is presently only built in if CONFIG_MMU is set. While this is reasonable, platforms that support both CONFIG_MMU=y or n need to be able to call in to this regardless. As none of the current nommu platforms do anything special with ioremap(), we assume that it's always successful. This fixes the SH-4 build with CONFIG_MMU=n. Signed-off-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ee9aabb0520adea5937855a9575c08a97b16e7 Author: Davide Libenzi Date: Tue May 15 01:40:57 2007 -0700 epoll: move kfree inside ep_free Move the kfree() call inside the ep_free() function. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67647d0fb8bc03609d045a9cce85f7ef6d763036 Author: Davide Libenzi Date: Tue May 15 01:40:52 2007 -0700 epoll: fix some comments Fixes some epoll code comments. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7ea76302547f81e4583d0d7c52a1c37c6747f5d Author: Davide Libenzi Date: Tue May 15 01:40:47 2007 -0700 epoll locks changes and cleanups Changes the rwlock to a spinlock, and drops the use-count variable. Operations are always bound by the mutex now, so the use-count is no more needed. For the same reason, the rwlock can become a simple spinlock. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d47de16c7221968d3eab899d7540efa5ba77af5a Author: Davide Libenzi Date: Tue May 15 01:40:41 2007 -0700 fix epoll single pass code and add wait-exclusive flag Fixes the epoll single pass code. During the unlocked event delivery (to userspace) code, the poll callback can re-issue new events, and we must receive them correctly. Since we loop in a lockless fashion, we want to be O(nready), and we don't want to flash on/off the spinlock for every event, we have the poll callback to use a secondary list to queue events while we're inside the event delivery loop. The rw_semaphore has been turned into a mutex. This patch also adds the wait-exclusive flag, as suggested by Davi Arnaut. Signed-off-by: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faa8b6c3c2e1454175609167a25ae525d075f045 Author: Linus Torvalds Date: Mon May 14 15:24:24 2007 -0700 Revert "ipmi: add new IPMI nmi watchdog handling" This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen Cc: Mathieu Desnoyers Cc: Corey Minyard Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7c5b9ef8577bfa7b74ea58fc9ff2934ffce13532 Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IPoIB/cm: Optimize stale connection detection In the presence of some running RX connections, we repeat queue_delayed_work calls each 4 RX WRs, which is a waste. It's enough to start stale task when a first passive connection is added, and rerun it every IPOIB_CM_RX_DELAY as long as there are outstanding passive connections. This removes some code from RX data path. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit bd18c112774db5bb887adb981ffbe9bfe00b2f3a Author: Michael S. Tsirkin Date: Mon May 14 17:14:50 2007 +0300 IB/mthca: Set cleaned CQEs back to HW ownership when cleaning CQ mthca_cq_clean() updates the CQ consumer index without moving CQEs back to HW ownership. As a result, the same WRID might get reported twice, resulting in a use-after-free. This was observed in IPoIB CM. Fix by moving all freed CQEs to HW ownership. This fixes Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3e28c56b9b67347b42ba06f9a9373b408902beee Author: Michael S. Tsirkin Date: Mon May 14 07:26:51 2007 +0300 IB/mthca: Fix posting >255 recv WRs for Tavor Fix posting lists of > 255 receive WRs for Tavor: rq.next_ind must be updated each doorbell, otherwise the next doorbell will use an incorrect index. Found by Ronni Zimmermann at Mellanox. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 6c719f5c6c823901fac2d46b83db5a69ba7e9152 Author: Sean Hefty Date: Mon May 7 11:49:27 2007 -0700 RDMA/cma: Add check to validate that cm_id is bound to a device Several checks in the rdma_cm check against the state of the cm_id, but only to validate that the cm_id is bound to an underlying transport specific CM and an RDMA device. Make the check explicit in what we're trying to check for, since we're not synchronizing against the cm_id state. This will allow a user to disconnect a cm_id or reject a connection after receiving a device removal event. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit be65f086f2a50c478b2f5ecf4c55a52a4e95059a Author: Sean Hefty Date: Mon May 7 11:49:12 2007 -0700 RDMA/cma: Fix synchronization with device removal in cma_iw_handler The cma_iw_handler needs to validate the state of the rdma_cm_id before processing a new connection request to ensure that a device removal is not already being processed for the same rdma_cm_id. Without the state check, the user can receive simultaneous callbacks for the same cm_id, or a callback after they've destroyed the cm_id. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8aa08602bdd617a9cdd147f19076a8c8a70e03ef Author: Sean Hefty Date: Mon May 7 11:49:00 2007 -0700 RDMA/cma: Simplify device removal handling code Add a new routine and rename another to encapsulate common code for synchronizing with device removal. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e430dcb7b132a4076e533a9d69907acecbe71be Author: Joachim Fenkes Date: Wed May 9 13:48:31 2007 +0200 IB/ehca: Disable scaling code by default, bump version number - Scaling code is still considered experimental, so disable it by default - Increase version to SVNEHCA_0023 Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit bba9b6013e604fadb298191c058149acf1cdfced Author: Joachim Fenkes Date: Wed May 9 13:48:25 2007 +0200 IB/ehca: Beautify sysfs attribute code and fix compiler warnings eHCA's sysfs attributes are now being created via sysfs_create_group(), making the process neatly table-driven. The return value is checked, thus fixing a few compiler warnings. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c7a14939e78e75dd90b54cb0df371019bc6d3e89 Author: Joachim Fenkes Date: Wed May 9 13:48:20 2007 +0200 IB/ehca: Remove _irqsave, move #ifdef - In ehca_process_eq(), we're IRQ safe throughout the whole function, so we don't need another _irqsave in the middle of flight. - take_over_work() is only called by comp_pool_callback(), so it can move into the same #ifdef block. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit c55a0ddd8ebdd657224449c2fbfcd427e054c8cc Author: Hoang-Nam Nguyen Date: Wed May 9 13:48:11 2007 +0200 IB/ehca: Fix AQP0/1 QP number AQP0/1 should report qp_num={0|1} and the actual QP# should be stored in struct ehca_qp, not the other way round. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 92761cdaf215599a1bd81d383facb32adabfa620 Author: Joachim Fenkes Date: Wed May 9 13:48:01 2007 +0200 IB/ehca: Correctly set GRH mask bit in ehca_modify_qp() The driver needs to always supply the "GRH present" flag to the hypervisor, whether it's true or false. Not supplying it (i.e. not setting the corresponding mask bit) amounts to a "perhaps", which we don't want. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 5d88278e3bdb6f2e4ed43306659e930ecd715f0c Author: Stefan Roscher Date: Wed May 9 13:47:56 2007 +0200 IB/ehca: Serialize hypervisor calls in ehca_register_mr() Some pSeries hypervisor versions show a race condition in the allocate MR hCall. Serialize this call per adapter to circumvent this problem. Signed-off-by: Joachim Fenkes Signed-off-by: Roland Dreier commit 8f140b407f3be04e7202be9aa0cfef3006d14c9f Author: Arthur Jones Date: Thu May 10 12:10:49 2007 -0700 IB/ipath: Shadow the gpio_mask register Once upon a time, GPIO interrupts were rare. But then a chip bug in the waldo series forced the use of a GPIO interrupt to signal packet reception. This greatly increased the frequency of GPIO interrupts which have the gpio_mask bits set on the waldo chips. Other bits in the gpio_status register are used for I2C clock and data lines, these bits are usually on. An "unlikely" annotation leftover from the old days was improperly applied to these bits, and an unnecessary chip mmio read was being accessed in the interrupt fast path on waldo. Remove the stagnant unlikely annotation in the interrupt handler and keep a shadow copy of the gpio_mask register to avoid the slow mmio read when testing for interruptable GPIO bits. Signed-off-by: Arthur Jones Signed-off-by: Roland Dreier commit 26c6bc7b812b4157ba929035e467c0f4dd165916 Author: Jack Morgenstein Date: Sun May 13 17:18:23 2007 +0300 IB/mlx4: Fix uninitialized spinlock for 32-bit archs uar_lock spinlock was used in mlx4_ib_cq_arm without being initialized (this only affects 32-bit archs, because uar_lock is not used on 64-bit archs and MLX4_INIT_DOORBELL_LOCK() is a NOP). Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 3ec2ab5514dbd6b5c4c3437c6a3cd9e5a90e84ef Merge: 200cfbb... 90e07d9... Author: Linus Torvalds Date: Mon May 14 12:29:14 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response mmc: use assigned major for block device sdhci: handle dma boundary interrupts mmc: au1xmmc command types check from data flags commit 200cfbb36ce360f7943c62b6c09885c215bfc1f5 Merge: 29e0937... d831666... Author: Linus Torvalds Date: Mon May 14 12:28:11 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4] SNMP: Display new statistics at /proc/net/netstat [IPV6]: Reverse sense of promisc tests in ip6_mc_input [NET_SCHED]: prio qdisc boundary condition [IPSEC]: Don't warn if high-order hash resize fails [IPSEC]: Check validity of direction in xfrm_policy_byid commit 29e0937bb693879221f575b01f26314b3f443322 Merge: 140ff8b... be35cf0... Author: Linus Torvalds Date: Mon May 14 12:27:17 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [VIDEO]: XVR-500 and XVR-2500 need FB=y. [SPARC32]: asm/system.h needs asm/smp.h [SPARC32]: Update defconfig. [SPARC32]: Fix sparc32 kdebug changes. [SPARC64]: Accept ebus_bus_type for generic DMA ops. [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. [SCSI]: Add help text for SCSI_ESP_CORE. [SPARC] SBUS: display7seg.c needs asm/io.h [SPARC] SBUS: bbc_i2c.c needs asm/io.h [SPARC64]: Be more resiliant with PCI I/O space regs. [SERIAL] SUNHV: Add an ID string. commit 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 Author: Stephen Rothwell Date: Mon May 14 13:47:47 2007 +1000 Declare another couple of compat syscalls. compat_sys_signalfd and compat_sys_timerfd need declarations before PowerPC can wire them up. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a34be83a9cfa15d596bfeb498b13380f0544249f Author: Dave Jones Date: Sun May 13 19:07:46 2007 -0400 MAINTAINERS update. I've not really 'maintained' this code for years, and others are doing a much more thorough job these days. Removing myself might stem some of the crazier emails I get. Signed-off-by: Dave Jones Acked-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit d10ff3fb62bd38415c0f7be3d75d107e1f67e59a Author: Thomas Gleixner Date: Mon May 14 11:10:02 2007 +0200 timekeeping fix patch got mis-applied The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds commit 90e07d9f54c61449dd48eff82e2354d0124d4f7e Author: Nicolas Pitre Date: Sun May 13 18:03:08 2007 +0200 pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response ... and make it depend on the response flag instead of the command type. Signed-off-by: Nicolas Pitre Signed-off-by: Pierre Ossman commit fe6b4c8840c5e23fe9b8696450cee8f2e8cebffd Author: Pierre Ossman Date: Mon May 14 17:27:29 2007 +0200 mmc: use assigned major for block device The MMC block devices now have an assigned major. Make sure we actually use it. Signed-off-by: Pierre Ossman commit 6ba736a10e4ae63b38ccfee9f22b3263a6e5d050 Author: Pierre Ossman Date: Sun May 13 22:39:23 2007 +0200 sdhci: handle dma boundary interrupts When the device hits certain memory boundaries, it signals an interrupt and expects to be serviced. We don't need the feature but we need to make sure the device doesn't stall. Signed-off-by: Pierre Ossman commit c0f3b6c777af071063984fdbc4efb6c904f665f4 Author: Yoichi Yuasa Date: Sun May 13 18:23:15 2007 +0200 mmc: au1xmmc command types check from data flags This patch has changed command types check from data flags. MMC_STOP_TRANSMISSION is never passed to au1xmmc_send_command(). SEND_STOP() is used for MMC_STOP_TRANSMISSION. Signed-off-by: Yoichi Yuasa Signed-off-by: Pierre Ossman commit be35cf01a9889e82da3bbda1d7b161f036424225 Author: David S. Miller Date: Mon May 14 04:19:01 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit d0842f40a025521beb48063e02a8cc57ebd075e0 Author: David S. Miller Date: Mon May 14 04:18:38 2007 -0700 [VIDEO]: XVR-500 and XVR-2500 need FB=y. Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller commit 6e46507d0178ad4b33ed3bfcc72dc6e1e8a17790 Author: David S. Miller Date: Mon May 14 03:53:47 2007 -0700 [SPARC32]: asm/system.h needs asm/smp.h To get hard_smp_processor_id() even on UP builds. Signed-off-by: David S. Miller commit 2b6d868fa62b51500dd95a036229adc4a4a7bdae Author: David S. Miller Date: Mon May 14 03:53:12 2007 -0700 [SPARC32]: Update defconfig. Signed-off-by: David S. Miller commit 19fce2b96655d2b3b758e0f783314678d89b47c5 Author: Robert Reif Date: Mon May 14 03:22:08 2007 -0700 [SPARC32]: Fix sparc32 kdebug changes. Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit d831666e98b4f1e19ebdd2349735f47bf37cd293 Author: Mitsuru Chinen Date: Mon May 14 03:07:30 2007 -0700 [IPV4] SNMP: Display new statistics at /proc/net/netstat This displays the statistics specified in the updated IP-MIB RFC (RFC4293) in /proc/net/netstat. The reason why these are not displayed in /proc/net/snmp is that some existing utilities are developed under the assumption which ipstat items in /proc/net/snmp is unchanged. Signed-off-by: Mitsuru Chinen Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit ae7bf20a6316272acfcaef5d265b18aaa54b41e4 Author: Corey Mutter Date: Mon May 14 03:00:27 2007 -0700 [IPV6]: Reverse sense of promisc tests in ip6_mc_input Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 3e5c2d3bdbe2c047b9853c4248f881f5ac645c89 Author: Jamal Hadi Salim Date: Mon May 14 02:57:19 2007 -0700 [NET_SCHED]: prio qdisc boundary condition This fixes an out-of-boundary condition when the classified band equals q->bands. Caught by Alexey Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 9ac6d4a4b85004dbb907f1d3b34412afe16f3758 Author: David S. Miller Date: Mon May 14 02:56:03 2007 -0700 [SPARC64]: Accept ebus_bus_type for generic DMA ops. Based upon a bug report by Meelis Roos. Signed-off-by: David S. Miller commit 6253db055eb62a1bd0a18a1d8489565303b2b1dd Author: Herbert Xu Date: Mon May 14 02:19:11 2007 -0700 [IPSEC]: Don't warn if high-order hash resize fails Multi-page allocations are always likely to fail. Since such failures are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about them. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b5505c6e1071b32176c7548a3aaf0be49f7c763e Author: Herbert Xu Date: Mon May 14 02:15:47 2007 -0700 [IPSEC]: Check validity of direction in xfrm_policy_byid The function xfrm_policy_byid takes a dir argument but finds the policy using the index instead. We only use the dir argument to update the policy count for that direction. Since the user can supply any value for dir, this can corrupt our policy count. I know this is the problem because a few days ago I was deleting policies by hand using indicies and accidentally typed in the wrong direction. It still deleted the policy and at the time I thought that was cool. In retrospect it isn't such a good idea :) I decided against letting it delete the policy anyway just in case we ever remove the connection between indicies and direction. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 17f34f0ec96783851abcabf9878f8237ac67e4e7 Author: David S. Miller Date: Mon May 14 02:01:52 2007 -0700 [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. Signed-off-by: David S. Miller commit ec6fb1ad84551741c14a05918cc0e04dea928fc0 Author: David S. Miller Date: Sun May 13 23:52:14 2007 -0700 [SCSI]: Add help text for SCSI_ESP_CORE. Signed-off-by: David S. Miller commit 3049f89df13bb8f5ded8737631a6c2dd6209b5ca Author: David S. Miller Date: Sun May 13 22:22:47 2007 -0700 [SPARC] SBUS: display7seg.c needs asm/io.h Signed-off-by: David S. Miller commit 4b5dff76a70cb1d8b935b8b93fe0df0bbe66640d Author: David S. Miller Date: Sun May 13 22:22:13 2007 -0700 [SPARC] SBUS: bbc_i2c.c needs asm/io.h Signed-off-by: David S. Miller commit 49d23cfcec5d36a91e118d28148d353bf8f0bc03 Author: David S. Miller Date: Sun May 13 22:01:18 2007 -0700 [SPARC64]: Be more resiliant with PCI I/O space regs. If we miss on the ranges, just toss the translation up to the parent instead of failing. Signed-off-by: David S. Miller commit 7a05b591a3de20466a775f62369a42ea0fe1345d Author: David S. Miller Date: Sun May 13 21:27:37 2007 -0700 [SERIAL] SUNHV: Add an ID string. The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller commit 705962ccc9d21a08b74b6b6e1d3cf10f98968a67 Author: Al Viro Date: Sun May 13 05:52:32 2007 -0400 fix deadlock in loop.c ... doh Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but cause lockdep to complain. Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which, we probably want to s/lock/pin/ in drivers/base/map.c to avoid such brainos again. And yes, this stuff needs clear documentation. Will try to put one together once I get some sleep... Signed-off-by: Al Viro Cc: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 20eebcf09c2d329e4dcdd765634c0a524195e16d Author: Roland Dreier Date: Sun May 13 08:54:18 2007 -0700 mlx4_core: Remove unused doorbell_lock struct mlx4_priv.doorbell_lock is never used, so delete it. Signed-off-by: Roland Dreier commit f550d94cf9f86bc54e31dae2aee1a03d678c6e7f Author: Paul Mundt Date: Thu May 10 12:50:28 2007 +0900 net: Trivial MLX4_DEBUG dependency fix. CONFIG_MLX4_DEBUG works out to a def_bool y for those that have CONFIG_EMBEDDED set. Make it depend on MLX4_CORE. Signed-off-by: Paul Mundt Signed-off-by: Roland Dreier