commit 589643be6693c46fbc54bae77745f336c8ed4bcc Merge: 80519bc faabd47 Author: Linus Torvalds Date: Sun Jul 11 13:35:34 2010 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: Fix autoloading of fschmd on recent Fujitsu machines hwmon: (coretemp) Properly label the sensors hwmon: (coretemp) Skip duplicate CPU entries hwmon: (it87) Fix in7 on IT8720F hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions commit 80519bc77b52729ca49b278b67d58715e38b85e9 Merge: ecd4b48 102b59c Author: Linus Torvalds Date: Sun Jul 11 13:32:55 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c/mips: Fix error return codes from Sibyte i2c bus driver i2c: Fix probability check commit 102b59c6d6d30fb6560177fd1ae8a34c4c163897 Author: Guenter Roeck Date: Sat Jul 10 09:42:47 2010 +0200 i2c/mips: Fix error return codes from Sibyte i2c bus driver Sibyte i2c bus driver returns non-descriptive error values. Update to return error values as defined in Documentation/i2c/fault-codes. Signed-off-by: Guenter Roeck Signed-off-by: Jean Delvare commit 827900c55665dc8e20b05bb18d3f6e078eaa6183 Author: Jean Delvare Date: Sat Jul 10 09:42:46 2010 +0200 i2c: Fix probability check The new unified probing function differs from the original code, and the preliminary test whether probing is possible must be updated accordingly. Signed-off-by: Jean Delvare commit faabd47f7e3a36574abcdff0b3506abb092bbe24 Author: Jean Delvare Date: Fri Jul 9 16:22:51 2010 +0200 hwmon: Fix autoloading of fschmd on recent Fujitsu machines Fujitsu slightly changed the DMI strings in their recent machines, (for example the D2778) and this breaks the automatic loading of the needed fschmd driver. Being more tolerant on string comparison fixes the issue. This closes bug #15634: https://bugzilla.kernel.org/show_bug.cgi?id=15634 Signed-off-by: Jean Delvare Tested-by: Sergey Spiridonov Cc: Hans de Goede commit 3f4f09b4be35d38d6e2bf22c989443e65e70fc4c Author: Jean Delvare Date: Fri Jul 9 16:22:51 2010 +0200 hwmon: (coretemp) Properly label the sensors Don't assume that CPU entry number and core ID always match. It worked in the simple cases (single CPU, no HT) but fails on multi-CPU systems. Signed-off-by: Jean Delvare Acked-by: Huaxu Wan Cc: stable@kernel.org commit d883b9f0977269d519469da72faec6a7f72cb489 Author: Jean Delvare Date: Fri Jul 9 16:22:49 2010 +0200 hwmon: (coretemp) Skip duplicate CPU entries On hyper-threaded CPUs, each core appears twice in the CPU list. Skip the second entry to avoid duplicate sensors. Signed-off-by: Jean Delvare Acked-by: Huaxu Wan Cc: stable@kernel.org commit 436cad2a41a40c6c32bd9152b63d17eeb1f7c99b Author: Jean Delvare Date: Fri Jul 9 16:22:48 2010 +0200 hwmon: (it87) Fix in7 on IT8720F The IT8720F has no VIN7 pin, so VCCH should always be routed internally to VIN7 with an internal divider. Curiously, there still is a configuration bit to control this, which means it can be set incorrectly. And even more curiously, many boards out there are improperly configured, even though the IT8720F datasheet claims that the internal routing of VCCH to VIN7 is the default setting. So we force the internal routing in this case. It turns out that all boards with the wrong setting are from Gigabyte, so I suspect a BIOS bug. But it's easy enough to workaround in the driver, so let's do it. Signed-off-by: Jean Delvare Cc: Jean-Marc Spaggiari Cc: stable@kernel.org commit d535bad90dad4eb42ec6528043fcfb53627d4f89 Author: Andreas Herrmann Date: Fri Jul 9 16:22:47 2010 +0200 hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions Reported temperature for ASB1 CPUs is too high. Add ASB1 CPU revisions (these are also non-desktop variants) to the list of CPUs for which the temperature fixup is not required. Example: (from LENOVO ThinkPad Edge 13, 01972NG, system was idle) Current kernel reports $ sensors k8temp-pci-00c3 Adapter: PCI adapter Core0 Temp: +74.0 C Core0 Temp: +70.0 C Core1 Temp: +69.0 C Core1 Temp: +70.0 C With this patch I have $ sensors k8temp-pci-00c3 Adapter: PCI adapter Core0 Temp: +54.0 C Core0 Temp: +51.0 C Core1 Temp: +48.0 C Core1 Temp: +49.0 C Cc: stable@kernel.org [.32.x .33.x, .34.x] Cc: Rudolf Marek Signed-off-by: Andreas Herrmann Signed-off-by: Jean Delvare commit ecd4b48a163b55d7eb4132617100b90d0d2768ec Author: Ben Hutchings Date: Thu Jul 1 20:37:20 2010 +0000 IB/qib: Use request_firmware() to load SD7220 firmware Extract the microcode for the QLogic QLE7220 series IB HCA and use the kernel microcode request facility to load the microcode. This supports Debian Linux's requirements to separate microcode which doesn't have open source code available from the device driver. Signed-off-by: Ben Hutchings Signed-off-by: Roland Dreier commit e467e104bb7482170b79f516d2025e7cfcaaa733 Merge: b9f3995 9e77004 Author: Linus Torvalds Date: Thu Jul 8 12:20:54 2010 -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: IPoIB: Fix world-writable child interface control sysfs attributes IB/qib: Clean up properly if qib_init() fails IB/qib: Completion queue callback needs to be single threaded IB/qib: Update 7322 serdes tables IB/qib: Clear 6120 hardware error register IB/qib: Clear eager buffer memory for each new process IB/qib: Mask hardware error during link reset IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem RDMA/cxgb4: Derive smac_idx from port viid RDMA/cxgb4: Avoid false GTS CIDX_INC overflows RDMA/cxgb4: Don't call abort_connection() for active connect failures RDMA/cxgb4: Use the DMA state API instead of the pci equivalents commit 9e770044a0f08a6dcf245152ec1575f7cb0b9631 Merge: 2c5934b 7a52b34 756a33b Author: Roland Dreier Date: Thu Jul 8 09:10:24 2010 -0700 Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next commit b9f399594d12e353dcb609c25219bdaa76c2a050 Merge: c77e9e6 7645054 Author: Linus Torvalds Date: Thu Jul 8 08:20:41 2010 -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 - Enable beep on Realtek codecs with PCI SSID override ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams ALSA: hda - Add Macbook 5,2 quirk ALSA: hda - Fix uninitialized variable commit c77e9e68269bf50573ce130b5d95ff6e539dbcf8 Merge: 31016e9 83ba7b0 Author: Linus Torvalds Date: Thu Jul 8 08:06:40 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: writeback: simplify the write back thread queue writeback: split writeback_inodes_wb writeback: remove writeback_inodes_wbc fs-writeback: fix kernel-doc warnings splice: check f_mode for seekable file splice: direct_splice_actor() should not use pos in sd commit 31016e9941be85e8c487b1f3c45d253eda356715 Merge: 6741502 bf23690 Author: Linus Torvalds Date: Thu Jul 8 08:05:43 2010 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix userspace build of ptrace.h powerpc: Fix default_machine_crash_shutdown #ifdef botch powerpc: Fix logic error in fixup_irqs powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources powerpc: Linux cannot run with 0 cores powerpc: Fix feature-fixup tests for gcc 4.5 powerpc: Disable SPARSE_IRQ by default powerpc: Fix compile errors in prom_init_check for gcc 4.5 powerpc: Fix module building for gcc 4.5 and 64 bit powerpc/perf_event: Fix for power_pmu_disable() commit 67415020950046e32f520c1447e79ebebbf447ac Merge: 2aa72f6 f50b8bc Author: Linus Torvalds Date: Thu Jul 8 08:02:18 2010 -0700 Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: Fix on wrong function name for S5PV210 sdhci0 ARM: S5P6442: Fix PLL setting announce message. ARM: SAMSUNG: Fix build without SDHCI controllers for S3C64XX ARM: S5PV210: Correct clock register properties ARM: S5P: Bug fix on external interrupt for S5P SoCs commit 7645054f181404e6a28c616b307c4d2562423a50 Merge: b492c4e a5c7d79 Author: Takashi Iwai Date: Thu Jul 8 16:55:26 2010 +0200 Merge branch 'fix/misc' into for-linus commit b492c4e8954d54f806875c149bbcafaa7ede7ada Merge: 815c416 f189efc Author: Takashi Iwai Date: Thu Jul 8 16:55:02 2010 +0200 Merge branch 'fix/hda' into for-linus commit bf23690b89b731468478c21eb07bbb645cc66ead Author: Sam Ravnborg Date: Sun May 9 08:52:31 2010 +0200 powerpc: Fix userspace build of ptrace.h Build of ptrace.h failed for assembly because it pulls in stdint.h. Use exportable types (__u32, __u64) to avoid the dependency on stdint.h. Signed-off-by: Sam Ravnborg Cc: Andrey Volkov Cc: Dave Kleikamp Cc: Benjamin Herrenschmidt Acked-by: Dave Kleikamp Signed-off-by: Benjamin Herrenschmidt commit c2be05481f6125254c45b78f334d4dd09c701c82 Author: Paul E. McKenney Date: Tue Jun 15 14:48:39 2010 +0000 powerpc: Fix default_machine_crash_shutdown #ifdef botch crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64 and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP. Fix the conditional compilation around the invocation. Signed-off-by: Paul E. McKenney Acked-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit 3cd8519248e9e17d982c6fab0f1a89bca6feb49a Author: Johannes Berg Date: Wed Jun 16 00:09:35 2010 +0000 powerpc: Fix logic error in fixup_irqs When SPARSE_IRQ is set, irq_to_desc() can return NULL. While the code here has a check for NULL, it's not really correct. Fix it by separating the check for it. This fixes CPU hot unplug for me. Reported-by: Alastair Bridgewater Cc: stable@kernel.org [2.6.32+] Signed-off-by: Johannes Berg Signed-off-by: Benjamin Herrenschmidt commit d3005fbc696781d2fd7bd5b5389a94fae5332b58 Author: Denis Kirjanov Date: Wed Jun 16 05:16:59 2010 +0000 powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources I don't know if this is a right fix for the problem since of_get_property can return NULL. Since iseries_device_information is used only for informational purpose, we can skip this function without valid HvSubBusNumber number. Signed-off-by: Denis Kirjanov Signed-off-by: Benjamin Herrenschmidt commit 33ad5e4b6cab3ad8cf3afda49b66393f1833150e Author: Anton Blanchard Date: Thu Jun 17 14:33:06 2010 +0000 powerpc: Linux cannot run with 0 cores If we configure with CONFIG_SMP=n or set NR_CPUS less than the number of SMT threads we will set the max cores property to 0 in the ibm,client-architecture-support structure. On new versions of firmware that understand this property it obliges and terminates our partition. Use DIV_ROUND_UP so we handle not only the CONFIG_SMP=n case but also the case where NR_CPUS isn't a multiple of the number of SMT threads. Signed-off-by: Anton Blanchard Acked-by: Paul E. McKenney Signed-off-by: Benjamin Herrenschmidt commit 3880ecb05bc5ece4c6e392a21ea77518e55b4935 Author: Stephen Rothwell Date: Mon Jun 28 21:08:29 2010 +0000 powerpc: Fix feature-fixup tests for gcc 4.5 The feature-fixup test declare some extern void variables and then take their addresses. Fix this by declaring them as extern u8 instead. Fixes these warnings (treated as errors): CC arch/powerpc/lib/feature-fixups.o cc1: warnings being treated as errors arch/powerpc/lib/feature-fixups.c: In function 'test_cpu_macros': arch/powerpc/lib/feature-fixups.c:293:23: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:294:9: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:297:2: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:297:2: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c: In function 'test_fw_macros': arch/powerpc/lib/feature-fixups.c:306:23: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:307:9: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:310:2: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:310:2: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c: In function 'test_lwsync_macros': arch/powerpc/lib/feature-fixups.c:321:23: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:322:9: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:326:3: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:326:3: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:329:3: error: taking address of expression of type 'void' arch/powerpc/lib/feature-fixups.c:329:3: error: taking address of expression of type 'void' Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 9ce91685f9db48b7050bed916bea097fcbaea093 Author: Yang Li Date: Mon Jun 28 23:32:57 2010 +0000 powerpc: Disable SPARSE_IRQ by default The SPARSE_IRQ considerably adds overhead to critical path of IRQ handling. However it doesn't benefit much in space for most systems with limited IRQ_NR. Should be disabled unless really necessary. Signed-off-by: Li Yang Signed-off-by: Benjamin Herrenschmidt commit 5afd878a958191a3f32911f1f5f03beee5368e68 Author: Stephen Rothwell Date: Tue Jun 29 20:04:22 2010 +0000 powerpc: Fix compile errors in prom_init_check for gcc 4.5 Just whitelist these extra compiler generated symbols. Fixes these errors: Error: External symbol '_restgpr0_14' referenced from prom_init.c Error: External symbol '_restgpr0_20' referenced from prom_init.c Error: External symbol '_restgpr0_22' referenced from prom_init.c Error: External symbol '_restgpr0_24' referenced from prom_init.c Error: External symbol '_restgpr0_25' referenced from prom_init.c Error: External symbol '_restgpr0_26' referenced from prom_init.c Error: External symbol '_restgpr0_27' referenced from prom_init.c Error: External symbol '_restgpr0_28' referenced from prom_init.c Error: External symbol '_restgpr0_29' referenced from prom_init.c Error: External symbol '_restgpr0_31' referenced from prom_init.c Error: External symbol '_savegpr0_14' referenced from prom_init.c Error: External symbol '_savegpr0_20' referenced from prom_init.c Error: External symbol '_savegpr0_22' referenced from prom_init.c Error: External symbol '_savegpr0_24' referenced from prom_init.c Error: External symbol '_savegpr0_25' referenced from prom_init.c Error: External symbol '_savegpr0_26' referenced from prom_init.c Error: External symbol '_savegpr0_27' referenced from prom_init.c Error: External symbol '_savegpr0_28' referenced from prom_init.c Error: External symbol '_savegpr0_29' referenced from prom_init.c Error: External symbol '_savegpr0_31' referenced from prom_init.c Signed-off-by: Stephen Rothwell Acked-by: Segher Boessenkool Signed-off-by: Benjamin Herrenschmidt commit 7fca5dc8aa7aaa6a1023bd3587901b88ebfe8154 Author: Stephen Rothwell Date: Tue Jun 29 20:08:42 2010 +0000 powerpc: Fix module building for gcc 4.5 and 64 bit Gcc 4.5 is now generating out of line register save and restore in the function prefix and postfix when we use -Os. Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 219a92a4c40db2fac604f63bce9a5a3fe1967879 Author: Matt Evans Date: Mon Jul 5 17:36:32 2010 +0000 powerpc/perf_event: Fix for power_pmu_disable() When power_pmu_disable() removes the given event from a particular index into cpuhw->event[], it shuffles down higher event[] entries. But, this array is paired with cpuhw->events[] and cpuhw->flags[] so should shuffle them similarly. If these arrays get out of sync, code such as power_check_constraints() will fail. This caused a bug where events were temporarily disabled and then failed to be re-enabled; subsequent code tried to write_pmc() with its (disabled) idx of 0, causing a message "oops trying to write PMC0". This triggers this bug on POWER7, running a miss-heavy test: perf record -e L1-dcache-load-misses -e L1-dcache-store-misses ./misstest Signed-off-by: Matt Evans Acked-by: Paul Mackerras Signed-off-by: Benjamin Herrenschmidt commit 2aa72f612144a0a7d4b0b22ae7c122692ac6a013 Merge: 78178c7 33b665e Author: Linus Torvalds Date: Wed Jul 7 19:56:00 2010 -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: (35 commits) NET: SB1250: Initialize .owner vxge: show startup message with KERN_INFO ll_temac: Fix missing iounmaps bridge: Clear IPCB before possible entry into IP stack bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined net/ne: fix memory leak in ne_drv_probe() xfrm: fix xfrm by MARK logic virtio_net: fix oom handling on tx virtio_net: do not reschedule rx refill forever s2io: resolve statistics issues linux/net.h: fix kernel-doc warnings net: decreasing real_num_tx_queues needs to flush qdisc sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock qlge: fix a eeh handler to not add a pending timer qlge: Replacing add_timer() to mod_timer() usbnet: Set parent device early for netdev_printk() net: Revert "rndis_host: Poll status channel before control channel" netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h ... commit 33b665eeeb85956ccbdf31c4c31a4e2a31133c44 Author: Ralf Baechle Date: Tue Jul 6 05:18:11 2010 +0000 NET: SB1250: Initialize .owner Signed-off-by: Ralf Baechle drivers/net/sb1250-mac.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Signed-off-by: David S. Miller commit 7074b16cc6bd27b1962e8f592b3733ebe92f4897 Author: Wu Fengguang Date: Tue Jul 6 03:02:03 2010 +0000 vxge: show startup message with KERN_INFO The original KERN_CRIT will mess up terminals. CC: Sreenivasa Honnur Signed-off-by: Wu Fengguang Signed-off-by: David S. Miller commit dfe1e8eddcd73fc58124933c14c2efe93fab0b8f Author: Denis Kirjanov Date: Mon Jul 5 21:44:20 2010 +0000 ll_temac: Fix missing iounmaps Fix missing iounmaps. Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 17762060c25590bfddd68cc1131f28ec720f405f Author: Herbert Xu Date: Mon Jul 5 21:29:28 2010 +0000 bridge: Clear IPCB before possible entry into IP stack The bridge protocol lives dangerously by having incestuous relations with the IP stack. In this instance an abomination has been created where a bogus IPCB area from a bridged packet leads to a crash in the IP stack because it's interpreted as IP options. This patch papers over the problem by clearing the IPCB area in that particular spot. To fix this properly we'd also need to parse any IP options if present but I'm way too lazy for that. Signed-off-by: Herbert Xu Cheers, Signed-off-by: David S. Miller commit 78178c7d6e127fff6dba027315fd6914304b05cf Merge: 140236b 023eb57 Author: Linus Torvalds Date: Wed Jul 7 11:43:28 2010 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: correctly update connector DPMS status in drm_fb_helper drm/radeon/kms: fix shared ddc handling drm/ttm: Allocate the page pool manager in the heap. commit 023eb571a1d0eae738326042dcffa974257eb8c8 Author: Jesse Barnes Date: Fri Jul 2 10:48:08 2010 -0700 drm: correctly update connector DPMS status in drm_fb_helper We don't currently update the DPMS status of the connector (both in the connector itself and the connector's DPMS property) in the fb helper code. This means that if the kernel FB core has blanked the screen, sysfs will still show a DPMS status of "on". It also means that when X starts, it will try to light up the connectors, but the drm_crtc_helper code will ignore the DPMS change since according to the connector, the DPMS status is already on. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28436 (the annoying "my screen was blanked when I started X and now it won't light up" bug). Signed-off-by: Jesse Barnes Signed-off-by: Dave Airlie commit b2ea4aa67bfd084834edd070e0a4a47857d6db59 Author: Alex Deucher Date: Thu Jul 1 10:34:56 2010 -0400 drm/radeon/kms: fix shared ddc handling Connectors with a shared ddc line can be connected to different encoders. Reported by Pasi Kärkkäinen on dri-devel Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 5870a4d97da136908ca477e3a21bc9f4c2705161 Author: Francisco Jerez Date: Sun Jul 4 04:03:07 2010 +0200 drm/ttm: Allocate the page pool manager in the heap. Repeated ttm_page_alloc_init/fini fails noisily because the pool manager kobj isn't zeroed out between uses (we could do just that but statically allocated kobjects are generally considered a bad thing). Move it to kzalloc'ed memory. Note that this patch drops the refcounting behavior of the pool allocator init/fini functions: it would have led to a race condition in its current form, and anyway it was never exploited. This fixes a regression with reloading kms modules at runtime, since page allocator was introduced. Signed-off-by: Francisco Jerez Signed-off-by: Dave Airlie commit 140236b4b1c749c9b795ea3d11558a0eb5a3a080 Author: Artem Bityutskiy Date: Thu Jun 10 13:56:33 2010 +0300 VFS: introduce s_dirty accessors This patch introduces 3 VFS accessors: 'sb_mark_dirty()', 'sb_mark_clean()', and 'sb_is_dirty()'. They simply set 'sb->s_dirt' or test 'sb->s_dirt'. The plan is to make every FS use these accessors later instead of manipulating the 'sb->s_dirt' flag directly. Ultimately, this change is a preparation for the periodic superblock synchronization optimization which is about preventing the "sync_supers" kernel thread from waking up even if there is nothing to synchronize. This patch does not do any functional change, just adds accessor functions. Signed-off-by: Artem Bityutskiy Signed-off-by: Linus Torvalds commit 47a716cf0ca981b9549ec9815122ada7a0ff707c Merge: 1cc9629 b945d6b Author: Linus Torvalds Date: Tue Jul 6 17:16:09 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rbtree: Undo augmented trees performance damage and regression x86, Calgary: Limit the max PHB number to 256 commit 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd Merge: 8b8ce88 153a109 Author: Linus Torvalds Date: Tue Jul 6 17:15:15 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix crush device 'out' threshold to 1.0, not 0.1 ceph: fix caps usage accounting for import (non-reserved) case ceph: only release clean, unused caps with mds requests ceph: fix crush CHOOSE_LEAF when type is already a leaf ceph: fix crush recursion ceph: fix caps debugfs entry ceph: delay umount until all mds requests drop inode+dentry refs ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate ceph: fix crush map update decoding ceph: fix message memory leak, uninitialized variable ceph: fix map handler error path ceph: some endianity fixes commit 8b8ce8810b092cef35e15af6577ad569f6145c0a Merge: 7491eb9 e4f1ac2 Author: Linus Torvalds Date: Tue Jul 6 17:14:53 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: do not initialize the present flag too late. commit 7491eb9b5f39dbd9faa32a07d76597ab502166a1 Merge: 7263e71 55dc9d5 Author: Linus Torvalds Date: Tue Jul 6 17:14:33 2010 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits) MIPS: Return after handling coprocessor 2 exception MIPS: BCM47xx: Add NVRAM support devices MIPS: Loongson: Define rtc device on MC146818-equipped systems MIPS: MT: Fix FPU affinity. MIPS: Oprofile: Fixup of loongson2_exit() MIPS: Alchemy: sleepcode without compile-time cputype dependencies MIPS: Tracing: Cleanup of address space checking MIPS: Tracing: Cleanup of function graph tracer MIPS: Tracing: Reduce the overhead of dynamic Function Tracer MIPS: Tracing: Cleanup of instructions used MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5 MIPS: Tracing: Cleanup comments MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return MIPS: Tracing: Merge adjacent #ifdefs with same condition. MIPS: AR7, BCM63xx: fix gpio_to_irq() return value MIPS: Restore signalling NaN behaviour for abs.[sd] MIPS: Loongson: CS5536: Fix ISA support MIPS: Loongson: Add a missing break statement in CS5536 IDE code MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB ... commit 7263e715c91f3de554ab7d4f20f56e080783d0f5 Author: Michal Marek Date: Mon Jul 5 23:43:04 2010 +0200 kbuild: Fix path to scripts/setlocalversion Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch. Reported-by: Stephen Rothwell Reported-and-tested-by: Rafael J. Wysocki Reported-by: Peter Anvin Signed-off-by: Michal Marek Signed-off-by: Linus Torvalds commit 7a52b34b07122ff5f45258d47f260f8a525518f0 Author: Or Gerlitz Date: Sun Jun 6 04:59:16 2010 +0000 IPoIB: Fix world-writable child interface control sysfs attributes Sumeet Lahorani reported that the IPoIB child entries are world-writable; however we don't want ordinary users to be able to create and destroy child interfaces, so fix them to be writable only by root. Signed-off-by: Or Gerlitz Cc: Signed-off-by: Roland Dreier commit 756a33b8dc3ed5c27685a130339de8a894d528a7 Author: Ralph Campbell Date: Thu Jul 1 20:25:45 2010 +0000 IB/qib: Clean up properly if qib_init() fails If qib_init() fails, the driver fails to free memory, unregister device files, and unregister with the PCIe framework. The driver will unload without error but a subsequent driver load will cause the system to panic. This was found by changing the 7220 code to load the serdes microcode separately and not installing the microcode file. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 950aff53949268eec4b0f2bd49f700f9585698f7 Author: Ralph Campbell Date: Thu Jun 17 23:14:15 2010 +0000 IB/qib: Completion queue callback needs to be single threaded Workqueues aren't exactly equivalent to tasklets since the callback function may be called from multiple CPUs before the callback returns. This causes completion notification callbacks to have MT bugs since they weren't expecting this behavior. The fix is to use a single threaded work queue. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 7c7a416ef863a741c2031b5da1538773f9ab54f0 Author: Ralph Campbell Date: Thu Jun 17 23:14:09 2010 +0000 IB/qib: Update 7322 serdes tables Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 2d757a7ce06abb4afe5b3002d4cdc40e47d7facc Author: Ralph Campbell Date: Thu Jun 17 23:14:04 2010 +0000 IB/qib: Clear 6120 hardware error register The hardware error register needs to be cleared or another interrupt will be generated, thus causing an infinite loop. This is a regression introduced when removing debug output. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit 5df4223a444057e433e9e4f2e101ee7159f8c19d Author: Ralph Campbell Date: Thu Jun 17 23:13:59 2010 +0000 IB/qib: Clear eager buffer memory for each new process The eager buffers are not being cleared before being mmapped into a new user address space. This is a potential security risk and should be fixed. Note that the eager header queue is already being cleared. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit b9e03e0489a8616fc415e62128d05ad0159a20a2 Author: Ralph Campbell Date: Thu Jun 17 23:13:54 2010 +0000 IB/qib: Mask hardware error during link reset The HCA checks for certain hardware errors which can be falsely triggered when the IB link is reset. The fix is to mask them rather than report them. Signed-off-by: Ralph Campbell Signed-off-by: Roland Dreier commit fce24a9d28f8b99fd0eacc14e252ab4fca9527a7 Author: Dave Olson Date: Thu Jun 17 23:13:44 2010 +0000 IB/qib: Don't mark VL15 bufs as WC to avoid a rare 7322 chip problem Don't set write combining via PAT on the VL15 buffers to avoid a rare problem with unaligned writes from interrupt-flushed store buffers. Signed-off-by: Dave Olson Signed-off-by: Roland Dreier commit 2c5934bfc5ffcbef3622d0bdbad93628d210012a Author: Steve Wise Date: Wed Jun 23 15:46:44 2010 +0000 RDMA/cxgb4: Derive smac_idx from port viid Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 1973e8b8edea68d2408328d25b318ee7401293be Author: Steve Wise Date: Thu Jun 10 19:03:06 2010 +0000 RDMA/cxgb4: Avoid false GTS CIDX_INC overflows The T4 IQ hw design assumes CIDX_INC credits will be returned on a regular basis and always before the CIDX counter crosses over the PIDX counter. For RDMA CQs, however, returning CIDX_INC credits is only needed and desired when and if the CQ is armed for notification. This can lead to a GTS write returning credits that causes the HW to reject the credit update because it causes CIDX to pass PIDX. Once this happens, the CIDX/PIDX counters get out of whack and an application can miss a notification and get stuck blocked awaiting a notification. To avoid this, we allocate the HW IQ 2x times the requested size. This seems to avoid the false overflow failures. If we see more issues with this, then we'll have to add code in the poll path to return credits periodically like when the amount reaches 1/2 the queue depth). I would like to avoid this as it adds a PCI write transaction for applications that never arm the CQ (like most MPIs). Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit b21ef16a8b956aee2fb3d7fc9d24a0b4dae2ae72 Author: Steve Wise Date: Thu Jun 10 19:02:55 2010 +0000 RDMA/cxgb4: Don't call abort_connection() for active connect failures Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit f38926aa1dc5fbf7dfc5f97a53377b2e796dedc3 Author: FUJITA Tomonori Date: Thu Jun 3 05:37:50 2010 +0000 RDMA/cxgb4: Use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Acked-by: Steve Wise Signed-off-by: Roland Dreier commit 83ba7b071f30f7c01f72518ad72d5cd203c27502 Author: Christoph Hellwig Date: Tue Jul 6 08:59:53 2010 +0200 writeback: simplify the write back thread queue First remove items from work_list as soon as we start working on them. This means we don't have to track any pending or visited state and can get rid of all the RCU magic freeing the work items - we can simply free them once the operation has finished. Second use a real completion for tracking synchronous requests - if the caller sets the completion pointer we complete it, otherwise use it as a boolean indicator that we can free the work item directly. Third unify struct wb_writeback_args and struct bdi_work into a single data structure, wb_writeback_work. Previous we set all parameters into a struct wb_writeback_args, copied it into struct bdi_work, copied it again on the stack to use it there. Instead of just allocate one structure dynamically or on the stack and use it all the way through the stack. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe commit edadfb10ba35da7253541e4155aa92eff758ebe6 Author: Christoph Hellwig Date: Thu Jun 10 12:07:54 2010 +0200 writeback: split writeback_inodes_wb The case where we have a superblock doesn't require a loop here as we scan over all inodes in writeback_sb_inodes. Split it out into a separate helper to make the code simpler. This also allows to get rid of the sb member in struct writeback_control, which was rather out of place there. Also update the comments in writeback_sb_inodes that explain the handling of inodes from wrong superblocks. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe commit 9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c Author: Christoph Hellwig Date: Thu Jun 10 12:07:27 2010 +0200 writeback: remove writeback_inodes_wbc This was just an odd wrapper around writeback_inodes_wb. Removing this also allows to get rid of the bdi member of struct writeback_control which was rather out of place there. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe commit 7f285fa78d4b81b8458f05e77fb6b46245121b4e Author: Herbert Xu Date: Mon Jul 5 14:50:08 2010 +0000 bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference On Tue, Jul 06, 2010 at 08:48:35AM +0800, Herbert Xu wrote: > > bridge: Restore NULL check in br_mdb_ip_get Resend with proper attribution. bridge: Restore NULL check in br_mdb_ip_get Somewhere along the line the NULL check in br_mdb_ip_get went AWOL, causing crashes when we receive an IGMP packet with no multicast table allocated. This patch restores it and ensures all br_mdb_*_get functions use it. Reported-by: Frank Arnold Signed-off-by: Herbert Xu Thanks, Signed-off-by: David S. Miller commit bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2 Author: Ben Hutchings Date: Fri Jul 2 07:08:44 2010 +0000 net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined netif_vdbg() was originally defined as entirely equivalent to netdev_vdbg(), but I assume that it was intended to take the same parameters as netif_dbg() etc. (Currently it is only used by the sfc driver, in which I worked on that assumption.) In commit a4ed89c I changed the definition used when VERBOSE_DEBUG is not defined, but I failed to notice that the definition used when VERBOSE_DEBUG is defined was also not as I expected. Change that to match netif_dbg() as well. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3390712a474abdcd3de10024dd1062e5928d381c Author: Kulikov Vasiliy Date: Sat Jul 3 05:20:42 2010 +0000 net/ne: fix memory leak in ne_drv_probe() net_device allocated with alloc_eip_netdev() must be freed. Signed-off-by: Kulikov Vasiliy Signed-off-by: David S. Miller commit 153a10939ea6e42e9c0115b0645060d0d7bb4697 Author: Sage Weil Date: Mon Jul 5 09:44:17 2010 -0700 ceph: fix crush device 'out' threshold to 1.0, not 0.1 Fix a typo that made any OSD weighted between 0.1 and 1.0 effectively weighted as 1.0 (fully in). Signed-off-by: Sage Weil commit 55dc9d51a89ba10a1f7b3ed15f1262eb83e87e74 Author: Jesper Nilsson Date: Thu Jun 17 15:25:54 2010 +0200 MIPS: Return after handling coprocessor 2 exception Breaking here dropped us to the default code which always sends a SIGILL to the current process, no matter what the CU2 notifier says. [Ralf: Currently this only hurts on Cavium and possibly some out of tree platforms.] Signed-off-by: Jesper Nilsson To: linux-mips@linux-mips.org To: linux-kernel@vger.kernel.org Patchwork: http://patchwork.linux-mips.org/patch/1391/ Signed-off-by: Ralf Baechle commit 121915c4ee0812a14bc8d752bc210d0238d755c1 Author: Waldemar Brodkorb Date: Tue Jun 8 19:06:01 2010 +0200 MIPS: BCM47xx: Add NVRAM support devices When trying to netboot a Linksys WRT54GS WLAN router, the bootup fails, because of following error message: ... [ 0.424000] b44: b44.c:v2.0 [ 0.424000] b44: Invalid MAC address found in EEPROM [ 0.432000] b44 ssb0:1: Problem fetching invariants of chip,aborting [ 0.436000] b44: probe of ssb0:1 failed with error -22 ... The router uses a CFE bootloader, but most of the needed environment variables for network card initialization, are not available from CFE via printenv and even though not via cfe_getenv(). The required environment variables are saved in a special partition in flash memory. The attached patch implement nvram_getenv and enables bootup via NFS root on my router. Most of the patch is extracted from the OpenWrt subversion repository and stripped down and cleaned up to just fix this issue. [Ralf: sorted out header file inclusions. Lots of unneded headers and such that should have been included.] Signed-off-by: Waldemar Brodkorb Reviewed-by: Phil Sutter To: linux-mips@linux-mips.org Cc: Hauke Mehrtens Patchwork: http://patchwork.linux-mips.org/patch/1359/ Signed-off-by: Ralf Baechle commit 5df74352876c0835d2b41b53858c9ee779e0f12f Author: Arnaud Patard Date: Wed Jun 2 00:39:54 2010 +0200 MIPS: Loongson: Define rtc device on MC146818-equipped systems This patch declare the rtc device present on systems with clock compatible with the mc146818 and handled by rtc-cmos. Introduce a new Kconfig entry because there are some systems without rtc_cmos compatible clock. Signed-off-by: Arnaud Patard To: linux-mips@linux-mips.org Cc: aba@not.so.argh.org Patchwork: http://patchwork.linux-mips.org/patch/1320/ Signed-off-by: Ralf Baechle commit 17c04139fd2aeaef30fda380bb91b32de7b41a8f Author: Ralf Baechle Date: Sat May 29 03:19:57 2010 +0100 MIPS: MT: Fix FPU affinity. The fragile MT sys_sched_setaffinity wrapper needs its regular dose of fixes. Nose-poked-at-pile-o-crap-by: Julia Lawall Signed-off-by: Ralf Baechle commit 1d84267480ce8cf9943b79b70da86ddb3f95e3dd Author: Wu Zhangjin Date: Fri May 7 01:03:49 2010 +0800 MIPS: Oprofile: Fixup of loongson2_exit() When exiting from loongson2_exit(), we need to reset the counter register too, this patch adds a function reset_counters() to do it, by the way, this function will be shared by Perf. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1199/ Signed-off-by: Ralf Baechle commit 2e93d1ec080e4b21a34869129bda73f24ebb8950 Author: Manuel Lauss Date: Mon May 24 19:42:52 2010 +0200 MIPS: Alchemy: sleepcode without compile-time cputype dependencies Split the low-level sleepcode into per-cpu functions instead of relying on compile-time-defined cpu type. Signed-off-by: Manuel Lauss To: Linux-MIPS Patchwork: http://patchwork.linux-mips.org/patch/1281/ Signed-off-by: Ralf Baechle commit c9f84873c1231621508cd438bb2991ddba770a69 Author: Wu Zhangjin Date: Fri May 14 19:08:34 2010 +0800 MIPS: Tracing: Cleanup of address space checking This patch adds an inline function in_module() to check which space the instruction pointer in, kernel space or module space. Note: This will not work when the kernel space and module space are the same. If they are the same, we need to modify scripts/recordmcount.pl, ftrace_make_nop/call() and the other related parts to ensure the enabling/disabling of the calling site to _mcount is right for both kernel and module. [Ralf: It also is still incorrect for some 64-bit kernels.] Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1232/ Signed-off-by: Ralf Baechle commit 68ccf7521dc89bfcf01432fd1bf8cb4d7d534e4c Author: Wu Zhangjin Date: Fri May 14 19:08:33 2010 +0800 MIPS: Tracing: Cleanup of function graph tracer Cleans up comments and ftrace_get_parent_addr() of function graph tracer. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1231/ Signed-off-by: Ralf Baechle commit e424054000878d7eb11e44289242886d6e219d22 Author: Wu Zhangjin Date: Fri May 14 19:08:32 2010 +0800 MIPS: Tracing: Reduce the overhead of dynamic Function Tracer With the help of uasm this patch encodes the instructions of the dynamic function tracer in ftrace_dyn_arch_init() when initializing it. As a result we can remove the dynamic encoding of instructions in ftrace_make_nop()/call(), ftrace_enable_ftrace_graph_caller() and remove the macro jump_insn_encode() and at last this reduce the overhead of dynamic Function Tracer. This also is cleaner. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1230/ Signed-off-by: Ralf Baechle commit 4d6829f92a02d96e1bec2ffe6ee674ef3b49722b Author: Wu Zhangjin Date: Fri May 14 19:08:31 2010 +0800 MIPS: Tracing: Cleanup of instructions used This patch adds some cleanups of the instructions: o use macros instead of magic numbers o use macros instead of variables to reduce some overhead o add new macro for the jal instruction Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1229/ Signed-off-by: Ralf Baechle commit 3a2af2dc1bcbfe86b1f39e9e5f9c2c5447943f16 Author: Wu Zhangjin Date: Fri May 14 19:08:30 2010 +0800 MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address For 32-bit kernel the -mmcount-ra-address option of gcc 4.5 emits one extra instruction before calling to _mcount so we need to use a different "b 1f" for it. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1228/ Signed-off-by: Ralf Baechle commit 56b49cd35fd56e29adb8f97ba051a1670d24d133 Author: Wu Zhangjin Date: Fri May 14 19:08:29 2010 +0800 MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5 As documented in the GCC 4.5 docs [1] -mmcount-ra-address uses register $12 to pass the stack offset of the return address to the _mcount function. On 64-bit kernels $12 is t0 but in 32-bit kernels it is t4 so we need to use $12 instead of t0 here to be correct for both kernel types. [1] GCC documentation: MIPS Options http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1227/ Signed-off-by: Ralf Baechle commit 042e571d224707b777d0995317c74812b960bfeb Author: Wu Zhangjin Date: Fri May 14 19:08:28 2010 +0800 MIPS: Tracing: Cleanup comments Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1225/ Signed-off-by: Ralf Baechle commit cbe555b01b0da9e89afa4babf3b8942d2b052fb8 Author: Wu Zhangjin Date: Fri May 14 19:08:27 2010 +0800 MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1226/ Signed-off-by: Ralf Baechle commit 27b118342f2dcd6f0c2cd64453cc5a0289c4b3c9 Author: Wu Zhangjin Date: Fri May 14 19:08:26 2010 +0800 MIPS: Tracing: Merge adjacent #ifdefs with same condition. Signed-off-by: Wu Zhangjin Cc: linux-mips Cc: David Daney Patchwork: http://patchwork.linux-mips.org/patch/1224/ Signed-off-by: Ralf Baechle commit cdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed Author: Yoichi Yuasa Date: Mon May 24 17:36:24 2010 +0900 MIPS: AR7, BCM63xx: fix gpio_to_irq() return value The return value of gpio_to_irq() is not a pointer but an integer. Signed-off-by: Yoichi Yuasa Cc: linux-mips Patchwork: http://patchwork.linux-mips.org/patch/1280/ Signed-off-by: Ralf Baechle commit e48682ddaa8c553fe36a01be9fa07e2556a640df Author: Chris Dearman Date: Tue May 11 18:30:34 2010 -0700 MIPS: Restore signalling NaN behaviour for abs.[sd] Atsushi Nemoto spotted that this had been incorrectly removed in a previous patch Signed-off-by: Chris Dearman To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1213/ Tested-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 4085467060dc31c8d1201f69e52529a08e2c2407 Author: Wu Zhangjin Date: Wed May 19 09:14:18 2010 +0800 MIPS: Loongson: CS5536: Fix ISA support The function _wrmsr() called by divil_lbar_disable()/enable() should be called with the offset as the argument. Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Patchwork: http://patchwork.linux-mips.org/patch/1252/ Signed-off-by: Ralf Baechle commit aa5f858b16d44887cf8a40a746592ae08df5664a Author: Wu Zhangjin Date: Wed May 19 09:13:38 2010 +0800 MIPS: Loongson: Add a missing break statement in CS5536 IDE code Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Cc: Hu Hongbing Patchwork: http://patchwork.linux-mips.org/patch/1251/ Signed-off-by: Ralf Baechle commit f18b2f67eaae0dc0e3aaf1fd8ef320e2b69a514c Author: Wu Zhangjin Date: Wed May 19 09:12:17 2010 +0800 MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB Add several missing RDMSRs for IDE and USB are missing to avoid the agressive modification of the high 32 bits of the MSR. Without this patch some usb devices may fail after printing "reset ehci host ....." when reading the partition information. Signed-off-by: Hu Hongbing Signed-off-by: Wu Zhangjin Cc: linux-mips@linux-mips.org Cc: Zhang Le Cc: Hu Hongbing Patchwork: http://patchwork.linux-mips.org/patch/1250/ Signed-off-by: Ralf Baechle commit e1df057df814a4a70a8711c0226a1d178c33edaa Author: Florian Fainelli Date: Sun May 16 15:25:30 2010 +0200 MIPS: AR7: Fix typo in ar7.h This fixes a typo on the AR7_RESET_PERIPHERAL define. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1247/ Signed-off-by: Ralf Baechle commit 154615d554596d96dd2b29bba4116fa21770fdc0 Author: Florian Fainelli Date: Sun May 16 15:25:17 2010 +0200 MIPS: AR7: Use correct UART port type PORT_AR7 has the correct TRIG flag (UART_FCR_R_TRIG_00) as well as UART_CAP_AFE being set. This fixes UART on TNETD7300 revision 0x02, which would otherwise mangle some characters, no side effects on other revisions. Signed-off-by: Florian Fainelli To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1246/ Signed-off-by: Ralf Baechle commit f189efcd1cc06b75fe18642c9751d26aa5ed2b54 Author: Takashi Iwai Date: Mon Jul 5 17:28:17 2010 +0200 ALSA: hda - Enable beep on Realtek codecs with PCI SSID override When the PCI SSID gives an overriding SKU assno, PC-beep bit isn't detected (since it's located over 16bit), resulting in no PC beep. Also, many devices seem ignoring the requirement by Realtek's spec for SSID numbers, and it also confuses the PC beep detection. This patch assumes the PC beep is available on every machine with PCI SSID override. It's a regression fix from 2.6.34. Reference: Kernel bug 16251 http://bugzilla.kernel.org/show_bug.cgi?id=16251 Signed-off-by: Takashi Iwai commit b945d6b2554d550fe95caadc61e521c0ad71fb9c Author: Peter Zijlstra Date: Sat May 29 15:31:43 2010 +0200 rbtree: Undo augmented trees performance damage and regression Reimplement augmented RB-trees without sprinkling extra branches all over the RB-tree code (which lives in the scheduler hot path). This approach is 'borrowed' from Fabio's BFQ implementation and relies on traversing the rebalance path after the RB-tree-op to correct the heap property for insertion/removal and make up for the damage done by the tree rotations. For insertion the rebalance path is trivially that from the new node upwards to the root, for removal it is that from the deepest node in the path from the to be removed node that will still be around after the removal. [ This patch also fixes a video driver regression reported by Ali Gholami Rudi - the memtype->subtree_max_end was updated incorrectly. ] Acked-by: Suresh Siddha Acked-by: Venkatesh Pallipadi Signed-off-by: Peter Zijlstra Tested-by: Ali Gholami Rudi Cc: Fabio Checconi Cc: "H. Peter Anvin" Cc: Andrew Morton Cc: Linus Torvalds LKML-Reference: <1275414172.27810.27961.camel@twins> Signed-off-by: Ingo Molnar commit e4f1ac2122413736bf2791d3af6533f36b46fc61 Author: Dominik Brodowski Date: Sat Jun 19 14:33:56 2010 +0200 pcmcia: do not initialize the present flag too late. The "present" flag was initialized too late -- possibly, a card was already registered at this time, so re-setting the flag to 0 caused pcmcia_dev_present() to fail. Reported-by: Mikulas Patocka Signed-off-by: Dominik Brodowski commit f50b8bc707988e2543f884d3030199868ca0f48f Author: Hyuk Lee Date: Thu Jun 10 12:40:39 2010 +0900 ARM: SAMSUNG: Fix on wrong function name for S5PV210 sdhci0 This patch fixes on wrong function name in include/plat/sdhci.h for Samsung. The 's5pc100_default_sdhci0()' function should be chnaged to 's5pv210_default_sdhci0()'. Because 's5pv210_default_sdhci0()' must be pair. Signed-off-by: Hyuk Lee Signed-off-by: Kukjin Kim commit 4164acaf096fb92b67cdbde6b454dda773aa953b Author: Thomas Abraham Date: Mon Jun 21 14:21:54 2010 +0530 ARM: S5P6442: Fix PLL setting announce message. The S5P6442 PLL setting announce message incorrectly displays S5P6440 as the SoC. Change it to S5P6442. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit 6b34f498fe8a918978ddba2bc82a9bd6a883e1fb Author: Marek Szyprowski Date: Tue Jun 22 15:45:26 2010 +0900 ARM: SAMSUNG: Fix build without SDHCI controllers for S3C64XX This patch fixes the following compilation problem if only NCP machine is selected: arch/arm/mach-s3c64xx/s3c6410.c: In function 's3c6410_map_io': arch/arm/mach-s3c64xx/s3c6410.c:51: error: implicit declaration of function 's3c6410_default_sdhci2' And also adds missed 's3c6400_default_sdhci2'. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park [kgene.kim@samsung.com: minor title fix and added comments] Signed-off-by: Kukjin Kim commit 154d62e4cdec9eb9271cf57f9d1f57c79c4f4e18 Author: MyungJoo Ham Date: Sat Jun 26 17:21:50 2010 +0900 ARM: S5PV210: Correct clock register properties 1. Corrected shift values of I2S and UART clocks (CLK_GATE_IP3), which were defined incorrectly. 2. Corrected shift values of sclk_audio, uclk1, sclk_fimd, sclk_mmc, sclk_spi, sclk_pwm, which had duplicated .enable/.ctrlbit with their twins defined in struct clk init_clocks_disable[] and struct clk init_clocks[]. We've changed their .enable/.ctrlbit to use CLK_SRC_MASK register to avoid the duplicated clock problem described below. NOTE: Duplicated Clock Problem Please note that each clock definition should access different control register; otherwise, the system may suffer lockups. For example, if we have two clock definitions "a" and "b" which access the same register (and the shift value). Then, when we do: module A clk = clk_get("a"); clk->clk_enable(clk); module B (context switch) clk = clk_get("b"); clk->clk_enable(clk); do something with clk. clk->clk_disable(clk); module A (context switch) do something with clk * At this point, the system may hang. Therefore, there should be no clock definitions with the same contol register/shift. If we need to create "aliases", then, creating child clocks sharing the clock should be fine. 3. Corrected other sclk_* shift values and access registers. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park [kgene.kim@samsung.com: minor title and message fix] Signed-off-by: Kukjin Kim commit 79fc72d6d3ab4ee08068fe39c199aab2e677daaa Author: Boojin Kim Date: Sat Jun 26 16:36:43 2010 +0900 ARM: S5P: Bug fix on external interrupt for S5P SoCs This patch fixes bug on eint type set function, s5p_irq_eint_set_type(). In the IRQ_TYPE_EDGE_FALLING case, S5P_EXTINT_FALLEDGE is right instead of S5P_EXTINT_RISEEDGE Signed-off-by: Boojin Kim Signed-off-by: Kukjin Kim commit 44b451f1633896de15d2d52e1a2bd462e80b7814 Author: Peter Kosyh Date: Fri Jul 2 07:47:55 2010 +0000 xfrm: fix xfrm by MARK logic While using xfrm by MARK feature in 2.6.34 - 2.6.35 kernels, the mark is always cleared in flowi structure via memset in _decode_session4 (net/ipv4/xfrm4_policy.c), so the policy lookup fails. IPv6 code is affected by this bug too. Signed-off-by: Peter Kosyh Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 8bd39456bd5ab16d2a956dd3d567dcac9c73a6c0 Merge: 58eba97 7b3384f Author: David S. Miller Date: Fri Jul 2 22:29:22 2010 -0700 Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 58eba97d0774c69b1cf3e5a8ac74419409d1abbf Author: Rusty Russell Date: Fri Jul 2 16:34:01 2010 +0000 virtio_net: fix oom handling on tx virtio net will never try to overflow the TX ring, so the only reason add_buf may fail is out of memory. Thus, we can not stop the device until some request completes - there's no guarantee anything at all is outstanding. Make the error message clearer as well: error here does not indicate queue full. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell (...and avoid TX_BUSY) Cc: stable@kernel.org # .34.x (s/virtqueue_/vi->svq->vq_ops->/) Signed-off-by: David S. Miller commit 1788f49548860fa1c861ee3454d47b466c877e43 Author: Michael S. Tsirkin Date: Fri Jul 2 16:32:55 2010 +0000 virtio_net: do not reschedule rx refill forever We currently fill all of RX ring, then add_buf returns ENOSPC, which gets mis-detected as an out of memory condition and causes us to reschedule the work, and so on forever. Fix this by oom = err == -ENOMEM; Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell Cc: stable@kernel.org # .34.x Signed-off-by: David S. Miller commit 4a49043223e5047c8f60a09f7b2927a2e6e8dfc7 Author: Jon Mason Date: Fri Jul 2 09:13:49 2010 +0000 s2io: resolve statistics issues This patch resolves a number of issues in the statistics gathering of the s2io driver. On Xframe adapters, the received multicast statistics counter includes pause frames which are not indicated to the driver. This can cause issues where the multicast packet count is higher than what has actually been received, possibly higher than the number of packets received. The driver software counters are replaced with the adapter hardware statistics for rx_packets, rx_bytes, and tx_bytes. It also uses the overflow registers to determine if the statistics wrapped the 32bit register (removing the window of having a statistic value less than the previous call). rx_length_errors statistic now includes undersized packets in addition to oversized packets in its counting. Finally, rx_crc_errors are now being counted. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 94e6721d9ce938293a02736c5f7e42205a41ea68 Merge: e2aec37 499031a Author: David S. Miller Date: Fri Jul 2 22:04:49 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit e2aec372ff4b7e78e79c308104a860ae0ed20950 Author: Randy Dunlap Date: Thu Jul 1 13:18:58 2010 +0000 linux/net.h: fix kernel-doc warnings Fix kernel-doc warnings in linux/net.h: Warning(include/linux/net.h:151): No description found for parameter 'wq' Warning(include/linux/net.h:151): Excess struct/union/enum/typedef member 'fasync_list' description in 'socket' Warning(include/linux/net.h:151): Excess struct/union/enum/typedef member 'wait' description in 'socket' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit f0796d5c73e59786d09a1e617689d1d415f2db44 Author: John Fastabend Date: Thu Jul 1 13:21:57 2010 +0000 net: decreasing real_num_tx_queues needs to flush qdisc Reducing real_num_queues needs to flush the qdisc otherwise skbs with queue_mappings greater then real_num_tx_queues can be sent to the underlying driver. The flow for this is, dev_queue_xmit() dev_pick_tx() skb_tx_hash() => hash using real_num_tx_queues skb_set_queue_mapping() ... qdisc_enqueue_root() => enqueue skb on txq from hash ... dev->real_num_tx_queues -= n ... sch_direct_xmit() dev_hard_start_xmit() ndo_start_xmit(skb,dev) => skb queue set with old hash skbs are enqueued on the qdisc with skb->queue_mapping set 0 < queue_mappings < real_num_tx_queues. When the driver decreases real_num_tx_queues skb's may be dequeued from the qdisc with a queue_mapping greater then real_num_tx_queues. This fixes a case in ixgbe where this was occurring with DCB and FCoE. Because the driver is using queue_mapping to map skbs to tx descriptor rings we can potentially map skbs to rings that no longer exist. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4ef6acff83222f4496ceef7d1f0ee9e50a5bb403 Author: John Fastabend Date: Thu Jul 1 13:21:35 2010 +0000 sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock When calling qdisc_reset() the qdisc lock needs to be held. In this case there is at least one driver i4l which is using this without holding the lock. Add the locking here. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7ae80abdba0644e12ac17da567a2db1efc1bf8a8 Author: Breno Leitao Date: Thu Jul 1 03:00:18 2010 +0000 qlge: fix a eeh handler to not add a pending timer On some ocasions the function qlge_io_resume() tries to add a pending timer, which causes the system to hit the BUG() on add_timer() function. This patch removes the timer during the EEH recovery. Signed-off-by: Breno Leitao Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 72046d84f0d6e3047f4d5a5173260141983b2b61 Author: Breno Leitao Date: Thu Jul 1 03:00:17 2010 +0000 qlge: Replacing add_timer() to mod_timer() Currently qlge driver calls add_timer() instead of mod_timer(). This patch changes add_timer() to mod_timer(), which seems a better solution. Signed-off-by: Breno Leitao Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 0dacca73a3ddefa6cb8a7e0282f938e01faa1a64 Author: Ben Hutchings Date: Fri Jul 2 21:49:02 2010 -0700 usbnet: Set parent device early for netdev_printk() netdev_printk() follows the net_device's parent device pointer, so we must set that earlier than we previously did. Reported-by: Luís Picciochi Oliveira Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 7b00ac51ffcda994ef0839001257be894cc6e5a8 Author: Ben Hutchings Date: Fri Jul 2 21:47:54 2010 -0700 net: Revert "rndis_host: Poll status channel before control channel" This reverts commit c17b274dc2aa538b68c1f02b01a3c4e124b435ba. That change was reported to break rndis_wlan support for the WUSB54GS. Reported-by: Luís Picciochi Oliveira Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 499031ac8a3df6738f6186ded9da853e8ea18253 Author: Eric Dumazet Date: Fri Jul 2 10:05:01 2010 +0200 netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT We should release dst if dst->error is set. Bug introduced in 2.6.14 by commit e104411b82f5c ([XFRM]: Always release dst_entry on error in xfrm_lookup) Signed-off-by: Eric Dumazet Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit c89827e0e9346c039aed9b63c14096c2d36796b1 Author: Cody Rester Date: Thu Jul 1 21:27:44 2010 -0700 drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h Fixed include error, changed to linux/io.h Signed-off-by: Cody Rester Acked-by: Gustavo F. Padovan Signed-off-by: David S. Miller commit 7b3384fc30633738ae4eaf8e1bc6ce70470ced80 Author: Michael S. Tsirkin Date: Thu Jul 1 18:40:12 2010 +0300 vhost: add unlikely annotations to error path patch 'break out of polling loop on error' caused a minor performance regression on my machine: recover that performance by adding a bunch of unlikely annotations in the error handling. Signed-off-by: Michael S. Tsirkin commit 06d738fa9155ff16dba3d7e501ba4581d01a98cb Author: Randy Dunlap Date: Thu Jul 1 08:26:34 2010 +0200 fs-writeback: fix kernel-doc warnings Fix kernel-doc to match the function's changed args. Warning(fs/fs-writeback.c:190): No description found for parameter 'args' Warning(fs/fs-writeback.c:190): Excess function parameter 'sb' description in 'bdi_queue_work_onstack' Signed-off-by: Randy Dunlap Cc: Christoph Hellwig Signed-off-by: Jens Axboe commit d596043d71ff0d7b3d0bead19b1d68c55f003093 Author: Darrick J. Wong Date: Wed Jun 30 17:45:19 2010 -0700 x86, Calgary: Limit the max PHB number to 256 The x3950 family can have as many as 256 PCI buses in a single system, so change the limits to the maximum. Since there can only be 256 PCI buses in one domain, we no longer need the BUG_ON check. Signed-off-by: Darrick J. Wong LKML-Reference: <20100701004519.GQ15515@tux1.beaverton.ibm.com> Signed-off-by: H. Peter Anvin commit 42d782ac1bef7cbcdf05b857731345c6e8149f90 Author: Flavio Leitner Date: Tue Jun 29 08:24:39 2010 +0000 bonding: check if clients MAC addr has changed When two systems using bonding devices in adaptive load balancing (ALB) communicates with each other, an endless ping-pong of ARP replies starts between these two systems. What happens? In the ALB mode, bonding driver keeps track of each client connected in a hash table, so it can do the receive load balancing (RLB). This hash table is updated when an ARP reply is received, then it scans for the client entry, updates its MAC address and flag it to be announced later. Therefore, two seconds later, the alb monitor runs and send for each updated client entry two ARP replies updating this specific client. The same process happens on the receiving system, causing the endless ping-pong of arp replies. See more information including the relevant functions below: System 1 System 2 bond0 bond0 ping ARP request ---------> <--------- ARP reply +->rlb_arp_recv <---------------------+ <--- loop begins | rlb_update_entry_from_arp | | client_info->ntt = 1; | | bond_info->rx_ntt = 1; | | | | | | | | bond_alb_monitor | | rlb_update_rx_clients | | rlb_update_client | | arp_create(ARPOP_REPLY) | | send ARP reply --------------> V | send ARP reply --------------> | rlb_arp_recv | rlb_update_entry_from_arp | client_info->ntt = 1; | bond_info->rx_ntt = 1; | < snipped, same as in system 1> +------- <-------------- send ARP reply <-------------- send ARP reply Besides the unneeded networking traffic, this loop breaks a cluster because a backup system can't take over the IP address. There is always one system sending an ARP reply poisoning the network. This patch fixes the problem adding a check for the MAC address before updating it. Thus, if the MAC address didn't change, there is no need to update neither to announce it later. Signed-off-by: Flavio Leitner Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit dd1589a431e90f9ff587e640c67101a565e52bba Author: David Howells Date: Wed Jun 30 13:10:09 2010 -0700 Bluetooth: Fix abuse of the preincrement operator Fix abuse of the preincrement operator as detected when building with gcc 4.6.0: CC [M] drivers/bluetooth/hci_bcsp.o drivers/bluetooth/hci_bcsp.c: In function 'bcsp_prepare_pkt': drivers/bluetooth/hci_bcsp.c:247:20: warning: operation on 'bcsp->msgq_txseq' may be undefined Reported-by: Justin P. Mattock Signed-off-by: David Howells Acked-by: Gustavo F. Padovan Signed-off-by: David S. Miller commit 9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439 Author: Saeed Bishara Date: Sun Jun 27 00:26:43 2010 +0000 mv643xx_eth: use sw csum for big packets Some controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size. Signed-off-by: Saeed Bishara Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 08e554b17bfdc2682599c8c2770b088a0187a405 Merge: 4efd7e8 062bee4 Author: David S. Miller Date: Wed Jun 30 12:04:58 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 4efd7e833591721bec21cc4730a7f6261417840f Author: Andreas Steffen Date: Wed Jun 30 10:41:15 2010 -0700 xfrm: fix XFRMA_MARK extraction in xfrm_mark_get Determine the size of the xfrm_mark struct, not of its pointer. Signed-off-by: Andreas Steffen Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit d3ead2413cb99d3e6265577b12537434e229d8c2 Author: Guillaume Gaudonville Date: Tue Jun 29 18:29:00 2010 +0000 ixgbe: skip non IPv4 packets in ATR filter In driver ixgbe, ixgbe_atr may cause crashes for non-ipv4 packets. Just add a test to check skb->protocol. It may crash on short packets due to ip_hdr() access. Signed-off-by: Guillaume Gaudonville Acked-by: Peter P Waskiewicz Jr Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9f756f018a6d9f83556f972ce7fcd6870274efae Author: John Fastabend Date: Tue Jun 29 18:28:36 2010 +0000 ixgbe: disable tx engine before disabling tx laser Disabling the tx laser while receiving DMA requests can hang the device. After this occurs the device is in a bad state. The GPIO bit never clears when PCI master access is disabled and a reboot is required to get the device in a good state again. Signed-off-by: John Fastabend Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fa37813401ff52d78591c262d6542e4d5d935584 Author: Andy Gospodarek Date: Tue Jun 29 18:28:12 2010 +0000 ixgbe: fix panic when shutting down system with WoL enabled This patch added to 2.6.34: commit 5f6c01819979afbfec7e0b15fe52371b8eed87e8 Author: Jesse Brandeburg Date: Wed Apr 14 16:04:23 2010 -0700 ixgbe: fix bug with vlan strip in promsic mode among other things added a function called ixgbe_vlan_filter_enable. This new function wants to access and set some rx_ring parameters, but adapter->rx_ring has already been freed. This simply moves the free until after the access and makes __ixgbe_shutdown look more like ixgbe_remove. Signed-off-by: Andy Gospodarek Acked-by: Jesse Brandeburg Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 19c9a49b432f245c6293508d164a4350f1f2c601 Author: Changli Gao Date: Tue Jun 29 13:10:36 2010 +0200 splice: check f_mode for seekable file check f_mode for seekable file As a seekable file is allowed without a llseek function, so the old way isn't work any more. Signed-off-by: Changli Gao Signed-off-by: Miklos Szeredi ---- fs/splice.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Signed-off-by: Jens Axboe commit 2cb4b05e7647891b46b91c07c9a60304803d1688 Author: Changli Gao Date: Tue Jun 29 13:09:18 2010 +0200 splice: direct_splice_actor() should not use pos in sd direct_splice_actor() shouldn't use sd->pos, as sd->pos is for file reading, file->f_pos should be used instead. Signed-off-by: Changli Gao Signed-off-by: Miklos Szeredi ---- fs/splice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Signed-off-by: Jens Axboe commit 443b3760a06860187f135c1ecd56c2c7d4ad1022 Author: Sage Weil Date: Tue Jun 29 09:28:39 2010 -0700 ceph: fix caps usage accounting for import (non-reserved) case We need to increase the total and used counters when allocating a new cap in the non-reserved (cap import) case. Signed-off-by: Sage Weil commit ec97f88ba6d4256927fde516033ee76d5d85b54a Author: Sage Weil Date: Thu Jun 24 15:12:37 2010 -0700 ceph: only release clean, unused caps with mds requests We can drop caps with an mds request. Ensure we only drop unused AND clean caps, since the MDS doesn't support cap writeback in that context, nor do we track it. If caps are dirty, and the MDS needs them back, we it will revoke and we will flush in the normal fashion. This fixes a possibly loss of metadata. Signed-off-by: Sage Weil commit bf988435bd5b53529f4408a8efb1f433f6ddfda9 Author: Ben Hutchings Date: Mon Jun 28 08:45:58 2010 +0000 ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH struct ethtool_rxnfc was originally defined in 2.6.27 for the ETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data fields. It was then extended in 2.6.30 to support various additional commands. These commands should have been defined to use a new structure, but it is too late to change that now. Since user-space may still be using the old structure definition for the ETHTOOL_{G,S}RXFH commands, and since they do not need the additional fields, only copy the originally defined fields to and from user-space. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit db048b69037e7fa6a7d9e95a1271a50dc08ae233 Author: Ben Hutchings Date: Mon Jun 28 08:44:07 2010 +0000 ethtool: Fix potential kernel buffer overflow in ETHTOOL_GRXCLSRLALL On a 32-bit machine, info.rule_cnt >= 0x40000000 leads to integer overflow and the buffer may be smaller than needed. Since ETHTOOL_GRXCLSRLALL is unprivileged, this can presumably be used for at least denial of service. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: David S. Miller commit c22d7ac844f1cb9c6a5fd20f89ebadc2feef891b Author: Andy Gospodarek Date: Fri Jun 25 09:50:44 2010 +0000 bonding: prevent netpoll over bonded interfaces Support for netpoll over bonded interfaces was added here: commit f6dc31a85cd46a959bdd987adad14c3b645e03c1 Author: WANG Cong Date: Thu May 6 00:48:51 2010 -0700 bonding: make bonding support netpoll but it is bad enough that we should probably just disable netpoll over bonding until some of the locking logic in the bonding driver is changed or converted completely to RCU. Simple actions like changing the active slave in active-backup mode will hang the box if a high enough printk debugging level is enabled. Keeping the old code around will be good for anyone that wants to work on it (and for after the RCU conversion), so I propose this small patch rather than ripping it all out. Signed-off-by: Andy Gospodarek Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit d5675bd204efd87a174eeea592de23c4c4e7f908 Author: Michael S. Tsirkin Date: Thu Jun 24 16:59:59 2010 +0300 vhost: break out of polling loop on error When ring parsing fails, we currently handle this as ring empty condition. This means that we enable kicks and recheck ring empty: if this not empty, we re-start polling which of course will fail again. Instead, let's return a negative error code and stop polling. Signed-off-by: Michael S. Tsirkin commit 062bee448bd539580ef9f64efe50fdfe04eeb103 Author: Wey-Yi Guy Date: Fri Jun 18 11:33:17 2010 -0700 iwlwifi: set TX_CMD_FLAG_PROT_REQUIRE_MSK in tx_flag When building tx command, always set TX_CMD_FLAG_PROT_REQUIRE_MSK for 5000 series and up. Without setting this bit the firmware will not examine the RTS/CTS setting and thus not send traffic with the appropriate protection. RTS/CTS is is required for HT traffic in a noisy environment where, without this setting, connections will stall on some hardware as documented in the patch that initially attempted to address this: commit 1152dcc28c66a74b5b3f1a3ede0aa6729bfd48e4 Author: Wey-Yi Guy Date: Fri Jan 15 13:42:58 2010 -0800 iwlwifi: Fix throughput stall issue in HT mode for 5000 Similar to 6000 and 1000 series, RTS/CTS is the recommended protection mechanism for 5000 series in HT mode based on the HW design. Using RTS/CTS will better protect the inner exchange from interference, especially in highly-congested environment, it also prevent uCode encounter TX FIFO underrun and other HT mode related performance issues. For 3945 and 4965, different flags are used for RTS/CTS or CTS-to-Self protection. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit d1e89f37de2845db364ef6d67586cd882f86b557 Author: Johannes Berg Date: Fri Jun 18 03:41:25 2010 -0700 iwlwifi: fix multicast commit 3474ad635db371b0d8d0ee40086f15d223d5b6a4 Author: Johannes Berg Date: Thu Apr 29 04:43:05 2010 -0700 iwlwifi: apply filter flags directly broke multicast. The reason, it turns out, is that the code previously checked if ALLMULTI _changed_, which the new code no longer did, and normally it _never_ changes. Had somebody changed it manually, the code prior to my patch there would have been broken already. The reason is that we always, unconditionally, ask the device to pass up all multicast frames, but the new code made it depend on ALLMULTI which broke it since now we'd pass up multicast frames depending on the default filter in the device, which isn't necessarily what we want (since we don't program it right now). Fix this by simply not checking allmulti as we have allmulti behaviour enabled already anyway. Reported-by: Maxim Levitsky Tested-by: Maxim Levitsky Signed-off-by: Johannes Berg commit a1a31e734241aefcb2b30fb0cc0376977b6d2ba8 Author: Sage Weil Date: Thu Jun 24 12:58:14 2010 -0700 ceph: fix crush CHOOSE_LEAF when type is already a leaf We may not recurse for CHOOSE_LEAF if we start with a leaf node. When that happens, the out2 vector needs to be filled in with the result. Signed-off-by: Sage Weil commit 55bda7aacd13f5fdfeaafc16934953171405c692 Author: Sage Weil Date: Thu Jun 24 12:55:48 2010 -0700 ceph: fix crush recursion There was a longstanding problem with recursion through intervening bucket types on complex hierarchies. Signed-off-by: Sage Weil commit bfaf148eb2e42c00f1c79b2163f0804068ea0c5e Author: Yehuda Sadeh Date: Wed Jun 23 15:52:27 2010 -0700 ceph: fix caps debugfs entry The ceph client structure was not set correctly. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 6c3118e2305326743acb52250bcfd0d52389d9dc Author: Vasanthakumar Thiagarajan Date: Wed Jun 23 06:49:21 2010 -0700 ath9k: Fix bug in starting ani There are few places where ANI is started without checking if it is right to start. This might lead to a case where ani timer would be left undeleted and cause improper memory acccess during module unload. This bug is clearly exposed with paprd support where the driver detects tx hang and does a chip reset. During this reset ani is (re)started without checking if it needs to be started. This would leave a timer scheduled even after all the resources are freed and cause a panic. This patch introduces a bit in sc_flags to indicate if ani needs to be started in sw_scan_start() and ath_reset(). This would fix the following panic. This issue is easily seen with ar9003 + paprd. BUG: unable to handle kernel paging request at 0000000000003f38 [] ? __queue_work+0x41/0x50 [] run_timer_softirq+0x17a/0x370 [] ? tick_dev_program_event+0x48/0x110 [] __do_softirq+0xb9/0x1f0 [] ? handle_IRQ_event+0x50/0x160 [] call_softirq+0x1c/0x30 [] do_softirq+0x65/0xa0 [] irq_exit+0x85/0x90 [] do_IRQ+0x75/0xf0 [] ret_from_intr+0x0/0x11 [] ? acpi_idle_enter_simple+0xe4/0x119 [] ? acpi_idle_enter_simple+0xdd/0x119 [] cpuidle_idle_call+0xa7/0x140 [] cpu_idle+0xb3/0x110 [] start_secondary+0x1ee/0x1f5 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a5c7d797dcce3be5e77cd6ea62cc4920ededc32b Author: Alexey Fisher Date: Wed Jun 23 14:17:09 2010 +0200 ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams Some programs like Skype trying to set capture volume automatically. Normally it will tray, carefully step by step lover or higher, set the volume. In real word it work not really well, because devises and vendors lie about real audio settings. For example most Logitech webcams have 6400 or 3500 steps for capture volume. They do not tell that actual resolution is 384. So we have only 7 or 18 real steps. In this patch I set real resolution only for tested devices. Signed-off-by: Alexey Fisher Signed-off-by: Takashi Iwai commit 3bfea98ff73d377ffce0d4c7f938b7ef958cdb35 Author: Luke Yelavich Date: Tue Jun 22 11:04:19 2010 +1000 ALSA: hda - Add Macbook 5,2 quirk BugLink: https://bugs.launchpad.net/bugs/463178 Set Macbook 5,2 (106b:4a00) hardware to use ALC885_MB5 Cc: Signed-off-by: Luke Yelavich Signed-off-by: Takashi Iwai commit 2f44f84725dec354228fddc129e83e251060361d Author: Takashi Iwai Date: Tue Jun 22 11:12:32 2010 +0200 ALSA: hda - Fix uninitialized variable Fix the following compile warning. kctl should be NULL-initialized. sound/pci/hda/patch_realtek.c: In function ‘alc_build_controls’: sound/pci/hda/patch_realtek.c:2550:23: warning: ‘kctl’ may be used uninitialized in this function Signed-off-by: Takashi Iwai commit 17c688c3dfffc274c87be00033da0050bb6eefc0 Author: Sage Weil Date: Mon Jun 21 16:12:26 2010 -0700 ceph: delay umount until all mds requests drop inode+dentry refs This fixes a race between handle_reply finishing an mds request, signalling completion, and then dropping the request structing and its dentry+inode refs, and pre_umount function waiting for requests to finish before letting the vfs tear down the dcache. If umount was delayed waiting for mds requests, we could race and BUG in shrink_dcache_for_umount_subtree because of a slow dput. This delays umount until the msgr queue flushes, which means handle_reply will exit and will have dropped the ceph_mds_request struct. I'm assuming the VFS has already ensured that its calls have all completed and those request refs have thus been dropped as well (I haven't seen that race, at least). Signed-off-by: Sage Weil commit d69ed05a80f23b25f06e73af9b7e701ce4900edc Author: Sage Weil Date: Mon Jun 21 10:38:14 2010 -0700 ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate Handle a splice_dentry failure (due to a d_materialize_unique error) without crashing. (Also, report the error code.) Signed-off-by: Sage Weil commit cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 Author: Sage Weil Date: Thu Jun 17 10:22:48 2010 -0700 ceph: fix crush map update decoding If the incremental osdmap has a new crush map, advance the position after decoding so that we can parse the rest of the osdmap properly. Signed-off-by: Sage Weil commit ae32be31341a5fecfa16c5b3eb78095207182cce Author: Sage Weil Date: Sun Jun 13 10:30:19 2010 -0700 ceph: fix message memory leak, uninitialized variable We need to properly initialize skip, as not all alloc_msg op instances set it. Also, BUG if someone says skip but also allocates a message. Signed-off-by: Sage Weil commit 4a32f93d29b05cdab63c0e2979bc1524c8ea6bf5 Author: Sage Weil Date: Sun Jun 13 10:27:53 2010 -0700 ceph: fix map handler error path Don't leak message if we receive an unexpected message type. Signed-off-by: Sage Weil commit 0cf5537b158caae42bcc03f0f6db10f68585b1ec Author: Yehuda Sadeh Date: Fri Jun 11 15:57:06 2010 -0700 ceph: some endianity fixes Fix some problems that came up with sparse. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil