)]}' { "log": [ { "commit": "6f0f9b6b3fcfe5e156f20d4f804f0d505c750b3c", "tree": "3e708164563b979e1c1af5557031021b15710aeb", "parents": [ "9391734d7662019f52db42e6e2c434f81aa0d2a2", "96af69ea2a83d292238bdba20e4508ee967cf8cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 25 14:20:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 25 14:20:29 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull more networking fixes from David Miller:\n\n 1) Eric Dumazet discovered and fixed what turned out to be a family of\n bugs. These functions were using pskb_may_pull() which might need\n to reallocate the linear SKB data buffer, but the callers were not\n expecting this possibility. The callers have cached pointers to the\n packet header areas, and would need to reload them if we were to\n continue using pskb_may_pull().\n\n So they could end up reading garbage.\n\n It\u0027s easier to just change these RAW4/RAW6/MIP6 routines to use\n skb_header_pointer() instead of pskb_may_pull(), which won\u0027t modify\n the linear SKB data area.\n\n 2) Dave Jone\u0027s syscall spammer caught a case where a non-TCP socket can\n call down into the TCP keepalive code. The case basically involves\n creating a raw socket with sk_protocol \u003d\u003d IPPROTO_TCP, then calling\n setsockopt(sock_fd, SO_KEEPALIVE, ...)\n\n Fixed by Eric Dumazet.\n\n 3) Bluetooth devices do not get configured properly while being powered\n on, resulting in always using legacy pairing instead of SSP. Fix\n from Andrzej Kaczmarek.\n\n 4) Bluetooth cancels delayed work erroneously, put stricter checks in\n place. From Andrei Emeltchenko.\n\n 5) Fix deadlock between cfg80211_mutex and reg_regdb_search_mutex in\n cfg80211, from Luis R. Rodriguez.\n\n 6) Fix interrupt double release in iwlwifi, from Emmanuel Grumbach.\n\n 7) Missing module license in bcm87xx driver, from Peter Huewe.\n\n 8) Team driver can lose port changed events when adding devices to a\n team, fix from Jiri Pirko.\n\n 9) Fix endless loop when trying ot unregister PPPOE device in zombie\n state, from Xiaodong Xu.\n\n10) batman-adv layer needs to set MAC address of software device\n earlier, otherwise we call tt_local_add with it uninitialized.\n\n11) Fix handling of KSZ8021 PHYs, it\u0027s matched currently by KS8051 but\n that doesn\u0027t program the device properly. From Marek Vasut.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n ipv6: mip6: fix mip6_mh_filter()\n ipv6: raw: fix icmpv6_filter()\n net: guard tcp_set_keepalive() to tcp sockets\n phy/micrel: Add missing header to micrel_phy.h\n phy/micrel: Rename KS80xx to KSZ80xx\n phy/micrel: Implement support for KSZ8021\n batman-adv: Fix symmetry check / route flapping in multi interface setups\n batman-adv: Fix change mac address of soft iface.\n pppoe: drop PPPOX_ZOMBIEs in pppoe_release\n team: send port changed when added\n ipv4: raw: fix icmp_filter()\n net/phy/bcm87xx: Add MODULE_LICENSE(\"GPL\") to GPL driver\n iwlwifi: don\u0027t double free the interrupt in failure path\n cfg80211: fix possible circular lock on reg_regdb_search()\n Bluetooth: Fix not removing power_off delayed work\n Bluetooth: Fix freeing uninitialized delayed works\n Bluetooth: mgmt: Fix enabling LE while powered off\n Bluetooth: mgmt: Fix enabling SSP while powered off\n" }, { "commit": "be8cfc4af15cf611dfeb66a1fb5df43d5f1e280a", "tree": "b84efb3a6189633a5e3f1a210971f28a0d68dac4", "parents": [ "b5bd6a0e5fa8c0376d9746c566fe3daaa51ec825" ], "author": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Mon Sep 24 17:17:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 25 08:59:21 2012 -0700" }, "message": "c/r: prctl: fix build error for no-MMU case\n\nCommit 1ad75b9e1628 (\"c/r: prctl: add minimal address test to\nPR_SET_MM\") added some address checking to prctl_set_mm() used by\ncheckpoint-restore. This causes a build error for no-MMU systems:\n\n kernel/sys.c: In function \u0027prctl_set_mm\u0027:\n kernel/sys.c:1868:34: error: \u0027mmap_min_addr\u0027 undeclared (first use in this function)\n\nThe test for mmap_min_addr doesn\u0027t make a lot of sense for no-MMU code\nas noted in commit 6e1415467614 (\"NOMMU: Optimise away the\n{dac_,}mmap_min_addr tests\").\n\nThis patch defines mmap_min_addr as 0UL in the no-MMU case so that the\ncompiler will optimize away tests for \"addr \u003c mmap_min_addr\".\n\nSigned-off-by: Mark Salter \u003cmsalter@redhat.com\u003e\nReviewed-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.6.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "69190e67d4fac49e2f6ea22f46780d0c712214b8", "tree": "48e93cbdb2d6f402403590b4a6b291accf40a20e", "parents": [ "510d573fefed904a136b220b259bf48d99d5e381" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Sun Sep 23 16:58:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 15:54:33 2012 -0400" }, "message": "phy/micrel: Add missing header to micrel_phy.h\n\nThe license header was missing in micrel_phy.h . This patch adds\none.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "510d573fefed904a136b220b259bf48d99d5e381", "tree": "7af965230f3691616be27c42fd6a5cc26de8d558", "parents": [ "212ea99a85d30dbc834888384c57ad5abbc67a0a" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Sun Sep 23 16:58:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 15:54:33 2012 -0400" }, "message": "phy/micrel: Rename KS80xx to KSZ80xx\n\nThere is no such part as KS8001, KS8041 or KS8051. There are only\nKSZ8001, KSZ8041 and KSZ8051. Rename these parts as such to match\nthe Micrel naming.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nCc: Linux ARM kernel \u003clinux-arm-kernel@lists.infradead.org\u003e\nCc: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "212ea99a85d30dbc834888384c57ad5abbc67a0a", "tree": "565c35bd99f9b7a5b3d4fecece05c0a1201261ba", "parents": [ "2b018d57ff18e5405823e5cb59651a5b4d946d7b" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Sun Sep 23 16:58:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 15:54:32 2012 -0400" }, "message": "phy/micrel: Implement support for KSZ8021\n\nThe KSZ8021 PHY was previously caught by KS8051, which is not correct.\nThis PHY needs additional setup if it is strapped for address 0. In such\ncase an reserved bit must be written in the 0x16, \"Operation Mode Strap\nOverride\" register. According to the KS8051 datasheet, that bit means\n\"PHY Address 0 in non-broadcast\" and it indeed behaves as such on KSZ8021.\nThe issue where the ethernet controller (Freescale FEC) did not communicate\nwith network is fixed by writing this bit as 1.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abef3bd71029b80ec1bdd6c6244b5b0b99f56633", "tree": "5645e6f4eb637fa8e290a1eab1f40436deb15338", "parents": [ "6219844e72ecc7a7c9efed8b4e41a6c6064a4967", "a630844d898ae8a0b4a3db84af061150682e0d3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:32:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:32:55 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n \"More bug fixes, nothing gets past these guys\"\n\n 1) More kernel info leaks found by Mathias Krause, this time in the\n IPSEC configuration layers.\n\n 2) When IPSEC policies change, we do not properly make sure that cached\n routes (which could now be stale) throughout the system will be\n revalidated. Fix this by generalizing the generation count\n invalidation scheme used by ipv4. From Nicolas Dichtel.\n\n 3) When repairing TCP sockets, we need to allow to restore not just the\n send window scale, but the receive one too. Extend the existing\n interface to achieve this in a backwards compatible way. From\n Andrey Vagin.\n\n 4) A fix for FCOE scatter gather feature validation erroneously caused\n scatter gather to be disabled for things like AOE too. From Ed L\n Cashin.\n\n 5) Several cases of mishandling of error pointers, from Mathias Krause,\n Wei Yongjun, and Devendra Naga.\n\n 6) Fix gianfar build, from Richard Cochran.\n\n 7) CAP_NET_* failures should return -EPERM not -EACCES, from Zhao\n Hongjiang.\n\n 8) Hardware reset fix in janz-ican3 CAN driver, from Ira W Snyder.\n\n 9) Fix oops during rmmod in ti_hecc CAN driver, from Marc Kleine-Budde.\n\n10) The removal of the conditional compilation of the clk support code\n in the stmmac driver broke things. This is because the interfaces\n used are the ones that don\u0027t also perform the enable/disable of the\n clk. Fix from Stefan Roese.\n\n11) The QFQ packet scheduler can record out of range virtual start\n times, resulting later in misbehavior and even crashes. Fix from\n Paolo Valente.\n\n12) If MSG_WAITALL is used with IOAT DMA under TCP, we can wedge the\n receiver when the advertised receive window goes to zero. Detect\n this case and force the processing of the IOAT DMA queue when it\n happens to avoid getting stuck. Fix from Michal Kubecek.\n\n13) batman-adv assumes that test_bit() returns only 0 or 1, but this is\n not true for x86 (which returns -1 or 0, via the \u0027sbb\u0027 instruction).\n Fix from Linus Lussing.\n\n14) Fix small packet corruption in e1000, from Tushar Dave.\n\n15) make_blackhole() in the IPSEC policy code can do one read unlock too\n many, fix from Li RongQing.\n\n16) The new tcp_try_coalesce() code introduced a bug in TCP URG\n handling, fix from Eric Dumazet.\n\n17) Fix memory leak in __netif_receive_skb() when doing zerocopy and\n when hit an OOM condition. From Michael S Tsirkin.\n\n18) netxen blindly deferences pdev-\u003ebus-\u003eself, which is not guarenteed\n to be non-NULL. Fix from Nikolay Aleksandrov.\n\n19) Fix a performance regression caused by mistakes in ipv6 checksum\n validation in the bnx2x driver, fix from Michal Schmidt.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)\n net/stmmac: Use clk_prepare_enable and clk_disable_unprepare\n net: change return values from -EACCES to -EPERM\n net/irda: sh_sir: fix return value check in sh_sir_set_baudrate()\n stmmac: fix return value check in stmmac_open_ext_timer()\n gianfar: fix phc index build failure\n ipv6: fix return value check in fib6_add()\n bnx2x: remove false warning regarding interrupt number\n can: ti_hecc: fix oops during rmmod\n can: janz-ican3: fix support for older hardware revisions\n net: do not disable sg for packets requiring no checksum\n aoe: assert AoE packets marked as requiring no checksum\n at91ether: return PTR_ERR if call to clk_get fails\n xfrm_user: don\u0027t copy esn replay window twice for new states\n xfrm_user: ensure user supplied esn replay window is valid\n xfrm_user: fix info leak in copy_to_user_tmpl()\n xfrm_user: fix info leak in copy_to_user_policy()\n xfrm_user: fix info leak in copy_to_user_state()\n xfrm_user: fix info leak in copy_to_user_auth()\n net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200\n tcp: restore rcv_wscale in a repair mode (v2)\n ...\n" }, { "commit": "18f5600ba2629feca202a7d6387b9c32371af329", "tree": "cd65b0d53bd0ad65bd02eddda51373a775d8f26d", "parents": [ "789f95b788146ec27ab068103aacd546d05db266", "85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:24:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:24:48 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"Small perf fixlets\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tracing: Don\u0027t call page_to_pfn() if page is NULL\n perf/x86: Fix Intel Ivy Bridge support\n perf/x86/ibs: Check syscall attribute flags\n perf/x86: Export Sandy Bridge uncore clockticks event in sysfs\n" }, { "commit": "6d77987fe62eb97479f27426d12f33ef97145c5b", "tree": "cfe26b77adee0589798cf09fdfad7ce6d0448a56", "parents": [ "06b050eb81b877c7a4adb6be8624ad3890fee9f2", "263a523d18bca306016d75f5c8d5c57c37fe52fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 12:33:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 12:33:31 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon fixes from Guenter Roeck:\n - Add missing \u0027name\u0027 sysfs attributes to ad7314 and ads7871 drivers\n - Bump maximum wait time for applesmc driver (again)\n - Fix build warning seen with W\u003d1 in include/linux/kernel.h, introduced\n with commit b6d86d3d6d6e (\"Fix DIV_ROUND_CLOSEST to support negative\n dividends\")\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n linux/kernel.h: Fix warning seen with W\u003d1 due to change in DIV_ROUND_CLOSEST\n hwmon: (applesmc) Bump max wait\n hwmon: (ad7314) Add \u0027name\u0027 sysfs attribute\n hwmon: (ads7871) Add \u0027name\u0027 sysfs attribute\n" }, { "commit": "ecd7918745234e423dd87fcc0c077da557909720", "tree": "7435863b7aa3822b3c927264c5cb00da7783896b", "parents": [ "1f86840f897717f86d523a13e99a447e6a5d2fa5" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Thu Sep 20 10:01:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 20 18:08:40 2012 -0400" }, "message": "xfrm_user: ensure user supplied esn replay window is valid\n\nThe current code fails to ensure that the netlink message actually\ncontains as many bytes as the header indicates. If a user creates a new\nstate or updates an existing one but does not supply the bytes for the\nwhole ESN replay window, the kernel copies random heap bytes into the\nreplay bitmap, the ones happen to follow the XFRMA_REPLAY_ESN_VAL\nnetlink attribute. This leads to following issues:\n\n1. The replay window has random bits set confusing the replay handling\n code later on.\n\n2. A malicious user could use this flaw to leak up to ~3.5kB of heap\n memory when she has access to the XFRM netlink interface (requires\n CAP_NET_ADMIN).\n\nKnown users of the ESN replay window are strongSwan and Steffen\u0027s\niproute2 patch (\u003chttp://patchwork.ozlabs.org/patch/85962/\u003e). The latter\nuses the interface with a bitmap supplied while the former does not.\nstrongSwan is therefore prone to run into issue 1.\n\nTo fix both issues without breaking existing userland allow using the\nXFRMA_REPLAY_ESN_VAL netlink attribute with either an empty bitmap or a\nfully specified one. For the former case we initialize the in-kernel\nbitmap with zero, for the latter we copy the user supplied bitmap. For\nstate updates the full bitmap must be supplied.\n\nTo prevent overflows in the bitmap length calculation the maximum size\nof bmp_len is limited to 128 by this patch -- resulting in a maximum\nreplay window of 4096 packets. This should be sufficient for all real\nlife scenarios (RFC 4303 recommends a default replay window size of 64).\n\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nCc: Martin Willi \u003cmartin@revosec.ch\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "263a523d18bca306016d75f5c8d5c57c37fe52fb", "tree": "085d8f549b1d133b00363535afe6b9e510dc9718", "parents": [ "521cf6489269f5b223c24857d99c779e91f42d3e" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Tue Sep 18 20:42:31 2012 -0700" }, "committer": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Wed Sep 19 06:51:25 2012 -0700" }, "message": "linux/kernel.h: Fix warning seen with W\u003d1 due to change in DIV_ROUND_CLOSEST\n\nAfter commit b6d86d3d (Fix DIV_ROUND_CLOSEST to support negative dividends),\nthe following warning is seen if the kernel is compiled with W\u003d1 (-Wextra):\n\nwarning: comparison of unsigned expression \u003e\u003d 0 is always true\n\nThe warning is due to the test \u0027((typeof(x))-1) \u003e\u003d 0\u0027, which is used to detect\nif the variable type is unsigned. Research on the web suggests that the warning\ndisappears if \u0027\u003e\u0027 instead of \u0027\u003e\u003d\u0027 is used for the comparison.\n\nTests after changing the macro along that line show that the warning is gone,\nand that the result is still correct:\n\ni\u003d-4: DIV_ROUND_CLOSEST(i, 2)\u003d-2\ni\u003d-3: DIV_ROUND_CLOSEST(i, 2)\u003d-2\ni\u003d-2: DIV_ROUND_CLOSEST(i, 2)\u003d-1\ni\u003d-1: DIV_ROUND_CLOSEST(i, 2)\u003d-1\ni\u003d0: DIV_ROUND_CLOSEST(i, 2)\u003d0\ni\u003d1: DIV_ROUND_CLOSEST(i, 2)\u003d1\ni\u003d2: DIV_ROUND_CLOSEST(i, 2)\u003d1\ni\u003d3: DIV_ROUND_CLOSEST(i, 2)\u003d2\ni\u003d4: DIV_ROUND_CLOSEST(i, 2)\u003d2\n\nCode size is the same as before.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nTested-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "b161dfa6937ae46d50adce8a7c6b12233e96e7bd", "tree": "51ca2936e508c2c0f4a330c6dfdb1535a26eb6f9", "parents": [ "4651afbbae968772efd6dc4ba461cba9b49bb9d8" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Mon Sep 17 22:31:38 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 18 11:23:51 2012 -0700" }, "message": "vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()\n\nIBM reported a soft lockup after applying the fix for the rename_lock\ndeadlock. Commit c83ce989cb5f (\"VFS: Fix the nfs sillyrename regression\nin kernel 2.6.38\") was found to be the culprit.\n\nThe nfs sillyrename fix used DCACHE_DISCONNECTED to indicate that the\ndentry was killed. This flag can be set on non-killed dentries too,\nwhich results in infinite retries when trying to traverse the dentry\ntree.\n\nThis patch introduces a separate flag: DCACHE_DENTRY_KILLED, which is\nonly set in d_kill() and makes try_to_ascend() test only this flag.\n\nIBM reported successful test results with this patch.\n\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9a858dc7cebce01a7bb616bebb85087fa2b40871", "tree": "70e8b7fd41d6503e105cdd0b5b9ed3e6f7c464ee", "parents": [ "579035dc5ddd6d48fd8529e7358b03d911ab9d8a" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Mon Sep 17 14:09:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 17 15:00:38 2012 -0700" }, "message": "compiler.h: add __visible\n\ngcc 4.6+ has support for a externally_visible attribute that prevents the\noptimizer from optimizing unused symbols away. Add a __visible macro to\nuse it with that compiler version or later.\n\nThis is used (at least) by the \"Link Time Optimization\" patchset.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "05cf96398e1b6502f9e191291b715c7463c9d5dd", "tree": "8dd12c4142216f4e3acb344146c0c4cae3a1588f", "parents": [ "18b48d5873a6fc8e0e6044ddb572fcda26988f19" ], "author": { "name": "Jianguo Wu", "email": "wujianguo@huawei.com", "time": "Mon Sep 17 14:08:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 17 15:00:37 2012 -0700" }, "message": "mm/ia64: fix a memory block size bug\n\nI found following definition in include/linux/memory.h, in my IA64\nplatform, SECTION_SIZE_BITS is equal to 32, and MIN_MEMORY_BLOCK_SIZE\nwill be 0.\n\n #define MIN_MEMORY_BLOCK_SIZE (1 \u003c\u003c SECTION_SIZE_BITS)\n\nBecause MIN_MEMORY_BLOCK_SIZE is int type and length of 32bits,\nso MIN_MEMORY_BLOCK_SIZE(1 \u003c\u003c 32) will will equal to 0.\nActually when SECTION_SIZE_BITS \u003e\u003d 31, MIN_MEMORY_BLOCK_SIZE will be wrong.\nThis will cause wrong system memory infomation in sysfs.\nI think it should be:\n\n #define MIN_MEMORY_BLOCK_SIZE (1UL \u003c\u003c SECTION_SIZE_BITS)\n\nAnd \"echo offline \u003e memory0/state\" will cause following call trace:\n\n kernel BUG at mm/memory_hotplug.c:885!\n sh[6455]: bugcheck! 0 [1]\n Pid: 6455, CPU 0, comm: sh\n psr : 0000101008526030 ifs : 8000000000000fa4 ip : [\u003ca0000001008c40f0\u003e] Not tainted (3.6.0-rc1)\n ip is at offline_pages+0x210/0xee0\n Call Trace:\n show_stack+0x80/0xa0\n show_regs+0x640/0x920\n die+0x190/0x2c0\n die_if_kernel+0x50/0x80\n ia64_bad_break+0x3d0/0x6e0\n ia64_native_leave_kernel+0x0/0x270\n offline_pages+0x210/0xee0\n alloc_pages_current+0x180/0x2a0\n\nSigned-off-by: Jianguo Wu \u003cwujianguo@huawei.com\u003e\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "73f8be297e90f6ebb951c30490376833f8782349", "tree": "1e15c36ed544e33b82e2bbbc6ba8d787c9d3e7e4", "parents": [ "c500ce38e52bb2f526b84f41314a9a9f83a2fdf5", "b186b12487efc80c44f2f0d26cc26eb249cf1524" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 13:22:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 13:22:21 2012 -0700" }, "message": "Merge tag \u0027mfd-for-linus-3.6-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull mfd fixes from Samuel Ortiz:\n \"This is the remaining MFD fixes for 3.6, with 5 pending fixes:\n\n - A tps65217 build error fix.\n - A lcp_ich regression fix caused by the MFD driver failing to\n initialize the watchdog sub device due to ACPI conflicts.\n - 2 MAX77693 interrupt handling bug fixes.\n - An MFD core fix, adding an IRQ domain argument to the MFD device\n addition API in order to prevent silent and potentially harmful\n remapping behaviour changes for drivers supporting non-DT\n platforms.\"\n\n* tag \u0027mfd-for-linus-3.6-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: MAX77693: Fix NULL pointer error when initializing irqs\n mfd: MAX77693: Fix interrupt handling bug\n mfd: core: Push irqdomain mapping out into devices\n mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver\n mfd: Move tps65217 regulator plat data handling to regulator\n" }, { "commit": "a34689d98059f0c88cef08a78866e81eb53466c9", "tree": "5501c1c2b8b5adbc4492f703709e6ae7996d14a5", "parents": [ "37407ea7f93864c2cfc03edf8f37872ec539ea2b", "5d037f9064a8f3b9abbe383cdfb35e159d813711" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 12:57:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 12:57:59 2012 -0700" }, "message": "Merge tag \u0027sound-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull more sound fixes from Takashi Iwai:\n \"Yet more (a bunch of) small fixes that slipped from the previous pull\n request. Most of commits are pending ASoC fixes, all of which are\n fairly trivial commits.\"\n\n* tag \u0027sound-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ASoC: wm8904: correct the index\n ALSA: hda - Yet another position_fix quirk for ASUS machines\n ASoC: tegra: fix maxburst settings in dmaengine code\n ASoC: samsung dma - Don\u0027t indicate support for pause/resume.\n ASoC: mc13783: Remove mono support\n ASoC: arizona: Fix typo in 44.1kHz rates\n ASoC: spear: correct the check for NULL dma_buffer pointer\n sound: tegra_alc5632: remove HP detect GPIO inversion\n ASoC: atmel-ssc: include linux/io.h for raw io\n ASoC: dapm: Don\u0027t force card bias level to be updated\n ASoC: dapm: Make sure we update the bias level for CODECs with no op\n ASoC: am3517evm: fix error return code\n ASoC: ux500_msp_i2s: better use devm functions and fix error return code\n ASoC: imx-sgtl5000: fix error return code\n" }, { "commit": "37407ea7f93864c2cfc03edf8f37872ec539ea2b", "tree": "7c07e7adadd40fc94cebfe816f1c65a4a630b147", "parents": [ "3f0c3c8fe30c725c1264fb6db8cc4b69db3a658a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 12:29:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 16 12:29:43 2012 -0700" }, "message": "Revert \"sched: Improve scalability via \u0027CPU buddies\u0027, which withstand random perturbations\"\n\nThis reverts commit 970e178985cadbca660feb02f4d2ee3a09f7fdda.\n\nNikolay Ulyanitsky reported thatthe 3.6-rc5 kernel has a 15-20%\nperformance drop on PostgreSQL 9.2 on his machine (running \"pgbench\").\n\nBorislav Petkov was able to reproduce this, and bisected it to this\ncommit 970e178985ca (\"sched: Improve scalability via \u0027CPU buddies\u0027 ...\")\napparently because the new single-idle-buddy model simply doesn\u0027t find\nidle CPU\u0027s to reschedule on aggressively enough.\n\nMike Galbraith suspects that it is likely due to the user-mode spinlocks\nin PostgreSQL not reacting well to preemption, but we don\u0027t really know\nthe details - I\u0027ll just revert the commit for now.\n\nThere are hopefully other approaches to improve scheduler scalability\nwithout it causing these kinds of downsides.\n\nReported-by: Nikolay Ulyanitsky \u003clystor@gmail.com\u003e\nBisected-by: Borislav Petkov \u003cbp@alien8.de\u003e\nAcked-by: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096", "tree": "d529ea8370d62b7c3c1dfd42a6714c9bd052ef39", "parents": [ "a0e35322910555e20e9eced3f050a76c7b3a1f92" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Sep 11 15:16:36 2012 +0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sat Sep 15 23:22:04 2012 +0200" }, "message": "mfd: core: Push irqdomain mapping out into devices\n\nCurrently the MFD core supports remapping MFD cell interrupts using an\nirqdomain but only if the MFD is being instantiated using device tree\nand only if the device tree bindings use the pattern of registering IPs\nin the device tree with compatible properties. This will be actively\nharmful for drivers which support non-DT platforms and use this pattern\nfor their DT bindings as it will mean that the core will silently change\nremapping behaviour and it is also limiting for drivers which don\u0027t do\nDT with this particular pattern. There is also a potential fragility if\nthere are interrupts not associated with MFD cells and all the cells are\nomitted from the device tree for some reason.\n\nInstead change the code to take an IRQ domain as an optional argument,\nallowing drivers to take the decision about the parent domain for their\ninterrupts. The one current user of this feature is ab8500-core, it has\nthe domain lookup pushed out into the driver.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "5b799dde3159284fdee8d60f535e2753a86dbb3f", "tree": "636a679344e014cfda8e9f98be026057c2baba26", "parents": [ "1547cb80db5587c465be609b9a15bfb2dfd73099", "5f71a3ef3753ac2068009637eee619e163f44b30" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 17:55:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 17:55:57 2012 -0700" }, "message": "Merge branch \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux\n\nPull i2c embedded fixes from Wolfram Sang:\n \"The last bunch of (typical) i2c-embedded driver fixes for 3.6.\n\n Also update the MAINTAINERS file to point to my tree since people keep\n asking where to find their patches.\"\n\n* \u0027i2c-embedded/for-current\u0027 of git://git.pengutronix.de/git/wsa/linux:\n i2c: algo: pca: Fix mode selection for PCA9665\n MAINTAINERS: fix tree for current i2c-embedded development\n i2c: mxs: correctly setup speed for non devicetree\n i2c: pnx: Fix read transactions of \u003e\u003d 2 bytes\n i2c: pnx: Fix bit definitions\n" }, { "commit": "7ef6e97380a1cb0f38cab795fe696f43c71d3ae9", "tree": "0557d01616fb4a41bfc98e6908ace912fa6d717c", "parents": [ "7076cca9a700af5ccb0bd5eb7261dcfd7356dc5a", "e4390fa632d7c592e68e8106b7daea923ac995f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 17:43:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 17:43:45 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"This tree includes various fixes\"\n\nIngo really needs to improve on the whole \"explain git pull\" part.\n\"Various fixes\" indeed.\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled\n perf/x86: Enable Intel Cedarview Atom suppport\n perf_event: Switch to internal refcount, fix race with close()\n oprofile, s390: Fix uninitialized memory access when writing to oprofilefs\n perf/x86: Fix microcode revision check for SNB-PEBS\n" }, { "commit": "a1362d504e26f32f853c65d0448ebc9ffb190f7d", "tree": "ce923b5e3f4f4278addefb68e8b248282e8ec15e", "parents": [ "4bca55d3d93c705708835969ee66a6a4b9468d3c", "6af773e786ad617b0264ebe06ba60675c01f3e51" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 15:34:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 15:34:07 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Use after free and new device IDs in bluetooth from Andre Guedes,\n Yevgeniy Melnichuk, Gustavo Padovan, and Henrik Rydberg.\n\n 2) Fix crashes with short packet lengths and VLAN in pktgen, from\n Nishank Trivedi.\n\n 3) mISDN calls flush_work_sync() with locks held, fix from Karsten\n Keil.\n\n 4) Packet scheduler gred parameters are reported to userspace\n improperly scaled, and WRED idling is not performed correctly. All\n from David Ward.\n\n 5) Fix TCP socket refcount problem in ipv6, from Julian Anastasov.\n\n 6) ibmveth device has RX queue alignment requirements which are not\n being explicitly met resulting in sporadic failures, fix from\n Santiago Leon.\n\n 7) Netfilter needs to take care when interpreting sockets attached to\n socket buffers, they could be time-wait minisockets. Fix from Eric\n Dumazet.\n\n 8) sock_edemux() has the same issue as netfilter did in #7 above, fix\n from Eric Dumazet.\n\n 9) Avoid infinite loops in CBQ scheduler with some configurations, from\n Eric Dumazet.\n\n10) Deal with \"Reflection scan: an Off-Path Attack on TCP\", from Jozsef\n Kadlecsik.\n\n11) SCTP overcharges socket for TX packets, fix from Thomas Graf.\n\n12) CODEL packet scheduler should not reset it\u0027s state every time it\n builds a new flow, fix from Eric Dumazet.\n\n13) Fix memory leak in nl80211, from Wei Yongjun.\n\n14) NETROM doesn\u0027t check skb_copy_datagram_iovec() return values, from\n Alan Cox.\n\n15) l2tp ethernet was using sizeof(ETH_HLEN) instead of plain ETH_HLEN,\n oops. From Eric Dumazet.\n\n16) Fix selection of ath9k chips on which PA linearization and AM2PM\n predistoration are used, from Felix Fietkau.\n\n17) Flow steering settings in mlx4 driver need to be validated properly,\n from Hadar Hen Zion.\n\n18) bnx2x doesn\u0027t show the correct link duplex setting, from Yaniv\n Rosner.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)\n pktgen: fix crash with vlan and packet size less than 46\n bnx2x: Add missing afex code\n bnx2x: fix registers dumped\n bnx2x: correct advertisement of pause capabilities\n bnx2x: display the correct duplex value\n bnx2x: prevent timeouts when using PFC\n bnx2x: fix stats copying logic\n bnx2x: Avoid sending multiple statistics queries\n net: qmi_wwan: call subdriver with control intf only\n net_sched: gred: actually perform idling in WRED mode\n net_sched: gred: fix qave reporting via netlink\n net_sched: gred: eliminate redundant DP prio comparisons\n net_sched: gred: correct comment about qavg calculation in RIO mode\n mISDN: Fix wrong usage of flush_work_sync while holding locks\n netfilter: log: Fix log-level processing\n net-sched: sch_cbq: avoid infinite loop\n net: qmi_wwan: fix Gobi device probing for un2430\n net: fix net/core/sock.c build error\n ixp4xx_hss: fix build failure due to missing linux/module.h inclusion\n caif: move the dereference below the NULL test\n ...\n" }, { "commit": "0462bfc88d37ecb7f69488643c91cb657a1f264d", "tree": "0f307e998ca28deec27f8ed3e25098c86ef9545c", "parents": [ "55815f70147dcfa3ead5738fd56d3574e2e3c1c2", "60e233a56609fd963c59e99bd75c663d63fa91b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 14:53:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 14 14:53:22 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.6-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core fix from Greg Kroah-Hartman:\n \"Here is one fix for 3.6-rc6 for the kobject.h file.\n\n It fixes a reported oops if CONFIG_HOTPLUG is disabled. It\u0027s been in\n the linux-next tree for a while now.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027driver-core-3.6-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n kobject: fix oops with \"input0: bad kobj_uevent_env content in show_uevent()\"\n" }, { "commit": "4b921eda53366b319602351ff4d7256fafa4bd1b", "tree": "a60091cf40391abd4eb1452dc840289bd05bfd19", "parents": [ "930521695c183c8a4da8fe13ce231cf5263b8d98" ], "author": { "name": "Karsten Keil", "email": "keil@b1-systems.de", "time": "Thu Sep 13 04:36:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 13 14:58:54 2012 -0400" }, "message": "mISDN: Fix wrong usage of flush_work_sync while holding locks\n\nIt is a bad idea to hold a spinlock and call flush_work_sync.\nMove the workqueue cleanup outside the spinlock and use cancel_work_sync,\non closing the channel this seems to be the more correct function.\nRemove the never used and constant return value of mISDN_freebchannel.\n\nSigned-off-by: Karsten Keil \u003ckeil@b1-systems.de\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bad9ac2d7f878a31cf1ae8c1ee3768077d222bcb", "tree": "26f49a2e0824a6e6a7830e12faaeaf201b16d99b", "parents": [ "35534b201c9f115c68962c095b5a9aad204d025f" ], "author": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Wed Jul 25 19:12:45 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Sep 13 16:59:48 2012 +0200" }, "message": "perf/x86/ibs: Check syscall attribute flags\n\nCurrent implementation simply ignores attribute flags. Thus, there is\nno notification to userland of unsupported features. Check syscall\u0027s\nattribute flags to let userland know if a feature is supported by the\nkernel. This is also needed to distinguish between future kernels what\nmight support a feature.\n\nCc: \u003cstable@vger.kernel.org\u003e v3.5..\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120910093018.GO8285@erda.amd.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "22b4e63ebe062e2e3d4a3a2b468e47ca9575d598", "tree": "3813950eaf97dd563b52c7365f43501aff595355", "parents": [ "0bd1189e239c76eb3a50e458548fbe7e4a5dfff1", "7b281ee026552f10862b617a2a51acf49c829554" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 13 09:04:13 2012 +0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 13 09:04:13 2012 +0800" }, "message": "Merge tag \u0027nfs-for-3.6-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n\n - Final (hopefully) fix for the range checking code in NFSv4 getacl.\n This should fix the Oopses being seen when the acl size is close to\n PAGE_SIZE.\n - Fix a regression with the legacy binary mount code\n - Fix a regression in the readdir cookieverf initialisation\n - Fix an RPC over UDP regression\n - Ensure that we report all errors in the NFSv4 open code\n - Ensure that fsync() reports all relevant synchronisation errors.\n\n* tag \u0027nfs-for-3.6-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFS: fsync() must exit with an error if page writeback failed\n SUNRPC: Fix a UDP transport regression\n NFS: return error from decode_getfh in decode open\n NFSv4: Fix buffer overflow checking in __nfs4_get_acl_uncached\n NFSv4: Fix range checking in __nfs4_get_acl_uncached and __nfs4_proc_set_acl\n NFS: Fix a problem with the legacy binary mount code\n NFS: Fix the initialisation of the readdir \u0027cookieverf\u0027 array\n" }, { "commit": "c076ada4e4aaf45e1a31ad6de7c6cce36081e045", "tree": "0c1676608ef8316d271ed0a54f275c21feb3008e", "parents": [ "b3aafe80c83097403d2b5edccfc440fac3d5f028" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Wed Aug 08 09:42:32 2012 +0200" }, "committer": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Wed Sep 12 17:52:44 2012 +0200" }, "message": "i2c: pnx: Fix read transactions of \u003e\u003d 2 bytes\n\nOn transactions with n\u003e\u003d2 bytes, the controller actually wrongly clocks in n+1\nbytes. This is caused by the (wrong) assumption that RFE in the Status Register\nis 1 iff there is no byte already ordered (via a dummy TX byte). This lead to\nthe implementation of synchronized byte ordering, e.g.:\n\nDummy-TX - RX - Dummy-TX - RX - ...\n\nBut since RFE actually stays high after some Dummy-TX, it rather looks like:\n\nDummy-TX - Dummy-TX - RX - Dummy-TX - RX - (RX)\n\nThe last RX byte is clocked in by the bus controller, but ignored by the kernel\nwhen filling the userspace buffer.\n\nThis patch fixes the issue by asking for RX via Dummy-TX asynchronously.\nIntroducing a separate counter for TX bytes.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\n" }, { "commit": "7fb40f87c4195ec1728527f30bc744c47a45b366", "tree": "4a7356fc76c4db03731d7354c66f7b158682d295", "parents": [ "a8edc3bf05a3465726afdf635a820761fae0d50b" ], "author": { "name": "Hadar Hen Zion", "email": "hadarh@mellanox.com", "time": "Wed Sep 05 22:50:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 07 12:55:59 2012 -0400" }, "message": "net/mlx4_core: Add security check / enforcement for flow steering rules set for VMs\n\nSince VFs may be mapped to VMs which aren\u0027t trusted entities, flow\nsteering rules attached through the wrapper on behalf of VFs must be\nchecked to make sure that their L2 specification relate to MAC address\nassigned to that VF, and add L2 specification if its missing.\n\nSigned-off-by: Hadar Hen Zion \u003chadarh@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8edc3bf05a3465726afdf635a820761fae0d50b", "tree": "345e02de5037f0b36685d90717aadae4ef19ed69", "parents": [ "d90c92fee89ccd75ef2646f3bde0b4c0450666c3" ], "author": { "name": "Hadar Hen Zion", "email": "hadarh@mellanox.com", "time": "Wed Sep 05 22:50:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 07 12:55:59 2012 -0400" }, "message": "net/mlx4_core: Put Firmware flow steering structures in common header files\n\nTo allow for usage of the flow steering Firmware structures in more locations over the driver,\nsuch as the resource tracker, move them from mcg.c to common header files.\n\nSigned-off-by: Hadar Hen Zion \u003chadarh@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f39c1bfb5a03e2d255451bff05be0d7255298fa4", "tree": "c4f7c970840e7803e22ce10809746272d23f6fde", "parents": [ "01913b49cf1dc6409a07dd2a4cc6af2e77f3c410" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 07 11:08:50 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Sep 07 11:43:49 2012 -0400" }, "message": "SUNRPC: Fix a UDP transport regression\n\nCommit 43cedbf0e8dfb9c5610eb7985d5f21263e313802 (SUNRPC: Ensure that\nwe grab the XPRT_LOCK before calling xprt_alloc_slot) is causing\nhangs in the case of NFS over UDP mounts.\n\nSince neither the UDP or the RDMA transport mechanism use dynamic slot\nallocation, we can skip grabbing the socket lock for those transports.\nAdd a new rpc_xprt_op to allow switching between the TCP and UDP/RDMA\ncase.\n\nNote that the NFSv4.1 back channel assigns the slot directly\nthrough rpc_run_bc_task, so we can ignore that case.\n\nReported-by: Dick Streefland \u003cdick.streefland@altium.nl\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org [\u003e\u003d 3.1]\n" }, { "commit": "60e233a56609fd963c59e99bd75c663d63fa91b6", "tree": "5fc9c390fa72dc489c5fe682e9364c5c7b488b2c", "parents": [ "fea7a08acb13524b47711625eebea40a0ede69a0" ], "author": { "name": "Bjørn Mork", "email": "bjorn@mork.no", "time": "Sun Sep 02 15:41:34 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Sep 06 10:13:58 2012 -0700" }, "message": "kobject: fix oops with \"input0: bad kobj_uevent_env content in show_uevent()\"\n\nFengguang Wu \u003cfengguang.wu@intel.com\u003e writes:\n\n\u003e After the __devinit* removal series, I can still get kernel panic in\n\u003e show_uevent(). So there are more sources of bug..\n\u003e\n\u003e Debug patch:\n\u003e\n\u003e @@ -343,8 +343,11 @@ static ssize_t show_uevent(struct device\n\u003e goto out;\n\u003e\n\u003e /* copy keys to file */\n\u003e - for (i \u003d 0; i \u003c env-\u003eenvp_idx; i++)\n\u003e + dev_err(dev, \"uevent %d env[%d]: %s/.../%s\\n\", env-\u003ebuflen, env-\u003eenvp_idx, top_kobj-\u003ename, dev-\u003ekobj.name);\n\u003e + for (i \u003d 0; i \u003c env-\u003eenvp_idx; i++) {\n\u003e + printk(KERN_ERR \"uevent %d env[%d]: %s\\n\", (int)count, i, env-\u003eenvp[i]);\n\u003e count +\u003d sprintf(\u0026buf[count], \"%s\\n\", env-\u003eenvp[i]);\n\u003e + }\n\u003e\n\u003e Oops message, the env[] is again not properly initilized:\n\u003e\n\u003e [ 44.068623] input input0: uevent 61 env[805306368]: input0/.../input0\n\u003e [ 44.069552] uevent 0 env[0]: (null)\n\nThis is a completely different CONFIG_HOTPLUG problem, only\ndemonstrating another reason why CONFIG_HOTPLUG should go away. I had a\nhard time trying to disable it anyway ;-)\n\nThe problem this time is lots of code assuming that a call to\nadd_uevent_var() will guarantee that env-\u003ebuflen \u003e 0. This is not true\nif CONFIG_HOTPLUG is unset. So things like this end up overwriting\nenv-\u003eenvp_idx because the array index is -1:\n\n\tif (add_uevent_var(env, \"MODALIAS\u003d\"))\n\t\treturn -ENOMEM;\n len \u003d input_print_modalias(\u0026env-\u003ebuf[env-\u003ebuflen - 1],\n\t\t\t\t sizeof(env-\u003ebuf) - env-\u003ebuflen,\n\t\t\t\t dev, 0);\n\nDon\u0027t know what the best action is, given that there seem to be a *lot*\nof this around the kernel. This patch \"fixes\" the problem for me, but I\ndon\u0027t know if it can be considered an appropriate fix.\n\n[ It is the correct fix for now, for 3.7 forcing CONFIG_HOTPLUG to\nalways be on is the longterm fix, but it\u0027s too late for 3.6 and older\nkernels to resolve this that way - gregkh ]\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nTested-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c7c6bf1e8c72b94d73756d5dc4f7a6d7c4d1e290", "tree": "05a749ebde9f76985f2f6ded042cf42d0a8fe588", "parents": [ "bd12ce8cc23a5ab7eafb1edb3f2cd311d2b89e7e", "b6d86d3d6d6e4c9b588d81615c81b5a8292b62ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 06 09:39:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 06 09:39:47 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull a hwmon fix from Guenter Roeck:\n \"One patch, fixing DIV_ROUND_CLOSEST to support negative dividends.\n\n While the changes are not in the drivers/hwmon directory, the problem\n primarily affects hwmon drivers, and it makes sense to push the patch\n through the hwmon tree.\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n linux/kernel.h: Fix DIV_ROUND_CLOSEST to support negative dividends\n" }, { "commit": "1f1ea6c2d9d8c0be9ec56454b05315273b5de8ce", "tree": "4718cdc2e494f18ab13c2c8f09930953b77c31ff", "parents": [ "21f498c2f73bd6150d82931f09965826dca0b5f2" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sun Aug 26 11:44:43 2012 -0700" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Sep 06 11:11:53 2012 -0400" }, "message": "NFSv4: Fix buffer overflow checking in __nfs4_get_acl_uncached\n\nPass the checks made by decode_getacl back to __nfs4_get_acl_uncached\nso that it knows if the acl has been truncated.\n\nThe current overflow checking is broken, resulting in Oopses on\nuser-triggered nfs4_getfacl calls, and is opaque to the point\nwhere several attempts at fixing it have failed.\nThis patch tries to clean up the code in addition to fixing the\nOopses by ensuring that the overflow checks are performed in\na single place (decode_getacl). If the overflow check failed,\nwe will still be able to report the acl length, but at least\nwe will no longer attempt to cache the acl or copy the\ntruncated contents to user space.\n\nReported-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nTested-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\n" }, { "commit": "080909503664641432cc8adf2ee2084775fd992a", "tree": "115dc3c1c3ac5772dfd3c8b88c66c198cd84eb9e", "parents": [ "bc6c83641e1df61cff67748987f95ca62953565e", "75b53aee2f4fe6375c6007226bf68d75b5c4a929" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 05 19:41:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 05 19:41:58 2012 -0700" }, "message": "Merge tag \u0027mmc-fixes-for-3.6-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC fixes from Chris Ball:\n - a firmware bug on several Samsung MoviNAND eMMC models causes\n permanent corruption on the device when secure erase and secure trim\n requests are made, so we disable those requests on these eMMC devices.\n - atmel-mci: fix a hang with some SD cards by waiting for not-busy flag.\n - dw_mmc: low-power mode breaks SDIO interrupts; fix PIO error handling;\n fix handling of error interrupts.\n - mxs-mmc: fix deadlocks; fix compile error due to dma.h arch change.\n - omap: fix broken PIO mode causing memory corruption.\n - sdhci-esdhc: fix card detection.\n\n* tag \u0027mmc-fixes-for-3.6-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: omap: fix broken PIO mode\n mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.\n mmc: dw_mmc: Disable low power mode if SDIO interrupts are used\n mmc: dw_mmc: fix error handling in PIO mode\n mmc: dw_mmc: correct mishandling error interrupt\n mmc: dw_mmc: amend using error interrupt status\n mmc: atmel-mci: not busy flag has also to be used for read operations\n mmc: sdhci-esdhc: break out early if clock is 0\n mmc: mxs-mmc: fix deadlock caused by recursion loop\n mmc: mxs-mmc: fix deadlock in SDIO IRQ case\n mmc: bfin_sdh: fix dma_desc_array build error\n" }, { "commit": "c3f52af3e03013db5237e339c817beaae5ec9e3a", "tree": "c042675337569f9dda0415cd4cb3e54b885bc6a0", "parents": [ "086600430493e04b802bee6e5b3ce0458e4eb77f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Sep 03 14:56:02 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Sep 04 14:52:42 2012 -0400" }, "message": "NFS: Fix the initialisation of the readdir \u0027cookieverf\u0027 array\n\nWhen the NFS_COOKIEVERF helper macro was converted into a static\ninline function in commit 99fadcd764 (nfs: convert NFS_*(inode)\nhelpers to static inline), we broke the initialisation of the\nreaddir cookies, since that depended on doing a memset with an\nargument of \u0027sizeof(NFS_COOKIEVERF(inode))\u0027 which therefore\nchanged from sizeof(be32 cookieverf[2]) to sizeof(be32 *).\n\nAt this point, NFS_COOKIEVERF seems to be more of an obfuscation\nthan a helper, so the best thing would be to just get rid of it.\n\nAlso see: https://bugzilla.kernel.org/show_bug.cgi?id\u003d46881\n\nReported-by: Andi Kleen \u003candi@firstfloor.org\u003e\nReported-by: David Binderman \u003cdcb314@hotmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "3550ccdb9d8d350e526b809bf3dd92b550a74fe1", "tree": "8e656ed3f53adca5c0bc7a598e44d62476f51e78", "parents": [ "9623b5b9192b349bcadb31cce159072a78ac6972" ], "author": { "name": "Ian Chen", "email": "ian.cy.chen@samsung.com", "time": "Wed Aug 29 15:05:36 2012 +0900" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue Sep 04 13:58:10 2012 -0400" }, "message": "mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.\n\nFor several MoviNAND eMMC parts, there are known issues with secure\nerase and secure trim. For these specific MoviNAND devices, we skip\nthese operations.\n\nSpecifically, there is a bug in the eMMC firmware that causes\nunrecoverable corruption when the MMC is erased with MMC_CAP_ERASE\nenabled.\n\nReferences:\n\nhttp://forum.xda-developers.com/showthread.php?t\u003d1644364\nhttps://plus.google.com/111398485184813224730/posts/21pTYfTsCkB#111398485184813224730/posts/21pTYfTsCkB\n\nSigned-off-by: Ian Chen \u003cian.cy.chen@samsung.com\u003e\nReviewed-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nAcked-by: Jaehoon Chung \u003cjh80.chung@samsung.com\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e [3.0+]\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "500ad2d8b01390c98bc6dce068bccfa9534b8212", "tree": "a7e1330e5380d4cb4be02820a86fbea1dc0da5c9", "parents": [ "3ec18cd8b8f8395d0df604c62ab3bc2cf3a966b4" ], "author": { "name": "K.Prasad", "email": "Prasad.Krishnan@gmail.com", "time": "Thu Aug 02 13:46:35 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Sep 04 17:29:53 2012 +0200" }, "message": "perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled\n\nWhile debugging a warning message on PowerPC while using hardware\nbreakpoints, it was discovered that when perf_event_disable is invoked\nthrough hw_breakpoint_handler function with interrupts disabled, a\nsubsequent IPI in the code path would trigger a WARN_ON_ONCE message in\nsmp_call_function_single function.\n\nThis patch calls __perf_event_disable() when interrupts are already\ndisabled, instead of perf_event_disable().\n\nReported-by: Edjunior Barbosa Machado \u003cemachado@linux.vnet.ibm.com\u003e\nSigned-off-by: K.Prasad \u003cPrasad.Krishnan@gmail.com\u003e\n[naveen.n.rao@linux.vnet.ibm.com: v3: Check to make sure we target current task]\nSigned-off-by: Naveen N. Rao \u003cnaveen.n.rao@linux.vnet.ibm.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120802081635.5811.17737.stgit@localhost.localdomain\n[ Fixed build error on MIPS. ]\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "a6fa941d94b411bbd2b6421ffbde6db3c93e65ab", "tree": "2d80af531f906c6b27184148bbf15b8a7469c2a7", "parents": [ "e3e45c01ae690e65f2650e5288b9af802e95a136" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Mon Aug 20 14:59:25 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Sep 04 17:29:22 2012 +0200" }, "message": "perf_event: Switch to internal refcount, fix race with close()\n\nDon\u0027t mess with file refcounts (or keep a reference to file, for\nthat matter) in perf_event. Use explicit refcount of its own\ninstead. Deal with the race between the final reference to event\ngoing away and new children getting created for it by use of\natomic_long_inc_not_zero() in inherit_event(); just have the\nlatter free what it had allocated and return NULL, that works\nout just fine (children of siblings of something doomed are\ncreated as singletons, same as if the child of leader had been\ncreated and immediately killed).\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120820135925.GG23464@ZenIV.linux.org.uk\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "0b1a34c992853ecb47daa5be598d7ed2930342dc", "tree": "d21e98ea17bb5f1d77a78b8b56c1c453a0fe65ef", "parents": [ "4cbe5a555fa58a79b6ecbb6c531b8bab0650778d", "5002200599429e83fc13e0d9a2d4788b79515b0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 02 11:28:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 02 11:28:00 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) NLA_PUT* --\u003e nla_put_* conversion got one case wrong in\n nfnetlink_log, fix from Patrick McHardy.\n\n 2) Missed error return check in ipw2100 driver, from Julia Lawall.\n\n 3) PMTU updates in ipv4 were setting the expiry time incorrectly, fix\n from Eric Dumazet.\n\n 4) SFC driver erroneously reversed src and dst when reporting filters\n via ethtool.\n\n 5) Memory leak in CAN protocol and wrong setting of IRQF_SHARED in\n sja1000 can platform driver, from Alexey Khoroshilov and Sven\n Schmitt.\n\n 6) Fix multicast traffic scaling regression in ipv4_dst_destroy, only\n take the lock when we really need to. From Eric Dumazet.\n\n 7) Fix non-root process spoofing in netlink, from Pablo Neira Ayuso.\n\n 8) CWND reduction in TCP is done incorrectly during non-SACK recovery,\n fix from Yuchung Cheng.\n\n 9) Revert netpoll change, and fix what was actually a driver specific\n problem. From Amerigo Wang. This should cure bootup hangs with\n netconsole some people reported.\n\n10) Fix xen-netfront invoking __skb_fill_page_desc() with a NULL page\n pointer. From Ian Campbell.\n\n11) SIP NAT fix for expectiontation creation, from Pablo Neira Ayuso.\n\n12) __ip_rt_update_pmtu() needs RCU locking, from Eric Dumazet.\n\n13) Fix usbnet deadlock on resume, can\u0027t use GFP_KERNEL in this\n situation. From Oliver Neukum.\n\n14) The davinci ethernet driver triggers an OOPS on removal because it\n frees an MDIO object before unregistering it. Fix from Bin Liu.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)\n net: qmi_wwan: add several new Gobi devices\n fddi: 64 bit bug in smt_add_para()\n net: ethernet: fix kernel OOPS when remove davinci_mdio module\n net/xfrm/xfrm_state.c: fix error return code\n net: ipv6: fix error return code\n net: qmi_wwan: new device: Foxconn/Novatel E396\n usbnet: fix deadlock in resume\n cs89x0 : packet reception not working\n netfilter: nf_conntrack: fix racy timer handling with reliable events\n bnx2x: Correct the ndo_poll_controller call\n bnx2x: Move netif_napi_add to the open call\n ipv4: must use rcu protection while calling fib_lookup\n bnx2x: fix 57840_MF pci id\n net: ipv4: ipmr_expire_timer causes crash when removing net namespace\n e1000e: DoS while TSO enabled caused by link partner with small MSS\n l2tp: avoid to use synchronize_rcu in tunnel free function\n gianfar: fix default tx vlan offload feature flag\n netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation\n xen-netfront: use __pskb_pull_tail to ensure linear area is big enough on RX\n netfilter: nfnetlink_log: fix error return code in init path\n ...\n" }, { "commit": "b6d86d3d6d6e4c9b588d81615c81b5a8292b62ed", "tree": "814c4ba720911beba197b610d4bd4559a26c3e96", "parents": [ "4cbe5a555fa58a79b6ecbb6c531b8bab0650778d" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Fri Aug 24 17:25:01 2012 -0700" }, "committer": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Sat Sep 01 18:58:09 2012 -0700" }, "message": "linux/kernel.h: Fix DIV_ROUND_CLOSEST to support negative dividends\n\nDIV_ROUND_CLOSEST returns a bad result for negative dividends:\n\tDIV_ROUND_CLOSEST(-2, 2) \u003d 0\n\nMost of the time this does not matter. However, in the hardware monitoring\nsubsystem, DIV_ROUND_CLOSEST is sometimes used on integers which can be\nnegative (such as temperatures).\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "cee58483cf56e0ba355fdd97ff5e8925329aa936", "tree": "8cc2dc979a93a48a07c25d309250a2271e508e21", "parents": [ "7a611e69b26069a511d9d5251c6a28af6c521121" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Aug 31 13:30:06 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 01 10:24:48 2012 -0700" }, "message": "time: Move ktime_t overflow checking into timespec_valid_strict\n\nAndreas Bombe reported that the added ktime_t overflow checking added to\ntimespec_valid in commit 4e8b14526ca7 (\"time: Improve sanity checking of\ntimekeeping inputs\") was causing problems with X.org because it caused\ntimeouts larger then KTIME_T to be invalid.\n\nPreviously, these large timeouts would be clamped to KTIME_MAX and would\nnever expire, which is valid.\n\nThis patch splits the ktime_t overflow checking into a new\ntimespec_valid_strict function, and converts the timekeeping codes\ninternal checking to use this more strict function.\n\nReported-and-tested-by: Andreas Bombe \u003caeb@debian.org\u003e\nCc: Zhouping Liu \u003czliu@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c879d2094946081af934739850c7260e8b25d3c", "tree": "c0924b2b402fbe37b2eeb6d3d91949a0947f5efd", "parents": [ "acbb219d5f53821b2d0080d047800410c0420ea1" ], "author": { "name": "Yuval Mintz", "email": "yuvalmin@broadcom.com", "time": "Sun Aug 26 00:35:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 30 13:14:48 2012 -0400" }, "message": "bnx2x: fix 57840_MF pci id\n\nCommit c3def943c7117d42caaed3478731ea7c3c87190e have added support for\nnew pci ids of the 57840 board, while failing to change the obsolete value\nin \u0027pci_ids.h\u0027.\nThis patch does so, allowing the probe of such devices.\n\nSigned-off-by: Yuval Mintz \u003cyuvalmin@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b969afc8b719bbe3f0842a694e6bf5e87f08868f", "tree": "03df5cc9c3c9b4534426462f4a0498bb6fb25577", "parents": [ "4e872a46823c64e655d997e1e04a4b32e326aa1b" ], "author": { "name": "Joachim Eastwood", "email": "manabian@gmail.com", "time": "Thu Aug 23 18:14:54 2012 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Tue Aug 28 10:14:01 2012 -0700" }, "message": "ASoC: atmel-ssc: include linux/io.h for raw io\n\nInclude linux/io.h for raw io operations in atmel-scc header.\n\nThis fixes the following build error:\n CC [M] sound/soc/atmel/atmel_ssc_dai.o\nsound/soc/atmel/atmel_ssc_dai.c: In function \u0027atmel_ssc_interrupt\u0027:\nsound/soc/atmel/atmel_ssc_dai.c:171: error: implicit declaration of function \u0027__raw_readl\u0027\nsound/soc/atmel/atmel_ssc_dai.c: In function \u0027atmel_ssc_shutdown\u0027:\nsound/soc/atmel/atmel_ssc_dai.c:249: error: implicit declaration of function \u0027__raw_writel\u0027\n\nSigned-off-by: Joachim Eastwood \u003cjoachim.eastwood@jotron.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "9acb172543aecb783e2e1e53e3f447d4c0f5c150", "tree": "08524a97b260f64084c8b31c4dae5eed23f2d032", "parents": [ "267560874cb0189f28e7ae6dfbc8e98b8848be98", "57f0b2014135235d5bf03834dee1284629ce50d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 25 17:33:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 25 17:33:33 2012 -0700" }, "message": "Merge tag \u0027fixes-3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc fixes from Arnd Bergmann:\n \"Bug fixes for various ARM platforms. About half of these are for OMAP\n and submitted before but did not make it into v3.6-rc2.\"\n\n* tag \u0027fixes-3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)\n ARM: ux500: don\u0027t select LEDS_GPIO for snowball\n ARM: imx: build i.MX6 functions only when needed\n ARM: imx: select CPU_FREQ_TABLE when needed\n ARM: imx: fix ksz9021rn_phy_fixup\n ARM: imx: build pm-imx5 code only when PM is enabled\n ARM: omap: allow building omap44xx without SMP\n ARM: dts: imx51-babbage: fix esdhc cd/wp properties\n ARM: imx6: spin the cpu until hardware takes it down\n ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled\n ARM: ux500: Fix merge error, no matching driver name for \u0027snd_soc_u8500\u0027\n ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path\n ARM: Kirkwood: fix Makefile.boot\n ARM: Kirkwood: Fix iconnect leds\n ARM: Orion: Set eth packet size csum offload limit\n ARM: mv78xx0: fix win_cfg_base prototype\n ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*()\n ARM: mmp: fix potential NULL dereference\n ARM: OMAP4: Register the OPP table only for 4430 device\n cpufreq: OMAP: Handle missing frequency table on SMP systems\n ARM: OMAP4: sleep: Save the complete used register stack frame\n ...\n" }, { "commit": "a7e546f175f07630453c44b5afe14dd667dcfec9", "tree": "352c2577161f0cbe8c3b49bb6f053cfd49ed32b4", "parents": [ "da31ce727e8cc6920de5840e35b4e770c08e86e3", "676ce6d5ca3098339c028d44fe0427d1566a4d2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 25 11:36:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 25 11:36:43 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nPull block-related fixes from Jens Axboe:\n\n - Improvements to the buffered and direct write IO plugging from\n Fengguang.\n\n - Abstract out the mapping of a bio in a request, and use that to\n provide a blk_bio_map_sg() helper. Useful for mapping just a bio\n instead of a full request.\n\n - Regression fix from Hugh, fixing up a patch that went into the\n previous release cycle (and marked stable, too) attempting to prevent\n a loop in __getblk_slow().\n\n - Updates to discard requests, fixing up the sizing and how we align\n them. Also a change to disallow merging of discard requests, since\n that doesn\u0027t really work properly yet.\n\n - A few drbd fixes.\n\n - Documentation updates.\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: replace __getblk_slow misfix by grow_dev_page fix\n drbd: Write all pages of the bitmap after an online resize\n drbd: Finish requests that completed while IO was frozen\n drbd: fix drbd wire compatibility for empty flushes\n Documentation: update tunable options in block/cfq-iosched.txt\n Documentation: update tunable options in block/cfq-iosched.txt\n Documentation: update missing index files in block/00-INDEX\n block: move down direct IO plugging\n block: remove plugging at buffered write time\n block: disable discard request merge temporarily\n bio: Fix potential memory leak in bio_find_or_create_slab()\n block: Don\u0027t use static to define \"void *p\" in show_partition_start()\n block: Add blk_bio_map_sg() helper\n block: Introduce __blk_segment_map_sg() helper\n fs/block-dev.c:fix performance regression in O_DIRECT writes to md block devices\n block: split discard into aligned requests\n block: reorganize rounding of max_discard_sectors\n" }, { "commit": "b5bc0c7054725e238d1be6965fec452b0f0e5213", "tree": "c92a6c31fb6eaec9ba5834a21a35e072b5d40db6", "parents": [ "d37e44969e60dc652fdbaf4397d5436e07c967af", "bf2ac312195155511a0f79325515cbb61929898a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 23 21:46:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 23 21:46:57 2012 -0700" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Thomas Gleixner:\n \"Mostly small fixes for the fallout of the timekeeping overhaul in 3.6\n along with stable fixes to address an accumulation problem and missing\n sanity checks for RTC readouts and user space provided values.\"\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time: Avoid making adjustments if we haven\u0027t accumulated anything\n time: Avoid potential shift overflow with large shift values\n time: Fix casting issue in timekeeping_forward_now\n time: Ensure we normalize the timekeeper in tk_xtime_add\n time: Improve sanity checking of timekeeping inputs\n" }, { "commit": "57f0b2014135235d5bf03834dee1284629ce50d2", "tree": "bf2859249c8ff69daa8158c43795388256f53cea", "parents": [ "5f870baa18656be6dae856f96e3b2426ae83d69b", "db43b184685632b7c23ccd47ec08b61010d55798" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 23 17:30:54 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 23 17:30:54 2012 +0200" }, "message": "Merge branch \u0027randconfig/mach\u0027 into fixes\n\nSmall platform specific bug fixes for problems found in randconfig builds.\n\n* randconfig/mach:\n ARM: ux500: don\u0027t select LEDS_GPIO for snowball\n ARM: imx: build i.MX6 functions only when needed\n ARM: imx: select CPU_FREQ_TABLE when needed\n ARM: imx: fix ksz9021rn_phy_fixup\n ARM: imx: build pm-imx5 code only when PM is enabled\n ARM: omap: allow building omap44xx without SMP\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c7a9b09b1a4a1fbccb2ec409daec95f9068d77c0", "tree": "f767b4391b4a20046a5649e5efae80428506453f", "parents": [ "d9875690d9b89a866022ff49e3fcea892345ad92" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Aug 15 20:51:54 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 23 17:16:42 2012 +0200" }, "message": "ARM: omap: allow building omap44xx without SMP\n\nThe new omap4 cpuidle implementation currently requires\nARCH_NEEDS_CPU_IDLE_COUPLED, which only works on SMP.\n\nThis patch makes it possible to build a non-SMP kernel\nfor that platform. This is not normally desired for\nend-users but can be useful for testing.\n\nWithout this patch, building rand-0y2jSKT results in:\n\ndrivers/cpuidle/coupled.c: In function \u0027cpuidle_coupled_poke\u0027:\ndrivers/cpuidle/coupled.c:317:3: error: implicit declaration of function \u0027__smp_call_function_single\u0027 [-Werror\u003dimplicit-function-declaration]\n\nIt\u0027s not clear if this patch is the best solution for\nthe problem at hand. I have made sure that we can now\nbuild the kernel in all configurations, but that does\nnot mean it will actually work on an OMAP44xx.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nTested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nCc: Kevin Hilman \u003ckhilman@ti.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "1e72fe1fca4490474984d6356bbf66e2daa89f73", "tree": "12d95820cbb2083a6c78cfe550a0f9b20b1246eb", "parents": [ "8a211d362cc94df2bb42323ab13d258650529bec", "a46d2619d7180bda12bad2bf15bbd0731dfc2dcf" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 23 17:02:42 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 23 17:02:42 2012 +0200" }, "message": "Merge branch \u0027imx/fixes-for-3.6\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n\n* \u0027imx/fixes-for-3.6\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: dts: imx51-babbage: fix esdhc cd/wp properties\n ARM: imx6: spin the cpu until hardware takes it down\n ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path\n\nAlso updates to Linux 3.6-rc2\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ad746be96941ddd2fb31fad7a629de7912051c8d", "tree": "c94cc4d13d7595973c72e95dc093ef5404cb3b43", "parents": [ "467e9e51d07d43d32a1dd8b6ead2351e28fff084", "086600430493e04b802bee6e5b3ce0458e4eb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 09:57:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 09:57:25 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.6-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - NFSv3 mounts need to fail if the FSINFO rpc call fails\n - Ensure that the NFS commit cache gets torn down when we unload the\n NFS module.\n - Fix memory scribble issues when interrupting a LAYOUTGET rpc call\n - Fix NFSv4 legacy idmapper regressions\n - Fix issues with the NFSv4 getacl command\n - Fix a regression when using the legacy \"mount -t nfs4\"\n\n* tag \u0027nfs-for-3.6-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv3: Ensure that do_proc_get_root() reports errors correctly\n NFSv4: Ensure that nfs4_alloc_client cleans up on error.\n NFS: return -ENOKEY when the upcall fails to map the name\n NFS: Clear key construction data if the idmap upcall fails\n NFSv4: Don\u0027t use private xdr_stream fields in decode_getacl\n NFSv4: Fix the acl cache size calculation\n NFSv4: Fix pointer arithmetic in decode_getacl\n NFS: Alias the nfs module to nfs4\n NFS: Fix a regression when loading the NFS v4 module\n NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done\n pnfs-obj: Better IO pattern in case of unaligned offset\n NFS41: add pg_layout_private to nfs_pageio_descriptor\n pnfs: nfs4_proc_layoutget returns void\n pnfs: defer release of pages in layoutget\n nfs: tear down caches in nfs_init_writepagecache when allocation fails\n" }, { "commit": "467e9e51d07d43d32a1dd8b6ead2351e28fff084", "tree": "d925caa3c94036ba2457f0de64b6e6c40236ca46", "parents": [ "23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5", "88ec2789d856056344161aa20420dd37e893b0fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 09:56:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 22 09:56:06 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull assorted fixes - mostly vfs - from Al Viro:\n \"Assorted fixes, with an unexpected detour into vfio refcounting logics\n (fell out when digging in an analog of eventpoll race in there).\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n task_work: add a scheduling point in task_work_run()\n fs: fix fs/namei.c kernel-doc warnings\n eventpoll: use-after-possible-free in epoll_create1()\n vfio: grab vfio_device reference *before* exposing the sucker via fd_install()\n vfio: get rid of vfio_device_put()/vfio_group_get_device* races\n vfio: get rid of open-coding kref_put_mutex\n introduce kref_put_mutex()\n vfio: don\u0027t dereference after kfree...\n mqueue: lift mnt_want_write() outside -\u003ei_mutex, clean up a bit\n" }, { "commit": "8ad5db8a8ddbe3bd33078863a027011e28f1f4ee", "tree": "e54d9b3a0f6dba580dec882046b99e576c33387c", "parents": [ "934ad4c235f87dcb9206abdfa22922358999afab" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Aug 17 20:10:46 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Aug 22 10:24:41 2012 -0400" }, "message": "introduce kref_put_mutex()\n\nequivalent of\n\tmutex_lock(mutex);\n\tif (!kref_put(kref, release))\n\t\tmutex_unlock(mutex);\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1922b0f2758badc0b971d1ebbd300bc6635a6aef", "tree": "fa725f8e1a7b3a3f7eac166a1de8cea29adf46ae", "parents": [ "d9875690d9b89a866022ff49e3fcea892345ad92" ], "author": { "name": "AnilKumar Ch", "email": "anilkumar@ti.com", "time": "Mon Aug 13 20:36:05 2012 +0530" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Aug 22 10:55:25 2012 +0200" }, "message": "mfd: Move tps65217 regulator plat data handling to regulator\n\nRegulator platform data handling was mistakenly added to MFD\ndriver. So we will see build errors if we compile MFD drivers\nwithout CONFIG_REGULATOR. This patch moves regulator platform\ndata handling from TPS65217 MFD driver to regulator driver.\n\nThis makes MFD driver independent of REGULATOR framework so\nbuild error is fixed if CONFIG_REGULATOR is not set.\n\ndrivers/built-in.o: In function `tps65217_probe\u0027:\ntps65217.c:(.devinit.text+0x13e37): undefined reference\nto `of_regulator_match\u0027\n\nThis patch also fix allocation size of tps65217 platform data.\nCurrent implementation allocates a struct tps65217_board for each\nregulator specified in the device tree. But the structure itself\nprovides array of regulators so one instance of it is sufficient.\n\nSigned-off-by: AnilKumar Ch \u003canilkumar@ti.com\u003e\n" }, { "commit": "23dcfa61bac244e1200ff9ad19c6e9144dcb6bb5", "tree": "4033d868fe120f7778a6180a8eda60842309b665", "parents": [ "a484147a52e6910d990ae7cf2a5d16b5bc58dcbe", "c67fe3752abe6ab47639e2f9b836900c3dc3da84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 17:22:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 17:22:22 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton.\n\nRandom drivers and some VM fixes.\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (17 commits)\n mm: compaction: Abort async compaction if locks are contended or taking too long\n mm: have order \u003e 0 compaction start near a pageblock with free pages\n rapidio/tsi721: fix unused variable compiler warning\n rapidio/tsi721: fix inbound doorbell interrupt handling\n drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode\n mm: correct page-\u003epfmemalloc to fix deactivate_slab regression\n drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes\n mm/compaction.c: fix deferring compaction mistake\n drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources\n string: do not export memweight() to userspace\n hugetlb: update hugetlbpage.txt\n checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO\n mm: hugetlbfs: correctly populate shared pmd\n cciss: fix incorrect scsi status reporting\n Documentation: update mount option in filesystem/vfat.txt\n mm: change nr_ptes BUG_ON to WARN_ON\n cs5535-clockevt: typo, it\u0027s MFGPT, not MFPGT\n" }, { "commit": "8f8ba75ee2065738644382667f833a4eb6f6db1d", "tree": "06d58982c73239611f7e50fd40d865b84ff4fb84", "parents": [ "1456c75a80dfd3fd02b9ea44d1223bb51a5683d5", "e0e3cea46d31d23dc40df0a49a7a2c04fe8edfea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 16:46:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 16:46:08 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking update from David Miller:\n \"A couple weeks of bug fixing in there. The largest chunk is all the\n broken crap Amerigo Wang found in the netpoll layer.\"\n\n 1) netpoll and it\u0027s users has several serious bugs:\n a) uses GFP_KERNEL with locks held\n b) interfaces requiring interrupts disabled are called with them\n enabled\n c) and vice versa\n d) VLAN tag demuxing, as per all other RX packet input paths, is not\n applied\n\n All from Amerigo Wang.\n\n 2) Hopefully cure the ipv4 mapped ipv6 address TCP early demux bugs for\n good, from Neal Cardwell.\n\n 3) Unlike AF_UNIX, AF_PACKET sockets don\u0027t set a default credentials\n when the user doesn\u0027t specify one explicitly during sendmsg().\n Instead we attach an empty (zero) SCM credential block which is\n definitely not what we want. Fix from Eric Dumazet.\n\n 4) IPv6 illegally invokes netdevice notifiers with RCU lock held, fix\n from Ben Hutchings.\n\n 5) inet_csk_route_child_sock() checks wrong inet options pointer, fix\n from Christoph Paasch.\n\n 6) When AF_PACKET is used for transmit, packet loopback doesn\u0027t behave\n properly when a socket fanout is enabled, from Eric Leblond.\n\n 7) On bluetooth l2cap channel create failure, we leak the socket, from\n Jaganath Kanakkassery.\n\n 8) Fix all the netprio file handling bugs found by Al Viro, from John\n Fastabend.\n\n 9) Several error return and NULL deref bug fixes in networking drivers\n from Julia Lawall.\n\n10) A large smattering of struct padding et al. kernel memory leaks to\n userspace found of Mathias Krause.\n\n11) Conntrack expections in netfilter can access an uninitialized timer,\n fix from Pablo Neira Ayuso.\n\n12) Several netfilter SIP tracker bug fixes from Patrick McHardy.\n\n13) IPSEC ipv6 routes are not initialized correctly all the time,\n resulting in an OOPS in inet_putpeer(). Also from Patrick McHardy.\n\n14) Bridging does rcu_dereference() outside of RCU protected area, from\n Stephen Hemminger.\n\n15) Fix routing cache removal performance regression when looking up\n output routes that have a local destination. From Zheng Yan.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)\n af_netlink: force credentials passing [CVE-2012-3520]\n ipv4: fix ip header ident selection in __ip_make_skb()\n ipv4: Use newinet-\u003einet_opt in inet_csk_route_child_sock()\n tcp: fix possible socket refcount problem\n net: tcp: move sk_rx_dst_set call after tcp_create_openreq_child()\n net/core/dev.c: fix kernel-doc warning\n netconsole: remove a redundant netconsole_target_put()\n net: ipv6: fix oops in inet_putpeer()\n net/stmmac: fix issue of clk_get for Loongson1B.\n caif: Do not dereference NULL in chnl_recv_cb()\n af_packet: don\u0027t emit packet on orig fanout group\n drivers/net/irda: fix error return code\n drivers/net/wan/dscc4.c: fix error return code\n drivers/net/wimax/i2400m/fw.c: fix error return code\n smsc75xx: add missing entry to MAINTAINERS\n net: qmi_wwan: new devices: UML290 and K5006-Z\n net: sh_eth: Add eth support for R8A7779 device\n netdev/phy: skip disabled mdio-mux nodes\n dt: introduce for_each_available_child_of_node, of_get_next_available_child\n net: netprio: fix cgrp create and write priomap race\n ...\n" }, { "commit": "c67fe3752abe6ab47639e2f9b836900c3dc3da84", "tree": "c66f8f1c7a26c0277875e90107d9315f69ec2adf", "parents": [ "de74f1cc3b1e9730d9b58580cd11361d30cd182d" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Tue Aug 21 16:16:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 16:45:03 2012 -0700" }, "message": "mm: compaction: Abort async compaction if locks are contended or taking too long\n\nJim Schutt reported a problem that pointed at compaction contending\nheavily on locks. The workload is straight-forward and in his own words;\n\n\tThe systems in question have 24 SAS drives spread across 3 HBAs,\n\trunning 24 Ceph OSD instances, one per drive. FWIW these servers\n\tare dual-socket Intel 5675 Xeons w/48 GB memory. I\u0027ve got ~160\n\tCeph Linux clients doing dd simultaneously to a Ceph file system\n\tbacked by 12 of these servers.\n\nEarly in the test everything looks fine\n\n procs -------------------memory------------------ ---swap-- -----io---- --system-- -----cpu-------\n r b swpd free buff cache si so bi bo in cs us sy id wa st\n 31 15 0 287216 576 38606628 0 0 2 1158 2 14 1 3 95 0 0\n 27 15 0 225288 576 38583384 0 0 18 2222016 203357 134876 11 56 17 15 0\n 28 17 0 219256 576 38544736 0 0 11 2305932 203141 146296 11 49 23 17 0\n 6 18 0 215596 576 38552872 0 0 7 2363207 215264 166502 12 45 22 20 0\n 22 18 0 226984 576 38596404 0 0 3 2445741 223114 179527 12 43 23 22 0\n\nand then it goes to pot\n\n procs -------------------memory------------------ ---swap-- -----io---- --system-- -----cpu-------\n r b swpd free buff cache si so bi bo in cs us sy id wa st\n 163 8 0 464308 576 36791368 0 0 11 22210 866 536 3 13 79 4 0\n 207 14 0 917752 576 36181928 0 0 712 1345376 134598 47367 7 90 1 2 0\n 123 12 0 685516 576 36296148 0 0 429 1386615 158494 60077 8 84 5 3 0\n 123 12 0 598572 576 36333728 0 0 1107 1233281 147542 62351 7 84 5 4 0\n 622 7 0 660768 576 36118264 0 0 557 1345548 151394 59353 7 85 4 3 0\n 223 11 0 283960 576 36463868 0 0 46 1107160 121846 33006 6 93 1 1 0\n\nNote that system CPU usage is very high blocks being written out has\ndropped by 42%. He analysed this with perf and found\n\n perf record -g -a sleep 10\n perf report --sort symbol --call-graph fractal,5\n 34.63% [k] _raw_spin_lock_irqsave\n |\n |--97.30%-- isolate_freepages\n | compaction_alloc\n | unmap_and_move\n | migrate_pages\n | compact_zone\n | compact_zone_order\n | try_to_compact_pages\n | __alloc_pages_direct_compact\n | __alloc_pages_slowpath\n | __alloc_pages_nodemask\n | alloc_pages_vma\n | do_huge_pmd_anonymous_page\n | handle_mm_fault\n | do_page_fault\n | page_fault\n | |\n | |--87.39%-- skb_copy_datagram_iovec\n | | tcp_recvmsg\n | | inet_recvmsg\n | | sock_recvmsg\n | | sys_recvfrom\n | | system_call\n | | __recv\n | | |\n | | --100.00%-- (nil)\n | |\n | --12.61%-- memcpy\n --2.70%-- [...]\n\nThere was other data but primarily it is all showing that compaction is\ncontended heavily on the zone-\u003elock and zone-\u003elru_lock.\n\ncommit [b2eef8c0: mm: compaction: minimise the time IRQs are disabled\nwhile isolating pages for migration] noted that it was possible for\nmigration to hold the lru_lock for an excessive amount of time. Very\nbroadly speaking this patch expands the concept.\n\nThis patch introduces compact_checklock_irqsave() to check if a lock\nis contended or the process needs to be scheduled. If either condition\nis true then async compaction is aborted and the caller is informed.\nThe page allocator will fail a THP allocation if compaction failed due\nto contention. This patch also introduces compact_trylock_irqsave()\nwhich will acquire the lock only if it is not contended and the process\ndoes not need to schedule.\n\nReported-by: Jim Schutt \u003cjaschut@sandia.gov\u003e\nTested-by: Jim Schutt \u003cjaschut@sandia.gov\u003e\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3a5ce0416b6c172a23bc8a3760d8704d3d1535b", "tree": "93dab5d7523b83c78588b16ba35a46f151734a29", "parents": [ "d46f3d86fdc9248b4a8497a7da229812a15ba670" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Tue Aug 21 16:16:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 16:45:03 2012 -0700" }, "message": "string: do not export memweight() to userspace\n\nFix the following warning:\n\n usr/include/linux/string.h:8: userspace cannot reference function or variable defined in the kernel\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8f6c1ca9be29b49b03a94c8db33998093ea809f6", "tree": "2f731fb7b616140e388e2c815054e0209a7bc705", "parents": [ "4459f3974ad69a0a65d89af2a31cab425708c67e", "4c39104da846379151b9c37cffaf8b00a5580229" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 10:07:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 21 10:07:41 2012 -0700" }, "message": "Merge tag \u0027pinctrl-fixes-v3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pin control fixes from Linus Walleij:\n - Fixed Nomadik errorpath\n - Fixed documentation spelling errors\n - Forward-declare struct device in a header file\n - Remove some extraneous code lines when getting pinctrl states\n - Correct the i.MX51 configure register number\n - Fix the Nomadik keypad function group list\n\n* tag \u0027pinctrl-fixes-v3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl/nomadik: add kp_b_2 keyboard function group list\n pinctrl: imx51: fix .conf_reg of MX51_PAD_SD2_CMD__CSPI_MOSI\n trivial: pinctrl core: remove extraneous code lines\n pinctrl: header: trivial: declare struct device\n Documentation/pinctrl.txt: Fix some misspelled macros\n pinctrl/nomadik: fix null in irqdomain errorpath\n" }, { "commit": "c71a35520f2a30920d9c1a1fc86e16503b58681f", "tree": "ceecf9303b571834a6137cdc5c179e4decb4f841", "parents": [ "53795ced6e270fbb5cef7b527a71ffbb69657c78", "515c7af85ed92696c311c53d53cb4898ff32d784" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 20 10:36:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 20 10:36:18 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Ingo Molnar.\n\nA x32 socket ABI fix with a -stable backport tag among other fixes.\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x32: Use compat shims for {g,s}etsockopt\n Revert \"x86-64/efi: Use EFI to deal with platform wall clock\"\n x86, apic: fix broken legacy interrupts in the logical apic mode\n x86, build: Globally set -fno-pic\n x86, avx: don\u0027t use avx instructions with \"noxsave\" boot param\n" }, { "commit": "6c71bec66ae65305ba5c33c93aa722f21f092737", "tree": "ab07e16e8047bea8343d6ad34f0d5377f369aef4", "parents": [ "c0de08d04215031d68fa13af36f347a6cfa252ca", "2614f86490122bf51eb7c12ec73927f1900f4e7d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 20 02:44:29 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 20 02:44:29 2012 -0700" }, "message": "Merge git://1984.lsi.us.es/nf\n\nPable Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following five patches contain fixes for 3.6-rc, they are:\n\n* Two fixes for message parsing in the SIP conntrack helper, from\n Patrick McHardy.\n\n* One fix for the SIP helper introduced in the user-space cthelper\n infrastructure, from Patrick McHardy.\n\n* fix missing appropriate locking while modifying one conntrack entry\n from the nfqueue integration code, from myself.\n\n* fix possible access to uninitiliazed timer in the nf_conntrack\n expectation infrastructure, from myself.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0de08d04215031d68fa13af36f347a6cfa252ca", "tree": "7352576a55b5ceb586e3f73c9f66be890b8bccca", "parents": [ "9915e67eb1134b4710a4888a3e041c757869e0e2" ], "author": { "name": "Eric Leblond", "email": "eric@regit.org", "time": "Thu Aug 16 22:02:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 20 02:37:29 2012 -0700" }, "message": "af_packet: don\u0027t emit packet on orig fanout group\n\nIf a packet is emitted on one socket in one group of fanout sockets,\nit is transmitted again. It is thus read again on one of the sockets\nof the fanout group. This result in a loop for software which\ngenerate packets when receiving one.\nThis retransmission is not the intended behavior: a fanout group\nmust behave like a single socket. The packet should not be\ntransmitted on a socket if it originates from a socket belonging\nto the same fanout group.\n\nThis patch fixes the issue by changing the transmission check to\ntake fanout group info account.\n\nReported-by: Aleksandr Kotov \u003ca1k@mail.ru\u003e\nSigned-off-by: Eric Leblond \u003ceric@regit.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3296193d1421c2d6f9e49e181cecfd917f0f5764", "tree": "e3252ad5cd1979bbdf64f46975b602f474fa2bb3", "parents": [ "476ad154f3b41dd7d9a08a2f641e28388abc2fd1" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Tue Aug 14 13:20:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 20 02:16:00 2012 -0700" }, "message": "dt: introduce for_each_available_child_of_node, of_get_next_available_child\n\nMacro for_each_child_of_node() makes it easy to iterate over all of the\nchildren for a given device tree node, including those nodes that are\nmarked as unavailable (i.e. status \u003d \"disabled\").\n\nIntroduce for_each_available_child_of_node(), which is like\nfor_each_child_of_node(), but it automatically skips unavailable nodes.\nThis also requires the introduction of helper function\nof_get_next_available_child(), which returns the next available child\nnode.\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "557e2e2eef90d7d3d4ee5396c1ecee873c3dd46e", "tree": "0564981d2766e8b4f9b7bbf7eff12e4ad9b82e97", "parents": [ "c83917976fad1e66689f2e4f632841ed2b2dbe2b", "3a491aeae86577e0f23cd094f3e16351b6061209" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 17 10:17:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 17 10:17:03 2012 -0700" }, "message": "Merge tag \u0027staging-3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging fixes from Greg Kroah-Hartman:\n \"Here are some staging driver fixes (and iio driver fixes, they get\n lumped in with the staging stuff due to dependancies) for your 3.6-rc3\n tree.\n\n Nothing major, just a bunch of fixes that people have reported.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027staging-3.6-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (26 commits)\n iio: lm3533-als: Fix build warnings\n staging:iio:ad7780: Mark channels as unsigned\n staging:iio:ad7192: Report offset and scale for temperature channel\n staging:iio:ad7192: Report channel offset\n staging:iio:ad7192: Mark channels as unsigned\n staging:iio:ad7192: Fix setting ACX\n staging:iio:ad7192: Add missing break in switch statement\n staging:iio:ad7793: Fix internal reference value\n staging:iio:ad7793: Follow new IIO naming spec\n staging:iio:ad7793: Fix temperature scale and offset\n staging:iio:ad7793: Report channel offset\n staging:iio:ad7793: Mark channels as unsigned\n staging:iio:ad7793: Add missing break in switch statement\n iio/adjd_s311: Fix potential memory leak in adjd_s311_update_scan_mode()\n iio: frequency: ADF4350: Fix potential reference div factor overflow.\n iio: staging: ad7298_ring: Fix maybe-uninitialized warning\n staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usage\n staging: comedi: usbdux: Declare MODULE_FIRMWARE usage\n staging: comedi: usbduxsigma: Declare MODULE_FIRMWARE usage\n staging: csr: add INET dependancy\n ...\n" }, { "commit": "ef824bfba2cce6a75c7cd740f6ad80581e75a109", "tree": "10cdb7ae50f4c8a9a16e55a62bce245f1924889f", "parents": [ "d807ff838f48e7778996e577e2a57a5796c32e84", "89a4e48f8479f8145eca9698f39fe188c982212f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 17 08:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 17 08:04:47 2012 -0700" }, "message": "Merge tag \u0027ext4_for_linus_stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 bug fixes from Ted Ts\u0027o:\n \"The following are all bug fixes and regressions. The most notable are\n the ones which cause problems for ext4 on RAID --- a performance\n problem when mounting very large filesystems, and a kernel OOPS when\n doing an rm -rf on large directory hierarchies on fast devices.\"\n\n* tag \u0027ext4_for_linus_stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n ext4: fix kernel BUG on large-scale rm -rf commands\n ext4: fix long mount times on very big file systems\n ext4: don\u0027t call ext4_error while block group is locked\n ext4: avoid kmemcheck complaint from reading uninitialized memory\n ext4: make sure the journal sb is written in ext4_clear_journal_err()\n" }, { "commit": "ac5aa7f9e0891a115ab307b4bdde9c55b9232970", "tree": "b8c9327181209368ec60e6085d5f67bc5e176e8b", "parents": [ "d1a83d3b1729ac53ebcc6134f0d88faa311c42b9" ], "author": { "name": "Richard Genoud", "email": "richard.genoud@gmail.com", "time": "Fri Aug 10 16:52:58 2012 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Fri Aug 17 11:09:58 2012 +0200" }, "message": "pinctrl: header: trivial: declare struct device\n\nAs struct device is used as a function argument, it should at\nleast be declared (device.h is not included).\n\nSigned-off-by: Richard Genoud \u003crichard.genoud@gmail.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "8857df3aceb7a8eb7558059b7da109e41dd1fb95", "tree": "ba45e6d7779aab84f6a7c1ba37697d9914158b97", "parents": [ "dfffd0d65fdf16d034681716dcbea74776f62e40" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Fri Jul 20 09:31:00 2012 +0100" }, "committer": { "name": "Jonathan Cameron", "email": "jic23@kernel.org", "time": "Thu Aug 16 20:24:33 2012 +0100" }, "message": "iio: frequency: ADF4350: Fix potential reference div factor overflow.\n\nWith small channel spacing values and high reference frequencies it is\npossible to exceed the range of the 10-bit counter.\nWorkaround by checking the range and widening some constrains.\n\nWe don\u0027t use the REG1_PHASE value in this case the datasheet recommends to set\nit to 1 if not used.\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Jonathan Cameron \u003cjic23@kernel.org\u003e\n" }, { "commit": "63ca5f1d17a4eecaec3149982223fe89e55a568f", "tree": "f8ebd2cf85e5a9850bb628f8b42104772b16ff4e", "parents": [ "2eac9eb8a2e64cbfcc300e9a8098edf424c1d16c", "817fea2df3c24b22f6123dc0106eb063b7132883" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 16 11:47:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 16 11:47:42 2012 -0700" }, "message": "Merge tag \u0027vfio-for-v3.6-rc1\u0027 of git://github.com/awilliam/linux-vfio\n\nPull VFIO fix from Alex Williamson:\n \"Just a trivial patch to include vfio.h in the installed headers so we\n can complete userspace integration into QEMU.\"\n\n* tag \u0027vfio-for-v3.6-rc1\u0027 of git://github.com/awilliam/linux-vfio:\n vfio: Include vfio.h in installed headers\n" }, { "commit": "2eac9eb8a2e64cbfcc300e9a8098edf424c1d16c", "tree": "f3c4b8f25e2d25915e14ced10db661cae1341807", "parents": [ "ad54e461137765aaf090eb7f54c3b51fc0ad5d62", "fb6ccff667712c46b4501b920ea73a326e49626a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 16 11:46:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 16 11:46:31 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse updates from Miklos Szeredi.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: verify all ioctl retry iov elements\n fuse: add missing INIT flag descriptions\n fuse: add missing INIT flags\n fuse: update attributes on aio_read\n fuse: invalidate inode mapping if mtime changes\n fuse: add FUSE_AUTO_INVAL_DATA init flag\n" }, { "commit": "0a224c514f3e9620e167f9f6497ae526a41df22c", "tree": "54193db2b3c577cb6b086481da689ac8cc8322c5", "parents": [ "c6041d4adde006216cd7e8da4558323ddb2e4255", "b74ffd85e32d44e8ed405a2a0a175ef4cd39cf67" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Aug 15 14:33:02 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Aug 15 18:18:29 2012 +0200" }, "message": "Merge branch \u0027fixes-for-v3.6\u0027 of git://git.infradead.org/users/jcooper/linux into fixes\n\nFrom Jason Cooper \u003cjason@lakedaemon.net\u003e:\n\nSmall fixes for the orion platforms including kirkwood.\n\n* \u0027fixes-for-v3.6\u0027 of git://git.infradead.org/users/jcooper/linux:\n ARM: Kirkwood: fix Makefile.boot\n ARM: Kirkwood: Fix iconnect leds\n ARM: Orion: Set eth packet size csum offload limit\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "58569aee5a1a5dcc25c34a0a2ed9a377874e6b05", "tree": "bb41415f9e3d885a6282f9fca61439b9d3b19fcf", "parents": [ "0d7614f09c1ebdbaa1599a5aba7593f147bf96ee" ], "author": { "name": "Arnaud Patard (Rtp)", "email": "arnaud.patard@rtp-net.org", "time": "Thu Jul 26 12:15:46 2012 +0200" }, "committer": { "name": "Jason Cooper", "email": "jason@lakedaemon.net", "time": "Wed Aug 15 13:58:09 2012 +0000" }, "message": "ARM: Orion: Set eth packet size csum offload limit\n\nThe mv643xx ethernet controller limits the packet size for the TX\nchecksum offloading. This patch sets this limits for Kirkwood and\nDove which have smaller limits that the default.\n\nAs a side note, this patch is an updated version of a patch sent some years\nago: http://lists.infradead.org/pipermail/linux-arm-kernel/2010-June/017320.html\nwhich seems to have been lost.\n\nSigned-off-by: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nSigned-off-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b", "tree": "d0681e8e99fe2fbae1bfa574a8a68320ae5c7c1f", "parents": [ "3bf671af14d591ede9251acb0085e8017f3705e7" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 08 15:36:20 2012 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Aug 15 15:54:01 2012 +0200" }, "message": "time: Improve sanity checking of timekeeping inputs\n\nUnexpected behavior could occur if the time is set to a value large\nenough to overflow a 64bit ktime_t (which is something larger then the\nyear 2262).\n\nAlso unexpected behavior could occur if large negative offsets are\ninjected via adjtimex.\n\nSo this patch improves the sanity check timekeeping inputs by\nimproving the timespec_valid() check, and then makes better use of\ntimespec_valid() to make sure we don\u0027t set the time to an invalid\nnegative value or one that overflows ktime_t.\n\nNote: This does not protect from setting the time close to overflowing\nktime_t and then letting natural accumulation cause the overflow.\n\nReported-by: CAI Qian \u003ccaiqian@redhat.com\u003e\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Zhouping Liu \u003czliu@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: stable@vger.kernel.org\nLink: http://lkml.kernel.org/r/1344454580-17031-1-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "77ab8a54d9a8dcc4a46484a04133314f33f2aba6", "tree": "57473addc796b47c477efef5f026e2c1fe23cc8b", "parents": [ "e15c3c2294605f09f9b336b2f3b97086ab4b8145" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:32 2012 -0700" }, "message": "netpoll: convert several functions to bool\n\nThese functions are just boolean, let them return\nbool instead of int.\n\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e15c3c2294605f09f9b336b2f3b97086ab4b8145", "tree": "913bd57b5fa899687c779530d0576a3ca8100732", "parents": [ "4e3828c4bfd90b00a951cad7c8da27d1966beefe" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:32 2012 -0700" }, "message": "netpoll: check netpoll tx status on the right device\n\nAlthough this doesn\u0027t matter actually, because netpoll_tx_running()\ndoesn\u0027t use the parameter, the code will be more readable.\n\nFor team_dev_queue_xmit() we have to move it down to avoid\ncompile errors.\n\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2899656b494dcd118123af1126826b115c8ea6f9", "tree": "969d2b4362c2237cb38259f909774dc0a00a7e4d", "parents": [ "91fe4a4b9e490a24f6702dd8afe72d8afab6fcdb" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:31 2012 -0700" }, "message": "netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev()\n\nThis patch fixes several problems in the call path of\nnetpoll_send_skb_on_dev():\n\n1. Disable IRQ\u0027s before calling netpoll_send_skb_on_dev().\n\n2. All the callees of netpoll_send_skb_on_dev() should use\n rcu_dereference_bh() to dereference -\u003enpinfo.\n\n3. Rename arp_reply() to netpoll_arp_reply(), the former is too generic.\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91fe4a4b9e490a24f6702dd8afe72d8afab6fcdb", "tree": "ded789b4e378c4e657ea425f0e05ea72be395747", "parents": [ "57c5d46191e75312934c00eba65b13a31ca95120" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:31 2012 -0700" }, "message": "netpoll: use netpoll_rx_on() in netpoll_rx()\n\nThe logic of the code is same, just call netpoll_rx_on().\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57c5d46191e75312934c00eba65b13a31ca95120", "tree": "18eb9488b414f0dacdf7be468985a29ceeb1f2e9", "parents": [ "3335f0ca130c201f8680e97f63612053fbc16e22" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:31 2012 -0700" }, "message": "netpoll: take rcu_read_lock_bh() in netpoll_rx()\n\nIn __netpoll_rx(), it dereferences -\u003enpinfo without rcu_dereference_bh(),\nthis patch fixes it by using the \u0027npinfo\u0027 passed from netpoll_rx()\nwhere it is already dereferenced with rcu_dereference_bh().\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38e6bc185d9544dfad1774b3f8902a0b061aea25", "tree": "5dc41a28f9dc48095c998dfc0dcf8b970db6e1b5", "parents": [ "47be03a28cc6c80e3aa2b3e8ed6d960ff0c5c0af" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:30 2012 -0700" }, "message": "netpoll: make __netpoll_cleanup non-block\n\nLike the previous patch, slave_disable_netpoll() and __netpoll_cleanup()\nmay be called with read_lock() held too, so we should make them\nnon-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47be03a28cc6c80e3aa2b3e8ed6d960ff0c5c0af", "tree": "ba11046ff60d948cd4db06652e2483537387b3ca", "parents": [ "ddf343f635fe4440cad528e12f96f28bd50aa099" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Aug 10 01:24:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 14 14:33:30 2012 -0700" }, "message": "netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()\n\nslave_enable_netpoll() and __netpoll_setup() may be called\nwith read_lock() held, so should use GFP_ATOMIC to allocate\nmemory. Eric suggested to pass gfp flags to __netpoll_setup().\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f026cfa82f628db24b8cea41b9d6202af104cecb", "tree": "1a5e36878ad1134587220e9a3d229c5977271947", "parents": [ "f1c6300183dbf5b9da25988e13f6f25a9e27151b" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Aug 14 09:53:38 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Aug 14 09:58:25 2012 -0700" }, "message": "Revert \"x86-64/efi: Use EFI to deal with platform wall clock\"\n\nThis reverts commit bacef661acdb634170a8faddbc1cf28e8f8b9eee.\n\nThis commit has been found to cause serious regressions on a number of\nASUS machines at the least. We probably need to provide a 1:1 map in\naddition to the EFI virtual memory map in order for this to work.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nReported-and-bisected-by: Jérôme Carretero \u003ccJ-ko@zougloub.eu\u003e\nCc: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120805172903.5f8bb24c@zougloub.eu\n" }, { "commit": "1c212c65b2468e9a302f06849e244d461cc89d86", "tree": "983a67cdba5de0f048b90b9c2c3581dc643113f6", "parents": [ "f82202bae3f7f076402b16ca7bced9928aad16d0", "f57b07c0c7ca9e4dde36acfabdf474ee3c478e6d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 13 09:18:19 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 13 09:18:19 2012 +0300" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking changes from David Miller:\n \"Most importantly this should cure the ipv4-mapped ipv6 socket TCP\n crashes some people were seeing, otherwise:\n\n 1) Fix e1000e autonegotiation handling regression, from Tushar Dave.\n\n 2) Fix TX data corruption race on e1000e down, also from Tushar Dave.\n\n 3) Fix bfin_sir IRDA driver build, from Sonic Zhang.\n\n 4) AF_PACKET mmap() tests a flag in the TX ring shared between\n userspace and the kernel for an internal consistency check. It\n really shouldn\u0027t do this to validate the kernel\u0027s own behavior\n because the user can corrupt it to be any value at all. From\n Daniel Borkmann.\n\n 5) Fix TCP metrics leak on netns dismantle, from Eric Dumazet.\n\n 6) Orphan the anonymous TCP socket from the SKB in\n ip_send_unicast_reply() so that the rest of the stack needn\u0027t see\n it. Otherwise we get selinux problems of all sorts, from Eric\n Dumazet.\n\n This is the best way to fix this since the socket is just a place\n holder for sending packets in a context where we have no real\n socket at all.\n\n 7) Fix TUN detach crashes, from Stanislav Kinsbursky.\n\n 8) dev_set_alias() leaks memory on krealloc() failure, from Alexey\n Khoroshilov.\n\n 9) FIB trie must use call_rcu() not call_rcu_bh(), because this code\n is not universally invoked from software interrupts. From Eric\n Dumazet.\n\n 10) PPTP looks up ipv4 routes with the wrong network namespace, fix\n from Gao Feng.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)\n bnx2x: Fix compiler warnings\n af_packet: remove BUG statement in tpacket_destruct_skb\n macvtap: rcu_dereference outside read-lock section\n codel: refine one condition to avoid a nul rec_inv_sqrt\n ixgbe: add missing braces\n ipv4: fix ip_send_skb()\n net: tcp: ipv6_mapped needs sk_rx_dst_set method\n ipv4: tcp: unicast_sock should not land outside of TCP stack\n bnx2x: Fix recovery flow cleanup during probe\n bnx2x: fix unload previous driver flow when flr-capable\n tun: don\u0027t zeroize sock-\u003efile on detach\n igb: Fix register defines for all non-82575 hardware\n e1000e: fix panic while dumping packets on Tx hang with IOMMU\n igb: fix panic while dumping packets on Tx hang with IOMMU\n tcp: must free metrics at net dismantle\n net/stmmac: mark probe function as __devinit\n lpc_eth: remove obsolete ifdefs\n net/core: Fix potential memory leak in dev_set_alias()\n cdc-phonet: Don\u0027t leak in usbpn_open\n batman-adv: Fix mem leak in the batadv_tt_local_event() function\n ...\n" }, { "commit": "c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31", "tree": "822ae29c1572f7e95fd4726c3effd8389a79b336", "parents": [ "e4e139bebd9cc2c867950ad8ea6814e542dbcc6f", "9d8dad742ad1c74d7e7210ee05d0b44961d5ea16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:36:13 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:36:13 2012 +0300" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull a security subsystem fix from James Morris\n \"This fixes an issue in the Yama LSM\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n Yama: higher restrictions should block PTRACE_TRACEME\n" }, { "commit": "e4e139bebd9cc2c867950ad8ea6814e542dbcc6f", "tree": "269b6fa6014b06aac70b4e2fbfc2299b2fd09fbc", "parents": [ "88de3d0d714bff03b2e0a3fcd5b8b346a392e9ea", "07368d32f1a67e797def08cf2ee3ea1647b204b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:34:09 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:34:09 2012 +0300" }, "message": "Merge tag \u0027pm-for-3.6-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management fixes from Rafael J. Wysocki:\n\n - Fix for two recent regressions in the generic PM domains framework.\n\n - Revert of a commit that introduced a resume regression and is\n conceptually incorrect in my opinion.\n\n - Fix for a return value in pcc-cpufreq.c from Julia Lawall.\n\n - RTC wakeup signaling fix from Neil Brown.\n\n - Suppression of compiler warnings for CONFIG_PM_SLEEP unset in ACPI,\n platform/x86 and TPM drivers.\n\n* tag \u0027pm-for-3.6-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP\n platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP\n ACPI / PM: Fix unused function warnings for CONFIG_PM_SLEEP\n Revert \"NMI watchdog: fix for lockup detector breakage on resume\"\n PM: Make dev_pm_get_subsys_data() always return 0 on success\n drivers/cpufreq/pcc-cpufreq.c: fix error return code\n RTC: Avoid races between RTC alarm wakeup and suspend.\n" }, { "commit": "88de3d0d714bff03b2e0a3fcd5b8b346a392e9ea", "tree": "f7c89ed0248876b63dee824414c607d367ccebe0", "parents": [ "f720e7ea3a77cc9e88eb2b2bd762021646d6be52", "de9234306bb28fe6c8c3bb908e3f9956f5276a02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:31:44 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 12 21:31:44 2012 +0300" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc bug fixes from Arnd Bergmann:\n \"These are a bunch of bug fixes that came in after the merge window and\n one update for the MAINTAINERS file.\n\n The largest part of the fixes are patches that address bugs found by\n building all the ARM defconfig files. There are a lot more warnings\n that we have patches for, but the others are either still under\n discussion or are harmless and do not cause actual problems besides\n making the build slightly noisy.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)\n ARM: davinci: remove broken ntosd2_init_i2c\n ARM: s3c24xx: enable CONFIG_BUG for tct_hammer\n omap-rng: fix use of SIMPLE_DEV_PM_OPS\n spi/s3c64xx: improve error handling\n mtd/omap2: fix dmaengine_slave_config error handling\n gpio: em: do not discard em_gio_irq_domain_cleanup\n ARM: exynos: exynos_pm_add_dev_to_genpd may be unused\n ARM: imx: gpmi-nand depends on mxs-dma\n ARM: integrator: include \u003clinux/export.h\u003e\n ARM: s3c24xx: use new PWM driver\n ARM: sa1100: include linux/io.h in hackkit leds code\n Input: eeti_ts: pass gpio value instead of IRQ\n ARM: pxa: remove irq_to_gpio from ezx-pcap driver\n ARM: tegra: more regulator fixes for Harmony\n usb/ohci-omap: remove unused variable\n mfd/asic3: fix asic3_mfd_probe return value\n ARM: kirkwood: fix typo in Makefile.boot\n i.MX27: Fix emma-prp and csi clocks.\n ARM: integrator: use clk_prepare_enable() for timer\n MAINTAINERS: update entry for Linus Walleij\n ...\n" }, { "commit": "9d8dad742ad1c74d7e7210ee05d0b44961d5ea16", "tree": "b1e738bf17987552cdace2695d8b77328dc29bcf", "parents": [ "f4ba394c1b02e7fc2179fda8d3941a5b3b65efb6" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Thu Aug 09 19:01:26 2012 -0700" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Fri Aug 10 19:58:07 2012 +1000" }, "message": "Yama: higher restrictions should block PTRACE_TRACEME\n\nThe higher ptrace restriction levels should be blocking even\nPTRACE_TRACEME requests. The comments in the LSM documentation are\nmisleading about when the checks happen (the parent does not go through\nsecurity_ptrace_access_check() on a PTRACE_TRACEME call).\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: stable@vger.kernel.org # 3.5.x and later\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "02b69cbdc2fb2e1bfbfd9ac0c246d7be1b08d3cd", "tree": "6ecc2c345b62d1d70463d3cf3f00b02051cadf8c", "parents": [ "e9324b2ce656e1910d2385b9b47a2f926456dbe3" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Aug 09 10:08:46 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Aug 10 11:53:11 2012 +0200" }, "message": "netfilter: nf_ct_sip: fix IPv6 address parsing\n\nWithin SIP messages IPv6 addresses are enclosed in square brackets in most\ncases, with the exception of the \"received\u003d\" header parameter. Currently\nthe helper fails to parse enclosed addresses.\n\nThis patch:\n\n- changes the SIP address parsing function to enforce square brackets\n when required, and accept them when not required but present, as\n recommended by RFC 5118.\n\n- adds a new SDP address parsing function that never accepts square\n brackets since SDP doesn\u0027t use them.\n\nWith these changes, the SIP helper correctly parses all test messages\nfrom RFC 5118 (Session Initiation Protocol (SIP) Torture Test Messages\nfor Internet Protocol Version 6 (IPv6)).\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "276f0f5d157bb4a816053f4f3a941dbcd4f76556", "tree": "96192def39c6cb8dbd6f2ae6b8847aaf20c0dfb4", "parents": [ "389d7b26d9e4f78b17366c23a3aa16b3c5cb3bde" ], "author": { "name": "Shaohua Li", "email": "shli@fusionio.com", "time": "Thu Aug 09 15:20:23 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Aug 09 15:20:23 2012 +0200" }, "message": "block: disable discard request merge temporarily\n\nThe SCSI discard request merge never worked, and looks no solution\nfor in future, let\u0027s disable it temporarily.\n\nSigned-off-by: Shaohua Li \u003cshli@fusionio.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "4eef6cbfcc03b294d9d334368a851b35b496ce53", "tree": "65168d2471521362a2d562ee651e2283eb71c820", "parents": [ "59ee93a528b94ef4e81a08db252b0326feff171f" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Apr 30 16:21:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 09 15:16:41 2012 +0200" }, "message": "Input: eeti_ts: pass gpio value instead of IRQ\n\nThe EETI touchscreen asserts its IRQ line as soon as it has data in its\ninternal buffers. The line is automatically deasserted once all data has\nbeen read via I2C. Hence, the driver has to monitor the GPIO line and\ncannot simply rely on the interrupt handler reception.\n\nIn the current implementation of the driver, irq_to_gpio() is used to\ndetermine the GPIO number from the i2c_client\u0027s IRQ value.\n\nAs irq_to_gpio() is not available on all platforms, this patch changes\nthis and makes the driver ignore the passed in IRQ. Instead, a GPIO is\nadded to the platform_data struct and gpio_to_irq is used to derive the\nIRQ from that GPIO. If this fails, bail out. The driver is only able to\nwork in environments where the touchscreen GPIO can be mapped to an\nIRQ.\n\nWithout this patch, building raumfeld_defconfig results in:\n\ndrivers/input/touchscreen/eeti_ts.c: In function \u0027eeti_ts_irq_active\u0027:\ndrivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function \u0027irq_to_gpio\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Daniel Mack \u003czonque@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: stable@vger.kernel.org (v3.2+)\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Sven Neumann \u003cs.neumann@raumfeld.com\u003e\nCc: linux-input@vger.kernel.org\nCc: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "59ee93a528b94ef4e81a08db252b0326feff171f", "tree": "33ce49f8da61db28119b5fc8d54f6f7a70a0e98f", "parents": [ "798bd59ce94c8218332996e650ded48ded039fe1" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Aug 05 14:58:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Aug 09 15:16:41 2012 +0200" }, "message": "ARM: pxa: remove irq_to_gpio from ezx-pcap driver\n\nThe irq_to_gpio function was removed from the pxa platform\nin linux-3.2, and this driver has been broken since.\n\nThere is actually no in-tree user of this driver that adds\nthis platform device, but the driver can and does get enabled\non some platforms.\n\nWithout this patch, building ezx_defconfig results in:\n\ndrivers/mfd/ezx-pcap.c: In function \u0027pcap_isr_work\u0027:\ndrivers/mfd/ezx-pcap.c:205:2: error: implicit declaration of function \u0027irq_to_gpio\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: stable@vger.kernel.org (v3.2+)\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Daniel Ribeiro \u003cdrwyrm@gmail.com\u003e\n" }, { "commit": "d933d2beb1e416f62bf56fe002e5451414f9a9d2", "tree": "c224370c9dee10a70f13624dd970b5dc27bcd5f3", "parents": [ "99aa3473e672ca610905838997fa018b95cd643f", "035534ed3377d9def2c17717899fd64a111a785b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 08 15:55:02 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 08 15:55:02 2012 -0700" }, "message": "Merge branch \u0027fixes-for-3.6\u0027 of git://gitorious.org/linux-can/linux-can\n\nMarc Kleine-Budde says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nhere\u0027s a fix intended for the v3.6 release cycle. Oliver noticed and\nfixed that the flags definition for the new canfd_frame contains\nredundant and confusing information.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "300d3739e873d50d4c6e3656f89007a217fb1d29", "tree": "05ed9e06da5920926e0048ee0591a724ee487968", "parents": [ "77254950bb174d637cd88d1a74e137ecf3185a65" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Aug 07 13:50:22 2012 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Aug 08 20:49:45 2012 +0200" }, "message": "Revert \"NMI watchdog: fix for lockup detector breakage on resume\"\n\nRevert commit 45226e9 (NMI watchdog: fix for lockup detector breakage\non resume) which breaks resume from system suspend on my SH7372\nMackerel board (by causing a NULL pointer dereference to happen) and\nis generally wrong, because it abuses the CPU hotplug functionality\nin a shamelessly blatant way.\n\nThe original issue should be addressed through appropriate syscore\nresume callback instead.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "f4ba394c1b02e7fc2179fda8d3941a5b3b65efb6", "tree": "4d64ebd34792dee247983d64f6a5014124c412d1", "parents": [ "bf44ce8377316071fc53a1fe07b28f99a37c4462", "5d299f3d3c8a2fbc732b1bf03af36333ccec3130" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 08 20:06:43 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 08 20:06:43 2012 +0300" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Missed rcu_assign_pointer() in mac80211 scanning, from Johannes\n Berg.\n\n 2) Allow devices to limit the number of segments that an individual\n TCP TSO packet can use at a time, to deal with device and/or driver\n specific limitations. From Ben Hutchings.\n\n 3) Fix unexpected hard IPSEC expiration after setting the date. From\n Fan Du.\n\n 4) Memory leak fix in bxn2x driver, from Jesper Juhl.\n\n 5) Fix two memory leaks in libertas driver, from Daniel Drake.\n\n 6) Fix deref of out-of-range array index in packet scheduler generic\n actions layer. From Hiroaki SHIMODA.\n\n 7) Fix TX flow control errors in mlx4 driver, from Yevgeny Petrilin.\n\n 8) Fix CRIS eth_v10.c driver build, from Randy Dunlap.\n\n 9) Fix wrong SKB freeing in LLC protocol layer, from Sorin Dumitru.\n\n10) The IP output path checks neigh lookup errors incorrectly, it needs\n to use IS_ERR(). From Vasiliy Kulikov.\n\n11) An estimator leak leads to deref of freed memory in timer handler,\n fix from Hiroaki SHIMODA.\n\n12) TCP early demux in ipv6 needs to use DST cookies in order to\n validate the RX route properly. Fix from Eric Dumazet.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)\n net: ipv6: fix TCP early demux\n net: Use PTR_RET rather than if(IS_ERR(.. [1]\n net_sched: act: Delete estimator in error path.\n ip: fix error handling in ip_finish_output2()\n llc: free the right skb\n ixp4xx_eth: fix ptp_ixp46x build failure\n drivers/atm/iphase.c: fix error return code\n tcp_output: fix sparse warning for tcp_wfree\n drivers/net/phy/mdio-mux-gpio.c: drop devm_kfree of devm_kzalloc\u0027d data\n batman-adv: select an internet gateway if none was chosen\n mISDN: Bugfix for layer2 fixed TEI mode\n igb: don\u0027t break user visible strings over multiple lines in igb_ethtool.c\n igb: correct hardware type (i210/i211) check in igb_loopback_test()\n igb: Fix for failure to init on some 82576 devices.\n cris: fix eth_v10.c build error\n cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWAN\n isdnloop: fix and simplify isdnloop_init()\n hyperv: Move wait completion msg code into rndis_filter_halt_device()\n net/mlx4_core: Remove port type restrictions\n net/mlx4_en: Fixing TX queue stop/wake flow\n ...\n" }, { "commit": "7f46f9c13041c8fde331142791f3994a8fdbec6f", "tree": "da24c058773a1392cf82b1a31ec6867f83803af6", "parents": [ "6666cabf5af309c1c3e63a36e2580879fb40e827", "31fe943599b7e5870edb9decb7fbb9538b218f26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 08 20:01:45 2012 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 08 20:01:45 2012 +0300" }, "message": "Merge tag \u0027iommu-fixes-v3.6-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull IOMMU fixes from Joerg Roedel:\n \"These patches fix a couple of issues. First of all a few problems\n with ACS on x86 introduced in the last merge window, where ACS did not\n work on AMD and a NULL pointer dereference when there ran against\n SR-IOV devices.\n\n The patches fallen out of coccinelle checks fix a possible invalid\n memory reference and a possible memory leak. The other patches mostly\n fix build errors and warnings and a wrong return value.\"\n\n* tag \u0027iommu-fixes-v3.6-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n iommu/amd: Fix ACS path checking\n iommu/intel: Fix ACS path checking\n iommu/amd: Fix pci_request_acs() call-place\n iommu/exynos: Fix build error\n iommu/tegra: smmu: Fix error initial value at domain_init\n iommu/tegra: smmu: Cleanup with lesser nest\n iommu: Add missing forward declaration in include file\n iommu: Include linux/types.h\n iommu/intel: add missing free_domain_mem\n iommu/tegra: remove invalid reference to list iterator variable\n" }, { "commit": "817fea2df3c24b22f6123dc0106eb063b7132883", "tree": "594031e1ae715c76a787b1597385505e719c017c", "parents": [ "42a579a0f960081cd16fc945036e4780c3ad3202" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue Aug 07 11:48:33 2012 -0600" }, "committer": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue Aug 07 11:48:33 2012 -0600" }, "message": "vfio: Include vfio.h in installed headers\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\n" }, { "commit": "035534ed3377d9def2c17717899fd64a111a785b", "tree": "25efb74e0abecd07bc07e2c73ce7f92e7b67c70c", "parents": [ "5d299f3d3c8a2fbc732b1bf03af36333ccec3130" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Mon Aug 06 18:02:29 2012 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Tue Aug 07 10:10:57 2012 +0200" }, "message": "canfd: remove redundant CAN FD flag\n\nThe first idea of the CAN FD implementation started with a new struct\ncanfd_frame to be used for both CAN FD frames and legacy CAN frames.\nThe now mainlined implementation supports both CAN frame types simultaneously\nand distinguishes them only by their required sizes: CAN_MTU and CANFD_MTU.\n\nOnly the struct canfd_frame contains a flags element which is needed for the\nadditional CAN FD information. As CAN FD implicitly means that the \u0027Extened\nData Length\u0027 mode is enabled the formerly defined CANFD_EDL bit became\nredundant and also confusing as an unset bit would be an error and would\nalways need to be tested.\n\nThis patch removes the obsolete CANFD_EDL bit and clarifies the documentation\nfor the use of struct canfd_frame and the CAN FD relevant flags.\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "5d299f3d3c8a2fbc732b1bf03af36333ccec3130", "tree": "119701591725281d99ecad6f459166da3e6034a2", "parents": [ "b5497eeb37d7d4a5a61b91f64efedc90d1ad6fa3" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Aug 06 05:09:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 06 13:33:21 2012 -0700" }, "message": "net: ipv6: fix TCP early demux\n\nIPv6 needs a cookie in dst_check() call.\n\nWe need to add rx_dst_cookie and provide a family independent\nsk_rx_dst_set(sk, skb) method to properly support IPv6 TCP early demux.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d796c52ef0b71a988364f6109aeb63d79c5b116b", "tree": "657ec500327ce4095000d74e9d826c2073b9dc6d", "parents": [ "0d7614f09c1ebdbaa1599a5aba7593f147bf96ee" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Sun Aug 05 19:04:57 2012 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Sun Aug 05 19:04:57 2012 -0400" }, "message": "ext4: make sure the journal sb is written in ext4_clear_journal_err()\n\nAfter we transfer set the EXT4_ERROR_FS bit in the file system\nsuperblock, it\u0027s not enough to call jbd2_journal_clear_err() to clear\nthe error indication from journal superblock --- we need to call\njbd2_journal_update_sb_errno() as well. Otherwise, when the root file\nsystem is mounted read-only, the journal is replayed, and the error\nindicator is transferred to the superblock --- but the s_errno field\nin the jbd2 superblock is left set (since although we cleared it in\nmemory, we never flushed it out to disk).\n\nThis can end up confusing e2fsck. We should make e2fsck more robust\nin this case, but the kernel shouldn\u0027t be leaving things in this\nconfused state, either.\n\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: stable@kernel.org\n\n\n" }, { "commit": "e7882d6c40874a5b5033ca85f7508a602a60b662", "tree": "d477954bbc6ad932cda97fca1def0f5b48a2a378", "parents": [ "d8579fd834de224d2833ce2e82e0f691cc67e8f7", "fe7c80518e34d1786f4a940ce673a0bfcbe53298" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 04 08:32:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 04 08:32:46 2012 -0700" }, "message": "Merge branch \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull VFS fixes and cleanups from Al Viro.\n\nMost of this is the series to remove sync_supers() and the\n-\u003ewrite_supers VFS callback from Artem Bityutskiy. One commit to do the\nactual removal work, a whole series of commits to fix up stale comments\netc all over the tree.\n\nThere\u0027s also a regression fix for an incorrect use of mnt_drop_write()\nin do_dentry_open().\n\n* \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n missed mnt_drop_write() in do_dentry_open()\n UBIFS: nuke pdflush from comments\n gfs2: nuke pdflush from comments\n drbd: nuke pdflush from comments\n nilfs2: nuke write_super from comments\n hfs: nuke write_super from comments\n vfs: nuke pdflush from comments\n jbd/jbd2: nuke write_super from comments\n btrfs: nuke pdflush from comments\n btrfs: nuke write_super from comments\n ext4: nuke pdflush from comments\n ext4: nuke write_super from comments\n ext3: nuke write_super from comments\n Documentation: fix the VM knobs descritpion WRT pdflush\n Documentation: get rid of write_super\n vfs: kill write_super and sync_supers\n" }, { "commit": "0d5c3eba2e1e5aa74e097f49bc90b58f607e101c", "tree": "09463050b4738e380ea7d9fa32d607e7fb2040bb", "parents": [ "12810ad70858af10f5e00b3c178085c03baa457b" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Wed Jul 25 18:12:08 2012 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Aug 04 12:15:37 2012 +0400" }, "message": "vfs: nuke pdflush from comments\n\nThe pdflush thread is long gone, so this patch removes references to pdflush\nfrom vfs comments.\n\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f0cd2dbb6cf387c11f87265462e370bb5469299e", "tree": "21c9b6237dd9131763654a6cd715461177701607", "parents": [ "d42d1dabf34bdd5ad832cb56a7338817aad8a052" ], "author": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@linux.intel.com", "time": "Wed Jul 25 18:11:59 2012 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Aug 04 01:24:44 2012 +0400" }, "message": "vfs: kill write_super and sync_supers\n\nFinally we can kill the \u0027sync_supers\u0027 kernel thread along with the\n\u0027-\u003ewrite_super()\u0027 superblock operation because all the users are gone.\nNow every file-system is supposed to self-manage own superblock and\nits dirty state.\n\nThe nice thing about killing this thread is that it improves power management.\nIndeed, \u0027sync_supers\u0027 is a source of monotonic system wake-ups - it woke up\nevery 5 seconds no matter what - even if there were no dirty superblocks and\neven if there were no file-systems using this service (e.g., btrfs and\njournalled ext4 do not need it). So it was wasting power most of the time. And\nbecause the thread was in the core of the kernel, all systems had to have it.\nSo I am quite happy to make it go away.\n\nInterestingly, this thread is a left-over from the pdflush kernel thread which\nwas a self-forking kernel thread responsible for all the write-back in old\nLinux kernels. It was turned into per-block device BDI threads, and\n\u0027sync_supers\u0027 was a left-over. Thus, R.I.P, pdflush as well.\n\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d8579fd834de224d2833ce2e82e0f691cc67e8f7", "tree": "4427904f275fa4520faa97e76568285695a83936", "parents": [ "d42d1dabf34bdd5ad832cb56a7338817aad8a052", "9d0b01a1bbb7a4ad23000240b67bca33c4235fcf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 14:10:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 14:10:00 2012 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nPull ACPI and power management fixes from Len Brown:\n \"A 3.3 sleep regression fixed, numa bugfix, plus some minor cleanups\"\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n ACPI processor: Fix tick_broadcast_mask online/offline regression\n ACPI: Only count valid srat memory structures\n ACPI: Untangle a return statement for better readability\n ACPI / PCI: Do not try to acquire _OSC control if that is hopeless\n ACPI: delete _GTS/_BFS support\n ACPI/x86: revert \u0027x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler\u0027\n ACPI: replace strlen(\"string\") with sizeof(\"string\") -1\n ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset\n" }, { "commit": "ddc5057c1c1fb3e99afeeef45d2b8ff9597e6707", "tree": "801e4842f3a4dce2d777336b54f3caf075975025", "parents": [ "fcc1d2a9cea4ba97c9800e1de0748003bba07335", "4e250fdde9be50581c7dd5fed88c9b9960615314" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 10:58:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 10:58:57 2012 -0700" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Ingo Molnar:\n \"One regression fix, and a couple of cleanups that clean up the code\n flow in areas that had high-profile bugs recently.\"\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n time: Remove all direct references to timekeeper\n time: Clean up offs_real/wall_to_mono and offs_boot/total_sleep_time updates\n time: Clean up stray newlines\n time/jiffies: Rename ACTHZ to SHIFTED_HZ\n time/jiffies: Allow CLOCK_TICK_RATE to be undefined\n time: Fix casting issue in tk_set_xtime and tk_xtime_add\n" }, { "commit": "fcc1d2a9cea4ba97c9800e1de0748003bba07335", "tree": "c27c56275048e33e61097202cabaa48ef49f1314", "parents": [ "bd463a06064c4bc8497f6aa6dfb4437be8f07a3b", "b9403130a5350fca59a50ed11c198cb8c7e54119" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 10:58:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 03 10:58:13 2012 -0700" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar:\n \"Fixes and two late cleanups\"\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched/cleanups: Add load balance cpumask pointer to \u0027struct lb_env\u0027\n sched: Fix comment about PREEMPT_ACTIVE bit location\n sched: Fix minor code style issues\n sched: Use task_rq_unlock() in __sched_setscheduler()\n sched/numa: Add SD_PERFER_SIBLING to CPU domain\n" } ], "next": "bd463a06064c4bc8497f6aa6dfb4437be8f07a3b" }