commit e490517a039a99d692cb3a5561941b0a5f576172 Author: Linus Torvalds Date: Mon May 26 11:07:53 2008 -0700 Linux 2.6.26-rc4 commit cbaffba12ce08beb3e80bfda148ee0fa14aac188 Author: Oleg Nesterov Date: Mon May 26 20:55:42 2008 +0400 posix timers: discard SI_TIMER signals on exec Based on Roland's patch. This approach was suggested by Austin Clements from the very beginning, and then by Linus. As Austin pointed out, the execing task can be killed by SI_TIMER signal because exec flushes the signal handlers, but doesn't discard the pending signals generated by posix timers. Perhaps not a bug, but people find this surprising. See http://bugzilla.kernel.org/show_bug.cgi?id=10460 Signed-off-by: Oleg Nesterov Cc: Austin Clements Cc: Roland McGrath Signed-off-by: Linus Torvalds commit c8e85b4f4b9ee23bf0e79bdeb3da274a0f9c663f Author: Oleg Nesterov Date: Mon May 26 20:55:42 2008 +0400 posix timers: sigqueue_free: don't free sigqueue if it is queued Currently sigqueue_free() removes sigqueue from list, but doesn't cancel the pending signal. This is not consistent, the task should either receive the "full" signal along with siginfo_t, or it shouldn't receive the signal at all. Change sigqueue_free() to clear SIGQUEUE_PREALLOC but leave sigqueue on list if it is queued. This is a user-visible change. If the signal is blocked, it stays queued after sys_timer_delete() until unblocked with the "stale" si_code/si_value, and of course it is still counted wrt RLIMIT_SIGPENDING which also limits the number of posix timers. Signed-off-by: Oleg Nesterov Cc: Austin Clements Cc: Roland McGrath Signed-off-by: Linus Torvalds commit 84a881657d391121cd88c37f0a312dec3528fa44 Merge: 1434b65... 2548baa... Author: Linus Torvalds Date: Mon May 26 10:24:06 2008 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Align i2c_device_id tuner: Do not alter i2c_client.name commit 1434b65731963207a4cc84bd87e6191e34321986 Merge: 4934ed8... 7699441... Author: Linus Torvalds Date: Mon May 26 10:21:26 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: ksize() abuse checks slob: Fix to return wrong pointer commit 4934ed888e6fe78d9d339471fb870819da911e8b Merge: 0dfdf77... 9c28faa... Author: Linus Torvalds Date: Mon May 26 10:20:40 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26: sh: Drop broken URAM support on SH7723. sh: update Migo-R defconfig sh: use sm501 8250 mfd support on r2d boards sh: add probe support for new sh7723 cut sh: fix VPU interrupt vector for sh7723 sh: fix USBF resource for sh7722 commit 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa Merge: c5e6fd2... 551dec4... Author: Linus Torvalds Date: Mon May 26 10:14:37 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: sparc64: global_reg_snapshot is not for userspace commit c5e6fd28e5776200a737e9df337a529d36fa9a54 Merge: b373303... 289c79a... Author: Linus Torvalds Date: Mon May 26 10:14:02 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: (52 commits) vlan: Use bitmask of feature flags instead of seperate feature bits fmvj18x_cs: add NextCom NC5310 rev B support xirc2ps_cs: re-initialize the multicast address in do_reset 3C509: rx_bytes should not be increased when alloc_skb failed NETFRONT: Use __skb_queue_purge() VIRTIO: Use __skb_queue_purge() phylib: do EXPORT_SYMBOL on get_phy_id netlink: Fix nla_parse_nested_compat() to call nla_parse() directly WAN: protect HDLC proto list while insmod/rmmod drivers/net/fs_enet: remove null pointer dereference S2io: Version update for napi and MSI-X patches S2io: Added napi support when MSIX is enabled. S2io: Move all the transmit completions to a single msi-x (alarm) vector drivers/net/ehea - remove unnecessary memset after kzalloc au1000_eth: remove useless check Blackfin EMAC Driver: Removed duplicated include cpmac bugfixes and enhancements e1000e: use resource_size_t, not unsigned long, for phys addrs net/usb: add support for Apple USB Ethernet Adapter uli526x: add support for netpoll ... commit 2548baa07ddf37ea8604e9627f042616d1cdc43e Author: Jiri Slaby Date: Mon May 26 16:08:40 2008 +0200 i2c: Align i2c_device_id Align i2c_device_id.driver_data to 8 bytes to not fail on crossbuilds. (Added in d2653e92732bd3911feff6bee5e23dbf959381db.) Signed-off-by: Jiri Slaby Signed-off-by: Jean Delvare commit 7271e60a950b3677f136a31e084bc4b0463c7018 Author: Michael Krufky Date: Mon May 26 16:08:40 2008 +0200 tuner: Do not alter i2c_client.name The tuner driver used to change i2c_client.name for its own needs, but it really shouldn't, as this field is used by i2c-core to do the device/driver matching. So, create and use a separate field for the tuner driver needs. Signed-off-by: Michael Krufky Signed-off-by: Jean Delvare commit 551dec47bb5964478db594385a896eb0d4ab2b0a Author: Adrian Bunk Date: Sun May 25 22:50:16 2008 -0700 sparc64: global_reg_snapshot is not for userspace global_reg_snapshot shouldn't be visible in our userspace headers. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb Author: Paul Mundt Date: Mon May 26 11:45:45 2008 +0900 sh: Drop broken URAM support on SH7723. This was copied over from the previous MobileR bits, which doesn't apply to R2. The URAM block on R2 is recycled for the L2 instead. Signed-off-by: Paul Mundt commit b3733034f113a4119f734b84e94180a42c8bc1a1 Merge: c8ff99a... 7353190... Author: Linus Torvalds Date: Sun May 25 15:00:27 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST .gitignore: match ncscope.out scripts/ver_linux use 'gcc -dumpversion' commit c8ff99a7c2fb23a0f1165f3821fd66fd65f30264 Merge: 32522bf... a49056d... Author: Linus Torvalds Date: Sun May 25 14:59:59 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers [WATCHDOG] hpwdt: Fix NMI handling. [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver [WATCHDOG] Add w83697h_wdt early_disable option [WATCHDOG] Make w83697h_wdt timeout option string similar to others [WATCHDOG] Make w83697h_wdt void-like functions void commit 32522bfdaed094e447f71cce68c349847ae9c7d5 Merge: eb90d81... 587755f... Author: Linus Torvalds Date: Sun May 25 14:59:27 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: [ALSA] hda - Fix capture mute Widget for stac9250/9251 [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number [ALSA] hda - Added support for Foxconn P35AX-S mainboard [ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode [ALSA] hda - Fix noise on VT1708 codec [ALSA] hda - Add model for ASUS P5K-E/WIFI-AP commit 73531905ed53576d9e8707659a761e7046a60497 Author: Sam Ravnborg Date: Sun May 25 23:03:18 2008 +0200 Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST init/Kconfig contains a list of configs that are searched for if 'make *config' are used with no .config present. Extend this list to look at the config identified by ARCH_DEFCONFIG. With this change we now try the defconfig targets last. This fixes a regression reported by: Linus Torvalds Signed-off-by: Sam Ravnborg Cc: Linus Torvalds Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" commit 9723c046bd5989aa9064038ce142f498bb1870d6 Author: Jike Song Date: Thu May 22 09:23:10 2008 +0800 .gitignore: match ncscope.out Sometimes I got this: $ git-status {snip} # On branch master # Untracked files: # (use "git add ..." to include in what will be committed) # # ncscope.out nothing added to commit but untracked files present (use "git add" to track) Fix it. Signed-off-by: Jike Song Signed-off-by: Sam Ravnborg commit 656a3f797889dafcce2f5b8b222ad66e9974b6f7 Author: Gabriel C Date: Wed May 21 20:36:19 2008 +0200 scripts/ver_linux use 'gcc -dumpversion' These magic greps and hacks in ver_linux to get the gcc version always break after some gcc releases. Since now gcc >4.3 allows compiling with '--with-pkgversion' ( which can be everything 'My Cool Gcc' or something ) ver_linux will report random junk for these. Simply use 'gcc -dumpversion' to get the gcc version which should always work. Signed-off-by: Gabriel C Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 587755f1f6a983a9f0f3322d284034f4e146891a Author: Mauro Carvalho Chehab Date: Sun May 25 18:20:06 2008 +0200 [ALSA] hda - Fix capture mute Widget for stac9250/9251 Fix capture mute widget for STAC9250/9251 codecs. The widget 0x09 has no mute but 0x14 does actually. Signed-off-by: Mauro Carvalho Chehab commit 97e08f5d732bbfd5180f73aa7875d328421bee8a Author: Stas Sergeev Date: Sat May 24 18:05:47 2008 +0200 [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number This solves the problem with mixers wrongly displaying the PWM freq. Signed-off-by: Stas Sergeev Signed-off-by: Takashi Iwai commit a49056da0325742d3b4f5d1ef7bf8ab0690c3888 Author: Gabriel C Date: Wed Apr 30 16:51:10 2008 +0200 [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver Add the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bump the driver version. Tested on an P5E-VM DO ASUS motherboard. Signed-off-by: Gabriel Craciunescu Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit f172ddc61ad7a7c444b2b3e08992a45c76b821f9 Author: Chen Gong Date: Tue Apr 29 16:42:05 2008 +0800 [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's On Book-E SMP systems each core has its own private watchdog. If only one watchdog is enabled, when the core that doesn't enable the watchdog is hung, system can't reset because no watchdog is running on it. That's bad. It means we must enable watchdogs on both cores. We can use smp_call_function() to send appropriate messages to all the other cores to enable and update the watchdog. Signed-off-by: Chen Gong Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 0b36086b5d7c397a128784bed6e332418e500af1 Author: Jordan Crouse Date: Mon Jan 21 10:07:00 2008 -0700 [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers Add a watchdog timer based on the MFGPT timers in the CS5535/CS5536 companion chips to the AMD Geode GX and LX processors. Only caveat is that the BIOS must provide at least a one free timer, and most do not. Signed-off-by: Jordan Crouse Signed-off-by: Wim Van Sebroeck commit 7f7f894c6d3285407b2493d1575500fb25e3d495 Author: Mingarelli, Thomas Date: Tue Mar 25 17:17:30 2008 +0000 [WATCHDOG] hpwdt: Fix NMI handling. I need to just return in case it's not my NMI so someone else can take a look at it (and reset die_nmi_called to 0 in case I actually do get one that's mine to handle). Signed-off-by: Thomas Mingarelli Signed-off-by: Wim Van Sebroeck commit 93539b194696a6291e6895be07d4241c8d972c4b Author: Mike Frysinger Date: Thu Mar 27 11:53:32 2008 -0700 [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver - split platform device/driver registering from actual watchdog device/driver registering so that we can cleanly load/unload - fixup __initdata with __initconst and __devinitdata with __devinitconst Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Wim Van Sebroeck commit 6fd656012bb8d5c5a4570adc2e630668b0109cb0 Author: Samuel Tardieu Date: Wed Mar 12 14:28:03 2008 +0100 [WATCHDOG] Add w83697h_wdt early_disable option Pádraig Brady requested the possibility of not disabling the watchdog at module load time or kernel boot time if it had been previously enabled in the bios. It may help rebooting the machine if it freezes before the userland daemon kicks in. Signed-off-by: Samuel Tardieu Cc: Pádraig Brady Signed-off-by: Wim Van Sebroeck commit 5794a9f412676ee7ec87828a926d0f58f0a2ffbf Author: Samuel Tardieu Date: Wed Mar 12 14:28:02 2008 +0100 [WATCHDOG] Make w83697h_wdt timeout option string similar to others Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit 03315adca76ee93128e4d92566d1f18a1a937e79 Author: Samuel Tardieu Date: Wed Mar 12 14:28:01 2008 +0100 [WATCHDOG] Make w83697h_wdt void-like functions void Some non-exported functions always returned 0. Mark them void instead. Signed-off-by: Samuel Tardieu Signed-off-by: Wim Van Sebroeck commit eb90d81d03c0917b0fd629f6342554a3b58ea52c Merge: d3c5f8b... b1979a5... Author: Linus Torvalds Date: Sat May 24 10:20:00 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: x86: prevent PGE flush from interruption/preemption x86: use explicit copy in vdso_gettimeofday() namespacecheck: automated fixes x86/xen: fix arbitrary_virt_to_machine() x86: don't read maxlvt before checking if APIC is mapped x86: disable TSC for sched_clock() when calibration failed x86: distangle user disabled TSC from unstable x86: fix setup of cyc2ns in tsc_64.c commit d3c5f8b93febadf62da9a4b39a2dca8e66a4da40 Merge: 25d5cb4... 7c28472... Author: Linus Torvalds Date: Sat May 24 10:13:16 2008 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] integrator: fix build warnings and errors [ARM] fix OMAP include loops Revert "[ARM] pxa: spitz wants PXA27x UDC definitions" [ARM] 5053/1: define before use of processor_id [ARM] 5052/1: export clock functions for the at91x40 [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too [ARM] omap: fix omap clk support build errors [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X. [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c [ARM] 5025/2: fix collie cpu initialisation commit 25d5cb4b0375e5864ec0ccf35e12ff1d1b5cf3f0 Author: David Brownell Date: Fri May 23 13:05:03 2008 -0700 spi: remove some spidev oops-on-rmmod paths Somehow the spidev code forgot to include a critical mechanism: when the underlying device is removed (e.g. spi_master rmmod), open file descriptors must be prevented from issuing new I/O requests to that device. On penalty of the oopsing reported by Sebastian Siewior ... This is a partial fix, adding handshaking between the lower level (SPI messaging) and the file operations using the spi_dev. (It also fixes an issue where reads and writes didn't return the number of bytes sent or received.) There's still a refcounting issue to be addressed (separately). Signed-off-by: David Brownell Reported-by: Sebastian Siewior Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c02b575780d0d785815a1e7b79a98edddee895a Author: Cedric Le Goater Date: Fri May 23 13:05:02 2008 -0700 cgroups: remove node_ prefix_from ns subsystem This is a slight change in the namespace cgroup subsystem api. The change is that previously when cgroup_clone() was called (currently only from the unshare path in ns_proxy cgroup, you'd get a new group named "node_$pid" whereas now you'll get a group named after just your pid.) The only users who would notice it are those who are using the ns_proxy cgroup subsystem to auto-create cgroups when namespaces are unshared - something of an experimental feature, which I think really needs more complete container/namespace support in order to be useful. I suspect the only users are Cedric and Serge, or maybe a few others on containers@lists.linux-foundation.org. And in fact it would only be noticed by the users who make the assumption about how the name is generated, rather than getting it from the /proc//cgroups file for the process in question. Whether the change is actually needed or not I'm fairly agnostic on, but I guess it is more elegant to just use the pid as the new group name rather than adding a fairly arbitrary "node_" prefix on the front. [menage@google.com: provided changelog] Signed-off-by: Cedric Le Goater Cc: "Paul Menage" Cc: "Serge E. Hallyn" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12d15f0d51d47cec39d1d7250e81573c5cbd8b5d Author: Fernando Luis Vazquez Cao Date: Fri May 23 13:05:01 2008 -0700 for_each_online_pgdat(): kerneldoc fix for_each_pgdat() was renamed to for_each_online_pgdat() and kerneldoc comments should be updated accordingly. Signed-off-by: Fernando Luis Vazquez Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb56f0f9922d3fb2c5503cdc346dc3f86c897bc4 Author: Adrian Bunk Date: Fri May 23 13:05:00 2008 -0700 frv: export empty_zero_page Fix the following build error: ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined! Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b26655f6208fdefa9ab0adc016116324f8d4ba8 Author: Shi Weihua Date: Fri May 23 13:04:59 2008 -0700 sys_prctl(): fix return of uninitialized value If none of the switch cases match, the PR_SET_PDEATHSIG and PR_SET_DUMPABLE cases of the switch statement will never write to local variable `error'. Signed-off-by: Shi Weihua Cc: Andrew G. Morgan Acked-by: "Serge E. Hallyn" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f99c90094bffbe1cf38ef66f198a808c14a02d56 Author: Kumar Gala Date: Fri May 23 13:04:58 2008 -0700 edac: mpc85xx: fix building as a module including of causes build problems since it doesn't exist. Also removed warning: drivers/edac/mpc85xx_edac.c:45: warning: 'mpc85xx_ctl_name' defined but not used Signed-off-by: Kumar Gala Acked-by: Doug Thompson Acked-by: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ea0205b56546cef782b74d9f4664ec00290a6ae Author: David Brownell Date: Fri May 23 13:04:58 2008 -0700 gpio: build fixes This fixes various gpio-related build errors (mostly potential) reported in part by Russell King and Uwe Kleine-König. Signed-off-by: David Brownell Cc: Uwe Kleine-König Cc: Russell King Cc: Arnaud Patard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee29420aca6ca6fbb3e72ee8a980b2600911b864 Author: Ben Dooks Date: Fri May 23 13:04:57 2008 -0700 S3C2410: fix driver MODULE_ALIAS() Add a correct MODULE_ALIAS() entry for this driver to enable udev module loading. Signed-off-by: Ben Dooks Cc: Arnaud Patard Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a0e4ec7bcc6e80d2a32a4c0b83a32c904aadc05 Author: Ben Dooks Date: Fri May 23 13:04:56 2008 -0700 S3C2410: clean out changelog header and tidy Remove the old changelog entries which are now out of date and should be extractable from git anyway. Also tidy up the copyright for the driver. Signed-off-by: Ben Dooks Cc: Arnaud Patard Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d585dfe840c93ea800afc124333b6ac04722d359 Author: Ben Dooks Date: Fri May 23 13:04:56 2008 -0700 S3C2410: add error print if we cannot add attribute Fix the following warning by checking the result of device_create_file and printing an error but not removing the device (loss of debug registers is not fatal). drivers/video/s3c2410fb.c:905: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result Signed-off-by: Ben Dooks Cc: Arnaud Patard Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 673b4600e3b3cc6689025e6a6fc6909b6e53dd5e Author: Ben Dooks Date: Fri May 23 13:04:55 2008 -0700 S3C2410: ensure that FB_BLANK_POWERDOWN shuts down the controller When a blank level of FB_BLANK_POWERDOWN is used, we should shut down the controller so that it no longer tries to produce any panel signals or data, and shuts down the DMA which is not needed. Signed-off-by: Ben Dooks Cc: Arnaud Patard Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdc83ae2453ddb19060e05e6afd22b1254128c42 Author: Ben Dooks Date: Fri May 23 13:04:53 2008 -0700 SM501: reverse FPEN/VBIASEN flags behaviour To keep backwards compatibility, reverse the meanings of these flags so that when they are not set, the driver uses the original behvaiour. Signed-off-by: Ben Dooks Cc: Arnaud Patard Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd94b9dbfa300fc42e45f230010623fc08d59563 Author: Heiko Carstens Date: Fri May 23 13:04:52 2008 -0700 memory hotplug: fix early allocation handling Trying to add memory via add_memory() from within an initcall function results in bootmem alloc of 163840 bytes failed! Kernel panic - not syncing: Out of memory This is caused by zone_wait_table_init() which uses system_state to decide if it should use the bootmem allocator or not. When initcalls are handled the system_state is still SYSTEM_BOOTING but the bootmem allocator doesn't work anymore. So the allocation will fail. To fix this use slab_is_available() instead as indicator like we do it everywhere else. [akpm@linux-foundation.org: coding-style fix] Reviewed-by: Andy Whitcroft Cc: Dave Hansen Cc: Gerald Schaefer Cc: KAMEZAWA Hiroyuki Acked-by: Yasunori Goto Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7eb54824b76793dd86afb54f182ef9aa64b3a45a Author: Andy Whitcroft Date: Fri May 23 13:04:50 2008 -0700 zonelists: handle a node zonelist with no applicable entries When booting 2.6.26-rc3 on a multi-node x86_32 numa system we are seeing panics when trying node local allocations: BUG: unable to handle kernel NULL pointer dereference at 0000034c IP: [] get_page_from_freelist+0x4a/0x18e *pdpt = 00000000013a7001 *pde = 0000000000000000 Oops: 0000 [#1] SMP Modules linked in: Pid: 0, comm: swapper Not tainted (2.6.26-rc3-00003-g5abc28d #82) EIP: 0060:[] EFLAGS: 00010282 CPU: 0 EIP is at get_page_from_freelist+0x4a/0x18e EAX: c1371ed8 EBX: 00000000 ECX: 00000000 EDX: 00000000 ESI: f7801180 EDI: 00000000 EBP: 00000000 ESP: c1371ec0 DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process swapper (pid: 0, ti=c1370000 task=c12f5b40 task.ti=c1370000) Stack: 00000000 00000000 00000000 00000000 000612d0 000412d0 00000000 000412d0 f7801180 f7c0101c f7c01018 c10426e4 f7c01018 00000001 00000044 00000000 00000001 c12f5b40 00000001 00000010 00000000 000412d0 00000286 000412d0 Call Trace: [] __alloc_pages_internal+0x99/0x378 [] __alloc_pages+0x7/0x9 [] kmem_getpages+0x66/0xef [] cache_grow+0x8f/0x123 [] ____cache_alloc_node+0xb9/0xe4 [] kmem_cache_alloc_node+0x92/0xd2 [] setup_cpu_cache+0xaf/0x177 [] kmem_cache_create+0x2c8/0x353 [] kmem_cache_init+0x1ce/0x3ad [] start_kernel+0x178/0x1ee This occurs when we are scanning the zonelists looking for a ZONE_NORMAL page. In this system there is only ZONE_DMA and ZONE_NORMAL memory on node 0, all other nodes are mapped above 4GB physical. Here is a dump of the zonelists from this system: zonelists pgdat=c1400000 0: c14006c0:2 f7c006c0:2 f7e006c0:2 c1400360:1 c1400000:0 1: c14006c0:2 c1400360:1 c1400000:0 zonelists pgdat=f7c00000 0: f7c006c0:2 f7e006c0:2 c14006c0:2 c1400360:1 c1400000:0 1: f7c006c0:2 zonelists pgdat=f7e00000 0: f7e006c0:2 c14006c0:2 f7c006c0:2 c1400360:1 c1400000:0 1: f7e006c0:2 When performing a node local allocation we call get_page_from_freelist() looking for a page. It in turn calls first_zones_zonelist() which returns a preferred_zone. Where there are no applicable zones this will be NULL. However we use this unconditionally, leading to this panic. Where there are no applicable zones there is no possibility of a successful allocation, so simply fail the allocation. Signed-off-by: Andy Whitcroft Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03a74dcc7eebe6edd778317e82fafdf71e68488c Author: Arjan van de Ven Date: Fri May 23 13:04:49 2008 -0700 serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c enable_irq_wake() and disable_irq_wake() need to be balanced. However, serial_core.c calls these for different conditions during the suspend and resume functions... This is causing a regular WARN_ON() as found at http://www.kerneloops.org/search.php?search=set_irq_wake This patch makes the conditions for triggering the _wake enable/disable sequence identical. Signed-off-by: Arjan van de Ven Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4185a0e019387f5ad6e99009804965531fa1fab Author: Denis V. Lunev Date: Fri May 23 13:04:47 2008 -0700 proc: proc_get_inode() should get module only once Any file under /proc/net opened more than once leaked the refcounter on the module it belongs to. The problem is that module_get is called for each file opening while module_put is called only when /proc inode is destroyed. So, lets put module counter if we are dealing with already initialised inode. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10737 Signed-off-by: Denis V. Lunev Cc: David Miller Cc: Patrick McHardy Acked-by: Pavel Emelyanov Acked-by: Robert Olsson Acked-by: Eric W. Biederman Reported-by: Roland Kletzing Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53978d0a7a27eb036b9bf33c4caa06257a9dbed7 Author: Marcin Krol Date: Fri May 23 13:04:46 2008 -0700 brd: don't show ramdisks in /proc/partitions In 2.6.25, ramdisk devices show up in /proc/partitions, which is a behaviour change from the old rd.c. Add GENHD_FL_SUPPRESS_PARTITION_INFO, which was present in rd.c. All kernels prior to 2.6.25 weren't displaying ramdisks in /proc/partitions. Since there are many userspace tools using information from /proc/partitions some of them may now behave incorrectly (I didn't tested any though). For example before 2.6.25 /proc/partitions was empty if no block devices like hard disks and such were detected by kernel. Now all 16 ramdisks are always visible there. Some software may rely on such information (I mean, on empty /proc/partitions). There was quite similar situation back in 2004, and ramdisks were excluded back from displaying. Thats why I called this a regression (maybe a bit unfortunate). See this patch for info: http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3-rc2/2.6.3-rc2-mm1/broken-out/nbd-proc-partitions-fix.patch I also think that someone somewhere (long time ago) excluded ramdisks from /proc/partitions for good reasons. It is possible that now such new "feature" is harmless, but I think there are more chances that someone will say "hey, /proc/partitions has changed, now my software doesn't work" then "hey where did my new 2.6.25 feature go". nbd devices are also excluded, maybe for very same (unknown to me) reasons. Signed-off-by: Marcin Krol Signed-off-by: Nick Piggin Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6089093e588ee3f6aed99d08b1cf5ea37c52cf97 Author: Alan Cox Date: Fri May 23 13:04:45 2008 -0700 ip2: fix crashes on load/unload This doesn't need to be two modules, and making it one cleans up the problem Signed-off-by: Alan Cox Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bff5fda972dc23bd1806a47c2098ae173585d013 Author: Trent Piepho Date: Fri May 23 13:04:44 2008 -0700 gpiolib: fix off by one errors The last gpio belonging to a chip is chip->base + chip->ngpios - 1. Some places in the code, but not all, forgot the critical minus one. Signed-off-by: Trent Piepho Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d1c1d9b557a12320174058d2d313ffb0f8611f4 Author: Roel Kluin <12o3l@tiscali.nl> Date: Fri May 23 13:04:43 2008 -0700 gpio: mcp23s08 debug fix The return value of mcp23s08_read_regs() can only be evaluated when signed Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69292b342193d4068f6435660368ff98713d8164 Author: David Brownell Date: Fri May 23 13:04:42 2008 -0700 gpio: pca953x driver handles pca9554 too Teach drivers/gpio/pca953x.c about PCA9554, another compatible chip. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da7978b0348d497688541e2d2f5739aa2a2c334f Author: Oleg Nesterov Date: Fri May 23 13:04:41 2008 -0700 signals: fix sigqueue_free() vs __exit_signal() race __exit_signal() does flush_sigqueue(tsk->pending) outside of ->siglock. This can race with another thread doing sigqueue_free(), we can free the same SIGQUEUE_PREALLOC sigqueue twice or corrupt the pending->list. Note that even sys_exit_group() can trigger this race, not only sys_timer_delete(). Move the callsite of flush_sigqueue(tsk->pending) under ->siglock. This patch doesn't touch flush_sigqueue(->shared_pending) below, it is called when there are no other threads which can play with signals, and sigqueue_free() can't be used outside of our thread group. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc7064500061677720fa26352963c772d3ebe6b Author: NeilBrown Date: Fri May 23 13:04:39 2008 -0700 md: restart recovery cleanly after device failure. When we get any IO error during a recovery (rebuilding a spare), we abort the recovery and restart it. For RAID6 (and multi-drive RAID1) it may not be best to restart at the beginning: when multiple failures can be tolerated, the recovery may be able to continue and re-doing all that has already been done doesn't make sense. We already have the infrastructure to record where a recovery is up to and restart from there, but it is not being used properly. This is because: - We sometimes abort with MD_RECOVERY_ERR rather than just MD_RECOVERY_INTR, which causes the recovery not be be checkpointed. - We remove spares and then re-added them which loses important state information. The distinction between MD_RECOVERY_ERR and MD_RECOVERY_INTR really isn't needed. If there is an error, the relevant drive will be marked as Faulty, and that is enough to ensure correct handling of the error. So we first remove MD_RECOVERY_ERR, changing some of the uses of it to MD_RECOVERY_INTR. Then we cause the attempt to remove a non-faulty device from an array to fail (unless recovery is impossible as the array is too degraded). Then when remove_and_add_spares attempts to remove the devices on which recovery can continue, it will fail, they will remain in place, and recovery will continue on them as desired. Issue: If we are halfway through rebuilding a spare and another drive fails, and a new spare is immediately available, do we want to: 1/ complete the current rebuild, then go back and rebuild the new spare or 2/ restart the rebuild from the start and rebuild both devices in parallel. Both options can be argued for. The code currently takes option 2 as a/ this requires least code change b/ this results in a minimally-degraded array in minimal time. Cc: "Eivind Sarto" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90b08710e41a07d4ff0fb8940dcce3a552991a56 Author: Bernd Schubert Date: Fri May 23 13:04:38 2008 -0700 md: allow parallel resync of md-devices. In some configurations, a raid6 resync can be limited by CPU speed (Calculating P and Q and moving data) rather than by device speed. In these cases there is nothing to be gained byt serialising resync of arrays that share a device, and doing the resync in parallel can provide benefit. So add a sysfs tunable to flag an array as being allowed to resync in parallel with other arrays that use (a different part of) the same device. Signed-off-by: Bernd Schubert Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f54b0e9485644a3c5fca2ae43bcbe7376825747 Author: Dan Williams Date: Fri May 23 13:04:37 2008 -0700 md: notify userspace on 'stop' events This additional notification to 'array_state' is needed to allow the monitor application to learn about stop events via sysfs. The sysfs_notify("sync_action") call that comes at the end of do_md_stop() (via md_new_event) is insufficient since the 'sync_action' attribute has been removed by this point. (Seems like a sysfs-notify-on-removal patch is a better fix. Currently removal updates the event count but does not wake up waiters) Signed-off-by: Dan Williams Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09a44cc15079f80c1416cde1a1d5b2cdd8f2118a Author: NeilBrown Date: Fri May 23 13:04:36 2008 -0700 md: notify userspace on 'write-pending' changes to array_state When an array enters write pending, 'array_state' changes, so we must be sure to sysfs_notify. Also, when waiting for user-space to acknowledge 'write-pending' by marking the metadata as dirty, we don't want to wait for MD_CHANGE_DEVS to be cleared as that might not happen. So explicity test for the bits that we are really interested in. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698b18c1e8bddf39cbf1ba50792b0fe302dbe6d6 Author: NeilBrown Date: Fri May 23 13:04:35 2008 -0700 md: raid1: Fix restoration of bio between failed read and write. When performing a "recovery" or "check" pass on a RAID1 array, we read from each device and possible, if there is a difference or a read error, write back to some devices. We use the same 'bio' for both read and write, resetting various fields between the two operations. We forgot to reset bv_offset and bv_len however. These are often left unchanged, but in the case where there is an IO error one or two sectors into a page, they are changed. This results in correctable errors not being corrected properly. It does not result in any data corruption. Cc: "Fairbanks, David" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6be9d4940134b36f9ed020aead36f831f19b49f1 Author: Bernd Schubert Date: Fri May 23 13:04:34 2008 -0700 md: md: raid5 rate limit error printk Last night we had scsi problems and a hardware raid unit was offlined during heavy i/o. While this happened we got for about 3 minutes a huge number messages like these Apr 12 03:36:07 pfs1n14 kernel: [197510.696595] raid5:md7: read error not correctable (sector 2993096568 on sdj2). I guess the high error rate is responsible for not scheduling other events - during this time the system was not pingable and in the end also other devices run into scsi command timeouts causing problems on these unrelated devices as well. Signed-off-by: Bernd Schubert Signed-off-by: Dan Williams Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bcfd601861cce45ca73ac1d714f1286b6b3f0d4 Author: Christoph Hellwig Date: Fri May 23 13:04:34 2008 -0700 md: kill file_path wrapper Kill the trivial and rather pointless file_path wrapper around d_path. Signed-off-by: Christoph Hellwig Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03de250a269bfa8e6a9e6ccb4a1dbce19dae8a61 Author: Adrian Bunk Date: Fri May 23 13:04:33 2008 -0700 md: proper extern for mdp_major This patch adds a proper extern for mdp_major in include/linux/raid/md.h Signed-off-by: Adrian Bunk Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84255d1018c50e72c71a49f359989597d53a3f53 Author: NeilBrown Date: Fri May 23 13:04:32 2008 -0700 md: fix possible oops when removing a bitmap from an active array It is possible to add a write-intent bitmap to an active array, or remove the bitmap that is there. When we do with the 'quiesce' the array, which causes make_request to block in "wait_barrier()". However we are sampling the value of "mddev->bitmap" before the wait_barrier call, and using it afterwards. This can result in using a bitmap structure that has been freed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80119ef5c8153e0a6cc5edf00c083dc98a9bd348 Author: Alan Cox Date: Fri May 23 13:04:31 2008 -0700 mm: fix atomic_t overflow in vm The atomic_t type is 32bit but a 64bit system can have more than 2^32 pages of virtual address space available. Without this we overflow on ludicrously large mappings Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 Author: maximilian attems Date: Fri May 23 13:04:29 2008 -0700 types.h: don't expose struct ustat to userspace can't be used together with because they both define struct ustat: $ cat test.c #include #include $ gcc -c test.c In file included from test.c:2: /usr/include/linux/types.h:165: error: redefinition of 'struct ustat' has been reported a while ago to debian, but seems to have been lost in cat fighting: http://bugs.debian.org/429064 Signed-off-by: maximilian attems Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2 Author: Ignacio García Pérez Date: Fri May 23 13:04:28 2008 -0700 serial: support for InstaShield IS-400 four port RS-232 PCI card Add support for the InstaShield IS-400 four port RS-232 PCI card. Signed-off-by: Ignacio García Pérez Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25829b0e977a7e396b284dad0f523099394390e7 Author: Mariusz Kozlowski Date: Fri May 23 13:04:28 2008 -0700 fix parenthesis in include/asm-mips/mach-au1x00/au1000.h Parenthesis fix in include/asm-mips/mach-au1x00/au1000.h Signed-off-by: Mariusz Kozlowski Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d5437a15884bfb3429aee99f76fc014c7de039a Author: Mariusz Kozlowski Date: Fri May 23 13:04:26 2008 -0700 fix parenthesis in include/asm-mips/gic.h Parenthesis fix in include/asm-mips/gic.h Signed-off-by: Mariusz Kozlowski Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8808a793f052c0a67426a24b961402fa20e92814 Author: Darrick J. Wong Date: Fri May 23 13:04:25 2008 -0700 ibmaem: new driver for power/energy/temp meters in IBM System X hardware This driver reads IBM Active Energy Manager energy/temperature/power sensors on IBM System X hardware. [akpm@linux-foundation.org: fix printk warnings] Signed-off-by: Darrick J. Wong Cc: "Mark M. Hoffman" Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8fdaf5a05adbf80e5a943bb3f65b46b5fb9b488 Author: Darrick J. Wong Date: Fri May 23 13:04:25 2008 -0700 i5k_amb: support Intel 5400 chipset Minor rework to support the Intel 5400 chipset. Signed-off-by: Darrick J. Wong Cc: "Mark M. Hoffman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca68d0ac16539a062ae26ca50da8b186fa3a0814 Author: Gabor Czigola Date: Fri May 23 13:04:23 2008 -0700 hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads Cc: "Mark M. Hoffman" Cc: Dmitry Torokhov Cc: Jiri Kosina Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80bfc25f42db6d4715c7688ae2352c5a8038fe7e Author: Marcin Slusarz Date: Fri May 23 13:04:22 2008 -0700 ntfs: le*_add_cpu conversion replace all: little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) + expression_in_cpu_byteorder); with: leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder); generated with semantic patch Signed-off-by: Marcin Slusarz Acked-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7232154198f928fc25f420d6190468212a7632a Author: Johannes Weiner Date: Fri May 23 13:04:21 2008 -0700 mm: don't drop a partial page in a zone's memory map size In a zone's present pages number, account for all pages occupied by the memory map, including a partial. Signed-off-by: Johannes Weiner Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f899b0adc6fc8f60a9db8b52f36f06fd1abeaf7c Author: Karel Zak Date: Fri May 23 13:04:21 2008 -0700 MAINTAINERS: add util-linux-ng package (akpm: we often deal with util-linux and I (at least) can never remember where they hang out). Signed-off-by: Karel Zak Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71fd5179e8d1d4d503b517e0c5374f7c49540bfc Author: Cyrill Gorcunov Date: Fri May 23 13:04:20 2008 -0700 ecryptfs: fix missed mutex_unlock Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03fb0bce01490c9bdedad861962c76f987531014 Author: Miklos Szeredi Date: Fri May 23 13:04:19 2008 -0700 fuse: fix bdi naming conflict Fuse allocates a separate bdi for each filesystem, and registers them in sysfs with "MAJOR:MINOR" of sb->s_dev (st_dev). This works fine for anon devices normally used by fuse, but can conflict with an already registered BDI for "fuseblk" filesystems, where sb->s_dev represents a real block device. In particularl this happens if a non-partitioned device is being mounted. Fix by registering with a different name for "fuseblk" filesystems. Thanks to Ioan Ionita for the bug report. Signed-off-by: Miklos Szeredi Reported-by: Ioan Ionita Tested-by: Ioan Ionita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42172d751b4596b8ca4346a1c251b5f1c661ab0c Author: Nick Piggin Date: Fri May 23 13:04:18 2008 -0700 mm: allow pfnmap ->fault()s Take out an assertion to allow ->fault handlers to service PFNMAP regions. This is required to reimplement .nopfn handlers with .fault handlers and subsequently remove nopfn. Signed-off-by: Nick Piggin Acked-by: Jes Sorensen Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97ec710cab76f90a6bece76a04e76aa50096a470 Author: Travis Place Date: Fri May 23 18:31:46 2008 +0200 [ALSA] hda - Added support for Foxconn P35AX-S mainboard Added IDs for the Foxconn P35AX-S mainboard to patch_realtek.c, so that ALC883_6ST_DIG is used by default. Signed-off-by: Travis Place Signed-off-by: Takashi Iwai commit 20a3a05dd66ad0f678a587688cc85f0b36869876 Author: Takashi Iwai Date: Fri May 23 17:52:53 2008 +0200 [ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode Fix the missing COEF and EAPD initialization in ALC889 auto-configuration mode. Signed-off-by: Takashi Iwai commit bc9b56238eedda865070dcaed6694d65b517c8d6 Author: Takashi Iwai Date: Fri May 23 17:50:27 2008 +0200 [ALSA] hda - Fix noise on VT1708 codec We get quite noisy output on the right channel on VT1708 codec when 24bit samples are used. Suppress the 24bit support until any real fix is found. https://bugzilla.novell.com/show_bug.cgi?id=390473 Signed-off-by: Takashi Iwai commit b9e16bc548600124da9d24186364ee8d06040569 Author: Travis Place Date: Wed May 21 16:57:20 2008 +0200 [ALSA] hda - Add model for ASUS P5K-E/WIFI-AP Added a config table entry for the ASUS P5K-E/WIFI-AP mainboard (ID 1043:8227) to use AD1988_6STACK_DIG Signed-off-by: Travis Place Signed-off-by: Takashi Iwai commit 7c28472a5d4ecf7c61b3c3901994be878cd6c5d2 Author: Russell King Date: Fri May 23 19:35:52 2008 +0100 [ARM] integrator: fix build warnings and errors Fix resource_size_t warning in impd1.c, and printascii() build errors in pci_v3.c Signed-off-by: Russell King commit c2448278e3be3a43fe0343e138444742af1e99ae Merge: e6b027a... 5a4f2b6... Author: Linus Torvalds Date: Fri May 23 11:11:44 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish() MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries IB/mlx4: Fix creation of kernel QP with max number of send s/g entries IB/mthca: Fix max_sge value returned by query_device RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send() IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send() IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate IB/ipath: Fix printk format for ipath_sdma_status commit 5a4f2b675210718aceb4abf41617a3af31bba718 Author: Dave Olson Date: Fri May 23 10:52:59 2008 -0700 IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED If a low-level driver returns IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED, handle_outgoing_dr_smp() doesn't clean up properly. The fix is to kfree the local data and break, rather than falling through. This was observed with the ipath driver, but could happen with any driver. This fixes . Signed-off-by: Dave Olson Signed-off-by: Roland Dreier commit e6b027a398bcfbb8897353a88a2edfcc97fd604d Merge: 57f7bd5... 4f74369... Author: Linus Torvalds Date: Fri May 23 09:24:52 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] clarify license of freq_table.c [CPUFREQ] Remove documentation of removed ondemand tunable. [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq [CPUFREQ] powernow-k8: improve error messages commit b1979a5fda7869a790f4fd83fb06c78498d26ba1 Author: Ingo Molnar Date: Mon May 12 21:21:15 2008 +0200 x86: prevent PGE flush from interruption/preemption CR4 manipulation is not protected against interrupts and preemption, but KVM uses smp_function_call to manipulate the X86_CR4_VMXE bit either from the CPU hotplug code or from the kvm_init call. We need to protect the CR4 manipulation from both interrupts and preemption. Original bug report: http://lkml.org/lkml/2008/5/7/48 Bugzilla entry: http://bugzilla.kernel.org/show_bug.cgi?id=10642 This is not a regression from 2.6.25, it's a long standing and hard to trigger bug. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 57f7bd5b455298dbe94227aa1fedbbfe63bbf252 Author: Jesse Barnes Date: Fri May 23 08:40:45 2008 -0700 remove debug printk from DRM suspend path Not sure how this snuck upstream, but it really doesn't belong there. We don't need a KERN_ERR printk in the suspend path to know what's going on (at least not anymore). Signed-off-by: Jesse Barnes Signed-off-by: Linus Torvalds commit cbff290491cd97bcd449b14f672d98992ddad5cb Merge: 6483d15... 8962cad... Author: Linus Torvalds Date: Fri May 23 08:15:12 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] iSeries: Remove unused mail address [POWERPC] mpic: Fix use of uninitialized variable [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS [POWERPC] PS3: Fix memory hotplug commit 6483d152acffb83442b90dad1517fde8a7b1e12d Merge: cb61896... 6ab455e... Author: Linus Torvalds Date: Fri May 23 08:13:39 2008 -0700 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Fix memory corruption with small buffer reads [XFS] Fix inode list allocation size in writeback. [XFS] Don't allow memory reclaim to wait on the filesystem in inode [XFS] Fix fsync() b0rkage. [XFS] Include linux/random.h in all builds, not just debug builds. commit cb618965bc2073267b7f9345066f502515fcfdf5 Merge: 5e2daeb... 3401a61... Author: Linus Torvalds Date: Fri May 23 08:13:19 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: stop_machine: make stop_machine_run more virtualization friendly doc: add a chapter about trylock functions [Bug 9011] modules: proper cleanup of kobject without CONFIG_SYSFS module loading ELF handling: use SELFMAG instead of numeric constant commit 5e2daeb3c982ea19ecad0c2e720a4052034be14b Author: Harvey Harrison Date: Thu May 22 15:45:08 2008 -0700 fbdev: fix integer as NULL pointer warning drivers/video/aty/atyfb_base.c:3359:26: warning: Using plain integer as NULL pointer drivers/video/aty/radeon_base.c:2280:32: warning: Using plain integer as NULL pointer drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer drivers/video/sis/sis_main.c:5790:44: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit 9bcf091083065c751a4d90317b766370d2497ae9 Author: Harvey Harrison Date: Thu May 22 15:45:07 2008 -0700 scsi: fix integer as NULL pointer warning drivers/scsi/aha152x.c:3585:60: warning: Using plain integer as NULL pointer drivers/scsi/aha152x.c:3845:56: warning: Using plain integer as NULL pointer drivers/scsi/qla1280.c:2814:37: warning: Using plain integer as NULL pointer drivers/scsi/atp870u.c:750:47: warning: Using plain integer as NULL pointer drivers/scsi/3w-9xxx.c:1281:36: warning: Using plain integer as NULL pointer drivers/scsi/3w-9xxx.c:1293:36: warning: Using plain integer as NULL pointer drivers/scsi/3w-9xxx.c:1301:35: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:447:10: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:457:10: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:479:24: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:483:22: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:1213:23: warning: Using plain integer as NULL pointer drivers/scsi/hptiop.c:1214:23: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit 94b5e0ac694baba20efbe7d8ce6ff9cbe1776162 Author: Harvey Harrison Date: Thu May 22 15:45:07 2008 -0700 isdn: fix integer as NULL pointer warning drivers/isdn/hysdn/hycapi.c:465:42: warning: Using plain integer as NULL pointer drivers/isdn/hysdn/hycapi.c:467:44: warning: Using plain integer as NULL pointer drivers/isdn/hysdn/hycapi.c:469:42: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit b62151de496d26a705942b945fab9cecdb3fb8da Author: Harvey Harrison Date: Thu May 22 15:45:06 2008 -0700 acpi: fix integer as NULL pointer warning drivers/acpi/dispatcher/dsmethod.c:568:50: warning: Using plain integer as NULL pointer drivers/acpi/executer/exmutex.c:329:30: warning: Using plain integer as NULL pointer drivers/acpi/executer/exmutex.c:466:31: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit 7fafd91d85181e946207bed18c44addc47e36c63 Author: Harvey Harrison Date: Thu May 22 15:45:06 2008 -0700 x86: fix integer as NULL pointer warning arch/x86/boot/printf.c:59:10: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds commit cfb41bf756cac168c829e27def36072dbfbe6fd0 Author: Russell King Date: Fri May 23 15:38:07 2008 +0100 [ARM] fix OMAP include loops OMAP has two include loops in its header files: asm-arm/hardware.h <- asm-arm/arch-omap/io.h <- asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h asm-arm/arch-omap/board-palmte.h <- asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h <- asm-arm/arch-omap/gpio.h <- asm-arm/arch-omap/board-palmte.h Circular include dependencies are dangerous since they can result in inconsistent definitions being provided to other code, especially if '#ifndef' constructs are used. Solve these by removing the offending includes, and add additional includes where necessary. Acked-by: Tony Lindgren Signed-off-by: Russell King commit 2a740d7a64807acaceb7e44ccf50df35107a34ab Author: Russell King Date: Fri May 23 13:53:31 2008 +0100 Revert "[ARM] pxa: spitz wants PXA27x UDC definitions" This reverts commit 53491e042e79578765e2d33512a45d50eb0d8801, which hit the kernel tree too early. Signed-off-by: Russell King commit 415ad1e50abcc86c235a42fbab57f2b6134412d7 Author: Greg Ungerer Date: Fri May 23 08:31:39 2008 +0100 [ARM] 5053/1: define before use of processor_id For the simple read_cpuid() macro case the variable processor_id has no definition on use of the macro. Add an extern for it. Move all the processor ID macros into the #ifndef __ASSEMBLEY__ block. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 66aaeff1c27545909e502546120be2c5432394e3 Author: Greg Ungerer Date: Fri May 23 08:26:24 2008 +0100 [ARM] 5052/1: export clock functions for the at91x40 Export the AT91 clock functions for the AT91X40. Some external code common to all AT91 family parts relys on this, like the gpio and serial support. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit 50346e621252617a07eb800dfa3f876ccd52d534 Author: Greg Ungerer Date: Fri May 23 07:16:52 2008 +0100 [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too The non-MMU case also needs the type definition of pgtable_t. So move it out of a CONFIG_MMU conditional section. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit a1289643adb6272c04db9399653ae195072c482a Author: Andi Kleen Date: Wed May 14 16:10:42 2008 -0700 x86: use explicit copy in vdso_gettimeofday() Jeremy's gcc 3.4 seems to be unable to inline a 8 byte memcpy. But the vdso doesn't support external references. Copy the structure members of struct timezone explicitely instead. Signed-off-by: Andi Kleen Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 2ddfd20e7c55421435cbf95a5ed3dd6e423cf934 Author: Ingo Molnar Date: Thu May 22 10:37:48 2008 +0200 namespacecheck: automated fixes Signed-off-by: Ingo Molnar commit de067814d6b69030d0030e1c5b3dbaf0385aae41 Author: Jan Beulich Date: Thu May 15 13:24:52 2008 +0100 x86/xen: fix arbitrary_virt_to_machine() While I realize that the function isn't currently being used, I still think an obvious mistake like this should be corrected. Signed-off-by: Jan Beulich Acked-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 2584a82deed7196f48066f1b1a7fad4ec5bea961 Author: Chuck Ebbert Date: Tue May 20 18:18:12 2008 -0400 x86: don't read maxlvt before checking if APIC is mapped A check for unmapped apic was added before reading maxlvt but the early read of maxlvt wasn't removed. Signed-off-by: Chuck Ebbert Cc: Andi Kleen Signed-off-by: Thomas Gleixner Cc: stable@kernel.org commit 74dc51a3de06aa516e3b9fdc4017b2aeb38bf44b Author: Thomas Gleixner Date: Sun May 18 22:17:59 2008 +0200 x86: disable TSC for sched_clock() when calibration failed When the TSC calibration fails then TSC is still used in sched_clock(). Disable it completely in that case. Signed-off-by: Thomas Gleixner Cc: stable@kernel.org commit 9ccc906c97e34fd91dc6aaf5b69b52d824386910 Author: Thomas Gleixner Date: Tue May 13 12:31:00 2008 +0200 x86: distangle user disabled TSC from unstable tsc_enabled is set to 0 from the command line switch "notsc" and from the mark_tsc_unstable code. Seperate those functionalities and replace tsc_enable with tsc_disable. This makes also the native_sched_clock() decision when to use TSC understandable. Preparatory patch to solve the sched_clock() issue on 32 bit. Signed-off-by: Thomas Gleixner commit b6db80ee1331e7beaeb91b4b3d946dd16c72e388 Author: Thomas Gleixner Date: Sun May 18 19:27:48 2008 +0200 x86: fix setup of cyc2ns in tsc_64.c When the TSC is calibrated against the PIT due to the nonavailability of PMTIMER/HPET or due to SMI interference then the setup of the per CPU cyc2ns variables is skipped. This is unlikely to happen but it would definitely render sched_clock() unusable. This was introduced with commit 53d517cdbaac704352b3d0c10fecb99e0b54572e x86: scale cyc_2_nsec according to CPU frequency Update the per CPU cyc2ns variables in all exit pathes of tsc_calibrate. Signed-off-by: Thomas Gleixner Cc: stable@kernel.org commit 6ab455eeaff6893cd06da33843e840d888cdc04a Author: Christoph Hellwig Date: Mon May 19 16:34:42 2008 +1000 [XFS] Fix memory corruption with small buffer reads When we have multiple buffers in a single page for a blocksize == pagesize filesystem we might overwrite the page contents if two callers hit it shortly after each other. To prevent that we need to keep the page locked until I/O is completed and the page marked uptodate. Thanks to Eric Sandeen for triaging this bug and finding a reproducible testcase and Dave Chinner for additional advice. This should fix kernel.org bz #10421. Tested-by: Eric Sandeen SGI-PV: 981813 SGI-Modid: xfs-linux-melb:xfs-kern:31173a Signed-off-by: Christoph Hellwig Signed-off-by: David Chinner Signed-off-by: Lachlan McIlroy commit 289c79a4bd350e8a25065102563ad1a183d1b402 Author: Patrick McHardy Date: Fri May 23 00:22:04 2008 -0700 vlan: Use bitmask of feature flags instead of seperate feature bits Herbert Xu points out that the use of seperate feature bits for features to be propagated to VLAN devices is going to get messy real soon. Replace the VLAN feature bits by a bitmask of feature flags to be propagated and restore the old GSO_SHIFT/MASK values. Signed-off-by: Patrick McHardy Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 7bece8155be133cd67c41eed2b31c60a310609de Merge: b9a2f2e... bdefff1... Author: David S. Miller Date: Fri May 23 00:05:14 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e Author: Stephen Rothwell Date: Fri May 23 11:41:46 2008 +1000 [POWERPC] iSeries: Remove unused mail address I don't use my IBM email address normally and people can find me in CREDITS. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 06a901c5621f85e07e00ac4816c7ca95620ee74a Author: Stephen Rothwell Date: Wed May 21 16:24:31 2008 +1000 [POWERPC] mpic: Fix use of uninitialized variable Compiling ppc64_defconfig with gcc 4.3 gives thes warnings: arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_get_priority': arch/powerpc/sysdev/mpic.c:1351: warning: 'is_ipi' may be used uninitialized in this function arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_set_priority': arch/powerpc/sysdev/mpic.c:1328: warning: 'is_ipi' may be used uninitialized in this function It turns out that in the cases where is_ipi is uninitialized, another variable (mpic) will be NULL and it is dereferenced. Protect against this by returning if mpic is NULL in mpic_irq_set_priority, and removing mpic_irq_get_priority completely as it has no in tree callers. This has the nice side effect of making the warning go away. Signed-off-by: Stephen Rothwell Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d1e8d50d5a4bc7e40b119bf513804188ce2933d0 Author: Michael Ellerman Date: Tue May 20 22:48:03 2008 +1000 [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init Since commit "85xx: Add support for relocatable kernel (and booting at non-zero)" (37dd2badcfcec35f5e21a0926968d77a404f03c3), PHYSICAL_START is #defined as kernstart_addr if RELOCATABLE and FLATMEM is enabled. PHYSICAL_START is used in prom_init.c and so kernstart_addr needs to be added to the list of allowed symbols that prom_init.c can access. Signed-off-by: Michael Ellerman Acked-by: Kumar Gala Signed-off-by: Paul Mackerras commit 46a7417963a84f67984af1af59d43261159dd96b Author: David Gibson Date: Mon May 19 16:16:00 2008 +1000 [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS __set_fixmap() in pgtable_32.c currently fails to compile if STRICT_MM_TYPECHECKS is defined. This fixes it. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit ecc240f90bce23651f9866a1523ba55faa89f009 Author: Geoff Levand Date: Fri May 16 06:09:59 2008 +1000 [POWERPC] PS3: Fix memory hotplug A change was made to walk_memory_resource() in commit 4b119e21d0c66c22e8ca03df05d9de623d0eb50f that added a check of find_lmb(). Add the coresponding lmb_add() call to ps3_mm_add_memory() so that that check will succeed. This fixes the condition where the PS3 boots up with only the 128 MiB of boot memory, and doesn't see the other 128MiB that is available. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit c8f5f12e46f079a954d4f7163ba59dadee08ca26 Author: David Chinner Date: Tue May 20 11:30:15 2008 +1000 [XFS] Fix inode list allocation size in writeback. We only need to allocate space for the number of inodes in the cluster when writing back inodes, not every byte in the inode cluster. This reduces the amount of memory needing to be allocated to 256 bytes instead of 64k. SGI-PV: 981949 SGI-Modid: xfs-linux-melb:xfs-kern:31182a Signed-off-by: David Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 49383b0e98ad1f69ff4c816eb1961f703df12318 Author: David Chinner Date: Mon May 19 16:29:34 2008 +1000 [XFS] Don't allow memory reclaim to wait on the filesystem in inode writeback If we allow memory reclaim to wait on the pages under writeback in inode cluster writeback we could deadlock because we are currently holding the ILOCK on the initial writeback inode which is needed in data I/O completion to change the file size or do unwritten extent conversion before the pages are taken out of writeback state. SGI-PV: 981091 SGI-Modid: xfs-linux-melb:xfs-kern:31015a Signed-off-by: David Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit 978b7237123d007b9fa983af6e0e2fa8f97f9934 Author: David Chinner Date: Mon May 19 16:29:46 2008 +1000 [XFS] Fix fsync() b0rkage. xfs_fsync() fails to wait for data I/O completion before checking if the inode is dirty or clean to decide whether to log the inode or not. This misses inode size updates when the data flushed by the fsync() is extending the file. Hence, like fdatasync(), we need to wait for I/o completion first, then check the inode for cleanliness. Doing so makes the behaviour of xfs_fsync() identical for fsync and fdatasync and we *always* use synchronous semantics if the inode is dirty. Therefore also kill the differences and remove the unused flags from the xfs_fsync function and callers. SGI-PV: 981296 SGI-Modid: xfs-linux-melb:xfs-kern:31033a Signed-off-by: David Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy commit c1e554aeea12d2dab5183e011c27dee6142dc927 Merge: c203e45... 78b58e5... Author: Lachlan McIlroy Date: Fri May 23 13:48:37 2008 +1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit 3401a61e16a5b852d4e353c8850c857105a67a9c Author: Christian Borntraeger Date: Thu May 8 15:20:38 2008 +0200 stop_machine: make stop_machine_run more virtualization friendly On kvm I have seen some rare hangs in stop_machine when I used more guest cpus than hosts cpus. e.g. 32 guest cpus on 1 host cpu triggered the hang quite often. I could also reproduce the problem on a 4 way z/VM host with a 64 way guest. It turned out that the guest was consuming all available cpus mostly for spinning on scheduler locks like rq->lock. This is expected as the threads are calling yield all the time. The problem is now, that the host scheduling decisings together with the guest scheduling decisions and spinlocks not being fair managed to create an interesting scenario similar to a live lock. (Sometimes the hang resolved itself after some minutes) Changing stop_machine to yield the cpu to the hypervisor when yielding inside the guest fixed the problem for me. While I am not completely happy with this patch, I think it causes no harm and it really improves the situation for me. I used cpu_relax for yielding to the hypervisor, does that work on all architectures? p.s.: If you want to reproduce the problem, cpu hotplug and kprobes use stop_machine_run and both triggered the problem after some retries. Signed-off-by: Christian Borntraeger CC: Ingo Molnar Signed-off-by: Rusty Russell commit 4d2e7d0d77e4e1e8a21cc990c607985fdba20e66 Author: Matti Linnanvuori Date: Tue May 13 18:31:47 2008 +0300 doc: add a chapter about trylock functions [Bug 9011] Add a chapter about trylock functions. http://bugzilla.kernel.org/show_bug.cgi?id=9011 Signed-off-by: Matti Linnanvuori Signed-off-by: Rusty Russell (removed down_trylock) commit 34e4e2fef4c7a2f7699b3d25e48d871d3ac4c3e7 Author: Denis V. Lunev Date: Tue May 20 13:59:48 2008 +0400 modules: proper cleanup of kobject without CONFIG_SYSFS kobject: '' (ffffffffa0104050): is not initialized, yet kobject_put() is being called. ------------[ cut here ]------------ WARNING: at /home/den/src/linux-netns26/lib/kobject.c:583 kobject_put+0x53/0x55() Modules linked in: ipv6 nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs ide_cd_mod cdrom button [last unloaded: pktgen] comm: rmmod Tainted: G W 2.6.26-rc3 #585 Call Trace: [] warn_on_slowpath+0x58/0x7a [] ? printk+0x67/0x69 [] ? printk+0x67/0x69 [] kobject_put+0x53/0x55 [] free_module+0x87/0xfa [] sys_delete_module+0x178/0x1e1 [] ? lockdep_sys_exit_thunk+0x35/0x67 [] ? trace_hardirqs_on_thunk+0x35/0x3a [] system_call_after_swapgs+0x7b/0x80 ---[ end trace 8f5aafa7f6406cf8 ]--- mod->mkobj.kobj is not initialized without CONFIG_SYSFS. Do not call kobject_put in this case. Signed-off-by: Denis V. Lunev Cc: Rusty Russell Cc: Kay Sievers Signed-off-by: Rusty Russell commit c4ea6fcf5a192dbba54666f308bdace1c278e0c1 Author: Cyrill Gorcunov Date: Wed May 14 16:27:29 2008 -0700 module loading ELF handling: use SELFMAG instead of numeric constant Signed-off-by: Cyrill Gorcunov Signed-off-by: Andrew Morton Signed-off-by: Rusty Russell commit c511afb41f21857fbbae78f83f88b1247597f46f Author: Magnus Damm Date: Thu May 22 22:38:36 2008 +0900 sh: update Migo-R defconfig Update the Migo-R defconfig to include support for KEYSC, I2C, RTC and NAND and NOR MTD devices. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit fa7ff086008d1af6b7325bf556a0cf70aaf2efd3 Author: Magnus Damm Date: Thu May 22 22:34:28 2008 +0900 sh: use sm501 8250 mfd support on r2d boards Make use of recently added sm501 8250 uart support, commit 61711f8fd8180e458cfb6846bcf4fc636a95f3db makes the mfd code handle 8250 uarts so there is no longer need to do it from the r2d board code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b76baf4cf5978efeabf5a3e054551e40ef599b69 Author: Magnus Damm Date: Thu May 22 22:24:51 2008 +0900 sh: add probe support for new sh7723 cut This patch adds support for sh7723 silicon with a prr value of 0x51. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 760130447248de94943cf75c80fa3ac8fe9d977d Author: Magnus Damm Date: Thu May 22 22:19:39 2008 +0900 sh: fix VPU interrupt vector for sh7723 This patch fixes a VPU vector typo for sh7723. The correct value is 0x980, the same as for sh7722. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 526c1c23a23785114f618624e22480a3317388e1 Author: Magnus Damm Date: Thu May 22 22:15:31 2008 +0900 sh: fix USBF resource for sh7722 The USBF function on sh7722 is currently not working with the m66592_udc driver. The driver is using platform_get_resource_byname() so my commit a0d29798e568116aa6c32aef7bab2d9e620c88ad broke sh7722 support. The long term fix is to replace platform_get_resource_byname() in the driver with platform_get_resource(), but this helps until that happens. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4f74369422b883164c50b5936517d010a3e1ce59 Author: Dominik Brodowski Date: Thu May 22 08:52:05 2008 +0200 [CPUFREQ] clarify license of freq_table.c Signed-off-by: Dominik Brodowski Signed-off-by: Dave Jones commit bdefff1f54cb76a19700663f211350de2f65cc91 Author: Komuro Date: Mon May 5 10:51:12 2008 +0900 fmvj18x_cs: add NextCom NC5310 rev B support fmvj18x_cs: The manfid of "NextCom NC5310 rev B" is MANF_ID_FUJITSU. but this card is MBH10302 based card. use ConfigBase to detect the cardtype for this card. Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit 43fc63dceb8ff58c5ef0a30c70abd31336b5e8b4 Author: Komuro Date: Sun Apr 20 14:32:34 2008 +0900 xirc2ps_cs: re-initialize the multicast address in do_reset keep bit7,8 of XIRCREG42_SWC1 in set_multicast_list. Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit f7f312a0c7e7a1947cf193e0e94a257ad7742cb2 Author: Wang Chen Date: Tue May 20 17:13:52 2008 +0800 3C509: rx_bytes should not be increased when alloc_skb failed If alloc_skb failed, the recieved packet will be dropped. Do not increase rx_bytes for dropped packet. Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit 56cfe5d028687468f76e8b613c63ca41f209982d Author: Wang Chen Date: Thu May 22 18:09:06 2008 +0800 NETFRONT: Use __skb_queue_purge() Use standard routine for queue purging. Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit 288369cc2580178ef6ed7c5c63cc1ef08c803250 Author: Wang Chen Date: Thu May 22 18:07:43 2008 +0800 VIRTIO: Use __skb_queue_purge() Use standard routine for queue purging. Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit a01b3d766c0ad3e63978b0f6faf4004688f13522 Author: Paul Gortmaker Date: Thu May 22 12:43:50 2008 -0400 phylib: do EXPORT_SYMBOL on get_phy_id Commit cac1f3c8 factored out the code for get_phy_id so that it could be reused in multiple places. Turns out that some of the users can be modular, so we need to export this symbol as well. Signed-off-by: Paul Gortmaker Signed-off-by: Jeff Garzik commit b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 Author: Thomas Graf Date: Thu May 22 10:48:59 2008 -0700 netlink: Fix nla_parse_nested_compat() to call nla_parse() directly The purpose of nla_parse_nested_compat() is to parse attributes which contain a struct followed by a stream of nested attributes. So far, it called nla_parse_nested() to parse the stream of nested attributes which was wrong, as nla_parse_nested() expects a container attribute as data which holds the attribute stream. It needs to call nla_parse() directly while pointing at the next possible alignment point after the struct in the beginning of the attribute. With this patch, I can no longer reproduce the reported leftover warnings. Signed-off-by: Thomas Graf Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 76994412f8e824e79a593d6777ec327d85f942b2 Author: Pekka Enberg Date: Thu May 22 19:22:25 2008 +0300 slub: ksize() abuse checks Add a WARN_ON for pages that don't have PageSlab nor PageCompound set to catch the worst abusers of ksize() in the kernel. Acked-by: Christoph Lameter Cc: Matt Mackall Signed-off-by: Pekka Enberg commit b851cb289d905ea04e5f0b518bf3f28407a72118 Author: Russell King Date: Thu May 22 16:38:50 2008 +0100 [ARM] omap: fix omap clk support build errors arch/arm/plat-omap/clock.c:397: warning: "struct cpufreq_frequency_table" declared inside parameter list arch/arm/plat-omap/clock.c:397: warning: its scope is only this definition or declaration, which is probably not what you want arch/arm/plat-omap/clock.c: In function `clk_init_cpufreq_table': arch/arm/plat-omap/clock.c:402: error: structure has no member named `clk_init_cpufreq_table' arch/arm/plat-omap/clock.c:403: error: structure has no member named `clk_init_cpufreq_table' Signed-off-by: Russell King commit 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 Merge: a0abb93... 0a891ad... Author: Linus Torvalds Date: Thu May 22 08:08:25 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] Fix reversed memset arguments Adds username in the upcall key for unattended mounts with keytab [CIFS] Remove redundant NULL check commit 0a891adccc867c28b022128bc342a779e476c816 Author: Dave Jones Date: Thu May 22 14:20:21 2008 +0000 [CIFS] Fix reversed memset arguments Signed-off-by: Dave Jones Signed-off-by: Steve French commit e4058245ac0c4d9a517cda688a35aef065cb7f4e Author: Igor Mammedov Date: Wed Apr 2 17:33:47 2008 +0400 Adds username in the upcall key for unattended mounts with keytab Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit 90239bbd598c6a0fc7f2c7352e9886bd3be968d0 Author: Ben Dooks Date: Wed May 21 10:24:17 2008 +0100 [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X. Rename the SDI device if on an S3C2440 or S3C2442. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4ba35fbe293be319b1a5d97951e567c0d9527d09 Author: Philipp Zabel Date: Thu May 22 10:19:28 2008 +0100 [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo Signed-off-by: Philipp Zabel Acked-by: Eric Miao Signed-off-by: Russell King commit e142848300b1a13d59a6e5fff8c914096d3830fb Author: Ben Dooks Date: Wed May 21 10:25:01 2008 +0100 [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit ace94f9efb8ad2c21b308b3bdf02db984d8b3c5f Author: Ben Dooks Date: Wed May 21 10:24:46 2008 +0100 [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 59d83db559315bb75aea849ee773f571ddcc3574 Author: Tony Lindgren Date: Mon May 19 05:20:56 2008 +0100 [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c As noted by Russell King. These depend on tsc210x drivers getting integrated first. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 864d0ec9db9c0c18b79cebb9d8b7ac75c3b70571 Author: Thomas Kunze Date: Mon May 19 22:06:51 2008 +0100 [ARM] 5025/2: fix collie cpu initialisation collie.h: * add some meaningfull names to some gpios collie.c: * initialize cpu registers correctly Signed-off-by: Thomas Kunze Signed-off-by: Russell King commit fa701bd24d6e64a2283d6fa386554775fd4336e7 Author: Krzysztof Halasa Date: Mon May 19 19:00:51 2008 +0200 WAN: protect HDLC proto list while insmod/rmmod WAN: protect protocol list in hdlc.c with RTNL. Signed-off-by: Krzysztof Hałasa Signed-off-by: Jeff Garzik commit 4ecc8c066f3cecb55807644a01435084d8ed638a Author: Julia Lawall Date: Mon May 12 15:38:26 2008 +0200 drivers/net/fs_enet: remove null pointer dereference The following code appears in the function fs_init_instance in the file drivers/net/fs_enet/fs_enet-main.c. if (fep->ops == NULL) { printk(KERN_ERR DRV_MODULE_NAME ": %s No matching ops found (%d).\n", ndev->name, fpi->fs_no); err = -EINVAL; goto err; } This code implies that at the point of err, fep->ops can be NULL, so an extra test is needed before dereferencing this value. This problem was found using the following semantic match (http://www.emn.fr/x-info/coccinelle/) // @@ expression E, E1; identifier f; statement S1,S2,S3; @@ * if (E == NULL) { ... when != if (E == NULL) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Jeff Garzik commit 0b5923cd477674755dde670ba804649523f27c97 Author: Sreenivasa Honnur Date: Mon May 12 13:43:05 2008 -0400 S2io: Version update for napi and MSI-X patches - Updated version number Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: Jeff Garzik commit f61e0a3544be2f615a0af4aec71eb85a96bdbd62 Author: Sreenivasa Honnur Date: Mon May 12 13:42:17 2008 -0400 S2io: Added napi support when MSIX is enabled. - Added napi support when MSIX is enabled. - Moved test_msi function from s2io_open to probe function. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: Jeff Garzik commit ac731ab66960547c33a4e2c504419389ae747067 Author: Sreenivasa Honnur Date: Mon May 12 13:41:32 2008 -0400 S2io: Move all the transmit completions to a single msi-x (alarm) vector - Move all the transmit completions to a single msi-x (alarm) vector. - Enable the continuous timer interrupt for only one transmit fifo. Signed-off-by: Santosh Rastapur Signed-off-by: Ramkrishna Vepa Signed-off-by: Jeff Garzik commit 25c16fffa8ed82d3ef31980d76ff95d3c6430f00 Author: Joe Perches Date: Mon May 12 14:38:17 2008 -0700 drivers/net/ehea - remove unnecessary memset after kzalloc Signed-off-by: Joe Perches Signed-off-by: Jeff Garzik commit d04455fba3777fa5c3963348be76510169bbf4df Author: Francois Romieu Date: Mon May 12 18:44:21 2008 +0200 au1000_eth: remove useless check The lifespan of the device covers the request_irq .. free_irq interval. The cast of a void * pointer is not needed either. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 94a47f4161798c34bec7718768f72cf16bcfb4f0 Author: Huang Weiyi Date: Mon May 12 12:14:04 2008 +0800 Blackfin EMAC Driver: Removed duplicated include Signed-off-by: Huang Weiyi Signed-off-by: Bryan Wu Signed-off-by: Jeff Garzik commit f917d58031fce6dfd7cea71259ea6a2b663ec813 Author: Matteo Croce Date: Wed May 14 00:58:32 2008 +0200 cpmac bugfixes and enhancements * Resolve some locking issues using atomic_inc/atomic_dec * move status code in cpmac_check_status * unmark the BROKEN flag in Kconfig * move code which should have been in platform code in arch/mips/ar7/platform.c * fixed an IRQ storm which lets the kernel hang * fixed a double call to netif_start_queue which causes a kernel panic * don't fail to register the PHY, works on many devices now Signed-off-by: Matteo Croce Signed-off-by: Felix Fietkau Signed-off-by: Jeff Garzik commit f47e81fc36371a2f5e2b9792b6a8c56a4564ebbe Author: Becky Bruce Date: Thu May 1 18:03:11 2008 -0500 e1000e: use resource_size_t, not unsigned long, for phys addrs The use of unsigned long causes the driver to fail on 32-bit systems which support 64-bit resources. Signed-off-by: Becky Bruce Signed-off-by: Jeff Garzik commit 3d60efb55f634e200fd99e0960a8e099fb38446a Author: Aurelien Nephtali Date: Wed May 14 17:04:13 2008 -0700 net/usb: add support for Apple USB Ethernet Adapter Add support for Apple USB Ethernet Adapter. http://store.apple.com/1-800-MY-APPLE/WebObjects/AppleStore.woa/wa/RSLID?nplm=MB442Z/A Signed-off-by: Aurelien Nephtali Acked-by: Greg KH Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 7fa0cba330af3a24f43ac85e14b0b5fed557cdab Author: Anton Vorontsov Date: Fri May 16 23:04:51 2008 +0400 uli526x: add support for netpoll This patch adds netpoll support for the uli526x ethernet driver -- simply call the interrupt handler for polling. To do this without disable_irq()/enable_irq() pair we should fully protect the handler. Luckily, it's already using irqsave spinlock, the only unprotected place is interrupts re-enabling write. It was safe to re-enable interrupts without holding the spinlock, but with netpoll possibility now it doesn't seem so. Patch was tested using netconsole and KGDBoE. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 7f80202bb964dd9c5b408af8100c7f0fd39a15c7 Author: Andy Fleming Date: Thu May 15 17:00:21 2008 -0500 ucc_geth: Fix arguments to dma map/unmap functions We were passing NULL as the device. When we actually start supporting more interesting memory configurations, this will break things, so we proactively are fixing the bug. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit 940608be2e6117c17c19b203f7393ced4d02590a Author: Maciej W. Rozycki Date: Sat May 17 07:07:36 2008 +0100 PHYLIB: Kconfig: Fix the dependency on S390 PHYLIB was first marked as BROKEN on S390, then the enclosing menu marked as non-S390, then the two dependencies merged with the conversion to menuconfig. Reduce to non-S390. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 5a0a92e67b5009a71e011658da04fb92dad8961f Author: Gerrit Renker Date: Sat May 17 08:35:36 2008 +0100 [SC92031] Using padto turned driver into an IPv6-only interface IPv4 would work with this driver only with static arp table entries, the patch reverts a padto introduced in commit 26a17b7bbb36a8552d531bc1ad08472fb5aa3007 sc92031: start transmit return value bugfix The padto does not work because the driver code evaluates `len' later on and there are cases where skb->len is not updated accordingly. This was observed with ARP frames (skb->len = 42 bytes, !skb_cloned(), skb_tailroom = 84 bytes). Then in skb_pad(), the first condition is true, where skb->len is not updated. As a consequence, the driver uses 42 bytes instead of the 60 bytes, and the ARP frame never makes it onto the wire. Signed-off-by: Gerrit Renker Signed-off-by: Jeff Garzik commit 789585e968f07653a29a9e829aed20386043636c Author: Stephen Hemminger Date: Sun May 18 04:45:09 2008 +0100 sb1250: use netdev_alloc_skb Use netdev_alloc_skb. This sets skb->dev and allows arch specific allocation. Also simplify and cleanup the alignment code. Signed-off-by: Stephen Hemminger Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 40ba182e3ca9f019f299ce5052fcd7e4cf68d11b Author: Tobias Diedrich Date: Sun May 18 15:00:36 2008 +0200 [netdrvr] forcedeth: Restore multicast settings on resume nv_open() resets multicast settings, call nv_set_multicast(dev) to restore them. (Maybe this should rather be moved into nv_open()) Signed-off-by: Tobias Diedrich Signed-off-by: Jeff Garzik commit aff26e2faa782e196f28b86d04b093fd3bae1ffb Author: Krzysztof Halasa Date: Mon May 19 19:11:08 2008 +0200 WAN: protect Cisco HDLC state changes with a spinlock. Signed-off-by: Krzysztof Hałasa Signed-off-by: Jeff Garzik commit 0178ec3d3e4e48c63b350e712835a4a5c15c6c86 Author: Adrian Bunk Date: Tue May 20 00:53:00 2008 +0300 make myri10ge_get_firmware_capabilities() static This patch makes the needlessly global myri10ge_get_firmware_capabilities() static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 7ad62dbcb5766dae38516e0333a6f68a1b6df884 Author: Ilpo Järvinen Date: Tue May 13 14:16:54 2008 +0300 s2io: add missing block braces to multistatement if statement Signed-off-by: Ilpo Järvinen Cc: Ramkrishna Vepa Cc: Rastapur Santosh Cc: Sivakumar Subramani Cc: Sreenivasa Honnur Signed-off-by: Jeff Garzik commit 6941727a08d49c88a58bc3afb55044df7932549e Author: Ilpo Järvinen Date: Tue May 13 14:16:53 2008 +0300 hamradio/scc: add missing block braces to multi-statement if Signed-off-by: Ilpo Järvinen Signed-off-by: Jeff Garzik commit 7fb1c2ac8ecaf0883f2fcb38dfc9ec2d15cee11d Author: Brian King Date: Wed May 14 09:48:25 2008 -0500 ehea: Fix use after free on reboot Fixes the following use after free oops: ehea: Reboot: freeing all eHEA resources Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6c5b Faulting instruction address: 0xd000000000354488 cpu 0x0: Vector: 300 (Data Access) at [c00000002ec6f310] pc: d000000000354488: .ehea_shutdown_single_port+0x50/0x78 [ehea] lr: d00000000035447c: .ehea_shutdown_single_port+0x44/0x78 [ehea] sp: c00000002ec6f590 msr: 8000000000009032 dar: 6b6b6b6b6b6b6c5b dsisr: 40000000 current = 0xc0000000281412e0 paca = 0xc0000000006df300 pid = 10930, comm = reboot enter ? for help [c00000002ec6f590] d00000000035d64c .ehea_remove+0x44/0x124 [ehea] (unreliable) [c00000002ec6f630] c000000000319f88 .of_platform_device_remove+0x40/0x58 [c00000002ec6f6a0] c000000000291018 .__device_release_driver+0xb0/0xf0 [c00000002ec6f730] c000000000291120 .driver_detach+0xc8/0xfc [c00000002ec6f7c0] c00000000028fe24 .bus_remove_driver+0xb4/0x114 [c00000002ec6f850] c000000000291768 .driver_unregister+0x54/0x74 [c00000002ec6f8e0] c00000000031a0c8 .of_unregister_driver+0x14/0x28 [c00000002ec6f950] c000000000023ba0 .ibmebus_unregister_driver+0x10/0x24 [c00000002ec6f9c0] d000000000354180 .ehea_reboot_notifier+0x30/0x4c [ehea] [c00000002ec6fa40] c0000000003c95a8 .notifier_call_chain+0x5c/0xcc [c00000002ec6fae0] c000000000082cd4 .__blocking_notifier_call_chain+0x70/0xb0 [c00000002ec6fb90] c000000000075cf8 .kernel_restart_prepare+0x24/0x58 [c00000002ec6fc10] c000000000075f0c .kernel_restart+0x20/0x6c [c00000002ec6fc90] c000000000078674 .sys_reboot+0x1d4/0x290 [c00000002ec6fe30] c0000000000086ac syscall_exit+0x0/0x40 Signed-off-by: Jeff Garzik commit 74ef5c5025fed5ad6a1cbdfb5c2e831acdbbd2fe Author: Pierre Ynard Date: Wed May 14 16:20:16 2008 -0700 rndis_host: increase delay in command response loop Some devices running some WinCE firmware (with SC_* Samsung processors according to the SynCE project, verified on a HTC P3600 device) fail to register because they apparently need extra time to respond correctly to requests. Increase the existing delay to satisfy them. Based on code from the SynCE project, on a suggestion of David Brownell. This patch Works For Me(tm). Signed-off-by: Pierre Ynard Acked-by: David Brownell Cc: Greg KH Cc: Jeff Garzik Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 63dac8ff1b3709b5f7ba71283eb48b4e1f18d563 Author: Andrew Morton Date: Wed May 14 16:20:15 2008 -0700 drivers/net/tokenring/olympic.c: fix warning When dev_name() is changed to return `const char *': drivers/net/tokenring/olympic.c: In function 'olympic_probe': drivers/net/tokenring/olympic.c:234: warning: assignment discards qualifiers from pointer target type Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5d9bac8ece5e2a64a2a450c7e2d6901ed9152052 Author: Andrew Morton Date: Wed May 14 16:20:15 2008 -0700 drivers/net/tokenring/3c359.c: squish a warning When dev_name() is changed to return `const char *': drivers/net/tokenring/3c359.c: In function 'xl_probe': drivers/net/tokenring/3c359.c:318: warning: assignment discards qualifiers from pointer target type Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b166cfba01d62d04ae81ecce2d5dbe308db8083a Author: Andrew Morton Date: Wed May 14 16:20:14 2008 -0700 pcnet32: fix warning pci_name() will be changed to return `const char *': drivers/net/pcnet32.c: In function 'pcnet32_probe1': drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5bceeda3253d9ea6a38e2e918362a2610677f9c0 Author: Andrew Morton Date: Wed May 14 16:20:12 2008 -0700 [netdrvr] dm9000: use delayed work to update mii phy state fix use cancel_delayed_work_sync() Cc: Ben Dooks Cc: Enrico Scholz Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d494eacde8858f9b53f5c640692caf14eb3c8239 Author: Stephen Hemminger Date: Wed May 14 17:04:13 2008 -0700 sky2: restore vlan acceleration on reset If device has to be reset by sky2_restart, then need to restore the VLAN acceleration settings. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 8757a5f71530c2dc8db7823ad68a5d4c2fbdad19 Author: Ben Hutchings Date: Fri May 16 21:21:06 2008 +0100 sfc: Remove sub-minor component from driver version This driver has diverged from the out-of-tree driver to which the version number originally applied. It should be identified primarily by kernel version. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 9b7bfc4c4c601a5cb368751f60cac054492c45f5 Author: Ben Hutchings Date: Fri May 16 21:20:20 2008 +0100 sfc: Added checks for heap allocation failure Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit d3208b5ebae9e62c32f0cf74dce1d4ddfac3f895 Author: Ben Hutchings Date: Fri May 16 21:20:00 2008 +0100 sfc: Remove redundant casts to and from void * Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 5daab96d873721cb84f4583f232b88fcd67c51fb Author: Ben Hutchings Date: Fri May 16 21:19:43 2008 +0100 sfc: Change type of efx_nic::nic_data to struct falcon_nic_data * Remove redundant casts and variable. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 24c28edc5a1b1dc4677eb13408ff3492d65df159 Author: Ben Hutchings Date: Fri May 16 21:19:21 2008 +0100 sfc: Use __packed macro Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 6f8135ca7224d98c2de43edde69f4e6bec12da0e Author: Ben Hutchings Date: Fri May 16 21:19:05 2008 +0100 sfc: Do not define inline macro Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 9bbd7d9a3528de1b5b915fa77df027b4de62174c Author: Ben Hutchings Date: Fri May 16 21:18:48 2008 +0100 sfc: Use DMA_BIT_MASK() instead of our own DMA mask macros Also change type of efx_nic_type::max_dma_mask to u64, matching pci_dma_supported() parameter type. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 5b9e207ced5bb7af98b3c147171893435f5104ca Author: Ben Hutchings Date: Fri May 16 21:18:14 2008 +0100 sfc: Correct and expand some comments These comments have been revised in response to questions raised by Andrew Morton in <20080501120858.207b6dd6.akpm@linux-foundation.org>. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 086ea3564a5378a06c7cbfaf9d2727bc58a8c285 Author: Ben Hutchings Date: Fri May 16 21:17:06 2008 +0100 sfc: Use resource_size_t for PCI bus address This should make the driver work on 32-bit systems with 64-bit PCI support. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 184be0c21aba048cf510036edeee095e68740951 Author: Ben Hutchings Date: Fri May 16 21:16:31 2008 +0100 sfc: Merged efx_page_offset() into efx_rx_buf_offset() Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 55668611d0b2a5947cd17f66243be3cebf21400c Author: Ben Hutchings Date: Fri May 16 21:16:10 2008 +0100 sfc: Replaced various macros with inline functions Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit b3475645ed8b823c063f7560b243026150d7c3f8 Author: Ben Hutchings Date: Fri May 16 21:15:49 2008 +0100 sfc: Added and removed braces to comply with kernel style Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 2c118e0f6b7f3b8021df3c80c80c0545402f38b4 Author: Ben Hutchings Date: Fri May 16 21:15:29 2008 +0100 sfc: Removed unncesssary UL suffixes on 0 literals Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit f7f13b0b9253e21557ad090144a44f20860332f1 Author: Ben Hutchings Date: Fri May 16 21:15:06 2008 +0100 sfc: Simplified efx_rx_calc_buffer_size() using get_order() Merged it into its only caller, efx_init_channels(). Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 91ad757c2fc35ec79dd2c909dc6dc721b9c257f3 Author: Ben Hutchings Date: Fri May 16 21:14:27 2008 +0100 sfc: Removed casts to void Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 4cc58bdebfcb7561de401999705a5cde16674842 Author: Ben Hutchings Date: Fri May 16 21:13:57 2008 +0100 sfc: Use mod_timer() to set expiry and add_timer() together Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1 Merge: 9956c11... 071f92d... Author: Linus Torvalds Date: Wed May 21 22:14:39 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: net: The world is not perfect patch. tcp: Make prior_ssthresh a u32 xfrm_user: Remove zero length key checks. net/ipv4/arp.c: Use common hex_asc helpers cassini: Only use chip checksum for ipv4 packets. tcp: TCP connection times out if ICMP frag needed is delayed netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ af_key: Fix selector family initialization. libertas: Fix ethtool statistics mac80211: fix NULL pointer dereference in ieee80211_compatible_rates mac80211: don't claim iwspy support orinoco_cs: add ID for SpeedStream wireless adapters hostap_cs: add ID for Conceptronic CON11CPro rtl8187: resource leak in error case ath5k: Fix loop variable initializations commit 9956c1120826bce3b42093099a0149b7f62d0b8a Merge: 78b58e5... ada44a0... Author: Linus Torvalds Date: Wed May 21 22:00:12 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: sparc64: Prevent stack backtrace false positives on trap frames. sparc64: Fix stack tracing through trap frames. sparc64: Fix kernel thread stack termination. sunhv: Fix locking in non-paged I/O case. commit ada44a0430fdd00b3f38aad0aa518e97cb760bd0 Author: David S. Miller Date: Wed May 21 21:50:01 2008 -0700 sparc64: Prevent stack backtrace false positives on trap frames. When we fully commit to returning back to kernel mode from a trap, zero out the regs->magic value to prevent false positives during stack backtraces. Signed-off-by: David S. Miller commit 0d817bc0d6cdd92ff1ab2e98dd5878659a48659c Author: Steve French Date: Thu May 22 02:02:03 2008 +0000 [CIFS] Remove redundant NULL check Noticed by Coverity checker. Signed-off-by: Steve French commit 14d2c68baa659cfd15dc782dd229ea304330c4f6 Author: David S. Miller Date: Wed May 21 18:15:53 2008 -0700 sparc64: Fix stack tracing through trap frames. The offset to the pt_regs area was wrong, so we weren't looking at the right location for the magic cookie. A trap frame is composed of a "struct sparc_stackf" then a "struct pt_regs", the code was using "struct reg_window" instead of "struct sparc_stackf". Signed-off-by: David S. Miller commit a051bc5bb1ac6dc138d529077fa20cbbc6622d95 Author: David S. Miller Date: Wed May 21 18:14:28 2008 -0700 sparc64: Fix kernel thread stack termination. Because of the silly way I set up the initial stack for new kernel threads, there is a loop at the top of the stack. To fix this, properly add another stack frame that is copied from the parent and terminate it in the child by setting the frame pointer in that frame to zero. Signed-off-by: David S. Miller commit 071f92d05967a0c8422f1c8587ce0b4d90a8b447 Author: Rami Rosen Date: Wed May 21 17:47:54 2008 -0700 net: The world is not perfect patch. Unless there will be any objection here, I suggest consider the following patch which simply removes the code for the -DI_WISH_WORLD_WERE_PERFECT in the three methods which use it. The compilation errors we get when using -DI_WISH_WORLD_WERE_PERFECT show that this code was not built and not used for really a long time. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 4b749440445ebcb6fad402fc762bc35af871f689 Author: Ilpo Järvinen Date: Wed May 21 17:40:05 2008 -0700 tcp: Make prior_ssthresh a u32 If previous window was above representable values of u16, strange things will happen if undo with the truncated value is called for. Alternatively, this could be fixed by some max trickery but that would limit undoing high-speed undos. Adds 16-bit hole but there isn't anything to fill it with. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 88860c9ef45963eb69411b0d2ace4e8ba0f7a32f Author: David S. Miller Date: Wed May 21 17:36:21 2008 -0700 xfrm_user: Remove zero length key checks. The crypto layer will determine whether that is valid or not. Suggested by Herbert Xu, based upon a report and patch by Martin Willi. Signed-off-by: David S. Miller Acked-by: Herbert Xu commit 51f82a2b128131c411880aed2cb802b166fe3445 Author: Denis Cheng Date: Wed May 21 17:34:32 2008 -0700 net/ipv4/arp.c: Use common hex_asc helpers Here the local hexbuf is a duplicate of global const char hex_asc from lib/hexdump.c, except the hex letters' cases: const char hexbuf[] = "0123456789ABCDEF"; const char hex_asc[] = "0123456789abcdef"; and here to print HW addresses, the hex cases are not significant. Thanks to Harvey Harrison to introduce the hex_asc_hi/hex_asc_lo helpers. Signed-off-by: Denis Cheng Signed-off-by: Harvey Harrison Signed-off-by: David S. Miller commit b1443e2f6501f06930a162ff1ff08382a98bf23e Author: David S. Miller Date: Wed May 21 17:05:34 2008 -0700 cassini: Only use chip checksum for ipv4 packets. According to David Monro, at least with Natsemi Saturn chips the cassini driver has some trouble with ipv6 checksums. Until we have more information about what's going on here, only use the chip checksums for ipv4. This workaround was suggested and tested by David. Update version and release date. Signed-off-by: David S. Miller commit 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 HTC_EGPIO is ARM-only driver uses symbols defined only on ARM Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 337e3c48e95e071a6ec1bfe95b55325e97f4908e Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 provide out-of-line strcat() for m68k Whether we sidestep it in init/main.c or not, such situations will arise again; compiler does generate calls of strcat() on optimizations, so we really ought to have an out-of-line version... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8c5330a505ca58013a65ce9c55953ff7ded79202 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 caiaq endianness fix Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 839cd31050096c88d929cc7c790c80cae87e2d85 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 MODULE_LICENSE expects "GPL v2", not "GPLv2" ... and we have few enough places using the latter to make it simpler to do search and replace... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e3428e2cf83ca47b66c194559b9e8a74af915947 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 msnd_* is ISA-only Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 46cb69ccdf76bf3649a249f6e626c5adc3c2f572 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 missing dependencies on HAS_DMA Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9d8df6aa9b1ca74127b11537d91de492dbea666a Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 ocfs2 endianness fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f6c2fb5ccff51e19850b1aca024a3b20b16a81e9 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 irda-usb endianness annotations and fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 572abae844e380ef4f8484d4e374a9ccf73dd568 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 sbus bpp: instances missed in s/dev_name/bpp_dev_name/ Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 79bc12a0a09c2eb1ccbb01c192045f994567bda2 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 ecryptfs fixes memcpy() from userland pointer is a Bad Thing(tm) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4ec7ffa2df247054d422b48148ad82369a45e986 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 misc drivers/net endianness noise Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8152b4a5b40da7c3e8c80e578c5c0608c5a8a142 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 thanks to net/mac80211 we need to pull drivers/leds/Kconfig on uml Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3e3b48e5198544dd90e27265a70c1a834139e025 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 missing export of csum_partial() on uml/amd64 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d347926a7ef9fa1334894a0531aa0c5f8a1ddeae Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 uml: add missing exports for UML_RANDOM=m Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 13c48c490208d9e70d8d66d56f96c5054db69af7 Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 fix hppfs Makefile breakage Fallout from commit 46d7b522ebf486edbd096965d534cc6465e9e309 ("uml: move hppfs_kern.c to hppfs.c") Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 3787fa6df5bb6e80b274ff805e10b6a9bfc4588c Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 fix include order in sys-i386/registers.c We want sys/ptrace.h before any includes of linux/ptrace.h and asm/user.h pulls the latter. Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 296cd66f7f6e130fe08e6880ecb13c3fc615a8db Author: Al Viro Date: Wed May 21 06:32:11 2008 +0100 missed kmalloc() in pcap_user.c Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 7d227cd235c809c36c847d6a597956ad9e9d2bae Author: Sridhar Samudrala Date: Wed May 21 16:42:20 2008 -0700 tcp: TCP connection times out if ICMP frag needed is delayed We are seeing an issue with TCP in handling an ICMP frag needed message that is received after net.ipv4.tcp_retries1 retransmits. The default value of retries1 is 3. So if the path mtu changes and ICMP frag needed is lost for the first 3 retransmits or if it gets delayed until 3 retransmits are done, TCP doesn't update MSS correctly and continues to retransmit the orginal message until it timesout after tcp_retries2 retransmits. I am seeing this issue even with the latest 2.6.25.4 kernel. In tcp_retransmit_timer(), when retransmits counter exceeds tcp_retries1 value, the dst cache entry of the socket is reset. At this time, if we receive an ICMP frag needed message, the dst entry gets updated with the new MTU, but the TCP sockets dst_cache entry remains NULL. So the next time when we try to retransmit after the ICMP frag needed is received, tcp_retransmit_skb() gets called. Here the cur_mss value is calculated at the start of the routine with a NULL sk_dst_cache. Instead we should call tcp_current_mss after the rebuild_header that caches the dst entry with the updated mtu. Also the rebuild_header should be called before tcp_fragment so that skb is fragmented if the mss goes down. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7 Author: Patrick McHardy Date: Wed May 21 14:08:38 2008 -0700 netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ Greg Steuck points out that some of the netfilter headers can't be used in userspace without including linux/types.h first. The headers include their own linux/types.h include statements, these are stripped by make headers-install because they are inside #ifdef __KERNEL__ however. Move them out to fix this. Reported and Tested by Greg Steuck. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4da5105687e0993a3bbdcffd89b2b94d9377faab Author: Kazunori MIYAZAWA Date: Wed May 21 13:26:11 2008 -0700 af_key: Fix selector family initialization. This propagates the xfrm_user fix made in commit bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 ("[XFRM]: xfrm_user: fix selector family initialization") Based upon a bug report from, and tested by, Alan Swanson. Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit 3651751fff44ede58f65cbb1e39242139ead251b Author: David S. Miller Date: Tue May 20 23:42:09 2008 -0700 sunhv: Fix locking in non-paged I/O case. This causes the lock to be taken twice, thus resulting in a deadlock. Signed-off-by: David S. Miller commit 5cf11daf9abdfd7bf5f5893137155cb38ccbdeb8 Merge: d40ace0... 397d71d... Author: Linus Torvalds Date: Tue May 20 21:12:14 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (21 commits) [CIFS] Remove debug statement Fix possible access to undefined memory region. [CIFS] Enable DFS support for Windows query path info [CIFS] Enable DFS support for Unix query path info [CIFS] add missing seq_printf to cifs_show_options for hard mount option [CIFS] add more complete mount options to cifs_show_options [CIFS] Add missing defines for DFS CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec. Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now. [CIFS] enable parsing for transport encryption mount parm [CIFS] Finishup DFS code [CIFS] BKL-removal: convert CIFS over to unlocked_ioctl [CIFS] suppress duplicate warning [CIFS] Fix paths when share is in DFS to include proper prefix add function to convert access flags to legacy open mode clarify return value of cifs_convert_flags() [CIFS] don't explicitly do a FindClose on rewind when directory search has ended [CIFS] cleanup old checkpatch warnings [CIFS] CIFSSMBPosixLock should return -EINVAL on error fix memory leak in CIFSFindNext ... commit 397d71ddfda5b11b85e396d6ea822011c132b962 Author: Steve French Date: Wed May 21 03:49:46 2008 +0000 [CIFS] Remove debug statement Signed-off-by: Steve French commit 5651ced3ab196b5e7dc485c5777f210aa41e2d8d Author: Igor Mammedov Date: Tue May 20 13:02:01 2008 +0400 Fix possible access to undefined memory region. Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit d8ac48d4cbae0cc59b7784399292fbda3e231be3 Merge: d3ede32... 5d283e8... Author: David S. Miller Date: Tue May 20 20:34:22 2008 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 5d283e8cdb8097b6a3e9304c9c8942ad9dc1a4eb Author: David Woodhouse Date: Mon May 19 16:32:02 2008 +0100 libertas: Fix ethtool statistics Fix various problems: - We converted MESH_ACCESS to a direct command but missed this caller. - We were trying to access mesh stats even on meshless firmware. - We should really zero the buffer if something goes wrong. Signed-off-by: David Woodhouse Acked-by: Dan Williams Signed-off-by: John W. Linville commit 0d580a774b3682b8b2b5c89ab9b813d149ef28e7 Author: Helmut Schaa Date: Tue May 20 09:56:37 2008 +0200 mac80211: fix NULL pointer dereference in ieee80211_compatible_rates Fix a possible NULL pointer dereference in ieee80211_compatible_rates introduced in the patch "mac80211: fix association with some APs". If no bss is available just use all supported rates in the association request. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit d40ace0c7b4a329f7d869d0fbf27435543bb2acc Merge: e616c63... 68432a0... Author: Linus Torvalds Date: Tue May 20 19:30:54 2008 -0700 Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linux * 'for-2.6.26' of git://linux-nfs.org/~bfields/linux: (25 commits) svcrdma: Verify read-list fits within RPCSVC_MAXPAGES svcrdma: Change svc_rdma_send_error return type to void svcrdma: Copy transport address and arm CQ before calling rdma_accept svcrdma: Set rqstp transport address in rdma_read_complete function svcrdma: Use ib verbs version of dma_unmap svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free svcrdma: Move the QP and cm_id destruction to svc_rdma_free svcrdma: Add reference for each SQ/RQ WR svcrdma: Move destroy to kernel thread svcrdma: Shrink scope of spinlock on RQ CQ svcrdma: Use standard Linux lists for context cache svcrdma: Simplify RDMA_READ deferral buffer management svcrdma: Remove unused READ_DONE context flags bit svcrdma: Return error from rdma_read_xdr so caller knows to free context svcrdma: Fix error handling during listening endpoint creation svcrdma: Free context on post_recv error in send_reply svcrdma: Free context on ib_post_recv error svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler svcrdma: Fix return value in svc_rdma_send svcrdma: Fix race with dto_tasklet in svc_rdma_send ... commit da8395be0bb04f685d55f124d046766d9209214a Author: Dave Jones Date: Tue May 20 22:13:09 2008 -0400 [CPUFREQ] Remove documentation of removed ondemand tunable. sampling_down_factor was removed in ccb2fe209dac9ff67f6351e783e610073afaaeaf back in June 2006. Signed-off-by: Dave Jones commit e616c6303306df62223ebe2e68bb2f19c420dd81 Merge: 789319d... d3ede32... Author: Linus Torvalds Date: Tue May 20 17:23:03 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: (27 commits) pktgen: make sure that pktgen_thread_worker has been executed [VLAN]: Propagate selected feature bits to VLAN devices drivers/atm/: remove CVS keywords vlan: Correctly handle device notifications for layered VLAN devices net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() net_sched: cls_api: fix return value for non-existant classifiers ipsec: Use the correct ip_local_out function ipv6 addrconf: Allow infinite prefix lifetime. ipv6 route: Fix lifetime in netlink. ipv6 addrconf: Fix route lifetime setting in corner case. ndisc: Add missing strategies for per-device retrans timer/reachable time settings. ipv6: Move from header-y to unifdef-y. l2tp: avoid skb truesize bug if headroom is increased wireless: Create 'device' symlink in sysfs wireless, airo: waitbusy() won't delay libertas: fix command timeout after firmware failure mac80211: Add RTNL version of ieee80211_iterate_active_interfaces mac80211 : Association with 11n hidden ssid ap. hostap: fix "registers" registration in procfs isdn/capi: Return proper errnos on module init. ... commit 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 Merge: fd9908c... 93dae5b... Author: Linus Torvalds Date: Tue May 20 17:21:32 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: sparc64: Add global register dumping facility. sparc: remove CVS keywords sparc64: remove CVS keywords commit fd9908c078b30db393e9855fb96f804793af23ba Merge: 57312b7... afba937... Author: Linus Torvalds Date: Tue May 20 17:20:49 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: USB: CDC WDM driver USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator USB: serial: ch341: New VID/PID for CH341 USB-serial USB: build fix USB: pxa27x_udc - Fix Oops USB: OPTION: fix name of Onda MSA501HS HSDPA modem USB: add TELIT HDSPA UC864-E modem to option driver usb-serial: Use ftdi_sio driver for RATOC REX-USB60F commit 57312b75aa06b09c28acd9c5a9c70827da3696d2 Merge: 1b5e2a7... 24b4256... Author: Linus Torvalds Date: Tue May 20 17:20:23 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: SCSI: fix race in device_create USB: Core: fix race in device_create USB: Phidget: fix race in device_create s390: fix race in device_create SOUND: fix race in device_create UIO: fix race in device_create Power Supply: fix race in device_create LEDS: fix race in device_create IB: fix race in device_create ide: fix race in device_create fbdev: fix race in device_create mm: bdi: fix race in bdi_class device creation Driver core: add device_create_vargs and device_create_drvdata commit 68432a03f8ff93a9eecee95cc8f02e7fe2025cc9 Merge: d71a4dd... a6f911c... Author: J. Bruce Fields Date: Tue May 20 19:57:38 2008 -0400 Merge branch 'from-tomtucker' into for-2.6.26 commit e1d50dce5af77cb6d33555af70e2b8748dd84009 Author: Jack Morgenstein Date: Tue May 20 15:41:09 2008 -0700 IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish() We saw a kernel oops in our regression testing when a multicast "join finish" occurred just after the interface was -- this is . The test randomly causes the HCA physical port to go down then up. The cause of this is that ipoib_mcast_join_finish() processing happen just after ipoib_mcast_dev_flush() was invoked (in which case the broadcast pointer is NULL). This patch tests for and handles the case where priv->broadcast is NULL. Cc: Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit d3ede327e83f202c3a0962e207318f65717c5eb7 Author: Denis V. Lunev Date: Tue May 20 15:12:44 2008 -0700 pktgen: make sure that pktgen_thread_worker has been executed The following courruption can happen during pktgen stop: list_del corruption. prev->next should be ffff81007e8a5e70, but was 6b6b6b6b6b6b6b6b kernel BUG at lib/list_debug.c:67! :pktgen:pktgen_thread_worker+0x374/0x10b0 ? autoremove_wake_function+0x0/0x40 ? _spin_unlock_irqrestore+0x42/0x80 ? :pktgen:pktgen_thread_worker+0x0/0x10b0 kthread+0x4d/0x80 child_rip+0xa/0x12 ? restore_args+0x0/0x30 ? kthread+0x0/0x80 ? child_rip+0x0/0x12 RIP list_del+0x48/0x70 The problem is that pktgen_thread_worker can not be executed if kthread_stop has been called too early. Insert a completion on the normal initialization path to make sure that pktgen_thread_worker will gain the control for sure. Signed-off-by: Denis V. Lunev Acked-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 51e779f0daa5c712439d37b907d58543e4fcf12a Author: Johannes Berg Date: Mon May 19 07:18:10 2008 +0200 mac80211: don't claim iwspy support We removed iwspy support a very long time ago because it is useless, but forgot to stop claiming to support it. Apparently, nobody cares, but remove it nonetheless. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 682c97c04b3041d0f29241b8bfa013093201e269 Author: Pavel Roskin Date: Fri May 16 17:53:03 2008 -0400 orinoco_cs: add ID for SpeedStream wireless adapters Reported by Gerald Willmann Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 449fecca0b74502b571f4199d46bcd6a11a5e2c2 Author: Pavel Roskin Date: Fri May 16 17:52:57 2008 -0400 hostap_cs: add ID for Conceptronic CON11CPro Reported by Santiago Garcia Mantinan Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit ea8ee240251cbac73b66d70d35eeabfbff86d3ce Author: Oliver Neukum Date: Thu May 15 21:49:16 2008 +0200 rtl8187: resource leak in error case This fixes resource leaks in error cases due to urb submission failures. Signed-off-by: Oliver Neukum Signed-off-by: John W. Linville commit 5fb13570543f4ae022996c9d7c0c099c8abf22dd Author: Patrick McHardy Date: Tue May 20 14:54:50 2008 -0700 [VLAN]: Propagate selected feature bits to VLAN devices Propagate feature bits from the NETDEV_FEAT_CHANGE notifier. For now only TSO is propagated for devices that announce their ability to support TSO in combination with VLAN accel by setting the NETIF_F_VLAN_TSO flag. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b9a3260f25ab5d2ba5c8b9508e7952848b9d704b Author: Steve French Date: Tue May 20 21:52:32 2008 +0000 [CIFS] Enable DFS support for Windows query path info Final piece for handling DFS in query_path_info, constructing a fake inode for the junction directory which the submount will cover. This handles the non-Unix (Windows etc.) code path. Signed-off-by: Steve French commit 7ff6e6f779960e1078a78b60a881571c04f52b9b Author: Adrian Bunk Date: Tue May 20 14:52:25 2008 -0700 drivers/atm/: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time. Signed-off-by: Adrian Bunk Acked-by: Chas Williams Signed-off-by: David S. Miller commit 89fd2e282ad510f801c1f44a660086f9d5bdf088 Author: Bob Copeland Date: Mon May 12 21:16:44 2008 -0400 ath5k: Fix loop variable initializations In ath5k_tasklet_rx, both status structures 'rxs' and 'rs' are initialized at the top of the tasklet, but not within the loop. If the loop is executed multiple times in the tasklet then the variables may see changes from previous packets. For TKIP, this results in 'Invalid Michael MIC' errors if two packets are processed in the tasklet: rxs.flag gets set to RX_DECRYPTED by mac80211 when it decrypts the first encrypted packet. The subsequent packet will have RX_DECRYPTED set upon entry to mac80211, so mac80211 will not try to decrypt it. We currently initialize all but two fields in the structures, so fix the other two. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 81d85346b3fcd8b3167eac8b5fb415a210bd4345 Author: Patrick McHardy Date: Tue May 20 14:37:36 2008 -0700 vlan: Correctly handle device notifications for layered VLAN devices Commit 30688a9 ([VLAN]: Handle vlan devices net namespace changing) changed the device notifier to special-case notifications for VLAN devices, effectively disabling state propagation to underlying VLAN devices. This is needed for layered VLANs though, so restore the original behaviour. Signed-off-by: Patrick McHardy Acked-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 0e91796eb46e29edc791131c832a2232bcaed9dd Author: David Woodhouse Date: Tue May 20 14:36:14 2008 -0700 net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() Am I just being particularly dim today, or can the call to dev->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() never happen? We've just set dev->flags = flags & IFF_MULTICAST, effectively. So the condition '(dev->flags ^ flags) & IFF_MULTICAST' is _never_ going to be true. Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit f2df824948d559ea818e03486a8583e42ea6ab37 Author: Patrick McHardy Date: Tue May 20 14:34:46 2008 -0700 net_sched: cls_api: fix return value for non-existant classifiers cls_api should return ENOENT when the requested classifier doesn't exist. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3 Author: Herbert Xu Date: Tue May 20 14:32:14 2008 -0700 ipsec: Use the correct ip_local_out function Because the IPsec output function xfrm_output_resume does its own dst_output call it should always call __ip_local_output instead of ip_local_output as the latter may invoke dst_output directly. Otherwise the return values from nf_hook and dst_output may clash as they both use the value 1 but for different purposes. When that clash occurs this can cause a packet to be used after it has been freed which usually leads to a crash. Because the offending value is only returned from dst_output with qdiscs such as HTB, this bug is normally not visible. Thanks to Marco Berizzi for his perseverance in tracking this down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f Merge: 737b0fb... eccf214... Author: Linus Torvalds Date: Tue May 20 14:28:34 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: iop-adma: fixup some kzalloc/memset confusions fsldma: update the fsldma driver MAINTAINERS info commit afba937e540c902c989cd516fd97ea0c8499bb27 Author: Oliver Neukum Date: Tue May 13 17:01:25 2008 +0200 USB: CDC WDM driver Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 129bd474a80726247e5b1c61fe66a413e63053bc Author: Lennert Buytenhek Date: Tue May 20 19:08:53 2008 +0200 USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator Commit 7329e211b987a493cbcfca0e98c60eb108ab42df ("USB: root hubs don't lie about their number of TTs") requires the various platform EHCI glue modules to set ->has_tt if the root hub has a Transaction Translator. The Orion EHCI root hub does have a Transaction Translator, so set ->has_tt in ehci_orion_setup(). This fixes oopsing on plugging in a low speed device. Signed-off-by: Lennert Buytenhek Acked-by: Nicolas Pitre Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 82078234d4023c61b9d88e8be5e795423d17538e Author: Michael F. Robbins Date: Fri May 16 23:48:42 2008 -0400 USB: serial: ch341: New VID/PID for CH341 USB-serial Recent USB-serial devices using the WinChipHead CH340/CH341 chipset are being shipped with a new vendor/product ID code pair, but an otherwise identical device. (This is confirmed by looking at INF for the included Windows driver.) Patch is tested and working, both with new and old devices. Signed-off-by: Michael F. Robbins Signed-off-by: Greg Kroah-Hartman commit f82b9878e9fe7351370d4426d9437a62c0c1ebe5 Author: Ingo Molnar Date: Fri May 16 09:30:14 2008 +0200 USB: build fix this config: http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad fails to build due to an #error. Turn that into a #warning instead to not break randconfig builds unnecessarily. Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 3f886620742edd4e7e037d7d9349be69df0ce59b Author: karl beldan Date: Fri May 16 11:30:22 2008 +0200 USB: pxa27x_udc - Fix Oops udc_disable oopses dereferencing udc_command. Signed-off-by: Karl Beldan Acked-by: Robert Jarzmik Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1b2d23d49cf4b4b1fe3b43d3ffd6077fc4ee9ac6 Author: Arnaldo Carvalho de Melo Date: Fri May 16 15:41:40 2008 -0300 USB: OPTION: fix name of Onda MSA501HS HSDPA modem This fixes the name of the onda MSA501HS device, I guess it is called different things in different countries. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman commit ee53b0ca0153b4f944cb142b5e65c96a1860d765 Author: Greg Kroah-Hartman Date: Thu May 15 10:07:44 2008 -0700 USB: add TELIT HDSPA UC864-E modem to option driver This adds the Telit UC864-E HDSPA modem support to the option driver. This lets their customers comply with the GPL instead of having to use a binary driver from the manufacturer. Cc: Simon Kissel Cc: Nico Erfurth Cc: Andrea Ghezzo Cc: Dietmar Staps Cc: stable Signed-off-by: Greg Kroah-Hartman commit 26ab705396b65a469233a8327ecb51b8aebb6be0 Author: Atsushi Nemoto Date: Sat May 17 00:13:56 2008 +0900 usb-serial: Use ftdi_sio driver for RATOC REX-USB60F This patch reverts 57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2 ("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds support for the device to ftdi_sio driver. Cc: Akira Tsukamoto Cc: stable Signed-off-by: Atsushi Nemoto Signed-off-by: Greg Kroah-Hartman commit e5ec3789c16e12a1936a3be7bdda51897a4148b8 Author: Steve Wise Date: Tue May 20 14:06:33 2008 -0700 MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit cd155c1c7c9e64df6afb5504d292fef7cb783a4f Author: Roland Dreier Date: Tue May 20 14:00:02 2008 -0700 IB/mlx4: Fix creation of kernel QP with max number of send s/g entries When creating a kernel QP where the consumer asked for a send queue with lots of scatter/gater entries, set_kernel_sq_size() incorrectly returned an error if the send queue stride is larger than the hardware's maximum send work request descriptor size. This is not a problem; the only issue is to make sure that the actual descriptors used do not overflow the maximum descriptor size, so check this instead. Clamp the returned max_send_sge value to be no bigger than what query_device returns for the max_sge to avoid confusing hapless users, even if the hardware is capable of handling a few more s/g entries. This bug caused NFS/RDMA mounts to fail when the server adapter used the mlx4 driver. Signed-off-by: Roland Dreier commit eccf2144e1232c33a8235033ffa079b6ebf92faf Author: Christophe Jaillet Date: Tue May 20 16:33:06 2008 -0700 iop-adma: fixup some kzalloc/memset confusions 1) Remove an explicit memset(.., 0, ...) to a variable allocated with kzalloc (i.e. 'dest'). 2) Allocate 'src' with kmalloc instead of kzalloc as all elements of the 'src' buffer are initialized in a 'for(...)' loop just after. 3) remove useless 'sizeof(u8)', which always returns 1, when computing the size of the memory to be allocated. Signed-off-by: Christophe Jaillet Signed-off-by: Dan Williams commit 76b0c788e6033c514f2a75171b04c73c68d28e8d Author: Zhang Wei Date: Tue May 13 14:44:59 2008 -0700 fsldma: update the fsldma driver MAINTAINERS info Add Li Yang as the new maintainer for fsldma driver and update my email address. Acked-by: Li Yang Signed-off-by: Zhang Wei Signed-off-by: Dan Williams commit 24b42566c3fcbb5a9011d1446783d0f5844ccd45 Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 SCSI: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). It fixes the problem in all of the scsi drivers that need it. Cc: Kay Sievers Cc: Doug Gilbert Cc: James E.J. Bottomley Signed-off-by: Greg Kroah-Hartman commit c013d040b70bc2bff5465917ebb255a70b650396 Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 USB: Core: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit bfd3a5a96c1dd432303fdf2283e770419f6aecb3 Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 USB: Phidget: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). It fixes all 3 phidget drivers, which all have the same problem. Cc: Kay Sievers Cc: Sean Young Signed-off-by: Greg Kroah-Hartman commit c5fb920aec2090a44aa4c33546b9f3c3affa538c Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 s390: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 5d99a8b814abd76e89ef2cf90e29bbb879d6d66c Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 SOUND: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 43691da4cefcf0d0dd6432f9e7e0dba902b59597 Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 UIO: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 54d29ad33e3483bcc7ca433a21cf294854e5154a Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 Power Supply: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: Anton Vorontsov Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 0b00fc5851551781e8a30153af2c94cee9fa84af Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 LEDS: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: Richard Purdie Signed-off-by: Greg Kroah-Hartman commit 6c06aec2487f7568cf57471a20f422568f25d551 Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 IB: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Reviewed-by: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Greg Kroah-Hartman commit 716ad8750a3ffe6b458d52da2d1c01cbf3e2f60d Author: Greg Kroah-Hartman Date: Fri May 16 17:55:12 2008 -0700 ide: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman commit 8b485877e0b9eb23c3579f50cca165f75442c6cc Author: Greg Kroah-Hartman Date: Thu May 15 13:44:08 2008 -0700 fbdev: fix race in device_create There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers Cc: James Simmons Signed-off-by: Greg Kroah-Hartman commit 19051c5035d217e572672a2ca9db06c1cef50e9b Author: Greg Kroah-Hartman Date: Thu May 15 13:44:08 2008 -0700 mm: bdi: fix race in bdi_class device creation There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_vargs(). Many thanks to Arthur Jones for reporting the bug, and testing patches out. Cc: Kay Sievers Cc: Arthur Jones Cc: Peter Zijlstra Cc: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman commit 8882b39421bae317e3ee864edd845e994307ce16 Author: Greg Kroah-Hartman Date: Thu May 15 13:44:08 2008 -0700 Driver core: add device_create_vargs and device_create_drvdata We want to have the drvdata field set properly when creating the device as sysfs callbacks can assume it is present and it can race the later setting of this field. So, create two new functions, deviec_create_vargs() and device_create_drvdata() that take this new field. device_create_drvdata() will go away in 2.6.27 as the drvdata field will just be moved to the device_create() call as it should be. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 0e4bbde94fdc33f5b3d793166b21bf768ca3e098 Author: Steve French Date: Tue May 20 19:50:46 2008 +0000 [CIFS] Enable DFS support for Unix query path info Final piece for handling DFS in unix_query_path_info, constructing a fake inode for the junction directory which the submount will cover. Acked-by: Igor Mammedov Signed-off-by: Steve French commit 737b0fbf448306975267509e6c6a074885ddb43c Merge: c110a2b... c1f69db... Author: Linus Torvalds Date: Tue May 20 10:55:04 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: correct mailing list address PCI: Correct last two HP entries in the bfsort whitelist commit c110a2bd82676a8f124cf4dfc39339fd366f0e59 Merge: 81b2dbc... 551f4cb... Author: Linus Torvalds Date: Tue May 20 10:12:48 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: prevent userspace from accessing shut down devices ieee1394: sbp2: use correct size of command descriptor block commit 81b2dbcad86732ffc02bad87aa25c4651199fc77 Author: Arjan van de Ven Date: Tue May 20 09:53:52 2008 -0700 Fix a deadlock in the bttv driver vidiocgmbuf() does this: mutex_lock(&fh->cap.vb_lock); retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, V4L2_MEMORY_MMAP); and videobuf_mmap_setup() then just does mutex_lock(&q->vb_lock); ret = __videobuf_mmap_setup(q, bcount, bsize, memory); mutex_unlock(&q->vb_lock); which is an obvious double-take deadlock. This patch fixes this by having vidiocgmbuf() just call the __videobuf_mmap_setup function instead. Acked-by: Mauro Carvalho Chehab Reported-by: Koos Vriezen Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 551f4cb9de716ffcdaf968c99a450c22ff12e8c3 Author: Jay Fenlason Date: Fri May 16 11:15:23 2008 -0400 firewire: prevent userspace from accessing shut down devices If userspace ignores the POLLERR bit from poll(), and only attempts to read() the device when POLLIN is set, it can still make ioctl() calls on a device that has been removed from the system. The node_id and generation returned by GET_INFO will be outdated, but INITIATE_BUS_RESET would still cause a bus reset, and GET_CYCLE_TIMER will return data. And if you guess the correct generation to use, you can send requests to a different device on the bus, and get responses back. This patch prevents open, ioctl, compat_ioctl, and mmap against shutdown devices. Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 93c596f7d611b379302bbdd26f31acdf72f4859a Author: Stefan Richter Date: Sun May 4 16:54:14 2008 +0200 ieee1394: sbp2: use correct size of command descriptor block Boaz Harrosh wrote: > cmd->cmd_len is now guarantied to be set properly at all cases. > And some commands you want to support will not be set correctly > by COMMAND_SIZE(). Signed-off-by: Stefan Richter commit babd90b274e6b43a7dc7bb08562bf566cbabdbf8 Merge: 424de91... 186c311... Author: Linus Torvalds Date: Tue May 20 08:49:08 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: [ALSA] hda - Fix ASUS P5GD1 model [ALSA] hda - Fix ALC262 fujitsu model snd-pcsp: use HRTIMER_CB_SOFTIRQ commit 424de91dd6163808729d7082de55c319e1096bee Merge: bca39da... f8dea7a... Author: Linus Torvalds Date: Tue May 20 08:16:25 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: remove CVS keywords HID: Add iMON LCDs to blacklist HID: add Microchip PICKit 1 and PICkit 2 to blacklist HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN. commit bca39da5645c72048e8854340575c338b8100bca Merge: 551395a... 09c2012... Author: Linus Torvalds Date: Tue May 20 08:15:34 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update defconfigs for desktop/server systems [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec [POWERPC] Update arch/powerpc/boot/.gitignore [POWERPC] Remove generated files on make clean [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword [POWERPC] Update Cell MAINTAINERS entry, add spufs entry lmb: Fix compile warning commit 551395ae667d699189014f762355e9131fc03e79 Merge: a8375bd... 00377d8... Author: Linus Torvalds Date: Tue May 20 08:15:18 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Prefer strlcpy() over snprintf() [GFS2] Fix cast from unsigned int to s64 [GFS2] filesystem consistency error from do_strip commit a8375bd81cf99cb81be37127eaf08316ecb87619 Author: Hugh Dickins Date: Tue May 20 13:59:47 2008 +0100 x86: strengthen 64-bit p?d_bad() The x86_64 pgd_bad(), pud_bad(), pmd_bad() inlines have differed from their x86_32 counterparts in a couple of ways: they've been unnecessarily weak (e.g. letting 0 or 1 count as good), and were typed as unsigned long. Strengthen them and return int. The PAE pmd_bad was too weak before, allowing any junk in the upper half; but got strengthened by the patch correcting its ~PAGE_MASK to ~PTE_MASK. The PAE pud_bad already said ~PTE_MASK; and since it folds into pgd_bad, and we don't set the protection bits at that level, it'll do as is. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit cbb3077cbe718795d7ae5d78ed11659ca73c97b9 Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:24 2008 +0100 xen: use PTE_MASK in pte_mfn() Use PTE_MASK to extract mfn from pte. Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit ba23cef5c23cf1e9298032037d919157553d1211 Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:23 2008 +0100 x86: use PTE_MASK rather than ad-hoc mask Use ~PTE_MASK to extract the non-pfn parts of the pte (ie, the pte flags), rather than constructing an ad-hoc mask. Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 86aaf4fd4ea25ddde05772d03b93dbce23c0ead1 Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:22 2008 +0100 x86: clarify use of _PAGE_CHG_MASK _PAGE_CHG_MASK is defined as the set of bits not updated by pte_modify(); specifically, the pfn itself, and the Accessed and Dirty bits (which are updated by hardware). Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 7f84133af6aaa86e9ef0e9e1970655439a8cf3a1 Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:21 2008 +0100 x86: use PTE_MASK in pgtable_32.h Signed-off-by: Linus Torvalds commit a4d6886270a5c892d71cd6e09186196a150a50dc Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:20 2008 +0100 x86: use PTE_MASK in 32-bit PAE Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE). Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit c57c05d0032cd5a500c5eba18ede4867a6d2cd5f Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:19 2008 +0100 x86: rearrange __(VIRTUAL|PHYSICAL)_MASK Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses. Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 1bb271db63c356212564aad050b2cf026f800858 Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:18 2008 +0100 x86: fix warning on 32-bit non-PAE Fix the warning: include2/asm/pgtable.h: In function `pte_modify': include2/asm/pgtable.h:290: warning: left shift count >= width of type On 32-bit PAE the virtual and physical addresses are both 32-bits, so it ends up evaluating 1<<32. Do the shift as a 64-bit shift then cast to the appropriate size. This should all be done at compile time, and so have no effect on generated code. Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 2bd3a99c9d1851182f73d0a024dc5bdb0a470e8c Author: Jeremy Fitzhardinge Date: Tue May 20 08:26:17 2008 +0100 x86: define PTE_MASK in a universally useful way Define PTE_MASK so that it contains a meaningful value for all x86 pagetable configurations. Previously it was defined as a "long" which means that it was too short to cover a 32-bit PAE pte entry. It is now defined as a pteval_t, which is an integer type long enough to contain a full pte (or pmd, pud, pgd). This fixes an Xorg crash on 32-bit x86 with PAE due to corruption of the NX bit in mprotect due to the incorrect type/value of PTE_MASK reported by Hugh Dickins: "Yes, thanks Jeremy: I've checked that each stage builds and runs X on my boxes here, x86_32 and x86_32+PAE and x86_64. (So even 1/8 is enough to fix the PAT pte_modify issue, though 2/8 then fixes compiler warnings.)" Signed-off-by: Jeremy Fitzhardinge Tested-by: Hugh Dickins Signed-off-by: Linus Torvalds commit f8dea7a3d47ee7c857965b22e33229e7de410a88 Author: Adrian Bunk Date: Tue May 20 01:31:25 2008 +0200 HID: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: Jiri Kosina commit 0952c9e8eda6dea621176b2263323e74d05f50c1 Author: Dylan R Semler Date: Wed May 14 11:38:14 2008 +0200 HID: Add iMON LCDs to blacklist The new iMON LCDs from SoundGraph need to be blacklisted from HID in order to be used by lirc. Signed-off-by: Dylan R Semler Signed-off-by: Jiri Kosina commit f4971031f4acd98423a2903c6517fb3ef1aea8dc Author: Xiaofan Chen Date: Tue May 13 17:11:59 2008 +0200 HID: add Microchip PICKit 1 and PICkit 2 to blacklist Microchip PICkit 1 and PICKit 2 USB Programmers are USB HID class of device but they are not real HID device. They are now supported by libusb based programs like the following programs. pk2 and pk2cmd Linux port: http://home.pacbell.net/theposts/picmicro/ usb_pickit: http://tfc.duke.free.fr/pickit.html usb_pickit original version: http://charm.cs.uiuc.edu/users/olawlor/projects/2003/microchip/ Therefore it ispreferred to blacklist them. Signed-off-by: Xiaofan Chen Signed-off-by: Jiri Kosina commit 6e7045990f35ef9250804b3fd85e855b8c2aaeb6 Author: Diego 'Flameeyes' Petteno Date: Mon May 5 16:20:50 2008 +0200 HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN. Since 2.6.25 the HID_QUIRK_APPLE_HAS_FN quirk is enabled even for non-laptop Apple keyboards of the Aluminium series. The USB version of these don't need Numlock emulation, like the laptop (and Aluminium Wireless) do, as they have a proper keypad. This patch splits the Numlock emulation for Apple keyboards in a different quirk flag, so that it can be enabled for all the keyboards but the Aluminium USB ones. If the Numlock emulation is enabled for Aluminium USB keyboards, the JKL and UIO keys become the numeric pad, and the rest of the keyboard is disabled, included the key used to disable Numlock. Additionally, these keyboard should not have a Numlock at all, as the Numlock key is instead replaced by the 'Clear' key as usual for Apple USB keyboards. Signed-off-by: Diego 'Flameeyes' Petteno Signed-off-by: Jiri Kosina commit 09c201219b000c5d79a7a7ebeb2f9768e97224fc Author: Paul Mackerras Date: Tue May 20 20:04:12 2008 +1000 [POWERPC] Update defconfigs for desktop/server systems Signed-off-by: Paul Mackerras commit 186c3117f8aac0b2ac5290aaed254fcfdcc937de Author: Travis Place Date: Tue May 20 11:54:41 2008 +0200 [ALSA] hda - Fix ASUS P5GD1 model Corrected the model assignment for the ASUS P5GD1 w/SPDIF after reports of surround sound not being possible. Signed-off-by: Travis Place Signed-off-by: Takashi Iwai commit ebc7a406633acefc6d12c1ccc9441bfef69e0f33 Author: Takashi Iwai Date: Tue May 20 09:23:05 2008 +0200 [ALSA] hda - Fix ALC262 fujitsu model Fixed the speaker auto-mute with two laptop and docking headphones. Signed-off-by: Takashi Iwai Acked-by: Tony Vroon commit 4b7afb0d0d23b298a7e6d30eaba0679449542d2e Author: Stas Sergeev Date: Tue May 20 11:47:29 2008 +0200 snd-pcsp: use HRTIMER_CB_SOFTIRQ Change HRTIMER_CB_IRQSAFE to HRTIMER_CB_SOFTIRQ, as suggested by Thomas Gleixner. That solves the lock dependancy reported in Bug #10701. That also allows to call hrtimer_start() directly, tasklet "stupid hack" removed. Signed-off-by: Stas Sergeev Acked-by: Thomas Gleixner Signed-off-by: Takashi Iwai commit 927c258ac6c68868c6d36ce6cc17cda831ab8738 Merge: d3d3d3c... 8939700... Author: Paul Mackerras Date: Tue May 20 19:46:37 2008 +1000 Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge commit 93dae5b70e7c1c8e927d22e1c20a941ca376906a Author: David S. Miller Date: Mon May 19 23:46:00 2008 -0700 sparc64: Add global register dumping facility. When a cpu really is stuck in the kernel, it can be often impossible to figure out which cpu is stuck where. The worst case is when the stuck cpu has interrupts disabled. Therefore, implement a global cpu state capture that uses SMP message interrupts which are not disabled by the normal IRQ enable/disable APIs of the kernel. As long as we can get a sysrq 'y' to the kernel, we can get a dump. Even if the console interrupt cpu is wedged, we can trigger it from userspace using /proc/sysrq-trigger The output is made compact so that this facility is more useful on high cpu count systems, which is where this facility will likely find itself the most useful :) Signed-off-by: David S. Miller commit 88278ca27a43ae503572b52ea2c171fbf45db5a2 Author: Adrian Bunk Date: Mon May 19 16:53:02 2008 -0700 sparc: remove CVS keywords This patch removes the CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit b00dc8376465ee5f8dd49b95924e31b4c2404ab0 Author: Adrian Bunk Date: Mon May 19 16:52:27 2008 -0700 sparc64: remove CVS keywords This patch removes the CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 8939700edcd2bdb7a1af0defceb2532ee2565bc3 Author: Kumar Gala Date: Sun May 18 13:30:03 2008 -0500 [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec Signed-off-by: Kumar Gala commit 4978757987e5535614a1307bf8ccc938e28765a9 Author: Kumar Gala Date: Sun May 18 13:25:28 2008 -0500 [POWERPC] Update arch/powerpc/boot/.gitignore * Add dtbImage.* * Added zImage.holly * Folded zImage.coff.lds into zImage.*lds * Removed some unused zImage. ignores Signed-off-by: Kumar Gala commit b58a45752886bdd282b1e707e01d41454ab7e271 Author: Kumar Gala Date: Sun May 18 13:23:03 2008 -0500 [POWERPC] Remove generated files on make clean dtbImage.* and several zImage. targets get created but never cleaned up. Also, moved zImage to the clean-files line associated with all other image results (was previously duplicated). Signed-off-by: Kumar Gala commit 6f704992d3658aadff9e506c7fd80957fce33c5f Author: YOSHIFUJI Hideaki Date: Mon May 19 16:56:11 2008 -0700 ipv6 addrconf: Allow infinite prefix lifetime. We need to handle infinite prefix lifetime specially. With help from original reporter "Bonitch, Joseph" . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 69cdf8f92a8dd191eee0e834c631d84a140b1121 Author: YOSHIFUJI Hideaki Date: Mon May 19 16:55:13 2008 -0700 ipv6 route: Fix lifetime in netlink. We could not see appropriate lifetime if the route had been scheduled to expired at 0 (in jiffies). We should check rt6i_flags instead of rt6i_expires to determine whether lifetime is valid or not. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit a3264435b4ca1ccee54cbef2970f2ba4bef39e2d Author: YOSHIFUJI Hideaki Date: Mon May 19 16:54:29 2008 -0700 ipv6 addrconf: Fix route lifetime setting in corner case. Because of arithmetic overflow avoidance, the actual lifetime setting (vs the value given by RA) did not increase monotonically around 0x7fffffff/HZ. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 8033c6e9736c29cce5f0d0abbca9a44dffb20c39 Merge: 2d3cf58... e5c0ef9... Author: Linus Torvalds Date: Mon May 19 16:40:30 2008 -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: at91_mci: minor cleanup mmc: mmc host test driver mmc: Fix omap compile by replacing dev_name with dma_dev_name commit 2d3cf588e9bf6df0a22581baece7edeacfbbc9f5 Author: Brice Goglin Date: Sat May 17 12:45:36 2008 +0200 Add maintainers for myri10ge driver Add a MAINTAINERS entry for the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Linus Torvalds commit 16ae527bfa03c6c82328098eafae972807ed32d4 Merge: e23a5f6... 6793a05... Author: Linus Torvalds Date: Mon May 19 16:38:10 2008 -0700 Merge branch 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] list_for_each_rcu must die: audit [patch 1/1] audit_send_reply(): fix error-path memory leak [PATCH] open sessionid permissions commit e23a5f66877d32f21a2ac15a200ad4a2b4c8b0ee Merge: c9091f9... e9baf6e... Author: Linus Torvalds Date: Mon May 19 16:37:45 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] return to old errno choice in mkdir() et.al. [Patch] fs/binfmt_elf.c: fix wrong return values [PATCH] get rid of leak in compat_execve() [Patch] fs/binfmt_elf.c: fix a wrong free [PATCH] avoid multiplication overflows and signedness issues for max_fds [PATCH] dup_fd() part 4 - race fix [PATCH] dup_fd() - part 3 [PATCH] dup_fd() part 2 [PATCH] dup_fd() fixes, part 1 [PATCH] take init_files to fs/file.c commit c9091f9e571386992c8c5badcec84d49753b9df1 Merge: cc2020e... 13c501e... Author: Linus Torvalds Date: Mon May 19 16:36:28 2008 -0700 Merge branch 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx * 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx: [POWERPC] 4xx: Workaround for CHIP_11 Errata commit cc2020e62dd607ef907bb44325ac95cbb5b76eb2 Author: Alan Cox Date: Mon May 19 14:21:51 2008 +0100 MAINTAINERS needs further order fixing Signed-off-by: Linus Torvalds commit d3d3d3cdb12dcc72e7bbff3d01073b7600349d3c Author: Adrian Bunk Date: Tue May 20 01:07:25 2008 +0300 [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword This removes a CVS keyword that wasn't updated for a long time from a comment. Signed-off-by: Adrian Bunk Signed-off-by: Paul Mackerras commit 754cdd4aba225b74dcc35cc384aeb0c42b505e8b Merge: db07b02... 460ed2e... Author: Linus Torvalds Date: Mon May 19 16:33:29 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN Blackfin serial driver: add extra IRQ flag for 8250 serial driver 8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board Blackfin arch: Fix bug - USB fails to build for BF524/BF526 Blackfin arch: update boards defconfig files Blackfin arch: IO Port functions to read/write unalligned memory Blackfin arch: enable a choice to provide 4M DMA memory Blackfin arch: cleanup the icplb/dcplb multiple hit checks Blackfin arch: Add workaround to read edge triggered GPIOs Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr. Blackfin arch: Check for Anomaly 05000182 [Blackfin] arch: rename bf5xx-flash to bfin-async-flash [Blackfin] arch: Blackfin checksum annotations commit db07b02304d0d70bf8273abc93d94e4c8d2f9cec Merge: 88e6c94... 336f1d3... Author: Linus Torvalds Date: Mon May 19 16:33:08 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix up restorer in debug_trap exception return path. sh: Make is_valid_bugaddr() more intelligent on nommu. sh: use the common ascii hex helpers sh: fix sh7785 master clock value sh: Fix up thread info pointer in syscall_badsys resume path. sh: Fix up optimized SH-4 memcpy on big endian. sh: disable initrd defaults in .empty_zero_page. sh: display boot params by default on entry. commit 44dc19c829c057dc78a5ffacaf851ac4c301eb58 Merge: 0686caa... 229ce3a... Author: David S. Miller Date: Mon May 19 16:29:40 2008 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 88e6c9499f959cdac9ef120a1a1e857da5944052 Merge: 8c4bab3... c85665f... Author: Linus Torvalds Date: Mon May 19 16:29:29 2008 -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: (28 commits) drivers/ata: trim trailing whitespace Fixups to ATA ACPI hotplug libata: ignore SIMG4726 config pseudo device sata_sil24: don't use NCQ if marvell 4140 PMP is attached libata: don't schedule LPM action seperately during probing libata: make sure PMP notification is turned off during recovery libata: increase PMP register access timeout to 3s libata: ignore recovered PHY errors libata: kill hotplug related race condition libata: move reset freeze/thaw handling into ata_eh_reset() libata: reorganize ata_eh_reset() no reset method path libata: fix sata_link_hardreset() @online out parameter handling sata_promise: other cleanups sata_promise: mmio access cleanups sata_promise: fix irq clearing buglets ata: remove FIT() macro sata_mv: ensure empty request queue for FBS-NCQ EH sata_mv: cache main_irq_mask register in hpriv sata_mv: disregard masked irqs sata_mv: fix pmp drives not found ... commit 0686caa35ed17cf5b9043f453957e702a7eb588d Author: YOSHIFUJI Hideaki Date: Mon May 19 16:25:42 2008 -0700 ndisc: Add missing strategies for per-device retrans timer/reachable time settings. Noticed from Al Viro via David Miller . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b815454221665b9253f68606bc27f8189ac9dce4 Author: Arnd Bergmann Date: Fri May 16 11:10:59 2008 +0200 [POWERPC] Update Cell MAINTAINERS entry, add spufs entry The MAINTAINERS file entry for the cell platform is outdated, even the name of the platform changed since the early days when it was initially submitted. The SPU file system is now maintained by Jeremy Kerr. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit c1f69db782595a9869395dad4b60d331906c22ef Author: Jesse Barnes Date: Mon May 19 15:28:16 2008 -0700 PCI: correct mailing list address Forgot to update the PCI error handling address with the new @vger one. Signed-off-by: Jesse Barnes commit 89562b777c50d100d1694db7b1b023279839b9ae Author: Steve French Date: Mon May 19 22:26:42 2008 +0000 [CIFS] add missing seq_printf to cifs_show_options for hard mount option Also Kari Hurtta noticed a missing check in the same function which is now fixed. CC: Kari Hurtta Signed-off-by: Steve French commit 667ad4f70110357e8f024e81741c7bd1d7906e7d Author: maximilian attems Date: Thu May 8 22:10:01 2008 +0200 [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq The longrun cpufreq module reports a false minimum frequency 3MHz on 300-600MHz Crusoe processor. This may be due to a calculation bug in the module. Original patch from Kaz Sasayama submitted as http://bugs.debian.org/468149 patch ported to x86 Cc: Kaz Sasayama Signed-off-by: maximilian attems Signed-off-by: Dave Jones commit eba9fe93a2959ec7f195c47c9db6ce7b5114ce1f Author: Mark Langsdorf Date: Tue Mar 18 15:24:32 2008 -0500 [CPUFREQ] powernow-k8: improve error messages The most common error with powernow-k8 is an ACPI _PSS error caused either by failure to load the ACPI processor module or a bad parse of the _PSS object. Make the error message returned to the user in these situations more straightforward and easier to understand. -Mark Langsdorf Operating System Research Center AMD Signed-off-by: Mark Langsdorf Signed-off-by: Andreas Herrmann Signed-off-by: Dave Jones commit c85665ffa8e351a5b38f8e4ceaec527d8783c970 Author: Jeff Garzik Date: Mon May 19 17:56:10 2008 -0400 drivers/ata: trim trailing whitespace Signed-off-by: Jeff Garzik commit ae6c23c4e1ec9720b99e1e6850fe47c6c7fddbb3 Author: Matthew Garrett Date: Mon May 19 17:29:34 2008 +0100 Fixups to ATA ACPI hotplug The libata-acpi.c code currently accepts hotplug messages from both the port and the device. This does not match the behaviour of the bay driver, and may result in confusion when two hotplug requests are received for the same device. This patch limits the hotplug notification to removable ACPI devices, which in turn allows it to use the _STA method to determine whether the device has been removed or inserted. On removal, devices are marked as detached. On insertion, a hotplug scan is started. This should avoid lockups caused by the ata layer attempting to scan devices which have been removed. The uevent sending is moved outside the spinlock in order to avoid a warning generated by it firing when interrupts are disabled. Signed-off-by: Matthew Garrett Signed-off-by: Jeff Garzik commit 50af2fa1e18d0ab411d06bf727ecadb7e01721e9 Author: Tejun Heo Date: Mon May 19 01:15:14 2008 +0900 libata: ignore SIMG4726 config pseudo device I was hoping ATA_HORKAGE_NODMA | ATA_HORKAGE_SKIP_PM could keep it happy but no even this doesn't work under certain configurations and it's not like we can do anything useful with the cofig device anyway. Replace ATA_HORKAGE_SKIP_PM with ATA_HORKAGE_DISABLE and use it for the config device. This makes the device completely ignored by libata. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 906c1ff44a81aaad96a9feb40ea13d73bbf3662a Author: Tejun Heo Date: Mon May 19 01:15:13 2008 +0900 sata_sil24: don't use NCQ if marvell 4140 PMP is attached When 4140 PMP is attached to sil24, NCQ commands to fan out port 1 and 2 (0 based) often stall if commands are in progress to other ports. I've tried a number of things but can't tell what's going on. It never happens w/ ahci and reportedly sata_mv which can issue NCQ commands to multiple devices simultaneously like sil24 does. Disable NCQ for devices behind 4140 PMP for the time being. Signed-off-by: Tejun Heo Cc: Mark Lord Signed-off-by: Jeff Garzik commit 391191c116c088edc6794a6e5ace10a13928c2f6 Author: Tejun Heo Date: Mon May 19 01:15:12 2008 +0900 libata: don't schedule LPM action seperately during probing There's no reason to schedule LPM action after probing is complete causing another EH iteration. Just schedule it together with probing itself. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f1bbfb90e81dd84d59de6370689ee6fe6a71fee0 Author: Tejun Heo Date: Mon May 19 01:15:11 2008 +0900 libata: make sure PMP notification is turned off during recovery PMP notification during reset can make some controllers fail reset processing and needs to be turned off during resets. PMP attach and full-revalidation path did this via sata_pmp_configure() but the quick revalidation wasn't. Move the notification disable code right above fan-out port recovery so that it's always turned off. This fixes obscure reset failures. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bf1bff6fa9fdd4e92e57d80a5434fd5201c051fc Author: Tejun Heo Date: Mon May 19 01:15:10 2008 +0900 libata: increase PMP register access timeout to 3s This timeout was set low because previously PMP register access was done via polling and register access timeouts could stack up. This is no longer the case. One timeout will make all following accesses fail immediately. In rare cases both marvell and SIMG PMPs need almost a second. Bump it to 3s. While at it, rename it to SATA_PMP_RW_TIMEOUT. It's not specific to SCR access. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e0614db2a398d4d0dc5fb47fe2c2783141262a3e Author: Tejun Heo Date: Mon May 19 01:15:09 2008 +0900 libata: ignore recovered PHY errors No reason to get overzealous about recovered comm and data errors. Some PHYs habitually sets them w/o no good reason and being draconian about these soft error conditions doesn't seem to help anybody. If need ever rises, we might need to add soft PHY error condition, say AC_ERR_MAYBE_ATA_BUS and use it only to determine whether speed down is necessary but I don't think that's very likely to happen. It's far more likely we'll get timeouts or fatal transmission errors if recovered errors are so prominent that they hamper operation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f046519fc85a8fdf6a058b4ac9d897cdee6f3e52 Author: Tejun Heo Date: Mon May 19 01:15:08 2008 +0900 libata: kill hotplug related race condition Originally, whole reset processing was done while the port is frozen and SError was cleared during @postreset(). This had two race conditions. 1: hotplug could occur after reset but before SError is cleared and libata won't know about it. 2: hotplug could occur after all the reset is complete but before the port is thawed. As all events are cleared on thaw, the hotplug event would be lost. Commit ac371987a81c61c2efbd6931245cdcaf43baad89 kills the first race by clearing SError during link resume but before link onlineness test. However, this doesn't fix race #2 and in some cases clearing SError after SRST is a good idea. This patch solves this problem by cross checking link onlineness with classification result after SError is cleared and port is thawed. Reset is retried if link is online but all devices attached to the link are unknown. As all devices will be revalidated, this one-way check is enough to ensure that all devices are detected and revalidated reliably. This, luckily, also fixes the cases where host controller returns bogus status while harddrive is spinning up after hotplug making classification run before the device sends the first FIS and thus causes misdetection. Low level drivers can bypass the logic by setting class explicitly to ATA_DEV_NONE if ever necessary (currently none requires this). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit dc98c32cbe80750ae2d9d9fbdae305d38f005de7 Author: Tejun Heo Date: Mon May 19 01:15:07 2008 +0900 libata: move reset freeze/thaw handling into ata_eh_reset() Previously reset freeze/thaw handling lived outside of ata_eh_reset() mainly because the original PMP reset code needed the port frozen while resetting all the fan-out ports, which is no longer the case. This patch moves freeze/thaw handling into ata_eh_reset(). @prereset() and @postreset() are now called w/o freezing the port although @prereset() an be called frozen if the port is frozen prior to entering ata_eh_reset(). This makes code simpler and will help removing hotplug event related races. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 932648b007de76badc61c1b13d7282288dbe887e Author: Tejun Heo Date: Mon May 19 01:15:06 2008 +0900 libata: reorganize ata_eh_reset() no reset method path Reorganize ata_eh_reset() such that @prereset() is called even when no reset method is available and if block is used instead of goto to skip actual reset. This makes no reset case behave better (readiness wait) and future changes easier. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0cbf0711a1ebcc4d3aea8e11def684afc2c07ef8 Author: Tejun Heo Date: Mon May 19 01:15:05 2008 +0900 libata: fix sata_link_hardreset() @online out parameter handling The @online out parameter is supposed to set to true iff link is online and reset succeeded as advertised in the function description and callers are coded expecting that. However, sata_link_reset() didn't behave this way on device readiness test failure. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7715a6f9cdb9c1422d2b1f4fea21b1fe86b5b0fe Author: Mikael Pettersson Date: Sat May 17 18:49:09 2008 +0200 sata_promise: other cleanups Minor coding-style fixes for sata_promise: - remove stray blank lines - fix checkpatch.pl errors; warnings about long lines remain, but I don't intend to address those at this time - remove two inline directives: neither is essential and both functions are trivially inlinable anyway by virtue of being static and having a single unique call site - fix comment in pdc_interrupt(): the bits in PDC_INT_SEQMASK denote SEQIDs not tags, the distinction becomes important when NCQ gets implemented Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 821d22cdcd3c2944b93ac5f217ec0b6593ae6f48 Author: Mikael Pettersson Date: Sat May 17 18:48:15 2008 +0200 sata_promise: mmio access cleanups This patch cleans up sata_promise's mmio accesses. In sata_promise there are three distinct mmio address spaces: 1. global registers, offsets from host->iomap[PDC_MMIO_BAR] 2. per-port ATA registers, offsets from ap->ioaddr.cmd_addr 3. per-port SATA registers, offsets from ap->ioaddr.scr_addr The driver currently often fails to indicate which address space a given mmio base pointer refers to, which is a source of bugs and confusion (see recent pdc_thaw() irq clearing bug; it's also been an obstacle for the pending NCQ extensions). To reduce these problems, adopt a coding style where the name of a base pointer always indicates which address space it refers to: 1. global registers: host_mmio 2. per-port ATA registers: ata_mmio 3. per-port SATA registers: sata_mmio Also rearrange register offset definitions to clearly indicate which address space they belong to, and add a symbolic definition for the previously hard-coded PHYMODE4 register. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit a13db78e2209ebfe1898207f53c353ed836d4a53 Author: Mikael Pettersson Date: Sat May 17 18:47:35 2008 +0200 sata_promise: fix irq clearing buglets This patch fixes two bugs in sata_promise's irq status clearing paths: 1. When clearing the irq status for a specific port, the driver read the global SEQMASK register. This is wrong because that clears the irq status for _all_ ports. 2. pdc_thaw() incorrectly added the PDC_INT_SEQMASK host register offset to a per-port ata engine base address. This resulted in it reading the unrelated PDC_PKT_SUBMIT register, which did not have the desired irq status clearing effect. In both cases the fix is to read from the port's Command/Status register. This also matches what Promise's own driver does. Signed-off-by: Mikael Pettersson Signed-off-by: Jeff Garzik commit 07633b5d0723ce2ec31262e1096dcf61311bf078 Author: Harvey Harrison Date: Wed May 14 16:17:00 2008 -0700 ata: remove FIT() macro Use the kernel-provided clamp_val() macro. FIT was always applied to a member of struct ata_timing (unsigned short) and two constants. clamp_val will not cast to short anymore. Signed-off-by: Harvey Harrison Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 06aaca3f6301d04463b1ee0eb75c0352147159f2 Author: Mark Lord Date: Mon May 19 09:01:24 2008 -0400 sata_mv: ensure empty request queue for FBS-NCQ EH Check for an empty request queue before stopping EDMA after a FBS-NCQ error, as per recommendation from the Marvell datasheet. This ensures that the EDMA won't suddenly become active again just after our subsequent check of the empty/idle bits. Also bump DRV_VERSION. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 96e2c487933e5f69e98fffdcae2c35c78a671c07 Author: Mark Lord Date: Sat May 17 13:38:00 2008 -0400 sata_mv: cache main_irq_mask register in hpriv Part five of simplifying/fixing handling of the main_irq_mask register to resolve unexpected interrupt issues observed in 2.6.26-rc*. Keep a cached copy of the main_irq_mask so that we don't have to stall the CPU to read it on every pass through mv_interrupt. This significantly speeds up interrupt handling, both for sata_mv, and for any other driver/device sharing the same PCI IRQ line. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit a44253d24a97ec3efe601267274a5fb64d8696c1 Author: Mark Lord Date: Sat May 17 13:37:07 2008 -0400 sata_mv: disregard masked irqs Part four of simplifying/fixing handling of the main_irq_mask register to resolve unexpected interrupt issues observed in 2.6.26-rc*. Ignore masked IRQs in mv_interrupt(). This prevents "unexpected device interrupt while idle" messages. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 88e675e193159b9891c1c576de4348eaf490f5d0 Author: Mark Lord Date: Sat May 17 13:36:30 2008 -0400 sata_mv: fix pmp drives not found Part three of simplifying/fixing handling of the main_irq_mask register to resolve unexpected interrupt issues observed in 2.6.26-rc*. Partially fix a reported bug whereby we sometimes miss seeing drives on a port-multiplier, as reported by Gwendal Grignou . The problem was that we were receiving unexpected interrupts during EH from POLLed commands while accessing port-multiplier registers. These unexpected interrupts can be prevented by masking the DONE_IRQ bit for the port whenever not operating in EDMA mode. Also fix port_stop() to mask all port interrupts. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit c4de573b14d78ac83861d81d12977457d1e9cb6d Author: Mark Lord Date: Sat May 17 13:35:21 2008 -0400 sata_mv: consolidate main_irq_mask updates Part two of simplifying/fixing handling of the main_irq_mask register to resolve unexpected interrupt issues observed in 2.6.26-rc*. Consolidate all updates of the host main_irq_mask register into a single function. This simplifies maintenance, and also prepares the way for caching it (later). No functionality changes in this update. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 51de32d200b21333950abc52ea1e589bc4eecef7 Author: Mark Lord Date: Sat May 17 13:34:42 2008 -0400 sata_mv: don't blindly enable IRQs Part one of simplifying/fixing handling of the main_irq_mask register to resolve unexpected interrupt issues observed in 2.6.26-rc*. Don't blindly enable port IRQs at host init time. Instead, enable only the bits that we want, which in this case is simply the PCI_ERR bit. The per-port bits can wait until the ports are reset/probed for devices. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit c443c5002b24ff5d2f4efcc25a861f0cb835130a Author: Mark Lord Date: Wed May 14 09:24:39 2008 -0400 sata_mv: async notify for genIIe only Now that we handle the FIS_IRQ_CAUSE register correctly, we can also now handle SATA asynchronous notification events. So enable them, but only for the more modern GenIIe chips. (older chips have unaddressed errata issues related to this). This fixes hot plug/unplug for port-muliplier ports. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit ad3aef51e17b9c6a90a9014805f1645e8e441c17 Author: Mark Lord Date: Wed May 14 09:21:43 2008 -0400 sata_mv: group genIIe flags Group all of the flags for GenIIe devices into a common definition, to ensure that any updates to them are shared by all GenIIe devices. This will help make future maintenance somewhat simpler. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit e40060772d85f3534d3d517197696e24bb01f45b Author: Mark Lord Date: Wed May 14 09:19:30 2008 -0400 sata_mv: fis irq register fixes Fix handling of the FIS_IRQ_CAUSE register in sata_mv. This register exists *only* on GenIIe devices, so don't bother writing to it on older chips. Also, it has to be read/cleared in mv_err_intr() before clearing the main ERR_IRQ_CAUSE register. This keeps sata_mv from getting stuck forever on certain error types. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055 Author: Mark Lord Date: Wed May 14 09:18:12 2008 -0400 sata_mv: always do softreset Always request a softreset after hardreset succeeds. This fixes a regression reported by Martin Michlmayr . Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 68b90ee7c8046864301823d8d4449eb1ce1d2f74 Author: Christophe Jaillet Date: Tue May 13 21:17:30 2008 +0200 avr32/pata: avoid unnecessary memset (updated after comments) Remove an explicit memset(.., 0, ...) to a variable allocated with kzalloc (i.e. 'info'). Signed-off-by: Christophe Jaillet Acked-by: Haavard Skinnemoen Signed-off-by: Jeff Garzik commit b6e7b447975b0364c3430284c7b16e2e89ccf9e9 Author: Sonic Zhang Date: Mon May 12 12:12:16 2008 +0800 pata-bf54x: Set ATAPI HSM to control IDE device terminate sequence. Set ATAPI host state machine to control IDE device terminate sequence. Some IDE harddisk may assert terminate sequence in the middle of a formal DMA transaction and resume later. Bit DETECT_TERM in ATAPI_CTRL register determines whether the ATAPI host state machine or the kernel driver should take care of this case. Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu Signed-off-by: Jeff Garzik commit e6da97e7df385a1674cf9f72c31b7a0e46e2620d Author: Robert P. J. Day Date: Mon May 19 14:13:11 2008 -0700 ipv6: Move from header-y to unifdef-y. Given that contains a __KERNEL__ test, it should be unifdef-ed. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 090c48d3dd5ea90b37350334aaed9a93b0c1e0a1 Author: James Chapman Date: Mon May 19 14:10:01 2008 -0700 l2tp: avoid skb truesize bug if headroom is increased A user reported seeing occasional bugs such as the following when using the L2TP driver. SKB BUG: Invalid truesize (272) len=72, sizeof(sk_buff)=208 When L2TP adds its header in the transmit path, it might need to increase the headroom of the skb. In some cases, the increased headroom trips a kernel bug when the skb is freed because the skb has grown beyond its truesize value. The fix is to increase the truesize by the amount of headroom added, after orphaning the skb. While here, fix a misleading comment. Thanks to Iouri Kharon for the initial report and testing the fix. Signed-off-by: James Chapman Signed-off-by: David S. Miller commit 8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4 Merge: 88d5376... c3cc3bd... Author: Linus Torvalds Date: Mon May 19 14:04:47 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: should be "unifdef"ed. dlm: fix plock dev_write return value dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL dlm: section mismatch warning fix dlm: convert connections_lock in a mutex commit 88d53766bd0f3bc6e46a0dff25be147a2b98c511 Merge: 860da5e... 54aaace... Author: Linus Torvalds Date: Mon May 19 13:53:21 2008 -0700 Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: LAPIC: ignore pending timers if LVTT is disabled KVM: Update MAINTAINERS for new mailing lists KVM: Fix kvm_vcpu_block() task state race KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48 KVM: ia64: fix GVMM module including position-dependent objects KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg KVM: PIT: take inject_pending into account when emulating hlt s390: KVM guest: fix compile error KVM: x86 emulator: fix writes to registers with modrm encodings commit c3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902 Author: Robert P. J. Day Date: Sat May 17 16:58:28 2008 -0400 dlm: should be "unifdef"ed. Given that contains a conditional __KERNEL__ test, it should be moved from header-y to unifdef-y. Signed-off-by: Robert P. J. Day Signed-off-by: David Teigland commit 817d10bad56f2fdfa321b4a864a21295226b123a Author: David Teigland Date: Tue May 13 14:28:26 2008 -0500 dlm: fix plock dev_write return value The return value on writes to the plock device should be the number of bytes written. It was returning 0 instead when an nfs lock callback was involved. Reported-by: Nathan Straz Signed-off-by: David Teigland commit 0035a4b14931eb62a5f8a7762284c18e7ab14289 Author: Marcin Slusarz Date: Sun May 11 22:01:29 2008 +0200 dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL Signed-off-by: Marcin Slusarz Cc: Christine Caulfield Cc: David Teigland Cc: cluster-devel@redhat.com Signed-off-by: David Teigland commit 88ad23195e4609cef73b6fcf2b4c08aaaef33204 Author: Leonardo Potenza Date: Sun May 11 19:15:34 2008 +0200 dlm: section mismatch warning fix Removed the section mismatch message: WARNING: fs/dlm/dlm.o(.init.text+0x132): Section mismatch in reference from the function init_module() to the function .exit.text:dlm_netlink_exit() Since dlm_netlink_exit() is called in the init_dlm() error handling, the __exit annotation has been removed. Signed-off-by: Leonardo Potenza Signed-off-by: David Teigland commit 7a936ce71eed7b887b8a0d6c54dd8a9072f71c9f Author: Matthias Kaehlcke Date: Mon May 12 10:04:51 2008 -0500 dlm: convert connections_lock in a mutex The semaphore connections_lock is used as a mutex. Convert it to the mutex API. Signed-off-by: Matthias Kaehlcke Cc: Christine Caulfield Cc: David Teigland Cc: Steven Whitehouse Signed-off-by: Andrew Morton Signed-off-by: David Teigland commit 860da5e578c25d1ab4528c0d1ad13f9969e3490f Merge: 1bf9947... e948e99... Author: Linus Torvalds Date: Mon May 19 13:30:40 2008 -0700 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: save and restore dsparb and d_state registers. drm/i915: fix off by one in VGA save/restore of AR & CR regs. drm: disable tasklets not IRQs when taking the drm lock spinlock Revert "drm/vbl rework: rework how the drm deals with vblank." commit 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a Author: Tony Camuso Date: Thu May 15 14:40:14 2008 -0400 PCI: Correct last two HP entries in the bfsort whitelist Replace Redundant Whitelist Entries with the Correct Ones The ProLiant DL585 G2 and the DL585 G2 are entered reundantly in the dmi_system_id table. What should have been there are the DL360 and DL380. This patch simply replaces the redundant entries with the correct entries. Signed-off-by: Tony Camuso Signed-off-by: Pat Schoeller Signed-off-by: Jesse Barnes commit 1bf99477226963d84b182b3995e355d3091199be Merge: 83e0c24... 7d3cc8b... Author: Linus Torvalds Date: Mon May 19 11:32:21 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: Don't clean bounds.h and asm-offsets.h kconfig: incorrect 'len' field initialisation ? kernel-doc: allow unnamed bit-fields kbuild: filter away debug symbols from kernel symbols Remove *.rej pattern from .gitignore MAINTAINERS: document names of new kbuild trees kbuild: disable modpost warnings for linkonce sections kbuild: escape meta characters in regular expression in make TAGS commit 7d3cc8b6d899e53222c22a78d98bb53a695f7962 Author: Jan Blunck Date: Fri May 16 13:54:59 2008 +0200 Don't clean bounds.h and asm-offsets.h Since 97965478a66fbdf0f4ad5e4ecc4828f0cb548a45 ("mm: Get rid of __ZONE_COUNT") mmzone.h includes bounds.h. Calling make clean after make prepare removes bounds.h again so when building external modules this fails. Signed-off-by: Jan Blunck Signed-off-by: Sam Ravnborg -- commit 107f43a0f7282511ec570214a0b8f639224ff525 Author: Christophe Jaillet Date: Sun May 18 23:10:24 2008 +0200 kconfig: incorrect 'len' field initialisation ? 1) The field 'len' of the 'gstr' structure seems to track the size of the memory already allocated for the "growable string". So the value of this field should be the same as the 'malloc()' just above, shouldn't it ? Signed-off-by: Christophe Jaillet Signed-off-by: Sam Ravnborg commit 7b97887eab6c35d23f2e4680bd5e285415068f35 Author: Randy Dunlap Date: Fri May 16 15:45:52 2008 -0700 kernel-doc: allow unnamed bit-fields Allow for unnamed bit-fields and skip them instead of printing an erroneous warning message for them, such as: Warning(include/asm-s390/cio.h:103): No description found for parameter 'u32' which contains: struct tm_scsw { u32 :1; Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit aab34ac8582303ef57b792710fc5dd5991477475 Author: Sam Ravnborg Date: Mon May 19 20:07:58 2008 +0200 kbuild: filter away debug symbols from kernel symbols Andi Kleen reported that he saw a lot of symbols like this: 0000000000000b24 N DW.aio.h.903a6d92.2 0000000000000bce N DW.task_io_accounting.h.8d8de327.0 0000000000000bec N DW.hrtimer.h.c23659c6.0 in his System.map / kallsyms output. Simple solution is to skip all debugging symbols (they are marked 'N'). Signed-off-by: Sam Ravnborg Cc: Paulo Marques commit 239f49c0800778c863585a103805c58afbad6748 Author: MinChan Kim Date: Mon May 19 22:12:08 2008 +0900 slob: Fix to return wrong pointer Although slob_alloc return NULL, __kmalloc_node returns NULL + align. Because align always can be changed, it is very hard for debugging problem of no page if it don't return NULL. We have to return NULL in case of no page. [penberg@cs.helsinki.fi: fix formatting as suggested by Matt.] Acked-by: Matt Mackall Signed-off-by: MinChan Kim Signed-off-by: Pekka Enberg commit 83e0c24a38aa91f7d932bbcab257093b82435074 Merge: 161fb0c... 42ece6c... Author: Linus Torvalds Date: Mon May 19 09:24:49 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: snd-pcsp: silent misleading warning snd-pcsp: depend on CONFIG_EXPERIMENTAL snd-pcsp: put back the compatibility code for the older alsa-libs snd-pcsp: adjust help texts to frighten users commit 13c501e69c3fba3ca0651abcc4aa7c9091fda70a Author: Josh Boyer Date: Fri May 16 00:43:46 2008 +1000 [POWERPC] 4xx: Workaround for CHIP_11 Errata The PowerPC 440EP, 440GR, 440EPx, and 440GRx chips have an issue that causes the PLB3-to-PLB4 bridge to wait indefinitely for transaction requests that cross the end-of-memory-range boundary. Since the DDR controller only returns the valid portion of a read request, the bridge will prevent other PLB masters from completing their transactions. This implements the recommended workaround for this errata for chips that use older versions of firmware that do not already handle it. The last 4KiB of memory are hidden from the kernel to prevent the problem transactions from occurring. Signed-off-by: Josh Boyer Acked-by: Stefan Roese Signed-off-by: Josh Boyer commit a6f911c04e20b98feb4b33d3aba2976851977d6a Author: Tom Tucker Date: Tue May 13 09:16:05 2008 -0500 svcrdma: Verify read-list fits within RPCSVC_MAXPAGES A RDMA read-list cannot contain more elements than RPCSVC_MAXPAGES or it will overflow the DTO context. Verify this when processing the protocol header. Signed-off-by: Tom Tucker commit 008fdbc57164b0ac237ad6ee2766944f02ac9c28 Author: Tom Tucker Date: Wed May 7 15:47:42 2008 -0500 svcrdma: Change svc_rdma_send_error return type to void The svc_rdma_send_error function is called when an RPCRDMA protocol error is detected. This function attempts to post an error reply message. Since an error posting to a transport in error is ignored, change the return type to void. Signed-off-by: Tom Tucker commit af261af4db14230fb35bcdc0ba9ef78ed6cf7bc1 Author: Tom Tucker Date: Wed May 7 13:52:42 2008 -0500 svcrdma: Copy transport address and arm CQ before calling rdma_accept This race was found by inspection. Messages can be received from the peer immediately following the rdma_accept call, however, the CQ have not yet been armed and the transport address has not yet been set. Set the transport address in the connect request handler and arm the CQ prior to calling rdma_accept. Signed-off-by: Tom Tucker commit 69500c43b45f7155b72dcadad31cd55cda789c93 Author: Tom Tucker Date: Wed May 7 13:49:58 2008 -0500 svcrdma: Set rqstp transport address in rdma_read_complete function The rdma_read_complete function needs to copy the rqstp transport address from the transport. Failure to do so can result in using the wrong authentication method for the RPC or bug checking if the rqstp address is not valid. Signed-off-by: Tom Tucker commit 97a3df382e01c49555ea844bd7c4e5a08f245b9d Author: Tom Tucker Date: Thu May 1 14:02:45 2008 -0500 svcrdma: Use ib verbs version of dma_unmap Use the ib_verbs version of the dma_unmap service in the svc_rdma_put_context function. This should support providers using software rdma. Signed-off-by: Tom Tucker commit 356d0a1519867422c3f17f79e2183f8c2d44f8ee Author: Tom Tucker Date: Thu May 1 11:25:02 2008 -0500 svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free When the transport is closing, the DTO tasklet may queue data that never gets processed. Clean up resources associated with this I/O. Signed-off-by: Tom Tucker commit 1711386c62c97f7fb086a2247d44cdb1f8867640 Author: Tom Tucker Date: Thu May 1 11:13:50 2008 -0500 svcrdma: Move the QP and cm_id destruction to svc_rdma_free Move the destruction of the QP and CM_ID to the free path so that the QP cleanup code doesn't race with the dto_tasklet handling flushed WR. The QP reference is not needed because we now have a reference for every WR. Also add a guard in the SQ and RQ completion handlers to ignore calls generated by some providers when the QP is destroyed. Signed-off-by: Tom Tucker commit 0905c0f0a2346516ecd12f0a4f33dca571b0dccd Author: Tom Tucker Date: Thu May 1 10:49:03 2008 -0500 svcrdma: Add reference for each SQ/RQ WR Add a reference on the transport for every outstanding WR. Signed-off-by: Tom Tucker commit 8da91ea8de873ee8be82377ff18637d05e882058 Author: Tom Tucker Date: Wed Apr 30 22:00:46 2008 -0500 svcrdma: Move destroy to kernel thread Some providers may wait while destroying adapter resources. Since it is possible that the last reference is put on the dto_tasklet, the actual destroy must be scheduled as a work item. Signed-off-by: Tom Tucker commit 47698e083e40bbd3ef87f5561390ae33abb13cd0 Author: Tom Tucker Date: Tue May 6 11:49:05 2008 -0500 svcrdma: Shrink scope of spinlock on RQ CQ The rq_cq_reap function is only called from the dto_tasklet. The only resource shared with other threads is the sc_rq_dto_q. Move the spin lock to protect only this list. Signed-off-by: Tom Tucker commit 8740767376b32a7772607e1b2b07cde0c24120cc Author: Tom Tucker Date: Wed Apr 30 20:44:39 2008 -0500 svcrdma: Use standard Linux lists for context cache Replace the one-off linked list implementation used to implement the context cache with the standard Linux list_head lists. Add a context counter to catch resource leaks. A WARN_ON will be added later to ensure that we've freed all contexts. Signed-off-by: Tom Tucker commit 02e7452de74d308ca642f54f7e5ef801ced60a92 Author: Tom Tucker Date: Wed Apr 30 19:50:56 2008 -0500 svcrdma: Simplify RDMA_READ deferral buffer management An NFS_WRITE requires a set of RDMA_READ requests to fetch the write data from the client. There are two principal pieces of data that need to be tracked: the list of pages that comprise the completed RPC and the SGE of dma mapped pages to refer to this list of pages. Previously this whole bit was managed as a linked list of contexts with the context containing the page list buried in this list. This patch simplifies this processing by not keeping a linked list, but rather only a pionter from the last submitted RDMA_READ's context to the context that maps the set of pages that describe the RPC. This significantly simplifies this code path. SGE contexts are cleaned up inline in the DTO path instead of at read completion time. Signed-off-by: Tom Tucker commit 10a38c33f46d128d11e299acba744bc325cde420 Author: Tom Tucker Date: Wed Apr 30 17:32:17 2008 -0500 svcrdma: Remove unused READ_DONE context flags bit The RDMACTXT_F_READ_DONE bit is not longer used. Remove it. Signed-off-by: Tom Tucker commit d16d40093a95f2b31007d7a7abefc50e6b27e236 Author: Tom Tucker Date: Tue May 6 10:04:50 2008 -0500 svcrdma: Return error from rdma_read_xdr so caller knows to free context The rdma_read_xdr function did not discriminate between no read-list and an error posting the read-list. This results in a leak of a page if there is an error posting the read-list. Signed-off-by: Tom Tucker commit 58e8f62137f1c55fe3d31234167660f2ce509297 Author: Tom Tucker Date: Tue May 6 09:45:54 2008 -0500 svcrdma: Fix error handling during listening endpoint creation A listening endpoint isn't known to the generic transport switch until the svc_create_xprt function returns without error. Calling svc_xprt_put within the xpo_create function causes the module reference count to be erroneously decremented. Signed-off-by: Tom Tucker commit 5ac461a6f05499fa233ea43b1de80b679d1eec21 Author: Tom Tucker Date: Fri Apr 25 18:08:59 2008 -0500 svcrdma: Free context on post_recv error in send_reply If an error is encountered trying to post a recv buffer in send_reply, free the passed in context. Return an error to the caller so it is aware that the request was not posted. Signed-off-by: Tom Tucker commit 05a0826a6e6d95ab6e9c3e4a10b58e10f233cc2b Author: Tom Tucker Date: Fri Apr 25 14:11:31 2008 -0500 svcrdma: Free context on ib_post_recv error If there is an error posting the recv WR to the RQ, free the context associated with the WR. This would leak a context when asynchronous errors occurred on the transport while conccurent threads were processing their RPC. Signed-off-by: Tom Tucker commit 120693d12cde0cc735d784c951b53381efec918f Author: Tom Tucker Date: Thu Apr 24 14:17:21 2008 -0500 svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler The svcrdma transport takes a reference when it gets the ESTABLISHED event from the provider. This reference is supposed to be removed when the DISCONNECT event is received, however, the call to svc_xprt_put was missing in the switch statement. This results in the memory associated with the transport never being freed. Signed-off-by: Tom Tucker commit 9d6347acd2134373c3a4c65a4d43e4f1d59aa012 Author: Tom Tucker Date: Fri Apr 25 15:51:27 2008 -0500 svcrdma: Fix return value in svc_rdma_send Fix the return value on close to -ENOTCONN so caller knows to free context. Also if a thread is waiting for free SQ space, check for close when waking to avoid posting WR to a closing transport. Signed-off-by: Tom Tucker commit dbcd00eba99945acfc433508a58eadc5dcd18cad Author: Tom Tucker Date: Tue May 6 11:33:11 2008 -0500 svcrdma: Fix race with dto_tasklet in svc_rdma_send The svc_rdma_send function will attempt to reap SQ WR to make room for a new request if it finds the SQ full. This function races with the dto_tasklet that also reaps SQ WR. To avoid polling and arming the CQ unnecessarily move the test_and_clear_bit of the RDMAXPRT_SQ_PENDING flag and arming of the CQ to the sq_cq_reap function. Refactor the rq_cq_reap function to match sq_cq_reap so that the code is easier to follow. Signed-off-by: Tom Tucker commit 0e7f011a19696cc25d68a8d6631fc6c5aa60a54c Author: Tom Tucker Date: Wed Apr 23 16:49:54 2008 -0500 svcrdma: Simplify receive buffer posting The svcrdma transport provider currently allocates receive buffers to the RQ through the xpo_release_rqst method. This approach is overly complicated since it means that the rqstp rq_xprt_ctxt has to be selectively set based on whether the RPC is going to be processed immediately or deferred. Instead, just post the receive buffer when we are certain that we are replying in the send_reply function. Signed-off-by: Tom Tucker commit aa3314c8d6da673b3454549eed45547a79f7cbe1 Author: Tom Tucker Date: Thu Apr 24 21:30:47 2008 -0500 svc: Remove unused header files from svc_xprt.c This cosmetic patch removes unused header files that svc_xprt.c inherited from svcsock.c Signed-off-by: Tom Tucker commit fc63a050861a53ba99a6222229cda555796d669e Author: Tom Tucker Date: Fri Apr 25 11:07:10 2008 -0500 svc: Remove extra check for XPT_DEAD bit in svc_xprt_enqueue Remove a redundant check for the XPT_DEAD bit in the svc_xprt_enqueue function. This same bit is checked below while holding the pool lock and prints a debug message if found to be dead. Signed-off-by: Tom Tucker commit 336f1d326831873ffab6de5fcec4b3be05103ae0 Author: Paul Mundt Date: Mon May 19 19:39:33 2008 +0900 sh: Fix up restorer in debug_trap exception return path. There are a few different types of debug trap exceptions, though now that they are all going through a special jump table, the restorer needs to be unified as well. Presently this is falling through the ret_from_fork path, which more or less does the right thing on SH-3/4 whilst being completely unsuitable on MMU-less targets. Ultimately what we want here is a branch through the platform's restore_all directly, without worrying about the retval being clobbered. We can accomplish that through a branch to __restore_all directly, so switch it so we come back from the jump table and branch to the restorer. This fixes up a recursion in the nommu WARN_ON() path, as well as some other userspace nastiness where said recursion caused serious stack corruption. Signed-off-by: Paul Mundt commit 9a33fc217d2248838d52f8ef214b1909073f3eb4 Author: Paul Mundt Date: Mon May 19 19:32:07 2008 +0900 sh: Make is_valid_bugaddr() more intelligent on nommu. Currently is_valid_bugaddr() is true for anything >= PAGE_OFFSET, which happens to be 0 on nommu configurations. Make this a bit smarter by just reading in the opcode and comparing it against the trap type that we already know. Follows the logic from avr32. Signed-off-by: Paul Mundt commit 42ece6c1f8162cd782b44dc4863679e888531df5 Author: Stas Sergeev Date: Sun May 18 18:30:03 2008 +0200 snd-pcsp: silent misleading warning It appears that alsa allows a sound buffer with size not evenly devided by the period size. This triggers a warning in snd-pcsp and floods the log. As a quick fix, the warning should be disabled. Signed-off-by: Stas Sergeev Signed-off-by: Takashi Iwai commit 2bc536a235382f2a14fbbefd4fa9cd6089c9d0d0 Author: Stas Sergeev Date: Sat May 17 08:46:55 2008 +0200 snd-pcsp: depend on CONFIG_EXPERIMENTAL Considering all the feedbacks I got, depending snd-pcsp on CONFIG_EXPERIMENTAL looks like the only safe way to get out of all the troubles at one go. :) Signed-off-by: Stas Sergeev Signed-off-by: Takashi Iwai commit 4dfd79546dfed83bf756f5c912f686ebac187c16 Author: Stas Sergeev Date: Sat May 17 08:44:41 2008 +0200 snd-pcsp: put back the compatibility code for the older alsa-libs The attached patch adds back the compatibility code, allowing the driver to work with older alsa-libs. The removal was premature, it breaks the real-life configs. Signed-off-by: Stas Sergeev Signed-off-by: Takashi Iwai commit 3ccee69019d3b23f02204f4c2cb3085f436da252 Author: Stas Sergeev Date: Fri May 16 12:10:03 2008 +0200 snd-pcsp: adjust help texts to frighten users Added the warning text to the help of snd-pcsp about the possible problem with this driver so that user can know of the problem in advance. Also, removed the obsoleted text about ancient pc-speaker patch in CONFIG_SOUND help. Signed-off-by: Stas Sergeev Signed-off-by: Takashi Iwai commit c203e45f069af47ca7623e4dcd8c00bfba2722e4 Merge: a94477d... b8291ad... Author: Lachlan McIlroy Date: Mon May 19 15:09:05 2008 +1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit f9ebcd9d410ba7209a8f321c41edf8615fc3ce67 Author: Kumar Gala Date: Sun May 18 13:18:01 2008 -0500 lmb: Fix compile warning lib/lmb.c: In function 'lmb_dump_all': lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64' Signed-off-by: Kumar Gala commit d71a4dd72e67210ae0767ccae69c79f1c933ff64 Author: J. Bruce Fields Date: Fri May 9 12:01:19 2008 -0700 svcrpc: fix proc/net/rpc/auth.unix.ip/content display Commit f15364bd4cf8799a7677b6daeed7b67d9139d974 ("IPv6 support for NFS server export caches") dropped a couple spaces, rendering the output here difficult to read. (However note that we expect the output to be parsed only by humans, not machines, so this shouldn't have broken any userland software.) Signed-off-by: J. Bruce Fields commit 88dd0be3874566796fa4ffbdf927a53c4a6a2f4b Author: J. Bruce Fields Date: Mon May 5 19:47:29 2008 -0400 nfsd: reorder printk in do_probe_callback to avoid use-after-free We're currently dereferencing the client after we drop our reference count to it. Signed-off-by: J. Bruce Fields commit 161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288 Merge: b8291ad... b452876... Author: Linus Torvalds Date: Sun May 18 15:32:44 2008 -0700 Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid nfs: make nfs4_drop_state_owner() static nfs: path_{get,put}() cleanups nfs: replace remaining __FUNCTION__ occurrences nfs/lsm: make NFSv4 set LSM mount options NFSv4: Check the return value of decode_compound_hdr_arg() nfs: fix race in nfs_dirty_request NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching commit b4528762ca92261c6ed3f03e76adeb1dc587aacb Author: Trond Myklebust Date: Sun May 11 12:18:51 2008 -0700 SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid Apparently this causes Solaris 10 servers to refuse our NFSv4 SETCLIENTID calls. Fall back to root creds for now, since most servers that care are very likely to have root squashing enabled. Signed-off-by: Trond Myklebust commit 54aaacee35afd594bba3244c20b02cc98d80a961 Author: Marcelo Tosatti Date: Wed May 14 02:29:06 2008 -0300 KVM: LAPIC: ignore pending timers if LVTT is disabled Only use the APIC pending timers count to break out of HLT emulation if the timer vector is enabled. Certain configurations of Windows simply mask out the vector without disabling the timer. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 1fc9d2bf75bbe5482cc503681dae0935df29b6b0 Author: Avi Kivity Date: Sun May 18 13:50:23 2008 +0300 KVM: Update MAINTAINERS for new mailing lists The KVM mailing lists are now hosted on vger.kernel.org. Also update the website URL. Signed-off-by: Avi Kivity commit e5c239cfd5b0ec22751c099dbf4d91f3c504a64f Author: Marcelo Tosatti Date: Thu May 8 19:47:01 2008 -0300 KVM: Fix kvm_vcpu_block() task state race There's still a race in kvm_vcpu_block(), if a wake_up_interruptible() call happens before the task state is set to TASK_INTERRUPTIBLE: CPU0 CPU1 kvm_vcpu_block add_wait_queue kvm_cpu_has_interrupt = 0 set interrupt if (waitqueue_active()) wake_up_interruptible() kvm_cpu_has_pending_timer kvm_arch_vcpu_runnable signal_pending set_current_state(TASK_INTERRUPTIBLE) schedule() Can be fixed by using prepare_to_wait() which sets the task state before testing for the wait condition. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit bd25ed033af52c8c054d43a9cce9c5976266ae74 Author: Xiantao Zhang Date: Wed May 14 19:44:57 2008 +0800 KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48 Guest's firmware needs an iosapic with 48 pins for ia64 guests. Needed to get networking going. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit 25c437b01f3a04af5362c7fd80ba91a0ec74f007 Author: Xiantao Zhang Date: Wed May 7 17:34:52 2008 +0800 KVM: ia64: fix GVMM module including position-dependent objects The GVMM module is position independent since it is relocated to the guest address space. Commit ea696f9cf ("ia64 kvm fixes for O=... builds") broke this by linking GVMM with non-PIC objects. Fix by creating two files: memset.S and memcpy.S which just include the files under arch/ia64/lib/{memset.S, memcpy.S} respectively. [akpm: don't delete files which we need] Signed-off-by: Xiantao Zhang Signed-off-by: Andrew Morton Signed-off-by: Avi Kivity commit 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb Author: Xiantao Zhang Date: Wed May 7 17:37:32 2008 +0800 KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg The kernel's ia64_fpreg structure conflicts with userspace headers, so define a new structure to replace it. Signed-off-by: Xiantao Zhang Signed-off-by: Avi Kivity commit eedaa4e2af681a266c084c410238855bdfbc2787 Author: Marcelo Tosatti Date: Tue May 6 13:32:54 2008 -0300 KVM: PIT: take inject_pending into account when emulating hlt Otherwise hlt emulation fails if PIT is not injecting IRQ's. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 5ca9fd54e3d75489ff9c70d7af6e0b9a390dd656 Author: Heiko Carstens Date: Tue May 6 17:38:30 2008 +0300 s390: KVM guest: fix compile error Fix kvm compile error: Commit c45a6816c19dee67b8f725e6646d428901a6dc24 (virtio: explicit advertisement of driver features) and commit e976a2b997fc4ad70ccc53acfe62811c4aaec851 (s390: KVM guest: virtio device support, and kvm hypercalls) don't like each other: CC drivers/s390/kvm/kvm_virtio.o drivers/s390/kvm/kvm_virtio.c:224: error: unknown field 'feature' specified in initializer drivers/s390/kvm/kvm_virtio.c:224: warning: initialization from incompatible pointer type make[3]: *** [drivers/s390/kvm/kvm_virtio.o] Error 1 Cc: Adrian Bunk Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Acked-by: Christian Borntraeger Acked-by: Carsten Otte Signed-off-by: Avi Kivity commit 107d6d2efa9eb8c48d050936d8019230ac6b24cd Author: Avi Kivity Date: Mon May 5 14:58:26 2008 +0300 KVM: x86 emulator: fix writes to registers with modrm encodings A register destination encoded with a mod=3 encoding left dst.ptr NULL. Normally we don't trap writes to registers, but in the case of smsw, we do. Fix by pointing dst.ptr at the destination register. Signed-off-by: Avi Kivity commit e5c0ef90e6cfd40c819bd70748d675067ff862e7 Author: Marc Pignat Date: Fri May 9 11:07:07 2008 +0200 at91_mci: minor cleanup MMC_POWER_ON is a noop, no need to set the power pin again. Signed-off-by: Marc Pignat Signed-off-by: Pierre Ossman commit 460ed2ea04da012e5575eb357a47a7f6407767de Author: Mike Frysinger Date: Sat May 17 18:22:26 2008 +0800 Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN Signed-off-by: Mike Frysinger Acked-by: Alan Cox Signed-off-by: Bryan Wu commit eedd306b51274fb64c00924b5ead679153fca78d Author: Javier Herrero Date: Sat May 17 18:21:57 2008 +0800 Blackfin serial driver: add extra IRQ flag for 8250 serial driver Signed-off-by: Javier Herrero Signed-off-by: Bryan Wu commit b4aa54d951d38d7a989d6b6385494ef5ea7371d7 Author: Javier Herrero Date: Sat May 17 18:21:42 2008 +0800 8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board Added support for 8250-class UARTs in HV Sistemas H8606 board, modification in 8250.c driver for correct compilation with Blackfin Besides, I think that there is more people using 8250-class UARTs with a different hardware than the H8606 board. This code can be shared by them. Signed-off-by: Javier Herrero Acked-by: Alan Cox Signed-off-by: Bryan Wu commit 7e291434eb128d7b4217dde6e0543f4342dd51fa Author: Bryan Wu Date: Mon May 19 14:56:42 2008 +0800 Blackfin arch: Fix bug - USB fails to build for BF524/BF526 BF524 is the same as BF525, except the speed of the processor BF526 is the same as BF527, except the speed of the processor Signed-off-by: Bryan Wu commit ecb9567e287e082f78fcf055e34613eaf1f7df24 Author: Michael Hennerich Date: Mon May 19 14:56:33 2008 +0800 Blackfin arch: update boards defconfig files Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 59069676383c6446f50555e04aed7f51d5de695e Author: Michael Hennerich Date: Sat May 17 16:38:52 2008 +0800 Blackfin arch: IO Port functions to read/write unalligned memory Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 86ad79321cbacdc4deebcde81849d19e26dd18e2 Author: Cliff Cai Date: Sat May 17 16:36:52 2008 +0800 Blackfin arch: enable a choice to provide 4M DMA memory support two cascaded AD73322 cards, more uncached DMA memory is needed, so add a choice to provide 4M DMA memory Signed-off-by: Cliff Cai Signed-off-by: Bryan Wu commit c6c6f75d54ca734c409e336245662934c21fcee0 Author: Mike Frysinger Date: Sat May 17 16:18:08 2008 +0800 Blackfin arch: cleanup the icplb/dcplb multiple hit checks so that we always send the same signal and we handle the NULL ptr condition properly Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 803a8d2acbf220aeb27f0a98dacb36d4af3d6559 Author: Michael Hennerich Date: Sat May 17 16:01:51 2008 +0800 Blackfin arch: Add workaround to read edge triggered GPIOs Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 92322da9b568a5ddc3ab872491bdc0f1b47ef904 Author: Michael Hennerich Date: Sat May 17 15:59:11 2008 +0800 Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr. Otherwise we use the wrong DMA channels. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 5ce998cf6d1dbb28f14dea879a366ed5348f9681 Author: Michael Hennerich Date: Sat May 17 15:57:01 2008 +0800 Blackfin arch: Check for Anomaly 05000182 IMDMA does not operate to full speed for 600MHz and higher devices Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4 Author: Paul E. McKenney Date: Wed May 14 17:10:12 2008 -0700 [PATCH] list_for_each_rcu must die: audit All uses of list_for_each_rcu() can be profitably replaced by the easier-to-use list_for_each_entry_rcu(). This patch makes this change for the Audit system, in preparation for removing the list_for_each_rcu() API entirely. This time with well-formed SOB. Signed-off-by: Paul E. McKenney Signed-off-by: Al Viro commit fcaf1eb8685a00a99259e138e403841e984385b0 Author: Andrew Morton Date: Wed May 14 16:11:48 2008 -0700 [patch 1/1] audit_send_reply(): fix error-path memory leak Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10663 Reporter: Daniel Marjamki Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Al Viro commit 6ee650467d5bf972d10441e99688e9b48171f99c Author: Steve Grubb Date: Tue Apr 29 15:01:13 2008 -0400 [PATCH] open sessionid permissions The current permissions on sessionid are a little too restrictive. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 2b280fab12b6697b6a7a24a13aaf9f4339edd075 Author: Steve French Date: Sat May 17 03:12:45 2008 +0000 [CIFS] add more complete mount options to cifs_show_options adds various options to cifs_show_options (displayed when you cat /proc/mounts with a cifs mount). I limited the new ones to values that are associated with the mount with the exception of "seal" (which is a per tree connection property, but I thought was important enough to show through). Eventually cifs's parse_mount_options also needs to be rewritten to use the match_token API but that would be a big enough change that I would prefer that changing parse_mount_options wait until next release. Signed-off-by: Steve French commit 12103dca52e79e23afe2fbcaf3d9e7fc9ceb6b18 Author: Roland Dreier Date: Fri May 16 14:58:44 2008 -0700 IB/mthca: Fix max_sge value returned by query_device The mthca driver returns the maximum number of scatter/gather entries returned by the firmware as the max_sge value when device properties are queried. However, the firmware also reports a limit on the maximum descriptor size allowed, and because mthca takes into account the worst case send request overhead when checking whether to allow a QP to be created, the largest number of scatter/gather entries that can be used with mthca may be limited by the maximum descriptor size rather than just by the actual s/g entry limit. This means that applications cannot actually create QPs with max_send_sge equal to the limit returned by ib_query_device(). Fix this by checking if the maximum descriptor size imposes a lower limit and if so returning that lower limit. Signed-off-by: Roland Dreier commit 21609ae3efa42f4118ce741f7e55d66d716cb17c Author: Roland Dreier Date: Fri May 16 14:58:40 2008 -0700 RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send() drivers/infiniband/hw/cxgb3/iwch_qp.c: In function 'iwch_post_send': drivers/infiniband/hw/cxgb3/iwch_qp.c:232: warning: 't3_wr_flit_cnt' may be used uninitialized in this function This is what akpm describes as "the dopey gcc-doesn't-know-that-foo(&var)-writes-to-var problem." Signed-off-by: Roland Dreier Acked-by: Steve Wise commit a3d8e1591dc90d359d444c759dfda2c6fc605251 Author: Andrew Morton Date: Fri May 16 14:28:30 2008 -0700 IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send() drivers/infiniband/hw/mlx4/qp.c: In function 'mlx4_ib_post_send': drivers/infiniband/hw/mlx4/qp.c:1460: warning: 'seglen' may be used uninitialized in this function This is the dopey gcc-doesn't-know-that-foo(&var)-writes-to-var problem. Signed-off-by: Andrew Morton Signed-off-by: Roland Dreier commit e9baf6e59842285bcf9570f5094e4c27674a0f7c Author: Al Viro Date: Thu May 15 04:49:12 2008 -0400 [PATCH] return to old errno choice in mkdir() et.al. In case when both EEXIST and EROFS would apply we used to return the former in mkdir(2) and friends. Lest anyone suspects us of being consistent, in the same situation knfsd gave clients nfs_erofs... ro-bind series had switched the syscall side of things to returning -EROFS and immediately broke an application - namely, mkdir -p. Patch restores the original behaviour... Signed-off-by: Al Viro commit 23c4971e3d97de4e1b7961ca6eacee35aa15ce5f Author: WANG Cong Date: Thu May 8 21:52:33 2008 +0800 [Patch] fs/binfmt_elf.c: fix wrong return values create_elf_tables() returns 0 on success. But when strnlen_user() "fails", it returns 0 directly. So this is wrong. Signed-off-by: WANG Cong Cc: Alexander Viro Signed-off-by: Al Viro commit 08a6fac1c63233c87eec129938022f1a9a4d51f6 Author: Al Viro Date: Sat May 10 16:38:25 2008 -0400 [PATCH] get rid of leak in compat_execve() Even though copy_compat_strings() doesn't cache the pages, copy_strings_kernel() and stuff indirectly called by e.g. ->load_binary() is doing that, so we need to drop the cache contents in the end. [found by WANG Cong ] Signed-off-by: Al Viro commit 5f719558edf9c84bfbb1f7ad37e84c483282d09f Author: WANG Cong Date: Tue May 6 12:45:35 2008 +0800 [Patch] fs/binfmt_elf.c: fix a wrong free In kmalloc failing path, we shouldn't free pointers in 'info', because the struct 'info' is uninitilized when kmalloc is called. And when kmalloc returns NULL, it's needless to kfree it. Signed-off-by: WANG Cong Cc: Alexander Viro Reviewed-by: Pekka Enberg -- Signed-off-by: Al Viro commit eceea0b3df05ed262ae32e0c6340cc7a3626632d Author: Al Viro Date: Sat May 10 10:08:32 2008 -0400 [PATCH] avoid multiplication overflows and signedness issues for max_fds Limit sysctl_nr_open - we don't want ->max_fds to exceed MAX_INT and we don't want size calculation for ->fd[] to overflow. Signed-off-by: Al Viro commit adbecb128cd2cc5d14b0ebef6d020ced0efd0ec6 Author: Al Viro Date: Thu May 8 21:19:42 2008 -0400 [PATCH] dup_fd() part 4 - race fix Parent _can_ be a clone task, contrary to the comment. Moreover, more files could be opened while we allocate a copy, in which case we end up copying only part into new descriptor table. Since what we get _is_ affected by all changes in the old range, we can get rather weird effects - e.g. dup2(0, 1024); close(0); in parallel with fork() resulting in child that sees the effect of close(), but not that of dup2() done just before that close(). What we need is to recalculate the open_count after having reacquired ->file_lock and if external fdtable we'd just allocated is too small for it, free the sucker and redo allocation. Signed-off-by: Al Viro commit afbec7fff4928c273a1f1bb14dfdfdf62688a193 Author: Al Viro Date: Thu May 8 21:11:17 2008 -0400 [PATCH] dup_fd() - part 3 merge alloc_files() into dup_fd(), leave setting newf->fdt until the end Signed-off-by: Al Viro commit 9dec3c4d306b09b31331e475e895bb9674e16d81 Author: Al Viro Date: Thu May 8 21:02:45 2008 -0400 [PATCH] dup_fd() part 2 use alloc_fdtable() instead of expand_files(), get rid of pointless grabbing newf->file_lock, kill magic in copy_fdtable() that used to be there only to skip copying when called from dup_fd(). Signed-off-by: Al Viro commit 02afc6267f6d55d47aba9fcafdbd1b7230d2294a Author: Al Viro Date: Thu May 8 19:42:56 2008 -0400 [PATCH] dup_fd() fixes, part 1 Move the sucker to fs/file.c in preparation to the rest Signed-off-by: Al Viro commit f52111b1546943545e67573c4dde1c7613ca33d3 Author: Al Viro Date: Thu May 8 18:19:16 2008 -0400 [PATCH] take init_files to fs/file.c Signed-off-by: Al Viro commit 229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0 Author: Masakazu Mokuno Date: Wed May 14 14:16:50 2008 +0900 wireless: Create 'device' symlink in sysfs Some network interfaces of the wireless drivers lack the 'device' symlink in sysfs. This patch lets the drivers create the links. Signed-off-by: Masakazu Mokuno Acked-by: Dan Williams Signed-off-by: John W. Linville commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a Author: Roel Kluin Date: Tue May 13 22:12:27 2008 +0200 wireless, airo: waitbusy() won't delay There will be no delay even when COMMAND_BUSY (defined 0x8000) is set: 0x8000 & (delay < 10000) will evaluate to 0 - when delay is 0. Signed-off-by: Roel Kluin Signed-off-by: John W. Linville commit 02969d296e91626d9942ea15f8a95fe056025ef1 Author: Brian Cavagnolo Date: Tue May 13 13:54:59 2008 +0100 libertas: fix command timeout after firmware failure This is a fix for OLPC ticket #6586: "SCAN command fails, timer doesn't fire". In fact, the timer was firing; the problem was that the dnld_sent state variable was not being updated after the timer expired, so lbs_execute_next_command was not being called. Signed-off-by: Brian Cavagnolo Signed-off-by: Javier Cardona Signed-off-by: David Woodhouse Signed-off-by: John W. Linville commit 2f561feb386d6adefbad63c59a1fcd298ac6a79c Author: Ivo van Doorn Date: Sat May 10 13:40:49 2008 +0200 mac80211: Add RTNL version of ieee80211_iterate_active_interfaces Since commit e38bad4766a110b61fa6038f10be16ced8c6cc38 mac80211: make ieee80211_iterate_active_interfaces not need rtnl rt2500usb and rt73usb broke down due to attempting register access in atomic context (which is not possible for USB hardware). This patch restores ieee80211_iterate_active_interfaces() to use RTNL lock, and provides the non-RTNL version under a new name: ieee80211_iterate_active_interfaces_atomic() So far only rt2x00 uses ieee80211_iterate_active_interfaces(), and those drivers require the RTNL version of ieee80211_iterate_active_interfaces(). Since they already call that function directly, this patch will automatically fix the USB rt2x00 drivers. v2: Rename ieee80211_iterate_active_interfaces_rtnl Signed-off-by: Ivo van Doorn Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 34a961f7db36f10abd6b153411fe8c810f21f6b3 Author: Abhijeet Kolekar Date: Fri May 9 09:35:41 2008 -0700 mac80211 : Association with 11n hidden ssid ap. This patch fixes the association problem with 11n hidden ssid ap. Patch fixes the problem of associating with hidden ssid when all three parameters ap,essid and channel are given to iwconfig. This patch removes the condition of checking three parameters and always checks for bss in bss list while associating. Signed-off-by: Abhijeet Kolekar Signed-off-by: John W. Linville commit a1fe78f16eac7d03d3c391dd5d54559826574982 Author: Steve French Date: Fri May 16 18:48:38 2008 +0000 [CIFS] Add missing defines for DFS Also has minor cleanup of previous patch CC: Igor Mammedov Signed-off-by: Steve French commit fec4585fd71cc5ec35d134e8c3854f6e8c4503f0 Author: Igor Mammedov Date: Fri May 16 13:06:30 2008 +0400 CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec. Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit 1d2e88e73ee0af52b0ed63b5fb8f42a919a4d9de Author: Adrian Bunk Date: Fri May 2 13:42:45 2008 -0700 nfs: make nfs4_drop_state_owner() static nfs4_drop_state_owner() can now become static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 31f31db1a15671513df9cd9fbe56ef45ee1e9a2a Author: Jan Blunck Date: Fri May 2 13:42:45 2008 -0700 nfs: path_{get,put}() cleanups Here are some more places where path_{get,put}() can be used instead of dput()/mntput() pair. Signed-off-by: Jan Blunck Cc: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 3110ff8048fb757b36112b044b384aea9c44d6e4 Author: Harvey Harrison Date: Fri May 2 13:42:44 2008 -0700 nfs: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Cc: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 46c8ac74250a396aca855e494f49a960797a6b5e Author: Eric Paris Date: Fri May 2 13:42:42 2008 -0700 nfs/lsm: make NFSv4 set LSM mount options NFSv3 get_sb operations call into the LSM layer to set security options passed from userspace. NFSv4 hooks were not originally added since it was reasonably late in the merge window and NFSv3 was the only thing that had regressed (v4 has never supported any LSM options) This patch makes NFSv4 call into the LSM to set security options rather than just blindly dropping them with no notice to the user as happens today. This patch was tested in a simple NFSv4 environment with the context= option and appeared to work as expected. Signed-off-by: Eric Paris Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: Stephen Smalley Acked-by: James Morris Cc: Casey Schaufler Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 3a6258e1fb5ff717dcefa04afc35f81aaae3f3e0 Author: Trond Myklebust Date: Tue May 6 13:32:40 2008 -0400 NFSv4: Check the return value of decode_compound_hdr_arg() If decode_compound_hdr_arg() returns a resource error, then we cannot proceed to process the callback. Return a 'GARBAGE_ARGS' rpc-level error to the caller instead. If, however, the minor version field is incorrect, then we need to propagate the resulting NFS4ERR_MINOR_VERS_MISMATCH error back as the compound status field (setting the nops field to 0). Finally, if encode_compound_hdr_res() returns an error, we need to return an RPC_SYSTEM_ERR to the caller. Signed-off-by: Trond Myklebust commit 38def50fabc479dc96ea6bd2cb2526e0dfc36fa4 Author: Fred Isaman Date: Thu May 1 20:03:22 2008 +0300 nfs: fix race in nfs_dirty_request When called from nfs_flush_incompatible, the req is not locked, so req->wb_page might be set to NULL before it is used by PageWriteback. Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit b0b539739fe9b7d75002412a787cfdf4efddbc33 Author: Trond Myklebust Date: Mon May 5 11:45:41 2008 -0400 NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching Both the 'noac' and 'actimeo=0' mount options should ensure that attributes are not cached, however a bug in nfs_attribute_timeout() means that currently, the attributes may in fact get cached for up to one jiffy. This has been seen to cause corruption in some applications. The reason for the bug is that the time_in_range() test returns 'true' as long as the current time lies between nfsi->read_cache_jiffies and nfsi->read_cache_jiffies + nfsi->attrtimeo. In other words, if jiffies equals nfsi->read_cache_jiffies, then we still cache the attribute data. Signed-off-by: Trond Myklebust commit de2db8d790b058fcd75d603780b913bd824972b3 Author: Igor Mammedov Date: Fri May 16 13:10:32 2008 +0400 Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now. Signed-off-by: Igor Mammedov Signed-off-by: Steve French commit bfd3c7a728fbe642f79f99482a6c01158c675545 Author: Harvey Harrison Date: Mon May 12 12:05:43 2008 -0700 sh: use the common ascii hex helpers Signed-off-by: Harvey Harrison Signed-off-by: Paul Mundt commit 65b83427c6e5814556855c42bf9b4edeafd66623 Author: Yoshihiro Shimoda Date: Thu May 15 17:44:00 2008 +0900 sh: fix sh7785 master clock value Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 561c2bccc7c5cf3d42f38f1f4d61c7b609d4631e Author: Hideo Saito Date: Thu May 15 13:30:05 2008 +0900 sh: Fix up thread info pointer in syscall_badsys resume path. Entry to resume_userspace expects r8 to contain current_thread_info, which happens in all paths except for syscall_badsys, where r8 was being inadvertently trampled. Reload it before the branch. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit e08b954c9a140f2062649faec72514eb505f18c3 Author: Hideo Saito Date: Thu May 15 13:28:46 2008 +0900 sh: Fix up optimized SH-4 memcpy on big endian. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit 972ad0e0d51b67b862ae6143d858fb7da2f2a5f6 Author: Paul Mundt Date: Tue May 13 17:41:46 2008 +0900 sh: disable initrd defaults in .empty_zero_page. When using initramfs on systems that don't explicitly clear LOADER_TYPE, unpack_to_rootfs() tramples tramples the range with the defaults taken out of .empty_zero_page. This causes kernels with valid initramfs images to bail out with crc or gzip magic mismatch errors after the second unpack takes place on certain platform configurations. Signed-off-by: Paul Mundt commit 0105346cc763a6e34e80feb6adb36ed9781150d4 Author: Paul Mundt Date: Tue May 13 17:40:17 2008 +0900 sh: display boot params by default on entry. Some kernel and boot loader configurations tweak the .empty_zero_page settings, while others do not. Print the values out on entry as a debugging aid. Signed-off-by: Paul Mundt commit df3f0da8db6b5e7e8f0585221c8b1cd8ff806d35 Author: Ralph Campbell Date: Thu May 15 16:37:25 2008 -0700 IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate When I fixed the RC receive completion opcode in 2bfc8e9e ("IB/ipath: Return the correct opcode for RDMA WRITE with immediate"), I forgot to fix UC, which had the same problem for RDMA write with immediate returning the wrong opcode. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit cd80ec6f81db89d109187a673470c04af4c09a63 Author: Roland Dreier Date: Thu May 15 15:28:55 2008 -0700 IB/ipath: Fix printk format for ipath_sdma_status Commit f018c7e1 ("IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long") changed ipath_sdma_status to be unsigned long, but left a few debug messages that printed it out with a %016llx format, which generates the warnings drivers/infiniband/hw/ipath/ipath_sdma.c:348: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' drivers/infiniband/hw/ipath/ipath_sdma.c:618: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' Fix this by changing the format used to print out the value to %08lx (8 hex digits are now sufficient, because the highest bit used is 31). Warnings reported by Randy Dunlap . Signed-off-by: Roland Dreier commit 23f40dc650c0344b37fe54143868a31be66db882 Author: Mathieu Chouquet-Stringer Date: Wed May 14 19:03:18 2008 -0400 hostap: fix "registers" registration in procfs The "registers" entry was incorrectly created in the procfs root instead of the device specific directory. Move "registers" registration immediately after the containing procfs directory is created. Signed-off-by: Mathieu Chouquet-Stringer Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 95b1cb90b79896c4bf5ea484bee2b41d7d293f43 Author: Steve French Date: Thu May 15 16:44:38 2008 +0000 [CIFS] enable parsing for transport encryption mount parm Samba now supports transport encryption on particular exports (mounted tree ids can be encrypted for servers which support the unix extensions). This adds parsing support to cifs mount option parsing for this. Signed-off-by: Steve French commit 066b2118976e6e7cc50eed39e2747c75343a23c4 Author: Marcin Slusarz Date: Wed May 14 23:30:06 2008 -0700 isdn/capi: Return proper errnos on module init. cdebug_init() is called from kcapi_init() which is module initialization function, so it must return negative values on errors. Signed-off-by: Marcin Slusarz Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit ffd8211fb18e1052b2d9eded629cc3c0b872d06a Author: Alan Cox Date: Wed May 14 23:28:47 2008 -0700 iphase: Fix 64bit warning. Time is unsigned long (except when you are in a hurry) so we need to store rx_tmp_jif in the right sized object. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 01bbf2c7ddc93479eecebf8495848c0f362130c5 Author: Andrew Morton Date: Wed May 14 23:27:18 2008 -0700 hysdn: No longer broken on SMP. With the cli/sti code sorted out we think this driver is OK for use on SMP systems. Acked-by: Mark Asselstine Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a9dd7fe28742c6b22eb8f214a04c4d2bcb2c0899 Author: Mark Asselstine Date: Wed May 14 23:25:33 2008 -0700 hysdn: Remove cli()/sti() calls. The use of cli()/sti() within the do/while was a way to ensure interrupts were only disabled for short periods of time while the bulk of the time interrupts were free to occur. The use of the spin lock has eliminated the need to play with interrupts in this way while still allowing for IO to be protected. The remaining 3 sti() calls seem unneeded now that at no other point in the driver is there a call to cli(). Signed-off-by: Mark Asselstine Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a1a61a435b3cc157830b7d42b175151ae5eabdd3 Author: Mike Frysinger Date: Wed May 14 23:24:09 2008 -0700 atm: Cleanup atm_tcp.h and atm.h for userspace. The atm_tcp.h uses types from linux/atm.h, but does not include it. It should also use the standard __u## types from linux/types.h rather than the uint##_t types since the former can be found with the kernel already. Same goes for linux/atm.h. The linux/socket.h include there also gets dropped as atm.h does not actually use anything from socket.h. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c2cf07d591ef7bc25c220249822d9bdf0f44c75c Author: Steve French Date: Thu May 15 06:20:02 2008 +0000 [CIFS] Finishup DFS code Fixup GetDFSRefer to prepare for cleanup of SMB response processing Fix build warning in link.c Signed-off-by: Steve French commit f9ddcca4cf7d95238beb295484d1de7c0bf490dd Author: Steve French Date: Thu May 15 05:51:55 2008 +0000 [CIFS] BKL-removal: convert CIFS over to unlocked_ioctl cifs_ioctl doesn't seem to need the BKL for anything, so convert it over to use unlocked_ioctl. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Steve French commit c32916374b2b4f4d2b7ccdb357fe7989f3b407a6 Author: Steve French Date: Thu May 15 05:41:54 2008 +0000 [CIFS] suppress duplicate warning fs/cifs/dir.c: In function 'cifs_ci_compare': fs/cifs/dir.c:582: warning: passing argument 1 of 'memcpy' discards qualifiers from pointer target type Signed-off-by: Andrew Morton Signed-off-by: Steve French commit 38d2f38be9e4a2f1e3324c973a903aa972f71d0f Author: Stephen Hemminger Date: Wed May 14 22:35:04 2008 -0700 bonding: handle case of device named bonding_master If device already exists named bonding_masters, then fail. This is a wierd corner case only a QA group could love. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 0599ad53fee2d084f9ba26247d7452f06a40d298 Author: Stephen Hemminger Date: Wed May 14 22:34:16 2008 -0700 sysfs: remove error messages for -EEXIST case It is possible that the entry in sysfs already exists, one case of this is when a network device is renamed to bonding_masters. Anyway, in this case the proper error path is for device_rename to return an error code, not to generate bogus backtrace and errors. Also, to avoid possible races, the create link should be done before the remove link. This makes a device rename atomic operation like other renames. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman Signed-off-by: David S. Miller commit dcc997738e538919101d8756f19ca23110b25d8d Author: Stephen Hemminger Date: Wed May 14 22:33:38 2008 -0700 net: handle errors from device_rename device_rename can fail with -EEXIST or -ENOMEM, so handle any problems. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 646dd539878a194bc14b104621c0b2b33587e40f Author: Steve French Date: Thu May 15 01:50:56 2008 +0000 [CIFS] Fix paths when share is in DFS to include proper prefix Some versions of Samba (3.2-pre e.g.) are stricter about checking to make sure that paths in DFS name spaces are sent in the form \\server\share\dir\subdir ... instead of \dir\subdir Acked-by: Jeff Layton Signed-off-by: Steve French commit 88ae600d58a8d3160144af480133a988404b8d59 Author: Pierre Ossman Date: Sun Aug 12 14:23:50 2007 +0200 mmc: mmc host test driver A dummy driver that performs a series of requests that are often mis- handled by host drivers. Signed-off-by: Pierre Ossman commit df48dd028766ce2fc05d1f1d9da9bf89855d5282 Author: Tony Lindgren Date: Tue May 6 16:36:47 2008 -0700 mmc: Fix omap compile by replacing dev_name with dma_dev_name This patch fixes error: drivers/mmc/host/omap.c: In function 'mmc_omap_get_dma_channel': drivers/mmc/host/omap.c:1038: error: called object 'dev_name' is not a function Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 adds a function called dev_name. This will cause a name conflict as dev_dbg calls dev_name(((host->mmc)->parent)). This same issue should not affect other drivers as they don't seem to use dev_name with dev_dbg. Thanks to Paul Walmsley for figuring this one out. Cc: Paul Walmsley Signed-off-by: Tony Lindgren Signed-off-by: Pierre Ossman commit 35fc37d5175091c36d034a28c057da0f9594ee7e Author: Jeff Layton Date: Wed May 14 10:22:03 2008 -0700 add function to convert access flags to legacy open mode SMBLegacyOpen always opens a file as r/w. This could be problematic for files with ATTR_READONLY set. Have it interpret the access_mode into a sane open mode. Signed-off-by: Steve French commit e10f7b551d2a79b113d5ce66b5dc9f3657035445 Author: Jeff Layton Date: Wed May 14 10:21:33 2008 -0700 clarify return value of cifs_convert_flags() cifs_convert_flags returns 0x20197 in the default case. It's not immediately evident where that number comes from, so change it to be an or'ed set of flags. The compiler will boil it down anyway. (Thanks to Guenter Kukkukk for clarifying the flags). Signed-off-by: Steve French commit 77c57ec89682c73785d12d51a6d1f873b292fa42 Author: Steve French Date: Tue May 13 21:39:32 2008 +0000 [CIFS] don't explicitly do a FindClose on rewind when directory search has ended Do the following series of operations on a CIFS share: opendir(dir) readdir(dir) unlink(file in dir) rewinddir(dir) readdir(dir) If the readdir read all entries in the directory this will make CIFS throw an error like this: CIFS VFS: Send error in FindClose = -9 CIFS requests "Close at end of search" of the server by setting this bit when issuing FindFirst or FindNext. Therefore when all search entries are returned, the server may return "end of search" and close the search implicitly when this bit is set by the client on the request. We check for this when a readdir is explicitly closed - but when the client notices that a directory has changed after the last operation, we attempt to close the directory before reopening by reissuing a second FindFirst. But, the directory may already been implicitly closed (due to end of search) because the first readdir finished. So we only want to issue a FindClose call in this case when we don't expect it to already be closed. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 582d21e5e319d38c0485d8b9e92f6f2341f7c79b Author: Steve French Date: Tue May 13 04:54:12 2008 +0000 [CIFS] cleanup old checkpatch warnings Signed-off-by: Steve French commit 9cd9c616f5890c9345546e03c99ba392b7a82cdf Author: Mike Frysinger Date: Tue May 13 12:31:32 2008 +0800 [Blackfin] arch: rename bf5xx-flash to bfin-async-flash - move all kconfig board settings into board resources - fixup casting style according to lkml feedback - rewrite driver so that it can handle arbitrary of instances according to the declared platform resources Signed-off-by: Mike Frysinger Cc: Joern Engel Signed-off-by: Bryan Wu commit ed5f037005d728de19a0f63678ac35b42064966d Author: Marcin Slusarz Date: Tue May 13 04:01:01 2008 +0000 [CIFS] CIFSSMBPosixLock should return -EINVAL on error all other codepaths in this function return negative values on errors Signed-off-by: Marcin Slusarz Signed-off-by: Steve French commit 6353450a2deefaa79cdb4fd2b72830c7db610256 Author: Jeff Layton Date: Mon May 12 19:56:05 2008 -0700 fix memory leak in CIFSFindNext When CIFSFindNext gets back an -EBADF from a call, it sets the return code of the function to 0 and eventually exits. Doing this makes the cleanup at the end of the function skip freeing the SMB buffer, so we need to make sure we free the buffer explicitly when doing this. If we don't you end up with errors like this when unplugging the cifs kernel module: slab error in kmem_cache_destroy(): cache `cifs_request': Can't free all objects [] kmem_cache_destroy+0x61/0xf3 [] cifs_destroy_request_bufs+0x14/0x28 [cifs] [] exit_cifs+0x1e/0x80 [cifs] [] sys_delete_module+0x192/0x1b8 [] audit_syscall_entry+0x14b/0x17d [] syscall_call+0x7/0xb ======================= Signed-off-by: Jeff Layton commit d0a9c078db4769f7305ff9774558776d12bfb25b Author: Jeff Layton Date: Mon May 12 22:23:49 2008 +0000 [CIFS] CIFS currently allows for permissions to be changed on files, even when unix extensions and cifsacl support are disabled. These permissions changes are "ephemeral" however. They are lost whenever a share is mounted and unmounted, or when memory pressure forces the inode out of the cache. Because of this, we'd like to introduce a behavior change to make CIFS behave more like local DOS/Windows filesystems. When unix extensions and cifsacl support aren't enabled, then don't silently ignore changes to permission bits that can't be reflected on the server. Still, there may be people relying on the current behavior for certain applications. This patch adds a new "dynperm" (and a corresponding "nodynperm") mount option that will be intended to make the client fall back to legacy behavior when setting these modes. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 00377d8e3842776d1da633ad9c79a16ecb548b92 Author: Jean Delvare Date: Fri May 9 17:59:51 2008 +0200 [GFS2] Prefer strlcpy() over snprintf() strlcpy is faster than snprintf when you don't use the returned value. Signed-off-by: Jean Delvare Signed-off-by: Steven Whitehouse commit ad99f77778e83358c371dab7a50bde69270ed6b8 Author: Andrew Price Date: Thu May 1 11:55:38 2008 +0100 [GFS2] Fix cast from unsigned int to s64 This fixes bz 444829 where allocating a new block caused gfs2 file systems to report 0 bytes used in df. It was caused by a broken cast from an unsigned int in gfs2_block_alloc() to a negative s64 in gfs2_statfs_change(). This patch casts the unsigned int to an s64 before the unary minus is applied. Signed-off-by: Andrew Price Signed-off-by: Steven Whitehouse commit 091806edd458486af13ad83c9802f5b8b54d6d19 Author: Bob Peterson Date: Tue Apr 29 12:35:48 2008 -0500 [GFS2] filesystem consistency error from do_strip This patch fixes a GFS2 filesystem consistency error reported from function do_strip. The problem was caused by a timing window that allowed two vfs inodes to be created in memory that point to the same file. The problem is fixed by making the vfs's iget_test, iget_set mechanism check and set a new bit in the in-core gfs2_inode structure while the vfs inode spin_lock is held. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit 45b3947c2de5841d691f1d27d30419b9fae2d86c Author: Al Viro Date: Mon May 12 11:55:10 2008 +0800 [Blackfin] arch: Blackfin checksum annotations FSVOtest in this case, since I don't have the hardware... However, all changes seen by gcc are actually - explicit cast to unsigned short in return expression of functions returning unsigned short - csum_fold() return type changed from unsigned int to __sum16 (unsigned short), same as for all other architecture and as net/* expects; expression actually returned is ((~(sum << 16)) >> 16) with sum being unsigned 32bit, so it's (a) going to fit into the range of unsigned short and (b) had been unsigned all along, so no sign expansion mess happened. Tested-by: Bryan Wu Signed-off-by: Al Viro Signed-off-by: David Miller Signed-off-by: Bryan Wu commit 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48 Author: S.Çağlar Onur Date: Fri May 2 14:10:08 2008 +0300 Remove *.rej pattern from .gitignore With commit 3f1b0e1f287547903f11fa1e6de7d2765597766e ".gitignore update" Linus's current git tree starts to ignore any "*.rej" files. So "git status" no longer shows these files, but the ones who works with quilt patchsets, this not makes life easier as expected. Because sometimes a work flow (at least for me) requires "quilt push -f" followed by "git status" to see unresolved merge conflicts, work on these conflicts to correct them and finalize the patch with "quilt refresh". And if there are some "*.rej" files exists in tree, for whatever reason, this means something goes really wrong there and i think this situation not deserves to be ignored. Signed-off-by: S.Çağlar Onur Signed-off-by: Sam Ravnborg commit 591b0179e80f7d59b5e6e57063e92fdbface98fb Author: Sam Ravnborg Date: Sun May 11 10:07:03 2008 +0200 MAINTAINERS: document names of new kbuild trees Signed-off-by: Sam Ravnborg commit fd1db0a31319bd21c521b197ce17c557556b821b Author: Andi Kleen Date: Thu May 8 13:41:11 2008 +0200 kbuild: disable modpost warnings for linkonce sections Disable modpost warnings for linkonce sections My build gives lots of warnings like WARNING: sound/core/snd.o (.gnu.linkonce.wi.mpspec_def.h.30779716): unexpected section name. The (.[number]+) following section name are ld generated and not expected. Did you forget to use "ax"/"aw" in a .S file? Note that for example contains section definitions for use in .S files. But for .linkonce. duplicated sections are actually ok and expected. So just disable the warning for this case. Signed-off-by: Andi Kleen Signed-off-by: Sam Ravnborg commit a95bcfac2b5f353f99c6a338d77eb5584ab35d83 Author: Masatake YAMATO Date: Wed May 7 16:04:31 2008 +0900 kbuild: escape meta characters in regular expression in make TAGS Alexey Dobriyan introduced a code adds menuconfig SOMETHING in Kconfig to tags output when you did "make tags". See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ff26241623875636674a31c0540a78c0fb5433 "make tags" may work fine with his code. However make TAGS doesn't work well because etags command requires backslashes to escape meta characters like `(', `)' and `|'. Here is a patch. Signed-off-by: Masatake YAMATO Signed-off-by: Sam Ravnborg commit e948e99400b28af152414f15f8c8023ff2430b79 Author: Keith Packard Date: Wed May 7 12:27:53 2008 +1000 drm/i915: save and restore dsparb and d_state registers. Signed-off-by: Dave Airlie commit a59e122a67b88925944d3bbf33d15229cf0fc3de Author: Jesse Barnes Date: Wed May 7 12:25:46 2008 +1000 drm/i915: fix off by one in VGA save/restore of AR & CR regs. turns out it's important to save/restore AR14 in particular. Signed-off-by: Dave Airlie commit f116cc561eae0a426b8fa6b3e22e80ba0bcf7aee Author: Thomas Hellstrom Date: Wed May 7 12:22:39 2008 +1000 drm: disable tasklets not IRQs when taking the drm lock spinlock Signed-off-by: Dave Airlie commit af6061af0d9f84a4665f88186dc1ff9e4fb78330 Author: Dave Airlie Date: Wed May 7 12:15:39 2008 +1000 Revert "drm/vbl rework: rework how the drm deals with vblank." This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4. Okay this looks like wasn't as fully baked as I'd led myself to believe. Revert for now for further baking. Signed-off-by: Dave Airlie commit a94477da38e0b261a7ecea71f4c95a3bcd5be69c Author: David Chinner Date: Wed Apr 30 18:15:34 2008 +1000 [XFS] Include linux/random.h in all builds, not just debug builds. SGI-PV: 979416 SGI-Modid: xfs-linux-melb:xfs-kern:31008a Signed-off-by: David Chinner Signed-off-by: Lachlan McIlroy