commit ade8c56cbd02020fecbe1684f181250a466685eb Author: Randy Dunlap Date: Thu Oct 25 14:27:24 2007 -0700 x86 bitops: fix code style issues Coding style cleanups: - change __inline__ to inline; - drop space in "* addr" parameters; - drop space between func. name and '(' The "volatile" keywords are correct according to email from one Linus Torvalds. [Several other arches need some of this also.] Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit fb9431eb038caa027cb98cb18576f1a731e56f76 Author: Randy Dunlap Date: Thu Oct 25 14:21:49 2007 -0700 bitops kernel-doc: inline instead of macro Use duplicated inline functions for test_and_set_bit_lock() on x86 instead of #define macros, thus avoiding a bad example. This allows kernel-doc to run cleanly instead of terminating with an error: Error(linux-2.6.24-rc1//include/asm-x86/bitops_32.h:188): cannot understand prototype: 'test_and_set_bit_lock test_and_set_bit ' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a60387ba3114fe087349df23fa82e5ad9d5b6ff2 Merge: 0e81bef... d5d1cea... Author: Linus Torvalds Date: Thu Oct 25 15:58:40 2007 -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: (40 commits) USB: open disconnect race in usblcd USB: disconnect open race in legousbtower USB: open disconnect race in iowarrior USB: missing error check in emi62 USB: missing error check in emi26 USB: usb_serial_resume bug fix USB: remove new OHCI build warnings USB: amd5536udc - remove set_mwi() compiler warning USB: usbserial - fix potential deadlock between write() and IRQ usb: serial/pl2303: support for IO Data Device RSAQ5 USB: fix read vs. disconnect race in cytherm driver USB: fix locking in idmouse USB: fix interface sysfs file-creation bug USB: fix ssb_ohci_probe() build bug USB: pl2303: remove can't happen checks, set speed properly and report baud rate USB: mos7840: Clean up old checks and stuff USB rio500.c: fix check-after-use USB iowarrior.c: fix check-after-use USB: add URB_FREE_BUFFER to permissible flags USB: isd200: sort out USB/IDE dependancy mess ... commit 0e81bef05e3b90f8319e79bf36e61341f7b6e189 Merge: eadd4f5... 9317d43... Author: Linus Torvalds Date: Thu Oct 25 15:58:18 2007 -0700 Merge branch 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'warnings-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: ISDN/sc: fix longstanding warning commit eadd4f5ea1507403655e9f5aeb0ea944eaa9d5de Merge: 06dbbfe... d58aa8c... Author: Linus Torvalds Date: Thu Oct 25 15:50:48 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED) commit 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c Merge: 22fa8d5... 03cf786... Author: Linus Torvalds Date: Thu Oct 25 15:50:32 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Explicitly call fib_get_table() in fib_frontend.c [NET]: Use BUILD_BUG_ON in net/core/flowi.c [NET]: Remove in-code externs for some functions from net/core/dev.c [NET]: Don't declare extern variables in net/core/sysctl_net_core.c [TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update() [NET]: Treat the sign of the result of skb_headroom() consistently [9P]: Fix missing unlock before return in p9_mux_poll_start [PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE [IPV4] ip_gre: sendto/recvfrom NBMA address [SCTP]: Consolidate sctp_ulpq_renege_xxx functions [NETLINK]: Fix ACK processing after netlink_dump_start [VLAN]: MAINTAINERS update [DCCP]: Implement SIOCINQ/FIONREAD [NET]: Validate device addr prior to interface-up commit 22fa8d59be28affbecc6ae87abf528aebeebff24 Merge: 7f14957... eec407c... Author: Linus Torvalds Date: Thu Oct 25 15:48:05 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix bogus KERN_ALERT on oops x86: lguest build fix x86: fix CONFIG_KEXEC build breakage commit 7f1495745347bc2cb9cc4f50d0a889caeb71f1f1 Merge: 2c75055... 85cdffc... Author: Linus Torvalds Date: Thu Oct 25 15:44:54 2007 -0700 Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block * 'sg' of git://git.kernel.dk/linux-2.6-block: fix sg_phys to use dma_addr_t ub: add sg_init_table for sense and read capacity commands x86: pci-gart fix blackfin: fix sg fallout xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it SG: audit of drivers that use blk_rq_map_sg() arch/um/drivers/ubd_kern.c: fix a building error SG: Change sg_set_page() to take length and offset argument AVR32: Fix sg_page breakage mmc: sg fallout m68k: sg fallout More SG build fixes sg: add missing sg_init_table calls to zfcp SG build fix commit 2c7505570353af02e48c58ab4d109edd9bbbdd81 Merge: fc42dab... e1e7296... Author: Linus Torvalds Date: Thu Oct 25 15:38:19 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: lguest: documentation update lguest: Add to maintainers file. lguest: build fix lguest: clean up lguest_launcher.h lguest: remove unused "wake" element from struct lguest lguest: use defines from x86 headers instead of magic numbers lguest: example launcher header cleanup. commit fc42dabe465d478311423039448d9dc9051e5f6b Merge: 2304c3a... e2e031e... Author: Linus Torvalds Date: Thu Oct 25 15:20:22 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: SWNCQ should not apply to MCP61 libata-core: Be a bit more relaxed about early DMA zero devices ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2 Fix pata_icside build for recent libata API changes libata: cosmetic clean up in ata_eh_reset() libata-core.c: make 2 functions static [libata] Create internal helper ata_dev_set_feature() commit 2304c3ac3634d2de59f71f7b2c58aab05959124b Merge: fcd0580... 96fd4cd... Author: Linus Torvalds Date: Thu Oct 25 15:19:59 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] forcedeth: add MCP77 device IDs rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size cpmac: update to new fixed phy driver interface cpmac: convert to napi_struct interface cpmac: use print_mac() instead of MAC_FMT natsemi: fix oops, link back netdevice from private-struct ehea: fix port_napi_disable/enable bonding/bond_main.c: fix cut'n'paste error make bonding/bond_main.c:bond_deinit() static drivers/net/ipg.c: cleanups remove Documentation/networking/net-modules.txt commit fcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0 Merge: f9e8348... 8ef93cf... Author: Linus Torvalds Date: Thu Oct 25 15:19:03 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL sched: isolate SMP balancing code a bit more sched: reduce balance-tasks overhead sched: make cpu_shares_{show,store}() static sched: clean up some control group code sched: constify sched.h sched: document profile=sleep requiring CONFIG_SCHEDSTATS sched: use show_regs() to improve __schedule_bug() output sched: clean up sched_domain_debug() sched: fix fastcall mismatch in completion APIs sched: fix sched_domain sysctl registration again commit f9e83489cbb3670df810d4f9fe308cde88faa0a9 Author: Ram Gupta Date: Thu Oct 25 10:03:28 2007 -0500 fs: Fix to correct the mbcache entries counter This patch fixes the c_entry_count counter of the mbcache. Currently it increments the counter first & allocate the cache entry later. In case of failure to allocate the entry due to insufficient memory this counter is still left incremented. This patch fixes this anomaly. Signed-off-by: Ram Gupta Signed-off-by: Linus Torvalds commit 2a2da53b181bdafcdecb43c457735ee2892ae885 Author: David Howells Date: Thu Oct 25 15:27:40 2007 +0100 Fix pointer mismatches in proc_sysctl.c Fix pointer mismatches in proc_sysctl.c. The proc_handler() method returns a size_t through an arg pointer, but is given a pointer to a ssize_t to return into. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit de48844398f81cfdf087d56e12c920d620dae8d5 Author: Jeff Garzik Date: Thu Oct 25 04:06:13 2007 -0400 Permit silencing of __deprecated warnings. The __deprecated marker is quite useful in highlighting the remnants of old APIs that want removing. However, it is quite normal for one or more years to pass, before the (usually ancient, bitrotten) code in question is either updated or deleted. Thus, like __must_check, add a Kconfig option that permits the silencing of this compiler warning. This change mimics the ifdef-ery and Kconfig defaults of MUST_CHECK as closely as possible. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit c67c36e4b86872ac875716d502748b84b2541de5 Author: Linus Torvalds Date: Wed Oct 17 23:18:32 2007 -0400 Fix /proc/acpi/alarm BCD alarm encodings This fixes some totally illogical and wrong code that converts things to and from BCD mode essentially randomly, does math on values in BCD mode etc etc. Introduce a few helper functions to make it a bit more obvious what is going on, and make sure that we always do all the arithmetic (and anythign else, for that matter) in binary, not BCD. Tested by Mark Lord, who found the problem originally, and also pushed the patch back and reminded me about it. Signed-off-by: Mark Lord Signed-off-by: Linus Torvalds commit d5d1ceac2a47645780bd07fd7a670b14c4d995db Author: Oliver Neukum Date: Thu Oct 25 16:05:53 2007 +0200 USB: open disconnect race in usblcd this driver has a possible use after free due to a race when disconnect and open handle intfdata without a lock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 78663ecc344b4694dd737deb682e81312a0684b6 Author: Oliver Neukum Date: Thu Oct 25 15:48:39 2007 +0200 USB: disconnect open race in legousbtower again, possible use after free due to touching intfdata without lock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 03f36e885fc26cb0ea299fb6df5171a51e814548 Author: Oliver Neukum Date: Thu Oct 25 15:46:30 2007 +0200 USB: open disconnect race in iowarrior the driver sets intfdata to NULL without lock. Data structures can be freed and accessed. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5919a43bbc649f4770b8b5db33f43136c7ff3153 Author: Oliver Neukum Date: Thu Oct 25 15:42:38 2007 +0200 USB: missing error check in emi62 the emi62 also lacks an error check. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit cf4cf0bb89cbff95c5be8f8d3c68e55f38f94ba7 Author: Oliver Neukum Date: Thu Oct 25 15:38:44 2007 +0200 USB: missing error check in emi26 this drivers lacks an error check. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319 Author: Sarah Sharp Date: Thu Oct 25 10:58:43 2007 -0700 USB: usb_serial_resume bug fix Avoid potential null pointer dereference. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit da6fb5704feeadd10b99a1025166f1a3f627825d Author: David Brownell Date: Wed Oct 24 17:23:42 2007 -0700 USB: remove new OHCI build warnings Remove various newly-introduced compiler warnings for OHCI. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 51745281b0bf56312b78d8f56afb970cd7c91137 Author: David Brownell Date: Wed Oct 24 18:44:08 2007 -0700 USB: amd5536udc - remove set_mwi() compiler warning Get rid of pointless pci_set_mwi() compiler warning. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit acd2a847e7fee7df11817f67dba75a2802793e5d Author: Jiri Kosina Date: Sat Oct 20 00:05:19 2007 +0200 USB: usbserial - fix potential deadlock between write() and IRQ USB: usbserial - fix potential deadlock between write() and IRQ usb_serial_generic_write() doesn't disable interrupts when taking port->lock, and could therefore deadlock with usb_serial_generic_read_bulk_callback() being called from interrupt, taking the same lock. Fix it. Signed-off-by: Jiri Kosina Acked-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 8a28dea3accda319d51a1bf4d3e280771d946f78 Author: Masakazu Mokuno Date: Tue Oct 23 13:51:57 2007 +0900 usb: serial/pl2303: support for IO Data Device RSAQ5 This patch adds support for the IO Data Device USB-RSAQ5, PL2303 based USB-serial converter, to pl2303 driver Signed-off-by: Masakazu Mokuno Signed-off-by: Greg Kroah-Hartman commit d718d2b17822bb92708204cb1a9175e512520261 Author: Oliver Neukum Date: Tue Oct 23 12:26:41 2007 +0200 USB: fix read vs. disconnect race in cytherm driver the disconnect method of this driver set intfdata to NULL before removing attribute files. The attributes' read methods will happily follow the NULL pointer. Here's the correct ordering. Signed-off-by : Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 54d2bc068fd21bcb096660938bce7c7265613a24 Author: Oliver Neukum Date: Tue Oct 23 14:23:13 2007 +0200 USB: fix locking in idmouse Pete caused me to lock at buggy drivers in this respect. The idmouse has a race between open and disconnect. This patch - solves the open/disconnect race - switches locking to mutexes Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 439a903a9663c0caa8094f3907ca60069d6c36e7 Author: Alan Stern Date: Fri Oct 19 09:51:58 2007 -0400 USB: fix interface sysfs file-creation bug This patch (as1005) fixes a rather subtle problem. When usb_set_configuration() registers the interfaces and their files in sysfs, it doesn't expect those files to exist already. But when an interface is registered, its driver may call usb_set_interface() and thereby cause the sysfs files to be created. The result is an error when usb_set_configuration() goes on to create those same files again. The (not-so-great) solution is to have usb_set_configuration() remove any existing files before creating them. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b22817b3c81cdb18ffe3d2debfee968731a8b5f4 Author: Ingo Molnar Date: Mon Oct 15 19:43:21 2007 +0200 USB: fix ssb_ohci_probe() build bug fix ssb_ohci_probe() build bug: drivers/built-in.o: In function `ssb_ohci_probe': ohci-hcd.c:(.text+0xbff39): undefined reference to `ssb_device_enable' ohci-hcd.c:(.text+0xbff6f): undefined reference to `ssb_admatch_base' ohci-hcd.c:(.text+0xbff8b): undefined reference to `ssb_admatch_size' ohci-hcd.c:(.text+0xbffe5): undefined reference to `ssb_device_disable' [...] the reason was that this Kconfig combination was allowed: CONFIG_SSB=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y the fix is to require a modular USB_OHCI_HCD build when SSB is modular. Signed-off-by: Ingo Molnar Acked-by: Michael Buesch Signed-off-by: Greg Kroah-Hartman commit df64c47184aedf34fd2a69a4b7f68584fe982fdf Author: Alan Cox Date: Mon Oct 15 20:54:47 2007 +0100 USB: pl2303: remove can't happen checks, set speed properly and report baud rate Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 3d3ddce568b79911bc893b9e8542f7e1d3bc72c7 Author: Alan Cox Date: Mon Oct 15 20:53:35 2007 +0100 USB: mos7840: Clean up old checks and stuff Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 3328d9752f3796a5f5f8695d27a175c34407a5ed Author: Adrian Bunk Date: Thu Oct 18 12:53:07 2007 +0200 USB rio500.c: fix check-after-use The Coverity checker spotted that we have already oops'ed if "dev" was NULL in these places. Since "dev" being NULL isn't possible at these places this patch removes the NULL checks. Additionally, I've fixed the formatting of the if's. Signed-off-by: Adrian Bunk Acked-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit e28c6a77061ab28bd2f0b57e400e3e58cd3474ca Author: Adrian Bunk Date: Thu Oct 18 12:52:50 2007 +0200 USB iowarrior.c: fix check-after-use The Coverity checker spotted that we have already oops'ed if "dev" was NULL. Since "dev" being NULL doesn't seem to be possible here this patch removes the NULL check. Signed-off-by: Adrian Bunk Acked-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 0b28baaf74ca04be2e0cc4d4dd2bbc801697f744 Author: Oliver Neukum Date: Wed Oct 17 14:37:54 2007 +0200 USB: add URB_FREE_BUFFER to permissible flags URB_FREE_BUFFER needs to be allowed in the sanity checks to use drivers that use that flag. Signed-off-by: Oliver Neukum Acked-by: Marcel Holtmann Cc: stable Signed-off-by: Greg Kroah-Hartman commit 3794ade5b286cbd4551009dd341dbe9aeead2bc3 Author: Alan Cox Date: Mon Oct 15 15:08:11 2007 +0100 USB: isd200: sort out USB/IDE dependancy mess The ISD200 driver imports a single trivial routine from the IDE layer and in doing so creates a mess of dependancies that drag in the entire old IDE layer. Even more sad - it does this for a routine which is usually (little endian) a null function! - Copy the function into ISD200 - Rename it so it doesn't clash with the ide header prototype - Remove all the depend constraints Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c93d46509e7aee7d58680c4c8a12cfbe98df98cb Author: Matthias Kaehlcke Date: Tue Oct 16 19:23:10 2007 +0200 USB: FTDI Elan driver: Convert ftdi->u132_lock to mutex FTDI Elan driver: Convert the semaphore ftdi->u132_lock to the mutex API Signed-off-by: Matthias Kaehlcke Signed-off-by: Greg Kroah-Hartman commit 7898ffc543566a9c4a1b4ff39f43857d2d84a51c Author: Alan Stern Date: Tue Oct 16 11:55:30 2007 -0400 USB: fix scheduling of Iso URBs in uhci-hcd This patch (as1003) changes uhci-hcd to treat the URB_ISO_ASAP flag the same as other host controller drivers, namely, to schedule an Iso URB for the first available time slot that hasn't already expired. URBs in which the flag isn't set will be scheduled for the first slot following the last URB, even if it has expired. This fixes a problem reported by Martin Bachem. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6ce073bd8be0a741440944fed892a136a1d24bbe Author: Alan Cox Date: Thu Oct 18 01:24:25 2007 -0700 USB: io_edgeport: cleanups, and tty speed reporting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bd5e47ccb656e74a775c002d0308c666bea65a2b Author: Andrew Morton Date: Thu Oct 18 01:24:25 2007 -0700 USB: ftd_sio cleanups and updates for new termios work checkpatch fixes WARNING: line over 80 characters #23: FILE: drivers/usb/serial/ftdi_sio.c:297: + speed_t force_baud; /* if non-zero, force the baud rate to this value */ ERROR: use tabs not spaces #31: FILE: drivers/usb/serial/ftdi_sio.c:881: +^I$ ERROR: use tabs not spaces #39: FILE: drivers/usb/serial/ftdi_sio.c:890: +^I$ WARNING: line over 80 characters #111: FILE: drivers/usb/serial/ftdi_sio.c:1956: + tty_encode_baud_rate(port->tty, priv->force_baud, priv->force_baud); Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 669a6db1037efeb064dd6620f69384f99fb45584 Author: Alan Cox Date: Thu Oct 18 01:24:24 2007 -0700 USB: ftd_sio: cleanups and updates for new termios work - Remove can't happen tests - Rework speed validation in terms of baud rates not CBAUD bits - Report speed set (or chosen) - Minor termios correctness Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9ab0f202e6a700d1362a1eb990ac3054f2cd15ea Author: Alan Cox Date: Thu Oct 18 01:24:24 2007 -0700 USB: cp2101: convert to new termios - Convert to new baud rate functions - Add baud rate reporting Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 01d1df29517625b8e8b5f48a0d3c2020d950eb4b Author: Alan Cox Date: Thu Oct 18 01:24:23 2007 -0700 USB: whiteheat: clean up can't happen checks and encode baud rate Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 337850917a690ca83605b30b29c464bb3397abdf Author: Alan Cox Date: Thu Oct 18 01:24:22 2007 -0700 usb-serial: handle NULL termios methods as "no hardware changing support" Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ed1f12ec50224222be9cc494cb72b4322bbacd7f Author: Alan Cox Date: Thu Oct 18 01:24:22 2007 -0700 USB: sierra: termios No hardware termios setting in this case so keep the old settings Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e650d8ae0494bb937eea6c7fd1a60e57ba74cd53 Author: Alan Cox Date: Thu Oct 18 01:24:21 2007 -0700 USB: option: termios handling For the devices that have no hardware settings set up the termios return properly. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit a6ebf80dbc186d4782d6b08cf3676e4f22a8a84b Author: Alan Cox Date: Thu Oct 18 01:24:21 2007 -0700 USB: kobil_sct: termios encoding fixups - Clear unsupported CMSPAR - Encode resulting speeds Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 74240b07a908e09e18fa09f2cba44f212be9c4c3 Author: Alan Cox Date: Thu Oct 18 01:24:20 2007 -0700 USB: keyspan termios tidy - Clear unsupported CMSPAR bit - Clean up long chains of a->b-> a bit - Encode baud rate back into tty structure properly Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 560aac22e1dce7c7e9756a0a4450ca3bae58fcd5 Author: Alan Cox Date: Thu Oct 18 01:24:20 2007 -0700 USB: ir_usb: termios handling - Clean up paranoia checks - Propogate back a correct fixed termios Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 998e8638711680aecceb9c2ea3b8a09a120d605b Author: Alan Cox Date: Thu Oct 18 01:24:19 2007 -0700 USB: empeg: clean up and handle speeds The empeg is pretty fixed. Tidy up the long foo->bar->baz stuff and encode the fixed speed properly. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7fa36a994cb4298f29994a248ced831be8dc7051 Author: Alan Cox Date: Thu Oct 18 01:24:19 2007 -0700 USB: digi_acceleport: fix termios and also readability a bit - Expand some x&y to x & y so I could read it when checking - Clear CMSPAR bit in the termios (as the driver does not support it) - Encode the speed using the new tty_encode_baud_rate facility Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 73f593081911b1be0d8d3962ecedd635c1e27179 Author: Alan Cox Date: Thu Oct 18 01:24:18 2007 -0700 USB: ch341: fix termios handling The ch341 currently doesn't support most of the hardware setting. So to keep the termios data right we propogate the old termios hardware values back then encode the speed. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7cc7ee28263e89793ae4d21e6e0102404c9a037b Author: Alan Cox Date: Thu Oct 18 01:24:18 2007 -0700 usb serial: kill another case we pass NULL and shouldn't Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit adb5dca17dde297b685d57ec68fa0e5490feee8b Author: Alan Cox Date: Thu Oct 18 01:24:17 2007 -0700 USB: ark3116: update termios handling - Set the i/ospeed in the initial termios properly - Use the tty_encode_baud_rate functions to report resulting rates properly Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 149b36eae2ab6aa6056664f4bc461f3d3affc9c1 Author: Alan Cox Date: Thu Oct 18 01:24:16 2007 -0700 serial: stop passing NULL to functions that expect data Earlier patches have removed the checking for old v new differences from the USB drivers so we can now pass in a valid blank old termios so that we don't to fill the drivers with magic hacks for console support Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3657f6c018907870d4264d466def384b58608484 Author: Greg Kroah-Hartman Date: Tue Apr 9 12:14:34 2002 -0700 USB: add new Novatel device ids to option driver This adds support for the U727 and MC950 devices. Cc: Rony Sarkis Signed-off-by: Greg Kroah-Hartman commit 85cdffcde0b6b831a06422413300d0f5c0e608c3 Author: Hugh Dickins Date: Thu Oct 25 09:55:05 2007 +0200 fix sg_phys to use dma_addr_t x86_32 CONFIG_HIGHMEM64G with 5GB RAM hung when booting, after issuing some "request_module: runaway loop modprobe binfmt-0000" messages in trying to exec /sbin/init. The binprm buf doesn't see the right ".ELF" header because sg_phys() is providing the wrong physical addresses for high pages: a 32-bit unsigned long is too small in this case, we need to use dma_addr_t. Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe commit 96fd4cd3e40e240f0c385af87f58e74da8b7099a Author: Ayaz Abdulla Date: Thu Oct 25 03:36:42 2007 -0400 [netdrvr] forcedeth: add MCP77 device IDs Signed-off-by: Jeff Garzik commit 500d2c2f7b8c1cf6194dc9e8f47c6e2295fc5be5 Author: Thomas Sailer Date: Wed Oct 24 00:47:19 2007 +0200 rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size This patch makes the host RNDIS driver talk to RNDIS devices with an MTU less than 1.5k, instead of refusing to talk to such a device. Signed-Off-by: Thomas Sailer Acked-by: David Brownell -- Hi Jeff, are you the right person to send this to? Nobody else seems to be wanting to forward this to Linus... Thanks, Tom Signed-off-by: Jeff Garzik commit b88219f8a2028a1ca2dd17aa7c9d9b643615646e Author: Eugene Konev Date: Wed Oct 24 10:42:03 2007 +0800 cpmac: update to new fixed phy driver interface Use fixed_mdio_get_phydev for obtaining fixed phy instances and adopt to changed fixed phy device naming. Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit 67d129d14da1555bb3eaca754f6f81c02cacbe0e Author: Eugene Konev Date: Wed Oct 24 10:42:02 2007 +0800 cpmac: convert to napi_struct interface Convert cpmac to new napi_struct API introduced by bea3348eef27e6044b6161fd04c3152215f96411 [NET]: Make NAPI polling independent of struct net_device objects. Only disable rx interrupts if napi actually has been scheduled. Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit df523b5cd9950485350fb1b7d97d5b8882d94a4e Author: Eugene Konev Date: Wed Oct 24 10:42:01 2007 +0800 cpmac: use print_mac() instead of MAC_FMT Switch to using DECLARE_MAC_BUF/print_mac() added by commit 0795af5729b18218767fab27c44b1384f72dc9ad [NET]: Introduce and use print_mac() and DECLARE_MAC_BUF(). Signed-off-by: Eugene Konev Signed-off-by: Jeff Garzik commit bbbab5ca835fb7676434815a47add8f2c696bec7 Author: Ingo Molnar Date: Wed Oct 24 13:58:57 2007 +0200 natsemi: fix oops, link back netdevice from private-struct * Andrew Nelless wrote: > Hi, > > I booted up 2.6.24-rc1 this morning [Real early over a brew ;-)] and > was having a problems with multiple ~5 second hangs on SATA/drive init > (Something to do with "EH" something-or-other and resets but I'll > email in separately about it later unless its fixed by the time I get > the chance). > > Anyway, I went to fire up netconsole to get a decent log dump and hit > across the following nasty. Netconsole works fine in 2.6.23.1 with a > similar config and the same kernel parameters. > > A shot of the screen is the only method I could come up with to > capture the log, I hope that is OK, it is pretty readable. > > > The nasty: > http://andotnet.nfshost.com/linux/2.6.24-rc1-netconsole-nullderef.jpg the NULL dereference is here: (gdb) list *0xffffffff804a9504 0xffffffff804a9504 is in natsemi_poll (drivers/net/natsemi.c:717). 712 return count; 713 } 714 715 static inline void __iomem *ns_ioaddr(struct net_device *dev) 716 { 717 return (void __iomem *) dev->base_addr; 718 } 719 which is this code from natsemi.c: 2227 struct net_device *dev = np->dev; 2228 void __iomem * ioaddr = ns_ioaddr(dev); 2229 int work_done = 0; seems like the NAPI changes in -rc1 added an np->dev field but forgot to initialize it ... does the patch below fix the oops for you? Ingo --------------------> Subject: natsemi: fix oops, link back netdevice from private-struct From: Ingo Molnar this commit: commit bea3348eef27e6044b6161fd04c3152215f96411 Author: Stephen Hemminger Date: Wed Oct 3 16:41:36 2007 -0700 [NET]: Make NAPI polling independent of struct net_device objects. added np->dev to drivers/net/natsemi.c's struct netdev_private, but forgot to initialize that new field upon driver init. The result was a predictable NULL dereference oops the first time the hardware generated an interrupt. Reported-by: Andrew Nelless Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 0173b793ca477aa2ca516ebf0a35e137b678d466 Author: Jan-Bernd Themann Date: Wed Oct 24 11:53:34 2007 +0200 ehea: fix port_napi_disable/enable napi_disable / napi_enable must be applied on all ehea queues. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit a40745f5ef38f4542d120bd67c2c4a07702eb1da Author: Adrian Bunk Date: Wed Oct 24 18:27:43 2007 +0200 bonding/bond_main.c: fix cut'n'paste error This patch fixes a cut'n'paste error in commit 1b76b31693d4a6088dec104ff6a6ead54081a3c2. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit c50b85d0fbca0a2017b8c0b1e2aeb650724c0a71 Author: Adrian Bunk Date: Wed Oct 24 18:23:17 2007 +0200 make bonding/bond_main.c:bond_deinit() static bond_deinit() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 96fd74b2d9b59edeed7ea1287d322b7661d549ca Author: Adrian Bunk Date: Wed Oct 24 18:23:19 2007 +0200 drivers/net/ipg.c: cleanups This patch contains the following cleanups: - make ipg_nic_get_stats() static - move DefaultPhyParam[] from ipg.h to ipg.c and make it static Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 4316b450e811a7298c80bb4f905af2de5cab54a8 Author: Adrian Bunk Date: Wed Oct 24 18:25:03 2007 +0200 remove Documentation/networking/net-modules.txt According to git, the only one who touched this file during the last 5 years was me when removing drivers... modinfo offers less ancient information. Signed-off-by: Adrian Bunk Acked-by: Geert Uytterhoeven Acked-by: Paul Gortmaker Signed-off-by: Jeff Garzik commit 4f33a9d9a416313f0ecf6e6953d205385a431cd5 Author: FUJITA Tomonori Date: Thu Oct 25 09:17:03 2007 +0200 ub: add sg_init_table for sense and read capacity commands Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit e88a39dee10d3a506ed8c4ba78cde0dd76a6fc83 Author: FUJITA Tomonori Date: Thu Oct 25 09:13:32 2007 +0200 x86: pci-gart fix map_sg could copy the last sg element to another position (if merging some elements). It breaks sg chaining. This copies only dma_address/length instead of the whole sg element. Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe commit e2e031eb09760c36099ac127eeb175e06d257aef Author: Kuan Luo Date: Thu Oct 25 02:14:17 2007 -0400 [libata] sata_nv: SWNCQ should not apply to MCP61 The mcp61 has bug with ncq. Signed-off-by: Kuan Luo Signed-off-by: Jeff Garzik commit 3acaf94bb0a69cca75a524a4ba8c30a9eae97dc8 Author: Alan Cox Date: Mon Oct 15 19:18:27 2007 +0100 libata-core: Be a bit more relaxed about early DMA zero devices I guess Windows didn't care about the command so neither did they Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit edc93052844c2032b2ec5910ace516da9078714d Author: Tejun Heo Date: Thu Oct 25 14:59:16 2007 +0900 ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2 P5W-DH Deluxe has ICH9 which doesn't have PMP support but SIMG 4726 hardwired to the second port of AHCI controller at PCI device 1f.2. The 4726 doesn't work as PMP but as a storage processor which can do hardware RAID on downstream ports. When no device is attached to the downstream port of the 4726, pseudo ATA device for configuration appears. Unfortunately, ATA emulation on the device is very lousy and causes long hang during boot. This patch implements workaround for the board. If the mainboard is P5W-DH Deluxe (matched using DMI), only hardreset is used on the second port of AHCI controller @ 1f.2 and the hardreset doesn't depend on receiving the first FIS and just proceed to IDENTIFY. This workaround fixes bugzilla #8923. http://bugzilla.kernel.org/show_bug.cgi?id=8923 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c15fcafe1c42daff212d78d4ce9619a52a74379f Author: Al Viro Date: Sun Oct 14 01:12:39 2007 +0100 Fix pata_icside build for recent libata API changes Signed-off-by: Jeff Garzik commit 0e06d9ce7a49d2ef2858cf07b44a324fc3a4c192 Author: Tejun Heo Date: Wed Oct 24 15:21:26 2007 +0900 libata: cosmetic clean up in ata_eh_reset() Local variable @action usage in ata_eh_reset() is a bit confusing. It's used only to cache ehc->i.action to test reset masks after clearing it; however, due to the generic name "action", it's easy to misinterpret the local variable as containing the selected reset method later. Also, the reason for caching the original value is easy to miss. This patch renames @action to @tmp_action and make it buffer newly selected value instead to improve readability. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 741b776335c3e91b0b8bf765a97f9484a3cd5034 Author: Adrian Bunk Date: Wed Oct 24 18:23:06 2007 +0200 libata-core.c: make 2 functions static strn_pattern_cmp() and ata_port_detach() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit e1e72965ec2c02db99b415cd06c17ea90767e3a4 Author: Rusty Russell Date: Thu Oct 25 15:02:50 2007 +1000 lguest: documentation update Went through the documentation doing typo and content fixes. This patch contains only comment and whitespace changes. Signed-off-by: Rusty Russell commit 218f3d30e60f32394738372c594d063f8e43ee6d Author: Jeff Garzik Date: Thu Oct 25 00:33:27 2007 -0400 [libata] Create internal helper ata_dev_set_feature() Signed-off-by: Jeff Garzik commit 568a17ffce2eeceae0cd9fc37e97cbad12f70278 Author: Rusty Russell Date: Thu Oct 25 14:12:24 2007 +1000 lguest: Add to maintainers file. Signed-off-by: Rusty Russell commit 4cfe6c3c1c301d3d7a36c9d579597b75ebb8ea13 Author: Jeff Garzik Date: Thu Oct 25 14:15:09 2007 +1000 lguest: build fix Fix this error (i386 !SMP build) arch/x86/lguest/boot.c: In function ‘lguest_init’: arch/x86/lguest/boot.c:1059: error: ‘pm_power_off’ undeclared (first use in this function) by including linux/pm.h. Signed-off-by: Jeff Garzik Signed-off-by: Rusty Russell commit 7334492b53706964eb055ed8e25e2e3315d7222a Author: Rusty Russell Date: Thu Oct 25 14:12:20 2007 +1000 lguest: clean up lguest_launcher.h Remove now-unused defines. Fix old idempotent #ifndef _ASM_LGUEST_USER name. Fix comment on use of lguest_req. Signed-off-by: Rusty Russell commit 197bff630ae586252d24b3595c54f8f9b712610a Author: Rusty Russell Date: Thu Oct 25 14:10:30 2007 +1000 lguest: remove unused "wake" element from struct lguest Signed-off-by: Rusty Russell commit 25c47bb35355c1e1b2ae325b49441b2c8b201ece Author: Rusty Russell Date: Thu Oct 25 14:09:53 2007 +1000 lguest: use defines from x86 headers instead of magic numbers Signed-off-by: Rusty Russell commit db24e8c2ef7eceb46818a8c22fc38dea733fe159 Author: Rusty Russell Date: Thu Oct 25 14:09:25 2007 +1000 lguest: example launcher header cleanup. Now the kernel headers are clean for userspace export, we don't need to typedef kernel types before including them. We also don't need pci_ids.h (that was from an earlier virtio draft). Signed-off-by: Rusty Russell commit 8ef93cf11413e3f2dc28bfaf736e1f49981ed700 Author: Ingo Molnar Date: Wed Oct 24 18:23:51 2007 +0200 sched: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTAL. All bugs have been fixed and it's perfect ;-) Signed-off-by: Ingo Molnar commit 681f3e68541d6f03e3e05d21fe15093578b8b539 Author: Peter Williams Date: Wed Oct 24 18:23:51 2007 +0200 sched: isolate SMP balancing code a bit more At the moment, a lot of load balancing code that is irrelevant to non SMP systems gets included during non SMP builds. This patch addresses this issue and reduces the binary size on non SMP systems: text data bss dec hex filename 10983 28 1192 12203 2fab sched.o.before 10739 28 1192 11959 2eb7 sched.o.after Signed-off-by: Peter Williams Signed-off-by: Ingo Molnar commit e1d1484f72127a5580d37c379f6a5b2c2786434c Author: Peter Williams Date: Wed Oct 24 18:23:51 2007 +0200 sched: reduce balance-tasks overhead At the moment, balance_tasks() provides low level functionality for both move_tasks() and move_one_task() (indirectly) via the load_balance() function (in the sched_class interface) which also provides dual functionality. This dual functionality complicates the interfaces and internal mechanisms and makes the run time overhead of operations that are called with two run queue locks held. This patch addresses this issue and reduces the overhead of these operations. Signed-off-by: Peter Williams Signed-off-by: Ingo Molnar commit a0f846aa76c3e03d54c1700a87cab3a46ccd71e2 Author: Adrian Bunk Date: Wed Oct 24 18:23:50 2007 +0200 sched: make cpu_shares_{show,store}() static cpu_shares_{show,store}() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar commit 2b01dfe37203e825edd8417ad3993d01cbbb527e Author: Paul Menage Date: Wed Oct 24 18:23:50 2007 +0200 sched: clean up some control group code - replace "cont" with "cgrp" in a few places in the CFS cgroup code, - use write_uint rather than write for cpu.shares write function Signed-off-by: Paul Menage Acked-by : Srivatsa Vaddagiri Signed-off-by: Ingo Molnar commit a8972ccf00b7184a743eb6cd9bc7f3443357910c Author: Joe Perches Date: Wed Oct 24 18:23:50 2007 +0200 sched: constify sched.h Add const to some struct task_struct * uses Signed-off-by: Joe Perches Signed-off-by: Ingo Molnar commit b3da2a73ff5a2953a4ad8ebbf0aa7e6965ff9de2 Author: Mel Gorman Date: Wed Oct 24 18:23:50 2007 +0200 sched: document profile=sleep requiring CONFIG_SCHEDSTATS profile=sleep only works if CONFIG_SCHEDSTATS is set. This patch notes the limitation in Documentation/kernel-parameters.txt and prints a warning at boot-time if profile=sleep is used without CONFIG_SCHEDSTAT. Signed-off-by: Mel Gorman Signed-off-by: Ingo Molnar commit 838225b48edc971620cbeb292034dabd2b0d7d1d Author: Satyam Sharma Date: Wed Oct 24 18:23:50 2007 +0200 sched: use show_regs() to improve __schedule_bug() output A full register dump along with stack backtrace would make the "scheduling while atomic" message more helpful. Use show_regs() instead of dump_stack() for this. We already know we're atomic in here (that is why this function was called) so show_regs()'s atomicity expectations are guaranteed. Also, modify the output of the "BUG: scheduling while atomic:" header a bit to keep task->comm and task->pid together and preempt_count() after them. Signed-off-by: Satyam Sharma Signed-off-by: Ingo Molnar commit 4dcf6aff023d9934630fb3649284951831c51f8f Author: Ingo Molnar Date: Wed Oct 24 18:23:48 2007 +0200 sched: clean up sched_domain_debug() clean up sched_domain_debug(). this also shrinks the code a bit: text data bss dec hex filename 50474 4306 480 55260 d7dc sched.o.before 50404 4306 480 55190 d796 sched.o.after Signed-off-by: Ingo Molnar commit b15136e9497ef5d6e08cf665e0d0acf7a229f6dc Author: Ingo Molnar Date: Wed Oct 24 18:23:48 2007 +0200 sched: fix fastcall mismatch in completion APIs Jeff Dike noticed that wait_for_completion_interruptible()'s prototype had a mismatched fastcall. Fix this by removing the fastcall attributes from all the completion APIs. Found-by: Jeff Dike Signed-off-by: Ingo Molnar commit 7378547f2c83ca16a30d0a7c488a43a688ea0888 Author: Milton Miller Date: Wed Oct 24 18:23:48 2007 +0200 sched: fix sched_domain sysctl registration again commit 029190c515f15f512ac85de8fc686d4dbd0ae731 (cpuset sched_load_balance flag) was not tested SCHED_DEBUG enabled as committed as it dereferences NULL when used and it reordered the sysctl registration to cause it to never show any domains or their tunables. Fixes: 1) restore arch_init_sched_domains ordering we can't walk the domains before we build them presently we register cpus with empty directories (no domain directories or files). 2) make unregister_sched_domain_sysctl do nothing when already unregistered detach_destroy_domains is now called one set of cpus at a time unregister_syctl dereferences NULL if called with a null. While the the function would always dereference null if called twice, in the previous code it was always called once and then was followed a register. So only the hidden bug of the sysctl_root_table not being allocated followed by an attempt to free it would have shown the error. 3) always call unregister and register in partition_sched_domains The code is "smart" about unregistering only needed domains. Since we aren't guaranteed any calls to unregister, always unregister. Without calling register on the way out we will not have a table or any sysctl tree. 4) warn if register is called without unregistering The previous table memory is lost, leaving pointers to the later freed memory in sysctl and leaking the memory of the tables. Before this patch on a 2-core 4-thread box compiled for SMT and NUMA, the domains appear empty (there are actually 3 levels per cpu). And as soon as two domains a null pointer is dereferenced (unreliable in this case is stack garbage): bu19a:~# ls -R /proc/sys/kernel/sched_domain/ /proc/sys/kernel/sched_domain/: cpu0 cpu1 cpu2 cpu3 /proc/sys/kernel/sched_domain/cpu0: /proc/sys/kernel/sched_domain/cpu1: /proc/sys/kernel/sched_domain/cpu2: /proc/sys/kernel/sched_domain/cpu3: bu19a:~# mkdir /dev/cpuset bu19a:~# mount -tcpuset cpuset /dev/cpuset/ bu19a:~# cd /dev/cpuset/ bu19a:/dev/cpuset# echo 0 > sched_load_balance bu19a:/dev/cpuset# mkdir one bu19a:/dev/cpuset# echo 1 > one/cpus bu19a:/dev/cpuset# echo 0 > one/sched_load_balance Unable to handle kernel paging request for data at address 0x00000018 Faulting instruction address: 0xc00000000006b608 NIP: c00000000006b608 LR: c00000000006b604 CTR: 0000000000000000 REGS: c000000018d973f0 TRAP: 0300 Not tainted (2.6.23-bml) MSR: 9000000000009032 CR: 28242442 XER: 00000000 DAR: 0000000000000018, DSISR: 0000000040000000 TASK = c00000001912e340[1987] 'bash' THREAD: c000000018d94000 CPU: 2 .. NIP [c00000000006b608] .unregister_sysctl_table+0x38/0x110 LR [c00000000006b604] .unregister_sysctl_table+0x34/0x110 Call Trace: [c000000018d97670] [c000000007017270] 0xc000000007017270 (unreliable) [c000000018d97720] [c000000000058710] .detach_destroy_domains+0x30/0xb0 [c000000018d977b0] [c00000000005cf1c] .partition_sched_domains+0x1bc/0x230 [c000000018d97870] [c00000000009fdc4] .rebuild_sched_domains+0xb4/0x4c0 [c000000018d97970] [c0000000000a02e8] .update_flag+0x118/0x170 [c000000018d97a80] [c0000000000a1768] .cpuset_common_file_write+0x568/0x820 [c000000018d97c00] [c00000000009d95c] .cgroup_file_write+0x7c/0x180 [c000000018d97cf0] [c0000000000e76b8] .vfs_write+0xe8/0x1b0 [c000000018d97d90] [c0000000000e810c] .sys_write+0x4c/0x90 [c000000018d97e30] [c00000000000852c] syscall_exit+0x0/0x40 Signed-off-by: Milton Miller Signed-off-by: Ingo Molnar commit 82861924a5f26208c8421a799a4e8724d48eb560 Author: Adrian Bunk Date: Wed Oct 24 14:09:25 2007 +0200 blackfin: fix sg fallout Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 8c7837c4f5cf177729297ba3fef1ec62f50f499b Author: Jens Axboe Date: Wed Oct 24 13:28:40 2007 +0200 xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it It's currently using asm/scatterlist.h, but that is not enough. Signed-off-by: Jens Axboe commit 5d9dc2cfd881b3b93c3f819ee94ad3ab7184b29a Merge: 3d1266c... 18ccc41... Author: Jens Axboe Date: Wed Oct 24 13:25:26 2007 +0200 Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 into sg commit 3d1266c7042e696704e22085a0f55c714bc06194 Author: Jens Axboe Date: Wed Oct 24 13:21:21 2007 +0200 SG: audit of drivers that use blk_rq_map_sg() They need to properly init the sg table, or blk_rq_map_sg() will complain if CONFIG_DEBUG_SG is set. Signed-off-by: Jens Axboe commit 23464ffa47689e46985fb10ae9e34bbc9e83f387 Author: WANG Cong Date: Wed Oct 24 13:07:11 2007 +0200 arch/um/drivers/ubd_kern.c: fix a building error Fix this uml building error: arch/um/drivers/ubd_kern.c: In function 'do_ubd_request': arch/um/drivers/ubd_kern.c:1118: error: implicit declaration of function 'sg_page' arch/um/drivers/ubd_kern.c:1118: warning: passing argument 6 of 'prepare_request' makes pointer from integer without a cast make[1]: *** [arch/um/drivers/ubd_kern.o] Error 1 make: *** [arch/um/drivers] Error 2 Signed-off-by: WANG Cong Add sg_init_table() call as well. Signed-off-by: Jens Axboe commit eec407c9ac5ee819bfcadb4e39ce892576d570d1 Author: Alexey Dobriyan Date: Wed Oct 24 12:58:02 2007 +0200 x86: fix bogus KERN_ALERT on oops fix this: printing eip: f881b9f3 *pdpt = 0000000000003001 <1>*pde = 000000000480a067 *pte = 0000000000000000 ^^^ [ mingo: added KERN_CONT as suggested by Pekka Enberg ] Signed-off-by: Alexey Dobriyan Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 230e55adf6f74309683a068dec23e664a64fb08a Author: Jeff Garzik Date: Wed Oct 24 12:58:02 2007 +0200 x86: lguest build fix Fix this error (i386 !SMP build): arch/x86/lguest/boot.c: In function lguest_init: arch/x86/lguest/boot.c:1059: error: pm_power_off undeclared (first use in this function) by including linux/pm.h. Signed-off-by: Jeff Garzik Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 1fb473d8f45658532555b956ee24e25a0ba493cd Author: Mike Galbraith Date: Wed Oct 24 12:58:01 2007 +0200 x86: fix CONFIG_KEXEC build breakage X86_32 build fix to commit 62a31a03b3d2a9d20e7a073e2cd9b27bfb7d6a3f Signed-off-by: Mike Galbraith Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 642f149031d70415d9318b919d50b71e4724adbd Author: Jens Axboe Date: Wed Oct 24 11:20:47 2007 +0200 SG: Change sg_set_page() to take length and offset argument Most drivers need to set length and offset as well, so may as well fold those three lines into one. Add sg_assign_page() for those two locations that only needed to set the page, where the offset/length is set outside of the function context. Signed-off-by: Jens Axboe commit 9317d4313e0cd51b2256ea9a9316f2d8561e37a8 Author: Jeff Garzik Date: Tue Oct 23 18:36:39 2007 -0400 ISDN/sc: fix longstanding warning drivers/isdn/sc/shmem.c: In function 'memcpy_toshmem': drivers/isdn/sc/shmem.c:54: warning: passing argument 1 of 'memcpy_toio' makes pointer from integer without a cast Also, remove some unneeded braces, and add some useful whitespace. Signed-off-by: Jeff Garzik commit 18ccc4194389c6edc78ede76ada3bf753525b11c Author: Haavard Skinnemoen Date: Wed Oct 24 10:16:02 2007 +0200 AVR32: Fix sg_page breakage The latest sg changes introduce the following build errors on AVR32: include/asm/dma-mapping.h: In function ‘dma_map_sg’: include/asm/dma-mapping.h:220: error: implicit declaration of function ‘sg_page’ include/asm/dma-mapping.h:220: error: invalid operands to binary - include/asm/dma-mapping.h:221: error: implicit declaration of function ‘sg_virt’ include/asm/dma-mapping.h:221: warning: assignment makes pointer from integer without a cast include/asm/dma-mapping.h: In function ‘dma_sync_sg_for_device’: include/asm/dma-mapping.h:330: warning: passing argument 2 of ‘dma_cache_sync’ makes pointer from integer without a cast Fix it by including the correct header file, i.e. linux/scatterlist.h instead of asm/scatterlist.h. Signed-off-by: Haavard Skinnemoen commit bd6dee6f30a0f6943df190b387b5f8fe98a848f3 Author: Jens Axboe Date: Wed Oct 24 09:01:09 2007 +0200 mmc: sg fallout Do a full scan of the directory to try and be a bit more proactive, instead of waiting for things to break. Signed-off-by: Jens Axboe commit 5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339 Author: Geert Uytterhoeven Date: Wed Oct 24 08:55:40 2007 +0200 m68k: sg fallout Signed-off-by: Geert Uytterhoeven Signed-off-by: Jens Axboe commit d91c5e8839791b27672277e81451873499bc517e Author: David Miller Date: Wed Oct 24 08:46:01 2007 +0200 More SG build fixes Signed-off-by: Jens Axboe commit de58d942924d431c1c2144ece35b0b9aceadaf2c Author: Heiko Carstens Date: Wed Oct 24 08:45:35 2007 +0200 sg: add missing sg_init_table calls to zfcp kernel BUG at include/linux/scatterlist.h:50! illegal operation: 0001 [#1] [...] Call Trace: ([<000000000026f184>] zfcp_ns_gid_pn_request+0x4c/0x2a0) [<0000000000276dd4>] zfcp_erp_strategy_do_action+0x1410/0x1938 [<0000000000278412>] zfcp_erp_thread+0x4fa/0x1430 [<000000000001990a>] kernel_thread_starter+0x6/0xc [<0000000000019904>] kernel_thread_starter+0x0/0xc Cc: Swen Schillig Cc: Christof Schmitt Signed-off-by: Heiko Carstens Signed-off-by: Jens Axboe commit 5e2a06489e4d4d85ca4ca20af23f213e95c2fbeb Author: David Miller Date: Wed Oct 24 08:44:21 2007 +0200 SG build fix Signed-off-by: David S. Miller Signed-off-by: Jens Axboe commit d58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1 Author: Chris Wright Date: Tue Oct 23 20:36:14 2007 -0700 [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED) Looks like the MAP_FIXED case is using the wrong address hint. I'd expect the comment "don't mess with it" means pass the request straight on through, not change the address requested to -ENOMEM. Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit 03cf786c4e83dba404ad23ca58f49147ae52dffd Author: Pavel Emelyanov Date: Tue Oct 23 21:17:27 2007 -0700 [IPV4]: Explicitly call fib_get_table() in fib_frontend.c In case the "multiple tables" config option is y, the ip_fib_local_table is not a variable, but a macro, that calls fib_get_table(RT_TABLE_LOCAL). Some code uses this "variable" *3* times in one place, thus implicitly making 3 calls. Fix it. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit f0fe91ded36bab95541e960ae8a115abc1f5ba03 Author: Pavel Emelyanov Date: Tue Oct 23 21:15:21 2007 -0700 [NET]: Use BUILD_BUG_ON in net/core/flowi.c Instead of ugly extern not-existing function. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 342709efc7a4ba91eac6d2d2d931ec316a587dfa Author: Pavel Emelyanov Date: Tue Oct 23 21:14:45 2007 -0700 [NET]: Remove in-code externs for some functions from net/core/dev.c Inconsistent prototype and real type for functions may have worse consequences, than those for variables, so move them into a header. Since they are used privately in net/core, make this file reside in the same place. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit a37ae4086e7e804db534bc8f2d31c2fbf89c5761 Author: Pavel Emelyanov Date: Tue Oct 23 21:13:53 2007 -0700 [NET]: Don't declare extern variables in net/core/sysctl_net_core.c Some are already declared in include/linux/netdevice.h, while some others (xfrm ones) need to be declared. The driver/net/rrunner.c just uses same extern as well, so cleanup it also. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit c1bd24b76879f61b2d10609b0dabde400792a6ec Author: Chuck Lever Date: Tue Oct 23 21:08:54 2007 -0700 [TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update() The tcp_minshall_update() function is called in exactly one place, and is passed an unsigned integer for the mss_len argument. Make the sign of the argument match the sign of the passed variable in order to eliminate an unneeded implicit type cast and a mixed sign comparison in tcp_minshall_update(). Signed-off-by: Chuck Lever Signed-off-by: David S. Miller commit c2636b4d9e8ab8d16b9e2bf0f0744bb8418d4026 Author: Chuck Lever Date: Tue Oct 23 21:07:32 2007 -0700 [NET]: Treat the sign of the result of skb_headroom() consistently In some places, the result of skb_headroom() is compared to an unsigned integer, and in others, the result is compared to a signed integer. Make the comparisons consistent and correct. Signed-off-by: Chuck Lever Signed-off-by: David S. Miller commit 0ffdd581497286e8af529b0b39770c01eab15b30 Author: Roel Kluin <12o3l@tiscali.nl> Date: Tue Oct 23 20:52:48 2007 -0700 [9P]: Fix missing unlock before return in p9_mux_poll_start Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: David S. Miller commit 0034622693ad21d6b341a1b51e766f72d1ef512e Author: Pavel Emelyanov Date: Tue Oct 23 20:50:58 2007 -0700 [PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE Fix one more user of netiff_subqueue_stopped. To check for the queue id one must use the __netiff_subqueue_stoped call. This run out of my sight when I made the: 668f895a85b0c3a62a690425145f13dabebebd7a [NET]: Hide the queue_mapping field inside netif_subqueue_stopped commit :( Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 6a5f44d7a048c97b8bae8ce464c97b8fad61ff99 Author: Timo Teras Date: Tue Oct 23 20:31:53 2007 -0700 [IPV4] ip_gre: sendto/recvfrom NBMA address When GRE tunnel is in NBMA mode, this patch allows an application to use a PF_PACKET socket to: - send a packet to specific NBMA address with sendto() - use recvfrom() to receive packet and check which NBMA address it came from This is required to implement properly NHRP over GRE tunnel. Signed-off-by: Timo Teras Acked-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 16d14ef9f29dfa9b1d99f3eff860e9f15bc99f39 Author: Pavel Emelyanov Date: Tue Oct 23 20:30:25 2007 -0700 [SCTP]: Consolidate sctp_ulpq_renege_xxx functions Both are equal, except for the list to be traversed. Signed-off-by: Pavel Emelyanov Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit 5c58298c2536252ab95aa2b1497ab47eb878ca5d Author: Denis V. Lunev Date: Tue Oct 23 20:29:25 2007 -0700 [NETLINK]: Fix ACK processing after netlink_dump_start Revert to original netlink behavior. Do not reply with ACK if the netlink dump has bees successfully started. libnl has been broken by the cd40b7d3983c708aabe3d3008ec64ffce56d33b0 The following command reproduce the problem: /nl-route-get 192.168.1.1 Signed-off-by: Denis V. Lunev Acked-by: Thomas Graf Signed-off-by: David S. Miller commit be7f827360b5dfecd8f43adbd48f2c39556004c9 Author: Patrick McHardy Date: Tue Oct 23 20:26:36 2007 -0700 [VLAN]: MAINTAINERS update Ben stepped down from VLAN maintainership due to a lack of time, add myself as new maintainer. Signed-off-by: Patrick McHardy Acked-by: Ben Greear Signed-off-by: David S. Miller commit 6273172e1772bf5ce8697bcae145f0f2954fd159 Author: Arnaldo Carvalho de Melo Date: Tue Oct 23 20:23:30 2007 -0700 [DCCP]: Implement SIOCINQ/FIONREAD Just like UDP. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Leandro Melo de Sales Signed-off-by: Ian McDonald Signed-off-by: David S. Miller commit bada339ba24dee9e143bfb42e1dc61f146619846 Author: Jeff Garzik Date: Tue Oct 23 20:19:37 2007 -0700 [NET]: Validate device addr prior to interface-up Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller