)]}' { "log": [ { "commit": "ccb19d263fd1c9e34948e2158c53eacbff369344", "tree": "6683e55f183920dcbf3e1a5b749e7f9780c465b3", "parents": [ "6a488979f574cb4287880db2dbc8b13cee30c5be", "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n net: fix NULL-deref in WARN() in skb_gso_segment()\n net: WARN if skb_checksum_help() is called on skb requiring segmentation\n caif: Remove bad WARN_ON in caif_dev\n caif: Fix typo in Vendor/Product-ID for CAIF modems\n bnx2x: Disable AN KR work-around for BCM57810\n bnx2x: Remove AutoGrEEEn for BCM84833\n bnx2x: Remove 100Mb force speed for BCM84833\n bnx2x: Fix PFC setting on BCM57840\n bnx2x: Fix Super-Isolate mode for BCM84833\n net: fix some sparse errors\n net: kill duplicate included header\n net: sh-eth: Fix build error by the value which is not defined\n net: Use device model to get driver name in skb_gso_segment()\n bridge: BH already disabled in br_fdb_cleanup()\n net: move sock_update_memcg outside of CONFIG_INET\n mwl8k: Fixing Sparse ENDIAN CHECK warning\n ...\n" }, { "commit": "c3b5003b628d8e373262bee42c7260d6a799c73e", "tree": "75667e9aabff692f71688057a7cc4c897efe4a44", "parents": [ "77676fdbd54f0c6fdb71d55d9758bebc69a00fc4" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Tue Jan 17 15:27:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 23:56:19 2012 -0500" }, "message": "tg3: Fix single-vector MSI-X code\n\nKdump kernels leave MSI-X interrupts (as setup by the crashed kernel)\nenabled. However, kdump only enables one CPU in the new environment,\nthus causing tg3 to abort MSI-X setup. When the driver attempts to\nenable INTA or MSI interrupt modes on a kdump kernel, interrupt\ndelivery fails.\n\nThis patch attempts to workaround the problem by forcing the driver\nto enable a single MSI-X interrupt. In such a configuration, the\ndevice\u0027s multivector interrupt mode must be disabled.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "4144cb2ade46d97b9c41682fd2e9064a59f23a98", "tree": "4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc", "parents": [ "59f608d84f937cb5e2fd3a0b9f848f200d47ba85", "604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "6ab48a5c86ce778188c173818cb2f1644526e962", "tree": "8314fc3ad439337e655a675cd01ab0aec9efba75", "parents": [ "096b9527db77defb2501509f2517d2ab24300d9c" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 17 02:33:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:44:43 2012 -0500" }, "message": "bnx2x: Disable AN KR work-around for BCM57810\n\nDisable the work-around for the autoneg KR of the BCM57810 in case the Warpcore version is 0xD108 and above, which fixes this problem.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "096b9527db77defb2501509f2517d2ab24300d9c", "tree": "8fb9f976c34665717b29f2d9181e97fda66dd1d0", "parents": [ "75318327802235ecd7e90b0760cceb994bf975ca" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 17 02:33:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:44:43 2012 -0500" }, "message": "bnx2x: Remove AutoGrEEEn for BCM84833\n\nDisable the autoGrEEEn feature for BCM84833.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75318327802235ecd7e90b0760cceb994bf975ca", "tree": "0d57527bc7f139656ea95ff25c4e05fe7340098f", "parents": [ "127302bb42257eef5d357722d670c4ac53327088" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 17 02:33:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:44:43 2012 -0500" }, "message": "bnx2x: Remove 100Mb force speed for BCM84833\n\nRemove unsupported speed of 100Mb force for BCM84833 due to hardware\nlimitation.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "127302bb42257eef5d357722d670c4ac53327088", "tree": "ec2b1def93a1c204c54e2259e9a28502f9b8b7be", "parents": [ "11b2ec6b739ee90211dc6f6942e2ba3a141434a8" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 17 02:33:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:44:43 2012 -0500" }, "message": "bnx2x: Fix PFC setting on BCM57840\n\nThis patch handles the second port of a path in a 4-port device of\nBCM57840.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11b2ec6b739ee90211dc6f6942e2ba3a141434a8", "tree": "cd3fcf9d89db4d87bd0ac1ec4bf17205c99d22cd", "parents": [ "747465ef7a082033e086dedc8189febfda43b015" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Tue Jan 17 02:33:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:44:42 2012 -0500" }, "message": "bnx2x: Fix Super-Isolate mode for BCM84833\n\nThe Super-Isolate mode comes to isolate the BCM84833 PHY from the\noutside world. Not doing it correctly, made link partner see the link\nbefore the driver was loaded.\n\nThis patch also involves SPIROM version fixes since it is used to\ndetermine whether the common init of the PHY was already executed, and\nthe common init of this PHY is partially responsible for setting the\nSuper-Isolate mode.\n\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34aa6f1400810890636ba0b170effbfa71eacec7", "tree": "4b9b49a22d0fe59c809b032d41d7ecfcb18d8111", "parents": [ "e52ac3398c3d772d372b9b62ab408fd5eec96840" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "nobuhiro.iwamatsu.yj@renesas.com", "time": "Mon Jan 16 16:50:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:31:12 2012 -0500" }, "message": "net: sh-eth: Fix build error by the value which is not defined\n\n-----\ndrivers/net/ethernet/renesas/sh_eth.c:1706: error: \u0027pdid\u0027 undeclared (first use in this function)\ndrivers/net/ethernet/renesas/sh_eth.c:1706: error: (Each undeclared identifier is reported only once\ndrivers/net/ethernet/renesas/sh_eth.c:1706: error: for each function it appears in.)\nmake[5]: *** [drivers/net/ethernet/renesas/sh_eth.o] Error 1\n-----\n\nSigned-off-by: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nCC: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa", "tree": "afa052c6f337e7bf1757a87cfed25dd854c14c3b", "parents": [ "544204733a20200951c271f81c74930ba5424638" ], "author": { "name": "Yogesh Ashok Powar", "email": "yogeshp@marvell.com", "time": "Tue Jan 17 15:45:15 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 10:12:27 2012 -0500" }, "message": "mwl8k: Fixing Sparse ENDIAN CHECK warning\n\nFixing following sparse warning\n\u003edrivers/net/wireless/mwl8k.c:2780:15: warning: incorrect type in assignment (different base types)\n\u003edrivers/net/wireless/mwl8k.c:2780:15: expected restricted unsigned short [usertype] channel\n\u003edrivers/net/wireless/mwl8k.c:2780:15: got unsigned short [unsigned] [usertype] hw_value\n\nSigned-off-by: Yogesh Ashok Powar \u003cyogeshp@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d981e05908f85beb68ae0d935e59c5e399d2136e", "tree": "1923918d9a1e79b8ed89ce3e07a1a8cf0c0f06ee", "parents": [ "5addc0de28f5e286f9d121112c4222250807b5a5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Tue Jan 17 10:33:31 2012 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 10:12:26 2012 -0500" }, "message": "mwl8k: fix condition in mwl8k_cmd_encryption_remove_key()\n\nThe intent here was to check whether key-\u003ecipher was WEP40 or WEP104.\nWe do a similar check correctly in several other places in this file.\nThe current condition is always true.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5addc0de28f5e286f9d121112c4222250807b5a5", "tree": "83e07ecd0cbc5462111b30d31624d6c2a654df32", "parents": [ "7e9e7fa414e47fccc6127f23bc866cbcc7e27dcb" ], "author": { "name": "Alexandre Oliva", "email": "oliva@lsd.ic.unicamp.br", "time": "Mon Jan 16 14:00:12 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 10:12:19 2012 -0500" }, "message": "brcmfmac: work-around gcc 4.7 build issue\n\nAlexandre Oliva \u003coliva@lsd.ic.unicamp.br\u003e says:\n\n\"It\u0027s an issue brought about by GCC 4.7\u0027s partial-inlining, that ends up\nsplitting the udelay function just at the wrong spot, in such a way that\nsome sanity checks for constants fails, and we end up calling\nbad_udelay.\n\nThis patch fixes the problem. Feel free to push it upstream if it makes\nsense to you.\"\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1886e5d2c694e7fb59434c717e704e7fd8475d2e", "tree": "1b2bde28f644bc2178b0eb0d842cc3d40e812a3a", "parents": [ "be94db9ddac0d6ea76f479b04fb3a43314654c9f" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@linux.vnet.ibm.com", "time": "Fri Jan 13 08:06:32 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:04:43 2012 -0500" }, "message": "ehea: make some functions and variables static\n\nSome functions and variables in ehea are only used in their own file, so\nthey should be static. One particular function had a very generic name,\nprint_error_data.\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e9e7fa414e47fccc6127f23bc866cbcc7e27dcb", "tree": "912d69316649f04bcf4b142bdec0ac353ea9fcf8", "parents": [ "7d5869e78f4c9d32f834dadefbb7dcb3c9d4d85f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 23:58:42 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 09:54:08 2012 -0500" }, "message": "brcmsmac: remove PCI suspend/resume from bcma driver\n\nThe brcmsmac driver isn\u0027t a PCI driver any more, it\u0027s a bcma one. The\nPCI device has been resumed by the PCI driver (the generic PCI layer,\nreally), we should be resuming just our own driver state.\n\nAlso add pr_debug() calls to show that we now actually get the\nsuspend/resume events.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7d5869e78f4c9d32f834dadefbb7dcb3c9d4d85f", "tree": "136560d132409e801be0c0e0ba00da7ea9695d05", "parents": [ "685a4ef0df23b97eea1842c2698da9a2e35fc976" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 23:58:41 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 09:54:08 2012 -0500" }, "message": "bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume\n\nNow the low-level driver actually gets informed that it is getting suspended and resumed.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "331d9301ed4d0fe33e9762c62f2870243bcf77eb", "tree": "3b33f0b9c4703ff52273f03d4e1127e31942d4b4", "parents": [ "74b8cc3d592e5e884123eb99960a9f064223eaab" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Mon Jan 16 00:47:12 2012 -0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 16 15:01:16 2012 -0500" }, "message": "wireless: iwlwifi: iwl-scan.c: Fix build warning\n\nFix the following build warning:\n\ndrivers/net/wireless/iwlwifi/iwl-scan.c: In function ‘iwlagn_request_scan’:\ndrivers/net/wireless/iwlwifi/iwl-scan.c:572: warning: ‘cmd_len’ may be used uninitialized in this function\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7a532fe7131216a02c81a6c1b1f8632da1195a58", "tree": "183c13f11d014deba1b4fba2b8cc4c60f791bd3a", "parents": [ "28e7d218da975f6ae1751e293aed938952c55c98" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jan 14 15:08:34 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 16 15:01:15 2012 -0500" }, "message": "ath9k_hw: fix interpretation of the rx KeyMiss flag\n\nDocumentation states that the KeyMiss flag is only valid if RxFrameOK is\nunset, however empirical evidence has shown that this is false.\nWhen KeyMiss is set (and RxFrameOK is 1), the hardware passes a valid frame\nwhich has not been decrypted. The driver then falsely marks the frame\nas decrypted, and when using CCMP this corrupts the rx CCMP PN, leading\nto connection hangs.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4964e0664c80680fa6b28ef91381c076a5b25c2c", "tree": "62099c5aaeee7274bcc66bcfba35d479affa97cf", "parents": [ "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "7bf6612e8a9d6a0b3b82e8e2611942be1258b307" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)\n MIPS: Delete unused function add_temporary_entry.\n MIPS: Set default pci cache line size.\n MIPS: Flush huge TLB\n MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.\n MIPS: Octeon: Add support for OCTEON II PCIe\n MIPS: Octeon: Update PCI Latency timer and enable more error reporting.\n MIPS: Alchemy: Update cpu-feature-overrides\n MIPS: Alchemy: db1200: Improve PB1200 detection.\n MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.\n MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller\n MIPS: Alchemy: irq: register pm at irq init time\n MIPS: Alchemy: Touchscreen support on DB1100\n MIPS: Alchemy: Hook up IrDA on DB1000/DB1100\n net/irda: convert au1k_ir to platform driver.\n MIPS: Alchemy: remove unused board headers\n MTD: nand: make au1550nd.c a platform_driver\n MIPS: Netlogic: Mark Netlogic chips as SMT capable\n MIPS: Netlogic: Add support for XLP 3XX cores\n MIPS: Netlogic: Merge some of XLR/XLP wakup code\n MIPS: Netlogic: Add default XLP config.\n ...\n\nFix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,\ntraps.c} and drivers/tty/serial/Makefile\n" }, { "commit": "dfd00c4c8f3dfa1fd7cec45f83d98b2a49743dcd", "tree": "918140b949cc6189294d27f688925cc3a763ed63", "parents": [ "92c1ff1fa772ee76a18ae1edd2e4baecf381f17e" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Fri Jan 13 12:59:32 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 13 14:40:57 2012 -0500" }, "message": "rt2800pci: fix spurious interrupts generation\n\nSame devices can generate interrupt without properly setting bit in\nINT_SOURCE_CSR register (spurious interrupt), what will cause IRQ line\nwill be disabled by interrupts controller driver.\n\nWe discovered that clearing INT_MASK_CSR stops such behaviour. We\npreviously first read that register, and then clear all know interrupt\nsources bits and do not touch reserved bits. After this patch, we write\nto all register content (I believe writing to reserved bits on that\nregister will not cause any problems, I tested that on my rt2800pci\ndevice).\n\nThis fix very bad performance problem, practically making device\nunusable (since worked without interrupts), reported in:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d658451\n\nWe previously tried to workaround that issue in commit\n4ba7d9997869d25bd223dea7536fc1ce9fab3b3b \"rt2800pci: handle spurious\ninterrupts\", but it was reverted in commit\n82e5fc2a34fa9ffea38f00c4066b7e600a0ca5e6\nas thing, that will prevent to detect real spurious interrupts.\n\nReported-and-tested-by: Amir Hedayaty \u003chedayaty@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "92c1ff1fa772ee76a18ae1edd2e4baecf381f17e", "tree": "1e92c04b64bb3ac4e8d2424e854ef6e9301a8be9", "parents": [ "ccde8a45cbd3ea9a6e785e4393d3a1f6b4e6b495" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Jan 12 09:34:50 2012 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 13 14:40:56 2012 -0500" }, "message": "ipw2x00: signedness bug handling frame length\n\nThis is basically just a cleanup. Large positive numbers get counted as\nnegative but then get implicitly cast to positive again for the checks\nthat matter.\n\nThis does make a small difference in ipw_handle_promiscuous_rx() when we\ntest \"if (unlikely((len + IPW_RX_FRAME_SIZE) \u003e skb_tailroom(rxb-\u003eskb)))\"\nIt should return there, but we don\u0027t return until a couple lines later\nwhen we test \"if (len \u003e IPW_RX_BUF_SIZE - sizeof(struct ipw_rt_hdr)) {\".\nThe difference is that in the second test the sizeof() means that there\nis an implied cast to unsigned.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ccde8a45cbd3ea9a6e785e4393d3a1f6b4e6b495", "tree": "15e7011f8a11f0ade53f0704093abd596e6d2f42", "parents": [ "099469502f62fbe0d7e4f0b83a2f22538367f734" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Fri Jan 06 12:58:16 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 13 14:40:50 2012 -0500" }, "message": "wireless: b43: fix Oops on card eject during transfer\n\nAn Oops has once been observed, when the SDIO card had been ejected during\nIO. The PC value shows, that the dev pointer in b43_op_stop() was NULL.\n\n(I moved the NULL check before the lock, based upon a suggestion from\nJulian Calaby \u003cjulian.calaby@gmail.com\u003e. -- JWL)\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "tree": "353f739a33f46f9861b479e64d2a59f9b5c85868", "parents": [ "2485a4b610171f4e1c4ab0d053569747795c1bbe", "91dce7ddab99a29b600e3d792b847dc2cdbf0848" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits)\n pptp: Accept packet with seq zero\n RDS: Remove some unused iWARP code\n net: fsl: fec: handle 10Mbps speed in RMII mode\n drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap\n drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap\n ksz884x: fix mtu for VLAN\n net_sched: sfq: add optional RED on top of SFQ\n dp83640: Fix NOHZ local_softirq_pending 08 warning\n gianfar: Fix invalid TX frames returned on error queue when time stamping\n gianfar: Fix missing sock reference when processing TX time stamps\n phylib: introduce mdiobus_alloc_size()\n net: decrement memcg jump label when limit, not usage, is changed\n net: reintroduce missing rcu_assign_pointer() calls\n inet_diag: Rename inet_diag_req_compat into inet_diag_req\n inet_diag: Rename inet_diag_req into inet_diag_req_v2\n bond_alb: don\u0027t disable softirq under bond_alb_xmit\n mac80211: fix rx-\u003ekey NULL pointer dereference in promiscuous mode\n nl80211: fix old station flags compatibility\n mdio-octeon: use an unique MDIO bus name.\n mdio-gpio: use an unique MDIO bus name.\n ...\n" }, { "commit": "91dce7ddab99a29b600e3d792b847dc2cdbf0848", "tree": "5af5d6d5141c203d92ca0fe3f25b6e54be13e8c7", "parents": [ "5b7bf42e3d47fb16aaf53776ae3eaaf1be247a35" ], "author": { "name": "Bradley Peterson", "email": "despite@gmail.com", "time": "Thu Jan 12 10:39:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "pptp: Accept packet with seq zero\n\nInitialize the PPTP \"seq received\" value to 0xffffffff, so we don\u0027t\nignore packets with seq zero.\n\nSigned-off-by: Bradley Peterson \u003cdespite@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d82f219c2d476811cd3157a39c7b5c1f045ebc3", "tree": "32bda05590b8799574c89d2f3bdc22ea47973cb5", "parents": [ "25cecd7e355bf90b8fea039bd06947bb3234e77d" ], "author": { "name": "Eric Benard", "email": "eric@eukrea.com", "time": "Thu Jan 12 06:10:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "net: fsl: fec: handle 10Mbps speed in RMII mode\n\nwhen the link is 10 Mbps and the mode is RMII, it\u0027s necessary\nto set FRCONT to 1 in MIIGSK_CFGR to divide the RMII source\nclock by 10 in order to support 10 Mbps operations.\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25cecd7e355bf90b8fea039bd06947bb3234e77d", "tree": "287848d194e82ba41fb71d5e4c1ac340a80b6d05", "parents": [ "20d4369b6892159895d6136946e692eaf29e8413" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Wed Jan 11 23:55:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap\n\nAdd missing iounmap in error handling code, in a case where the function\nalready preforms iounmap on some other execution path.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression e;\nstatement S,S1;\nint ret;\n@@\ne \u003d \\(ioremap\\|ioremap_nocache\\)(...)\n... when !\u003d iounmap(e)\nif (\u003c+...e...+\u003e) S\n... when any\n when !\u003d iounmap(e)\n*if (...)\n { ... when !\u003d iounmap(e)\n return ...; }\n... when any\niounmap(e);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "20d4369b6892159895d6136946e692eaf29e8413", "tree": "cd23450e46a9ec31c794c39126049a5d2b2ee988", "parents": [ "83636580ad99cffd85b07e75da7ad45ada0fd530" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Wed Jan 11 23:55:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap\n\nAdd missing iounmap in error handling code, in a case where the function\nalready preforms iounmap on some other execution path.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression e;\nstatement S,S1;\nint ret;\n@@\ne \u003d \\(ioremap\\|ioremap_nocache\\)(...)\n... when !\u003d iounmap(e)\nif (\u003c+...e...+\u003e) S\n... when any\n when !\u003d iounmap(e)\n*if (...)\n { ... when !\u003d iounmap(e)\n return ...; }\n... when any\niounmap(e);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "83636580ad99cffd85b07e75da7ad45ada0fd530", "tree": "e5ce86104abbfb7e8c9da7edd7bd7fca3871b9e3", "parents": [ "ddecf0f4db44ef94847a62d6ecf74456b4dcc66f" ], "author": { "name": "Doug Kehn", "email": "rdkehn@yahoo.com", "time": "Wed Jan 11 13:12:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "ksz884x: fix mtu for VLAN\n\nThe Ethernet header does not account for the addition of a VLAN header.\nFull size Ethernet frames containing VLAN header are not processed\nbecause the frame is larger than the resulting hw mtu.\n\nSigned-off-by: Doug Kehn \u003crdkehn@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72092cc45378176ba700034c91b7af2db524df26", "tree": "5505277b40f14304d78729aee8264b024799b775", "parents": [ "9c4886e5e63bbecea0b560829a96f37e8d9ddd7c" ], "author": { "name": "Manfred Rudigier", "email": "Manfred.Rudigier@omicron.at", "time": "Mon Jan 09 23:52:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:26:01 2012 -0800" }, "message": "dp83640: Fix NOHZ local_softirq_pending 08 warning\n\nSimilar problem as in 481a8199142c050b72bff8a1956a49fd0a75bbe0 (\"can:\nfix NOHZ local_softirq_pending 08 warning\"). This fix replaces\nnetif_rx() with netif_rx_ni() which has to be used from\nprocess/softirq context.\n\nSigned-off-by: Manfred Rudigier \u003cmanfred.rudigier@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c4886e5e63bbecea0b560829a96f37e8d9ddd7c", "tree": "1cc0c8626a929ecf04f8f84f9b289a20e95f32b5", "parents": [ "db83d136d7f7534857cd9c6e588adc08a428b190" ], "author": { "name": "Manfred Rudigier", "email": "Manfred.Rudigier@omicron.at", "time": "Mon Jan 09 23:26:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:26:01 2012 -0800" }, "message": "gianfar: Fix invalid TX frames returned on error queue when time stamping\n\nWhen TX time stamping for PTP messages is enabled on a socket, a time\nstamp is returned on the socket error queue to the user space application\nafter the frame was transmitted. The transmitted frame is also returned on\nthe error queue so that an application knows to which frame the time stamp\nbelongs.\n\nIn the current implementation the TxFCB is immediately followed by the\nframe. Since the eTSEC inserts the TX time stamp 8 bytes after the TxFCB,\nparts of the frame have been overwritten and an invalid frame was returned\non the socket error queue.\n\nThis patch fixes the described problem by adding additional 16 padding\nbytes between the TxFCB and the frame for all messages sent from a time\nstamping enabled socket (other sockets are not affected).\n\nSigned-off-by: Manfred Rudigier \u003cmanfred.rudigier@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db83d136d7f7534857cd9c6e588adc08a428b190", "tree": "f52e6d1092b01b395de9b180707e47822a168829", "parents": [ "eb8a54a78e974e1af3e17fa38bb74d3747c5c1bd" ], "author": { "name": "Manfred Rudigier", "email": "Manfred.Rudigier@omicron.at", "time": "Mon Jan 09 23:26:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:26:01 2012 -0800" }, "message": "gianfar: Fix missing sock reference when processing TX time stamps\n\nWhen there is not enough headroom in the skb a private copy will be made.\nHowever, the private copy had no reference to the socket and consequently\nno time stamp could be queued on the socket error queue during the\nskb_tstamp_tx function. This patch fixes this issue by also stealing the\nsock reference from the original skb after making the private copy.\n\nSigned-off-by: Manfred Rudigier \u003cmanfred.rudigier@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb8a54a78e974e1af3e17fa38bb74d3747c5c1bd", "tree": "d3642783d7470c26815b7d3c14ea5d5949d7dcdb", "parents": [ "1398eee08222a038fa5f017900f387e81f6e3ff4" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "message": "phylib: introduce mdiobus_alloc_size()\n\nIntroduce function mdiobus_alloc_size() as an alternative to mdiobus_alloc().\nMost callers of mdiobus_alloc() also allocate a private data structure, and\nthen manually point bus-\u003epriv to this object. mdiobus_alloc_size()\ncombines the two operations into one, which simplifies memory management.\n\nThe original mdiobus_alloc() now just calls mdiobus_alloc_size(0).\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bcf8a3dfcb274cf6654a19e12e244f3af8c0d355", "tree": "f1d0e0f36c0575a9202750aff65ba17ce91bc437", "parents": [ "61bd5e5683244a564ecfe31c73575ee0bc708ccc", "b6c96c0214138186f495e3ee73737c6fc5e4efa2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "message": "Merge tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux\n\n* tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux: (24 commits)\n lguest: Make sure interrupt is allocated ok by lguest_setup_irq\n lguest: move the lguest tool to the tools directory\n lguest: switch segment-voodoo-numbers to readable symbols\n virtio: balloon: Add freeze, restore handlers to support S4\n virtio: balloon: Move vq initialization into separate function\n virtio: net: Add freeze, restore handlers to support S4\n virtio: net: Move vq and vq buf removal into separate function\n virtio: net: Move vq initialization into separate function\n virtio: blk: Add freeze, restore handlers to support S4\n virtio: blk: Move vq initialization to separate function\n virtio: console: Disable callbacks for virtqueues at start of S4 freeze\n virtio: console: Add freeze and restore handlers to support S4\n virtio: console: Move vq and vq buf removal into separate functions\n virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff\n virtio: pci: switch to new PM API\n virtio_blk: fix config handler race\n virtio: add debugging if driver doesn\u0027t kick.\n virtio: expose added descriptors immediately.\n virtio: avoid modulus operation.\n virtio: support unlocked queue kick\n ...\n" }, { "commit": "61bd5e5683244a564ecfe31c73575ee0bc708ccc", "tree": "6df40bc0d8bd3e27588349fe8b469286fd48bdf9", "parents": [ "bccd17294a26b67a8a19aaa120e3eeaa7da49281" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:19:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:19:34 2012 -0800" }, "message": "brcmsmac: fix reading of PCI sprom contents\n\nIt appears that you can only read the sprom contents with aligned 16-bit\nreads: anything else causes at least some versions of the broadcom\nchipset to abort the PCI transaction, returning 0xff.\n\nThis apparently doesn\u0027t trigger very often, because most setups don\u0027t\nuse an external srom chip, and the OTP sprom loading doesn\u0027t have this\nissue. But at least the current 11\" Macbook Air does trigger it, and\nwireless communications were broken as a result.\n\nAcked-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9ee6045f09a7875ebe55b9942b232a19076b157b", "tree": "4c3924d35d99d413a95205ac21da8d369063234b", "parents": [ "3b09c84cb622ffbcdb5d541986b1eaf7d5812602", "1140afa862842ac3e56678693050760edc4ecde9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:10:00 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:10:00 2012 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "0741bcb5584f9e2390ae6261573c4de8314999f2", "tree": "d52abfa39e08dbdda0bee35d85a72a8060391a16", "parents": [ "04486ed019d249249c00546704af12498a432c15" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu Dec 22 16:58:33 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:46 2012 +1030" }, "message": "virtio: net: Add freeze, restore handlers to support S4\n\nRemove all the vqs, disable napi and detach from the netdev on\nhibernation.\n\nRe-create vqs after restoring from a hibernated image, re-enable napi\nand re-attach the netdev. This keeps networking working across\nhibernation.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "04486ed019d249249c00546704af12498a432c15", "tree": "13c2d4e7a02dffbd75c9476bde3ef4dcfcf8cd8a", "parents": [ "3f9c10b0d478a3b7c3dde555edae79fecef496e5" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu Dec 22 16:58:32 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:46 2012 +1030" }, "message": "virtio: net: Move vq and vq buf removal into separate function\n\nThe remove and PM freeze functions will share this code.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "3f9c10b0d478a3b7c3dde555edae79fecef496e5", "tree": "c83b10130dddce52bb8c71ea4b9e4acb82ee5bd0", "parents": [ "f8fb5bc23a50a5398aa31a4e8c6dbbef53d2dec6" ], "author": { "name": "Amit Shah", "email": "amit.shah@redhat.com", "time": "Thu Dec 22 16:58:31 2011 +0530" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:46 2012 +1030" }, "message": "virtio: net: Move vq initialization into separate function\n\nThe probe and PM restore functions will share this code.\n\nSigned-off-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "f96fde41f7f9af6cf20f6a1919f5d9670f84d574", "tree": "14b8a0343b255989ac8ba0ea34e18dca419723df", "parents": [ "5dfc17628d57f9e62043ed0cba03a6e3eb019a78" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "message": "virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf\n\nRemove wrapper functions. This makes the allocation type explicit in\nall callers; I used GPF_KERNEL where it seemed obvious, left it at\nGFP_ATOMIC otherwise.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "f515e6b77045b4b1f54617d9fbf4a22b95a58757", "tree": "d01dfbd06052f13c88aa6a93b69e9d33cc87c20c", "parents": [ "d6c25beba35a76c002bff9235484d75a6f8e7e6b" ], "author": { "name": "Maxim Uvarov", "email": "maxim.uvarov@oracle.com", "time": "Mon Jan 09 12:01:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 11 12:52:26 2012 -0800" }, "message": "bond_alb: don\u0027t disable softirq under bond_alb_xmit\n\nNo need to lock soft irqs under bond_alb_xmit()\nwhich already has softirq disabled.\n\nChanges:\n1. add non-bh/bh version to tlb_clear_slave()\n\n2. represent BH and non BH hash table locks\n_lock_rx_hashtbl_bh/_unlock_rx_hashtbl_bh\n_lock_rx_hashtbl/_unlock_rx_hashtbl\n_lock_tx_hashtbl_bh/_unlock_tx_hashtbl_bh\n_lock_tx_hashtbl/_unlock_tx_hashtbl\n\nSigned-off-by: Maxim Uvarov \u003cmaxim.uvarov@oracle.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6c25beba35a76c002bff9235484d75a6f8e7e6b", "tree": "30cca470f12d3eed947f4d8ee816bed23307d10f", "parents": [ "a77e929a24ccf5a8545266a0c247e5ae862f13ba" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "mdio-octeon: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a77e929a24ccf5a8545266a0c247e5ae862f13ba", "tree": "00b8be4c9f5e4d779cbfa1f071ee7728063b6029", "parents": [ "9e6c643bb4502c50b6511206601b7760c610dfcc" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "mdio-gpio: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e6c643bb4502c50b6511206601b7760c610dfcc", "tree": "4a5877bb5ce15ed3976d5b7d31d5077b5db49753", "parents": [ "3e617506c17df5cba55d7c615ec7cfbc812ec5fa" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "phy/fixed: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e617506c17df5cba55d7c615ec7cfbc812ec5fa", "tree": "951bff023324e9e1b26696fedf603034382ebf53", "parents": [ "0869b3a456d62070fb1f7e3519fd53934b52530c" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "bcm63xx_enet: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0869b3a456d62070fb1f7e3519fd53934b52530c", "tree": "90cd72132c43c8c2a3408d0833f0f34816b62b48", "parents": [ "5a05a8200a4359ef2bfe9094c137dee35cfdd516" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "ixp4xx-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a05a8200a4359ef2bfe9094c137dee35cfdd516", "tree": "398018bc13ea0295781219bd0e40705ff9c2d372", "parents": [ "d1733f078b1b3777fed8e8fe598e7f10f28f59fb" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "davinci_emac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1733f078b1b3777fed8e8fe598e7f10f28f59fb", "tree": "75e886c49a037e3c331e3b33c859155379a939cb", "parents": [ "db8857bf5bd888d763e1984f9449d0b824b39ee1" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "cpmac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db8857bf5bd888d763e1984f9449d0b824b39ee1", "tree": "f4ec2c77107dfd48ef371725a1451c6ac762aef4", "parents": [ "09ef0789bbceb0fe89ce4ad2bb1fdb2b937d3eba" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "stmmac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09ef0789bbceb0fe89ce4ad2bb1fdb2b937d3eba", "tree": "e238daa543759a37143ed42591304d29320f493b", "parents": [ "859ad35e711d95f2794ab2196aac7c45fe5f7cfe" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "smsc911x: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "859ad35e711d95f2794ab2196aac7c45fe5f7cfe", "tree": "6876c16bdc7b1b4e3aa2e48493d694ae60aa4658", "parents": [ "5278fb547076ad6768d16c8b4df45c086470c163" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "s6gmac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5278fb547076ad6768d16c8b4df45c086470c163", "tree": "823f9e28fac267c4c1ba28eb8c593ff31e0eb408", "parents": [ "d073a102a185e9847785c93669bffd1a09a8c1f2" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "sh-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d073a102a185e9847785c93669bffd1a09a8c1f2", "tree": "2f9dcff8dbbc7b8e98384c6b44aa2d7af44eeb42", "parents": [ "12322431d154250db9e61b0c79151c968a8d7766" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:01 2012 -0800" }, "message": "pxa168-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12322431d154250db9e61b0c79151c968a8d7766", "tree": "b19ecb9b785c2f5c5d9e131002a8c437c4daef79", "parents": [ "d1b86507d87c94a201a9a1bb31d2285b189d8e26" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "mv643xx-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1b86507d87c94a201a9a1bb31d2285b189d8e26", "tree": "ae490994b6beeb4b8466a0f2bfa8007144ce7271", "parents": [ "391420f7b829e73b26a543e39c40a83f7de6467c" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "lantiq_etop: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "391420f7b829e73b26a543e39c40a83f7de6467c", "tree": "47ec8646e97cee1af969c781cbd55853aa3bceec", "parents": [ "63f678301fb952c2d758d9ded4ed88c1da6c0c50" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "fec: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63f678301fb952c2d758d9ded4ed88c1da6c0c50", "tree": "d30d434b3d7e2482c79f3d713bd41c67dbc22fe2", "parents": [ "98d5e57eafce7a68d864fdb5a26542ba8b4f59ba" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "dnet: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98d5e57eafce7a68d864fdb5a26542ba8b4f59ba", "tree": "9800df483050169adb3d4ea3aea2b79969ee9399", "parents": [ "446bbc4b5ee122c3a3a4954b144d031f0f9aa006" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "macb: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "446bbc4b5ee122c3a3a4954b144d031f0f9aa006", "tree": "6d4b806e6eadab525a615aefbd15b2b9c58ebec5", "parents": [ "f74299b6c1d01363adf356c9ecc01ba000a5a1aa" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "sb1250: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f74299b6c1d01363adf356c9ecc01ba000a5a1aa", "tree": "eb3be20c38ebe2cea6dc202a41cd8f83a3e6b622", "parents": [ "75432fd2913e03696f56289a853754ef0124545f" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "au1000-eth: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75432fd2913e03696f56289a853754ef0124545f", "tree": "eeb14fbb8e09732f1931117efc4e4a8fb2551dc0", "parents": [ "fa84e7201c592945b390fb51a5ffc7e785868be4" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "bfin_mac: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa84e7201c592945b390fb51a5ffc7e785868be4", "tree": "13091b56438081a04901708f7899f02515f96685", "parents": [ "71bc5d94061516c4e70303570128797bcf768b10" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:00 2012 -0800" }, "message": "ax88796: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71bc5d94061516c4e70303570128797bcf768b10", "tree": "5625427bd7c047b0feffc0809ab91d91051a2014", "parents": [ "8ef66bdc4bda6aac2dae73b84d79dc8c2db33637" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Tue Jan 10 06:40:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:59:48 2012 -0800" }, "message": "asix: fix setting custom MAC address on Asix 88178 devices\n\nIn kernel v3.2 initialization sequence for Asix 88178 devices was changed so\nthat hardware is reseted on every time interface is brought up (ifconfig up),\ninstead just at USB probe time. This causes problem with setting custom MAC\naddress to device as ax88178_reset causes reload of MAC address from EEPROM.\n\nThis patch fixes the issue by rewriting MAC address at end of ax88178_reset.\n\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nAcked-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nCc: Allan Chou \u003callan@asix.com.tw\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ef66bdc4bda6aac2dae73b84d79dc8c2db33637", "tree": "a4a78ce0bbf4e7a320d10f1c80b80e93fc08a1ec", "parents": [ "2193ceabdcde1fca5e017acf1d0023285531748f" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Tue Jan 10 06:40:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:59:48 2012 -0800" }, "message": "asix: fix setting custom MAC address on Asix 88772 devices\n\nIn kernel v3.2 initialization sequence for Asix 88772 devices was changed so\nthat hardware is reseted on every time interface is brought up (ifconfig up),\ninstead just at USB probe time. This causes problem with setting custom MAC\naddress to device as ax88772_reset causes reload of MAC address from EEPROM.\n\nThis patch fixes the issue by rewriting MAC address at end of ax88772_reset.\n\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nAcked-by: Grant Grundler \u003cgrundler@chromium.org\u003e\nCc: Allan Chou \u003callan@asix.com.tw\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aae54cff9255f190ec712468d1b40e63bb51e127", "tree": "3a20f6dfbe71f0e2524ec0cd1dcbbbba1d9705e7", "parents": [ "1dd8117e3320fb42ec40ef2ace982871572d34ed" ], "author": { "name": "Stefan Roese", "email": "sr@denx.de", "time": "Tue Jan 10 01:47:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:57:20 2012 -0800" }, "message": "stmmac: Add missing LF to pr_info() in stmmac_main.c\n\nOtherwise the output looks like this:\n\n...\nSTMMAC - user ID: 0x10, Synopsys ID: 0x32\n No HW DMA feature register supported\n Normal descriptors\n Remote wake-up capable\n Checksum Offload Engine supported\n No MAC Management Counters availableIP-Config: Complete:\n device\u003deth0, addr\u003d192.168.20.42, mask\u003d255.255.0.0, gw\u003d192.168.1.254,\n...\n\nSigned-off-by: Stefan Roese \u003csr@denx.de\u003e\nCc: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dd8117e3320fb42ec40ef2ace982871572d34ed", "tree": "147b727bb7b64daff4ca09cefe85d00e0dd00fac", "parents": [ "f3e438f0f776024aa3979e717a0f65f85fe9c6f3" ], "author": { "name": "Stefan Roese", "email": "sr@denx.de", "time": "Tue Jan 10 01:47:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:57:20 2012 -0800" }, "message": "stmmac: Fix compilation error in mmc_core.c\n\nFix this error:\n\n CC drivers/net/ethernet/stmicro/stmmac/mmc_core.o\ndrivers/net/ethernet/stmicro/stmmac/mmc_core.c: In function \u0027dwmac_mmc_ctrl\u0027:\ndrivers/net/ethernet/stmicro/stmmac/mmc_core.c:143:2: error: implicit\n declaration of function \u0027pr_debug\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stefan Roese \u003csr@denx.de\u003e\nCc: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3e438f0f776024aa3979e717a0f65f85fe9c6f3", "tree": "0a636cc5b427e171ab4a04fc889a3f1e6ad961ef", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "e92b9b3b091d5fcdaed91d6fa9410deae135704b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:53:49 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 14:53:49 2012 -0800" }, "message": "Merge branch \u0027davem-next.via-rhine\u0027 of git://violet.fr.zoreil.com/romieu/linux\n" }, { "commit": "1a19f77f3642b8194ad9cf55548cc5d92e841766", "tree": "aed6d28a9043cb882e878676dc015d6b0f63c690", "parents": [ "c40701eacbaebcfe3fb6fac8ef3da653021c212c" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanohar@qca.qualcomm.com", "time": "Mon Jan 09 15:37:53 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 10 15:46:40 2012 -0500" }, "message": "ath9k: Fix regression in channelwidth switch at the same channel\n\nThe commit \"ath9k: Fix invalid noisefloor reading due to channel update\"\npreserves the current channel noisefloor readings before updating\nchannel type at the same channel index. It is also updating the curchan\npointer. As survey updation is also referring curchan pointer to fetch\nthe appropriate index, which might leads to invalid memory access. This\npatch partially reverts the change and stores the noise floor history\nbuffer before updating channel type w/o updating curchan.\n\nCc: stable@kernel.org\nCc: Gary Morain \u003cgmorain@google.com\u003e\nCc: Paul Stewart \u003cpstew@google.com\u003e\nReported-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c40701eacbaebcfe3fb6fac8ef3da653021c212c", "tree": "8b602862745a4988a7652b55c50770d0bfc4471c", "parents": [ "e4922f2b5f1c2b3daa80b56a6eeca984cbee0dde" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 08 23:41:21 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 10 15:46:40 2012 -0500" }, "message": "brcm80211: Don\u0027t leak \u0027vbuffer\u0027 in brcmf_sdbrcm_write_vars()\n\nIf the memory allocation \u0027nvram_ularray \u003d kmalloc(varsize,\nGFP_ATOMIC);\u0027 fails we\u0027ll leak the memory allocated to \u0027vbuffer\u0027 when\nwe return -ENOMEM from the function.\n\nThis patch resolves the leak by kfree()\u0027ing the allocated memory\nbefore the return.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e4922f2b5f1c2b3daa80b56a6eeca984cbee0dde", "tree": "13e5df16af456bf5eeed68aa504c6fcd6d07324d", "parents": [ "d90db4b12bc1b9b8a787ef28550fdb767ee25a49" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Sat Jan 07 21:06:02 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 10 15:46:39 2012 -0500" }, "message": "ath9k_hw: fix a comment\n\nalso remove an unused macro and a function declaration\n\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d90db4b12bc1b9b8a787ef28550fdb767ee25a49", "tree": "cf0aa627c4acd887de9555202feccb983868eddc", "parents": [ "874c60bad92564358e87d58f505fceb0b09ec1aa" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Wed Jan 04 20:50:47 2012 -0600" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 10 15:46:39 2012 -0500" }, "message": "rtl8192se: Fix BUG caused by failure to check skb allocation\n\nWhen downloading firmware into the device, the driver fails to check the\nreturn when allocating an skb. When the allocation fails, a BUG can be\ngenerated, as seen in https://bugzilla.redhat.com/show_bug.cgi?id\u003d771656.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "90160371b3a3e67ef78d68210a94dd30664a703d", "tree": "2841ea811be129133cf9b83d9c3badd96e7ffab4", "parents": [ "ae5cfc0546ca2698b9dcddf72accbd70e57590a0", "6c254de16a1d14c1ac931d3aa08dc88ac9fc582b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (37 commits)\n xen/pciback: Expand the warning message to include domain id.\n xen/pciback: Fix \"device has been assigned to X domain!\" warning\n xen/pciback: Move the PCI_DEV_FLAGS_ASSIGNED ops to the \"[un|]bind\"\n xen/xenbus: don\u0027t reimplement kvasprintf via a fixed size buffer\n xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX\n xen/xenbus: Reject replies with payload \u003e XENSTORE_PAYLOAD_MAX.\n Xen: consolidate and simplify struct xenbus_driver instantiation\n xen-gntalloc: introduce missing kfree\n xen/xenbus: Fix compile error - missing header for xen_initial_domain()\n xen/netback: Enable netback on HVM guests\n xen/grant-table: Support mappings required by blkback\n xenbus: Use grant-table wrapper functions\n xenbus: Support HVM backends\n xen/xenbus-frontend: Fix compile error with randconfig\n xen/xenbus-frontend: Make error message more clear\n xen/privcmd: Remove unused support for arch specific privcmp mmap\n xen: Add xenbus_backend device\n xen: Add xenbus device driver\n xen: Add privcmd device driver\n xen/gntalloc: fix reference counts on multi-page mappings\n ...\n" }, { "commit": "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "tree": "69ced9c509c864a67122c5e1337f14cd1d9e988d", "parents": [ "979ecef5b89a8003902299566d9cdc08de34a3ee", "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n netdev: make net_device_ops const\n bcm63xx: make ethtool_ops const\n usbnet: make ethtool_ops const\n net: Fix build with INET disabled.\n net: introduce netif_addr_lock_nested() and call if when appropriate\n net: correct lock name in dev_[uc/mc]_sync documentations.\n net: sk_update_clone is only used in net/core/sock.c\n 8139cp: fix missing napi_gro_flush.\n pktgen: set correct max and min in pktgen_setup_inject()\n smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h\n asix: fix infinite loop in rx_fixup()\n net: Default UDP and UNIX diag to \u0027n\u0027.\n r6040: fix typo in use of MCR0 register bits\n net: fix sock_clone reference mismatch with tcp memcontrol\n" }, { "commit": "979ecef5b89a8003902299566d9cdc08de34a3ee", "tree": "2a695d557adab1dec5263f014789f5b59238bac8", "parents": [ "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "8c3b2296f1aa13d7504d2c09bc819cef3759562a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "message": "Merge tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nclock management changes for i.MX\n\nAnother simple series related to clock management, this time only for\nimx.\n\n* tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: select HAVE_CLK_PREPARE for clock\n clk: add config option HAVE_CLK_PREPARE into Kconfig\n ASoC: mxs-saif: convert to clk_prepare/clk_unprepare\n video: mxsfb: convert to clk_prepare/clk_unprepare\n serial: mxs-auart: convert to clk_prepare/clk_unprepare\n net: flexcan: convert to clk_prepare/clk_unprepare\n mtd: gpmi-lib: convert to clk_prepare/clk_unprepare\n mmc: mxs-mmc: convert to clk_prepare/clk_unprepare\n dma: mxs-dma: convert to clk_prepare/clk_unprepare\n net: fec: add clk_prepare/clk_unprepare\n ARM: mxs: convert platform code to clk_prepare/clk_unprepare\n clk: add helper functions clk_prepare_enable and clk_disable_unprepare\n\nFix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to\ncommit 0ebafefcaa7a (\"net: fec: add clk_prepare/clk_unprepare\") clashing\ntrivially with commit e163cc97f9ac (\"net/fec: fix the .remove code\").\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "tree": "4cfa82b619f7d39b671e4a2a213f4d040b09c486", "parents": [ "6d889d03ab1417645e76e129834f76204bae37c0", "3e2762c8f1141ae8dc708034ea41d6827818c328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "message": "Merge tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNew feature development\n\nThis adds support for new features, and contains stuff from most\nplatforms. A number of these patches could have fit into other\nbranches, too, but were small enough not to cause too much\nconfusion here.\n\n* tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mfd/db8500-prcmu: remove support for early silicon revisions\n ARM: ux500: fix the smp_twd clock calculation\n ARM: ux500: remove support for early silicon revisions\n ARM: ux500: update register files\n ARM: ux500: register DB5500 PMU dynamically\n ARM: ux500: update ASIC detection for U5500\n ARM: ux500: support DB8520\n ARM: picoxcell: implement watchdog restart\n ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C\n ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx \u003c\u003d ES2.1\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\n ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3\n ARM: Orion: Remove address map info from all platform data structures\n ARM: Orion: Get address map from plat-orion instead of via platform_data\n ARM: Orion: mbus_dram_info consolidation\n ARM: Orion: Consolidate the address map setup\n ARM: Kirkwood: Add configuration for MPP12 as GPIO\n ARM: Kirkwood: Recognize A1 revision of 6282 chip\n ARM: ux500: update the MOP500 GPIO assignments\n ...\n" }, { "commit": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\n" }, { "commit": "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9", "tree": "e8adf108c0474879f18845d51556279ce9325c23", "parents": [ "1aff0cbe9d51236efba2e721a34e2c15779f95f3" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "netdev: make net_device_ops const\n\nMore drivers where net_device_ops should be const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1aff0cbe9d51236efba2e721a34e2c15779f95f3", "tree": "b0ed0d690cc5c42122b50ae6b41c3b905d71e2ee", "parents": [ "bc689c9788f2cc9829d01d84083bc1714b969b15" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "bcm63xx: make ethtool_ops const\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc689c9788f2cc9829d01d84083bc1714b969b15", "tree": "80417749027b979ecc11875d0cdbb5cc78113713", "parents": [ "3969eb3859e4fad4b32ca8f96d4ec8551c20704a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jan 05 19:10:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:05:23 2012 -0800" }, "message": "usbnet: make ethtool_ops const\n\nThe ethtool_ops table of function pointers should be const.\nFix all the usb network drivers.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "b189e810619a676e6b931a942a3e8387f3d39c21", "tree": "5efd2b54dd6b879442d780e3f417d5cf1767f94b", "parents": [ "26e29eeda048aa6699984c4b9d6997dd1a1315db" ], "author": { "name": "françois romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Jan 08 13:41:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 19:20:33 2012 -0800" }, "message": "8139cp: fix missing napi_gro_flush.\n\nThe driver uses __napi_complete and napi_gro_receive. Without it, the\ndriver hits the BUG_ON(n-\u003egro_list) assertion hard in __napi_complete.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nTested-by: Marin Glibic \u003czhilla2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "e92b9b3b091d5fcdaed91d6fa9410deae135704b", "tree": "0f4baaefba74f6b41f302d16555c9894c0923e8f", "parents": [ "fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:58:27 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:38 2012 +0100" }, "message": "via-rhine: rework suspend and resume.\n\nCover of 861ab44059350e5cab350238606cf8814abab93b.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c", "tree": "080fdb2ce9efb232296727d1c84e9cc3eb2ed3f1", "parents": [ "a384a33bb1c9ec2d99db2046b41f57023fa7d77b" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:39:37 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:38 2012 +0100" }, "message": "via-rhine: per device debug level.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "a384a33bb1c9ec2d99db2046b41f57023fa7d77b", "tree": "ca829e3546ffa5add0957ab0facb666877bd4666", "parents": [ "7ab87ff4c770eed71e3777936299292739fcd0fe" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 22:19:36 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: RHINE_WAIT_FOR macro removal.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "7ab87ff4c770eed71e3777936299292739fcd0fe", "tree": "d6eac281d61f8cdf84a387b2ef455d20f058001d", "parents": [ "a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Jan 06 21:42:26 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: move work from irq handler to softirq and beyond.\n\n- Tx processing is moved from the irq handler to NAPI poll\n- link events and obscure event processing is moved to its proper work queue\n\nLocking rules undergo some changes through the driver.\n\n- the driver offers the usual lock-free Tx path\n- besides the IRQ handler, the link event task schedules the napi handler.\n The driver thus adds some internal locking to prevent a loop when both\n must be disabled.\n- the reset task keeps being scheduled from the Tx watchdog handler, thus\n with implicit Tx queue disabling. It does not need to care about irq,\n only napi softirq and competing task.\n- it is not worth to add a dedicated lock between {g, s}et_wol and\n rhine_shutdown. It should not hurt no narrow it down a bit though.\n- rhine_reset_task must keep its huge spin_lock_bh protected section due\n to :\n - races for the CAM registers (see rhine_vlan_rx_{add, kill}_vid)\n - implicit use of napi_enable (see init_registers)\n - use of the same lock for stats read / update exclusion between\n napi rx processing and rhine_get_stats\n- rhine_resume requires a softirq disabled section for the same reason\n as rhine_reset_task\n- {free, request}_irq have been replaced with IntrEnable actions in\n rhine_{suspend, resume}. It is hidden behind init_registers for the\n latter.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e", "tree": "6a05caaced97e63d1fbfa9d8890fe12cfc025cc2", "parents": [ "a20a28bc321fefcc23f8da7ce3722e6ae7a7199d" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Jan 06 21:03:59 2012 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: remove useless forward declarations.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "a20a28bc321fefcc23f8da7ce3722e6ae7a7199d", "tree": "5263e0cb361abefaa1ed6e20801a23f441436a08", "parents": [ "269f3114b53a3ce93eb5977852ac2624a380f600" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Dec 30 14:53:58 2011 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: balance interrupt acknowledge and events retrieval.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "269f3114b53a3ce93eb5977852ac2624a380f600", "tree": "69edc14121322f20696ccf2d0463dbea1cd664e6", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Dec 30 14:43:54 2011 +0100" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sat Jan 07 23:02:37 2012 +0100" }, "message": "via-rhine: factor out tx_thresh handling\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "928a11ba36f999436915ea2b1eadf54301f93059", "tree": "8d7cb575d528ddd4b1165e4690401c729c1eb930", "parents": [ "237c78beb8a988453bac1993d21f025d070a0d8d", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:21:04 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:23:00 2012 +0000" }, "message": "Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/common.c\n\nThe common.c file gets changes from rmk/stable-devel (part of\nnext/cleanup), rmk/restart, samsung/dt and follow-on branches\nfrom the samsung tree.\n\nPulling it all together here hopefully avoids having to do\neven more conflicting merge changesets in this one file. What\na mess!\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "96dab45fc3eb732de7b7fe03d2250d3815af8929", "tree": "310743a99d434d4328b937273f6fcc6b56812cd1", "parents": [ "6c15d74defd38e7e7f8805392578b7a1d508097e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:22:11 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:22:11 2012 -0800" }, "message": "smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h\n\nThe energy detect enable/disable code in the driver uses some\nregister defines in this header unconditionally, so guarding\nthe smscphy.h header include with CONFIG_SMSC_PHY leads to\nbuild failures in some configurations.\n\nReported-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c15d74defd38e7e7f8805392578b7a1d508097e", "tree": "c647b38da15453d689c840893564508e27d6a17a", "parents": [ "6d62a66e4211546f9e5c5d1ad586749a51cf30db" ], "author": { "name": "Aurelien Jacobs", "email": "aurel@gnuage.org", "time": "Sat Jan 07 12:15:16 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:15:16 2012 -0800" }, "message": "asix: fix infinite loop in rx_fixup()\n\nAt this point if skb-\u003elen happens to be 2, the subsequant skb_pull(skb, 4)\ncall won\u0027t work and the skb-\u003elen won\u0027t be decreased and won\u0027t ever reach 0,\nresulting in an infinite loop.\n\nWith an ASIX 88772 under heavy load, without this patch, rx_fixup() reaches\nan infinite loop in less than a minute. With this patch applied,\nno infinite loop even after hours of heavy load.\n\nSigned-off-by: Aurelien Jacobs \u003caurel@gnuage.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75", "tree": "055f27071fd8cb39f3086a655c109f311f16069e", "parents": [ "f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Sat Jan 07 05:13:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:09:36 2012 -0800" }, "message": "r6040: fix typo in use of MCR0 register bits\n\nCommit 4e16d6ebd65b4f2c4e3f780b4c5704beef64019c (r6040: define more MCR0\nregister bits) added #define values for MCR0 register bits and converted\nuses of hardcoded magic values to uses of these defines.\n\nHowever, one of the conversions looks suspicious:\n\n #define MCR0\t\t0x00\t/* Control register 0 */\n+#define MCR0_RCVEN\t0x0002\t/* Receive enable */\n+#define MCR0_XMTEN\t0x1000\t/* Transmission enable */\n\n \t/* Init RDC private data */\n-\tlp-\u003emcr0 \u003d 0x1002;\n+\tlp-\u003emcr0 \u003d MCR0_XMTEN | MCR0;\n\nI believe what was meant here was MCR0_XMTEN | MCR0_RCVEN, which makes\nsense and matches the original values.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "40ba95fdf158713377d47736b1b3a9d75f4f2515", "tree": "17a3216542d1107f777fd82577c91aebbce597d6", "parents": [ "70d84a6431d732cbc4e68e72b6890cdd3865d43d", "0575fb754dbfc32a01f297e778533340a533ec68" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 11:51:28 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n\tarch/arm/mach-at91/at91sam9260.c\n\tarch/arm/mach-at91/at91sam9261.c\n\tarch/arm/mach-at91/at91sam9263.c\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-at91/at91sam9rl.c\n\tarch/arm/mach-exynos/cpu.c\n\tarch/arm/mach-shmobile/board-kota2.c\n\nThis resolves a bunch of conflicts between the arm-soc tree\nand changes from the arm tree that have gone upstream.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "356b95424cfb456e14a59eaa579422ce014c424b", "tree": "c0478479041f82ccd7a95157dddf2fd2d59ad8c5", "parents": [ "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "3bd9e50b4297b0d85bb86a8f2ade941c0f9c21fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:28:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:28:12 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)\n m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac\n m68k/serial: Remove references to obsolete serial config options\n m68k/net: Remove obsolete IRQ_FLG_* users\n m68k: Don\u0027t comment out syscalls used by glibc\n m68k/atari: Move declaration of atari_SCC_reset_done to header file\n m68k/serial: Remove references to obsolete CONFIG_SERIAL167\n m68k/hp300: Export hp300_ledstate\n m68k: Initconst section fixes\n m68k/mac: cleanup macro case\n mac_scsi: fix mac_scsi on some powerbooks\n m68k/mac: fix powerbook 150 adb_type\n m68k/mac: fix baboon irq disable and shutdown\n m68k/mac: oss irq fixes\n m68k/mac: fix nubus slot irq disable and shutdown\n m68k/mac: enable via_alt_mapping on performa 580\n m68k/mac: cleanup forward declarations\n m68k/mac: cleanup mac_irq_pending\n m68k/mac: cleanup mac_clear_irq\n m68k/mac: early console\n m68k/mvme16x: Add support for EARLY_PRINTK\n ...\n\nFix up trivial conflict in arch/m68k/Kconfig.debug due to new\nEARLY_PRINTK config option addition clashing with movement of the\nBOOTPARAM options.\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" } ], "next": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" }