)]}' { "log": [ { "commit": "8ecffd7914484b728799dd31968f1339fae91593", "tree": "310d16554bc99678a8be26e5d17ae3f0416b2ca9", "parents": [ "36059ee2bad1e08906fd8eed286a50ba6fad643d", "351cfe0fe810588bb1cc75fb4f1c1d1d01914b82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:59:33 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:59:33 2013 -0800" }, "message": "Merge tag \u0027gpio-v3.13-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio\n\nPull GPIO fixes from Linus Walleij:\n \"Here are a few more GPIO patches, we\u0027re a bit noisy for being the GPIO\n subsystem, mostly due to the new descriptor API, but all is getting\n into shape.\n\n - Fix compile warnings\n\n - Fix overly talkative diagnostic messages from usual use cases wrt\n GPIO descriptors\n\n - Add a documentation 00-INDEX\n\n - Use platform GPIOs as fallback when ACPI or device tree is used as\n the primary means to get GPIO lines\n\n - A bug fix for the MPC8572/MPC8536 fixing erroneous input data\"\n\n* tag \u0027gpio-v3.13-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:\n gpiolib: change a warning to debug message when failing to get gpio\n powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536\n gpiolib: use platform GPIO mappings as fallback\n Documentation: gpiolib: add 00-INDEX file\n gpiolib: fix lookup of platform-mapped GPIOs\n gpiolib: add missing declarations\n" }, { "commit": "36059ee2bad1e08906fd8eed286a50ba6fad643d", "tree": "41b07e13c86cf09f208e7d66ace64fb17459945a", "parents": [ "8aa9c36788ee5ebf7a1377742d577911bfc9cfe7", "a5c6e87a7b224bdbf57875a9da8f340f5a6abc5a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:56:18 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:56:18 2013 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Another batch of fixes for ARM SoCs for 3.13. The diffstat is large,\n mostly because of:\n\n - Another set of fixes to fix regressions caused by moving OMAP from\n board files to DT. Tony thinks this was the last major set of\n fixes, with maybe just a few small patches to follow.\n - More fixes for Marvell platforms, most dealing with misdescribed\n PCIe hardware, i.e. incorrect number of busses on some SoCs, etc.\n The line delta adds up due to various ranges moving around when\n this is fixed.\n\n But there\u0027s also:\n\n - Some smaller tweaks to defconfigs to make more boards bootable in\n my test setup for better coverage.\n - There are also a few other smaller fixes, a short series for at91,\n a couple of reverts for ux500, etc\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)\n arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk\n arm: socfpga: Enable ARM_TWD for socfpga\n ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS\u003d16\n ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support\n ARM: multi_v7_defconfig: enable network for BeagleBone Black\n ARM: dts: Fix the name of supplies for smsc911x shared by OMAP\n ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm\n ARM: dts: omap3-beagle: Add omap-twl4030 audio support\n ARM: dts: omap4-sdp: Fix pin muxing for wl12xx\n ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx\n ARM: at91: fixed unresolved symbol \"at91_pm_set_standby\" when built without CONFIG_PM\n ARM: at91: add usart3 alias to dtsi\n ARM: at91: sama5d3: reduce TWI internal clock frequency\n mmc: omap: Fix I2C dependency and make driver usable with device tree\n mmc: omap: Fix DMA configuration to not rely on device id\n ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)\n ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi\n ARM: dts: AM33XX IGEP0033: add USB support\n ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support\n ARM: dts: AM33XX BASE0033: add pinmux and user led support\n ...\n" }, { "commit": "8aa9c36788ee5ebf7a1377742d577911bfc9cfe7", "tree": "273361c41f33968e89f88efa2c4cd38ebff6fd7a", "parents": [ "278717909d47d86fbb20ab66dfeaa84560a2f8f2", "a16ab68ee96005382738c706fd06bdd874d9185b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:54:36 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:54:36 2013 -0800" }, "message": "Merge branch \u0027parisc-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux\n\nPull parsic updates from Helge Deller:\n - a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address\n which was already given in a previous call (fixes locale-gen on\n debian)\n - change the memory layout of the kernel to avoid the need for the\n -mlong-calls compiler option (depends on commit 5ecbe3c3c690 -\n \"kernel/extable: fix address-checks for core_kernel and init areas\")\n - defconfig updates, e.g. use the SIL680 driver instead of the SIIMAGE\n driver\n - add more parisc machine names to the machine database\n\n* \u0027parisc-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:\n parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver\n parisc: remove CONFIG_MLONGCALLS\u003dy from defconfigs\n parisc: fix kernel memory layout in vmlinux.ld.S\n parisc: use kernel_text_address() in unwind functions\n parisc: remove empty SERIAL_PORT_DFNS in serial.h\n parisc: add some more machine names to hardware database\n parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address\n" }, { "commit": "278717909d47d86fbb20ab66dfeaa84560a2f8f2", "tree": "7de925d78f769331d0ccfb6ce4c10c58c2198ea6", "parents": [ "d644c026e6b21959af1f86b15206ae26c64c2e51", "6d565409503f4e1f74ac30de14e8c91a2b826cd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:54:00 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:54:00 2013 -0800" }, "message": "Merge tag \u0027squashfs-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next\n\nPull squashfs bugfix from Phillip Lougher:\n \"Just a single bug fix to the new \"directly decompress into the page\n cache\" code\"\n\n* tag \u0027squashfs-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:\n Squashfs: fix failure to unlock pages on decompress error\n" }, { "commit": "d644c026e6b21959af1f86b15206ae26c64c2e51", "tree": "eadcb52fcdc2bdbf4b7cfe3dd69053f5727c3bc0", "parents": [ "1ab231b274ba51a54acebec23c6aded0f3cdf54e", "8ec25c51291681bd68bdc290b35f2e61fa601c21" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:53:09 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:53:09 2013 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto fixes from Herbert Xu:\n \"This push fixes a number of crashes triggered by a previous crypto\n self-test update. It also fixes a build problem in the caam driver,\n as well as a concurrency issue in s390.\n\n Finally there is a pair of fixes to bugs in the crypto scatterwalk\n code and authenc that may lead to crashes\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: testmgr - fix sglen in test_aead for case \u0027dst !\u003d src\u0027\n crypto: talitos - fix aead sglen for case \u0027dst !\u003d src\u0027\n crypto: caam - fix aead sglen for case \u0027dst !\u003d src\u0027\n crypto: ccm - Fix handling of zero plaintext when computing mac\n crypto: s390 - Fix aes-xts parameter corruption\n crypto: talitos - corrrectly handle zero-length assoc data\n crypto: scatterwalk - Set the chain pointer indication bit\n crypto: authenc - Find proper IV address in ablkcipher callback\n crypto: caam - Add missing Job Ring include\n" }, { "commit": "1ab231b274ba51a54acebec23c6aded0f3cdf54e", "tree": "2ce15cb4ba9adf3e041eb9d1b26f63292c953094", "parents": [ "dea4f48a0a301b23c65af8e4fe8ccf360c272fbf", "0e576acbc1d9600cf2d9b4a141a2554639959d50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:52:09 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 04 08:52:09 2013 -0800" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Thomas Gleixner:\n\n - timekeeping: Cure a subtle drift issue on GENERIC_TIME_VSYSCALL_OLD\n\n - nohz: Make CONFIG_NO_HZ\u003dn and nohz\u003doff command line option behave the\n same way. Fixes a long standing load accounting wreckage.\n\n - clocksource/ARM: Kconfig update to avoid ARM\u003dn wreckage\n\n - clocksource/ARM: Fixlets for the AT91 and SH clocksource/clockevents\n\n - Trivial documentation update and kzalloc conversion from akpms pile\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n nohz: Fix another inconsistency between CONFIG_NO_HZ\u003dn and nohz\u003doff\n time: Fix 1ns/tick drift w/ GENERIC_TIME_VSYSCALL_OLD\n clocksource: arm_arch_timer: Hide eventstream Kconfig on non-ARM\n clocksource: sh_tmu: Add clk_prepare/unprepare support\n clocksource: sh_tmu: Release clock when sh_tmu_register() fails\n clocksource: sh_mtu2: Add clk_prepare/unprepare support\n clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails\n ARM: at91: rm9200: switch back to clockevents_config_and_register\n tick: Document tick_do_timer_cpu\n timer: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)\n NOHZ: Check for nohz active instead of nohz enabled\n" }, { "commit": "a16ab68ee96005382738c706fd06bdd874d9185b", "tree": "31e1a8cc07ea72a189a1718b84392cfb8b30e521", "parents": [ "b8d8fccd68c36a19fef9768d06aa150bbc8cdd74" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Tue Dec 03 23:02:26 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Tue Dec 03 23:23:35 2013 +0100" }, "message": "parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "a5c6e87a7b224bdbf57875a9da8f340f5a6abc5a", "tree": "576ee8ba1d6fae188d433684bed319214c700ae4", "parents": [ "725dd7eb170af813407ee45409590941a5ac626e" ], "author": { "name": "Dinh Nguyen", "email": "dinguyen@altera.com", "time": "Tue Dec 03 14:32:10 2013 -0600" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 14:19:53 2013 -0800" }, "message": "arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk\n\nSome of the clocks that were designated gate-clk do not have a gate, so\nchange those clocks to be of periph-clk type.\n\nSigned-off-by: Dinh Nguyen \u003cdinguyen@altera.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "725dd7eb170af813407ee45409590941a5ac626e", "tree": "765d16c3af75dbeb105bc0d091fe37c4c256218e", "parents": [ "f39918eec72c841037f16475867dac1a2b0bfc01" ], "author": { "name": "Dinh Nguyen", "email": "dinguyen@altera.com", "time": "Wed Jul 17 16:19:09 2013 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 14:19:48 2013 -0800" }, "message": "arm: socfpga: Enable ARM_TWD for socfpga\n\nUpdate Kconfig to enable TWD.\n\nSigned-off-by: Dinh Nguyen \u003cdinguyen@altera.com\u003e\nReviewed-by: Pavel Machek \u003cpavel@denx.de\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "f39918eec72c841037f16475867dac1a2b0bfc01", "tree": "9a908bbad52ba774d721cbdc160e2294b7420804", "parents": [ "610ffd58dbbccaf7a6e0fe85c5a345200466adc2" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 10:21:49 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:14 2013 -0800" }, "message": "ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS\u003d16\n\nEnable MMC/SD on the Broadcom mobile platforms, and increase the block\nminors from the default 8 to 16 (since the Broadcom board by default\nhas root on the 8th partition).\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nCc: stable@vger.kernel.org # v3.12\n" }, { "commit": "610ffd58dbbccaf7a6e0fe85c5a345200466adc2", "tree": "dee3ce341122e3d8b82332de2716d7a232dd791b", "parents": [ "82cca5daced5012819d2cfd43e266b2919863d0c" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 02 18:40:50 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:13 2013 -0800" }, "message": "ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support\n\nThis enables a few more options on the sunxi defconfigs such that I can\nuse nfsroot to boot them (there is no local storage support yet). It\nalso enables PRINTK_TIME and tmpfs since it\u0027s a common distro requirement.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "82cca5daced5012819d2cfd43e266b2919863d0c", "tree": "39f48ae95c3874eaa2448302998e4a0d9b3c0273", "parents": [ "0dfee674b33fd87be4879a2b2d33a2fc22449814", "ac46bf3933421bde881399d9ad3d165064862cc3" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 02 18:24:38 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:12 2013 -0800" }, "message": "Merge tag \u0027omap-for-v3.13/more-dt-regressions\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nFrom Tony Lindgren:\n\nFew more legacy booting vs device tree booting fixes that people\nhave noticed while booting things with device tree for things like\nomap4 WLAN, smsc911x, and beagle audio. Hopefully this will be it\nfor the legacy booting vs device tree fixes for this -rc cycle.\n\n* tag \u0027omap-for-v3.13/more-dt-regressions\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: dts: Fix the name of supplies for smsc911x shared by OMAP\n ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm\n ARM: dts: omap3-beagle: Add omap-twl4030 audio support\n ARM: dts: omap4-sdp: Fix pin muxing for wl12xx\n ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx\n" }, { "commit": "0dfee674b33fd87be4879a2b2d33a2fc22449814", "tree": "51f165276b67edec01fd0321c801fff1df7d569d", "parents": [ "3060817fe8936b1e2aab03b14c068c92d54b84bb" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 02 00:15:29 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:11 2013 -0800" }, "message": "ARM: multi_v7_defconfig: enable network for BeagleBone Black\n\nBeagleBone Black uses the TI CPSW ethernet controller, enable it in the\nmulti_v7_defconfig for testing coverage purposes.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: stable@vger.kernel.org # v3.12\n" }, { "commit": "3060817fe8936b1e2aab03b14c068c92d54b84bb", "tree": "6c59d8412ef9328bbe53199b167a781d06781e80", "parents": [ "c0c3350c3c1171f7aff7373c658aa7d68975bd55", "7093bf2b7195541281cb711e31c027a8d826c6df" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Mon Dec 02 09:16:08 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:10 2013 -0800" }, "message": "Merge tag \u0027at91-fixes\u0027 of git://github.com/at91linux/linux-at91 into fixes\n\nFrom Nicolas Ferre:\nAT91: second round of fixes for 3.13\n- reduce IP frequency for I2C on sama5d3\n- missing aliases directive for USART3 on 9x5 family\n- a PM symbol is missing if !CONFIG_PM\n\n* tag \u0027at91-fixes\u0027 of git://github.com/at91linux/linux-at91:\n ARM: at91: fixed unresolved symbol \"at91_pm_set_standby\" when built without CONFIG_PM\n ARM: at91: add usart3 alias to dtsi\n ARM: at91: sama5d3: reduce TWI internal clock frequency\n" }, { "commit": "c0c3350c3c1171f7aff7373c658aa7d68975bd55", "tree": "9665b5fed230b7092e9b221afbb54488cbc72a62", "parents": [ "b8be3a227949202cdc9e1d7c35509f916a1aa327", "96039f735e290281d0c8a08fc467de2cd610543d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Dec 01 11:51:24 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:09 2013 -0800" }, "message": "Merge tag \u0027mvebu-dt-fixes-3.13\u0027 of git://git.infradead.org/linux-mvebu into fixes\n\nFrom Jason Cooper, mvebu DT fixes for v3.13:\n - mvebu\n - PCIe fixes now that we have test devices with more ports.\n - fix access to coherency registers\n\n* tag \u0027mvebu-dt-fixes-3.13\u0027 of git://git.infradead.org/linux-mvebu:\n ARM: mvebu: re-enable PCIe on Armada 370 DB\n ARM: mvebu: use the virtual CPU registers to access coherency registers\n ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260\n ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable\n" }, { "commit": "b8be3a227949202cdc9e1d7c35509f916a1aa327", "tree": "83b26949c93bdb8866730d8e8f8f1d07ce43f381", "parents": [ "a32555249f54dd511b61e7a388aa522809b12c82", "9cb238c00ba5c1ddfff2c2ed6aa66c15b962e4c3" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Nov 26 19:29:24 2013 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 03 12:39:08 2013 -0800" }, "message": "Merge tag \u0027omap-for-v3.13/fixes-against-rc1-take2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nFrom Tony Lindgren:\n\nSome omap related fixes that have come up with people moving to device\ntree only based booting for omap2+.\n\nThe series contains a handful of fixes for the igep boards as they were\none of the first omap3 boards to jump over completely to device tree\nbased booting. So these can be considered regressions compared to\nbooting igep in legacy mode with board files in v3.12.\n\nAlso included are few other device tree vs legacy booting regressions:\n\n- yet more missing omap3 .dtsi entries that have showed up booting\n various boards with device tree only\n\n- n900 eMMC device tree fix\n\n- fixes for beagle USB EHCI\n\n- two fixes to make omap2420 MMC work\n\nAs we\u0027re moving omap2+ to be device tree only for v3.14, I\u0027d like to\nhave v3.13 work equally well for legacy based booting and device tree\nbased booting. So there will be likely few more device tree related\nbooting patches trickling in.\n\nThis series also includes a regression fix for the omap timer posted\nmode that may wrongly stay on from the bootloader for some SoCs.\n\n* tag \u0027omap-for-v3.13/fixes-against-rc1-take2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n mmc: omap: Fix I2C dependency and make driver usable with device tree\n mmc: omap: Fix DMA configuration to not rely on device id\n ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)\n ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi\n ARM: dts: AM33XX IGEP0033: add USB support\n ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support\n ARM: dts: AM33XX BASE0033: add pinmux and user led support\n ARM: dts: AM33XX BASE0033: add pinmux and hdmi node to enable display\n ARM: dts: omap3-igep0020: Add pinmuxing for DVI output\n ARM: dts: omap3-igep0020: Add pinmux setup for i2c devices\n ARM: dts: omap3-igep: Update to use the TI AM/DM37x processor\n ARM: dts: omap3-igep: Add support for LBEE1USJYC WiFi connected to SDIO\n ARM: dts: omap3-igep: Fix bus-width for mmc1\n ARM: OMAP2+: dss-common: change IGEP\u0027s DVI DDC i2c bus\n ARM: OMAP2+: Disable POSTED mode for errata i103 and i767\n ARM: OMAP2+: Fix eMMC on n900 with device tree\n ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig\n ARM: OMAP2+: Fix more missing data for omap3.dtsi file\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "351cfe0fe810588bb1cc75fb4f1c1d1d01914b82", "tree": "26c9b8caf57b6d3c0148f05ad3251d8c8baa047f", "parents": [ "1aeef303b5d9e243c41d5b80f8bb059366514a10" ], "author": { "name": "Heikki Krogerus", "email": "heikki.krogerus@linux.intel.com", "time": "Fri Nov 29 15:47:34 2013 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:48 2013 +0100" }, "message": "gpiolib: change a warning to debug message when failing to get gpio\n\nIt\u0027s the drivers responsibility to react on failure to get\nthe gpio descriptors and not the frameworks. Since there are\nsome common peripherals that may or may not have certain\npins connected to gpio lines, depending on the platform,\nprinting the warning there may end up generating useless bug\nreports.\n\nSigned-off-by: Heikki Krogerus \u003cheikki.krogerus@linux.intel.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "1aeef303b5d9e243c41d5b80f8bb059366514a10", "tree": "36dd8b11675512527aa4829bc5906fb8a6c40724", "parents": [ "35c5d7fdc4eed4409f9193bf7651315849cc6aa3" ], "author": { "name": "Liu Gang", "email": "Gang.Liu@freescale.com", "time": "Fri Nov 22 16:12:40 2013 +0800" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:48 2013 +0100" }, "message": "powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536\n\nFor MPC8572/MPC8536, the status of GPIOs defined as output\ncannot be determined by reading GPDAT register, so the code\nuse shadow data register instead. But the code may give the\nwrong status of GPIOs defined as input under some scenarios:\n\n1. If some pins were configured as inputs and were asserted\nhigh before booting the kernel, the shadow data has been\ninitialized with those pin values.\n2. Some pins have been configured as output first and have\nbeen set to the high value, then reconfigured as input.\n\nThe above cases will make the shadow data for those input\npins to be set to high. Then reading the pin status will\nalways return high even if the actual pin status is low.\n\nThe code should eliminate the effects of the shadow data to\nthe input pins, and the status of those pins should be\nread directly from GPDAT.\n\nCc: stable@vger.kernel.org\nAcked-by: Scott Wood \u003cscottwood@freescale.com\u003e\nAcked-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Liu Gang \u003cGang.Liu@freescale.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "35c5d7fdc4eed4409f9193bf7651315849cc6aa3", "tree": "66c2782a2c9dd545d8ec1d094d3c3bb00dd1c267", "parents": [ "56a39aac593a7e855bed357b1ce43eeb7a99e7e2" ], "author": { "name": "Alexandre Courbot", "email": "acourbot@nvidia.com", "time": "Sat Nov 23 19:34:50 2013 +0900" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:48 2013 +0100" }, "message": "gpiolib: use platform GPIO mappings as fallback\n\nFor platforms that use device tree or ACPI as the standard way to look\nGPIOs up, allow the platform-defined GPIO mappings to be used as a\nfallback. This may be useful for platforms that need extra GPIOs mappings\nnot defined by the firmware.\n\nSigned-off-by: Alexandre Courbot \u003cacourbot@nvidia.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "56a39aac593a7e855bed357b1ce43eeb7a99e7e2", "tree": "c63a8900efc936a846546f84554af8ba627c27ea", "parents": [ "7cc67b9c74d9728ba6cbf868d7bcd2cc24de0880" ], "author": { "name": "Alexandre Courbot", "email": "acourbot@nvidia.com", "time": "Sat Nov 23 19:32:20 2013 +0900" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:48 2013 +0100" }, "message": "Documentation: gpiolib: add 00-INDEX file\n\nGive a short overview of the various GPIO documentation files.\n\nSigned-off-by: Alexandre Courbot \u003cacourbot@nvidia.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "7cc67b9c74d9728ba6cbf868d7bcd2cc24de0880", "tree": "cfcbcfebe0e303d2a23bd32800b87bf3380b0a87", "parents": [ "c9a9972b6f093e4e2f81f58892a7523df894144d" ], "author": { "name": "Alexandre Courbot", "email": "acourbot@nvidia.com", "time": "Sat Nov 23 14:55:52 2013 +0900" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:48 2013 +0100" }, "message": "gpiolib: fix lookup of platform-mapped GPIOs\n\nA typo resulted in GPIO lookup failing unconditionally.\n\nSigned-off-by: Alexandre Courbot \u003cacourbot@nvidia.com\u003e\nReported-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nReviewed-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "c9a9972b6f093e4e2f81f58892a7523df894144d", "tree": "e6e954167d55ec349c32f5da183c6072e948c63d", "parents": [ "dc1ccc48159d63eca5089e507c82c7d22ef60839" ], "author": { "name": "Alexandre Courbot", "email": "acourbot@nvidia.com", "time": "Mon Nov 25 18:34:24 2013 +0900" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Dec 03 13:10:47 2013 +0100" }, "message": "gpiolib: add missing declarations\n\nAdd declaration of \u0027struct of_phandle_args\u0027 to avoid the following\nwarning:\n\n In file included from arch/arm/mach-tegra/board-paz00.c:21:0:\n include/linux/gpio/driver.h:102:17: warning: \u0027struct of_phandle_args\u0027 declared inside parameter list\n include/linux/gpio/driver.h:102:17: warning: its scope is only this definition or declaration, which is probably not what you want\n\nAlso proactively add other definitions/includes that could be missing\nin other contexts.\n\nSigned-off-by: Alexandre Courbot \u003cacourbot@nvidia.com\u003e\nReported-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nReviewed-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "dea4f48a0a301b23c65af8e4fe8ccf360c272fbf", "tree": "86b69a75eae6cba3363a6b6153c9fa47775f0bc3", "parents": [ "b65502879556d041b45104c6a35abbbba28c8f2d", "aa1a6d6d74fff31060e08f6007037e6d807c8130" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 12:08:01 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 12:08:01 2013 -0800" }, "message": "Merge branch \u0027leds-fixes-for-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds\n\nPull LED subsystem bugfix from Bryan Wu.\n\n* \u0027leds-fixes-for-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:\n leds: pwm: Fix for deferred probe in DT booted mode\n" }, { "commit": "aa1a6d6d74fff31060e08f6007037e6d807c8130", "tree": "9e24e51ae5540d12b9460126fa1616257a71e8be", "parents": [ "dc1ccc48159d63eca5089e507c82c7d22ef60839" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Thu Nov 28 01:06:38 2013 -0800" }, "committer": { "name": "Bryan Wu", "email": "cooloney@gmail.com", "time": "Mon Dec 02 11:53:17 2013 -0800" }, "message": "leds: pwm: Fix for deferred probe in DT booted mode\n\nWe need to make sure that the error code from devm_of_pwm_get() is the one\nthe module returns in case of failure.\nRestructure the code to make this possible for DT booted case.\nWith this patch the driver can ask for deferred probing when the board is\nbooted with DT.\nFixes for example omap4-sdp board\u0027s keyboard backlight led.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nSigned-off-by: Bryan Wu \u003ccooloney@gmail.com\u003e\n" }, { "commit": "b65502879556d041b45104c6a35abbbba28c8f2d", "tree": "33dc13740f3a0e00a960a2eb9e78afe523f1e8c4", "parents": [ "a45299e72737c528975546a0680cace5d7364d27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 11:50:37 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 11:50:37 2013 -0800" }, "message": "uio: we cannot mmap unaligned page contents\n\nIn commit 7314e613d5ff (\"Fix a few incorrectly checked\n[io_]remap_pfn_range() calls\") the uio driver started more properly\nchecking the passed-in user mapping arguments against the size of the\nactual uio driver data.\n\nThat in turn exposed that some driver authors apparently didn\u0027t realize\nthat mmap can only work on a page granularity, and had tried to use it\nwith smaller mappings, with the new size check catching that out.\n\nSo since it\u0027s not just the user mmap() arguments that can be confused,\nmake the uio mmap code also verify that the uio driver has the memory\nallocated at page boundaries in order for mmap to work. If the device\nmemory isn\u0027t properly aligned, we return\n\n [ENODEV]\n The fildes argument refers to a file whose type is not supported by mmap().\n\nas per the open group documentation on mmap.\n\nReported-by: Holger Brunck \u003cholger.brunck@keymile.com\u003e\nAcked-by: Greg KH \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ac46bf3933421bde881399d9ad3d165064862cc3", "tree": "9e5fa1cb7755619d01c8b969b974765507be8c06", "parents": [ "1cfc4bdd51970ac07c9eea545e65a3b16dc269b6" ], "author": { "name": "Florian Vaussard", "email": "florian.vaussard@epfl.ch", "time": "Mon Dec 02 11:38:15 2013 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 02 11:38:15 2013 -0800" }, "message": "ARM: dts: Fix the name of supplies for smsc911x shared by OMAP\n\ndrivers/net/ethernet/smsc/smsc911x.c is expecting supplies named\n\"vdd33a\" and \"vddvario\". Currently the shared DTS file provides\n\"vmmc\" and \"vmmc_aux\", and the supply lookup will fail:\n\nsmsc911x 2c000000.ethernet: Looking up vdd33a-supply from device tree\nsmsc911x 2c000000.ethernet: Looking up vdd33a-supply property in node /ocp/gpmc@6e000000/ethernet@gpmc failed\nsmsc911x 2c000000.ethernet: Looking up vddvario-supply from device tree\nsmsc911x 2c000000.ethernet: Looking up vddvario-supply property in node /ocp/gpmc@6e000000/ethernet@gpmc failed\n\nFix it!\n\nLooks like commmit 6b2978ac40e4 (ARM: dts: Shared file for omap GPMC\nconnected smsc911x) made the problem more visible by moving the smc911x\nconfiguration from the omap3-igep0020.dts file to the generic file.\nBut it seems we\u0027ve had this problem since commit d72b4415011e\n(ARM: dts: omap3-igep0020: Add SMSC911x LAN chip support).\n\nTested on OMAP3 Overo platform.\n\nSigned-off-by: Florian Vaussard \u003cflorian.vaussard@epfl.ch\u003e\n[tony@atomide.com: updated comments for the commits causing the problem]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "1cfc4bdd51970ac07c9eea545e65a3b16dc269b6", "tree": "7ff5719fec95336d3327a2164afa658c913c4bd7", "parents": [ "33e9c392adf521b0a5be7ee2b9b28705b47f8967" ], "author": { "name": "Rajendra Nayak", "email": "rnayak@ti.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "message": "ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm\n\nCommit \u0027cd8abed\u0027 \"ARM: OMAP2+: Powerdomain: Remove the need to\nalways have a voltdm associated to a pwrdm\" leads to the following\nSmatch complaint:\n\narch/arm/mach-omap2/powerdomain.c:131 _pwrdm_register()\n\t error: we previously assumed \u0027arch_pwrdm\u0027 could be null (see line 105)\n\nSo, fix the unchecked dereference of arch_pwrdm.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Nishanth Menon \u003cnm@ti.com\u003e\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "33e9c392adf521b0a5be7ee2b9b28705b47f8967", "tree": "90941e4013597dba9720cfb597fd143fe9436c50", "parents": [ "2562f5281355d59b7ba31a46567e24ede4e2dea1" ], "author": { "name": "Jarkko Nikula", "email": "jarkko.nikula@bitmer.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "message": "ARM: dts: omap3-beagle: Add omap-twl4030 audio support\n\nThis adds typical McBSP2-TWL4030 audio description to the legacy\nBeagle Board.\n\nSigned-off-by: Jarkko Nikula \u003cjarkko.nikula@bitmer.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "2562f5281355d59b7ba31a46567e24ede4e2dea1", "tree": "84be559f50f26cbc2118ce9fef350407bd8abb04", "parents": [ "2ba2866f782f7f1c38abc3dd56d3295efd289264" ], "author": { "name": "Balaji T K", "email": "balajitk@ti.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 02 11:38:14 2013 -0800" }, "message": "ARM: dts: omap4-sdp: Fix pin muxing for wl12xx\n\nMux mode for wlan/sdmmc5 should be MODE0 in pinmux_wl12xx_pins and\nEnable Pull up on sdmmc5_clk to detect SDIO card.\n\nThis fixes WLAN on omap4-sdp that got broken in v3.10 when we\nmoved omap4 to boot using device tree only as I did not have\nthe WL12XX card in my omap4 SDP to test with. The commit that\nattempted to make WL12XX working on omap4 SDP was 775d2418f309\n(ARM: dts: Fix muxing and regulator for wl12xx on the SDIO\nbus for blaze).\n\nSigned-off-by: Balaji T K \u003cbalajitk@ti.com\u003e\n[tony@atomide.com: updated comments for the regression]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "2ba2866f782f7f1c38abc3dd56d3295efd289264", "tree": "f04ebd55521d179704c65bf6134d981fd9e37f47", "parents": [ "9cb238c00ba5c1ddfff2c2ed6aa66c15b962e4c3" ], "author": { "name": "Balaji T K", "email": "balajitk@ti.com", "time": "Mon Dec 02 11:38:13 2013 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Dec 02 11:38:13 2013 -0800" }, "message": "ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx\n\npin mux wl12xx_gpio and wl12xx_pins should be part of omap4_pmx_core\nand not omap4_pmx_wkup. So, move wl12xx_* to omap4_pmx_core.\n\nFix the following error message:\npinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)\npinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x\n\nSDIO card is not detected after moving pin mux to omap4_pmx_core since\nsdmmc5_clk pull is disabled. Enable Pull up on sdmmc5_clk to detect SDIO card.\n\nThis fixes a regression where WLAN did not work after a warm reset\nor after one up/down cycle that happened when we move omap4 to boot\nusing device tree only. For reference, the kernel bug is described at:\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d63821\n\nCc: stable@vger.kernel.org # v3.10+\nSigned-off-by: Balaji T K \u003cbalajitk@ti.com\u003e\n[tony@atomide.com: update comments to describe the regression]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "a45299e72737c528975546a0680cace5d7364d27", "tree": "45c97b0f789aa09acffeca70af691dc2dd4f19d7", "parents": [ "a0b57ca33ec1cd915ba49051512b3463fa44b4e3", "08332dff8adebb74171e98e008d6c20de6658c42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:15:39 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:15:39 2013 -0800" }, "message": "Merge branch \u0027irq-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull irq fixes from Thomas Gleixner:\n - Correction of fuzzy and fragile IRQ_RETVAL macro\n - IRQ related resume fix affecting only XEN\n - ARM/GIC fix for chained GIC controllers\n\n* \u0027irq-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n irqchip: Gic: fix boot for chained gics\n irq: Enable all irqs unconditionally in irq_resume\n genirq: Correct fuzzy and fragile IRQ_RETVAL() definition\n" }, { "commit": "a0b57ca33ec1cd915ba49051512b3463fa44b4e3", "tree": "a68f879562194bffd0774a3c8cac4d19c0c363b1", "parents": [ "e321ae4c207ce4c6c6812fc65e666efc325cc65e", "96739d6e548e16d76de39d059e1e39e70c187fff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:13:44 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:13:44 2013 -0800" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar:\n \"Various smaller fixlets, all over the place\"\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched/doc: Fix generation of device-drivers\n sched: Expose preempt_schedule_irq()\n sched: Fix a trivial typo in comments\n sched: Remove unused variable in \u0027struct sched_domain\u0027\n sched: Avoid NULL dereference on sd_busy\n sched: Check sched_domain before computing group power\n MAINTAINERS: Update file patterns in the lockdep and scheduler entries\n" }, { "commit": "e321ae4c207ce4c6c6812fc65e666efc325cc65e", "tree": "117ded7f1a1bfcdcc6417c6816c02680539d6485", "parents": [ "bcc2f9b718d0be9cd77551d37c28daf4ebbc570c", "e98a6e59dff885eb387163b1a7abe019a44ba90b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:13:09 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:13:09 2013 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"Misc kernel and tooling fixes\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tools lib traceevent: Fix conversion of pointer to integer of different size\n perf/trace: Properly use u64 to hold event_id\n perf: Remove fragile swevent hlist optimization\n ftrace, perf: Avoid infinite event generation loop\n tools lib traceevent: Fix use of multiple options in processing field\n perf header: Fix possible memory leaks in process_group_desc()\n perf header: Fix bogus group name\n perf tools: Tag thread comm as overriden\n" }, { "commit": "bcc2f9b718d0be9cd77551d37c28daf4ebbc570c", "tree": "5debda8b953b288bd547d2be8e36046746762fb0", "parents": [ "aeac81033bc04c9e7e3ecf5b93f476d26d4cb25b", "14883a75ec76b44759385fb12629f4a0f1aef4e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:12:01 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:12:01 2013 -0800" }, "message": "Merge tag \u0027stable/for-linus-3.13-rc2-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip\n\nPull Xen bug-fixes from Konrad Rzeszutek Wilk:\n \"Fixes to patches that went in this merge window along with a latent\n bug:\n - Fix lazy flushing in case m2p override fails.\n - Fix module compile issues with ARM/Xen\n - Add missing call to DMA map page for Xen SWIOTLB for ARM\"\n\n* tag \u0027stable/for-linus-3.13-rc2-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:\n xen/gnttab: leave lazy MMU mode in the case of a m2p override failure\n xen/arm: p2m_init and p2m_lock should be static\n arm/xen: Export phys_to_mach to fix Xen module link errors\n swiotlb-xen: add missing xen_dma_map_page call\n" }, { "commit": "aeac81033bc04c9e7e3ecf5b93f476d26d4cb25b", "tree": "765b4fd1bafaf22267bca5af32ddb054fc57752d", "parents": [ "5fc92de3c7106d17f85c245383ba072d810d6bb0", "c18158f1fdad0de6be5386291189580484e459cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:10:55 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:10:55 2013 -0800" }, "message": "Merge tag \u0027spi-v3.13-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi\n\nPull spi fixes from Mark Brown:\n \"A smattering of driver specific fixes here, including a bunch for a\n long standing common pattern in the error handling paths, and a fix\n for an embarrassing thinko in the new devm master registration code\"\n\n* tag \u0027spi-v3.13-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:\n spi/pxa2xx: Restore private register bits.\n spi/qspi: Fix qspi remove path.\n spi/qspi: cleanup pm_runtime error check.\n spi/qspi: set correct platform drvdata in ti_qspi_probe()\n spi/pxa2xx: add new ACPI IDs\n spi: core: invert success test in devm_spi_register_master\n spi: spi-mxs: fix reference leak to master in mxs_spi_remove()\n spi: bcm63xx: fix reference leak to master in bcm63xx_spi_remove()\n spi: txx9: fix reference leak to master in txx9spi_remove()\n spi: mpc512x: fix reference leak to master in mpc512x_psc_spi_do_remove()\n spi: rspi: use platform drvdata correctly in rspi_remove()\n spi: bcm2835: fix reference leak to master in bcm2835_spi_remove()\n" }, { "commit": "5fc92de3c7106d17f85c245383ba072d810d6bb0", "tree": "1e27a49e82ca9736144cc73ad5544a7ddf906644", "parents": [ "b0d8d2292160bb63de1972361ebed100c64b5b37", "833846e8fa0c51fb3e47bca8adfdd7b10643b737" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:09:07 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 10:09:07 2013 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n \"Here is a pile of bug fixes that accumulated while I was in Europe\"\n\n 1) In fixing kernel leaks to userspace during copying of socket\n addresses, we broke a case that used to work, namely the user\n providing a buffer larger than the in-kernel generic socket address\n structure. This broke Ruby amongst other things. Fix from Dan\n Carpenter.\n\n 2) Fix regression added by byte queue limit support in 8139cp driver,\n from Yang Yingliang.\n\n 3) The addition of MSG_SENDPAGE_NOTLAST buggered up a few sendpage\n implementations, they should just treat it the same as MSG_MORE.\n Fix from Richard Weinberger and Shawn Landden.\n\n 4) Handle icmpv4 errors received on ipv6 SIT tunnels correctly, from\n Oussama Ghorbel. In particular we should send an ICMPv6 unreachable\n in such situations.\n\n 5) Fix some regressions in the recent genetlink fixes, in particular\n get the pmcraid driver to use the new safer interfaces correctly.\n From Johannes Berg.\n\n 6) macvtap was converted to use a per-cpu set of statistics, but some\n code was still bumping tx_dropped elsewhere. From Jason Wang.\n\n 7) Fix build failure of xen-netback due to missing include on some\n architectures, from Andy Whitecroft.\n\n 8) macvtap double counts received packets in statistics, fix from Vlad\n Yasevich.\n\n 9) Fix various cases of using *_STATS_BH() when *_STATS() is more\n appropriate. From Eric Dumazet and Hannes Frederic Sowa.\n\n10) Pktgen ipsec mode doesn\u0027t update the ipv4 header length and checksum\n properly after encapsulation. Fix from Fan Du.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)\n net/mlx4_en: Remove selftest TX queues empty condition\n {pktgen, xfrm} Update IPv4 header total len and checksum after tranformation\n virtio_net: make all RX paths handle erors consistently\n virtio_net: fix error handling for mergeable buffers\n virtio_net: Fixed a trivial typo (fitler --\u003e filter)\n netem: fix gemodel loss generator\n netem: fix loss 4 state model\n netem: missing break in ge loss generator\n net/hsr: Support iproute print_opt (\u0027ip -details ...\u0027)\n net/hsr: Very small fix of comment style.\n MAINTAINERS: Added net/hsr/ maintainer\n ipv6: fix possible seqlock deadlock in ip6_finish_output2\n ixgbe: Make ixgbe_identify_qsfp_module_generic static\n ixgbe: turn NETIF_F_HW_L2FW_DOFFLOAD off by default\n ixgbe: ixgbe_fwd_ring_down needs to be static\n e1000: fix possible reset_task running after adapter down\n e1000: fix lockdep warning in e1000_reset_task\n e1000: prevent oops when adapter is being closed and reset simultaneously\n igb: Fixed Wake On LAN support\n inet: fix possible seqlock deadlocks\n ...\n" }, { "commit": "b0d8d2292160bb63de1972361ebed100c64b5b37", "tree": "6a7fb5ef0299553f0ef1160e24bbb9e2bb303e5e", "parents": [ "e84a2a49b9697bdd8f2decf7c56a555a6bc064d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 09:44:51 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 02 09:44:51 2013 -0800" }, "message": "vfs: fix subtle use-after-free of pipe_inode_info\n\nThe pipe code was trying (and failing) to be very careful about freeing\nthe pipe info only after the last access, with a pattern like:\n\n spin_lock(\u0026inode-\u003ei_lock);\n if (!--pipe-\u003efiles) {\n inode-\u003ei_pipe \u003d NULL;\n kill \u003d 1;\n }\n spin_unlock(\u0026inode-\u003ei_lock);\n __pipe_unlock(pipe);\n if (kill)\n free_pipe_info(pipe);\n\nwhere the final freeing is done last.\n\nHOWEVER. The above is actually broken, because while the freeing is\ndone at the end, if we have two racing processes releasing the pipe\ninode info, the one that *doesn\u0027t* free it will decrement the -\u003efiles\ncount, and unlock the inode i_lock, but then still use the\n\"pipe_inode_info\" afterwards when it does the \"__pipe_unlock(pipe)\".\n\nThis is *very* hard to trigger in practice, since the race window is\nvery small, and adding debug options seems to just hide it by slowing\nthings down.\n\nSimon originally reported this way back in July as an Oops in\nkmem_cache_allocate due to a single bit corruption (due to the final\n\"spin_unlock(pipe-\u003emutex.wait_lock)\" incrementing a field in a different\nallocation that had re-used the free\u0027d pipe-info), it\u0027s taken this long\nto figure out.\n\nSince the \u0027pipe-\u003efiles\u0027 accesses aren\u0027t even protected by the pipe lock\n(we very much use the inode lock for that), the simple solution is to\njust drop the pipe lock early. And since there were two users of this\npattern, create a helper function for it.\n\nIntroduced commit ba5bb147330a (\"pipe: take allocation and freeing of\npipe_inode_info out of -\u003ei_mutex\").\n\nReported-by: Simon Kirby \u003csim@hostway.ca\u003e\nReported-by: Ian Applegate \u003cia@cloudflare.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@kernel.org # v3.10+\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7093bf2b7195541281cb711e31c027a8d826c6df", "tree": "4ac74cc6c1ec12007c86878fb77e5166f55630fe", "parents": [ "d2607c3b78701fed52ba1bb953562da6702b2001" ], "author": { "name": "Brent Taylor", "email": "motobud@gmail.com", "time": "Sun Nov 24 12:02:35 2013 -0600" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Dec 02 14:24:40 2013 +0100" }, "message": "ARM: at91: fixed unresolved symbol \"at91_pm_set_standby\" when built without CONFIG_PM\n\nIf CONFIG_PM is not defined, then arch/arm/mach-at91/pm.c is not\ncompiled in. This patch creates an inline function that does nothing\nif CONFIG_PM is not defined.\n\nSigned-off-by: Brent Taylor \u003cmotobud@gmail.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "d2607c3b78701fed52ba1bb953562da6702b2001", "tree": "551ad66479f8cd6ee4176e991bfa3cef8697b0fa", "parents": [ "58e7b1d5826ac6a64b1101d8a70162bc084a7d1e" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Dec 02 10:58:32 2013 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Dec 02 14:14:53 2013 +0100" }, "message": "ARM: at91: add usart3 alias to dtsi\n\nAlias was missing for SoC of the at91sam9x5 familly that embed USART3.\n\nReported-by: Jiri Prchal \u003cjiri.prchal@aksignal.cz\u003e\n[b.brezillon@overkiz.com: advised to place changes in at91sam9x5_usart3.dtsi]\nAcked-by: Boris BREZILLON \u003cb.brezillon@overkiz.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "58e7b1d5826ac6a64b1101d8a70162bc084a7d1e", "tree": "133061595c50da263866003aca05cdccacc46576", "parents": [ "6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae" ], "author": { "name": "Ludovic Desroches", "email": "ludovic.desroches@atmel.com", "time": "Fri Nov 22 17:08:43 2013 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Dec 02 14:14:42 2013 +0100" }, "message": "ARM: at91: sama5d3: reduce TWI internal clock frequency\n\nWith some devices, transfer hangs during I2C frame transmission. This issue\ndisappears when reducing the internal frequency of the TWI IP. Even if it is\nindicated that internal clock max frequency is 66MHz, it seems we have\noversampling on I2C signals making TWI believe that a transfer in progress\nis done.\n\nThis fix has no impact on the I2C bus frequency.\n\nCc: \u003cstable@vger.kernel.org\u003e #3.10+\nSigned-off-by: Ludovic Desroches \u003cludovic.desroches@atmel.com\u003e\nAcked-by: Wolfram Sang \u003cwsa@the-dreams.de\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "833846e8fa0c51fb3e47bca8adfdd7b10643b737", "tree": "f75450c691d4c6a773d8502e286aac417cf2fbd1", "parents": [ "3868204d6b89ea373a273e760609cb08020beb1a" ], "author": { "name": "Eugenia Emantayev", "email": "eugenia@mellanox.com", "time": "Sun Dec 01 14:19:34 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 01 20:36:07 2013 -0500" }, "message": "net/mlx4_en: Remove selftest TX queues empty condition\n\nRemove waiting for TX queues to become empty during selftest.\nThis check is not necessary for any purpose, and might put\nthe driver into an infinite loop.\n\nSigned-off-by: Eugenia Emantayev \u003ceugenia@mellanox.com\u003e\nSigned-off-by: Amir Vadai \u003camirv@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3868204d6b89ea373a273e760609cb08020beb1a", "tree": "2b4b120d83ea831f0b3bf3b0746311b25fdd3fbd", "parents": [ "f121159d72091f25afb22007c833e60a6845e912" ], "author": { "name": "fan.du", "email": "fan.du@windriver.com", "time": "Sun Dec 01 16:28:48 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 01 20:33:52 2013 -0500" }, "message": "{pktgen, xfrm} Update IPv4 header total len and checksum after tranformation\n\ncommit a553e4a6317b2cfc7659542c10fe43184ffe53da (\"[PKTGEN]: IPSEC support\")\ntried to support IPsec ESP transport transformation for pktgen, but acctually\nthis doesn\u0027t work at all for two reasons(The orignal transformed packet has\nbad IPv4 checksum value, as well as wrong auth value, reported by wireshark)\n\n- After transpormation, IPv4 header total length needs update,\n because encrypted payload\u0027s length is NOT same as that of plain text.\n\n- After transformation, IPv4 checksum needs re-caculate because of payload\n has been changed.\n\nWith this patch, armmed pktgen with below cofiguration, Wireshark is able to\ndecrypted ESP packet generated by pktgen without any IPv4 checksum error or\nauth value error.\n\npgset \"flag IPSEC\"\npgset \"flows 1\"\n\nSigned-off-by: Fan Du \u003cfan.du@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f121159d72091f25afb22007c833e60a6845e912", "tree": "d9570571764a2a1f74e0af9619464228e2af77c6", "parents": [ "8fc3b9e9a229778e5af3aa453c44f1a3857ba769" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 28 13:30:59 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 01 20:27:16 2013 -0500" }, "message": "virtio_net: make all RX paths handle erors consistently\n\nreceive mergeable now handles errors internally.\nDo same for big and small packet paths, otherwise\nthe logic is too hard to follow.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8fc3b9e9a229778e5af3aa453c44f1a3857ba769", "tree": "49d4b6bc829ca1d1cb587b2a6f9acbf82a4ea2bf", "parents": [ "99e872ae1eacb560152c0123cf1cef571569e681" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 28 13:30:55 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 01 20:27:16 2013 -0500" }, "message": "virtio_net: fix error handling for mergeable buffers\n\nEric Dumazet noticed that if we encounter an error\nwhen processing a mergeable buffer, we don\u0027t\ndequeue all of the buffers from this packet,\nthe result is almost sure to be loss of networking.\n\nJason Wang noticed that we also leak a page and that we don\u0027t decrement\nthe rq buf count, so we won\u0027t repost buffers (a resource leak).\n\nFix both issues.\n\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Michael Dalton \u003cmwdalton@google.com\u003e\nReported-by: Eric Dumazet \u003cedumazet@google.com\u003e\nReported-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e84a2a49b9697bdd8f2decf7c56a555a6bc064d8", "tree": "f0866d5f03414e08caf0e15e2ebd3a57f7166138", "parents": [ "1d07489aac5cef3fc87312a6883fb9cb8208c657", "fff6540cbcb56a6ae92d4fd4b0864c8d13a8f932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 01 15:33:53 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 01 15:33:53 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml\n\nPull UML fixes from Richard Weinberger:\n \"Fixes two regressions which got introduced this merge window\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:\n um: Build always with -mcmodel\u003dlarge on 64bit\n um: Rename print_stack_trace to do_stack_trace\n" }, { "commit": "1d07489aac5cef3fc87312a6883fb9cb8208c657", "tree": "c8f686aa6527685cfadc0b56d5ac95a2f8368e2e", "parents": [ "af91706d5ddecb4a9858cca9e90d463037cfd498", "11d4bb1bd067f9d01d18f620ccfad516dc579593" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 01 15:32:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 01 15:32:19 2013 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/~rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Some ARM fixes, the biggest of which is the fix for the signal return\n codes; this came up due to an interaction between the V7M nommu\n changes and the BE8 changes. Dave Martin spotted that the kexec\n trampoline wasn\u0027t being correctly copied (in a way which allows\n Thumb-2 to work).\n\n I\u0027ve also fixed a number of breakages on footbridge platforms as I\u0027ve\n upgraded one of my machines to v3.12... one which had a 1200 day\n uptime\"\n\n* \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/~rmk/linux-arm:\n ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation\n ARM: 7897/1: kexec: Use the right ISA for relocate_new_kernel\n ARM: 7895/1: signal: fix armv7-m build issue in sigreturn_codes.S\n ARM: footbridge: fix EBSA285 LEDs\n ARM: footbridge: fix VGA initialisation\n ARM: fix booting low-vectors machines\n ARM: dma-mapping: check DMA mask against available memory\n" }, { "commit": "fff6540cbcb56a6ae92d4fd4b0864c8d13a8f932", "tree": "3c763c97ef687d10a289410e96894c46930d9477", "parents": [ "8ed12fcc194d93c6a17714120a7027ee4d76a881" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Fri Nov 29 15:39:41 2013 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Sun Dec 01 13:06:51 2013 +0100" }, "message": "um: Build always with -mcmodel\u003dlarge on 64bit\n\nOn UML SUBARCH can be x86, x86_64 and i386 and if it is x86\nwe use uname -m to select a defconfig.\nTherefore we can no longer use -mcmodel\u003dlarge only if SUBARCH\nis x86_64.\n\nReported-and-tested-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "8ed12fcc194d93c6a17714120a7027ee4d76a881", "tree": "fda3975f218874d047f6bf0554e420518f01af1b", "parents": [ "af91706d5ddecb4a9858cca9e90d463037cfd498" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Thu Nov 21 09:27:37 2013 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Sun Dec 01 13:06:51 2013 +0100" }, "message": "um: Rename print_stack_trace to do_stack_trace\n\nWe cannot use print_stack_trace because the name conflicts\nwith linux/stacktrace.h.\n\nReported-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nAcked-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\n" }, { "commit": "11d4bb1bd067f9d01d18f620ccfad516dc579593", "tree": "abd79988692f334730e2c245a5bd8db56b46e03b", "parents": [ "e2ccba49085ab5d71b092de2a5176eb9b19cc876" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Sat Nov 30 15:24:42 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 22:21:03 2013 +0000" }, "message": "ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation\n\nCurrently mx53 (CortexA8) running at 1GHz reports:\nCalibrating delay loop... 663.55 BogoMIPS (lpj\u003d3317760)\n\nTom Evans verified that alignments of 0x0 and 0x8 run the two instructions of __loop_delay in one clock cycle (1 clock/loop), while alignments of 0x4 and 0xc take 3 clocks to run the loop twice. (1.5 clock/loop)\n\nThe original object code looks like this:\n\n00000010 \u003c__loop_const_udelay\u003e:\n 10:\te3e01000 \tmvn\tr1, #0\n 14:\te51f201c \tldr\tr2, [pc, #-28]\t; 0 \u003c__loop_udelay-0x8\u003e\n 18:\te5922000 \tldr\tr2, [r2]\n 1c:\te0800921 \tadd\tr0, r0, r1, lsr #18\n 20:\te1a00720 \tlsr\tr0, r0, #14\n 24:\te0822b21 \tadd\tr2, r2, r1, lsr #22\n 28:\te1a02522 \tlsr\tr2, r2, #10\n 2c:\te0000092 \tmul\tr0, r2, r0\n 30:\te0800d21 \tadd\tr0, r0, r1, lsr #26\n 34:\te1b00320 \tlsrs\tr0, r0, #6\n 38:\t01a0f00e \tmoveq\tpc, lr\n\n0000003c \u003c__loop_delay\u003e:\n 3c:\te2500001 \tsubs\tr0, r0, #1\n 40:\t8afffffe \tbhi\t3c \u003c__loop_delay\u003e\n 44:\te1a0f00e \tmov\tpc, lr\n\nAfter adding the \u0027align 3\u0027 directive to __loop_delay (align to 8 bytes):\n\n00000010 \u003c__loop_const_udelay\u003e:\n 10:\te3e01000 \tmvn\tr1, #0\n 14:\te51f201c \tldr\tr2, [pc, #-28]\t; 0 \u003c__loop_udelay-0x8\u003e\n 18:\te5922000 \tldr\tr2, [r2]\n 1c:\te0800921 \tadd\tr0, r0, r1, lsr #18\n 20:\te1a00720 \tlsr\tr0, r0, #14\n 24:\te0822b21 \tadd\tr2, r2, r1, lsr #22\n 28:\te1a02522 \tlsr\tr2, r2, #10\n 2c:\te0000092 \tmul\tr0, r2, r0\n 30:\te0800d21 \tadd\tr0, r0, r1, lsr #26\n 34:\te1b00320 \tlsrs\tr0, r0, #6\n 38:\t01a0f00e \tmoveq\tpc, lr\n 3c:\te320f000 \tnop\t{0}\n\n00000040 \u003c__loop_delay\u003e:\n 40:\te2500001 \tsubs\tr0, r0, #1\n 44:\t8afffffe \tbhi\t40 \u003c__loop_delay\u003e\n 48:\te1a0f00e \tmov\tpc, lr\n 4c:\te320f000 \tnop\t{0}\n\n, which now reports:\nCalibrating delay loop... 996.14 BogoMIPS (lpj\u003d4980736)\n\nSome more test results:\n\nOn mx31 (ARM1136) running at 532 MHz, before the patch:\nCalibrating delay loop... 351.43 BogoMIPS (lpj\u003d1757184)\n\nOn mx31 (ARM1136) running at 532 MHz after the patch:\nCalibrating delay loop... 528.79 BogoMIPS (lpj\u003d2643968)\n\nAlso tested on mx6 (CortexA9) and on mx27 (ARM926), which shows the same\nBogoMIPS value before and after this patch.\n\nReported-by: Tom Evans \u003ctom_usenet@optusnet.com.au\u003e\nSuggested-by: Tom Evans \u003ctom_usenet@optusnet.com.au\u003e\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e2ccba49085ab5d71b092de2a5176eb9b19cc876", "tree": "bbc2d16349c5f6deef37e2b0dc51422158fa4730", "parents": [ "50913336ef3c9270b5e2b44a5d81230d7db42fc5" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Mon Nov 25 14:54:47 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 22:21:02 2013 +0000" }, "message": "ARM: 7897/1: kexec: Use the right ISA for relocate_new_kernel\n\nCopying a function with memcpy() and then trying to execute the\nresult isn\u0027t trivially portable to Thumb.\n\nThis patch modifies the kexec soft restart code to copy its\nassembler trampoline relocate_new_kernel() using fncpy() instead,\nso that relocate_new_kernel can be in the same ISA as the rest of\nthe kernel without problems.\n\nSigned-off-by: Dave Martin \u003cDave.Martin@arm.com\u003e\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nReported-by: Taras Kondratiuk \u003ctaras.kondratiuk@linaro.org\u003e\nTested-by: Taras Kondratiuk \u003ctaras.kondratiuk@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "50913336ef3c9270b5e2b44a5d81230d7db42fc5", "tree": "bba7eea0d1980d62872d267e312f5a41fa72b973", "parents": [ "67130c5464f50428aea0b4526a6729d61f9a1d53" ], "author": { "name": "Victor Kamensky", "email": "victor.kamensky@linaro.org", "time": "Thu Nov 21 07:17:03 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 22:21:00 2013 +0000" }, "message": "ARM: 7895/1: signal: fix armv7-m build issue in sigreturn_codes.S\n\nAfter \"ARM: signal: sigreturn_codes should be endian neutral to\nwork in BE8\" commit, thumb only platforms, like armv7m, fails to\ncompile sigreturn_codes.S. The reason is that for such arch\nvalues \u0027.arm\u0027 directive and arm opcodes are not allowed.\n\nFix conditionally enables arm opcodes only if no CONFIG_CPU_THUMBONLY\ndefined and it uses .org instructions to keep sigreturn_codes\nlayout.\n\nSuggested-by: Dave Martin \u003cDave.Martin@arm.com\u003e\nSigned-off-by: Victor Kamensky \u003cvictor.kamensky@linaro.org\u003e\nTested-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nReviewed-by: Dave Martin \u003cDave.Martin@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "67130c5464f50428aea0b4526a6729d61f9a1d53", "tree": "3191c3489e4add6c417f3ee483e5c9a7207cf1cf", "parents": [ "43659222e7a0113912ed02f6b2231550b3e471ac" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Nov 29 00:54:38 2013 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 22:20:59 2013 +0000" }, "message": "ARM: footbridge: fix EBSA285 LEDs\n\n- The LEDs register is write-only: it can\u0027t be read-modify-written.\n- The LEDs are write-1-for-off not 0.\n- The check for the platform was inverted.\n\nFixes: cf6856d693dd (\"ARM: mach-footbridge: retire custom LED code\")\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "b8d8fccd68c36a19fef9768d06aa150bbc8cdd74", "tree": "e7a6917978fb6af1610806f77b07b1281cc7425f", "parents": [ "161bd3bf60ee2c5765455ad3e3da967d03449f4a" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 22:22:08 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 22:22:08 2013 +0100" }, "message": "parisc: remove CONFIG_MLONGCALLS\u003dy from defconfigs\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "99e872ae1eacb560152c0123cf1cef571569e681", "tree": "6725f2f55156d09f0d6a447f3196f52cc2d0c304", "parents": [ "eff7979f00b2c546f36f6829f4072c8db54763a9" ], "author": { "name": "Thomas Huth", "email": "thuth@linux.vnet.ibm.com", "time": "Fri Nov 29 10:02:19 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 16:14:24 2013 -0500" }, "message": "virtio_net: Fixed a trivial typo (fitler --\u003e filter)\n\n\"MAC filter\" sounds more reasonable than \"MAC fitler\".\n\nSigned-off-by: Thomas Huth \u003cthuth@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "161bd3bf60ee2c5765455ad3e3da967d03449f4a", "tree": "5287e2c53bdc876b7bf2660237dc926efcb50d9c", "parents": [ "c790b41bac83512dc67da89b582daa6f4e1fab07" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 22:07:51 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 22:09:21 2013 +0100" }, "message": "parisc: fix kernel memory layout in vmlinux.ld.S\n\nWhen building a 64bit kernel sometimes functions in the .init section were not\nable to reach the standard kernel function. Main reason for this problem is,\nthat the linkage tables (.plt, .opd, .dlt) tend to become pretty huge and thus\nthe distance gets too big for short calls.\n\nOne option to avoid this is to use the -mlong-calls compiler option, but this\nincreases the binary size and introduces a performance penalty.\n\nInstead, with this patch we just lay out the binary differently. Init code is\nstored first, followed by text, R/O and finally R/W data. This means, that init\nand text code is now much closer to each other, which is sufficient to reach\neach other by short calls.\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "c790b41bac83512dc67da89b582daa6f4e1fab07", "tree": "9aa73679dbc5d78ce9a57eeed1ee3a75b65c4c30", "parents": [ "6c3215cd5d31584c8ae77a99255c72dba2565918" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 21:23:20 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 22:08:54 2013 +0100" }, "message": "parisc: use kernel_text_address() in unwind functions\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "6c3215cd5d31584c8ae77a99255c72dba2565918", "tree": "020e390dd5354353a6a8db7108fe07aaf653bb9d", "parents": [ "8f96bdfd6f545b0a999cf97625b5bf8a23014a2d" ], "author": { "name": "Chen Gang", "email": "gang.chen@asianux.com", "time": "Thu Oct 31 15:37:46 2013 +0800" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 21:02:18 2013 +0100" }, "message": "parisc: remove empty SERIAL_PORT_DFNS in serial.h\n\nIf architectures don\u0027t support SERIAL_PORT_DFNS, they need not define it\nto \"nothing\", the related drivers need do it by themselves (e.g. 8250\nserial driver).\n\nSigned-off-by: Chen Gang \u003cgang.chen@asianux.com\u003e\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "8f96bdfd6f545b0a999cf97625b5bf8a23014a2d", "tree": "d6da3f4192ec5cae94193cdb48a994316430d205", "parents": [ "0576da2c08e3d332f1b0653030d28ab804585ab6" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 23 00:25:43 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 21:00:14 2013 +0100" }, "message": "parisc: add some more machine names to hardware database\n\nSadly the correct names for machines which end with a question-mark aren\u0027t\nknown, so let\u0027s give it a best-guessed-name.\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\n" }, { "commit": "0576da2c08e3d332f1b0653030d28ab804585ab6", "tree": "6fba568d4bbb0a32989ea68dedca00cfcc75f99f", "parents": [ "dc1ccc48159d63eca5089e507c82c7d22ef60839" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Wed Nov 20 23:07:42 2013 +0100" }, "committer": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Sat Nov 30 20:57:50 2013 +0100" }, "message": "parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address\n\nlocale-gen on Debian showed a strange problem on parisc:\nmmap2(NULL, 536870912, PROT_NONE, MAP_SHARED, 3, 0) \u003d 0x42a54000\nmmap2(0x42a54000, 103860, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, 3, 0) \u003d -1 EINVAL (Invalid argument)\n\nBasically it was just trying to re-mmap() a file at the same address\nwhich it was given by a previous mmap() call. But this remapping failed\nwith EINVAL.\n\nThe problem is, that when MAP_FIXED and MAP_SHARED flags were used, we didn\u0027t\nincluded the mapping-based offset when we verified the alignment of the given\nfixed address against the offset which we calculated it in the previous call.\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.10+\n" }, { "commit": "eff7979f00b2c546f36f6829f4072c8db54763a9", "tree": "9cf1f1f79e84513e1a8f6c2101aabc2a17ccb3df", "parents": [ "ab6c27be8178a4682446faa5aa017b948997937f" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri Nov 29 11:04:26 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:49:29 2013 -0500" }, "message": "netem: fix gemodel loss generator\n\nPatch from developers of the alternative loss models, downloaded from:\n http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG\n\n \"in case 2, of the switch we change the direction of the inequality to\n net_random()\u003eclg-\u003ea3, because clg-\u003ea3 is h in the GE model and when h\n is 0 all packets will be lost.\"\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab6c27be8178a4682446faa5aa017b948997937f", "tree": "2159be97daea3dc8980376ff13dc7b90c140ca4e", "parents": [ "7c2781fa92f5b9ca3188817a56a2ced0400355f3" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri Nov 29 11:03:35 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:49:28 2013 -0500" }, "message": "netem: fix loss 4 state model\n\nPatch from developers of the alternative loss models, downloaded from:\n http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG\n\n \"In the case 1 of the switch statement in the if conditions we\n need to add clg-\u003ea4 to clg-\u003ea1, according to the model.\"\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c2781fa92f5b9ca3188817a56a2ced0400355f3", "tree": "56c74f89a51e9c1a3796a3df2d95c0ffdeb42b8b", "parents": [ "98bf8362220af717862b8262b21348774890b7b4" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri Nov 29 11:02:43 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:49:28 2013 -0500" }, "message": "netem: missing break in ge loss generator\n\nThere is a missing break statement in the Gilbert Elliot loss model\ngenerator which makes state machine behave incorrectly.\n\nReported-by: Martin Burri \u003cmartin.burri@ch.abb.com\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98bf8362220af717862b8262b21348774890b7b4", "tree": "35fdc9821c93fe29d6209c1aa12fe238bc876d2a", "parents": [ "213e3bc723e53af0976421d2808ea3f6cc821c56" ], "author": { "name": "Arvid Brodin", "email": "arvid.brodin@alten.se", "time": "Fri Nov 29 23:38:16 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:48:14 2013 -0500" }, "message": "net/hsr: Support iproute print_opt (\u0027ip -details ...\u0027)\n\nThis implements the rtnl_link_ops fill_info routine for HSR.\n\nSigned-off-by: Arvid Brodin \u003carvid.brodin@alten.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "213e3bc723e53af0976421d2808ea3f6cc821c56", "tree": "4ba1e9f9cdcb1bca5d56895e4194f0373a627d7a", "parents": [ "19990e29fedc2fe7056e66da31364978d49ea1e1" ], "author": { "name": "Arvid Brodin", "email": "arvid.brodin@alten.se", "time": "Fri Nov 29 23:37:07 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:48:13 2013 -0500" }, "message": "net/hsr: Very small fix of comment style.\n\nSigned-off-by: Arvid Brodin \u003carvid.brodin@alten.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19990e29fedc2fe7056e66da31364978d49ea1e1", "tree": "0e2d60bfb76321ff3988b50a48ff85ea67507419", "parents": [ "7f88c6b23afbd31545c676dea77ba9593a1a14bf" ], "author": { "name": "Arvid Brodin", "email": "arvid.brodin@alten.se", "time": "Fri Nov 29 23:36:00 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:48:13 2013 -0500" }, "message": "MAINTAINERS: Added net/hsr/ maintainer\n\nSigned-off-by: Arvid Brodin \u003carvid.brodin@alten.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f88c6b23afbd31545c676dea77ba9593a1a14bf", "tree": "632026254bc2ca731676e4327381dbe265153f76", "parents": [ "696701b89d44c636c800a9b98f4a6a8015a6e1c4" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Fri Nov 29 06:39:44 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:48:13 2013 -0500" }, "message": "ipv6: fix possible seqlock deadlock in ip6_finish_output2\n\nIPv6 stats are 64 bits and thus are protected with a seqlock. By not\ndisabling bottom-half we could deadlock here if we don\u0027t disable bh and\na softirq reentrantly updates the same mib.\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "696701b89d44c636c800a9b98f4a6a8015a6e1c4", "tree": "e1992698bfdf8adde9c288d6830caf9e2b098cb8", "parents": [ "f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76", "8821754704a661623083a9dedf425114199600ba" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:42:20 2013 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 30 12:42:20 2013 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net\n\nJeff Kirsher says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nIntel Wired LAN Driver Updates\n\nThis series contains updates to igb, e1000 and ixgbe.\n\nAkeem provides a igb fix where WOL was being reported as supported on\nsome ethernet devices which did not have that capability.\n\nYanjun provides a fix for e1000 which is similar to a previous fix\nfor e1000e commit bb9e44d0d0f4 (\"e1000e: prevent oops when adapter is\nbeing closed and reset simultaneously\"), where the same issue was\nobserved on the older e1000 cards.\n\nVladimir Davydov provides 2 e1000 fixes. The first fixes a lockdep\nwarning e1000_down() tries to synchronously cancel e1000 auxiliary\nworks (reset_task, watchdog_task, phy_info_task and fifo_stall_task)\nwhich take adapter-\u003emutex in their handlers. The second patch is to\nfix a possible race condition where reset_task() would be running\nafter adapter down.\n\nJohn provides 2 fixes for ixgbe. First turns ixgbe_fwd_ring_down\nto static and the second disables NETIF_F_HW_L2FW_DOFFLOAD by default\nbecause it allows upper layer net devices to use queues in the hardware\nto directly submit and receive skbs.\n\nMark Rustad provides a single patch for ixgbe to make\nixgbe_identify_qsfp_module_generic static to resolve compile\nwarnings.\n\nv2: Drop igb patch \"igb: Update queue reinit function to call dev_close\n when init of queues fails\" from Carolyn, so that the solution can\n be re-worked based on feedback from David Miller.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43659222e7a0113912ed02f6b2231550b3e471ac", "tree": "104877e158753381439607568c968250a3f575cd", "parents": [ "d8aa712c30148ba26fd89a5dc14de95d4c375184" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Nov 28 21:55:41 2013 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 14:45:32 2013 +0000" }, "message": "ARM: footbridge: fix VGA initialisation\n\nIt\u0027s no good setting vga_base after the VGA console has been\ninitialised, because if we do that we get this:\n\nUnable to handle kernel paging request at virtual address 000b8000\npgd \u003d c0004000\n[000b8000] *pgd\u003d07ffc831, *pte\u003d00000000, *ppte\u003d00000000\n0Internal error: Oops: 5017 [#1] ARM\nModules linked in:\nCPU: 0 PID: 0 Comm: swapper Not tainted 3.12.0+ #49\ntask: c03e2974 ti: c03d8000 task.ti: c03d8000\nPC is at vgacon_startup+0x258/0x39c\nLR is at request_resource+0x10/0x1c\npc : [\u003cc01725d0\u003e] lr : [\u003cc0022b50\u003e] psr: 60000053\nsp : c03d9f68 ip : 000b8000 fp : c03d9f8c\nr10: 000055aa r9 : 4401a103 r8 : ffffaa55\nr7 : c03e357c r6 : c051b460 r5 : 000000ff r4 : 000c0000\nr3 : 000b8000 r2 : c03e0514 r1 : 00000000 r0 : c0304971\nFlags: nZCv IRQs on FIQs off Mode SVC_32 ISA ARM Segment kernel\n\nwhich is an access to the 0xb8000 without the PCI offset required to\nmake it work.\n\nFixes: cc22b4c18540 (\"ARM: set vga memory base at run-time\")\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "d8aa712c30148ba26fd89a5dc14de95d4c375184", "tree": "61f15d12929d3dd19dbf0589035777cb2751a476", "parents": [ "11a5aa32562e1e90ab2d0278748fe0fbecda1cbe" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Nov 28 21:43:40 2013 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 14:45:31 2013 +0000" }, "message": "ARM: fix booting low-vectors machines\n\nCommit f6f91b0d9fd9 (ARM: allow kuser helpers to be removed from the\nvector page) required two pages for the vectors code. Although the\ncode setting up the initial page tables was updated, the code which\nallocates page tables for new processes wasn\u0027t, neither was the code\nwhich tears down the mappings. Fix this.\n\nFixes: f6f91b0d9fd9 (\"ARM: allow kuser helpers to be removed from the vector page\")\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "11a5aa32562e1e90ab2d0278748fe0fbecda1cbe", "tree": "e95ebca5e90b3afb5dd1d75bab11c5230542ffc4", "parents": [ "6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Nov 25 21:52:25 2013 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 30 14:45:29 2013 +0000" }, "message": "ARM: dma-mapping: check DMA mask against available memory\n\nSome buses have negative offsets, which causes the DMA mask checks to\nfalsely fail. Fix this by using the actual amount of memory fitted in\nthe system.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8821754704a661623083a9dedf425114199600ba", "tree": "e1992698bfdf8adde9c288d6830caf9e2b098cb8", "parents": [ "8bf1264d2f12c6fa8645d097275568c1b62c246c" ], "author": { "name": "Mark Rustad", "email": "mark.d.rustad@intel.com", "time": "Sat Nov 23 03:19:19 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat Nov 30 00:21:47 2013 -0800" }, "message": "ixgbe: Make ixgbe_identify_qsfp_module_generic static\n\nCorrect a namespace complaint by making the function static\nand moving the prototype into the .c file.\n\nSigned-off-by: Mark Rustad \u003cmark.d.rustad@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "8bf1264d2f12c6fa8645d097275568c1b62c246c", "tree": "152dbc057cf5e383412c9a5ebddef266c7b89dce", "parents": [ "ae72c8d068b3440c0b45df284303794cfbc0f4f2" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Tue Nov 12 12:13:29 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat Nov 30 00:15:16 2013 -0800" }, "message": "ixgbe: turn NETIF_F_HW_L2FW_DOFFLOAD off by default\n\nNETIF_F_HW_L2FW_DOFFLOAD allows upper layer net devices such\nas macvlan to use queues in the hardware to directly submit and\nreceive skbs.\n\nThis creates a subtle change in the datapath though. One change\nbeing the skb may no longer use the root devices qdisc.\n\nBecause users may not expect this we can\u0027t enable the feature\nby default unless the hardware can offload all the software\nfunctionality above it. So for now disable it by default and\nlet users opt in.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ae72c8d068b3440c0b45df284303794cfbc0f4f2", "tree": "cbc6853828db180ea2ccbfcf8db6643858db7ce8", "parents": [ "74a1b1ea8a30b035aaad833bbd6b9263e72acfac" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Nov 09 07:11:26 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat Nov 30 00:08:45 2013 -0800" }, "message": "ixgbe: ixgbe_fwd_ring_down needs to be static\n\nWhen compiling with -Wstrict-prototypes gcc catches a static\nI missed.\n\n./ixgbe_main.c:4254: warning: no previous prototype for \u0027ixgbe_fwd_ring_down\u0027\n\nReported-by: Phillip Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Phil Schmitt \u003cphillip.j.schmitt@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "74a1b1ea8a30b035aaad833bbd6b9263e72acfac", "tree": "fe53864a1d67a052ebdf7f2730aa6e3a8be638de", "parents": [ "b2f963bfaebadc9117b29f806630ea3bcaec403d" ], "author": { "name": "Vladimir Davydov", "email": "VDavydov@parallels.com", "time": "Sat Nov 23 07:18:01 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat Nov 30 00:02:12 2013 -0800" }, "message": "e1000: fix possible reset_task running after adapter down\n\nOn e1000_down(), we should ensure every asynchronous work is canceled\nbefore proceeding. Since the watchdog_task can schedule other works\napart from itself, it should be stopped first, but currently it is\nstopped after the reset_task. This can result in the following race\nleading to the reset_task running after the module unload:\n\ne1000_down_and_stop():\t\t\te1000_watchdog():\n----------------------\t\t\t-----------------\n\ncancel_work_sync(reset_task)\n\t\t\t\t\tschedule_work(reset_task)\ncancel_delayed_work_sync(watchdog_task)\n\nThe patch moves cancel_delayed_work_sync(watchdog_task) at the beginning\nof e1000_down_and_stop() thus ensuring the race is impossible.\n\nCc: Tushar Dave \u003ctushar.n.dave@intel.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Vladimir Davydov \u003cvdavydov@parallels.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "b2f963bfaebadc9117b29f806630ea3bcaec403d", "tree": "3c43790c0264ce2585e5be7be5d0485f2278a99c", "parents": [ "6a7d64e3e09e11181a07a2e8cd6af5d6355133be" ], "author": { "name": "Vladimir Davydov", "email": "VDavydov@parallels.com", "time": "Sat Nov 23 07:17:56 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Nov 29 23:55:40 2013 -0800" }, "message": "e1000: fix lockdep warning in e1000_reset_task\n\nThe patch fixes the following lockdep warning, which is 100%\nreproducible on network restart:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: possible circular locking dependency detected ]\n3.12.0+ #47 Tainted: GF\n-------------------------------------------------------\nkworker/1:1/27 is trying to acquire lock:\n ((\u0026(\u0026adapter-\u003ewatchdog_task)-\u003ework)){+.+...}, at: [\u003cffffffff8108a5b0\u003e] flush_work+0x0/0x70\n\nbut task is already holding lock:\n (\u0026adapter-\u003emutex){+.+...}, at: [\u003cffffffffa0177c0a\u003e] e1000_reset_task+0x4a/0xa0 [e1000]\n\nwhich lock already depends on the new lock.\n\nthe existing dependency chain (in reverse order) is:\n\n-\u003e #1 (\u0026adapter-\u003emutex){+.+...}:\n [\u003cffffffff810bdb5d\u003e] lock_acquire+0x9d/0x120\n [\u003cffffffff816b8cbc\u003e] mutex_lock_nested+0x4c/0x390\n [\u003cffffffffa017233d\u003e] e1000_watchdog+0x7d/0x5b0 [e1000]\n [\u003cffffffff8108b972\u003e] process_one_work+0x1d2/0x510\n [\u003cffffffff8108ca80\u003e] worker_thread+0x120/0x3a0\n [\u003cffffffff81092c1e\u003e] kthread+0xee/0x110\n [\u003cffffffff816c3d7c\u003e] ret_from_fork+0x7c/0xb0\n\n-\u003e #0 ((\u0026(\u0026adapter-\u003ewatchdog_task)-\u003ework)){+.+...}:\n [\u003cffffffff810bd9c0\u003e] __lock_acquire+0x1710/0x1810\n [\u003cffffffff810bdb5d\u003e] lock_acquire+0x9d/0x120\n [\u003cffffffff8108a5eb\u003e] flush_work+0x3b/0x70\n [\u003cffffffff8108b5d8\u003e] __cancel_work_timer+0x98/0x140\n [\u003cffffffff8108b693\u003e] cancel_delayed_work_sync+0x13/0x20\n [\u003cffffffffa0170cec\u003e] e1000_down_and_stop+0x3c/0x60 [e1000]\n [\u003cffffffffa01775b1\u003e] e1000_down+0x131/0x220 [e1000]\n [\u003cffffffffa0177c12\u003e] e1000_reset_task+0x52/0xa0 [e1000]\n [\u003cffffffff8108b972\u003e] process_one_work+0x1d2/0x510\n [\u003cffffffff8108ca80\u003e] worker_thread+0x120/0x3a0\n [\u003cffffffff81092c1e\u003e] kthread+0xee/0x110\n [\u003cffffffff816c3d7c\u003e] ret_from_fork+0x7c/0xb0\n\nother info that might help us debug this:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(\u0026adapter-\u003emutex);\n lock((\u0026(\u0026adapter-\u003ewatchdog_task)-\u003ework));\n lock(\u0026adapter-\u003emutex);\n lock((\u0026(\u0026adapter-\u003ewatchdog_task)-\u003ework));\n\n *** DEADLOCK ***\n\n3 locks held by kworker/1:1/27:\n #0: (events){.+.+.+}, at: [\u003cffffffff8108b906\u003e] process_one_work+0x166/0x510\n #1: ((\u0026adapter-\u003ereset_task)){+.+...}, at: [\u003cffffffff8108b906\u003e] process_one_work+0x166/0x510\n #2: (\u0026adapter-\u003emutex){+.+...}, at: [\u003cffffffffa0177c0a\u003e] e1000_reset_task+0x4a/0xa0 [e1000]\n\nstack backtrace:\nCPU: 1 PID: 27 Comm: kworker/1:1 Tainted: GF 3.12.0+ #47\nHardware name: System manufacturer System Product Name/P5B-VM SE, BIOS 0501 05/31/2007\nWorkqueue: events e1000_reset_task [e1000]\n ffffffff820f6000 ffff88007b9dba98 ffffffff816b54a2 0000000000000002\n ffffffff820f5e50 ffff88007b9dbae8 ffffffff810ba936 ffff88007b9dbac8\n ffff88007b9dbb48 ffff88007b9d8f00 ffff88007b9d8780 ffff88007b9d8f00\nCall Trace:\n [\u003cffffffff816b54a2\u003e] dump_stack+0x49/0x5f\n [\u003cffffffff810ba936\u003e] print_circular_bug+0x216/0x310\n [\u003cffffffff810bd9c0\u003e] __lock_acquire+0x1710/0x1810\n [\u003cffffffff8108a5b0\u003e] ? __flush_work+0x250/0x250\n [\u003cffffffff810bdb5d\u003e] lock_acquire+0x9d/0x120\n [\u003cffffffff8108a5b0\u003e] ? __flush_work+0x250/0x250\n [\u003cffffffff8108a5eb\u003e] flush_work+0x3b/0x70\n [\u003cffffffff8108a5b0\u003e] ? __flush_work+0x250/0x250\n [\u003cffffffff8108b5d8\u003e] __cancel_work_timer+0x98/0x140\n [\u003cffffffff8108b693\u003e] cancel_delayed_work_sync+0x13/0x20\n [\u003cffffffffa0170cec\u003e] e1000_down_and_stop+0x3c/0x60 [e1000]\n [\u003cffffffffa01775b1\u003e] e1000_down+0x131/0x220 [e1000]\n [\u003cffffffffa0177c12\u003e] e1000_reset_task+0x52/0xa0 [e1000]\n [\u003cffffffff8108b972\u003e] process_one_work+0x1d2/0x510\n [\u003cffffffff8108b906\u003e] ? process_one_work+0x166/0x510\n [\u003cffffffff8108ca80\u003e] worker_thread+0x120/0x3a0\n [\u003cffffffff8108c960\u003e] ? manage_workers+0x2c0/0x2c0\n [\u003cffffffff81092c1e\u003e] kthread+0xee/0x110\n [\u003cffffffff81092b30\u003e] ? __init_kthread_worker+0x70/0x70\n [\u003cffffffff816c3d7c\u003e] ret_from_fork+0x7c/0xb0\n [\u003cffffffff81092b30\u003e] ? __init_kthread_worker+0x70/0x70\n\n\u003d\u003d The issue background \u003d\u003d\n\nThe problem occurs, because e1000_down(), which is called under\nadapter-\u003emutex by e1000_reset_task(), tries to synchronously cancel\ne1000 auxiliary works (reset_task, watchdog_task, phy_info_task,\nfifo_stall_task), which take adapter-\u003emutex in their handlers. So the\nquestion is what does adapter-\u003emutex protect there?\n\nThe adapter-\u003emutex was introduced by commit 0ef4ee (\"e1000: convert to\nprivate mutex from rtnl\") as a replacement for rtnl_lock() taken in the\nasynchronous handlers. It targeted on fixing a similar lockdep warning\nissued when e1000_down() was called under rtnl_lock(), and it fixed it,\nbut unfortunately it introduced the lockdep warning described above.\nAnyway, that said the source of this bug is that the asynchronous works\nwere made to take rtnl_lock() some time ago, so let\u0027s look deeper and\nfind why it was added there.\n\nThe rtnl_lock() was added to asynchronous handlers by commit 338c15\n(\"e1000: fix occasional panic on unload\") in order to prevent\nasynchronous handlers from execution after the module is unloaded\n(e1000_down() is called) as it follows from the comment to the commit:\n\n\u003e Net drivers in general have an issue where timers fired\n\u003e by mod_timer or work threads with schedule_work are running\n\u003e outside of the rtnl_lock.\n\u003e\n\u003e With no other lock protection these routines are vulnerable\n\u003e to races with driver unload or reset paths.\n\u003e\n\u003e The longer term solution to this might be a redesign with\n\u003e safer locks being taken in the driver to guarantee no\n\u003e reentrance, but for now a safe and effective fix is\n\u003e to take the rtnl_lock in these routines.\n\nI\u0027m not sure if this locking scheme fixed the problem or just made it\nunlikely, although I incline to the latter. Anyway, this was long time\nago when e1000 auxiliary works were implemented as timers scheduling\nreal work handlers in their routines. The e1000_down() function only\ncanceled the timers, but left the real handlers running if they were\nrunning, which could result in work execution after module unload.\nToday, the e1000 driver uses sane delayed works instead of the pair\ntimer+work to implement its delayed asynchronous handlers, and the\ne1000_down() synchronously cancels all the works so that the problem\nthat commit 338c15 tried to cope with disappeared, and we don\u0027t need any\nlocks in the handlers any more. Moreover, any locking there can\npotentially result in a deadlock.\n\nSo, this patch reverts commits 0ef4ee and 338c15.\n\nFixes: 0ef4eedc2e98 (\"e1000: convert to private mutex from rtnl\")\nFixes: 338c15e470d8 (\"e1000: fix occasional panic on unload\")\nCc: Tushar Dave \u003ctushar.n.dave@intel.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Vladimir Davydov \u003cvdavydov@parallels.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6a7d64e3e09e11181a07a2e8cd6af5d6355133be", "tree": "0ef4b84399d23e585d740aea769cd9ed37361f58", "parents": [ "42ce4126d8bc2e128e1f207cf79bb0623fac498f" ], "author": { "name": "yzhu1", "email": "yanjun.zhu@windriver.com", "time": "Sat Nov 23 07:07:40 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Nov 29 23:49:05 2013 -0800" }, "message": "e1000: prevent oops when adapter is being closed and reset simultaneously\n\nThis change is based on a similar change made to e1000e support in\ncommit bb9e44d0d0f4 (\"e1000e: prevent oops when adapter is being closed\nand reset simultaneously\"). The same issue has also been observed\non the older e1000 cards.\n\nHere, we have increased the RESET_COUNT value to 50 because there are too\nmany accesses to e1000 nic on stress tests to e1000 nic, it is not enough\nto set RESET_COUT 25. Experimentation has shown that it is enough to set\nRESET_COUNT 50.\n\nSigned-off-by: yzhu1 \u003cyanjun.zhu@windriver.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "42ce4126d8bc2e128e1f207cf79bb0623fac498f", "tree": "e3b3b8e53ae62344c352047595a1917ae440e3b0", "parents": [ "f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76" ], "author": { "name": "Akeem G Abodunrin", "email": "akeem.g.abodunrin@intel.com", "time": "Fri Nov 08 01:54:07 2013 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Nov 29 23:42:35 2013 -0800" }, "message": "igb: Fixed Wake On LAN support\n\nThis patch fixes Wake on LAN being reported as supported on some Ethernet\nports, in contrary to Hardware capability.\n\nSigned-off-by: Akeem G Abodunrin \u003cakeem.g.abodunrin@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "af91706d5ddecb4a9858cca9e90d463037cfd498", "tree": "6deb94f92beb6a51eadad053ded7da136847062f", "parents": [ "dc1ccc48159d63eca5089e507c82c7d22ef60839" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Wed Nov 27 14:40:41 2013 +0100" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Nov 30 13:09:53 2013 +1100" }, "message": "ima: store address of template_fmt_copy in a pointer before calling strsep\n\nThis patch stores the address of the \u0027template_fmt_copy\u0027 variable in a new\nvariable, called \u0027template_fmt_ptr\u0027, so that the latter is passed as an\nargument of strsep() instead of the former. This modification is needed\nin order to correctly free the memory area referenced by\n\u0027template_fmt_copy\u0027 (strsep() modifies the pointer of the passed string).\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nReported-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "f1d8cba61c3c4b1eb88e507249c4cb8d635d9a76", "tree": "6938dd6d189b1a77cc5d10d55ad2d798f79d9b54", "parents": [ "f5e0d34382e18f396d7673a84df8e3342bea7eb6" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Nov 28 09:51:22 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:37:36 2013 -0500" }, "message": "inet: fix possible seqlock deadlocks\n\nIn commit c9e9042994d3 (\"ipv4: fix possible seqlock deadlock\") I left\nanother places where IP_INC_STATS_BH() were improperly used.\n\nudp_sendmsg(), ping_v4_sendmsg() and tcp_v4_connect() are called from\nprocess context, not from softirq context.\n\nThis was detected by lockdep seqlock support.\n\nReported-by: jongman heo \u003cjongman.heo@samsung.com\u003e\nFixes: 584bdf8cbdf6 (\"[IPV4]: Fix \"ipOutNoRoutes\" counter error for TCP and UDP\")\nFixes: c319b4d76b9e (\"net: ipv4: add IPPROTO_ICMP socket kind\")\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5e0d34382e18f396d7673a84df8e3342bea7eb6", "tree": "9c72ed100c60d42dbada63d3a42966a9099881e9", "parents": [ "d3f7d56a7a4671d395e8af87071068a195257bf6" ], "author": { "name": "Jiri Pirko", "email": "jiri@resnulli.us", "time": "Thu Nov 28 18:01:38 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:34:33 2013 -0500" }, "message": "team: fix master carrier set when user linkup is enabled\n\nWhen user linkup is enabled and user sets linkup of individual port,\nwe need to recompute linkup (carrier) of master interface so the change\nis reflected. Fix this by calling __team_carrier_check() which does the\nneeded work.\n\nPlease apply to all stable kernels as well. Thanks.\n\nReported-by: Jan Tluka \u003cjtluka@redhat.com\u003e\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3f7d56a7a4671d395e8af87071068a195257bf6", "tree": "4c76149ebe359812028538bebc5f5dff8f0760a7", "parents": [ "85493e6dd42dcaf0eaf0a19f12f1295e35cc3b7f" ], "author": { "name": "Shawn Landden", "email": "shawn@churchofgit.com", "time": "Sun Nov 24 22:36:28 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:32:54 2013 -0500" }, "message": "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST\n\nCommit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once)\nadded an internal flag MSG_SENDPAGE_NOTLAST, similar to\nMSG_MORE.\n\nalgif_hash, algif_skcipher, and udp used MSG_MORE from tcp_sendpages()\nand need to see the new flag as identical to MSG_MORE.\n\nThis fixes sendfile() on AF_ALG.\n\nv3: also fix udp\n\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.4.x + 3.2.x\nReported-and-tested-by: Shawn Landden \u003cshawnlandden@gmail.com\u003e\nOriginal-patch: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: Shawn Landden \u003cshawn@churchofgit.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "85493e6dd42dcaf0eaf0a19f12f1295e35cc3b7f", "tree": "c6f26f8195e7e54301e71d3727a0c20142d2b08f", "parents": [ "a0c20fb02592d372e744d1d739cda3e1b3defaae" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Wed Nov 27 18:54:31 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:26:16 2013 -0500" }, "message": "sfc: Convert to use hwmon_device_register_with_groups\n\nSimplify the code. Avoid race conditions caused by attributes\nbeing created after hwmon device registration. Implicitly\n(through hwmon API) add mandatory \u0027name\u0027 sysfs attribute.\n\nReviewed-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0c20fb02592d372e744d1d739cda3e1b3defaae", "tree": "eaac47e0b57cbf5f1a5fc6c92ce7bf216bd52764", "parents": [ "9d38d28bd211451533d7a0d1de57485aaf86d00a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Nov 28 14:33:52 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:23:35 2013 -0500" }, "message": "net: smc91: fix crash regression on the versatile\n\nAfter commit e9e4ea74f06635f2ffc1dffe5ef40c854faa0a90\n\"net: smc91x: dont\u0027t use SMC_outw for fixing up halfword-aligned data\"\nThe Versatile SMSC LAN91C111 is crashing like this:\n\n------------[ cut here ]------------\nkernel BUG at /home/linus/linux/drivers/net/ethernet/smsc/smc91x.c:599!\nInternal error: Oops - BUG: 0 [#1] ARM\nModules linked in:\nCPU: 0 PID: 43 Comm: udhcpc Not tainted 3.13.0-rc1+ #24\ntask: c6ccfaa0 ti: c6cd0000 task.ti: c6cd0000\nPC is at smc_hardware_send_pkt+0x198/0x22c\nLR is at smc_hardware_send_pkt+0x24/0x22c\npc : [\u003cc01be324\u003e] lr : [\u003cc01be1b0\u003e] psr: 20000013\nsp : c6cd1d08 ip : 00000001 fp : 00000000\nr10: c02adb08 r9 : 00000000 r8 : c6ced802\nr7 : c786fba0 r6 : 00000146 r5 : c8800000 r4 : c78d6000\nr3 : 0000000f r2 : 00000146 r1 : 00000000 r0 : 00000031\nFlags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user\nControl: 0005317f Table: 06cf4000 DAC: 00000015\nProcess udhcpc (pid: 43, stack limit \u003d 0xc6cd01c0)\nStack: (0xc6cd1d08 to 0xc6cd2000)\n1d00: 00000010 c8800000 c78d6000 c786fba0 c78d6000 c01be868\n1d20: c01be7a4 00004000 00000000 c786fba0 c6c12b80 c0208554 000004d0 c780fc60\n1d40: 00000220 c01fb734 00000000 00000000 00000000 c6c9a440 c6c12b80 c78d6000\n1d60: c786fba0 c6c9a440 00000000 c021d1d8 00000000 00000000 c6c12b80 c78d6000\n1d80: c786fba0 00000001 c6c9a440 c02087f8 c6c9a4a0 00080008 00000000 00000000\n1da0: c78d6000 c786fba0 c78d6000 00000138 00000000 00000000 00000000 00000000\n1dc0: 00000000 c027ba74 00000138 00000138 00000001 00000010 c6cedc00 00000000\n1de0: 00000008 c7404400 c6cd1eec c6cd1f14 c067a73c c065c0b8 00000000 c067a740\n1e00: 01ffffff 002040d0 00000000 00000000 00000000 00000000 00000000 ffffffff\n1e20: 43004400 00110022 c6cdef20 c027ae8c c6ccfaa0 be82d65c 00000014 be82d3cc\n1e40: 00000000 00000000 00000000 c01f2870 00000000 00000000 00000000 c6cd1e88\n1e60: c6ccfaa0 00000000 00000000 00000000 00000000 00000000 00000000 00000000\n1e80: 00000000 00000000 00000031 c7802310 c7802300 00000138 c7404400 c0771da0\n1ea0: 00000000 c6cd1eec c7800340 00000138 be82d65c 00000014 be82d3cc c6cd1f08\n1ec0: 00000014 00000000 c7404400 c7404400 00000138 c01f4628 c78d6000 00000000\n1ee0: 00000000 be82d3cc 00000138 c6cd1f08 00000014 c6cd1ee4 00000001 00000000\n1f00: 00000000 00000000 00080011 00000002 06000000 ffffffff 0000ffff 00000002\n1f20: 06000000 ffffffff 0000ffff c00928c8 c065c520 c6cd1f58 00000003 c009299c\n1f40: 00000003 c065c520 c7404400 00000000 c7404400 c01f2218 c78106b0 c7441cb0\n1f60: 00000000 00000006 c06799fc 00000000 00000000 00000006 00000000 c01f3ee0\n1f80: 00000000 00000000 be82d678 be82d65c 00000014 00000001 00000122 c00139c8\n1fa0: c6cd0000 c0013840 be82d65c 00000014 00000006 be82d3cc 00000138 00000000\n1fc0: be82d65c 00000014 00000001 00000122 00000000 00000000 00018cb1 00000000\n1fe0: 00003801 be82d3a8 0003a0c7 b6e9af08 60000010 00000006 00000000 00000000\n[\u003cc01be324\u003e] (smc_hardware_send_pkt+0x198/0x22c) from [\u003cc01be868\u003e] (smc_hard_start_xmit+0xc4/0x1e8)\n[\u003cc01be868\u003e] (smc_hard_start_xmit+0xc4/0x1e8) from [\u003cc0208554\u003e] (dev_hard_start_xmit+0x460/0x4cc)\n[\u003cc0208554\u003e] (dev_hard_start_xmit+0x460/0x4cc) from [\u003cc021d1d8\u003e] (sch_direct_xmit+0x94/0x18c)\n[\u003cc021d1d8\u003e] (sch_direct_xmit+0x94/0x18c) from [\u003cc02087f8\u003e] (dev_queue_xmit+0x238/0x42c)\n[\u003cc02087f8\u003e] (dev_queue_xmit+0x238/0x42c) from [\u003cc027ba74\u003e] (packet_sendmsg+0xbe8/0xd28)\n[\u003cc027ba74\u003e] (packet_sendmsg+0xbe8/0xd28) from [\u003cc01f2870\u003e] (sock_sendmsg+0x84/0xa8)\n[\u003cc01f2870\u003e] (sock_sendmsg+0x84/0xa8) from [\u003cc01f4628\u003e] (SyS_sendto+0xb8/0xdc)\n[\u003cc01f4628\u003e] (SyS_sendto+0xb8/0xdc) from [\u003cc0013840\u003e] (ret_fast_syscall+0x0/0x2c)\nCode: e3130002 1a000001 e3130001 0affffcd (e7f001f2)\n---[ end trace 81104fe70e8da7fe ]---\nKernel panic - not syncing: Fatal exception in interrupt\n\nThis is because the macro operations in smc91x.h defined\nfor Versatile are missing SMC_outsw() as used in this\ncommit.\n\nThe Versatile needs and uses the same accessors as the other\nplatforms in the first if(...) clause, just switch it to using\nthat and we have one problem less to worry about.\n\nThis includes a hunk of a patch from Will Deacon fixin\nthe other 32bit platforms as well: Innokom, Ramses, PXA,\nPCM027.\n\nCheckpatch complains about spacing, but I have opted to\nfollow the style of this .h-file.\n\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d38d28bd211451533d7a0d1de57485aaf86d00a", "tree": "b8f0e1967f912e3c7fd0fd7e6e3a0eb1a02dc430", "parents": [ "b268daffdcb9762ad9aa3898096570a9dd92aa9b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:23:14 2013 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:23:14 2013 -0500" }, "message": "Revert \"net: smc91: fix crash regression on the versatile\"\n\nThis reverts commit b268daffdcb9762ad9aa3898096570a9dd92aa9b.\n\nI applied the wrong version of this patch, the proper version\nis coming up next.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b268daffdcb9762ad9aa3898096570a9dd92aa9b", "tree": "0b799df630cf1adfb2f332a23d00c574e00b57af", "parents": [ "7fe0ee099ad5e3dea88d4ee1b6f20246b1ca57c3" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Nov 27 13:33:21 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:21:37 2013 -0500" }, "message": "net: smc91: fix crash regression on the versatile\n\nAfter commit e9e4ea74f06635f2ffc1dffe5ef40c854faa0a90\n\"net: smc91x: dont\u0027t use SMC_outw for fixing up halfword-aligned data\"\nThe Versatile SMSC LAN91C111 is crashing like this:\n\n------------[ cut here ]------------\nkernel BUG at /home/linus/linux/drivers/net/ethernet/smsc/smc91x.c:599!\nInternal error: Oops - BUG: 0 [#1] ARM\nModules linked in:\nCPU: 0 PID: 43 Comm: udhcpc Not tainted 3.13.0-rc1+ #24\ntask: c6ccfaa0 ti: c6cd0000 task.ti: c6cd0000\nPC is at smc_hardware_send_pkt+0x198/0x22c\nLR is at smc_hardware_send_pkt+0x24/0x22c\npc : [\u003cc01be324\u003e] lr : [\u003cc01be1b0\u003e] psr: 20000013\nsp : c6cd1d08 ip : 00000001 fp : 00000000\nr10: c02adb08 r9 : 00000000 r8 : c6ced802\nr7 : c786fba0 r6 : 00000146 r5 : c8800000 r4 : c78d6000\nr3 : 0000000f r2 : 00000146 r1 : 00000000 r0 : 00000031\nFlags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user\nControl: 0005317f Table: 06cf4000 DAC: 00000015\nProcess udhcpc (pid: 43, stack limit \u003d 0xc6cd01c0)\nStack: (0xc6cd1d08 to 0xc6cd2000)\n1d00: 00000010 c8800000 c78d6000 c786fba0 c78d6000 c01be868\n1d20: c01be7a4 00004000 00000000 c786fba0 c6c12b80 c0208554 000004d0 c780fc60\n1d40: 00000220 c01fb734 00000000 00000000 00000000 c6c9a440 c6c12b80 c78d6000\n1d60: c786fba0 c6c9a440 00000000 c021d1d8 00000000 00000000 c6c12b80 c78d6000\n1d80: c786fba0 00000001 c6c9a440 c02087f8 c6c9a4a0 00080008 00000000 00000000\n1da0: c78d6000 c786fba0 c78d6000 00000138 00000000 00000000 00000000 00000000\n1dc0: 00000000 c027ba74 00000138 00000138 00000001 00000010 c6cedc00 00000000\n1de0: 00000008 c7404400 c6cd1eec c6cd1f14 c067a73c c065c0b8 00000000 c067a740\n1e00: 01ffffff 002040d0 00000000 00000000 00000000 00000000 00000000 ffffffff\n1e20: 43004400 00110022 c6cdef20 c027ae8c c6ccfaa0 be82d65c 00000014 be82d3cc\n1e40: 00000000 00000000 00000000 c01f2870 00000000 00000000 00000000 c6cd1e88\n1e60: c6ccfaa0 00000000 00000000 00000000 00000000 00000000 00000000 00000000\n1e80: 00000000 00000000 00000031 c7802310 c7802300 00000138 c7404400 c0771da0\n1ea0: 00000000 c6cd1eec c7800340 00000138 be82d65c 00000014 be82d3cc c6cd1f08\n1ec0: 00000014 00000000 c7404400 c7404400 00000138 c01f4628 c78d6000 00000000\n1ee0: 00000000 be82d3cc 00000138 c6cd1f08 00000014 c6cd1ee4 00000001 00000000\n1f00: 00000000 00000000 00080011 00000002 06000000 ffffffff 0000ffff 00000002\n1f20: 06000000 ffffffff 0000ffff c00928c8 c065c520 c6cd1f58 00000003 c009299c\n1f40: 00000003 c065c520 c7404400 00000000 c7404400 c01f2218 c78106b0 c7441cb0\n1f60: 00000000 00000006 c06799fc 00000000 00000000 00000006 00000000 c01f3ee0\n1f80: 00000000 00000000 be82d678 be82d65c 00000014 00000001 00000122 c00139c8\n1fa0: c6cd0000 c0013840 be82d65c 00000014 00000006 be82d3cc 00000138 00000000\n1fc0: be82d65c 00000014 00000001 00000122 00000000 00000000 00018cb1 00000000\n1fe0: 00003801 be82d3a8 0003a0c7 b6e9af08 60000010 00000006 00000000 00000000\n[\u003cc01be324\u003e] (smc_hardware_send_pkt+0x198/0x22c) from [\u003cc01be868\u003e] (smc_hard_start_xmit+0xc4/0x1e8)\n[\u003cc01be868\u003e] (smc_hard_start_xmit+0xc4/0x1e8) from [\u003cc0208554\u003e] (dev_hard_start_xmit+0x460/0x4cc)\n[\u003cc0208554\u003e] (dev_hard_start_xmit+0x460/0x4cc) from [\u003cc021d1d8\u003e] (sch_direct_xmit+0x94/0x18c)\n[\u003cc021d1d8\u003e] (sch_direct_xmit+0x94/0x18c) from [\u003cc02087f8\u003e] (dev_queue_xmit+0x238/0x42c)\n[\u003cc02087f8\u003e] (dev_queue_xmit+0x238/0x42c) from [\u003cc027ba74\u003e] (packet_sendmsg+0xbe8/0xd28)\n[\u003cc027ba74\u003e] (packet_sendmsg+0xbe8/0xd28) from [\u003cc01f2870\u003e] (sock_sendmsg+0x84/0xa8)\n[\u003cc01f2870\u003e] (sock_sendmsg+0x84/0xa8) from [\u003cc01f4628\u003e] (SyS_sendto+0xb8/0xdc)\n[\u003cc01f4628\u003e] (SyS_sendto+0xb8/0xdc) from [\u003cc0013840\u003e] (ret_fast_syscall+0x0/0x2c)\nCode: e3130002 1a000001 e3130001 0affffcd (e7f001f2)\n---[ end trace 81104fe70e8da7fe ]---\nKernel panic - not syncing: Fatal exception in interrupt\n\nThis is because the macro operations in smc91x.h defined\nfor Versatile are missing SMC_outsw() as used in this\ncommit.\n\nThe Versatile needs and uses the same accessors as the other\nplatforms in the first if(...) clause, just switch it to using\nthat and we have one problem less to worry about.\n\nCheckpatch complains about spacing, but I have opted to\nfollow the style of this .h-file.\n\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7fe0ee099ad5e3dea88d4ee1b6f20246b1ca57c3", "tree": "b8f0e1967f912e3c7fd0fd7e6e3a0eb1a02dc430", "parents": [ "1bac1072425c86f1ac85bd5967910706677ef8b3" ], "author": { "name": "Yang Yingliang", "email": "yangyingliang@huawei.com", "time": "Wed Nov 27 14:32:52 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:18:23 2013 -0500" }, "message": "net: 8139cp: fix a BUG_ON triggered by wrong bytes_compl\n\nUsing iperf to send packets(GSO mode is on), a bug is triggered:\n\n[ 212.672781] kernel BUG at lib/dynamic_queue_limits.c:26!\n[ 212.673396] invalid opcode: 0000 [#1] SMP\n[ 212.673882] Modules linked in: 8139cp(O) nls_utf8 edd fuse loop dm_mod ipv6 i2c_piix4 8139too i2c_core intel_agp joydev pcspkr hid_generic intel_gtt floppy sr_mod mii button sg cdrom ext3 jbd mbcache usbhid hid uhci_hcd ehci_hcd usbcore sd_mod usb_common crc_t10dif crct10dif_common processor thermal_sys hwmon scsi_dh_emc scsi_dh_rdac scsi_dh_hp_sw scsi_dh ata_generic ata_piix libata scsi_mod [last unloaded: 8139cp]\n[ 212.676084] CPU: 0 PID: 4124 Comm: iperf Tainted: G O 3.12.0-0.7-default+ #16\n[ 212.676084] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007\n[ 212.676084] task: ffff8800d83966c0 ti: ffff8800db4c8000 task.ti: ffff8800db4c8000\n[ 212.676084] RIP: 0010:[\u003cffffffff8122e23f\u003e] [\u003cffffffff8122e23f\u003e] dql_completed+0x17f/0x190\n[ 212.676084] RSP: 0018:ffff880116e03e30 EFLAGS: 00010083\n[ 212.676084] RAX: 00000000000005ea RBX: 0000000000000f7c RCX: 0000000000000002\n[ 212.676084] RDX: ffff880111dd0dc0 RSI: 0000000000000bd4 RDI: ffff8800db6ffcc0\n[ 212.676084] RBP: ffff880116e03e48 R08: 0000000000000992 R09: 0000000000000000\n[ 212.676084] R10: ffffffff8181e400 R11: 0000000000000004 R12: 000000000000000f\n[ 212.676084] R13: ffff8800d94ec840 R14: ffff8800db440c80 R15: 000000000000000e\n[ 212.676084] FS: 00007f6685a3c700(0000) GS:ffff880116e00000(0000) knlGS:0000000000000000\n[ 212.676084] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n[ 212.676084] CR2: 00007f6685ad6460 CR3: 00000000db714000 CR4: 00000000000006f0\n[ 212.676084] Stack:\n[ 212.676084] ffff8800db6ffc00 000000000000000f ffff8800d94ec840 ffff880116e03eb8\n[ 212.676084] ffffffffa041509f ffff880116e03e88 0000000f16e03e88 ffff8800d94ec000\n[ 212.676084] 00000bd400059858 000000050000000f ffffffff81094c36 ffff880116e03eb8\n[ 212.676084] Call Trace:\n[ 212.676084] \u003cIRQ\u003e\n[ 212.676084] [\u003cffffffffa041509f\u003e] cp_interrupt+0x4ef/0x590 [8139cp]\n[ 212.676084] [\u003cffffffff81094c36\u003e] ? ktime_get+0x56/0xd0\n[ 212.676084] [\u003cffffffff8108cf73\u003e] handle_irq_event_percpu+0x53/0x170\n[ 212.676084] [\u003cffffffff8108d0cc\u003e] handle_irq_event+0x3c/0x60\n[ 212.676084] [\u003cffffffff8108fdb5\u003e] handle_fasteoi_irq+0x55/0xf0\n[ 212.676084] [\u003cffffffff810045df\u003e] handle_irq+0x1f/0x30\n[ 212.676084] [\u003cffffffff81003c8b\u003e] do_IRQ+0x5b/0xe0\n[ 212.676084] [\u003cffffffff8142beaa\u003e] common_interrupt+0x6a/0x6a\n[ 212.676084] \u003cEOI\u003e\n[ 212.676084] [\u003cffffffffa0416a21\u003e] ? cp_start_xmit+0x621/0x97c [8139cp]\n[ 212.676084] [\u003cffffffffa0416a09\u003e] ? cp_start_xmit+0x609/0x97c [8139cp]\n[ 212.676084] [\u003cffffffff81378ed9\u003e] dev_hard_start_xmit+0x2c9/0x550\n[ 212.676084] [\u003cffffffff813960a9\u003e] sch_direct_xmit+0x179/0x1d0\n[ 212.676084] [\u003cffffffff813793f3\u003e] dev_queue_xmit+0x293/0x440\n[ 212.676084] [\u003cffffffff813b0e46\u003e] ip_finish_output+0x236/0x450\n[ 212.676084] [\u003cffffffff810e59e7\u003e] ? __alloc_pages_nodemask+0x187/0xb10\n[ 212.676084] [\u003cffffffff813b10e8\u003e] ip_output+0x88/0x90\n[ 212.676084] [\u003cffffffff813afa64\u003e] ip_local_out+0x24/0x30\n[ 212.676084] [\u003cffffffff813aff0d\u003e] ip_queue_xmit+0x14d/0x3e0\n[ 212.676084] [\u003cffffffff813c6fd1\u003e] tcp_transmit_skb+0x501/0x840\n[ 212.676084] [\u003cffffffff813c8323\u003e] tcp_write_xmit+0x1e3/0xb20\n[ 212.676084] [\u003cffffffff81363237\u003e] ? skb_page_frag_refill+0x87/0xd0\n[ 212.676084] [\u003cffffffff813c8c8b\u003e] tcp_push_one+0x2b/0x40\n[ 212.676084] [\u003cffffffff813bb7e6\u003e] tcp_sendmsg+0x926/0xc90\n[ 212.676084] [\u003cffffffff813e1d21\u003e] inet_sendmsg+0x61/0xc0\n[ 212.676084] [\u003cffffffff8135e861\u003e] sock_aio_write+0x101/0x120\n[ 212.676084] [\u003cffffffff81107cf1\u003e] ? vma_adjust+0x2e1/0x5d0\n[ 212.676084] [\u003cffffffff812163e0\u003e] ? timerqueue_add+0x60/0xb0\n[ 212.676084] [\u003cffffffff81130b60\u003e] do_sync_write+0x60/0x90\n[ 212.676084] [\u003cffffffff81130d44\u003e] ? rw_verify_area+0x54/0xf0\n[ 212.676084] [\u003cffffffff81130f66\u003e] vfs_write+0x186/0x190\n[ 212.676084] [\u003cffffffff811317fd\u003e] SyS_write+0x5d/0xa0\n[ 212.676084] [\u003cffffffff814321e2\u003e] system_call_fastpath+0x16/0x1b\n[ 212.676084] Code: ca 41 89 dc 41 29 cc 45 31 db 29 c2 41 89 c5 89 d0 45 29 c5 f7 d0 c1 e8 1f e9 43 ff ff ff 66 0f 1f 44 00 00 31 c0 e9 7b ff ff ff \u003c0f\u003e 0b eb fe 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 c7 47 40 00\n[ 212.676084] RIP [\u003cffffffff8122e23f\u003e] dql_completed+0x17f/0x190\n------------[ cut here ]------------\n\nWhen a skb has frags, bytes_compl plus skb-\u003elen nr_frags times in cp_tx().\nIt\u0027s not the correct value(actually, it should plus skb-\u003elen once) and it\nwill trigger the BUG_ON(bytes_compl \u003e num_queued - dql-\u003enum_completed).\nSo only increase bytes_compl when finish sending all frags. pkts_compl also\nhas a wrong value, fix it too.\n\nIt\u0027s introduced by commit 871f0d4c (\"8139cp: enable bql\").\n\nSuggested-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: Yang Yingliang \u003cyangyingliang@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1bac1072425c86f1ac85bd5967910706677ef8b3", "tree": "06472ba6f55cff0ac3355891b18f453e3e59b25b", "parents": [ "db31c55a6fb245fdbb752a2ca4aefec89afabb06" ], "author": { "name": "David Chang", "email": "dchang@suse.com", "time": "Wed Nov 27 15:48:36 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:16:39 2013 -0500" }, "message": "r8169: check ALDPS bit and disable it if enabled for the 8168g\n\nWindows driver will enable ALDPS function, but linux driver and firmware\ndo not have any configuration related to ALDPS function for 8168g.\nSo restart system to linux and remove the NIC cable, LAN enter ALDPS,\nthen LAN RX will be disabled.\n\nThis issue can be easily reproduced on dual boot windows and linux\nsystem with RTL_GIGA_MAC_VER_40 chip.\n\nRealtek said, ALDPS function can be disabled by configuring to PHY,\nswitch to page 0x0A43, reg0x10 bit2\u003d0.\n\nSigned-off-by: David Chang \u003cdchang@suse.com\u003e\nAcked-by: Hayes Wang \u003chayeswang@realtek.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db31c55a6fb245fdbb752a2ca4aefec89afabb06", "tree": "ab94a0065aaa0db14bdca1ae6c92b6e29a086165", "parents": [ "ec6f809ff6f19fafba3212f6aff0dda71dfac8e8" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Nov 27 15:40:21 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:12:52 2013 -0500" }, "message": "net: clamp -\u003emsg_namelen instead of returning an error\n\nIf kmsg-\u003emsg_namelen \u003e sizeof(struct sockaddr_storage) then in the\noriginal code that would lead to memory corruption in the kernel if you\nhad audit configured. If you didn\u0027t have audit configured it was\nharmless.\n\nThere are some programs such as beta versions of Ruby which use too\nlarge of a buffer and returning an error code breaks them. We should\nclamp the -\u003emsg_namelen value instead.\n\nFixes: 1661bf364ae9 (\"net: heap overflow in __audit_sockaddr()\")\nReported-by: Eric Wong \u003cnormalperson@yhbt.net\u003e\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nTested-by: Eric Wong \u003cnormalperson@yhbt.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec6f809ff6f19fafba3212f6aff0dda71dfac8e8", "tree": "6218fc1ecc6805427b753c4f2573f910c6793e1d", "parents": [ "006da7b07bc4d3a7ffabad17cf639eec6849c9dc" ], "author": { "name": "Veaceslav Falico", "email": "vfalico@redhat.com", "time": "Fri Nov 29 09:53:23 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:11:08 2013 -0500" }, "message": "af_packet: block BH in prb_shutdown_retire_blk_timer()\n\nCurrently we\u0027re using plain spin_lock() in prb_shutdown_retire_blk_timer(),\nhowever the timer might fire right in the middle and thus try to re-aquire\nthe same spinlock, leaving us in a endless loop.\n\nTo fix that, use the spin_lock_bh() to block it.\n\nFixes: f6fb8f100b80 (\"af-packet: TPACKET_V3 flexible buffer implementation.\")\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCC: Willem de Bruijn \u003cwillemb@google.com\u003e\nCC: Phil Sutter \u003cphil@nwl.cc\u003e\nCC: Eric Dumazet \u003cedumazet@google.com\u003e\nReported-by: Jan Stancek \u003cjstancek@redhat.com\u003e\nTested-by: Jan Stancek \u003cjstancek@redhat.com\u003e\nSigned-off-by: Veaceslav Falico \u003cvfalico@redhat.com\u003e\nAcked-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "006da7b07bc4d3a7ffabad17cf639eec6849c9dc", "tree": "05d54631c14c7b6d3c02acc0e6296145949c88cb", "parents": [ "dff345c5c85df3c5853491b007f6b1b578dc28a4" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Tue Nov 26 12:37:12 2013 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 29 16:07:08 2013 -0500" }, "message": "macvtap: Do not double-count received packets\n\nCurrently macvlan will count received packets after calling each\nvlans receive handler. Macvtap attempts to count the packet\nyet again when the user reads the packet from the tap socket.\nThis code doesn\u0027t do this consistently either. Remove the\ncounting from macvtap and let only macvlan count received\npackets.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dc1ccc48159d63eca5089e507c82c7d22ef60839", "tree": "b461d1d3bbfdd41132dbd9c2e4e06c84e2f53a2c", "parents": [ "d5ff835f88c7c346ba748f389bd4ef5eae619ebc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 12:57:14 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 12:57:14 2013 -0800" }, "message": "Linux 3.13-rc2\n" }, { "commit": "d5ff835f88c7c346ba748f389bd4ef5eae619ebc", "tree": "8feddb009e4479fbdad95284d72e4aa3c629038f", "parents": [ "033dbbdec3ab178e5fe063a992b8c90ad08fd18c", "3676f9ef5481d614f8c5c857f5319755be248268" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:57:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:57:13 2013 -0800" }, "message": "Merge tag \u0027arm64-stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull ARM64 fixes from Catalin Marinas:\n - Remove preempt_count modifications in the arm64 IRQ handling code\n since that\u0027s already dealt with in generic irq_enter/irq_exit\n - PTE_PROT_NONE bit moved higher up to avoid overlapping with the\n hardware bits (for PROT_NONE mappings which are pte_present)\n - Big-endian fixes for ptrace support\n - Asynchronous aborts unmasking while in the kernel\n - pgprot_writecombine() change to create Normal NonCacheable memory\n rather than Device GRE\n\n* tag \u0027arm64-stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:\n arm64: Move PTE_PROT_NONE higher up\n arm64: Use Normal NonCacheable memory for writecombine\n arm64: debug: make aarch32 bkpt checking endian clean\n arm64: ptrace: fix compat registes get/set to be endian clean\n arm64: Unmask asynchronous aborts when in kernel mode\n arm64: dts: Reserve the memory used for secondary CPU release address\n arm64: let the core code deal with preempt_count\n" }, { "commit": "033dbbdec3ab178e5fe063a992b8c90ad08fd18c", "tree": "b06fdacd98c8a0ff28992a2fa33f2182b8358c65", "parents": [ "dc418f6e6a8f5021ccf9e9c0957eefae3737168d", "127581b64b432804948535d49847b36366b9ff64" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:56:15 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:56:15 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 updates from Martin Schwidefsky:\n \"One performance improvement and a few bug fixes. Two of the fixes\n deal with the clock related problems we have seen on recent kernels\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:\n s390/mm: handle asce-type exceptions as normal page fault\n s390,time: revert direct ktime path for s390 clockevent device\n s390/time,vdso: convert to the new update_vsyscall interface\n s390/uaccess: add missing page table walk range check\n s390/mm: optimize copy_page\n s390/dasd: validate request size before building CCW/TCW request\n s390/signal: always restore saved runtime instrumentation psw bit\n" }, { "commit": "dc418f6e6a8f5021ccf9e9c0957eefae3737168d", "tree": "2f420c2e330f278cd889461b04b42fdff096226a", "parents": [ "7224b31bd5f5a8994f8fb2d540847213a50db28c", "07a27a0047274e0ba568ce86b6416c34497a99a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:55:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:55:13 2013 -0800" }, "message": "Merge branch \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux\n\nPull i2c fixes from Wolfram Sang:\n \"Some easy but needed fixes for i2c drivers since rc1\"\n\n* \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:\n i2c: bcm2835: Linking platform nodes to adapter nodes\n i2c: omap: raw read and write endian fix\n i2c: i2c-bcm-kona: Fix module build\n i2c: i2c-diolan-u2c: different usb endpoints for DLN-2-U2C\n i2c: bcm-kona: remove duplicated include\n i2c: davinci: raw read and write endian fix\n" }, { "commit": "7224b31bd5f5a8994f8fb2d540847213a50db28c", "tree": "45c1a8beedfbb4620086038a0357b77f95c4935c", "parents": [ "de92a0589c8d450d5c1ac275599cbb64f415d813", "4e8b22bd1a37447712f1b1d96352fc53b463c6b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:49:08 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:49:08 2013 -0800" }, "message": "Merge branch \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue fixes from Tejun Heo:\n \"This contains one important fix. The NUMA support added a while back\n broke ordering guarantees on ordered workqueues. It was enforced by\n having single frontend interface with @max_active \u003d\u003d 1 but the NUMA\n support puts multiple interfaces on unbound workqueues on NUMA\n machines thus breaking the ordered guarantee. This is fixed by\n disabling NUMA support on ordered workqueues.\n\n The above and a couple other patches were sitting in for-3.12-fixes\n but I forgot to push that out, so they ended up waiting a bit too\n long. My aplogies.\n\n Other fixes are minor\"\n\n* \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues\n workqueue: fix comment typo for __queue_work()\n workqueue: fix ordered workqueues in NUMA setups\n workqueue: swap set_cpus_allowed_ptr() and PF_NO_SETAFFINITY\n" }, { "commit": "de92a0589c8d450d5c1ac275599cbb64f415d813", "tree": "56853ffe56a17a5bf82757bb65e43f6ffb1910b7", "parents": [ "2855987d13d2de99eb337cae98f5656e93452617", "c5700766975c69d27150256444db63fbfd103791" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:48:25 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:48:25 2013 -0800" }, "message": "Merge branch \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata\n\nPull libata fixes from Tejun Heo:\n \"libata device removal path was removing parent device node before its\n child, which is mostly harmless but triggers warning after recent\n sysfs changes. Rafael\u0027s patch fixes the order.\n\n Other than that, minor controller-specific fixes and device ID\n additions\"\n\n* \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:\n ATA: Fix port removal ordering\n ahci: add Marvell 9230 to the AHCI PCI device list\n ata: fix acpi_bus_get_device() return value check\n pata_arasan_cf: add missing clk_disable_unprepare() on error path\n ahci: add support for IBM Akebono platform device\n" }, { "commit": "2855987d13d2de99eb337cae98f5656e93452617", "tree": "8b43b58d2778ff26c71a0a2c06cde9ca66149174", "parents": [ "b8495995dd8ad425ec1b78f7182586d5a004d8ec", "e605b36575e896edd8161534550c9ea021b03bc0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:47:06 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:47:06 2013 -0800" }, "message": "Merge branch \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup fixes from Tejun Heo:\n \"Fixes for three issues.\n\n - cgroup destruction path could swamp system_wq possibly leading to\n deadlock. This actually seems to happen in the wild with memcg\n because memcg destruction path adds nested dependency on system_wq.\n\n Resolved by isolating cgroup destruction work items on its\n dedicated workqueue.\n\n - Possible locking context deadlock through seqcount reported by\n lockdep\n\n - Memory leak under certain conditions\"\n\n* \u0027for-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: fix cgroup_subsys_state leak for seq_files\n cpuset: Fix memory allocator deadlock\n cgroup: use a dedicated workqueue for cgroup destruction\n" }, { "commit": "b8495995dd8ad425ec1b78f7182586d5a004d8ec", "tree": "251e5032e6c1b8bbb24af2a8b6a4dd0eabad8eb2", "parents": [ "b01537bfbc832a09162e7189f63251a8785e2112", "eb9ca3ab2194ad9a6c52da0e8bf1b3f1ff9cd6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:36:42 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:36:42 2013 -0800" }, "message": "Merge tag \u0027sound-3.13-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"Quite a few HD-Audio fixes, a WUSB audio fix and a fix for FireWire\n audio. The HD-audio part contains a couple of fixes for the generic\n parser, and these are the only intrusive fixes. The rest are mostly\n device-specific fixes\"\n\n* tag \u0027sound-3.13-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Add LFE chmap to ASUS ET2700\n ALSA: hda - Initialize missing bass speaker pin for ASUS AIO ET2700\n ALSA: hda - limit mic boost on Asus UX31[A,E]\n ALSA: hda - Check leaf nodes to find aamix amps\n ALSA: hda - Fix hp-mic mode without VREF bits\n ALSA: hda - Create Headhpone Mic Jack Mode when really needed\n ALSA: usb: use multiple packets per urb for Wireless USB inbound audio\n ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Conexant codec\n ALSA: hda - Drop bus-\u003eavoid_link_reset flag\n ALSA: hda/realtek - Set pcbeep amp for ALC668\n ALSA: hda/realtek - Add support of ALC231 codec\n ALSA: firewire-lib: fix wrong value for FDF field as an empty packet\n" }, { "commit": "b01537bfbc832a09162e7189f63251a8785e2112", "tree": "f2e1b1430ed37ee173ead7bb78e0fcbdc8ab11ac", "parents": [ "282c183b0207a518bb3be1b65faa5a36d1529fa0", "d870b4a191a389c661cd40aacb06981c26b5e504" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:27:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:27:19 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs dentry reference count fix from Al Viro.\n\nThis fixes a possible inode_permission NULL pointer dereference (and\nother problems) that were due to the root dentry count being decremented\ntoo much. In commit 48a066e72d97 (\"RCU\u0027d vfsmounts\") the placement of\nclearing the LOOKUP_RCU bit changed, and we then returned failure of\nincrementing the lockref on the parent dentry with LOOKUP_RCU cleared.\n\nBut that meant we needed to go through the same cleanup routines that\nthe later failures did wrt LOOKUP_ROOT and nd-\u003eroot.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n fix bogus path_put() of nd-\u003eroot after some unlazy_walk() failures\n" }, { "commit": "282c183b0207a518bb3be1b65faa5a36d1529fa0", "tree": "5de1d3d56b54940871995b7cec628bb861fdc135", "parents": [ "dda9cc3a14518fcf8a89faef15f0f704de3533f2", "1b28c3e628315ac0d9ef2d3fac0403f05ae692db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:26:42 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 29 09:26:42 2013 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm qxl leak fix from Dave Airlie:\n \"As usual 5 mins after I send a trivial pull fix I find a real bug!\n\n This fixes a memory leak and I\u0027d like to get it into stable queue\n asap\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/qxl: fix memory leak in release list handling\n" } ], "next": "3676f9ef5481d614f8c5c857f5319755be248268" }