)]}' { "log": [ { "commit": "e5ea3f12d41d96edf4ad9374db2b1725e457acec", "tree": "348d3ff0f5856298291da3058db345598d393687", "parents": [ "33d78647dc409784c18aa71995346e6955802fe0" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Fri Jun 10 13:44:49 2011 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 10 08:46:26 2011 -0600" }, "message": "gpio/basic_mmio: add missing include of spinlock_types.h\n\ninclude/linux/basic_mmio_gpio.h uses a spinlock_t without including any\nof the spinlock headers resulting in this compiler warning.\n\ninclude/linux/basic_mmio_gpio.h:51:2: error: expected specifier-qualifier-list before \u0027spinlock_t\u0027\n\nExplicitly include linux/spinlock_types.h to fix it.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "33d78647dc409784c18aa71995346e6955802fe0", "tree": "ff985ac37ffe3dd49ca9aa64349874ac286fb752", "parents": [ "c226feb013ce81a18512fb4827bf7c2352d8b470" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Jun 09 11:08:47 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 09 15:03:38 2011 -0600" }, "message": "gpio/nomadik: fix sleepmode for elder Nomadik\n\nThe mach-nomadik machine did not compile properly due to bad\nux500-specific functions being called. Introduce new state\nvariables to fix this up.\n\nReported-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nCc: Prafulla Wadaskar \u003cprafulla.wadaskar@st.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "c226feb013ce81a18512fb4827bf7c2352d8b470", "tree": "4415ebda1c24f68bd7b88641f64097111eb359e0", "parents": [ "32919a28cc8470b1526f77b2f12cca8841b9ac62", "85ec7b970553369e0c956fab1d7a6022f2a99369" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 08 09:12:16 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 08 09:12:16 2011 -0600" }, "message": "Merge branch \u0027for_3.0/gpio-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/merge\n" }, { "commit": "32919a28cc8470b1526f77b2f12cca8841b9ac62", "tree": "b1918d7675459b8b28c80bd2041c3bb90a967aeb", "parents": [ "0bf8fa04e80a562641f687547053f98670f25cf9" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Tue Jun 07 14:37:27 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 07 14:37:27 2011 -0600" }, "message": "gpio/samsung: make Kconfig options def_bool\n\nThe Samsung GPIO drivers are always built-in when the relevant\nplatform is selected.  Change the Kconfig symbol to def_bool y\ndependant on the platform.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0bf8fa04e80a562641f687547053f98670f25cf9", "tree": "9bb78234e96f89c9ba8b7577d5e7c9ef87862835", "parents": [ "27721a52d6c8e33327ec3cae9f730204be99d251" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Tue Jun 07 14:04:49 2011 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 07 11:10:01 2011 -0600" }, "message": "gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting\n\nThe S3C_GPIO_PULL_UP macro value incorrectly maps to a reserved setting of GPIO\npull up/down registers on Exynos4 platform. Fix this incorrect mapping by adding\nwrappers to the s3c_gpio_setpull_updown and s3c_gpio_getpull_updown functions.\n\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "85ec7b970553369e0c956fab1d7a6022f2a99369", "tree": "ee66d404199eb4a1cd0c1608b30377e798c305b3", "parents": [ "0622b25bf071fd83c6eef6b61fb5f3f12a418528" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jun 06 13:38:18 2011 -0700" }, "committer": { "name": "Kevin Hilman", "email": "khilman@ti.com", "time": "Mon Jun 06 16:12:34 2011 -0700" }, "message": "GPIO: OMAP: add locking around calls to _set_gpio_triggering\n\n_set_gpio_triggering uses read-modify-write on bank registers,\nlock bank-\u003elock around all calls to it to prevent register\ncorruption if two cpus access gpios in the same bank at the\nsame time.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "0622b25bf071fd83c6eef6b61fb5f3f12a418528", "tree": "b94745ded735e4347ee37b51e5e382e3a6d81432", "parents": [ "d52b31deffe1956ac62d0b81b915c9b52cffb814" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jun 06 13:38:17 2011 -0700" }, "committer": { "name": "Kevin Hilman", "email": "khilman@ti.com", "time": "Mon Jun 06 16:12:23 2011 -0700" }, "message": "GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4\n\nSetting the IRQWAKEN bit was overwriting previous IRQWAKEN bits,\ncausing only the last bit set to take effect, resulting in lost\nwakeups when the GPIO controller is in idle.\n\nReplace direct writes to IRQWAKEN with MOD_REG_BIT calls to\nperform a read-modify-write on the register.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "d52b31deffe1956ac62d0b81b915c9b52cffb814", "tree": "ab1f636482534f060889bd789f07fc7690e99b28", "parents": [ "59c5f46fbe01a00eedf54a23789634438bb80603" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 27 13:56:12 2011 -0700" }, "committer": { "name": "Kevin Hilman", "email": "khilman@ti.com", "time": "Mon Jun 06 16:11:55 2011 -0700" }, "message": "GPIO: OMAP: fix section mismatch warnings\n\nWARNING: arch/arm/plat-omap/built-in.o(.devinit.text+0x46c): Section mismatch in reference from the function omap_gpio_probe() to the function .init.text:omap_gpio_chip_init()\nThe function __devinit omap_gpio_probe() references\na function __init omap_gpio_chip_init().\nIf omap_gpio_chip_init is only used by omap_gpio_probe then\nannotate omap_gpio_chip_init with a matching annotation.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "59c5f46fbe01a00eedf54a23789634438bb80603", "tree": "93985b0b0d0e12e8c10f18d4afa0799fd4911dc8", "parents": [ "e0dcd8a05be438b3d2e49ef61441ea3a463663f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 18:06:33 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 18:06:33 2011 +0900" }, "message": "Linux 3.0-rc2\n" }, { "commit": "e0dcd8a05be438b3d2e49ef61441ea3a463663f8", "tree": "a498479e6015180c26c5e5e37214b757b62098b3", "parents": [ "0d6925d43bd637fe4da7acb7bf1d0b92d38ab34b" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Sun Jun 05 22:03:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 18:00:27 2011 +0900" }, "message": "mm: fix ENOSPC returned by handle_mm_fault()\n\nAl Viro observes that in the hugetlb case, handle_mm_fault() may return\na value of the kind ENOSPC when its caller is expecting a value of the\nkind VM_FAULT_SIGBUS: fix alloc_huge_page()\u0027s failure returns.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d6925d43bd637fe4da7acb7bf1d0b92d38ab34b", "tree": "54519330c5eead47d14c654d46e179c6a3e0542c", "parents": [ "c12f667e7563c2c0e0908c997900b91b41b23592", "3190dad97b5105ec9b9720f6d7bea54ee830fc2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:51:28 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:51:28 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: usb - turn off de-emphasis in s/pdif for cm6206\n ALSA: asihpi: Use angle brackets for system includes\n ALSA: fm801: add error handling if auto-detect fails\n ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write\n ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()\n ALSA: 6fire: Don\u0027t leak firmware in error path\n ASoC: Fix wm_hubs input PGA ZC bits\n ASoC: Fix dapm_is_shared_kcontrol so everything isn\u0027t shared\n" }, { "commit": "c12f667e7563c2c0e0908c997900b91b41b23592", "tree": "add57171404be906a87e03820d9e0e5f31d53238", "parents": [ "0792644d22852f40c8ad16c4ba1fefd76aba5643", "942c1a927bf296fd64fd49f04c5a8f66bb14446b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:48:02 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:48:02 2011 +0900" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:\n hwmon: (max6642): Better chip detection schema\n hwmon: (coretemp) Further relax temperature range checks\n hwmon: (coretemp) Fix TjMax detection for older CPUs\n hwmon: (coretemp) Relax target temperature range check\n hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault\n" }, { "commit": "3190dad97b5105ec9b9720f6d7bea54ee830fc2d", "tree": "c76a9cac5eb467cdbdddcad4f5bd444b39c76a15", "parents": [ "157186bc185cdf588fecba0fc5d7466e3e5d49d7", "ea02c63d57d7ec099f66ddb2942b4022e865cd5f" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jun 06 09:28:49 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jun 06 09:28:49 2011 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "0792644d22852f40c8ad16c4ba1fefd76aba5643", "tree": "70b4fe2757ca9fcaa1e94eb124c129aab1d6c890", "parents": [ "e6ece70732b905742ad91a7b5489e0ca1362c0cd", "f2a4d8ae4d40f6f5482d207f47fd4d53b3ae0ed4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 05 08:11:11 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 05 08:11:11 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://android.git.kernel.org/kernel/tegra\n\n* \u0027for-linus\u0027 of git://android.git.kernel.org/kernel/tegra:\n ARM: Tegra: Harmony: Fix conflicting GPIO numbering\n" }, { "commit": "f2a4d8ae4d40f6f5482d207f47fd4d53b3ae0ed4", "tree": "7b5650560a494b171a9b8e6a70bdbd530f6f243e", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue May 31 15:14:07 2011 -0600" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat Jun 04 15:51:52 2011 -0700" }, "message": "ARM: Tegra: Harmony: Fix conflicting GPIO numbering\n\nCurrently, both the WM8903 and TPS6586x chips attempt to register with\ngpiolib using the same GPIO numbers. This causes the audio driver to\nfail to initialize.\n\nTo solve this, add a define to board-harmony.h for the TPS6586x, and make\nboard-harmony-power.c use this define, instead of directly referencing\nTEGRA_NR_GPIOS.\n\nThis fixes a regression introduced by commit\n6f168f2fa60f87e85e0df25e87e2372f22f5eb7c.\nARM: tegra: harmony: initialize the TPS65862 PMIC\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "e6ece70732b905742ad91a7b5489e0ca1362c0cd", "tree": "1ded331dec1886cf5b30bd6c6181787b8f237008", "parents": [ "23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159", "aa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 05 06:17:23 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 05 06:17:23 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (25 commits)\n btrfs: fix uninitialized variable warning\n btrfs: add helper for fs_info-\u003eclosing\n Btrfs: add mount -o inode_cache\n btrfs: scrub: add explicit plugging\n btrfs: use btrfs_ino to access inode number\n Btrfs: don\u0027t save the inode cache if we are deleting this root\n btrfs: false BUG_ON when degraded\n Btrfs: don\u0027t save the inode cache in non-FS roots\n Btrfs: make sure we don\u0027t overflow the free space cache crc page\n Btrfs: fix uninit variable in the delayed inode code\n btrfs: scrub: don\u0027t reuse bios and pages\n Btrfs: leave spinning on lookup and map the leaf\n Btrfs: check for duplicate entries in the free space cache\n Btrfs: don\u0027t try to allocate from a block group that doesn\u0027t have enough space\n Btrfs: don\u0027t always do readahead\n Btrfs: try not to sleep as much when doing slow caching\n Btrfs: kill BTRFS_I(inode)-\u003eblock_group\n Btrfs: don\u0027t look at the extent buffer level 3 times in a row\n Btrfs: map the node block when looking for readahead targets\n Btrfs: set range_start to the right start in count_range_bits\n ...\n" }, { "commit": "942c1a927bf296fd64fd49f04c5a8f66bb14446b", "tree": "58020f9137fd23755a918eca1ad0621109123a80", "parents": [ "bb9973e4e73f43bd86698483d0c3f7a362ff94ce" ], "author": { "name": "Per Dalén", "email": "per.dalen@appeartv.com", "time": "Thu May 26 09:08:53 2011 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Jun 04 10:34:28 2011 -0700" }, "message": "hwmon: (max6642): Better chip detection schema\n\nImprove detection of MAX6642 by reading non existing registers (0x04, 0x06\nand 0xff). Reading those registers returns the previously read value.\n\nSigned-off-by: Per Dalen \u003cper.dalen@appeartv.com\u003e\n[guenter.roeck@ericsson.com: added second set of register reads]\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159", "tree": "95187d64da68a22339ee0e61ba4e9939aeefb2b1", "parents": [ "0e833d8cfcb52b5ee3ead22cabbab81dea32c3f0", "e73e079bf128d68284efedeba1fbbc18d78610f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:19:51 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:19:51 2011 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:\n [SCSI] Fix oops caused by queue refcounting failure\n" }, { "commit": "0e833d8cfcb52b5ee3ead22cabbab81dea32c3f0", "tree": "0c64533ba9181c014a4b2dcda75c273ae0437dd6", "parents": [ "4f1ba49efafccbc73017f824efa2505c81b247cd", "7b29dc21ea084be7ddfb536994a9cfae95337690" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)\n tg3: Fix tg3_skb_error_unmap()\n net: tracepoint of net_dev_xmit sees freed skb and causes panic\n drivers/net/can/flexcan.c: add missing clk_put\n net: dm9000: Get the chip in a known good state before enabling interrupts\n drivers/net/davinci_emac.c: add missing clk_put\n af-packet: Add flag to distinguish VID 0 from no-vlan.\n caif: Fix race when conditionally taking rtnl lock\n usbnet/cdc_ncm: add missing .reset_resume hook\n vlan: fix typo in vlan_dev_hard_start_xmit()\n net/ipv4: Check for mistakenly passed in non-IPv4 address\n iwl4965: correctly validate temperature value\n bluetooth l2cap: fix locking in l2cap_global_chan_by_psm\n ath9k: fix two more bugs in tx power\n cfg80211: don\u0027t drop p2p probe responses\n Revert \"net: fix section mismatches\"\n drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()\n sctp: stop pending timers and purge queues when peer restart asoc\n drivers/net: ks8842 Fix crash on received packet when in PIO mode.\n ip_options_compile: properly handle unaligned pointer\n iwlagn: fix incorrect PCI subsystem id for 6150 devices\n ...\n" }, { "commit": "aa0467d8d2a00e75b2bb6a56a4ee6d70c5d1928f", "tree": "0139c403353d9e1ab771fc7c9049e5c334329d17", "parents": [ "7841cb2898f66a73062c64d0ef5733dde7279e46" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Fri Jun 03 16:29:08 2011 +0200" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:11:38 2011 -0400" }, "message": "btrfs: fix uninitialized variable warning\n\nWith Linus\u0027 tree, today\u0027s linux-next build (powercp ppc64_defconfig)\nproduced this warning:\n\nfs/btrfs/delayed-inode.c: In function \u0027btrfs_delayed_update_inode\u0027:\nfs/btrfs/delayed-inode.c:1598:6: warning: \u0027ret\u0027 may be used\nuninitialized in this function\n\nIntroduced by commit 16cdcec736cd (\"btrfs: implement delayed inode items\noperation\").\n\nThis fixes a bug in btrfs_update_inode(): if the returned value from\nbtrfs_delayed_update_inode is a nonzero garbage, inode stat data are not\nupdated and several call paths may hit a BUG_ON or fail with strange\ncode.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\n" }, { "commit": "7841cb2898f66a73062c64d0ef5733dde7279e46", "tree": "b7a94d96d44971845951a59e9fb7b5c2e30c46b3", "parents": [ "4b9465cb9e3859186eefa1ca3b990a5849386320" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Tue May 31 18:07:27 2011 +0200" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:11:22 2011 -0400" }, "message": "btrfs: add helper for fs_info-\u003eclosing\n\nwrap checking of filesystem \u0027closing\u0027 flag and fix a few missing memory\nbarriers.\n\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\n" }, { "commit": "4b9465cb9e3859186eefa1ca3b990a5849386320", "tree": "8fc06452fb75e52f6c1c2e2253c2ff6700e622fd", "parents": [ "e7786c3ae517b2c433edc91714e86be770e9f1ce" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 03 09:36:29 2011 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:47 2011 -0400" }, "message": "Btrfs: add mount -o inode_cache\n\nThis makes the inode map cache default to off until we\nfix the overflow problem when the free space crcs don\u0027t fit\ninside a single page.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e7786c3ae517b2c433edc91714e86be770e9f1ce", "tree": "90caab3728a36a579162b4868f41fc3426c5cbb4", "parents": [ "a4689d2bd3b00dcf5c4320f06e0ab88810fbff9c" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Sat May 28 20:58:38 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:46 2011 -0400" }, "message": "btrfs: scrub: add explicit plugging\n\nWith the removal of the implicit plugging scrub ends up doing more and\nsmaller I/O than necessary. This patch adds explicit plugging per chunk.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "a4689d2bd3b00dcf5c4320f06e0ab88810fbff9c", "tree": "295bcdb0fdbe5a4cda80eb886694efd45e276699", "parents": [ "d132a538d258f8f52fd0cd8b5017755f4e915386" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Tue May 31 17:08:14 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:46 2011 -0400" }, "message": "btrfs: use btrfs_ino to access inode number\n\ncommit 4cb5300bc (\"Btrfs: add mount -o auto_defrag\") accesses inode\nnumber directly while it should use the helper with the new inode\nnumber allocator.\n\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d132a538d258f8f52fd0cd8b5017755f4e915386", "tree": "bf3a5e67c8eff57425dd656778b40c5aaf858f80", "parents": [ "5f3f302a6f4cb74906c05fad1d03fc5e95c7e5af" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue May 31 19:33:33 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:45 2011 -0400" }, "message": "Btrfs: don\u0027t save the inode cache if we are deleting this root\n\nWith xfstest 254 I can panic the box every time with the inode number caching\nstuff on. This is because we clean the inodes out when we delete the subvolume,\nbut then we write out the inode cache which adds an inode to the subvolume inode\ntree, and then when it gets evicted again the root gets added back on the dead\nroots list and is deleted again, so we have a double free. To stop this from\nhappening just return 0 if refs is 0 (and we\u0027re not the tree root since tree\nroot always has refs of 0). With this fix 254 no longer panics. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nTested-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5f3f302a6f4cb74906c05fad1d03fc5e95c7e5af", "tree": "224a59dcd31fbbe2b23ac85d3d4906bbf7327b78", "parents": [ "ca456ae280c0646e1e571c3b9a3834c55e90adfe" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Mon May 30 08:36:16 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:44 2011 -0400" }, "message": "btrfs: false BUG_ON when degraded\n\nIn degraded mode the struct btrfs_device of missing devs don\u0027t have\ndevice-\u003ename set. A kstrdup of NULL correctly returns NULL. Don\u0027t\nBUG in this case.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "ca456ae280c0646e1e571c3b9a3834c55e90adfe", "tree": "945f70453e07c59739c02808f69598f637d35dfa", "parents": [ "211f96c24f117fcc6e9e2431e40d92f4de22625e" ], "author": { "name": "liubo", "email": "liubo2009@cn.fujitsu.com", "time": "Wed Jun 01 09:42:49 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:44 2011 -0400" }, "message": "Btrfs: don\u0027t save the inode cache in non-FS roots\n\nThis adds extra checks to make sure the inode map we are caching really\nbelongs to a FS root instead of a special relocation tree. It\nprevents crashes during balancing operations.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "211f96c24f117fcc6e9e2431e40d92f4de22625e", "tree": "9f73c5419e905066653660ec33f8d5efeaa3a148", "parents": [ "17aca1c987cff89dc4279371857035da902c8854" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 03 01:26:53 2011 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:43 2011 -0400" }, "message": "Btrfs: make sure we don\u0027t overflow the free space cache crc page\n\nThe free space cache uses only one page for crcs right now,\nwhich means we can\u0027t have a cache file bigger than the\ncrcs we can fit in the first page. This adds a check to\nenforce that restriction.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "17aca1c987cff89dc4279371857035da902c8854", "tree": "f63df32137d07ec9876f46542884b68a83e0a48c", "parents": [ "1bc8779349d6278e2713a1ff94418c2a6746a791" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 03 01:13:45 2011 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:43 2011 -0400" }, "message": "Btrfs: fix uninit variable in the delayed inode code\n\nThe nitems counter needs to start at zero\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1bc8779349d6278e2713a1ff94418c2a6746a791", "tree": "2caf24db7d669825538c15efe17473159da57593", "parents": [ "ff5714cca971848963b87d6b477c16ca8abbaa54" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Sat May 28 21:57:55 2011 +0200" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Jun 04 08:03:17 2011 -0400" }, "message": "btrfs: scrub: don\u0027t reuse bios and pages\n\nThe current scrub implementation reuses bios and pages as often as possible,\nallocating them only on start and releasing them when finished. This leads\nto more problems with the block layer than it\u0027s worth. The elevator gets\nconfused when there are more pages added to the bio than bi_size suggests.\nThis patch completely rips out the reuse of bios and pages and allocates\nthem freshly for each submit.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\nSigned-off-by: Chris Maosn \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4f1ba49efafccbc73017f824efa2505c81b247cd", "tree": "db072bbccffd1f1c6b1269ac7a752cb30af3a726", "parents": [ "39b4a46f19295b4876fba6655f27d67232dc6a1f", "e3a57b3ccf5c04934ac43b5b80e32ba51b817288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: Use hlist_entry() for io_context.cic_list.first\n cfq-iosched: Remove bogus check in queue_fail path\n xen/blkback: potential null dereference in error handling\n xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n block: blkdev_get() should access -\u003ebd_disk only after success\n CFQ: Fix typo and remove unnecessary semicolon\n block: remove unwanted semicolons\n Revert \"block: Remove extra discard_alignment from hd_struct.\"\n nbd: adjust \u0027max_part\u0027 according to part_shift\n nbd: limit module parameters to a sane value\n nbd: pass MSG_* flags to kernel_recvmsg()\n block: improve the bio_add_page() and bio_add_pc_page() descriptions\n" }, { "commit": "39b4a46f19295b4876fba6655f27d67232dc6a1f", "tree": "d30a6312bf61fa987774707331c2434d9ebd0198", "parents": [ "cb37bbd90a11003993d47c395837e0f87abf1b31", "5ff6197f828d5ea051b3abf77cb61f8a34480e8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:04:10 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:04:10 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:\n Blackfin: strncpy: fix handling of zero lengths\n" }, { "commit": "cb37bbd90a11003993d47c395837e0f87abf1b31", "tree": "404f13b334c2c2287e4bebac845c35db70ebfe81", "parents": [ "3af91a1256b628d55913324d27fe747c69566749", "b36a968927b789b2dd8de0aaf7a72ef7c1f0d012" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:03:16 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:03:16 2011 +0900" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n asm-generic/unistd.h: support sendmmsg syscall\n tile: enable CONFIG_BUGVERBOSE\n" }, { "commit": "3af91a1256b628d55913324d27fe747c69566749", "tree": "cdbb84d4cce611ba722699d989bf1fecb73a69f1", "parents": [ "9a44fde3435e0c6012cbc9122497bbbd3338434a", "098011940a2549ae7182db4bf101c3e3d2b4e6df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:59:32 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:59:32 2011 +0900" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubifs-2.6:\n UBIFS: fix-up free space earlier\n UBIFS: intialize LPT earlier\n UBIFS: assert no fixup when writing a node\n UBIFS: fix clean znode counter corruption in error cases\n UBIFS: fix memory leak on error path\n UBIFS: fix shrinker object count reports\n UBIFS: fix recovery broken by the previous recovery fix\n UBIFS: amend ubifs_recover_leb interface\n UBIFS: introduce a \"grouped\" journal head flag\n UBIFS: supress false error messages\n" }, { "commit": "9a44fde3435e0c6012cbc9122497bbbd3338434a", "tree": "6ad70370b4f6143e2acd324a466bccc21f60541b", "parents": [ "cd4ecf877a4d629c38571405fd649077c12dec50", "9bf7174949aef2f43253956e1f3ab01698abbd79" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:58:48 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:58:48 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest:\n ktest: Ignore unset values of the minconfig in config_bisect\n ktest: Fix result of rebooting the kernel\n ktest: Fix off-by-one in config bisect result\n" }, { "commit": "cd4ecf877a4d629c38571405fd649077c12dec50", "tree": "ac0c5a72b503e1debbc06a10682f4a551bc304ac", "parents": [ "1f3bd0f2ac870c9eb29590f193ee3d94e2d35514", "816af7422f5bdbb74a0c9bb09735a9aeb9522c30" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:53:23 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:53:23 2011 +0900" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n ARM: mach-shmobile: add DMAC clock definitions on SH7372\n ARM: arch-shmobile: support SDHI card detection on mackerel, using a GPIO\n sh_mobile_meram: MERAM platform data for LCDC\n" }, { "commit": "1f3bd0f2ac870c9eb29590f193ee3d94e2d35514", "tree": "40a12bd6ac1fb2c0ef51e51265d773a9044c7281", "parents": [ "bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2", "a1b2cc50679c1d2eed44e2885f6178ce907498b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:04:25 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:04:25 2011 +0900" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n dmaengine: shdma: fix a regression: initialise DMA channels for memcpy\n dmaengine: shdma: Fix up fallout from runtime PM changes.\n Revert \"clocksource: sh_cmt: Runtime PM support\"\n Revert \"clocksource: sh_tmu: Runtime PM support\"\n sh: Fix up asm-generic/ptrace.h fallout.\n sh64: Move from P1SEG to CAC_ADDR for consistent sync.\n sh64: asm/pgtable.h needs asm/mmu.h\n sh: asm/tlb.h needs linux/swap.h\n sh: mark DMA slave ID 0 as invalid\n sh: Update shmin to reflect PIO dependency.\n sh: arch/sh/kernel/process_32.c needs linux/prefetch.h.\n sh: add MMCIF runtime PM support on ecovec\n sh: switch ap325rxa to dynamically manage the platform camera\n" }, { "commit": "bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2", "tree": "53763eef4382a42cad216edf0247108b621e45b1", "parents": [ "55db4c64eddf37e31279ec15fe90314713bc9cfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:00:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:00:50 2011 +0900" }, "message": "Revert \"ASoC: Update cx20442 for TTY API change\"\n\nThis reverts commit ed0bd2333cffc3d856db9beb829543c1dfc00982.\n\nSince we reverted the TTY API change, we should revert the ASoC update\nto it too.\n\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Liam Girdwood \u003clrg@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "55db4c64eddf37e31279ec15fe90314713bc9cfa", "tree": "4bd186333049c5fcc1eacdff0efc82ac8b80ff5e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "message": "Revert \"tty: make receive_buf() return the amout of bytes received\"\n\nThis reverts commit b1c43f82c5aa265442f82dba31ce985ebb7aa71c.\n\nIt was broken in so many ways, and results in random odd pty issues.\n\nIt re-introduced the buggy schedule_work() in flush_to_ldisc() that can\ncause endless work-loops (see commit a5660b41af6a: \"tty: fix endless\nwork loop when the buffer fills up\").\n\nIt also used an \"unsigned int\" return value fo the -\u003ereceive_buf()\nfunction, but then made multiple functions return a negative error code,\nand didn\u0027t actually check for the error in the caller.\n\nAnd it didn\u0027t actually work at all. BenH bisected down odd tty behavior\nto it:\n \"It looks like the patch is causing some major malfunctions of the X\n server for me, possibly related to PTYs. For example, cat\u0027ing a\n large file in a gnome terminal hangs the kernel for -minutes- in a\n loop of what looks like flush_to_ldisc/workqueue code, (some ftrace\n data in the quoted bits further down).\n\n ...\n\n Some more data: It -looks- like what happens is that the\n flush_to_ldisc work queue entry constantly re-queues itself (because\n the PTY is full ?) and the workqueue thread will basically loop\n forver calling it without ever scheduling, thus starving the consumer\n process that could have emptied the PTY.\"\n\nwhich is pretty much exactly the problem we fixed in a5660b41af6a.\n\nMilton Miller pointed out the \u0027unsigned int\u0027 issue.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Stefan Bigler \u003cstefan.bigler@keymile.com\u003e\nCc: Toby Gray \u003ctoby.gray@realvnc.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b29dc21ea084be7ddfb536994a9cfae95337690", "tree": "799f5becd9484e53e09b5f620ebfd5315bdfe033", "parents": [ "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "dfe21582ac5ebc460dda98c67e8589dd506d02cd" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem\n" }, { "commit": "157186bc185cdf588fecba0fc5d7466e3e5d49d7", "tree": "bf6b3edcf7b85801c64a055419ab2df23eb0da5f", "parents": [ "d50a2fb63643dce8506520dab5ffb8f49cc45cb2" ], "author": { "name": "Eric Lammerts", "email": "alsa-devel@lists.lammerts.org", "time": "Fri May 27 18:16:52 2011 -0400" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 18:22:56 2011 +0200" }, "message": "ALSA: usb - turn off de-emphasis in s/pdif for cm6206\n\nCM6206: Turn off de-emphasis channel status bit in S/PDIF output.\n\nSigned-off-by: Eric Lammerts \u003ceric@lammerts.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "098011940a2549ae7182db4bf101c3e3d2b4e6df", "tree": "2c4c1e51beee85fba008a81598a58efffa1443d0", "parents": [ "781c5717a95a74b294beb38b8276943b0f8b5bb4" ], "author": { "name": "Ben Gardiner", "email": "bengardiner@nanometrics.ca", "time": "Mon May 30 14:56:16 2011 -0400" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:31 2011 +0300" }, "message": "UBIFS: fix-up free space earlier\n\nThe free space fixup is currently initiated during mount after the call to\nubifs_write_master() which results in a write to PEBs; this has been observed\nwith the patch \u0027assert no fixup when writing a node\u0027 applied:\n\nMove the free space fixup on mount to before the calls to\nubifs_recover_inl_heads() and ubifs_write_master(). This results in no\nassertions with the previously mentioned patch applied.\n\nArtem: tweaked the patch a bit\n\nSigned-off-by: Ben Gardiner \u003cbengardiner@nanometrics\u003e\nReviewed-by: Matthew L. Creech \u003cmlcreech@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "781c5717a95a74b294beb38b8276943b0f8b5bb4", "tree": "ed8dfe3b7066e6d0854e381f46712c7280b2f05e", "parents": [ "4f1ab9b01d34eac9fc958f7150d3bf266dcc1685" ], "author": { "name": "Ben Gardiner", "email": "bengardiner@nanometrics.ca", "time": "Mon May 30 14:56:15 2011 -0400" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:31 2011 +0300" }, "message": "UBIFS: intialize LPT earlier\n\nThe current \u0027mount_ubifs()\u0027 implementation does not initialize the LPT until the\nthe master node is marked dirty. Move the LPT initialization to before marking\nthe master node dirty. This is a preparation for the next patch which will move\nthe free-space-fixup check to before marking the master node dirty, because we\nhave to fix-up the free space before doing any writes.\n\nArtem: massaged the patch and commit message.\n\nSigned-off-by: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nReviewed-by: Matthew L. Creech \u003cmlcreech@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "4f1ab9b01d34eac9fc958f7150d3bf266dcc1685", "tree": "77ff5efa6449743984e77f491902fa53f7716969", "parents": [ "837072377034d0a0b18b851d1ab95676b245cc0a" ], "author": { "name": "Ben Gardiner", "email": "bengardiner@nanometrics.ca", "time": "Mon May 30 14:56:14 2011 -0400" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:31 2011 +0300" }, "message": "UBIFS: assert no fixup when writing a node\n\nThe current free space fixup can result in some writing to the UBI volume\nwhen the space_fixup flag is set.\n\nTo catch instances where UBIFS is writing to the NAND while the space_fixup\nflag is set, add an assert to ubifs_write_node().\n\nArtem: tweaked the patch, added similar assertion to the write buffer\n write path.\n\nSigned-off-by: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nReviewed-by: Matthew L. Creech \u003cmlcreech@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "837072377034d0a0b18b851d1ab95676b245cc0a", "tree": "7020b369ac3373f292d59fe5fd470f73ecb69897", "parents": [ "812eb258311f89bcd664a34a620f249d54a2cd83" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Tue May 31 14:26:07 2011 +0300" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:31 2011 +0300" }, "message": "UBIFS: fix clean znode counter corruption in error cases\n\nUBIFS maintains per-filesystem and global clean znode counters\n(\u0027c-\u003eclean_zn_cnt\u0027 and \u0027ubifs_clean_zn_cnt\u0027). It is important to maintain\ncorrect values there since the shrinker relies on \u0027ubifs_clean_zn_cnt\u0027.\n\nHowever, in case of failures during commit the counters were corrupted. E.g.,\nif a failure happens in the middle of \u0027write_index()\u0027, then some nodes in the\ncommit list (\u0027c-\u003ecnext\u0027) are marked as clean, and some are marked as dirty. And\nthe \u0027ubifs_destroy_tnc_subtree()\u0027 frees does not retrun correct count, and we\nend up with non-zero \u0027c-\u003eclean_zn_cnt\u0027 when unmounting. This means that if we\nhave 2 file-sytem and one of them fails, and we unmount it,\n\u0027ubifs_clean_zn_cnt\u0027 stays incorrect and confuses the shrinker.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "812eb258311f89bcd664a34a620f249d54a2cd83", "tree": "2b1598190efd598cfbdff30fbca302426f796e3a", "parents": [ "cf610bf4199770420629d3bc273494bd27ad6c1d" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Tue May 31 08:40:40 2011 +0300" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:31 2011 +0300" }, "message": "UBIFS: fix memory leak on error path\n\nUBIFS leaks memory on error path in \u0027ubifs_jnl_update()\u0027 in case of write\nfailure because it forgets to free the \u0027struct ubifs_dent_node *dent\u0027 object.\nAlthough the object is small, the alignment can make it large - e.g., 2KiB\nif the min. I/O unit is 2KiB.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "cf610bf4199770420629d3bc273494bd27ad6c1d", "tree": "76418cad3b35d8b40090ae13d5100de598e6c4cb", "parents": [ "da8b94ea61c5d80aae0cc7b7541f1e0fa7459391" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Tue May 31 07:03:21 2011 +0300" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Fri Jun 03 18:12:24 2011 +0300" }, "message": "UBIFS: fix shrinker object count reports\n\nSometimes VM asks the shrinker to return amount of objects it can shrink,\nand we return the ubifs_clean_zn_cnt in that case. However, it is possible\nthat this counter is negative for a short period of time, due to the way\nUBIFS TNC code updates it. And I can observe the following warnings sometimes:\n\nshrink_slab: ubifs_shrinker+0x0/0x2b7 [ubifs] negative objects to delete nr\u003d-8541616642706119788\n\nThis patch makes sure UBIFS never returns negative count of objects.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "5ff6197f828d5ea051b3abf77cb61f8a34480e8d", "tree": "4d40c726ed8b09f1cd184f972641edc99a8c07b8", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Steven Miao", "email": "realmz6@gmail.com", "time": "Wed Jun 01 15:52:41 2011 +0800" }, "committer": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Jun 03 11:05:36 2011 -0400" }, "message": "Blackfin: strncpy: fix handling of zero lengths\n\nThe jump to 4f will cause the NUL padding loop to run at least one time,\nso if string length is zero just jump to the end. Otherwise we wrongly\nwrite one NUL byte when size\u003d\u003d0.\n\nSigned-off-by: Steven Miao \u003crealmz6@gmail.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n" }, { "commit": "d50a2fb63643dce8506520dab5ffb8f49cc45cb2", "tree": "e2cbdcc0fe61a275a31f6f1a3e2247ba0c759449", "parents": [ "9676001559fce06e37c7dc230ab275f605556176" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Jun 03 02:28:49 2011 -0700" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 11:46:37 2011 +0200" }, "message": "ALSA: asihpi: Use angle brackets for system includes\n\nUse the normal include style.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "9676001559fce06e37c7dc230ab275f605556176", "tree": "1efc1b578374b3b14519746bdd78188ba4d0c66a", "parents": [ "a01ef051d584c12ede5cd5275b008b2ded57f3d9" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu May 26 11:47:35 2011 +0300" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 10:11:17 2011 +0200" }, "message": "ALSA: fm801: add error handling if auto-detect fails\n\nIn the original code if auto detect failed and tea575x_tuner \u003d\u003d 4\nthen we copy bogus information to chip-\u003etea.card. I\u0027ve changed the\nautodetect code to cleanup and return -ENODEV on error instead.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "a01ef051d584c12ede5cd5275b008b2ded57f3d9", "tree": "b65747acc39afc815912fd500c55ed1406273a2a", "parents": [ "4dffbe03d1e940aba878f9420e67feb8423cdd08" ], "author": { "name": "Raymond Yau", "email": "superquad.vortex2@gmail.com", "time": "Wed Jun 01 15:09:48 2011 +0800" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 10:08:46 2011 +0200" }, "message": "ALSA: hda - Check pin support EAPD in ad198x_power_eapd_write\n\nCheck whether the pin supports EAPD in ad198x_power_eapd_write.\n\nSigned-off-by: Raymond Yau \u003csuperquad.vortex2@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "4dffbe03d1e940aba878f9420e67feb8423cdd08", "tree": "cd476063172e4676427f80b4a85e609ad58d580d", "parents": [ "bf0be0e951cf1c4c9ce38032195cd8095a16d828" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 10:05:02 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 03 10:05:02 2011 +0200" }, "message": "ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()\n\nIn ad198x_power_eapd(), wrong pin NIDs are used for controlling EAPD for\nHP and Front outputs of AD1988/AD1989. These are actually same with the\nones for AD1984 \u0026 co, port-A is 0x11 and port-D 0x12.\n\nReported-by: Raymond Yau \u003csuperquad.vortex2@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "tree": "fc32f2ae2fefe55bfe5b3381629b33550f7adea6", "parents": [ "ec764bf083a6ff396234351b51fd236f53c903bf" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Jun 02 13:01:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 03 00:01:30 2011 -0700" }, "message": "tg3: Fix tg3_skb_error_unmap()\n\nThis function attempts to free one fragment beyond the number of\nfragments that were actually mapped. This patch brings back the limit\nto the correct spot.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nTested-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec764bf083a6ff396234351b51fd236f53c903bf", "tree": "30c0f8232fe10c76651114dea999b93fa2c8ade5", "parents": [ "2e4ceec4edaef6e903422792de4f7f37de98cec6" ], "author": { "name": "Koki Sanagi", "email": "sanagi.koki@jp.fujitsu.com", "time": "Mon May 30 21:48:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 02 14:06:31 2011 -0700" }, "message": "net: tracepoint of net_dev_xmit sees freed skb and causes panic\n\nBecause there is a possibility that skb is kfree_skb()ed and zero cleared\nafter ndo_start_xmit, we should not see the contents of skb like skb-\u003elen and\nskb-\u003edev-\u003ename after ndo_start_xmit. But trace_net_dev_xmit does that\nand causes panic by NULL pointer dereference.\nThis patch fixes trace_net_dev_xmit not to see the contents of skb directly.\n\nIf you want to reproduce this panic,\n\n1. Get tracepoint of net_dev_xmit on\n2. Create 2 guests on KVM\n2. Make 2 guests use virtio_net\n4. Execute netperf from one to another for a long time as a network burden\n5. host will panic(It takes about 30 minutes)\n\nSigned-off-by: Koki Sanagi \u003csanagi.koki@jp.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b36a968927b789b2dd8de0aaf7a72ef7c1f0d012", "tree": "3e2df4e6a5d60255ff9fc36dda0b763f11682571", "parents": [ "3cc39b3f061e90f69cb1f65d72c005c56cddd6a6" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Jun 02 14:21:45 2011 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Jun 02 14:31:38 2011 -0400" }, "message": "asm-generic/unistd.h: support sendmmsg syscall\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "bf0be0e951cf1c4c9ce38032195cd8095a16d828", "tree": "0f32e4bc1dd584e0f5e4cae2ceb7acdc0e74a61e", "parents": [ "46f2cc80514e389bacfb642a32a4181fa1f1d20b" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon May 30 12:49:01 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jun 02 19:56:31 2011 +0200" }, "message": "ALSA: 6fire: Don\u0027t leak firmware in error path\n\nOne of the error paths in\nsound/usb/6fire/firmware.c::usb6fire_fw_ezusb_upload() neglects to free\nthe memory allocated for the firmware before returning, thus leaking the\nmemory.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "9bf7174949aef2f43253956e1f3ab01698abbd79", "tree": "0c40eb90a854dd369df648d0a767d03fc6ced0c9", "parents": [ "4da46da2d295c0d9f4aaf28dd2b70a1ecb42d972" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Jun 01 23:27:19 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Jun 02 11:57:57 2011 -0400" }, "message": "ktest: Ignore unset values of the minconfig in config_bisect\n\nBy ignoring the unset values of the minconfig in deciding\nwhat to test in the config_bisect can cause the problem\nconfig from being tested too.\n\nJust do not test the configs that are set in the minconfig.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "4da46da2d295c0d9f4aaf28dd2b70a1ecb42d972", "tree": "a5d01b5c399702afd71969ca0b1e94be4aa1c254", "parents": [ "4c8cc55b3c0ebe989e727017933945b68b4327cd" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Jun 01 23:25:13 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Jun 02 11:57:56 2011 -0400" }, "message": "ktest: Fix result of rebooting the kernel\n\nThe command that is called that reboots the kernel may fail\nbut the return code is not passed back to the ktest.pl script.\nThis is because a \u0027;\u0027 is used between the two commands and\nif the second command fails, only the first command\u0027s return\ncode is returned. Using a \u0027\u0026\u0026\u0027 between the two commands fixes\nthis.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "4c8cc55b3c0ebe989e727017933945b68b4327cd", "tree": "725aa612c6d01c912e724c3dc0e1eb8f4e1b2712", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Jun 01 23:22:30 2011 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Thu Jun 02 11:57:41 2011 -0400" }, "message": "ktest: Fix off-by-one in config bisect result\n\nBecause in perl the array size returned by $#arr, is the last\nindex and not the actually size of the array, we end the config\nbisect early, thinking there is only one config left when there\nare in fact two. Thus the result has a 50% chance of picking\nthe correct config that caused the problem.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "e3a57b3ccf5c04934ac43b5b80e32ba51b817288", "tree": "990d7b323057b9969e7c251fa9fc8c50465b8702", "parents": [ "e2bd9678fc0085acf540dc4cb48ff961cd4d88c0", "9b83c771214cf6a256ee875050e6eaf320cf7983" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 02 13:14:15 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 02 13:14:15 2011 +0200" }, "message": "Merge branch \u0027for-jens/xen-blkback.fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus\n" }, { "commit": "e2bd9678fc0085acf540dc4cb48ff961cd4d88c0", "tree": "25fa9535761abdafa1f9de9fc86108d8b178cfef", "parents": [ "28304f485c3627cc5e1665b92e26eb7fcfe98088" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Thu Jun 02 13:05:02 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 02 13:05:02 2011 +0200" }, "message": "block: Use hlist_entry() for io_context.cic_list.first\n\nlist_entry() and hlist_entry() are both simply aliases for\ncontainer_of(), but since io_context.cic_list.first is an hlist_node one\nshould at least use the correct alias.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "28304f485c3627cc5e1665b92e26eb7fcfe98088", "tree": "c885abcc932d5ae28fdeb49027ea5eafaaafd376", "parents": [ "4c49ff3fe128ca68dabd07537415c419ad7f82f9" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Thu Jun 02 13:05:02 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 02 13:05:02 2011 +0200" }, "message": "cfq-iosched: Remove bogus check in queue_fail path\n\nqueue_fail can only be reached if cic is NULL, so its check for cic must\nbe bogus.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "e73e079bf128d68284efedeba1fbbc18d78610f9", "tree": "7477ba6759346155bb784e9719fe68bab89ee88e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Wed May 25 15:52:14 2011 -0500" }, "committer": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Thu Jun 02 18:34:43 2011 +0900" }, "message": "[SCSI] Fix oops caused by queue refcounting failure\n\nIn certain circumstances, we can get an oops from a torn down device.\nMost notably this is from CD roms trying to call scsi_ioctl. The root\ncause of the problem is the fact that after scsi_remove_device() has\nbeen called, the queue is fully torn down. This is actually wrong\nsince the queue can be used until the sdev release function is called.\nTherefore, we add an extra reference to the queue which is released in\nsdev-\u003erelease, so the queue always exists.\n\nReported-by: Parag Warudkar \u003cparag.lkml@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: James Bottomley \u003cjbottomley@parallels.com\u003e\n" }, { "commit": "2e4ceec4edaef6e903422792de4f7f37de98cec6", "tree": "628626d17ea26b1c77449afc9bdee88581982033", "parents": [ "6979d5dd96a4a4975ce240982436e92a3da23315" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 19:48:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 02 00:10:01 2011 -0700" }, "message": "drivers/net/can/flexcan.c: add missing clk_put\n\nThe failed_get label is used after the call to clk_get has succeeded, so it\nshould be moved up above the call to clk_put.\n\nThe failed_req labels doesn\u0027t do anything different than failed_get, so\ndelete it.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "816af7422f5bdbb74a0c9bb09735a9aeb9522c30", "tree": "a55684242df29a5b88248ccccbf0c11380755eb2", "parents": [ "4bff4a7ee4b9e487a1bc1d31082e77b6a381418a" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Jun 01 07:32:07 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Jun 02 14:45:33 2011 +0900" }, "message": "ARM: mach-shmobile: add DMAC clock definitions on SH7372\n\nThese definitions are needed to let the runtime PM subsystem turn off\nDMAC clocks, when it is suspended by the driver.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "a1b2cc50679c1d2eed44e2885f6178ce907498b7", "tree": "e30d672493dc63325dc9d92a05ed70e6ec995957", "parents": [ "1222de7c415cfa70f441f836588fd79a3334d4fe" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue May 31 09:25:16 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Jun 02 14:40:43 2011 +0900" }, "message": "dmaengine: shdma: fix a regression: initialise DMA channels for memcpy\n\nA recent patch has introduced a regression, where repeating a memcpy\nDMA test with shdma module unloading between them skips the DMA channel\nconfiguration. Fix this regression by always configuring the channel\nduring its allocation.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "6979d5dd96a4a4975ce240982436e92a3da23315", "tree": "b8a5c017e168d87f91668b5cab89c7df56dcda58", "parents": [ "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Jun 01 10:18:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:22:15 2011 -0700" }, "message": "net: dm9000: Get the chip in a known good state before enabling interrupts\n\nCurrently the DM9000 driver requests the primary interrupt before it\nresets the chip and puts it into a known good state. This means that if\nthe chip is asserting interrupt for some reason we can end up with a\nscreaming IRQ that the interrupt handler is unable to deal with. Avoid\nthis by only requesting the interrupt after we\u0027ve reset the chip so we\nknow what state it\u0027s in.\n\nThis started manifesting itself on one of my boards in the past month or\nso, I suspect as a result of some core infrastructure changes removing\nsome form of mitigation against bad behaviour here, even when things boot\nit seems that the new code brings the interface up more quickly.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d", "tree": "8eb77b610efcabd6185b964b817b2b30bdebad0d", "parents": [ "a3bcc23e890a6d49d6763d9eb073d711de2e0469" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 07:10:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:20:14 2011 -0700" }, "message": "drivers/net/davinci_emac.c: add missing clk_put\n\nGo to existing error handling code at the end of the function that calls\nclk_put.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a3bcc23e890a6d49d6763d9eb073d711de2e0469", "tree": "c4156e932f081dc14a514d5ab23cd43e590029cd", "parents": [ "41be5a4a3668810bf3687a76c2b017bd437039e0" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Wed Jun 01 06:49:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:18:03 2011 -0700" }, "message": "af-packet: Add flag to distinguish VID 0 from no-vlan.\n\nCurrently, user-space cannot determine if a 0 tcp_vlan_tci\nmeans there is no VLAN tag or the VLAN ID was zero.\n\nAdd flag to make this explicit. User-space can check for\nTP_STATUS_VLAN_VALID || tp_vlan_tci \u003e 0, which will be backwards\ncompatible. Older could would have just checked for tp_vlan_tci,\nso it will work no worse than before.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "41be5a4a3668810bf3687a76c2b017bd437039e0", "tree": "dcdfd3de6ee34d6467f26208ae431f9207769088", "parents": [ "85e3c65fa3a1d0542c181510a950a2be7733ff29" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Wed Jun 01 00:55:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:13:53 2011 -0700" }, "message": "caif: Fix race when conditionally taking rtnl lock\n\nTake the RTNL lock unconditionally when calling dev_close.\nTaking the lock conditionally may cause race conditions.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "85e3c65fa3a1d0542c181510a950a2be7733ff29", "tree": "7efb6a9f3ed34ed52358eef6b4a59659a5fdea94", "parents": [ "307f73df2b9829ee5a261d1ed432ff683c426cdf" ], "author": { "name": "Stefan Metzmacher", "email": "metze@samba.org", "time": "Wed Jun 01 02:01:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:10:49 2011 -0700" }, "message": "usbnet/cdc_ncm: add missing .reset_resume hook\n\nThis avoids messages like this after suspend:\n\n cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.6: usb0: unregister \u0027cdc_ncm\u0027 usb-0000:00:1d.0-1.4, CDC NCM\n\nThis is important for the Ericsson F5521gw GSM/UMTS modem.\nOtherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices\nbelong together.\n\nThe cdc_ether module does the same.\n\nSigned-off-by: Stefan Metzmacher \u003cmetze@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "307f73df2b9829ee5a261d1ed432ff683c426cdf", "tree": "909f94f39bda3ef24b4cd72cc7ac201c92c7367c", "parents": [ "d0733d2e29b652b2e7b1438ececa732e4eed98eb" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Tue May 31 22:53:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:08:47 2011 -0700" }, "message": "vlan: fix typo in vlan_dev_hard_start_xmit()\n\ncommit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless\ntransmit path) have a typo in vlan_dev_hard_start_xmit(), using\nu64_stats_update_begin() to end the stat update, it should be\nu64_stats_update_end().\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0733d2e29b652b2e7b1438ececa732e4eed98eb", "tree": "1fdc2634b52f097f0dc01f76196228492dac4be6", "parents": [ "948252cb9e01d65a89ecadf67be5018351eee15e" ], "author": { "name": "Marcus Meissner", "email": "meissner@suse.de", "time": "Wed Jun 01 21:05:22 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:05:22 2011 -0700" }, "message": "net/ipv4: Check for mistakenly passed in non-IPv4 address\n\nCheck against mistakenly passing in IPv6 addresses (which would result\nin an INADDR_ANY bind) or similar incompatible sockaddrs.\n\nSigned-off-by: Marcus Meissner \u003cmeissner@suse.de\u003e\nCc: Reinhard Max \u003cmax@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb9973e4e73f43bd86698483d0c3f7a362ff94ce", "tree": "2595ca9c4a1dad5c12ad21947bf07bccb9c32a4c", "parents": [ "4f5f71a7abe329bdad81ee6a8e4545054a7cc30a" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:03:41 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 20:10:40 2011 -0700" }, "message": "hwmon: (coretemp) Further relax temperature range checks\n\nFurther relax temperature range checks after reading the IA32_TEMPERATURE_TARGET\nregister. If the register returns a value other than 0 in bits 16..32, assume\nthat the returned value is correct.\n\nThis change applies to both packet and core temperature limits.\n\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "4f5f71a7abe329bdad81ee6a8e4545054a7cc30a", "tree": "e7d907a27fa72bd1c706a4f8a0eb2ca246ad26e5", "parents": [ "4c6e0f8101e62d8b2d01dc94b835a98b191a1454" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue May 31 06:54:21 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 20:10:31 2011 -0700" }, "message": "hwmon: (coretemp) Fix TjMax detection for older CPUs\n\nCommit a321cedb12904114e2ba5041a3673ca24deb09c9 excludes CPU models 0xe, 0xf,\n0x16, and 0x1a from TjMax temperature adjustment, even though several of those\nCPUs are known to have TiMax other than 100 degrees C, and even though the code\nin adjust_tjmax() explicitly handles those CPUs and points to a Web document\nlisting several of the affected CPU IDs.\n\nReinstate original TjMax adjustment if TjMax can not be determined using the\nIA32_TEMPERATURE_TARGET register.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d32582\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Huaxu Wan \u003chuaxu.wan@linux.intel.com\u003e\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Valdis Kletnieks \u003cvaldis.kletnieks@vt.edu\u003e\nCc: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nCc: Yong Wang \u003cyong.y.wang@linux.intel.com\u003e\nCc: Rudolf Marek \u003cr.marek@assembler.cz\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nTested-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e # .35.x .36.x .37.x .38.x .39.x\n" }, { "commit": "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c", "tree": "7318c8602f61c2052df308920bd681539f760555", "parents": [ "f0f52a9463839c52a63c05d6e7d4a330d94a9794" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 06:11:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 06:11:24 2011 +0900" }, "message": "Revert \"mm: fail GFP_DMA allocations when ZONE_DMA is not configured\"\n\nThis reverts commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac.\n\nAs rmk says:\n \"Commit a197b59ae6e8 (mm: fail GFP_DMA allocations when ZONE_DMA is not\n configured) is causing regressions on ARM with various drivers which\n use GFP_DMA.\n\n The behaviour up until now has been to silently ignore that flag when\n CONFIG_ZONE_DMA is not enabled, and to allocate from the normal zone.\n However, as a result of the above commit, such allocations now fail\n which causes drivers to fail. These are regressions compared to the\n previous kernel version.\"\n\nso just revert it.\n\nRequested-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f0f52a9463839c52a63c05d6e7d4a330d94a9794", "tree": "d964f65aa37dd46b457bc615f2f37e75390c6df8", "parents": [ "0f48f2600911d5de6393829e4a9986d4075558b3", "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Fix off-by-one in RMRR setup\n intel-iommu: Add domain check in domain_remove_one_dev_info\n intel-iommu: Remove Host Bridge devices from identity mapping\n intel-iommu: Use coherent DMA mask when requested\n intel-iommu: Dont cache iova above 32bit\n intel-iommu: Speed up processing of the identity_mapping function\n intel-iommu: Check for identity mapping candidate using system dma mask\n intel-iommu: Only unlink device domains from iommu\n intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n intel-iommu: Flush unmaps at domain_exit\n intel-iommu: Remove obsolete comment from detect_intel_iommu\n intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n" }, { "commit": "0f48f2600911d5de6393829e4a9986d4075558b3", "tree": "39745ab1858bb308f3b101f5ae555f08485bb7ea", "parents": [ "3f303103b884ca577908d3e5c0650ad12e40c586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "message": "block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal\n\nJens\u0027 back-merge commit 698567f3fa79 (\"Merge commit \u0027v2.6.39\u0027 into\nfor-2.6.40/core\") was incorrectly done, and re-introduced the\nDISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits\n\n - 9fd097b14918 (\"block: unexport DISK_EVENT_MEDIA_CHANGE for\n legacy/fringe drivers\")\n\n - 7eec77a1816a (\"ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd\n and ide-cd\")\n\nbecause of conflicts with the \"g-\u003eflags\" updates near-by by commit\nd4dc210f69bc (\"block: don\u0027t block events on excl write for non-optical\ndevices\")\n\nAs a result, we re-introduced the hanging behavior due to infinite disk\nmedia change reports.\n\nTssk, tssk, people! Don\u0027t do back-merges at all, and *definitely* don\u0027t\ndo them to hide merge conflicts from me - especially as I\u0027m likely\nbetter at merging them than you are, since I do so many merges.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3cc39b3f061e90f69cb1f65d72c005c56cddd6a6", "tree": "2a076b5e1bb8469928695bc2447f94ee95b99a32", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Jun 01 16:06:04 2011 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Wed Jun 01 16:06:04 2011 -0400" }, "message": "tile: enable CONFIG_BUGVERBOSE\n\nTrivial config change to enable backtraces on panic.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "dfe21582ac5ebc460dda98c67e8589dd506d02cd", "tree": "76fe13dd7d63a378d432ac98b62015fcae38a2e3", "parents": [ "a7567b2059020bf3fa96c389ec25eed8e28ad4ba" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Wed Jun 01 17:17:57 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:41:13 2011 -0400" }, "message": "iwl4965: correctly validate temperature value\n\nIn some cases we can read wrong temperature value. If after that\ntemperature value will not be updated to good one, we badly configure\ntx power parameters and device is unable to send a data.\n\nResolves:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d35932\n\nCc: stable@kernel.org # 2.6.39+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7567b2059020bf3fa96c389ec25eed8e28ad4ba", "tree": "8cade3b43b567a6fbf0541cffd36295c07f79552", "parents": [ "21fdc87248d1d28492c775e05fa92b3c8c7bc8db" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Jun 01 08:29:54 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:35:54 2011 -0400" }, "message": "bluetooth l2cap: fix locking in l2cap_global_chan_by_psm\n\nread_lock() ... read_unlock_bh() is clearly bogus.\nThis was broken by\n\ncommit 23691d75cdc69c3b285211b4d77746aa20a17d18\nAuthor: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nDate: Wed Apr 27 18:26:32 2011 -0300\n\n Bluetooth: Remove l2cap_sk_list\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "21fdc87248d1d28492c775e05fa92b3c8c7bc8db", "tree": "cd0f69b7a496b866d2a67cfcf12305b1e5060abc", "parents": [ "333ba7325213f0a09dfa5ceeddb056d6ad74b3b5" ], "author": { "name": "Daniel Halperin", "email": "dhalperi@cs.washington.edu", "time": "Tue May 31 11:59:30 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:35:54 2011 -0400" }, "message": "ath9k: fix two more bugs in tx power\n\nThis is the same fix as\n\n commit 841051602e3fa18ea468fe5a177aa92b6eb44b56\n Author: Matteo Croce \u003ctechnoboy85@gmail.com\u003e\n Date: Fri Dec 3 02:25:08 2010 +0100\n\n The ath9k driver subtracts 3 dBm to the txpower as with two radios the\n signal power is doubled.\n The resulting value is assigned in an u16 which overflows and makes\n the card work at full power.\n\nin two more places. I grepped the ath tree and didn\u0027t find any others.\n\nCc: stable@kernel.org\nSigned-off-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "333ba7325213f0a09dfa5ceeddb056d6ad74b3b5", "tree": "9dff6d71d30b863a30bc07c22326e32cd573eea5", "parents": [ "1144181c1bc054dc5e001a6f10b4820167e6c883" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Sun May 29 15:53:20 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:34:01 2011 -0400" }, "message": "cfg80211: don\u0027t drop p2p probe responses\n\nCommit 0a35d36 (\"cfg80211: Use capability info to detect mesh beacons\")\nassumed that probe response with both ESS and IBSS bits cleared\nmeans that the frame was sent by a mesh sta.\n\nHowever, these capabilities are also being used in the p2p_find phase,\nand the mesh-validation broke it.\n\nRename the WLAN_CAPABILITY_IS_MBSS macro, and verify that mesh ies\nexist before assuming this frame was sent by a mesh sta.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4c6e0f8101e62d8b2d01dc94b835a98b191a1454", "tree": "99631d4139ad63d6eb326754e70e99321463c3ca", "parents": [ "614198bbf8d74617381aea82521b261c7f9baaf6" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Tue May 31 15:50:51 2011 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:11:28 2011 -0700" }, "message": "hwmon: (coretemp) Relax target temperature range check\n\nThe current temperature range check of MSR_IA32_TEMPERATURE_TARGET\nseems too strict to me, some TjMax values documented in\nDocumentation/hwmon/coretemp wouldn\u0027t pass. Relax the check so that\nall the documented values pass.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "614198bbf8d74617381aea82521b261c7f9baaf6", "tree": "f7302190c660bdf05243fabff97b36c2b7aa6870", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Per Dalen", "email": "per.dalen@appeartv.com", "time": "Tue May 31 06:54:21 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:11:27 2011 -0700" }, "message": "hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault\n\nThe temp_fault sysfs attribute is wrong, it should be temp2_fault instead.\n\nReported-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Per Dalen \u003cper.dalen@appeartv.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "9b83c771214cf6a256ee875050e6eaf320cf7983", "tree": "39b5308ea40a47d19cefab98721402296b78a246", "parents": [ "6464920a6e30604cb71d0ecbaa20e35009bd76fb" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 27 09:27:16 2011 +0300" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:21 2011 -0400" }, "message": "xen/blkback: potential null dereference in error handling\n\nblkbk-\u003epending_pages can be NULL here so I added a check for it.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\n[v1: Redid the loop a bit]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6464920a6e30604cb71d0ecbaa20e35009bd76fb", "tree": "e4b8e6a06c6548d739176988c0bbdc21cafa40eb", "parents": [ "4c49ff3fe128ca68dabd07537415c419ad7f82f9" ], "author": { "name": "Laszlo Ersek", "email": "lersek@redhat.com", "time": "Wed May 25 12:24:25 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:20 2011 -0400" }, "message": "xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n\n...because vbd_size() dereferences bd_disk if bd_part is NULL.\n\nSigned-off-by: Laszlo Ersek\u003clersek@redhat.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "3f303103b884ca577908d3e5c0650ad12e40c586", "tree": "021b8baeba20df329b60798ad4fb55f280b0cbda", "parents": [ "5c6cce92bc8aee751aafe82c5d9caf7553226a3d", "63da029015b5255915cd6d61f19ffc276ad4635d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 21:47:39 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 21:47:39 2011 +0900" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6:\n mtd: fix physmap.h warnings\n" }, { "commit": "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a", "tree": "2c7ed5f263440c6a7302c19a31827488eade9ea5", "parents": [ "8519dc4401ddf8a5399f979870bbeeadbc111186" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 31 00:22:52 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:48:21 2011 +0100" }, "message": "intel-iommu: Fix off-by-one in RMRR setup\n\nWe were mapping an extra byte (and hence usually an extra page):\niommu_prepare_identity_map() expects to be given an \u0027end\u0027 argument which\nis the last byte to be mapped; not the first byte *not* to be mapped.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8519dc4401ddf8a5399f979870bbeeadbc111186", "tree": "a1eb0bc0fa29b955a757a1e1c1c76f569e6be4ee", "parents": [ "825507d6d059f1cbe2503e0e5a3926225b983aec" ], "author": { "name": "Mike Habeck", "email": "habeck@sgi.com", "time": "Sat May 28 13:15:07 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:48 2011 +0100" }, "message": "intel-iommu: Add domain check in domain_remove_one_dev_info\n\nThe comment in domain_remove_one_dev_info() states \"No need to compare\nPCI domain; it has to be the same\". But for the si_domain that isn\u0027t\ngoing to be true, as it consists of all the PCI devices that are\nidentity mapped thus multiple PCI domains can be in si_domain. The\ncode needs to validate the PCI domain too.\n\nSigned-off-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "825507d6d059f1cbe2503e0e5a3926225b983aec", "tree": "8f191cb5c4704a4710c7b89b81d9629206714d3b", "parents": [ "c681d0ba1252954208220ad32248a3e8e2fc98e4" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:06 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:46 2011 +0100" }, "message": "intel-iommu: Remove Host Bridge devices from identity mapping\n\nWhen using the 1:1 (identity) PCI DMA remapping, PCI Host Bridge devices\nthat do not use the IOMMU causes a kernel panic. Fix that by not\ninserting those devices into the si_domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c681d0ba1252954208220ad32248a3e8e2fc98e4", "tree": "fe74fdee4fa76e743aa0e8d2d22f958b1a1c710e", "parents": [ "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:05 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:45 2011 +0100" }, "message": "intel-iommu: Use coherent DMA mask when requested\n\nThe __intel_map_single function is not honoring the passed in DMA mask.\nThis results in not using the coherent DMA mask when called from\nintel_alloc_coherent().\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb", "tree": "c06f2bcc3b5aa5d0cb0869815e6247afc736ea7a", "parents": [ "cb452a4040bb051d92e85d6e7eb60c11734c1781" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:04 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:40 2011 +0100" }, "message": "intel-iommu: Dont cache iova above 32bit\n\nMike Travis and Mike Habeck reported an issue where iova allocation\nwould return a range that was larger than a device\u0027s dma mask.\n\nhttps://lkml.org/lkml/2011/3/29/423\n\nThe dmar initialization code will reserve all PCI MMIO regions and copy\nthose reservations into a domain specific iova tree. It is possible for\none of those regions to be above the dma mask of a device. It is typical\nto allocate iovas with a 32bit mask (despite device\u0027s dma mask possibly\nbeing larger) and cache the result until it exhausts the lower 32bit\naddress space. Freeing the iova range that is \u003e\u003d the last iova in the\nlower 32bit range when there is still an iova above the 32bit range will\ncorrupt the cached iova by pointing it to a region that is above 32bit.\nIf that region is also larger than the device\u0027s dma mask, a subsequent\nallocation will return an unusable iova and cause dma failure.\n\nSimply don\u0027t cache an iova that is above the 32bit caching boundary.\n\nReported-by: Mike Travis \u003ctravis@sgi.com\u003e\nReported-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nAcked-by: Mike Travis \u003ctravis@sgi.com\u003e\nTested-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cb452a4040bb051d92e85d6e7eb60c11734c1781", "tree": "ef19298ec70274c9c199fa74a4f08e77cc69080b", "parents": [ "8fcc5372fbac085199d84a880503ed67aba3fe49" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:03 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:36 2011 +0100" }, "message": "intel-iommu: Speed up processing of the identity_mapping function\n\nWhen there are a large count of PCI devices, and the pass through\noption for iommu is set, much time is spent in the identity_mapping\nfunction hunting though the iommu domains to check if a specific\ndevice is \"identity mapped\".\n\nSpeed up the function by checking the cached info to see if\nit\u0027s mapped to the static identity domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8fcc5372fbac085199d84a880503ed67aba3fe49", "tree": "aab84e5ac18fa8028efa49e2cc47a5b97d873916", "parents": [ "9b4554b21ed07e8556405510638171f0c787742a" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:02 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:34 2011 +0100" }, "message": "intel-iommu: Check for identity mapping candidate using system dma mask\n\nThe identity mapping code appears to make the assumption that if the\ndevices dma_mask is greater than 32bits the device can use identity\nmapping. But that is not true: take the case where we have a 40bit\ndevice in a 44bit architecture. The device can potentially receive a\nphysical address that it will truncate and cause incorrect addresses\nto be used.\n\nInstead check to see if the device\u0027s dma_mask is large enough\nto address the system\u0027s dma_mask.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9b4554b21ed07e8556405510638171f0c787742a", "tree": "384c8517f6aee9a09a43ac55c7d0cbadc3d2ee23", "parents": [ "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue May 24 12:19:04 2011 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:29 2011 +0100" }, "message": "intel-iommu: Only unlink device domains from iommu\n\nCommit a97590e5 added unlinking domains from iommus to reciprocate the\niommu from domains unlinking that was already done. We actually want\nto only do this for device domains and never for the static\nidentity map domain or VM domains. The SI domain is special and\nnever freed, while VM domain-\u003eid lives in their own special address\nspace, separate from iommu-\u003edomain_ids.\n\nIn the current code, a VM can get domain-\u003eid zero, then mark that\ndomain unused when unbound from pci-stub. This leads to DMAR\nwrite faults when the device is re-bound to the host driver.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d", "tree": "cb685e370cc1cb2dec39b29500bdd22fd1814596", "parents": [ "7b668357810ecb5fdda4418689d50f5d95aea6a8" ], "author": { "name": "Youquan Song", "email": "youquan.song@intel.com", "time": "Wed May 25 19:13:49 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:26:35 2011 +0100" }, "message": "intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n\nThere are no externally-visible changes with this. In the loop in the\ninternal __domain_mapping() function, we simply detect if we are mapping:\n - size \u003e\u003d 2MiB, and\n - virtual address aligned to 2MiB, and\n - physical address aligned to 2MiB, and\n - on hardware that supports superpages.\n\n(and likewise for larger superpages).\n\nWe automatically use a superpage for such mappings. We never have to\nworry about *breaking* superpages, since we trust that we will always\n*unmap* the same range that was mapped. So all we need to do is ensure\nthat dma_pte_clear_range() will also cope with superpages.\n\nAdjust pfn_to_dma_pte() to take a superpage \u0027level\u0027 as an argument, so\nit can return a PTE at the appropriate level rather than always\nextending the page tables all the way down to level 1. Again, this is\nsimplified by the fact that we should never encounter existing small\npages when we\u0027re creating a mapping; any old mapping that used the same\nvirtual range will have been entirely removed and its obsolete page\ntables freed.\n\nProvide an \u0027intel_iommu\u003dsp_off\u0027 argument on the command line as a\nchicken bit. Not that it should ever be required.\n\n\u003d\u003d\n\nThe original commit seen in the iommu-2.6.git was Youquan\u0027s\nimplementation (and completion) of my own half-baked code which I\u0027d\ntyped into an email. Followed by half a dozen subsequent \u0027fixes\u0027.\n\nI\u0027ve taken the unusual step of rewriting history and collapsing the\noriginal commits in order to keep the main history simpler, and make\nlife easier for the people who are going to have to backport this to\nolder kernels. And also so I can give it a more coherent commit comment\nwhich (hopefully) gives a better explanation of what\u0027s going on.\n\nThe original sequence of commits leading to identical code was:\n\nYouquan Song (3):\n intel-iommu: super page support\n intel-iommu: Fix superpage alignment calculation error\n intel-iommu: Fix superpage level calculation error in dma_pfn_level_pte()\n\nDavid Woodhouse (4):\n intel-iommu: Precalculate superpage support for dmar_domain\n intel-iommu: Fix hardware_largepage_caps()\n intel-iommu: Fix inappropriate use of superpages in __domain_mapping()\n intel-iommu: Fix phys_pfn in __domain_mapping for sglist pages\n\nSigned-off-by: Youquan Song \u003cyouquan.song@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "63da029015b5255915cd6d61f19ffc276ad4635d", "tree": "77e1110712e7adff87fcfc0db80310ff736a285f", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 23 11:37:09 2011 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 11:36:49 2011 +0100" }, "message": "mtd: fix physmap.h warnings\n\nFix build warnings in physmap.h:\n\ninclude/linux/mtd/physmap.h:25: warning: \u0027struct platform_device\u0027 declared inside parameter list\ninclude/linux/mtd/physmap.h:25: warning: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/mtd/physmap.h:26: warning: \u0027struct platform_device\u0027 declared inside parameter list\ninclude/linux/mtd/physmap.h:27: warning: \u0027struct platform_device\u0027 declared inside parameter list\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "da8b94ea61c5d80aae0cc7b7541f1e0fa7459391", "tree": "5d0b7c64b7f5afd9c9b2c528ed08e7d8a0d97859", "parents": [ "efcfde54ca68091b164f9aec544c7233a9760aff" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Thu May 26 08:58:19 2011 +0300" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Wed Jun 01 12:29:06 2011 +0300" }, "message": "UBIFS: fix recovery broken by the previous recovery fix\n\nUnfortunately, the recovery fix d1606a59b6be4ea392eabd40d1250aa1eeb19efb\n(UBIFS: fix extremely rare mount failure) broke recovery. This commit make\nUBIFS drop the last min. I/O unit in all journal heads, but this is needed only\nfor the GC head. And this does not work for non-GC heads. For example, if\nsuppose we have min. I/O units A and B, and A contains a valid node X, which\nwas fsynced, and then a group of nodes Y which spans the rest of A and B. In\nthis case we\u0027ll drop not only Y, but also X, which is obviously incorrect.\n\nThis patch fixes the issue and additionally makes recovery to drop last min.\nI/O unit only for the GC head, and leave things as they have been for ages for\nthe other heads - this is safer.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "efcfde54ca68091b164f9aec544c7233a9760aff", "tree": "f94cd590448a23c2ba7c6566dcbeb72eb3f3dd1d", "parents": [ "1a0b06997ceca96db9259e537eb935f9fe59a3de" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Thu May 26 08:36:52 2011 +0300" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Wed Jun 01 12:29:06 2011 +0300" }, "message": "UBIFS: amend ubifs_recover_leb interface\n\nInstead of passing \"grouped\" parameter to \u0027ubifs_recover_leb()\u0027 which tells\nwhether the nodes are grouped in the LEB to recover, pass the journal head\nnumber and let \u0027ubifs_recover_leb()\u0027 look at the journal head\u0027s \u0027grouped\u0027 flag.\n\nThis patch is a preparation to a further fix where we\u0027ll need to know the\njournal head number for other purposes.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" } ], "next": "1a0b06997ceca96db9259e537eb935f9fe59a3de" }