)]}' { "log": [ { "commit": "a0639948b6fb28ebf2063b58ae6e0f4de693f6c3", "tree": "7ffe6f1caa94a70d56197dad151b556b36fba681", "parents": [ "688c240b0bd920421fd3b9377b6ba3b731961755", "7bb5d75ce91ca3725256c0d502624ed697231cde" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 15:06:57 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 15:06:57 2013 +0200" }, "message": "Merge tag \u0027davinci-for-v3.11/soc-v2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc\n\nFrom Sekhar Nori:\n\nDaVinci SoC changes for v3.11\n\nThis pull request moves DaVinci EDMA library to\narch/arm/common so it can be used by OMAP based AM335x.\nThis is a temporary step until all drivers are converted\nto use the dmaengine driver in drivers/dma/edma.c.\n\nSeveral drivers like SPI, MMC/SD have already been converted.\nSome like audio are pending.\n\nThe other two patches in the pull request are cleanup in nature.\n\n* tag \u0027davinci-for-v3.11/soc-v2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:\n ARM: edma: remove unused transfer controller handlers\n ARM: davinci: move private EDMA API to arm/common\n ARM: davinci: remove __init atrribute from function declaration\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e5051b8472c2fde91e44d906c9a2e516a10b60b2", "tree": "b7c27378ca981a7bcf86639db7b0cde834feb0b6", "parents": [ "c3b693d1d63444afe4fbf809d8a311b63741e503", "3bfbc6cd9b41f937a134ba65a4a1eefba062b9a8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 02:14:59 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 02:15:45 2013 +0200" }, "message": "Merge tag \u0027imx-soc-3.11\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc\n\nFrom Shawn Guo:\n\nimx soc changes for 3.11:\n\n* New SoCs i.MX6 Sololite and Vybrid VF610 support\n* imx5 and imx6 clock fixes and additions\n* Update clock driver to use of_clk_init() function\n* Refactor restart routine mxc_restart() to get it work for DT boot\n as well\n* Clean up mxc specific ulpi access ops\n* imx defconfig updates\n\n* tag \u0027imx-soc-3.11\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6: (29 commits)\n ARM: imx_v6_v7_defconfig: Enable Vybrid VF610\n ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default\n ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd\n ARM: imx_v6_v7_defconfig: Enable PWM and backlight options\n ARM: imx: Remove mxc specific ulpi access ops\n ARM: imx: add initial support for VF610\n ARM: imx: add VF610 clock support\n ARM: imx_v6_v7_defconfig: enable parallel display\n ARM: imx: clk: No need to initialize phandle struct\n ARM: imx: irq-common: Include header to avoid sparse warning\n ARM: imx: Enable mx6 solo-lite support\n ARM: imx6: use common of_clk_init() call to initialize clocks\n ARM: imx6q: call of_clk_init() to register fixed rate clocks\n ARM: imx: imx_v6_v7_defconfig: Select CONFIG_DRM_IMX_TVE\n ARM: i.MX6: clk: add different DualLite MLB clock config\n ARM i.MX5: Add S/PDIF clocks\n ARM i.MX53: Add SATA clock\n ARM: imx6q: clk: add the eim_slow clock\n ARM: imx: remove MLB PLL from pllv3\n ARM: imx: disable pll8_mlb in mx6q_clks\n ...\n\nConflicts:\n\tarch/arm/Kconfig.debug (simple add/add conflict)\n\nIncludes an update to 3.10-rc6\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c3b693d1d63444afe4fbf809d8a311b63741e503", "tree": "5c0c264203967f1524ac28645f0b5cea57b624bc", "parents": [ "596fd95ea606548adaa8310a7c05a6dcfec46f16", "7fca1f20c0f3e9d7a3b23ee1fc9e832f520f3f1a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 01:51:18 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 20 01:51:18 2013 +0200" }, "message": "Merge tag \u0027u300-multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc\n\nFrom Linus Walleij:\n\nDevice Tree and Multiplatform support for U300:\n- Add devicetree support to timer, pinctrl (probe), I2C block,\n watchdog, DMA controller and clocks.\n- Piecewise add a device tree containing all peripherals.\n- Delete the ATAG boot path.\n- Delete redundant platform data and board files.\n- Convert to multiplatform.\n\n* tag \u0027u300-multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (40 commits)\n ARM: u300: switch to using syscon regmap for board\n ARM: u300: Update MMC configs for u300 defconfig\n spi: pl022: use DMA by default when probing from DT\n pinctrl: get rid of all platform data for coh901\n ARM: u300: convert MMC/SD clock to device tree\n ARM: u300: move the gated system controller clocks to DT\n i2c: stu300: do not request a specific clock name\n clk: move the U300 fixed and fixed-factor to DT\n ARM: u300: remove register definition file\n ARM: u300: add syscon node\n ARM: u300 use module_spi_driver to register driver\n ARM: u300: delete remnant machine headers\n ARM: u300: convert to multiplatform\n ARM: u300: localize \u003cmach/u300-regs.h\u003e\n ARM: u300: delete \u003cmach/irqs.h\u003e\n ARM: u300: delete \u003cmach/hardware.h\u003e\n ARM: u300: push down syscon registers\n ARM: u300: remove deps from debug macro\n ARM: u300: move debugmacro to debug includes\n ARM: u300: delete all static board data\n ...\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c", "tree": "1b2684a334fadc060b3acc1dc4963b935031d1b9", "parents": [ "b464e3cb294518c8705425335338957bc291d019" ], "author": { "name": "Matt Porter", "email": "mporter@ti.com", "time": "Wed Mar 06 11:15:31 2013 -0500" }, "committer": { "name": "Sekhar Nori", "email": "nsekhar@ti.com", "time": "Tue Jun 18 10:52:03 2013 +0530" }, "message": "ARM: davinci: move private EDMA API to arm/common\n\nMove mach-davinci/dma.c to common/edma.c so it can be used\nby OMAP (specifically AM33xx) as well.\n\nSigned-off-by: Matt Porter \u003cmporter@ti.com\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e # davinci_mmc.c\nAcked-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n[nsekhar@ti.com: dropped davinci sffsdr changes]\nSigned-off-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\n" }, { "commit": "b263e9b88746c6902c36d35a2dd83c119f8510a2", "tree": "a9f8d06f482af8587d9c7dbf77735bb3dc3185ce", "parents": [ "85fb28bed813469ba56706a7e48fba596f47c253" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu May 23 20:09:43 2013 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Jun 17 13:54:38 2013 +0200" }, "message": "pinctrl: get rid of all platform data for coh901\n\nThis deletes the dependency on any platform data for\nthe COH901 pin controller. There is only one user in the\nkernel, and if we at some point want to support more\nvariants, they shall provide their variant info through\nthe device tree.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "f21afc25f9ed45b8ffe200d0f071b0caec3ed2ef", "tree": "e3cd202f0830cc0f0b5fbe9318bfeebbc43ce4ea", "parents": [ "d0ff9348810c5bc9fc7a3f022bdfae9b44b62f00" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Fri Jun 14 11:13:59 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 14 19:24:42 2013 -1000" }, "message": "smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().\n\nThanks to commit f91eb62f71b3 (\"init: scream bloody murder if interrupts\nare enabled too early\"), \"bloody murder\" is now being screamed.\n\nWith a MIPS OCTEON config, we use on_each_cpu() in our\nirq_chip.irq_bus_sync_unlock() function. This gets called in early as a\nresult of the time_init() call. Because the !SMP version of\non_each_cpu() unconditionally enables irqs, we get:\n\n WARNING: at init/main.c:560 start_kernel+0x250/0x410()\n Interrupts were enabled early\n CPU: 0 PID: 0 Comm: swapper Not tainted 3.10.0-rc5-Cavium-Octeon+ #801\n Call Trace:\n show_stack+0x68/0x80\n warn_slowpath_common+0x78/0xb0\n warn_slowpath_fmt+0x38/0x48\n start_kernel+0x250/0x410\n\nSuggested fix: Do what we already do in the SMP version of\non_each_cpu(), and use local_irq_save/local_irq_restore. Because we\nneed a flags variable, make it a static inline to avoid name space\nissues.\n\n[ Change from v1: Convert on_each_cpu to a static inline function, add\n #include \u003clinux/irqflags.h\u003e to avoid build breakage on some files.\n\n on_each_cpu_mask() and on_each_cpu_cond() suffer the same problem as\n on_each_cpu(), but they are not causing !SMP bugs for me, so I will\n defer changing them to a less urgent patch. ]\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1149269646ae95c3985f5cf1c8a15b97bb30d8a", "tree": "f56db201ab0328feec913d90b7b60fef7054065a", "parents": [ "5ae13ef4e1045d6ec5d445947b42c839b9731bec", "1a87b01d3b18709ae240ec90ae612354dd44d9a9" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 14 17:36:30 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 14 17:36:30 2013 -0700" }, "message": "Merge tag \u0027renesas-phy-rcar-usb-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc\n\nFrom Simon Horman:\nRenesas USB updates for v3.11\n\nThese updates are by Sergei Shtylyov to clean-up USB support\npresent for R8A7779/Marzen and then extend USB support coverage to\nR8A7778/BOCK-W.\n\n* tag \u0027renesas-phy-rcar-usb-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:\n ARM: shmobile: BOCK-W: add USB support\n ARM: shmobile: r8a7778: add USB support\n phy-rcar-usb: add R8A7778 support\n phy-rcar-usb: handle platform data\n ARM: shmobile: Marzen: pass platform data to USB PHY device\n phy-rcar-usb: add platform data\n phy-rcar-usb: correct base address\n ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource\n phy-rcar-usb: remove EHCI internal buffer setup\n ARM: shmobile: r8a7779: setup EHCI internal buffer\n ehci-platform: add pre_setup() method to platform data\n ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code\n\nConflicts:\n\tarch/arm/mach-shmobile/board-marzen.c\n\tarch/arm/mach-shmobile/setup-r8a7778.c\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "10f8902b47340fc792cf503dd3caaba410d23615", "tree": "c81e0af4e9b3b7c2f221c74c02dea034350f8907", "parents": [ "eb25862dee69a0a0ba835f6ed093c75f8ed3123b", "4f288f081bb67813d35c10d1b2fa68e863c4b188" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 14 14:31:36 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 14 14:32:01 2013 -0700" }, "message": "Merge tag \u0027omap-for-v3.11/soc-signed\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc\n\nFrom Tony Lindgren:\nOmap SoC changes. Mostly improves am33xx support, and adds\nminimal support for am43x SoCs.\n\n* tag \u0027omap-for-v3.11/soc-signed\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP2+: AM43x: SRAM base and size\n ARM: OMAP2+: AM43x: GP or HS ?\n ARM: OMAP2+: AM43x: early init\n ARM: OMAP2+: AM43x: static mapping\n ARM: OMAP2+: AM437x: SoC revision detection\n ARM: OMAP2+: AM43x: soc_is support\n ARM: OMAP2+: AM43x: kbuild\n ARM: OMAP2+: AM43x: Kconfig\n ARM: OMAP2+: separate out OMAP4 restart\n ARM: AM33XX: clk: Add clock node for EHRPWM TBCLK\n ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies\n ARM: OMAP2+: AM33xx: Add missing reset status info to GFX hwmod\n + Linux 3.10-rc5\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "cb7e9704d58dab4b1b4284903e6bf973ade3863e", "tree": "bd66e94c4e34a9b89d4265591eb683a4fe8dad96", "parents": [ "dcae7f2dfcc6c948c313d72df6a0d7e466c6707a", "971394f389992f8462c4e5ae0e3b49a10a9534a3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 13 12:36:42 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 13 12:36:42 2013 -0700" }, "message": "Merge branch \u0027rcu/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu\n\nPull RCU fixes from Paul McKenney:\n \"I must confess that this past merge window was not RCU\u0027s best showing.\n This series contains three more fixes for RCU regressions:\n\n 1. A fix to __DECLARE_TRACE_RCU() that causes it to act as an\n interrupt from idle rather than as a task switch from idle.\n This change is needed due to the recent use of _rcuidle()\n tracepoints that can be invoked from interrupt handlers as well\n as from idle. Without this fix, invoking _rcuidle() tracepoints\n from interrupt handlers results in splats and (more seriously)\n confusion on RCU\u0027s part as to whether a given CPU is idle or not.\n This confusion can in turn result in too-short grace periods and\n therefore random memory corruption.\n\n 2. A fix to a subtle deadlock that could result due to RCU doing\n a wakeup while holding one of its rcu_node structure\u0027s locks.\n Although the probability of occurrence is low, it really\n does happen. The fix, courtesy of Steven Rostedt, uses\n irq_work_queue() to avoid the deadlock.\n\n 3. A fix to a silent deadlock (invisible to lockdep) due to the\n interaction of timeouts posted by RCU debug code enabled by\n CONFIG_PROVE_RCU_DELAY\u003dy, grace-period initialization, and CPU\n hotplug operations. This will not occur in production kernels,\n but really does occur in randconfig testing. Diagnosis courtesy\n of Steven Rostedt\"\n\n* \u0027rcu/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:\n rcu: Fix deadlock with CPU hotplug, RCU GP init, and timer migration\n rcu: Don\u0027t call wakeup() with rcu_node structure -\u003elock held\n trace: Allow idle-safe tracepoints to be called from irq\n" }, { "commit": "26e04462c8b78d079d3231396ec72d58a14f114b", "tree": "c1f47f78eef6d4eccef0195c72107f3dc2d6744b", "parents": [ "645a992934c8007fa17ac2e512ce73c100ed1614", "090adb893137ff3c672a644413edc174b0a75706" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 17:18:29 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 17:18:29 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking update from David Miller:\n\n 1) Fix dump iterator in nfnl_acct_dump() and ctnl_timeout_dump() to\n dump all objects properly, from Pablo Neira Ayuso.\n\n 2) xt_TCPMSS must use the default MSS of 536 when no MSS TCP option is\n present. Fix from Phil Oester.\n\n 3) qdisc_get_rtab() looks for an existing matching rate table and uses\n that instead of creating a new one. However, it\u0027s key matching is\n incomplete, it fails to check to make sure the -\u003edata[] array is\n identical too. Fix from Eric Dumazet.\n\n 4) ip_vs_dest_entry isn\u0027t fully initialized before copying back to\n userspace, fix from Dan Carpenter.\n\n 5) Fix ubuf reference counting regression in vhost_net, from Jason\n Wang.\n\n 6) When sock_diag dumps a socket filter back to userspace, we have to\n translate it out of the kernel\u0027s internal representation first.\n From Nicolas Dichtel.\n\n 7) davinci_mdio holds a spinlock while calling pm_runtime, which\n sleeps. Fix from Sebastian Siewior.\n\n 8) Timeout check in sh_eth_check_reset is off by one, from Sergei\n Shtylyov.\n\n 9) If sctp socket init fails, we can NULL deref during cleanup. Fix\n from Daniel Borkmann.\n\n10) netlink_mmap() does not propagate errors properly, from Patrick\n McHardy.\n\n11) Disable powersave and use minstrel by default in ath9k. From Sujith\n Manoharan.\n\n12) Fix a regression in that SOCK_ZEROCOPY is not set on tuntap sockets\n which prevents vhost from being able to use zerocopy. From Jason\n Wang.\n\n13) Fix race between port lookup and TX path in team driver, from Jiri\n Pirko.\n\n14) Missing length checks in bluetooth L2CAP packet parsing, from Johan\n Hedberg.\n\n15) rtlwifi fails to connect to networking using any encryption method\n other than WPA2. Fix from Larry Finger.\n\n16) Fix iwlegacy build due to incorrect CONFIG_* ifdeffing for power\n management stuff. From Yijing Wang.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)\n b43: stop format string leaking into error msgs\n ath9k: Use minstrel rate control by default\n Revert \"ath9k_hw: Update rx gain initval to improve rx sensitivity\"\n ath9k: Disable PowerSave by default\n net: wireless: iwlegacy: fix build error for il_pm_ops\n rtlwifi: Fix a false leak indication for PCI devices\n wl12xx/wl18xx: scan all 5ghz channels\n wl12xx: increase minimum singlerole firmware version required\n wl12xx: fix minimum required firmware version for wl127x multirole\n rtlwifi: rtl8192cu: Fix problem in connecting to WEP or WPA(1) networks\n mwifiex: debugfs: Fix out of bounds array access\n Bluetooth: Fix mgmt handling of power on failures\n Bluetooth: Fix missing length checks for L2CAP signalling PDUs\n Bluetooth: btmrvl: support Marvell Bluetooth device SD8897\n Bluetooth: Fix checks for LE support on LE-only controllers\n team: fix checks in team_get_first_port_txable_rcu()\n team: move add to port list before port enablement\n team: check return value of team_get_port_by_index_rcu() for NULL\n tuntap: set SOCK_ZEROCOPY flag during open\n netlink: fix error propagation in netlink_mmap()\n ...\n" }, { "commit": "b2cc9c19e48bcf00f10c23fbf9f6abe43f6929d5", "tree": "d38b1d04479c14c8a9bfdf01bc817490173dcd28", "parents": [ "a568fa1c91d4f0e565345119d0b942cc7f74ca3d", "ac4e97abce9b80c020e7113325f49e58b7b15e3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:42:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:42:39 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nPull block layer fixes from Jens Axboe:\n \"Outside of bcache (which really isn\u0027t super big), these are all\n few-liners. There are a few important fixes in here:\n\n - Fix blk pm sleeping when holding the queue lock\n\n - A small collection of bcache fixes that have been done and tested\n since bcache was included in this merge window.\n\n - A fix for a raid5 regression introduced with the bio changes.\n\n - Two important fixes for mtip32xx, fixing an oops and potential data\n corruption (or hang) due to wrong bio iteration on stacked devices.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n scatterlist: sg_set_buf() argument must be in linear mapping\n raid5: Initialize bi_vcnt\n pktcdvd: silence static checker warning\n block: remove refs to XD disks from documentation\n blkpm: avoid sleep when holding queue lock\n mtip32xx: Correctly handle bio-\u003ebi_idx !\u003d 0 conditions\n mtip32xx: Fix NULL pointer dereference during module unload\n bcache: Fix error handling in init code\n bcache: clarify free/available/unused space\n bcache: drop \"select CLOSURES\"\n bcache: Fix incompatible pointer type warning\n" }, { "commit": "c2853c8df57f49620d26f317d7d43347c29bfc2e", "tree": "4aa0a7f658e1db70c0f8e903cda95590bdb9b1c5", "parents": [ "89dc991f0f5272c307c746fdd57d0bff382b1ba2" ], "author": { "name": "Alex Shi", "email": "alex.shi@intel.com", "time": "Wed Jun 12 14:05:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:29:47 2013 -0700" }, "message": "include/linux/math64.h: add div64_ul()\n\nThere is div64_long() to handle the s64/long division, but no mocro do\nu64/ul division. It is necessary in some scenarios, so add this\nfunction.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Alex Shi \u003calex.shi@intel.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "30dad30922ccc733cfdbfe232090cf674dc374dc", "tree": "7663089f93435ea0c298eb69058ca834c109f530", "parents": [ "27749f2ff0717e115680922000839ad6a576eddf" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Jun 12 14:05:04 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:29:46 2013 -0700" }, "message": "mm: migration: add migrate_entry_wait_huge()\n\nWhen we have a page fault for the address which is backed by a hugepage\nunder migration, the kernel can\u0027t wait correctly and do busy looping on\nhugepage fault until the migration finishes. As a result, users who try\nto kick hugepage migration (via soft offlining, for example) occasionally\nexperience long delay or soft lockup.\n\nThis is because pte_offset_map_lock() can\u0027t get a correct migration entry\nor a correct page table lock for hugepage. This patch introduces\nmigration_entry_wait_huge() to solve this.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: Wanpeng Li \u003cliwanp@linux.vnet.ibm.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[2.6.35+]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "637241a900cbd982f744d44646b48a273d609b34", "tree": "0c8e84af9e6a37bd61f9fc9b7a668472df53df46", "parents": [ "cf7df378aa4ff7da3a44769b7ff6e9eef1a9f3db" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Wed Jun 12 14:04:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:29:44 2013 -0700" }, "message": "kmsg: honor dmesg_restrict sysctl on /dev/kmsg\n\nThe dmesg_restrict sysctl currently covers the syslog method for access\ndmesg, however /dev/kmsg isn\u0027t covered by the same protections. Most\npeople haven\u0027t noticed because util-linux dmesg(1) defaults to using the\nsyslog method for access in older versions. With util-linux dmesg(1)\ndefaults to reading directly from /dev/kmsg.\n\nTo fix /dev/kmsg, let\u0027s compare the existing interfaces and what they\nallow:\n\n - /proc/kmsg allows:\n - open (SYSLOG_ACTION_OPEN) if CAP_SYSLOG since it uses a destructive\n single-reader interface (SYSLOG_ACTION_READ).\n - everything, after an open.\n\n - syslog syscall allows:\n - anything, if CAP_SYSLOG.\n - SYSLOG_ACTION_READ_ALL and SYSLOG_ACTION_SIZE_BUFFER, if\n dmesg_restrict\u003d\u003d0.\n - nothing else (EPERM).\n\nThe use-cases were:\n - dmesg(1) needs to do non-destructive SYSLOG_ACTION_READ_ALLs.\n - sysklog(1) needs to open /proc/kmsg, drop privs, and still issue the\n destructive SYSLOG_ACTION_READs.\n\nAIUI, dmesg(1) is moving to /dev/kmsg, and systemd-journald doesn\u0027t\nclear the ring buffer.\n\nBased on the comments in devkmsg_llseek, it sounds like actions besides\nreading aren\u0027t going to be supported by /dev/kmsg (i.e.\nSYSLOG_ACTION_CLEAR), so we have a strict subset of the non-destructive\nsyslog syscall actions.\n\nTo this end, move the check as Josh had done, but also rename the\nconstants to reflect their new uses (SYSLOG_FROM_CALL becomes\nSYSLOG_FROM_READER, and SYSLOG_FROM_FILE becomes SYSLOG_FROM_PROC).\nSYSLOG_FROM_READER allows non-destructive actions, and SYSLOG_FROM_PROC\nallows destructive actions after a capabilities-constrained\nSYSLOG_ACTION_OPEN check.\n\n - /dev/kmsg allows:\n - open if CAP_SYSLOG or dmesg_restrict\u003d\u003d0\n - reading/polling, after open\n\nAddresses https://bugzilla.redhat.com/show_bug.cgi?id\u003d903192\n\n[akpm@linux-foundation.org: use pr_warn_once()]\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nReported-by: Christian Kujau \u003clists@nerdbynature.de\u003e\nTested-by: Josh Boyer \u003cjwboyer@redhat.com\u003e\nCc: Kay Sievers \u003ckay@vrfy.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "16e53dbf10a2d7e228709a7286310e629ede5e45", "tree": "4b606e077ba322764c584493243bbede219f737f", "parents": [ "77293e215edef7871a39de4b326f777bc39278ca" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Wed Jun 12 14:04:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 12 16:29:44 2013 -0700" }, "message": "CPU hotplug: provide a generic helper to disable/enable CPU hotplug\n\nThere are instances in the kernel where we would like to disable CPU\nhotplug (from sysfs) during some important operation. Today the freezer\ncode depends on this and the code to do it was kinda tailor-made for\nthat.\n\nRestructure the code and make it generic enough to be useful for other\nusecases too.\n\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Russ Anderson \u003crja@sgi.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b79462a8b9f9a452edc20c64a70a89ba3b0a6a88", "tree": "1fee0cd72cc92c6d0b3892c9b99af7a8e4382405", "parents": [ "72df935d985c1575ed44ad2c8c653b28147993fa" ], "author": { "name": "Jiri Pirko", "email": "jiri@resnulli.us", "time": "Sat Jun 08 15:00:55 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 12 00:56:27 2013 -0700" }, "message": "team: fix checks in team_get_first_port_txable_rcu()\n\nshould be checked if \"cur\" is txable, not \"port\".\n\nIntroduced by commit 6e88e1357c \"team: use function team_port_txable()\nfor determing enabled and up port\"\n\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea36b02269e49ad9dad926197de2ceab377c4c95", "tree": "d80e510716a055d325d670238957854d2a6715d6", "parents": [ "b67172ec0043bdc122aca334164979bd001450b6", "70423a379d5457f19b3b2ebc4239faebe64c602d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jun 11 15:57:17 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jun 11 15:57:51 2013 -0700" }, "message": "Merge branch \u0027clps711x/soc\u0027 into next/soc\n\nFrom Alexander Shiyan, this is a series of cleanups of clps711x, movig it\ncloser to multiplatform and cleans up a bunch of old code.\n\n* clps711x/soc:\n ARM: clps711x: Update defconfig\n ARM: clps711x: Add support for SYSCON driver\n ARM: clps711x: edb7211: Control LCD backlight via PWM\n ARM: clps711x: edb7211: Add support for I2C\n ARM: clps711x: Optimize interrupt handling\n ARM: clps711x: Add clocksource framework\n ARM: clps711x: Replace \"arch_initcall\" in common code with \".init_early\"\n ARM: clps711x: Move specific definitions from hardware.h to boards files\n ARM: clps711x: p720t: Define PLD registers as GPIOs\n ARM: clps711x: autcpu12: Move remaining specific definitions to board file\n ARM: clps711x: autcpu12: Special driver for handling memory is removed\n ARM: clps711x: autcpu12: Add support for NOR flash\n ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file\n ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source\n ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency\n ARM: clps711x: Re-add GPIO support\n GPIO: clps711x: Add DT support\n GPIO: clps711x: Rewrite driver for using generic GPIO code\n + Linux 3.10-rc4\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "6597619f9c85a0782d427d6723c96cf768e99086", "tree": "169e320427656ed43056e12d7f8510362a461e09", "parents": [ "e337d724e8ec40f80ade3371c002454f419a2c87" ], "author": { "name": "Alexander Shiyan", "email": "shc_work@mail.ru", "time": "Mon May 13 21:07:36 2013 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jun 11 15:47:45 2013 -0700" }, "message": "ARM: clps711x: Add support for SYSCON driver\n\nThis patch adds support for SYSCON driver for CLPS711X targets.\nAt this time there are no users for this driver, but it is will\nbe used as start point to use in CLPS711X drivers and remove\n\u003cmach/xx\u003e dependencies.\n\nSigned-off-by: Alexander Shiyan \u003cshc_work@mail.ru\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "620fa619a9aace41c21330d38fa045576ce3caff", "tree": "100fd9e4a39aaa6378ef948f8dd063ab1e4240c4", "parents": [ "ed3d27feccacf38299c244e9c0912e884a752b1d", "5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jun 11 00:21:46 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Jun 11 00:21:46 2013 -0700" }, "message": "Merge tag \u0027renesas-pinmux-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc\n\nFrom Simon Horman:\nRenesas ARM based SoC pinmux and GPIO update for v3.11\n\nSH-PFC:\n* Entries for INTC external IRQs\n* Remove dependency on GPIOLIB\n* PFC support for r8a7790 SoC\n* Pinmux support for r8a7778 SoC\n* Increase pin group and function coverage for sh7372, r8a7740,\n r8a7778, r8a7779 and r8a7790 SoCs\n* Use pinctrl mapping on mackerel, ap4evb, armadillo800eva,\n bonito, bockw, lager boards\n* Use RCAR_GP_PIN macro in marzen board\n* Remove unused GPIOs for sh7372, sh73a0, r8a7740 and r8a7790 SoCs\n* Add bias (pull-up/down) pinconf support for r8a7740 SoC\n* Add VCCQ support for sh73a0\n\nGPIO car:\n* Add RCAR_GP_PIN macro\n* Add support for IRQ_TYPE_EDGE_BOTH\n* Make the platform data gpio_base field signed\n\nThe GPIO changes have been included as the RCAR_GP_PIN and\nIRQ_TYPE_EDGE_BOTH changes are depended on by SH-PFC changes.\n\n* tag \u0027renesas-pinmux-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (132 commits)\n ARM: shmobile: marzen: Use RCAR_GP_PIN macro\n ARM: shmobile: lager: Initialize pinmux\n ARM: shmobile: bockw: add pinctrl support\n ARM: shmobile: kzm9g: tidyup FSI pinctrl\n ARM: shmobile: r8a7740 pinmux platform device cleanup\n ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH\n pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry\n Revert \"ARM: shmobile: Disallow PINCTRL without GPIOLIB\"\n pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces\n sh-pfc: r8a7778: add MMCIF pin groups\n sh-pfc: r8a7778: add HSPI pin groups\n sh-pfc: r8a7778: add I2C pin groups\n pinctrl: sh-pfc: fix a typo in pfc-r8a7790\n pinctrl: sh-pfc: fix r8a7790 Function Select register tables\n sh-pfc: r8a7778: fixup IRQ1A settings\n sh-pfc: r8a7779: add Ether pin groups\n sh-pfc: r8a7778: add Ether pin groups\n sh-pfc: r8a7778: add VIN pin groups\n sh-pfc: sh73a0: Remove function GPIOs\n sh-pfc: r8a7790: Add TPU pin groups and functions\n ...\n" }, { "commit": "54407f190c8d542572a9547ba5460d811810b6e4", "tree": "a5551de41842e27e0e806418ad76990c09a52708", "parents": [ "7173e59e6b5f9cbde3ece66ae664454edcac6382" ], "author": { "name": "Sergei Shtylyov", "email": "sergei.shtylyov@cogentembedded.com", "time": "Sun Jun 09 00:34:36 2013 +0400" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 11 16:11:16 2013 +0900" }, "message": "phy-rcar-usb: add R8A7778 support\n\nThe driver currently only supports R8A7779 SoC. Compared to it, R8A7778 USB-PHY\nhas extra register range containing two high-speed signal quality characteristic\ncontrol registers which should be set up during USB-PHY startup depending on\nwhether a ferrite bead is in use or not. So, we now handle an optional second\nmemory range in the driver\u0027s probe method, add the \u0027ferrite_bead\u0027 field to the\ndriver\u0027s platform data, and add an extra (optional) step to the USB-PHY startup\nroutine which sets up the extended registers.\n\nAlso mark in the driver\u0027s Kconfig section that R8A7778 is now supported and\ngenerally clarify that section, uppercasing the word \"phy\" and also changing\nthe module name that got lost in the big driver rename, while at it...\n\nThe patch has been tested on the Marzen and BOCK-W boards.\n\nSigned-off-by: Sergei Shtylyov \u003csergei.shtylyov@cogentembedded.com\u003e\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "6a82e2a83e568dc121326b4bab24035ce7a2f50e", "tree": "43a0193fbe852dd0ccc0058eca9c40d692b74a63", "parents": [ "725bf9dcafe16aa69c8ab34c63ba36c6eb4492f2" ], "author": { "name": "Sergei Shtylyov", "email": "sergei.shtylyov@cogentembedded.com", "time": "Sun Jun 02 01:52:28 2013 +0400" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 11 16:10:48 2013 +0900" }, "message": "phy-rcar-usb: add platform data\n\nCurrently the driver hard-codes USBPCTRL0 register to 0. It is wrong since this\nregister contains board-specific USB ports configuration and so its value should\nbe somehow passed via the platform data. Add the global header file containing\n\u0027struct rcar_phy_platform_data\u0027 consisting of the various bit fields describing\nUSB ports\u0027 pin configuration.\n\nSigned-off-by: Sergei Shtylyov \u003csergei.shtylyov@cogentembedded.com\u003e\nAcked-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "743fcce0a89e04dc511b4ea40eba8e3f7cec92d4", "tree": "5063feeef309582fb3a0904834f732d25f39fcf6", "parents": [ "2c8788bfd89bad424d3c288b5a52ce141271b862" ], "author": { "name": "Sergei Shtylyov", "email": "sergei.shtylyov@cogentembedded.com", "time": "Sun Jun 02 01:33:56 2013 +0400" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 11 16:10:45 2013 +0900" }, "message": "ehci-platform: add pre_setup() method to platform data\n\nSometimes there is a need to initialize some non-standard registers mapped to\nthe EHCI region before accessing the standard EHCI registers. Add pre_setup()\nmethod with \u0027struct usb_hcd *\u0027 parameter to be called just before ehci_setup()\nto the \u0027ehci-platform\u0027 driver\u0027s platform data for this purpose...\n\nWhile at it, add the missing incomplete declaration of \u0027struct platform_device\u0027\nto \u003clinux/usb/ehci_pdriver.h\u003e...\n\nThe patch has been tested on the Marzen and BOCK-W boards.\n\nSuggested-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Sergei Shtylyov \u003csergei.shtylyov@cogentembedded.com\u003e\nAcked-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nAcked-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "ed13998c319b050fc9abdb73915859dfdbe1fb38", "tree": "347c9ba28d34f2ab94823f8d52c0d223e00c036f", "parents": [ "92bb73ea2c434618a68a58a2f3a5c3fd0b660d18" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Jun 05 15:30:55 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 10 22:23:32 2013 -0700" }, "message": "sock_diag: fix filter code sent to userspace\n\nFilters need to be translated to real BPF code for userland, like SO_GETFILTER.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d62840995a99c9766803d54e9d7923f247a1c1db", "tree": "d278186c5541f3294a263edc19a15b4e1809cb06", "parents": [ "317ddd256b9c24b0d78fa8018f80f1e495481a10" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Wed May 22 02:41:36 2013 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Mon Jun 10 13:37:10 2013 -0700" }, "message": "trace: Allow idle-safe tracepoints to be called from irq\n\n__DECLARE_TRACE_RCU() currently creates an _rcuidle() tracepoint which\nmay safely be invoked from what RCU considers to be an idle CPU.\nHowever, these _rcuidle() tracepoints may -not- be invoked from the\nhandler of an irq taken from idle, because rcu_idle_enter() zeroes\nRCU\u0027s nesting-level counter, so that the rcu_irq_exit() returning to\nidle will trigger a WARN_ON_ONCE().\n\nThis commit therefore substitutes rcu_irq_enter() for rcu_idle_exit()\nand rcu_irq_exit() for rcu_idle_enter() in order to make the _rcuidle()\ntracepoints usable from irq handlers as well as from process context.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "14d0ee051753f30e23033bdb153110f00b03c8ce", "tree": "88a19ee630628e8904b96b586521d3f3755c14b8", "parents": [ "ea7f665612fcc73da6b7698f468cd5fc03a30d47", "f17a5194859a82afe4164e938b92035b86c55794" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 07 18:46:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 07 18:46:51 2013 -0700" }, "message": "Merge tag \u0027trace-fixes-v3.10-rc3-v3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull tracing fixes from Steven Rostedt:\n \"This contains 4 fixes.\n\n The first two fix the case where full RCU debugging is enabled,\n enabling function tracing causes a live lock of the system. This is\n due to the added debug checks in rcu_dereference_raw() that is used by\n the function tracer. These checks are also traced by the function\n tracer as well as cause enough overhead to the function tracer to slow\n down the system enough that the time to finish an interrupt can take\n longer than when the next interrupt is triggered, causing a live lock\n from the timer interrupt.\n\n Talking this over with Paul McKenney, we came up with a fix that adds\n a new rcu_dereference_raw_notrace() that does not perform these added\n checks, and let the function tracer use that.\n\n The third commit fixes a failed compile when branch tracing is\n enabled, due to the conversion of the trace_test_buffer() selftest\n that the branch trace wasn\u0027t converted for.\n\n The forth patch fixes a bug caught by the RCU lockdep code where a\n rcu_read_lock() is performed when rcu is disabled (either going to or\n from idle, or user space). This happened on the irqsoff tracer as it\n calls task_uid(). The fix here was to use current_uid() when possible\n that doesn\u0027t use rcu locking. Which luckily, is always used when\n irqsoff calls this code.\"\n\n* tag \u0027trace-fixes-v3.10-rc3-v3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:\n tracing: Use current_uid() for critical time tracing\n tracing: Fix bad parameter passed in branch selftest\n ftrace: Use the rcu _notrace variants for rcu_dereference_raw() and friends\n rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()\n" }, { "commit": "e56c60c374bbcd343ed286c713116056bf3d6d36", "tree": "287370ef948fbd7b9dc45c54e7ed7d384258dd26", "parents": [ "f49024926236068bc3fe6848aaf87b914049013a", "97c4e87d45498fb4d18c995721bba72345a7d257" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 07 17:01:42 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Jun 07 18:21:51 2013 -0700" }, "message": "Merge tag \u0027zynq-clk-for-3.11\u0027 of git://git.xilinx.com/linux-xlnx into next/soc\n\nFrom Michal Simek:\narm: Xilinx Zynq clock changes for v3.11\n\nChange Xilinx Zynq DT clock description which reflects logical abstraction\nof Zynq\u0027s clock tree.\n\n- Refactor PLL driver\n- Use new clock controller driver\n- Change timer and uart drivers\n\n* tag \u0027zynq-clk-for-3.11\u0027 of git://git.xilinx.com/linux-xlnx:\n clk: zynq: Remove deprecated clock code\n arm: zynq: Migrate platform to clock controller\n clk: zynq: Add clock controller driver\n clk: zynq: Factor out PLL driver\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "a7526eb5d06b0084ef12d7b168d008fcf516caab", "tree": "c79242698fadf78c23bbb9f50a7a8b9a74a40284", "parents": [ "4d3797d7e1861ac1af150a6189315786c5e1c820" ], "author": { "name": "Andy Lutomirski", "email": "luto@amacapital.net", "time": "Wed Jun 05 19:38:26 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 06 11:52:14 2013 -0700" }, "message": "net: Unbreak compat_sys_{send,recv}msg\n\nI broke them in this commit:\n\n commit 1be374a0518a288147c6a7398792583200a67261\n Author: Andy Lutomirski \u003cluto@amacapital.net\u003e\n Date: Wed May 22 14:07:44 2013 -0700\n\n net: Block MSG_CMSG_COMPAT in send(m)msg and recv(m)msg\n\nThis patch adds __sys_sendmsg and __sys_sendmsg as common helpers that accept\nMSG_CMSG_COMPAT and blocks MSG_CMSG_COMPAT at the syscall entrypoints. It\nalso reverts some unnecessary checks in sys_socketcall.\n\nApparently I was suffering from underscore blindness the first time around.\n\nSigned-off-by: Andy Lutomirski \u003cluto@amacapital.net\u003e\nTested-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4d3797d7e1861ac1af150a6189315786c5e1c820", "tree": "aa7eff5dc1e297e1560eaa85d1fac5735e0650c1", "parents": [ "844ce9f2044723a9da0f4bce588cca410e774d24", "5343a7f8be11951cb3095b91e8e4eb506cfacc0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 05 19:19:04 2013 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 05 19:19:04 2013 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix timeouts with direct mode authentication in mac80211, from\n Stanislaw Gruszka.\n\n 2) Aggregation sessions can deadlock in ath9k, from Felix Fietkau.\n\n 3) Netfilter\u0027s xt_addrtype doesn\u0027t work with ipv6 due to route lookups\n creating undesirable cache entries, from Florian Westphal.\n\n 4) Fix netfilter\u0027s ipt_ULOG from generating non-NULL terminated\n strings.\n\n 5) Fix netdev transmit queue crashes in mac80211, from Johannes Berg.\n\n 6) Fix copy and paste error in 802.11 stack that broke reporting of\n 64-bit station tx statistics, from Felix Fietkau.\n\n 7) When qlge_probe fails, it leaks the netdev. Fix from Wei Yongjun.\n\n 8) SKB control block (where we store the IP options information,\n amongst other things) must be cleared properly otherwise ICMP\n sending can crash for IP tunnels. Fix from Eric Dumazet.\n\n 9) Verification of Energy Efficient Ether support was coded wrongly,\n the test was inversed. Fix from Giuseppe CAVALLARO.\n\n10) TCP handles redirects improperly because the wrong flow key is used\n for the route lookup. From Michal Kubecek.\n\n11) Don\u0027t interpret MSG_CMSG_COMPAT from userspace, fix from Andy\n Lutomirski.\n\n12) The new AF_VSOCK was missing from the lockdep string table, fix from\n Federico Vaga.\n\n13) be2net doesn\u0027t handle checksumming of IP fragments properly, from\n Somnath Kotur.\n\n14) Fix several bugs in the device address list code that lead to\n crashes and other misbehaviors. From Jay Vosburgh.\n\n15) Fix ipv6 segmentation handling of fragmented GRE tunnel traffic,\n from Pravin B Shalr.\n\n16) Fix usage of stale policies in IPSEC layer, from Paul Moore.\n\n17) Fix team driver dump of ports when there are a large number of them,\n from Jiri Pirko.\n\n18) Fix softlockups in UDP ipv4 socket lookup causes by and error in the\n hlist_nulls_for_each_entry_rcu() macro. From Eric Dumazet.\n\n19) Fix several regressions added by the high rate accuracy changes to\n the htb packet scheduler. From Eric Dumazet.\n\n20) Fix DMA\u0027ing onto the stack in esd_usb2 and peak_usb CAN drivers,\n from Olivier Sobrie and Marc Kleine-Budde.\n\n21) Fix unremovable network devices due to missing route pointer\n installation in the per-device ipv6 address list entries. From Gao\n feng.\n\n22) Apply the tg3 5719 DMA workaround on 5720 chips as well, otherwise\n we get stalls. From Nithin Sujir.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)\n net_sched: htb: do not mix 1ns and 64ns time units\n net: fix sk_buff head without data area\n tg3: Add read dma workaround for 5720\n net: ethernet: xilinx_emaclite: set protocol selector bits when writing ANAR\n bnx2x: Fix bridged GSO for 57710/57711 chips\n net: fec: add fallback to random MAC address\n bnx2x: fix TCP offload for tunneling ipv4 over ipv6\n ipv6: assign rt6_info to inet6_ifaddr in init_loopback\n net/mlx4_core: Keep VF assigned MAC in the PF admin table\n net/mlx4_en: Handle unassigned VF MAC address correctly\n net/mlx4_core: Return -EPROBE_DEFER when a VF is probed before PF is sufficiently initialized\n net/mlx4_en: Fix adaptive moderation cq update\n net: can: peak_usb: Do not do dma on the stack\n net: can: esd_usb2: Do not do dma on the stack\n net: can: kvaser_usb: fix reception on \"USBcan Pro\" and \"USBcan R\" type hardware.\n net_sched: restore \"overhead xxx\" handling\n net: force a reload of first item in hlist_nulls_for_each_entry_rcu\n hyperv: Fix vlan_proto setting in netvsc_recv_callback()\n team: fix port list dump for big number of ports\n list: introduce list_first_entry_or_null\n ...\n" }, { "commit": "11df28ab76cd9e98e3e0bbbff8648d0a02509507", "tree": "4d03553042583cb4d4d434ee8dcefe2026f07af9", "parents": [ "7e1092b5a264c484001b0cdd1f49bea7884e3366" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart+renesas@ideasonboard.com", "time": "Mon Apr 08 11:36:13 2013 +0200" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 04 21:03:56 2013 +0900" }, "message": "gpio-rcar: Add RCAR_GP_PIN macro\n\nPins are numbered in the R-Car family documentation using a bank number\nand a pin number in the bank. As the Linux pin number space is linear,\nwe need to flatten this by multiplying the bank number by 32 and adding\nthe pin number. The resulting number bear no directly visible\nrelationship to the documentation, making it error-prone.\n\nAdd a RCAR_GP_PIN macro to convert from the documentation pin number\nspace to the linear Linux space.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart+renesas@ideasonboard.com\u003e\n[horms+renesas@verge.net.au: non-trivial rebase on top of\n \"sh-pfc: r8a7779: Don\u0027t group USB OVC and PENC pins\"]\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "7e1092b5a264c484001b0cdd1f49bea7884e3366", "tree": "b16dcf9106df40c5a021dde86eea17b862cb9dfe", "parents": [ "36cb0066ffc55fd326c8a21ffe80aaa5bd16021b" ], "author": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Fri May 24 18:47:24 2013 +0900" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 04 20:28:36 2013 +0900" }, "message": "gpio-rcar: Add support for IRQ_TYPE_EDGE_BOTH\n\nAs hardware support for this feature is not universal for all SoCs a flag,\nhas_both_edge_trigger, has been added to the platform data of the driver to\nallow this feature to be enabled.\n\nThe motivation for this is to allow use of the gpio-keys driver on the\nlager board which is based on the r8a7790 SoC. The V2 of this patch has been\nfully exercised using that driver on that board.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "36cb0066ffc55fd326c8a21ffe80aaa5bd16021b", "tree": "a6104d58fef9551eaa54d9eb52c512fd3198feba", "parents": [ "c234962b808f289237a40e4ce5fc1c8066d1c9d0" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri May 10 16:48:36 2013 +0200" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Tue Jun 04 20:28:36 2013 +0900" }, "message": "gpio-rcar: Make the platform data gpio_base field signed\n\nThe gpio_base field is used to specify the desired GPIO base for the\nGPIO controller. The GPIO core can automatically allocate a GPIO number\nrange when the base is set to -1. To make this possible, make the field\nsigned.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "7d80fea4263d9a83ffedea448afa8510b05d04d0", "tree": "202118fd64ea1a661e3945e1a5bf13ef2d6f90eb", "parents": [ "338e33acd820fa89b8a2d5b6574233784702f618", "2a0ff3fbe39bc93f719ff857e5a359d9780579ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 03 17:57:16 2013 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 03 17:57:16 2013 +0900" }, "message": "Merge branch \u0027for-3.10-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup fixes from Tejun Heo:\n\n - Fix for yet another xattr bug which may lead to NULL deref.\n\n - A subtle bug in for_each_descendant_pre(). This bug requires quite\n specific conditions to trigger and isn\u0027t too likely to actually\n happen in the wild, but maybe that just makes it that much more\n nastier.\n\n - A warning message added for silly cgroup re-mount (not -o remount,\n but unmount followed by mount) behavior.\n\n* \u0027for-3.10-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: warn about mismatching options of a new mount of an existing hierarchy\n cgroup: fix a subtle bug in descendant pre-order walk\n cgroup: initialize xattr before calling d_instantiate()\n" }, { "commit": "c87a124a5d5e8cf8e21c4363c3372bcaf53ea190", "tree": "291681da6b67bc52bf92703f895070eb8b772a8c", "parents": [ "c802db1164f28e62c6a43132b8d290cb8113f2ac" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 29 09:06:27 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 02 20:53:59 2013 -0700" }, "message": "net: force a reload of first item in hlist_nulls_for_each_entry_rcu\n\nRoman Gushchin discovered that udp4_lib_lookup2() was not reloading\nfirst item in the rcu protected list, in case the loop was restarted.\n\nThis produced soft lockups as in https://lkml.org/lkml/2013/4/16/37\n\nrcu_dereference(X)/ACCESS_ONCE(X) seem to not work as intended if X is\nptr-\u003efield :\n\nIn some cases, gcc caches the value or ptr-\u003efield in a register.\n\nUse a barrier() to disallow such caching, as documented in\nDocumentation/atomic_ops.txt line 114\n\nThanks a lot to Roman for providing analysis and numerous patches.\n\nDiagnosed-by: Roman Gushchin \u003cklamm@yandex-team.ru\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nReported-by: Boris Zhmurov \u003czhmurov@yandex-team.ru\u003e\nSigned-off-by: Roman Gushchin \u003cklamm@yandex-team.ru\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db9bde2fa518fa67d28ffa287d1209871bcdc789", "tree": "ef90d0d1fd72ab08dde7e9a6ca0556aa86686a80", "parents": [ "6678e38959f99a5669ce0a261a0b7f09a9aff0f8", "033a899c9b06e7e4f6733a637fee34c632ca2d47" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:39:35 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:39:35 2013 -0700" }, "message": "Merge branch \u0027VExpress_DCSCB\u0027 of git://git.linaro.org/people/nico/linux into next/soc\n\nFrom Nicolas Pitre:\n\nThis is the first MCPM backend submission for VExpress running on RTSM\naka Fast Models implementing the big.LITTLE system architecture. This\nenables SMP secondary boot as well as CPU hotplug on this platform.\n\nA big prerequisite for this support is the CCI driver from Lorenzo\nincluded in this pull request.\n\nAlso included is Rob Herring\u0027s set_auxcr/get_auxcr allowing nicer code.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n\n* \u0027VExpress_DCSCB\u0027 of git://git.linaro.org/people/nico/linux:\n ARM: vexpress: Select multi-cluster SMP operation if required\n ARM: vexpress/dcscb: handle platform coherency exit/setup and CCI\n ARM: vexpress/dcscb: do not hardcode number of CPUs per cluster\n ARM: vexpress/dcscb: add CPU use counts to the power up/down API implementation\n ARM: vexpress: introduce DCSCB support\n ARM: introduce common set_auxcr/get_auxcr functions\n drivers/bus: arm-cci: function to enable CCI ports from early boot code\n drivers: bus: add ARM CCI support\n" }, { "commit": "85b9174fda1d516198b4a46a7795e43636a3ea4c", "tree": "2721a32c07ca3e1d46df573a19b4e92853688966", "parents": [ "2dbefbf6a803d65f6327fe617f5e1960f218ce01", "ea7e0bd7e78868bbe6df6834595ef96166dd296a" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:23:25 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:23:25 2013 -0700" }, "message": "Merge tag \u0027seb_clk-3.11\u0027 of git://git.infradead.org/users/jcooper/linux into next/soc\n\nFrom Jason Cooper:\nmvebu clock restructuring for v3.11\n\n - clk: mvebu\n - reorganize by SoC to remove built up #ifdefs\n - add clk flags per clock gate\n\n* tag \u0027seb_clk-3.11\u0027 of git://git.infradead.org/users/jcooper/linux:\n clk: mvebu: disintegrate obsolete file\n ARM: mvebu: move DT boards to SoC-centric clock init\n ARM: kirkwood: move DT boards to SoC-centric clock init\n ARM: dove: move DT boards to SoC-centric clock init\n clk: mvebu: add Armada XP SoC-centric clock init\n clk: mvebu: add Armada 370 SoC-centric clock init\n clk: mvebu: add Kirkwood SoC-centric clock init\n clk: mvebu: add Dove SoC-centric clock init\n clk: mvebu: add common clock functions for core clk and clk gating\n clk: mvebu: introduce per-clock-gate flags\n" }, { "commit": "a640874bb6596f09160b1f39699618f635465e12", "tree": "20f39d27d2e819347b8db2b224a24346187268d5", "parents": [ "48cba51d8f82f3ff2766a7f3a9ad26d1d2fb9042", "3d9939c92efdd4ced672b94994959ca71b141cb8" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:13:24 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 31 23:13:24 2013 -0700" }, "message": "Merge tag \u0027pcie-3.11-2\u0027 of git://git.infradead.org/users/jcooper/linux into next/soc\n\nPCI-e driver for mvebu.\n\n* tag \u0027pcie-3.11-2\u0027 of git://git.infradead.org/users/jcooper/linux:\n pci: mvebu: fix return value check in mvebu_pcie_probe()\n arm: mvebu: PCIe support is now available on mvebu\n pci: PCIe driver for Marvell Armada 370/XP systems\n clk: mvebu: add more PCIe clocks for Armada XP\n clk: mvebu: create parent-child relation for PCIe clocks on Armada 370\n of/pci: Add of_pci_parse_bus_range() function\n of/pci: Add of_pci_get_devfn() function\n of/pci: Provide support for parsing PCI DT ranges property\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "6d7581e62f8be462440d7b22c6361f7c9fa4902b", "tree": "0f85824301b8a252ffe5a4e88288191c46cd98b2", "parents": [ "e4e8536f65b51ce91c30588b0925872bdfc60d03" ], "author": { "name": "Jiri Pirko", "email": "jiri@resnulli.us", "time": "Wed May 29 05:02:56 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 31 17:31:52 2013 -0700" }, "message": "list: introduce list_first_entry_or_null\n\nnon-rcu variant of list_first_or_null_rcu\n\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1e2bd517c108816220f262d7954b697af03b5f9c", "tree": "28fd8bea22513b7fcf8caa1a644f075f13ec5f48", "parents": [ "b190a50875b95e58ebe2b00ed3bf7f1d44961471" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Thu May 30 06:45:27 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 31 17:06:07 2013 -0700" }, "message": "udp6: Fix udp fragmentation for tunnel traffic.\n\nudp6 over GRE tunnel does not work after to GRE tso changes. GRE\ntso handler passes inner packet but keeps track of outer header\nstart in SKB_GSO_CB(skb)-\u003emac_offset. udp6 fragment need to\ntake care of outer header, which start at the mac_offset, while\nadding fragment header.\nThis bug is introduced by commit 68c3316311 (GRE: Add TCP\nsegmentation offload for GRE).\n\nReported-by: Dmitry Kravkov \u003cdkravkov@gmail.com\u003e\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nTested-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73ce00d4d6369c1a91c95f9b41e6ce498fbbd56f", "tree": "71b6049295835ece130e65d6ce050f4119714e45", "parents": [ "8e6d91ae0917bf934ed86411148f79d904728d51", "a70b9641e6a90d6821e4354a2c2fede74015db29" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 30 16:38:38 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 30 16:38:38 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following patchset contains Netfilter/IPVS fixes for 3.10-rc3,\nthey are:\n\n* fix xt_addrtype with IPv6, from Florian Westphal. This required\n a new hook for IPv6 functions in the netfilter core to avoid\n hard dependencies with the ipv6 subsystem when this match is\n only used for IPv4.\n\n* fix connection reuse case in IPVS. Currently, if an reused\n connection are directed to the same server. If that server is\n down, those connection would fail. Therefore, clear the\n connection and choose a new server among the available ones.\n\n* fix possible non-nul terminated string sent to user-space if\n ipt_ULOG is used as the default netfilter logging stub, from\n Chen Gang.\n\n* fix mark logging of IPv6 packets in xt_LOG, from Michal Kubecek.\n This bug has been there since 2.6.26.\n\n* Fix breakage ip_vs_sh due to incorrect structure layout for\n RCU, from Jan Beulich.\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": "37448adfc7ce0d6d5892b87aa8d57edde4126f49", "tree": "384a776fe506e4dfb1cb6d64cc56ce7ae3c289e9", "parents": [ "e4aa937ec75df0eea0bee03bffa3303ad36c986b" ], "author": { "name": "Lance Ortiz", "email": "lance.ortiz@hp.com", "time": "Thu May 30 08:25:12 2013 -0600" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu May 30 10:51:20 2013 -0700" }, "message": "aerdrv: Move cper_print_aer() call out of interrupt context\n\nThe following warning was seen on 3.9 when a corrected PCIe error was being\nhandled by the AER subsystem.\n\nWARNING: at .../drivers/pci/search.c:214 pci_get_dev_by_id+0x8a/0x90()\n\nThis occurred because a call to pci_get_domain_bus_and_slot() was added to\ncper_print_pcie() to setup for the call to cper_print_aer(). The warning\nshowed up because cper_print_pcie() is called in an interrupt context and\npci_get* functions are not supposed to be called in that context.\n\nThe solution is to move the cper_print_aer() call out of the interrupt\ncontext and into aer_recover_work_func() to avoid any warnings when calling\npci_get* functions.\n\nSigned-off-by: Lance Ortiz \u003clance.ortiz@hp.com\u003e\nAcked-by: Borislav Petkov \u003cbp@suse.de\u003e\nAcked-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ac4e97abce9b80c020e7113325f49e58b7b15e3f", "tree": "6b1395a60b4e28a34f4e3693fbfb3df98008a20b", "parents": [ "4997b72ee62930cb841d185398ea547d979789f4" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu May 30 09:19:35 2013 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu May 30 09:20:20 2013 +0200" }, "message": "scatterlist: sg_set_buf() argument must be in linear mapping\n\nAdd a check behind CONFIG_DEBUG_SG to verify this.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "ed69bdd8fd9b2db68b915ce5f60fc51d4744a9b1", "tree": "02dc3a5343f662ce153c66cb0e370a49b35b066f", "parents": [ "78ecad0183bd7e49131da2b5aa82bee017db1cf0" ], "author": { "name": "Lorenzo Pieralisi", "email": "lorenzo.pieralisi@arm.com", "time": "Fri Jul 13 15:55:52 2012 +0100" }, "committer": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed May 29 15:50:34 2013 -0400" }, "message": "drivers: bus: add ARM CCI support\n\nOn ARM multi-cluster systems coherency between cores running on\ndifferent clusters is managed by the cache-coherent interconnect (CCI).\nIt allows broadcasting of TLB invalidates and memory barriers and it\nguarantees cache coherency at system level through snooping of slave\ninterfaces connected to it.\n\nThis patch enables the basic infrastructure required in Linux to handle and\nprogramme the CCI component.\n\nNon-local variables used by the CCI management functions called by power\ndown function calls after disabling the cache must be flushed out to main\nmemory in advance, otherwise incoherency of those values may occur if they\nare sitting in the cache of some other CPU when power down functions\nexecute. Driver code ensures that relevant data structures are flushed\nfrom inner and outer caches after the driver probe is completed.\n\nCCI slave port resources are linked to set of CPUs through bus masters\nphandle properties that link the interface resources to masters node in\nthe device tree.\n\nDocumentation describing the CCI DT bindings is provided with the patch.\n\nSigned-off-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\n" }, { "commit": "ea7e0bd7e78868bbe6df6834595ef96166dd296a", "tree": "8584aa50c8219cfb3d6342ba91a3aaccc285e197", "parents": [ "9cbbc51551522efbc8313d45178a3415fd474eab" ], "author": { "name": "Sebastian Hesselbarth", "email": "sebastian.hesselbarth@gmail.com", "time": "Tue May 28 15:13:18 2013 +0000" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Wed May 29 19:28:29 2013 +0000" }, "message": "clk: mvebu: disintegrate obsolete file\n\nSwitch from function-centric to soc-centric clock drivers now makes\na bunch of files obsolete. This deletes all files and Kconfig options\nthat are not required anymore.\n\nSigned-off-by: Sebastian Hesselbarth \u003csebastian.hesselbarth@gmail.com\u003e\nAcked-by: Mike Turquette \u003cmturquette@linaro.org\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "12bcbe66d7b3cc9f9f86cd02f925666eaa3c2107", "tree": "54e70e0f7450aedfee1418742758dc538d9649e5", "parents": [ "6721cb60022629ae76365551f05d9658b8d14c55" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue May 28 14:38:42 2013 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue May 28 22:47:13 2013 -0400" }, "message": "rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()\n\nAs rcu_dereference_raw() under RCU debug config options can add quite a\nbit of checks, and that tracing uses rcu_dereference_raw(), these checks\nhappen with the function tracer. The function tracer also happens to trace\nthese debug checks too. This added overhead can livelock the system.\n\nAdd a new interface to RCU for both rcu_dereference_raw_notrace() as well\nas hlist_for_each_entry_rcu_notrace() as the hlist iterator uses the\nrcu_dereference_raw() as well, and is used a bit with the function tracer.\n\nLink: http://lkml.kernel.org/r/20130528184209.304356745@goodmis.org\n\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "30e1e28598c2674c133148d8aec6d431d7acd314", "tree": "e17a5fba2151cf6d32d0f39b9d69910f85b71a9f", "parents": [ "0ee52b157b8ed88550ddd6291e54bb4bfabde364" ], "author": { "name": "Soren Brinkmann", "email": "soren.brinkmann@xilinx.com", "time": "Mon May 13 10:46:38 2013 -0700" }, "committer": { "name": "Michal Simek", "email": "michal.simek@xilinx.com", "time": "Mon May 27 09:21:22 2013 +0200" }, "message": "arm: zynq: Migrate platform to clock controller\n\nMigrate the Zynq platform and its drivers to use the new clock\ncontroller driver.\n\nSigned-off-by: Soren Brinkmann \u003csoren.brinkmann@xilinx.com\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: linux-serial@vger.kernel.org\nSigned-off-by: Michal Simek \u003cmichal.simek@xilinx.com\u003e\nAcked-by: Mike Turquette \u003cmturquette@linaro.org\u003e\n" }, { "commit": "27a24cfa04c6f041c0191847d047f25e5627cd63", "tree": "c5377af546f914cc9ca665fd00c825204d61ef35", "parents": [ "6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5", "b59cc200ac025aca597fb21862c1c9e667f2eff2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 25 20:30:31 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 25 20:30:31 2013 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dma fixes from Vinod Koul:\n \"We have two patches from Andy \u0026 Rafael fixing the Lynxpoint dma\"\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n ACPI / LPSS: register clock device for Lynxpoint DMA properly\n dma: acpi-dma: parse CSRT to extract additional resources\n" }, { "commit": "9cf1848278a41f8d5f69b26bca546cfd2d5677d8", "tree": "2628cd3e8e3ca1acfe81e636b082c285d97640d9", "parents": [ "00cec111ac477ba71c99043358f17e9bb4d335fe", "03e04f048d2774aabd126fbad84729d4ba9dc40a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 18:12:15 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 18:12:15 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (incoming from Andrew Morton)\n\nMerge fixes from Andrew Morton:\n \"A bunch of fixes and one simple fbdev driver which missed the merge\n window because people will still talking about it (to no great\n effect).\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (30 commits)\n aio: fix kioctx not being freed after cancellation at exit time\n mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas\n drivers/rtc/rtc-max8998.c: check for pdata presence before dereferencing\n ocfs2: goto out_unlock if ocfs2_get_clusters_nocache() failed in ocfs2_fiemap()\n random: fix accounting race condition with lockless irq entropy_count update\n drivers/char/random.c: fix priming of last_data\n mm/memory_hotplug.c: fix printk format warnings\n nilfs2: fix issue of nilfs_set_page_dirty() for page at EOF boundary\n drivers/block/brd.c: fix brd_lookup_page() race\n fbdev: FB_GOLDFISH should depend on HAS_DMA\n drivers/rtc/rtc-pl031.c: pass correct pointer to free_irq()\n auditfilter.c: fix kernel-doc warnings\n aio: fix io_getevents documentation\n revert \"selftest: add simple test for soft-dirty bit\"\n drivers/leds/leds-ot200.c: fix error caused by shifted mask\n mm/THP: use pmd_populate() to update the pmd with pgtable_t pointer\n linux/kernel.h: fix kernel-doc warning\n mm compaction: fix of improper cache flush in migration code\n rapidio/tsi721: fix bug in MSI interrupt handling\n hfs: avoid crash in hfs_bnode_create\n ...\n" }, { "commit": "00cec111ac477ba71c99043358f17e9bb4d335fe", "tree": "1adbf2351b2f84d7a52aea35530635530de3dd26", "parents": [ "17fdfd0851617b6c18c0913364caf2a54171ce85", "f4ae176c626311d6507c9a2d263657c4cc4e1667" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:27:37 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:27:37 2013 -0700" }, "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 \"We didn\u0027t have any fixes sent up for -rc2, so this is a slightly\n larger batch. A bit all over the place platform-wise; OMAP, at91,\n marvell, renesas, sunxi, ux500, etc.\n\n I tried to summarize highlights but there isn\u0027t a whole lot to point\n out. Lots of little things fixed all over. A couple of defconfig\n updates due to new/changing options.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n ARM: at91/sama5: fix incorrect PMC pcr div definition\n ARM: at91/dt: fix macb pinctrl_macb_rmii_mii_alt definition\n ARM: at91: at91sam9n12: move external irq declatation to DT\n ARM: shmobile: marzen: Use error values in usb_power_*\n ARM: tegra: defconfig fixes\n ARM: nomadik: fix IRQ assignment for SMC ethernet\n ARM: vt8500: Add missing NULL terminator in dt_compat\n clk: tegra: add ac97 controller clock\n clk: tegra: remove USB from clk init table\n ARM: dts: mvebu: Fix wrong the address reg value for the L2-cache node\n ARM: plat-orion: Fix num_resources and id for ge10 and ge11\n ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis\n SERIAL: OMAP: Remove the slave idle handling from the driver\n ARM: OMAP2+: serial: Remove the un-used slave idle hooks\n ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes\n ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active\n ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc()\n arm: mvebu: fix the \u0027ranges\u0027 property to handle PCIe\n ARM: mvebu: select ARCH_REQUIRE_GPIOLIB for mvebu platform\n ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock\n ...\n" }, { "commit": "7450231fb35492951e78a91b833fd935171f4e66", "tree": "3e0327c1ae0953951ce0e2c30aa4761eabfa531e", "parents": [ "c2cc499c5bcf9040a738f49e8051b42078205748" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@infradead.org", "time": "Fri May 24 15:55:20 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:22:51 2013 -0700" }, "message": "linux/kernel.h: fix kernel-doc warning\n\nFix kernel-doc warning in \u003clinux/kernel.h\u003e:\n\n Warning(include/linux/kernel.h:590): No description found for parameter \u0027ip\u0027\n\nscripts/kernel-doc cannot handle macros, functions, or function\nprototypes between the function or macro that is being documented and\nits definition, so move these prototypes above the function that is\nbeing documented.\n\nSigned-off-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4c663cfc523a88d97a8309b04a089c27dc57fd7e", "tree": "d3b9de53922dbc326017075bd5e1558b5f8c741d", "parents": [ "7b92d03c3239f43e5b86c9cc9630f026d36ee995" ], "author": { "name": "Imre Deak", "email": "imre.deak@intel.com", "time": "Fri May 24 15:55:09 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:22:50 2013 -0700" }, "message": "wait: fix false timeouts when using wait_event_timeout()\n\nMany callers of the wait_event_timeout() and\nwait_event_interruptible_timeout() expect that the return value will be\npositive if the specified condition becomes true before the timeout\nelapses. However, at the moment this isn\u0027t guaranteed. If the wake-up\nhandler is delayed enough, the time remaining until timeout will be\ncalculated as 0 - and passed back as a return value - even if the\ncondition became true before the timeout has passed.\n\nFix this by returning at least 1 if the condition becomes true. This\nsemantic is in line with what wait_for_condition_timeout() does; see\ncommit bb10ed09 (\"sched: fix wait_for_completion_timeout() spurious\nfailure under heavy load\").\n\nDaniel said \"We have 3 instances of this bug in drm/i915. One case even\nwhere we switch between the interruptible and not interruptible\nwait_event_timeout variants, foolishly presuming they have the same\nsemantics. I very much like this.\"\n\nOne such bug is reported at\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d64133\n\nSigned-off-by: Imre Deak \u003cimre.deak@intel.com\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Lukas Czerner \u003clczerner@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bc8fcfea18249640f2728c46d70999dcb7e4dc49", "tree": "7d24b4132c4dd821c998649f21344bec6f4a3453", "parents": [ "a11650e11093ed57dca78bf16e7836517c599098" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Fri May 24 15:55:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:22:50 2013 -0700" }, "message": "rapidio: add enumeration/discovery start from user space\n\nAdd RapidIO enumeration/discovery start from user space. User space\nstart allows to defer RapidIO fabric scan until the moment when all\nparticipating endpoints are initialized avoiding mandatory synchronized\nstart of all endpoints (which may be challenging in systems with large\nnumber of RapidIO endpoints).\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a11650e11093ed57dca78bf16e7836517c599098", "tree": "9823799d4c54337971b4654ea9e5510131dae9c5", "parents": [ "585dc0c2f68981c02a0bb6fc8fe191a3f513959c" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Fri May 24 15:55:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 16:22:50 2013 -0700" }, "message": "rapidio: make enumeration/discovery configurable\n\nSystems that use RapidIO fabric may need to implement their own\nenumeration and discovery methods which are better suitable for needs of\na target application.\n\nThe following set of patches is intended to simplify process of\nintroduction of new RapidIO fabric enumeration/discovery methods.\n\nThe first patch offers ability to add new RapidIO enumeration/discovery\nmethods using kernel configuration options. This new configuration\noption mechanism allows to select statically linked or modular\nenumeration/discovery method(s) from the list of existing methods or use\nexternal module(s).\n\nThis patch also updates the currently existing enumeration/discovery\ncode to be used as a statically linked or modular method.\n\nThe corresponding configuration option is named \"Basic\nenumeration/discovery\" method. This is the only one configuration\noption available today but new methods are expected to be introduced\nafter adoption of provided patches.\n\nThe second patch address a long time complaint of RapidIO subsystem\nusers regarding fabric enumeration/discovery start sequence. Existing\nimplementation offers only a boot-time enumeration/discovery start which\nrequires synchronized boot of all endpoints in RapidIO network. While\nit works for small closed configurations with limited number of\nendpoints, using this approach in systems with large number of endpoints\nis quite challenging.\n\nTo eliminate requirement for synchronized start the second patch\nintroduces RapidIO enumeration/discovery start from user space.\n\nFor compatibility with the existing RapidIO subsystem implementation,\nautomatic boot time enumeration/discovery start can be configured in by\nspecifying \"rio-scan.scan\u003d1\" command line parameter if statically linked\nbasic enumeration method is selected.\n\nThis patch:\n\nRework to implement RapidIO enumeration/discovery method selection\ncombined with ability to use enumeration/discovery as a kernel module.\n\nThis patch adds ability to introduce new RapidIO enumeration/discovery\nmethods using kernel configuration options. Configuration option\nmechanism allows to select statically linked or modular\nenumeration/discovery method from the list of existing methods or use\nexternal modules. If a modular enumeration/discovery is selected each\nRapidIO mport device can have its own method attached to it.\n\nThe existing enumeration/discovery code was updated to be used as\nstatically linked or modular method. This configuration option is named\n\"Basic enumeration/discovery\" method.\n\nSeveral common routines have been moved from rio-scan.c to make them\navailable to other enumeration methods and reduce number of exported\nsymbols.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Andre van Herk \u003candre.van.herk@Prodrive.nl\u003e\nCc: Micha Nelissen \u003cmicha.nelissen@Prodrive.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb3d33900aa953bcdfe132a71bb03ee592ebbb47", "tree": "020bf904e5d5e9b3106228514f925b041492df28", "parents": [ "514e250f67d2b2a8ab08dc9c3650af19a411c926", "950e2958a5e96406e6e5ff4190a638a54769f89b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 08:27:32 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 24 08:27:32 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"It\u0027s been a while since my last pull request so quite a few fixes have\n piled up.\"\n\nIndeed.\n\n 1) Fix nf_{log,queue} compilation with PROC_FS disabled, from Pablo\n Neira Ayuso.\n\n 2) Fix data corruption on some tg3 chips with TSO enabled, from Michael\n Chan.\n\n 3) Fix double insertion of VLAN tags in be2net driver, from Sarveshwar\n Bandi.\n\n 4) Don\u0027t have TCP\u0027s MD5 support pass \u003e PAGE_SIZE page offsets in\n scatter-gather entries into the crypto layer, the crypto layer can\u0027t\n handle that. From Eric Dumazet.\n\n 5) Fix lockdep splat in 802.1Q MRP code, also from Eric Dumazet.\n\n 6) Fix OOPS in netfilter log module when called from conntrack, from\n Hans Schillstrom.\n\n 7) FEC driver needs to use netif_tx_{lock,unlock}_bh() rather than the\n non-BH disabling variants. From Fabio Estevam.\n\n 8) TCP GSO can generate out-of-order packets, fix from Eric Dumazet.\n\n 9) vxlan driver doesn\u0027t update \u0027used\u0027 field of fdb entries when it\n should, from Sridhar Samudrala.\n\n10) ipv6 should use kzalloc() to allocate inet6 socket cork options,\n otherwise we can OOPS in ip6_cork_release(). From Eric Dumazet.\n\n11) Fix races in bonding set mode, from Nikolay Aleksandrov.\n\n12) Fix checksum generation regression added by \"r8169: fix 8168evl\n frame padding.\", from Francois Romieu.\n\n13) ip_gre can look at stale SKB data pointer, fix from Eric Dumazet.\n\n14) Fix checksum handling when GSO is enabled in bnx2x driver with\n certain chips, from Yuval Mintz.\n\n15) Fix double free in batman-adv, from Martin Hundebøll.\n\n16) Fix device startup synchronization with firmware in tg3 driver, from\n Nithin Sujit.\n\n17) perf networking dropmonitor doesn\u0027t work at all due to mixed up\n trace parameter ordering, from Ben Hutchings.\n\n18) Fix proportional rate reduction handling in tcp_ack(), from Nandita\n Dukkipati.\n\n19) IPSEC layer doesn\u0027t return an error when a valid state is detected,\n causing an OOPS. Fix from Timo Teräs.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)\n be2net: bug fix on returning an invalid nic descriptor\n tcp: xps: fix reordering issues\n net: Revert unused variable changes.\n xfrm: properly handle invalid states as an error\n virtio_net: enable napi for all possible queues during open\n tcp: bug fix in proportional rate reduction.\n net: ethernet: sun: drop unused variable\n net: ethernet: korina: drop unused variable\n net: ethernet: apple: drop unused variable\n qmi_wwan: Added support for Cinterion\u0027s PLxx WWAN Interface\n perf: net_dropmonitor: Remove progress indicator\n perf: net_dropmonitor: Use bisection in symbol lookup\n perf: net_dropmonitor: Do not assume ordering of dictionaries\n perf: net_dropmonitor: Fix symbol-relative addresses\n perf: net_dropmonitor: Fix trace parameter order\n net: fec: use a more proper compatible string for MVF type device\n qlcnic: Fix updating netdev-\u003efeatures\n qlcnic: remove netdev-\u003etrans_start updates within the driver\n qlcnic: Return proper error codes from probe failure paths\n tg3: Update version to 3.132\n ...\n" }, { "commit": "7805d000db30a3787a4c969bab6ae4d8a5fd8ce6", "tree": "5178e1adaa4f398d2c1367fb38633191e81764e5", "parents": [ "d6cbf35dac8a3dadb9103379820c96d7c85df3d9" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri May 24 10:50:24 2013 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri May 24 10:50:24 2013 +0900" }, "message": "cgroup: fix a subtle bug in descendant pre-order walk\n\nWhen cgroup_next_descendant_pre() initiates a walk, it checks whether\nthe subtree root doesn\u0027t have any children and if not returns NULL.\nLater code assumes that the subtree isn\u0027t empty. This is broken\nbecause the subtree may become empty inbetween, which can lead to the\ntraversal escaping the subtree by walking to the sibling of the\nsubtree root.\n\nThere\u0027s no reason to have the early exit path. Remove it along with\nthe later assumption that the subtree isn\u0027t empty. This simplifies\nthe code a bit and fixes the subtle bug.\n\nWhile at it, fix the comment of cgroup_for_each_descendant_pre() which\nwas incorrectly referring to -\u003ecss_offline() instead of\n-\u003ecss_online().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "b91fd4d5aad0c1124654341814067ca3f59490fc", "tree": "f1ea23a27f0ad1dd91c336658cceed05f02cef63", "parents": [ "4c0eec03b188efafba3a35315b59a9efbf9684fc", "f3f011750a18abc389ef1b0d504fbeeacf641919" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 13:50:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 13:50:53 2013 -0700" }, "message": "Merge tag \u0027pci-v3.10-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI updates from Bjorn Helgaas:\n \"Here are some more fixes for v3.10. The Moorestown update broke Intel\n Medfield devices, so I reverted it. The acpiphp change fixes a\n regression: we broke hotplug notifications to host bridges when we\n split acpiphp into the host-bridge related part and the\n endpoint-related part.\n\n Moorestown\n Revert \"x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0\"\n Hotplug\n PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check\"\n\n* tag \u0027pci-v3.10-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:\n Revert \"x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0\"\n PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check\n" }, { "commit": "d97955625710b57f24427e403f150126078273c2", "tree": "4e1b2d5938e269266e77e46fa5d604b0cd24733c", "parents": [ "388c2896972c02ceccca4b5e90bd4a70e13fbab1", "e037f95ffb5355ffe295e1d106d02fefd284d882" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 09:28:34 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 09:28:34 2013 -0700" }, "message": "Merge tag \u0027tty-3.10-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty/serial fixes from Greg Kroah-Hartman:\n \"Here are some tty / serial driver fixes for 3.10-rc2.\n\n Nothing huge, although the rocket driver fix looks large, it\u0027s just\n moving the code around to fix the reported build issues in it. Other\n than that, this has the fix for the of-reported lockdep warning from\n the vt layer, as well as some other needed bugfixes.\n\n All of these have been in linux-next for a while\"\n\n* tag \u0027tty-3.10-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)\n tty: mxser: fix usage of opmode_ioaddr\n serial: 8250_dw: add ACPI ID for Intel BayTrail\n TTY: Fix tty miss restart after we turn off flow-control\n tty/vt: Fix vc_deallocate() lock order\n TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit\n TTY: rocket, fix more no-PCI warnings\n serial: mcf: missing uart_unregister_driver() on error in mcf_init()\n tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init()\n serial: samsung: add missing platform_driver_unregister() when module exit\n serial: pl011: protect attribute read from NULL platform data struct\n tty: nwpserial: Pass correct pointer to free_irq()\n serial: 8250_dw: Add valid clk pointer check\n" }, { "commit": "b64194068bbbdef3cc235f5459616a330f3b7724", "tree": "0cfeac1c7b331c3824564b1756d7d02d2a697f82", "parents": [ "72dd4e7980bf584fa11db4f00e38d5cf956a8856", "2a0ebf80aa95cc758d4725f74a7016e992606a39" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 09:23:32 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 23 09:23:32 2013 -0700" }, "message": "Merge tag \u0027usb-3.10-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of tiny USB bugfixes / new device ids for 3.10-rc2\n\n The majority of these are USB gadget fixes, but they are all small.\n Other than that, some USB host controller fixes, and USB serial driver\n fixes for problems reported with them.\n\n Also hopefully a fixed up USB_OTG Kconfig dependancy, that one seems\n to be almost impossible to get right for all of the different\n platforms these days.\"\n\n* tag \u0027usb-3.10-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (56 commits)\n USB: cxacru: potential underflow in cxacru_cm_get_array()\n USB: ftdi_sio: Add support for Newport CONEX motor drivers\n USB: option: add device IDs for Dell 5804 (Novatel E371) WWAN card\n usb: ohci: fix goto wrong tag in err case\n usb: isp1760-if: fix memleak when platform_get_resource fail\n usb: ehci-s5p: fix memleak when fallback to pdata\n USB: serial: clean up chars_in_buffer\n USB: ti_usb_3410_5052: fix chars_in_buffer overhead\n USB: io_ti: fix chars_in_buffer overhead\n USB: ftdi_sio: fix chars_in_buffer overhead\n USB: ftdi_sio: clean up get_modem_status\n USB: serial: add generic wait_until_sent implementation\n USB: serial: add wait_until_sent operation\n USB: set device dma_mask without reference to global data\n USB: Blacklisted Cinterion\u0027s PLxx WWAN Interface\n usb: option: Add Telewell TW-LTE 4G\n USB: EHCI: remove bogus #error\n USB: reset resume quirk needed by a hub\n USB: usb-stor: realtek_cr: Fix compile error\n usb, chipidea: fix link error when USB_EHCI_HCD is a module\n ...\n" }, { "commit": "2a7851bffb008ff4882eee673da74718997b4265", "tree": "262c2fc71bd91eabf6bd947944d2050ff1cec923", "parents": [ "497574c72c9922cf20c12aed15313c389f722fa0" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Fri May 17 03:56:10 2013 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu May 23 11:58:55 2013 +0200" }, "message": "netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6\n\nQuoting https://bugzilla.netfilter.org/show_bug.cgi?id\u003d812:\n\n[ ip6tables -m addrtype ]\nWhen I tried to use in the nat/PREROUTING it messes up the\nrouting cache even if the rule didn\u0027t matched at all.\n[..]\nIf I remove the --limit-iface-in from the non-working scenario, so just\nuse the -m addrtype --dst-type LOCAL it works!\n\nThis happens when LOCAL type matching is requested with --limit-iface-in,\nand the default ipv6 route is via the interface the packet we test\narrived on.\n\nBecause xt_addrtype uses ip6_route_output, the ipv6 routing implementation\ncreates an unwanted cached entry, and the packet won\u0027t make it to the\nreal/expected destination.\n\nSilently ignoring --limit-iface-in makes the routing work but it breaks\nrule matching (--dst-type LOCAL with limit-iface-in is supposed to only\nmatch if the dst address is configured on the incoming interface;\nwithout --limit-iface-in it will match if the address is reachable\nvia lo).\n\nThe test should call ipv6_chk_addr() instead. However, this would add\na link-time dependency on ipv6.\n\nThere are two possible solutions:\n\n1) Revert the commit that moved ipt_addrtype to xt_addrtype,\n and put ipv6 specific code into ip6t_addrtype.\n2) add new \"nf_ipv6_ops\" struct to register pointers to ipv6 functions.\n\nWhile the former might seem preferable, Pablo pointed out that there\nare more xt modules with link-time dependeny issues regarding ipv6,\nso lets go for 2).\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "3cb7a59fd8c816af6765f3712cd233d83984edf2", "tree": "efbb3b4dd4978d812f65620fb86aeccc4c5e3b55", "parents": [ "bb3ec6b08396bbd631b6441102dd1c3d89cbc576", "dec33abaafc89bcbd78f85fad0513170415a26d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 18:05:45 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 18:05:45 2013 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS update from Ralf Baechle:\n - Fix a build error if \u003clinux/printk.h\u003e is included without\n \u003clinux/linkage.h\u003e having been included before.\n - Cleanup and fix the damage done by the generic idle loop patch.\n - A kprobes fix that brings the MIPS code in line with what other\n architectures are for quite a while already.\n - Wire up the native getdents64(2) syscall for 64 bit - for some reason\n it was only for the compat ABIs. This has been reported to cause an\n application issue. This turned out bigger than I meant but the wait\n instruction support code was driving me nuts.\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:\n MIPS: N64: Wire getdents64(2)\n kprobes/mips: Fix to check double free of insn slot\n MIPS: Idle: Break r4k_wait into two functions and fix it.\n MIPS: Idle: Do address fiddlery in helper functions.\n MIPS: Idle: Consolidate all declarations in \u003casm/idle.h\u003e.\n MIPS: Idle: Don\u0027t call local_irq_disable() in cpu_wait() implementations.\n MIPS: Idle: Re-enable irqs at the end of r3081, au1k and loongson2 cpu_wait.\n MIPS: Idle: Make call of function pointer readable.\n MIPS: Idle: Consistently reformat inline assembler.\n MIPS: Idle: cleaup SMTC idle hook as per Linux coding style.\n MIPS: Consolidate idle loop / WAIT instruction support in a single file.\n MIPS: clock.h: Remove declaration of cpu_wait.\n Add include dependencies to \u003clinux/printk.h\u003e.\n MIPS: Rewrite pfn_valid to work in modules, too.\n" }, { "commit": "25625c9334d3b6a9cd32d009b99b36f6a78616f3", "tree": "03497342cf9b45da546cd9dd0f4b4434a1c0a697", "parents": [ "8d9849b05154ff6f19f538c2d094ea0f32981bb0", "3260c76055afc6c9396e5ad9f9e599505ea8891f" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 22 13:09:20 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 22 13:11:01 2013 -0700" }, "message": "Merge tag \u0027omap-fixes-a-for-3.10-rc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes\n\nFrom Paul Walmsley:\nFix the OMAP serial driver to work correctly on OMAP4 when booting\nwith DT.\n\n* tag \u0027omap-fixes-a-for-3.10-rc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:\n ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis\n SERIAL: OMAP: Remove the slave idle handling from the driver\n ARM: OMAP2+: serial: Remove the un-used slave idle hooks\n ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes\n ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active\n ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc()\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "cbfd2cd7195cf4500d428a04c79509445aa3924e", "tree": "41d9b00cd2a35be36c88779a5cba51398855aa8d", "parents": [ "94f1be9798c88b030256bdeb533008c3d55ec2c6", "5649d8f9e335f2b093751fcc2bdd5953f79f66ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 07:18:41 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 07:18:41 2013 -0700" }, "message": "Merge tag \u0027mfd-fixes-3.10-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes\n\nPull mfd fixes from Samuel Ortiz:\n \"This is the first batch of MFD fixes for 3.10.\n\n It\u0027s bigger than I would like, most of it is due to the big ab/db8500\n merge that went through during the 3.10 merge window.\n\n So we have:\n\n - Some build fixes for the tps65912 and ab8500 drivers.\n - A couple of build fixes for the the si476x driver with pre 4.3 gcc\n compilers.\n - A few runtime breakage fixes (probe failures or oopses) for the\n ab8500 and db8500 drivers.\n - Some sparse or regular gcc warning fixes for the si476x, ab8500 and\n cros_ec drivers.\"\n\n* tag \u0027mfd-fixes-3.10-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:\n mfd: ab8500-sysctrl: Let sysctrl driver work without pdata\n mfd: db8500-prcmu: Update stored DSI PLL divider value\n mfd: ab8500-sysctrl: Always enable pm_power_off handler\n mfd: ab8500-core: Pass GPADC compatible string to MFD core\n mfd: db8500-prcmu: Supply the pdata_size attribute for db8500-thermal\n mfd: ab8500-core: Use the correct driver name when enabling gpio/pinctrl\n mfd: ab8500: Pass AB8500 IRQ to debugfs code by resource\n mfd: ab8500-gpadc: Suppress \u0027ignoring regulator_enable() return value\u0027 warning\n mfd: ab8500-sysctrl: Set sysctrl_dev during probe\n mfd: ab8500-sysctrl: Fix sparse warning\n mfd: abx500-core: Fix sparse warning\n mfd: ab8500: Debugfs code depends on gpadc\n mfd: si476x: Use get_unaligned_be16() for unaligned be16 loads\n mfd: cros_ec_spi: Use %z to format pointer differences\n mfd: si476x: Do not use binary constants\n mfd: tps65912: Select MFD_CORE\n" }, { "commit": "94f1be9798c88b030256bdeb533008c3d55ec2c6", "tree": "e73baba68b700e50cab2a22025f85c0455df5470", "parents": [ "519fe2ecb755b875d9814cdda19778c2e88c6901", "6407d75afd08545f2252bb39806ffd3f10c7faac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 07:16:49 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 22 07:16:49 2013 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull virtio fixes from Rusty Russell:\n \"A build fix and a uapi exposure fix. The build fix is later than I\n liked, but my first version broke linux-next due to overzealous header\n clean.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n virtio_console: fix uapi header\n Hoist memcpy_fromiovec/memcpy_toiovec into lib/\n" }, { "commit": "154c2670087bd7f54688274aca627433e4a7c181", "tree": "08411994a8e9b05dfecaadbfe5c77a27207423b9", "parents": [ "8b9232141bf40788cce31f893c13f344ec31ee66" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue May 21 10:51:10 2013 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed May 22 01:34:24 2013 +0200" }, "message": "Add include dependencies to \u003clinux/printk.h\u003e.\n\nIf \u003clinux/linkage.h\u003e has not been included before \u003clinux/printk.h\u003e,\na build error like the below one will result:\n\n CC arch/mips/kernel/idle.o\nIn file included from arch/mips/kernel/idle.c:17:0:\ninclude/linux/printk.h:109:1: error: data definition has no type or storage class [-Werror]\ninclude/linux/printk.h:109:1: error: type defaults to ‘int’ in declaration of ‘asmlinkage’ [-Werror\u003dimplicit-int]\ninclude/linux/printk.h:110:1: error: ‘format’ attribute only applies to function types [-Werror\u003dattributes]\ninclude/linux/printk.h:110:1: error: expected ‘,’ or ‘;’ before ‘int’\ninclude/linux/printk.h:114:1: error: data definition has no type or storage class [-Werror]\ninclude/linux/printk.h:114:1: error: type defaults to ‘int’ in declaration of ‘asmlinkage’ [-Werror\u003dimplicit-int]\ninclude/linux/printk.h:115:1: error: ‘format’ attribute only applies to function types [-Werror\u003dattributes]\ninclude/linux/printk.h:115:1: error: expected ‘,’ or ‘;’ before ‘int’\ninclude/linux/printk.h:117:1: error: data definition has no type or storage class [-Werror]\ninclude/linux/printk.h:117:1: error: type defaults to ‘int’ in declaration of ‘asmlinkage’ [-Werror\u003dimplicit-int]\ninclude/linux/printk.h:118:1: error: ‘format’ attribute only applies to function types [-Werror\u003dattributes]\ninclude/linux/printk.h:118:1: error: ‘__cold__’ attribute ignored [-Werror\u003dattributes]\ninclude/linux/printk.h:118:1: error: expected ‘,’ or ‘;’ before ‘asmlinkage’\ninclude/linux/printk.h:122:1: error: data definition has no type or storage class [-Werror]\ninclude/linux/printk.h:122:1: error: type defaults to ‘int’ in declaration of ‘asmlinkage’ [-Werror\u003dimplicit-int]\ninclude/linux/printk.h:123:1: error: ‘format’ attribute only applies to function types [-Werror\u003dattributes]\ninclude/linux/printk.h:123:1: error: ‘__cold__’ attribute ignored [-Werror\u003dattributes]\ninclude/linux/printk.h:123:1: error: expected ‘,’ or ‘;’ before ‘int’\nIn file included from include/linux/kernel.h:14:0,\n from include/linux/sched.h:15,\n from arch/mips/kernel/idle.c:18:\ninclude/linux/dynamic_debug.h: In function ‘ddebug_dyndbg_module_param_cb’:\ninclude/linux/dynamic_debug.h:124:3: error: implicit declaration of function ‘printk’ [-Werror\u003dimplicit-function-declaration]\n\nFixed by including \u003clinux/linkage.h\u003e.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "ba7c96bec59d1c11cf9eaf6489e70e22f53da31b", "tree": "6d5c92ee3b4fa2d422f11d05da308a7cde614a5f", "parents": [ "057cf65e4f715f62acccbd9125cf63eddfe69d30", "6bb4880d9ef30375da4507aeabd6dc261a2c6c2b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 20 15:19:01 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 20 15:19:01 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "421b40a6286ee343d77d5e51f5ee6d04d7a2a90f", "tree": "2e4cb121813c9894c41c64b65df0c0f29f7f4ded", "parents": [ "df957d2b9c5c8aa12f050f94c9f15236fb0e51f1" ], "author": { "name": "Peter Hurley", "email": "peter@hurleysoftware.com", "time": "Fri May 17 12:41:03 2013 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon May 20 12:15:59 2013 -0700" }, "message": "tty/vt: Fix vc_deallocate() lock order\n\nNow that the tty port owns the flip buffers and i/o is allowed\nfrom the driver even when no tty is attached, the destruction\nof the tty port (and the flip buffers) must ensure that no\noutstanding work is pending.\n\nUnfortunately, this creates a lock order problem with the\nconsole_lock (see attached lockdep report [1] below).\n\nFor single console deallocation, drop the console_lock prior\nto port destruction. When multiple console deallocation,\ndefer port destruction until the consoles have been\ndeallocated.\n\ntty_port_destroy() is not required if the port has not\nbeen used; remove from vc_allocate() failure path.\n\n[1] lockdep report from Dave Jones \u003cdavej@redhat.com\u003e\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 ]\n 3.9.0+ #16 Not tainted\n -------------------------------------------------------\n (agetty)/26163 is trying to acquire lock:\n blocked: ((\u0026buf-\u003ework)){+.+...}, instance: ffff88011c8b0020, at: [\u003cffffffff81062065\u003e] flush_work+0x5/0x2e0\n\n but task is already holding lock:\n blocked: (console_lock){+.+.+.}, instance: ffffffff81c2fde0, at: [\u003cffffffff813bc201\u003e] vt_ioctl+0xb61/0x1230\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (console_lock){+.+.+.}:\n [\u003cffffffff810b3f74\u003e] lock_acquire+0xa4/0x210\n [\u003cffffffff810416c7\u003e] console_lock+0x77/0x80\n [\u003cffffffff813c3dcd\u003e] con_flush_chars+0x2d/0x50\n [\u003cffffffff813b32b2\u003e] n_tty_receive_buf+0x122/0x14d0\n [\u003cffffffff813b7709\u003e] flush_to_ldisc+0x119/0x170\n [\u003cffffffff81064381\u003e] process_one_work+0x211/0x700\n [\u003cffffffff8106498b\u003e] worker_thread+0x11b/0x3a0\n [\u003cffffffff8106ce5d\u003e] kthread+0xed/0x100\n [\u003cffffffff81601cac\u003e] ret_from_fork+0x7c/0xb0\n\n -\u003e #0 ((\u0026buf-\u003ework)){+.+...}:\n [\u003cffffffff810b349a\u003e] __lock_acquire+0x193a/0x1c00\n [\u003cffffffff810b3f74\u003e] lock_acquire+0xa4/0x210\n [\u003cffffffff810620ae\u003e] flush_work+0x4e/0x2e0\n [\u003cffffffff81065305\u003e] __cancel_work_timer+0x95/0x130\n [\u003cffffffff810653b0\u003e] cancel_work_sync+0x10/0x20\n [\u003cffffffff813b8212\u003e] tty_port_destroy+0x12/0x20\n [\u003cffffffff813c65e8\u003e] vc_deallocate+0xf8/0x110\n [\u003cffffffff813bc20c\u003e] vt_ioctl+0xb6c/0x1230\n [\u003cffffffff813b01a5\u003e] tty_ioctl+0x285/0xd50\n [\u003cffffffff811ba825\u003e] do_vfs_ioctl+0x305/0x530\n [\u003cffffffff811baad1\u003e] sys_ioctl+0x81/0xa0\n [\u003cffffffff81601d59\u003e] system_call_fastpath+0x16/0x1b\n\n other info that might help us debug this:\n\n [ 6760.076175] Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(console_lock);\n lock((\u0026buf-\u003ework));\n lock(console_lock);\n lock((\u0026buf-\u003ework));\n\n *** DEADLOCK ***\n\n 1 lock on stack by (agetty)/26163:\n #0: blocked: (console_lock){+.+.+.}, instance: ffffffff81c2fde0, at: [\u003cffffffff813bc201\u003e] vt_ioctl+0xb61/0x1230\n stack backtrace:\n Pid: 26163, comm: (agetty) Not tainted 3.9.0+ #16\n Call Trace:\n [\u003cffffffff815edb14\u003e] print_circular_bug+0x200/0x20e\n [\u003cffffffff810b349a\u003e] __lock_acquire+0x193a/0x1c00\n [\u003cffffffff8100a269\u003e] ? sched_clock+0x9/0x10\n [\u003cffffffff8100a269\u003e] ? sched_clock+0x9/0x10\n [\u003cffffffff8100a200\u003e] ? native_sched_clock+0x20/0x80\n [\u003cffffffff810b3f74\u003e] lock_acquire+0xa4/0x210\n [\u003cffffffff81062065\u003e] ? flush_work+0x5/0x2e0\n [\u003cffffffff810620ae\u003e] flush_work+0x4e/0x2e0\n [\u003cffffffff81062065\u003e] ? flush_work+0x5/0x2e0\n [\u003cffffffff810b15db\u003e] ? mark_held_locks+0xbb/0x140\n [\u003cffffffff8113c8a3\u003e] ? __free_pages_ok.part.57+0x93/0xc0\n [\u003cffffffff810b15db\u003e] ? mark_held_locks+0xbb/0x140\n [\u003cffffffff810652f2\u003e] ? __cancel_work_timer+0x82/0x130\n [\u003cffffffff81065305\u003e] __cancel_work_timer+0x95/0x130\n [\u003cffffffff810653b0\u003e] cancel_work_sync+0x10/0x20\n [\u003cffffffff813b8212\u003e] tty_port_destroy+0x12/0x20\n [\u003cffffffff813c65e8\u003e] vc_deallocate+0xf8/0x110\n [\u003cffffffff813bc20c\u003e] vt_ioctl+0xb6c/0x1230\n [\u003cffffffff810aec41\u003e] ? lock_release_holdtime.part.30+0xa1/0x170\n [\u003cffffffff813b01a5\u003e] tty_ioctl+0x285/0xd50\n [\u003cffffffff812b00f6\u003e] ? inode_has_perm.isra.46.constprop.61+0x56/0x80\n [\u003cffffffff811ba825\u003e] do_vfs_ioctl+0x305/0x530\n [\u003cffffffff812b04db\u003e] ? selinux_file_ioctl+0x5b/0x110\n [\u003cffffffff811baad1\u003e] sys_ioctl+0x81/0xa0\n [\u003cffffffff81601d59\u003e] system_call_fastpath+0x16/0x1b\n\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Peter Hurley \u003cpeter@hurleysoftware.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2c2c0e52314ef812a2aa9f7d32b3162584bee92b", "tree": "24a06b64246fc96d837cb08109ce49594efa8c98", "parents": [ "78aa0b3899297039259f645f107ea8b401eecf1e", "1dda2fa650da12a644c7cc8645707c912bdc5ab8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 20 07:59:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 20 07:59:46 2013 -0700" }, "message": "Merge tag \u0027pinctrl-fixes-v3.10-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl fixes from Linus Walleij:\n\n - Three fixes to make the boot path for device tree work properly on\n the Nomadik pin controller.\n\n - Compile warning fix for the vt8500 driver.\n\n - Fix error path in pinctrl-single.\n\n - Free mappings in error path of the Lantiq controller.\n\n - Documentation fixes.\n\n* tag \u0027pinctrl-fixes-v3.10-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl/lantiq: Free mapping configs for both pin and groups\n pinctrl: single: fix error return code in pcs_parse_one_pinctrl_entry()\n pinctrl: generic: Fix typos and clarify comments\n pinctrl: vt8500: Fix incorrect data in WM8750 pinctrl table\n pinctrl: abx500: Rejiggle platform data and DT initialisation\n pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data\n" }, { "commit": "d2f83e9078b8114e3b9d09082856c1aac299aa37", "tree": "707f0d810d28e000eb3f9a775be880687dde1030", "parents": [ "d5fe85af85367d5892e4308f596de4e2a5fb9017" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri May 17 09:05:21 2013 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 20 10:24:22 2013 +0930" }, "message": "Hoist memcpy_fromiovec/memcpy_toiovec into lib/\n\nERROR: \"memcpy_fromiovec\" [drivers/vhost/vhost_scsi.ko] undefined!\n\nThat function is only present with CONFIG_NET. Turns out that\ncrypto/algif_skcipher.c also uses that outside net, but it actually\nneeds sockets anyway.\n\nIn addition, commit 6d4f0139d642c45411a47879325891ce2a7c164a added\nCONFIG_NET dependency to CONFIG_VMCI for memcpy_toiovec, so hoist\nthat function and revert that commit too.\n\nsocket.h already includes uio.h, so no callers need updating; trying\nonly broke things fo x86_64 randconfig (thanks Fengguang!).\n\nReported-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7f18d05a1af75142d4856a91ffd2f1d8eb553c12", "tree": "081518eb559f9e5755293ffa162238ed8b62d6d9", "parents": [ "e59cd225c0ad280122cb69e04cd66699557875a4" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Wed May 15 20:18:41 2013 +0530" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun May 19 16:37:08 2013 -0600" }, "message": "SERIAL: OMAP: Remove the slave idle handling from the driver\n\nUART IP slave idle handling now taken care by runtime pm backend(hwmod layer)\nso remove the hackery from the driver.\n\nAs discussed on the list, in future if dma mode needs to be brought\nback to this driver, UART sysc handling needs to be updated in\nframework such a way that no-idle/force idle profile can be supported.\nGiven the broken dma mode for OMAP uarts, its very unlikely.\n\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nTested-by: Vaibhav Bedia \u003cvaibhav.bedia@ti.com\u003e\nTested-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nSigned-off-by: Rajendra nayak \u003crnayak@ti.com\u003e\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\nTested-by: Kevin Hilman \u003ckhilman@linaro.org\u003e # OMAP4/Panda\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n" }, { "commit": "4e23d3f505e8acfeac7cc33d4113fbb5a25c3090", "tree": "48184aadabb71896e0dd5295ee0daf14de81148c", "parents": [ "45ab9702fb47d18dca116b3a0509efa19fbcb27a" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Thu May 16 17:55:19 2013 +0200" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun May 19 20:30:10 2013 +0000" }, "message": "of/pci: Add of_pci_parse_bus_range() function\n\nThis function can be used to parse a bus-range property as specified by\ndevice nodes representing PCI bridges.\n\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "45ab9702fb47d18dca116b3a0509efa19fbcb27a", "tree": "60b73d1c507a8432318e832b5c008e7896ef4e62", "parents": [ "29b635c00f3ebcdaf7a52c4948f6d948ad3757d3" ], "author": { "name": "Thierry Reding", "email": "thierry.reding@avionic-design.de", "time": "Thu May 16 17:55:18 2013 +0200" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun May 19 20:30:10 2013 +0000" }, "message": "of/pci: Add of_pci_get_devfn() function\n\nThis function can be used to parse the device and function number from a\nstandard 5-cell PCI resource. PCI_SLOT() and PCI_FUNC() can be used on\nthe returned value obtain the device and function numbers respectively.\n\nSigned-off-by: Thierry Reding \u003cthierry.reding@avionic-design.de\u003e\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "29b635c00f3ebcdaf7a52c4948f6d948ad3757d3", "tree": "a6e09cffad345acacef84d646d7b91c005e91a4d", "parents": [ "f722406faae2d073cc1d01063d1123c35425939e" ], "author": { "name": "Andrew Murray", "email": "Andrew.Murray@arm.com", "time": "Thu May 16 17:55:17 2013 +0200" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Sun May 19 20:29:55 2013 +0000" }, "message": "of/pci: Provide support for parsing PCI DT ranges property\n\nThis patch factors out common implementation patterns to reduce overall kernel\ncode and provide a means for host bridge drivers to directly obtain struct\nresources from the DT\u0027s ranges property without relying on architecture specific\nDT handling. This will make it easier to write archiecture independent host bridge\ndrivers and mitigate against further duplication of DT parsing code.\n\nThis patch can be used in the following way:\n\n\tstruct of_pci_range_parser parser;\n\tstruct of_pci_range range;\n\n\tif (of_pci_range_parser_init(\u0026parser, np))\n\t\t; //no ranges property\n\n\tfor_each_of_pci_range(\u0026parser, \u0026range) {\n\n\t\t/*\n\t\t\tdirectly access properties of the address range, e.g.:\n\t\t\trange.pci_space, range.pci_addr, range.cpu_addr,\n\t\t\trange.size, range.flags\n\n\t\t\talternatively obtain a struct resource, e.g.:\n\t\t\tstruct resource res;\n\t\t\tof_pci_range_to_resource(\u0026range, np, \u0026res);\n\t\t*/\n\t}\n\nAdditionally the implementation takes care of adjacent ranges and merges them\ninto a single range (as was the case with powerpc and microblaze).\n\nSigned-off-by: Andrew Murray \u003cAndrew.Murray@arm.com\u003e\nSigned-off-by: Liviu Dudau \u003cLiviu.Dudau@arm.com\u003e\nSigned-off-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nTested-by: Thomas Petazzoni \u003cthomas.petazzoni@free-electrons.com\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Jingoo Han \u003cjg1.han@samsung.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\n" }, { "commit": "ff9129b06cfb05cb5920f1151c75506afe1586fe", "tree": "bf527a9d8db078b37da863e5959cfb100622aadb", "parents": [ "3c6a279ffccd0c414ecd1d5eb4670ed70072c526", "3132f623386e9ac87077bd839e726f7b940fbc94" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 18 10:46:50 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 18 10:46:50 2013 -0700" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux\n\nPull device tree fixes from Grant Likely:\n \"Device tree bug fixes and documentation updates for v3.10\n\n Nothing earth shattering here. A build failure fix, and fix for\n releasing nodes and some documenation updates.\"\n\n* tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux:\n Documentation/devicetree: make semantic of initrd-end more explicit\n of/base: release the node correctly in of_parse_phandle_with_args()\n of/documentation: move video device bindings to a common place\n \u003clinux/of_platform.h\u003e: fix compilation warnings with DT disabled\n" }, { "commit": "3f327e39b4b8f760c331bb2836735be6d83fbf53", "tree": "c2ebbf36764c554c31d82a82a6afb174c8e2b698", "parents": [ "f722406faae2d073cc1d01063d1123c35425939e" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Tue May 07 11:06:03 2013 -0600" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri May 17 14:12:06 2013 -0600" }, "message": "PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check\n\nWhen a PCI host bridge device receives a Bus Check notification, we\nmust re-enumerate starting with the bridge to discover changes (devices\nthat have been added or removed).\n\nPrior to 668192b678 (\"PCI: acpiphp: Move host bridge hotplug to\npci_root.c\"), this happened in _handle_hotplug_event_bridge(). After that\ncommit, _handle_hotplug_event_bridge() is not installed for host bridges,\nand the host bridge notify handler, _handle_hotplug_event_root() did not\nre-enumerate.\n\nThis patch adds re-enumeration to _handle_hotplug_event_root().\n\nThis fixes cases where we don\u0027t notice the addition or removal of\nPCI devices, e.g., the PCI-to-USB ExpressCard in the bugzilla below.\n\n[bhelgaas: changelog, references]\nReference: https://lkml.kernel.org/r/CAAh6nkmbKR3HTqm5ommevsBwhL_u0N8Rk7Wsms_LfP\u003dnBgKNew@mail.gmail.com\nReference: https://bugzilla.kernel.org/show_bug.cgi?id\u003d57961\nReported-by: Gavin Guo \u003ctuffkidtt@gmail.com\u003e\nTested-by: Gavin Guo \u003ctuffkidtt@gmail.com\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nReviewed-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nAcked-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nCC: stable@vger.kernel.org\t# v3.9+\n" }, { "commit": "d4988d4c733ba0b61cb372edd3d1992d26dd10d3", "tree": "4ffc79de1da2f342bd7ee4617774bb9c732cd877", "parents": [ "becdbc592580f76df58fdae14544f5db36ae05b4" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Thu May 09 21:24:24 2013 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri May 17 14:31:05 2013 -0400" }, "message": "bcma: add more core IDs\n\nPCIe and ARM CR4 cores were found on 14e4:43b1 AKA BCM4352.\n\nReported-by: Gabriel Thörnblad \u003cgabriel@thornblad.com\u003e\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dcf0105039660e951dfea348d317043d17988dfc", "tree": "17b7748bf83e08da5da530a257a81cc044110e91", "parents": [ "0693196fe7bbb5e6cafd255dfce91ff6d10bc18f" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Wed May 08 17:51:43 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 16 17:32:21 2013 -0700" }, "message": "USB: serial: add generic wait_until_sent implementation\n\nAdd generic wait_until_sent implementation which polls for empty\nhardware buffers using the new port-operation tx_empty.\n\nThe generic implementation will be used for all sub-drivers that\nimplement tx_empty but does not define wait_until_sent.\n\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0693196fe7bbb5e6cafd255dfce91ff6d10bc18f", "tree": "9cc67b83f7757647adea0629a3adf94c05865354", "parents": [ "3b9561e9d9b88eca9d4ed6aab025dec2eeeed501" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Sun May 05 20:32:27 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu May 16 17:32:21 2013 -0700" }, "message": "USB: serial: add wait_until_sent operation\n\nAdd wait_until_sent operation which can be used to wait for hardware\nbuffers to drain.\n\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "0b8ebdb18888c55588b932f4f564b9c9529de627", "tree": "9ed650b39b506419a9162e96c098b3998377eaff", "parents": [ "955de2eab3fd89bc6d5735817710926ba5817450" ], "author": { "name": "Fabio Baltieri", "email": "fabio.baltieri@linaro.org", "time": "Thu May 09 13:08:08 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 17 00:42:33 2013 +0200" }, "message": "mfd: ab8500-sysctrl: Always enable pm_power_off handler\n\nAB8500 sysctrl driver implements a pm_power_off handler, but that is\ncurrently not registered until a specific platform data field is\nenabled.\n\nThis patch drops the platform data field and always registers\nab8500_power_off if no other pm_power_off handler was defined before,\nand also introduces the necessary cleanup code in the driver\u0027s remove\nfunction.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Fabio Baltieri \u003cfabio.baltieri@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "b0ce3508b25ea6fa10ae3ca254de1d695b521702", "tree": "d5158ba0fe71d3807c563148c6cddb3757e7f348", "parents": [ "3aefe2b4a8003517d6e15112f806fd4069785389" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 16 07:34:53 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 16 15:02:01 2013 -0700" }, "message": "bonding: allow TSO being set on bonding master\n\nIn some situations, we need to disable TSO on bonding slaves.\n\nbonding device automatically unset TSO in bond_fix_features(), and\nperformance is not good because :\n\n1) We consume more cpu cycles.\n\n2) GSO segmentation has some bugs leading to out of order TCP packets\nif this segmentation is done before virtual device. This particular\nproblem will be addressed in a separate patch.\n\nThis patch allows TSO being set/unset on the bonding master,\nso that GSO segmentation is done after bonding layer.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Michał Mirosław \u003cmirqus@gmail.com\u003e\nCc: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nCc: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c64e3a45d43c6e3fa87cbe02e10059171d10812", "tree": "4b913307a3f9785aebf6c9271f26ec79ab5db625", "parents": [ "c240a539df4e2d50f86e2f31813ff6b7334cd493", "ccf5ae83a6cf3d9cfe9a7038bfe7cd38ab03d5e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 16 07:55:07 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 16 07:55:07 2013 -0700" }, "message": "Merge branch \u0027queue\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull target fixes from Nicholas Bellinger:\n \"A handful of fixes + minor changes this time around, along with one\n important \u003e\u003d v3.9 regression fix for IBLOCK backends. The highlights\n include:\n\n - Use FD_MAX_SECTORS in FILEIO for block_device as\n well as files (agrover)\n\n - Fix processing of out-of-order CmdSNs with\n iSBD driver (shlomo)\n\n - Close long-standing target_put_sess_cmd() vs.\n core_tmr_abort_task() race with the addition of\n kref_put_spinlock_irqsave() (joern + greg-kh)\n\n - Fix IBLOCK WCE\u003d1 + DPOFUA\u003d1 backend WRITE\n regression in \u003e\u003d v3.9 (nab + bootc)\n\n Note these four patches are CC\u0027ed to stable.\n\n Also, there is still some work left to be done on the active I/O\n shutdown path in target_wait_for_sess_cmds() used by tcm_qla2xxx +\n ib_isert fabrics that is still being discussed on the list, and will\n hopefully be resolved soon.\"\n\n* \u0027queue\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n target: close target_put_sess_cmd() vs. core_tmr_abort_task() race\n target: removed unused transport_state flag\n target/iblock: Fix WCE\u003d1 + DPOFUA\u003d1 backend WRITE regression\n MAINTAINERS: Update target git tree URL\n iscsi-target: Fix typos in RDMAEXTENSIONS macro usage\n target/rd: Add ramdisk bit for NULLIO operation\n iscsi-target: Fix processing of OOO commands\n iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void *\n iscsi-target: Fix NULL pointer dereference in iscsit_send_reject\n target: Have dev/enable show if TCM device is configured\n target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio\n target: Remove unused struct members in se_dev_entry\n" }, { "commit": "755ccb9d577b95b43537cfeb36da59140412f858", "tree": "9fdd8b6ce9bccf72476583974bfc3bfecfe02109", "parents": [ "1ed0d56c1d5ff07a5d57e6467621f9a0c09b0b65" ], "author": { "name": "Florian Fainelli", "email": "f.fainelli@gmail.com", "time": "Wed May 15 08:00:25 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 15 14:42:15 2013 -0700" }, "message": "broadcom: add include guards to include/linux/brcmphy.h\n\ninclude/linux/brcmphy.h is currently not protected against double\ninclusion, add ifdefs guard to fix that.\n\nSigned-off-by: Florian Fainelli \u003cf.fainelli@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc51bf6e6d8b03bd459818492e0bc3bef09dcd74", "tree": "1df4cddf95a656e829242dfb89f29cf22259ca70", "parents": [ "37cae5e24981f4619372e6a29456d34e4cbdc5e2", "b4f711ee03d28f776fd2324fd0bd999cc428e4d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 15 14:05:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 15 14:05:17 2013 -0700" }, "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 - Cure for not using zalloc in the first place, which leads to random\n crashes with CPUMASK_OFF_STACK.\n\n - Revert a user space visible change which broke udev\n\n - Add a missing cpu_online early return introduced by the new full\n dyntick conversions\n\n - Plug a long standing race in the timer wheel cpu hotplug code.\n Sigh...\n\n - Cleanup NOHZ per cpu data on cpu down to prevent stale data on cpu\n up.\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons\n timer: Don\u0027t reinitialize the cpu base lock during CPU_UP_PREPARE\n tick: Don\u0027t invoke tick_nohz_stop_sched_tick() if the cpu is offline\n tick: Cleanup NOHZ per cpu data on cpu down\n tick: Use zalloc_cpumask_var for allocating offstack cpumasks\n" }, { "commit": "de97f250394996f5acb07ba9e6dbdfc15ee4316c", "tree": "f588c77299f9e12b5c4a4357e066aa4754dd4802", "parents": [ "4b7e450fb5cefb5865c77999a675330206ab3b8a" ], "author": { "name": "Robert P. J. Day", "email": "rpjday@crashcourse.ca", "time": "Thu May 02 09:51:44 2013 -0400" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Wed May 15 17:19:15 2013 +0300" }, "message": "Correct typo \"supperspeed\" to \"superspeed\".\n\nTidy up kernel-doc content for USB GADGET. No functional change.\n\nSigned-off-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "ccf5ae83a6cf3d9cfe9a7038bfe7cd38ab03d5e1", "tree": "cb3966328bce7584d4c24434490dc21a67ecb48b", "parents": [ "a1321ddd27e65c6ada5b9a12cae4ee2612d76893" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Mon May 13 16:30:06 2013 -0400" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Wed May 15 01:47:35 2013 -0700" }, "message": "target: close target_put_sess_cmd() vs. core_tmr_abort_task() race\n\nIt is possible for one thread to to take se_sess-\u003esess_cmd_lock in\ncore_tmr_abort_task() before taking a reference count on\nse_cmd-\u003ecmd_kref, while another thread in target_put_sess_cmd() drops\nse_cmd-\u003ecmd_kref before taking se_sess-\u003esess_cmd_lock.\n\nThis introduces kref_put_spinlock_irqsave() and uses it in\ntarget_put_sess_cmd() to close the race window.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "b4f711ee03d28f776fd2324fd0bd999cc428e4d2", "tree": "8d8b659c2514648be0bfe51f0de65110da008f22", "parents": [ "42a5cf46cd56f46267d2a9fcf2655f4078cd3042" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Apr 24 11:32:56 2013 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 14 20:54:06 2013 +0200" }, "message": "time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons\n\nKay Sievers noted that the ALWAYS_USE_PERSISTENT_CLOCK config,\nwhich enables some minor compile time optimization to avoid\nuncessary code in mostly the suspend/resume path could cause\nproblems for userland.\n\nIn particular, the dependency for RTC_HCTOSYS on\n!ALWAYS_USE_PERSISTENT_CLOCK, which avoids setting the time\ntwice and simplifies suspend/resume, has the side effect\nof causing the /sys/class/rtc/rtcN/hctosys flag to always be\nzero, and this flag is commonly used by udev to setup the\n/dev/rtc symlink to /dev/rtcN, which can cause pain for\nolder applications.\n\nWhile the udev rules could use some work to be less fragile,\nbreaking userland should strongly be avoided. Additionally\nthe compile time optimizations are fairly minor, and the code\nbeing optimized is likely to be reworked in the future, so\nlets revert this change.\n\nReported-by: Kay Sievers \u003ckay@vrfy.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e #3.9\nCc: Feng Tang \u003cfeng.tang@intel.com\u003e\nCc: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nLink: http://lkml.kernel.org/r/1366828376-18124-1-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "b973425cbb51e08301b34fecdfd476a44507d8cf", "tree": "689cfb1e5bb3064f4fad6b381bb208c3ed54cf64", "parents": [ "7fb30d2b606beb78cda805647faf4d3cdfb39c42", "e2555fde4159467fb579e6ae3c0a8fc33015d0f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 14 09:30:54 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 14 09:30:54 2013 -0700" }, "message": "Merge tag \u0027ext4_for_linus_stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 update from Ted Ts\u0027o:\n \"Fixed regressions (two stability regressions and a performance\n regression) introduced during the 3.10-rc1 merge window.\n\n Also included is a bug fix relating to allocating blocks after\n resizing an ext3 file system when using the ext4 file system driver\"\n\n* tag \u0027ext4_for_linus_stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd,jbd2: fix oops in jbd2_journal_put_journal_head()\n ext4: revert \"ext4: use io_end for multiple bios\"\n ext4: limit group search loop for non-extent files\n ext4: fix fio regression\n" }, { "commit": "63ad9cbff5896dadfee510f631ffcb0176984722", "tree": "8bc28f3314081b33ab3dcad8d446211dc1e30b45", "parents": [ "1c7ad8f0019403bd32f457f14477e1855d93f434" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart+renesas@ideasonboard.com", "time": "Tue Apr 23 15:28:38 2013 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue May 14 13:40:45 2013 +0200" }, "message": "pinctrl: generic: Fix typos and clarify comments\n\nDrive strength controls both sink and source currents, clarify the\ndescription accordingly.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart+renesas@ideasonboard.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "b59cc200ac025aca597fb21862c1c9e667f2eff2", "tree": "fabada02fb402faffe5ec3582df3806b4c27d97c", "parents": [ "ee8209fd026b074bb8eb75bece516a338a281b1b" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed May 08 11:55:49 2013 +0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Tue May 14 10:23:58 2013 +0530" }, "message": "ACPI / LPSS: register clock device for Lynxpoint DMA properly\n\nThe DMA controller in Lynxpoint is enumerated as a regular ACPI device now. To\nwork properly it is using the LPSS root clock as a functional clock. That\u0027s why\nwe have to register the clock device accordingly to the ACPI ID of the DMA\ncontroller. The acpi_lpss.c module is responsible to do the job.\n\nThis patch also removes hardcoded name of the DMA device in clk-lpt.c and the\nname of the root clock in acpi_lpss.c.\n\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "ee8209fd026b074bb8eb75bece516a338a281b1b", "tree": "2ab58c3517488dd4faeafaafb598ec891cce81f8", "parents": [ "f722406faae2d073cc1d01063d1123c35425939e" ], "author": { "name": "Andy Shevchenko", "email": "andriy.shevchenko@linux.intel.com", "time": "Wed May 08 11:55:48 2013 +0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Tue May 14 10:23:57 2013 +0530" }, "message": "dma: acpi-dma: parse CSRT to extract additional resources\n\nSince we have CSRT only to get additional DMA controller resources, let\u0027s get\nrid of drivers/acpi/csrt.c and move its logic inside ACPI DMA helpers code.\n\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nAcked-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "dbbffe6898fd0d7bac66ded5d3c58835b13ddefc", "tree": "fc69faae77d9fd64139c13691c3895fd87f83111", "parents": [ "1f638766ffcd9f08209afcabb3e2df961552fe18", "ba21fc696dd28ea7a5880345faf0168619a478d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 13 13:25:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 13 13:25:36 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n \"Several small bug fixes all over:\n\n 1) be2net driver uses wrong payload length when submitting MAC list\n get requests to the chip. From Sathya Perla.\n\n 2) Fix mwifiex memory leak on driver unload, from Amitkumar Karwar.\n\n 3) Prevent random memory access in batman-adv, from Marek Lindner.\n\n 4) batman-adv doesn\u0027t check for pskb_trim_rcsum() errors, also from\n Marek Lindner.\n\n 5) Fix fec crashes on rapid link up/down, from Frank Li.\n\n 6) Fix inner protocol grovelling in GSO, from Pravin B Shelar.\n\n 7) Link event validation fix in qlcnic from Rajesh Borundia.\n\n 8) Not all FEC chips can support checksum offload, fix from Shawn\n Guo.\n\n 9) EXPORT_SYMBOL + inline doesn\u0027t make any sense, from Denis Efremov.\n\n 10) Fix race in passthru mode during device removal in macvlan, from\n Jiri Pirko.\n\n 11) Fix RCU hash table lookup socket state race in ipv6, leading to\n NULL pointer derefs, from Eric Dumazet.\n\n 12) Add several missing HAS_DMA kconfig dependencies, from Geert\n Uyttterhoeven.\n\n 13) Fix bogus PCI resource management in 3c59x driver, from Sergei\n Shtylyov.\n\n 14) Fix info leak in ipv6 GRE tunnel driver, from Amerigo Wang.\n\n 15) Fix device leak in ipv6 IPSEC policy layer, from Cong Wang.\n\n 16) DMA mapping leak fix in qlge from Thadeu Lima de Souza Cascardo.\n\n 17) Missing iounmap on probe failure in bna driver, from Wei Yongjun.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)\n bna: add missing iounmap() on error in bnad_init()\n qlge: fix dma map leak when the last chunk is not allocated\n xfrm6: release dev before returning error\n ipv6,gre: do not leak info to user-space\n virtio_net: use default napi weight by default\n emac: Fix EMAC soft reset on 460EX/GT\n 3c59x: fix PCI resource management\n caif: CAIF_VIRTIO should depend on HAS_DMA\n net/ethernet: MACB should depend on HAS_DMA\n net/ethernet: ARM_AT91_ETHER should depend on HAS_DMA\n net/wireless: ATH9K should depend on HAS_DMA\n net/ethernet: STMMAC_ETH should depend on HAS_DMA\n net/ethernet: NET_CALXEDA_XGMAC should depend on HAS_DMA\n ipv6: do not clear pinet6 field\n macvlan: fix passthru mode race between dev removal and rx path\n ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions\n net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode\n net/mlx4_core: Add missing report on VST and spoof-checking dev caps\n net: fec: enable hardware checksum only on imx6q-fec\n qlcnic: Fix validation of link event command.\n ...\n" }, { "commit": "88b0357dde1c2721a64268e4601d1c2dec1158b0", "tree": "a86c0af317bbb3f501c4d5b3517b02640a9f69c0", "parents": [ "0faa3146f17295f612abadafbfe3d4346178f10f", "3086c9f6482101b3c06935cdfb4d4b56adb60097" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon May 13 18:27:18 2013 +0400" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon May 13 18:27:18 2013 +0400" }, "message": "Merge remote-tracking branch \u0027spi/fix/grant\u0027 into spi-linus\n" }, { "commit": "e2555fde4159467fb579e6ae3c0a8fc33015d0f5", "tree": "aacf8fc79d3180a2bd2bf265f1fb362e7b2b4c50", "parents": [ "a549984b8c95acbecefd1fdd4bfdbea4d29b0588" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon May 13 09:45:01 2013 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon May 13 09:45:01 2013 -0400" }, "message": "jbd,jbd2: fix oops in jbd2_journal_put_journal_head()\n\nCommit ae4647fb (jbd2: reduce journal_head size) introduced a\nregression where we occasionally hit panic in\njbd2_journal_put_journal_head() because of wrong b_jcount. The bug is\ncaused by gcc making 64-bit access to 32-bit bitfield and thus\nclobbering b_jcount.\n\nAt least for now, those 8 bytes saved in struct journal_head are not\nworth the trouble with gcc bitfield handling so revert that part of\nthe patch.\n\nReported-by: EUNBONG SONG \u003ceunb.song@samsung.com\u003e\nReported-by: Tony Luck \u003ctony.luck@gmail.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "26b840ae5d5140fe7b2226098826c449e63de072", "tree": "0f4a6f1575a7f0e49f63da7920258e1e89359036", "parents": [ "607eeb0b836aa24a6972a460a213c4f87902d403", "b8820084f2130b3dcfb09c78ac16cdd2194a345b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 17:04:59 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 17:04:59 2013 -0700" }, "message": "Merge tag \u0027trace-fixes-v3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull tracing/kprobes update from Steven Rostedt:\n \"The majority of these changes are from Masami Hiramatsu bringing\n kprobes up to par with the latest changes to ftrace (multi buffering\n and the new function probes).\n\n He also discovered and fixed some bugs in doing so. When pulling in\n his patches, I also found a few minor bugs as well and fixed them.\n\n This also includes a compile fix for some archs that select the ring\n buffer but not tracing.\n\n I based this off of the last patch you took from me that fixed the\n merge conflict error, as that was the commit that had all the changes\n I needed for this set of changes.\"\n\n* tag \u0027trace-fixes-v3.10\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:\n tracing/kprobes: Support soft-mode disabling\n tracing/kprobes: Support ftrace_event_file base multibuffer\n tracing/kprobes: Pass trace_probe directly from dispatcher\n tracing/kprobes: Increment probe hit-count even if it is used by perf\n tracing/kprobes: Use bool for retprobe checker\n ftrace: Fix function probe when more than one probe is added\n ftrace: Fix the output of enabled_functions debug file\n ftrace: Fix locking in register_ftrace_function_probe()\n tracing: Add helper function trace_create_new_event() to remove duplicate code\n tracing: Modify soft-mode only if there\u0027s no other referrer\n tracing: Indicate enabled soft-mode in enable file\n tracing/kprobes: Fix to increment return event probe hit-count\n ftrace: Cleanup regex_lock and ftrace_lock around hash updating\n ftrace, kprobes: Fix a deadlock on ftrace_regex_lock\n ftrace: Have ftrace_regex_write() return either read or error\n tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()\n tracing: Don\u0027t succeed if event_enable_func did not register anything\n ring-buffer: Select IRQ_WORK\n" }, { "commit": "7677fc965fba41d1386fa3b76a1f00303f02bb2d", "tree": "1324b8af989563dea62f9bc7f952c411f8d8a2dd", "parents": [ "4e8cf5b8a1da8dbe1ece5f084b99f5c902ea709b" ], "author": { "name": "Rony Efraim", "email": "ronye@mellanox.com", "time": "Wed May 08 22:22:35 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 11 16:12:44 2013 -0700" }, "message": "net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode\n\nMake sure that the following steps are taken:\n\n- drop packets sent by the VF with vlan tag\n- block packets with vlan tag which are steered to the VF\n- drop/block tagged packets when the policy is priority-tagged\n- make sure VLAN stripping for received packets is set\n- make sure force UP bit for the VF QP is set\n\nUse enum values for all the above instead of numerical bit offsets.\n\nSigned-off-by: Rony Efraim \u003cronye@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c4445013f792f82855079ac377bf5d75af4581c", "tree": "fbdc80d7bd7cf3c40f85048b6f5e9c1357ca50d6", "parents": [ "ac4e01093f6d7b051c5d6a3e61ea5337774ac36a", "297b8a07347555f0d2fafa4a1ddfc332d2d4afa9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 15:24:22 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 15:24:22 2013 -0700" }, "message": "Merge tag \u0027scsi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull second SCSI update from James \"Jaj B\" Bottomley:\n \"This is the final round of SCSI patches for the merge window. It\n consists mostly of driver updates (bnx2fc, ibmfc, fnic, lpfc,\n be2iscsi, pm80xx, qla4x and ipr).\n\n There\u0027s also the power management updates that complete the patches in\n Jens\u0027 tree, an iscsi refcounting problem fix from the last pull, some\n dif handling in scsi_debug fixes, a few nice code cleanups and an\n error handling busy bug fix.\"\n\n* tag \u0027scsi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (92 commits)\n [SCSI] qla2xxx: Update firmware link in Kconfig file.\n [SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used\n [SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type\n [SCSI] pm80xx: thermal, sas controller config and error handling update\n [SCSI] pm80xx: NCQ error handling changes\n [SCSI] pm80xx: WWN Modification for PM8081/88/89 controllers\n [SCSI] pm80xx: Changed module name and debug messages update\n [SCSI] pm80xx: Firmware flash memory free fix, with addition of new memory region for it\n [SCSI] pm80xx: SPC new firmware changes for device id 0x8081 alone\n [SCSI] pm80xx: Added SPCv/ve specific hardware functionalities and relevant changes in common files\n [SCSI] pm80xx: MSI-X implementation for using 64 interrupts\n [SCSI] pm80xx: Updated common functions common for SPC and SPCv/ve\n [SCSI] pm80xx: Multiple inbound/outbound queue configuration\n [SCSI] pm80xx: Added SPCv/ve specific ids, variables and modify for SPC\n [SCSI] lpfc: fix up Kconfig dependencies\n [SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd\n [SCSI] sd: change to auto suspend mode\n [SCSI] sd: use REQ_PM in sd\u0027s runtime suspend operation\n [SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()\n [SCSI] ufs: Correct the expected data transfersize\n ...\n" }, { "commit": "ac4e01093f6d7b051c5d6a3e61ea5337774ac36a", "tree": "395a03788c81aa0c3ba5cdcb3573365d5880bdc7", "parents": [ "c4cc75c3321cad6f20d1e5325293890255c8a663", "86239ceb33b0d8480b0f0ca0eec08e7f7a807374" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 15:23:17 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 15:23:17 2013 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nPull idle update from Len Brown:\n \"Add support for new Haswell-ULT CPU idle power states\"\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n intel_idle: initial C8, C9, C10 support\n tools/power turbostat: display C8, C9, C10 residency\n" }, { "commit": "c4cc75c3321cad6f20d1e5325293890255c8a663", "tree": "f515d034c9d6947bed0467840678aff823747596", "parents": [ "2dbd3cac87250a0d44e07acc86c4224a08522709", "2a0b4be6dd655e24990da1d0811e28b9277f8b12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 14:29:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 14:29:11 2013 -0700" }, "message": "Merge git://git.infradead.org/users/eparis/audit\n\nPull audit changes from Eric Paris:\n \"Al used to send pull requests every couple of years but he told me to\n just start pushing them to you directly.\n\n Our touching outside of core audit code is pretty straight forward. A\n couple of interface changes which hit net/. A simple argument bug\n calling audit functions in namei.c and the removal of some assembly\n branch prediction code on ppc\"\n\n* git://git.infradead.org/users/eparis/audit: (31 commits)\n audit: fix message spacing printing auid\n Revert \"audit: move kaudit thread start from auditd registration to kaudit init\"\n audit: vfs: fix audit_inode call in O_CREAT case of do_last\n audit: Make testing for a valid loginuid explicit.\n audit: fix event coverage of AUDIT_ANOM_LINK\n audit: use spin_lock in audit_receive_msg to process tty logging\n audit: do not needlessly take a lock in tty_audit_exit\n audit: do not needlessly take a spinlock in copy_signal\n audit: add an option to control logging of passwords with pam_tty_audit\n audit: use spin_lock_irqsave/restore in audit tty code\n helper for some session id stuff\n audit: use a consistent audit helper to log lsm information\n audit: push loginuid and sessionid processing down\n audit: stop pushing loginid, uid, sessionid as arguments\n audit: remove the old depricated kernel interface\n audit: make validity checking generic\n audit: allow checking the type of audit message in the user filter\n audit: fix build break when AUDIT_DEBUG \u003d\u003d 2\n audit: remove duplicate export of audit_enabled\n Audit: do not print error when LSMs disabled\n ...\n" }, { "commit": "3644bc2ec7655a249612ea500e2be1c13052c4c2", "tree": "872dabd511e62b7e94f3d903d7b55114175f5b06", "parents": [ "6fad8d02ef9ab12d5e178014a4c5c297e1707f23", "c5ddd2024a87353f73068732cfd38d3dfec22e87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:21:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:21:05 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull stray syscall bits from Al Viro:\n \"Several syscall-related commits that were missing from the original\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE\n unicore32: just use mmap_pgoff()...\n unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE\n x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)\n" }, { "commit": "ec6671589a07d9b27ff5832138ff435b3a3c9b09", "tree": "4866cfd09e45a492b5b96380818fb5d1e3a4fac0", "parents": [ "f755407dd19072b7d20719bc5454caed9ab41cc1", "2f14f4b51ed34fe2b704af8df178f5cd8c81f65e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:02:50 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:02:50 2013 -0700" }, "message": "Merge tag \u0027dm-3.10-changes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm\n\nPull device-mapper updates from Alasdair Kergon:\n \"Allow devices that hold metadata for the device-mapper thin\n provisioning target to be extended easily; allow WRITE SAME on\n multipath devices; an assortment of little fixes and clean-ups.\"\n\n* tag \u0027dm-3.10-changes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: (21 commits)\n dm cache: set config value\n dm cache: move config fns\n dm thin: generate event when metadata threshold passed\n dm persistent metadata: add space map threshold callback\n dm persistent data: add threshold callback to space map\n dm thin: detect metadata device resizing\n dm persistent data: support space map resizing\n dm thin: open dev read only when possible\n dm thin: refactor data dev resize\n dm cache: replace memcpy with struct assignment\n dm cache: fix typos in comments\n dm cache policy: fix description of lookup fn\n dm: document iterate_devices\n dm persistent data: fix error message typos\n dm cache: tune migration throttling\n dm mpath: enable WRITE SAME support\n dm table: fix write same support\n dm bufio: avoid a possible __vmalloc deadlock\n dm snapshot: fix error return code in snapshot_ctr\n dm cache: fix error return code in cache_create\n ...\n" }, { "commit": "f755407dd19072b7d20719bc5454caed9ab41cc1", "tree": "afb1cd4f40314adb70eda77b493a09cc7c16e0d8", "parents": [ "05a88a43604abb816dfbff075bb114224641793b", "1deb9d341d475ff84262e927d6c0e36fecb9942e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:00:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 10 09:00:39 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID fixes from Jiri Kosina:\n\n - fix usage of sleeping lock in atomic context from Jiri Kosina\n\n - build fix for hid-steelseries under certain .config setups by Simon Wood\n\n - simple mismerge fix from Fernando Luis Vázquez Cao\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: debug: fix RCU preemption issue\n HID: hid-steelseries fix led class build issue\n HID: reintroduce fix-up for certain Sony RF receivers\n" }, { "commit": "832e77bc1106592c621fc42f2f6a4500e414a0a1", "tree": "2b226019e7b1344f05e44d79da956a5306d20780", "parents": [ "e0fd9affeb64088eff407dfc98bbd3a5c17ea479", "e689cf0caf2d5ebcb300fb69887d35c0abdbdb97" ], "author": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Fri May 10 07:53:40 2013 -0700" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Fri May 10 07:53:40 2013 -0700" }, "message": "Merge branch \u0027misc\u0027 into for-linus\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\n" } ], "next": "058ce5ca8155a4c8eeac9b9e8a70e6664996337b" }