)]}' { "log": [ { "commit": "da31824a3b52bde102a0f3c4ac621c3487ea88e1", "tree": "57ffc985ebc14fbeeb4f44a66a959efb977f7121", "parents": [ "578a621707dac9772a1d7a4097d6bea229fe25dd" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Fri Jun 22 11:36:18 2012 -0700" }, "committer": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Jun 28 09:11:01 2012 -0700" }, "message": "Bluetooth: Use transmit window from config response for ack timing\n\nThis change addresses an L2CAP ERTM throughput problem when a remote\ndevice does not fully utilize the available transmit window.\n\nThe L2CAP ERTM transmit window size determines the maximum number of\nunacked frames that may be outstanding at any time. It is configured\nseparately for each direction of an ERTM connection. Each side sends a\nconfiguration request with a tx_win field indicating how many unacked\nframes it is capable of receiving before sending an ack. The\nconfiguration response\u0027s tx_win field shows how many frames the\ntransmitter will actually send before waiting for an ack.\n\nIt\u0027s important to trace both the actual transmit window (to check for\nvalidity of incoming frames) and the number of frames that the\ntransmitter will send before waiting (to send acks at the appropriate\ntime). Now there are separate tx_win and ack_win values. ack_win is\nupdated based on configuration responses, and is used to determine\nwhen acks are sent.\n\nCRs-fixed: 370909\nChange-Id: I6d9ef55a2ff2f5f3d0117ad376a09e4cc26fe742\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\n" }, { "commit": "1505bfac7d136f7616caf083db4fb5ae27c89fee", "tree": "40516a6ff7c5ccc6d20ebe715c7eaa388e884cc1", "parents": [ "fa002621c590c56e13cd86e944919a5771a6e03e" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Jun 08 10:47:27 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Jun 08 10:47:27 2012 -0700" }, "message": "Bluetooth: AMP support enabled by module param, default disabled\n\nAMP feature is decommitted from Android PL\u0027s. Make advertising and\nsupport for the A2MP protocol depend on an L2CAP module parameter\nand make the default state disabled.\n\nChange-Id: Icb9827d2d4205818d6c3b49e7a53938666f769e8\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "f132c6cf77251e011e1dad0ec88c0b1fda16d5aa", "tree": "f04b469a3547a19b7bdbe110adc571eb71c93328", "parents": [ "23016defd7db701a01dc49f972ad6b1bae9651c2", "3f6240f3e4e2608caf1a70d614ada658cbcbe7be" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:30:57 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:45:28 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027 into msm-3.4\n\nAU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.\nFirst parent is from google/android-3.4.\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027: (8712 commits)\n PRNG: Device tree entry for qrng device.\n vidc:1080p: Set video core timeout value for Thumbnail mode\n msm: sps: improve the debugging support in SPS driver\n board-8064 msm: Overlap secure and non secure video firmware heaps.\n msm: clock: Add handoff ops for 7x30 and copper XO clocks\n msm_fb: display: Wait for external vsync before DTV IOMMU unmap\n msm: Fix ciruclar dependency in debug UART settings\n msm: gdsc: Add GDSC regulator driver for msm-copper\n defconfig: Enable Mobicore Driver.\n mobicore: Add mobicore driver.\n mobicore: rename variable to lower case.\n mobicore: rename folder.\n mobicore: add makefiles\n mobicore: initial import of kernel driver\n ASoC: msm: Add SLIMBUS_2_RX CPU DAI\n board-8064-gpio: Update FUNC for EPM SPI CS\n msm_fb: display: Remove chicken bit config during video playback\n mmc: msm_sdcc: enable the sanitize capability\n msm-fb: display: lm2 writeback support on mpq platfroms\n msm_fb: display: Disable LVDS phy \u0026 pll during panel off\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\n" }, { "commit": "1924066da0be90a72a8060f2d39c5d9ed8a7590b", "tree": "292702af3ca80ecb42bfbb8bbc1f3bf31c604e89", "parents": [ "80fbef09164b4f7b3195a9ba91bdf80a1681ed4c", "45df0f99094aefc2564951495ab0005a18d62de3" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jun 05 07:05:46 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Jun 05 07:05:46 2012 -0700" }, "message": "Merge \"Bluetooth: Initiate dedicated bonding if pin/key missing on remote device\" into msm-3.0" }, { "commit": "3096371e8e95db2a5e17aeba32295ba3559e1efd", "tree": "fd91828a314723552383c31e562b1ef0c29f1260", "parents": [ "700304c17a7687d48a65c2fef89d0c153e921708", "931bc4e2b45a3108cc8f57af06695bd5bfaacb53" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 01 05:13:43 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 01 05:13:43 2012 -0700" }, "message": "Merge \"Bluetooth: Fix mgmt response when adapter goes down or is removed\" into msm-3.0" }, { "commit": "931bc4e2b45a3108cc8f57af06695bd5bfaacb53", "tree": "cac3b22d86ae6112ee2ad26b76fb25ae2df4b451", "parents": [ "a3fe8df5d61bf52c971da8731ba536773c26c86d" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Thu Nov 03 14:40:33 2011 +0200" }, "committer": { "name": "Bhasker Neti", "email": "bneti@codeaurora.org", "time": "Fri Jun 01 11:52:50 2012 +0530" }, "message": "Bluetooth: Fix mgmt response when adapter goes down or is removed\n\nWhen an adapter gets powered off or is removed any pending commands\nshould receive a ENETDOWN or ENODEV status response.\n\nChange-Id: I2fec5fa19b2349a48a6aafd5b33ef7946067f16b\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Bhasker Neti \u003cbneti@codeaurora.org\u003e\nCRs-fixed: 364664\n[bneti@codeaurora.org: Resolved conflict]\n" }, { "commit": "d110434c0e8f1b32b276d98980fa0e9856e5fe04", "tree": "1f55e2089fb3b3af22ccc9366b84b06cec1f15d9", "parents": [ "19533230e8f3dcfb0e5b1addba5ea9901ac62dca", "6bba008fbead844722c5dc80b6c4dd59adc637c9" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed May 30 21:57:31 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed May 30 21:57:31 2012 -0700" }, "message": "Merge \"Bluetooth: Check for NULL pointer dereference\" into msm-3.0" }, { "commit": "45df0f99094aefc2564951495ab0005a18d62de3", "tree": "33b586e8c9e3f8b1d19d519a7b20b5da125e0ba1", "parents": [ "2cc13f08cde4f2bc54f671ef0d4f07a86112bbf2" ], "author": { "name": "Royston Rodrigues", "email": "roystonr@codeaurora.org", "time": "Wed May 30 10:26:42 2012 +0530" }, "committer": { "name": "Royston Rodrigues", "email": "roystonr@codeaurora.org", "time": "Thu May 31 09:09:02 2012 +0530" }, "message": "Bluetooth: Initiate dedicated bonding if pin/key missing on remote device\n\nIn case of 2.1 capable devices, when remote device had unpaired,\nsuccessive connect from the DUT was resulting in general bonding with\nautomatic accept allowed for numeric comparison\n(i.e. authentication_requirements \u003d 0x04). This lead to bad user\nexperience as user confirmation pop up wasn\u0027t notified on the DUT. Now\nits ensured that if remote device has unpaired then DUT would trigger\ndedicated bonding as part of the DUT intiated connect.\n\nCRs-fixed: 362572\nChange-Id: Id55f6cf3cc70621c29f583aa913fc08180e2d8f0\nSigned-off-by: Royston Rodrigues \u003croystonr@codeaurora.org\u003e\n" }, { "commit": "6bba008fbead844722c5dc80b6c4dd59adc637c9", "tree": "172984006a94c68e40f0ffc7ae9b46b30a4146fa", "parents": [ "ebdd79ed744d4ea5b32e555eb511ed3b7e6834db" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Wed May 23 17:08:16 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Tue May 29 09:01:55 2012 -0700" }, "message": "Bluetooth: Check for NULL pointer dereference\n\nThe fix in commit ff9718f8254b96dc313dd998c195c1c3769417ba was not\ncomplete. In l2cap_logical_link_complete the socket pointer was\ndereferenced in two places, the previous fix only handled one of\nthe locations.\n\nThis fixes an infrequent crash when performing OPP or FTP transfer\nover AMP (Bluetooth 3.0+HS).\n\nChange-Id: I730a503b143723ffff1765602151d66fe87103da\nCRs-fixed: 360758\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "5500e4fab219bf210f22d2334cc98f3ca8f8912d", "tree": "60f3edf480190ee60676348c1ca2730a699f8671", "parents": [ "903f6c716db3d4e26952aae9717f81dd5bc9e4ba", "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "message": "Merge commit \u0027v3.4\u0027 into android-3.4\n" }, { "commit": "b44f9e264c6c64eea22715bf3105fc01cb8ae687", "tree": "6544a77843f9b52598c0ec688dbe1c395f99e630", "parents": [ "fcef77c48a53b8b9cefa7346046c5b3816dffc79" ], "author": { "name": "Rahul Kashyap", "email": "rkashyap@codeaurora.org", "time": "Thu May 03 16:45:17 2012 +0530" }, "committer": { "name": "Rahul Kashyap", "email": "rkashyap@codeaurora.org", "time": "Thu May 24 11:38:05 2012 +0530" }, "message": "Bluetooth: Hold wakelock until BT idle timer kicks in.\n\nHolding a wakelock avoids suspend power collapse, which\nallow the BT idle timer to kick in, which eventually\ninitiates BT low power modes.\n\nCRs-Fixed: 361067\nChange-Id: I93e3950b6f854e70dbce092a5529120ec008c2b8\nSigned-off-by: Rahul Kashyap \u003crkashyap@codeaurora.org\u003e\n" }, { "commit": "d4b1133558e0d417342d5d2c49e4c35b428ff20d", "tree": "8d50b39901dbcd06d181ad505f7aff76ca9388d7", "parents": [ "42ea7d7f2a7356962022cdd124d9043c488ca5e2" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 17 23:52:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 18 13:54:33 2012 -0400" }, "message": "pktgen: fix module unload for good\n\ncommit c57b5468406 (pktgen: fix crash at module unload) did a very poor\njob with list primitives.\n\n1) list_splice() arguments were in the wrong order\n\n2) list_splice(list, head) has undefined behavior if head is not\ninitialized.\n\n3) We should use the list_splice_init() variant to clear pktgen_threads\nlist.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bad115cfe5b509043b684d3a007ab54b80090aa1", "tree": "f2da25538f8fcf48ae7a74b3b040d58628b52094", "parents": [ "1be5f0b7575e090fd100a98b303860879b5800de" ], "author": { "name": "Willy Tarreau", "email": "w@1wt.eu", "time": "Thu May 17 11:14:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 17 18:31:43 2012 -0400" }, "message": "tcp: do_tcp_sendpages() must try to push data out on oom conditions\n\nSince recent changes on TCP splicing (starting with commits 2f533844\n\"tcp: allow splice() to build full TSO packets\" and 35f9c09f \"tcp:\ntcp_sendpages() should call tcp_push() once\"), I started seeing\nmassive stalls when forwarding traffic between two sockets using\nsplice() when pipe buffers were larger than socket buffers.\n\nLatest changes (net: netdev_alloc_skb() use build_skb()) made the\nproblem even more apparent.\n\nThe reason seems to be that if do_tcp_sendpages() fails on out of memory\ncondition without being able to send at least one byte, tcp_push() is not\ncalled and the buffers cannot be flushed.\n\nAfter applying the attached patch, I cannot reproduce the stalls at all\nand the data rate it perfectly stable and steady under any condition\nwhich previously caused the problem to be permanent.\n\nThe issue seems to have been there since before the kernel migrated to\ngit, which makes me think that the stalls I occasionally experienced\nwith tux during stress-tests years ago were probably related to the\nsame issue.\n\nThis issue was first encountered on 3.0.31 and 3.2.17, so please backport\nto -stable.\n\nSigned-off-by: Willy Tarreau \u003cw@1wt.eu\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "26a5d3cc0b3d1ff23b5a94edb58226afe7f12a0c", "tree": "046834414e20d334fc5172275a53c55d9722a714", "parents": [ "769b0daf6e18a05a6d4da94baab7edd12867350c" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Mon May 14 01:47:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 16 15:38:49 2012 -0400" }, "message": "netfilter: ipset: fix hash size checking in kernel\n\nThe hash size must fit both into u32 (jhash) and the max value of\nsize_t. The missing checking could lead to kernel crash, bug reported\nby Seblu.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60374631487a6dbf6b888729022f0e8d76eec8fb", "tree": "4adda0d1a8616ce586ea26a25717477c9e18667a", "parents": [ "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "671267bf3aac3dae0555730b07ef29c042e325b2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "ec0b571c19ac62ab0bb80d373a3d4922a48b4b75", "tree": "10c597f5227c969c3f2b909fbeb29725a0c5c6e8", "parents": [ "7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc", "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc7\u0027 into android-3.4\n" }, { "commit": "671267bf3aac3dae0555730b07ef29c042e325b2", "tree": "89ee980737493ce6247b3a454636e48bd488e1c7", "parents": [ "a7d7723ae7c0178d715c06c5621e8fd8014ba92f" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Sat May 12 16:11:50 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:56:15 2012 -0400" }, "message": "Bluetooth: mgmt: Fix device_connected sending order\n\nThe mgmt_ev_device_connected signal must be sent before any event\nindications happen for sockets associated with the connection. Otherwise\ne.g. device authorization for the sockets will fail with ENOTCONN as\nuser space things that there is no baseband link.\n\nThis patch fixes the issue by ensuring that the device_connected event\nif sent (if it hasn\u0027t been so already) as soon as the first ACL data\npacket arrives from the remote device.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7d7723ae7c0178d715c06c5621e8fd8014ba92f", "tree": "8e09cd37ed267e792481c2ad699bcaff9596e5e7", "parents": [ "574e02abaf816b582685805f0c1150ca9f1f18ee" ], "author": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Sun May 13 03:20:07 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:51:25 2012 -0400" }, "message": "Bluetooth: notify userspace of security level change\n\nIt fixes L2CAP socket based security level elevation during a\nconnection. The HID profile needs this (for keyboards) and it is the only\nway to achieve the security level elevation when using the management\ninterface to talk to the kernel (hence the management enabling patch\nbeing the one that exposes this issue).\n\nIt enables the userspace a security level change when the socket is\nalready connected and create a way to notify the socket the result of the\nrequest. At the moment of the request the socket is made non writable, if\nthe request fails the connections closes, otherwise the socket is made\nwritable again, POLL_OUT is emmited.\n\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "tree": "8444efa46bbd8dbe4e01655aaa719d8d5257928e", "parents": [ "b99215cdc6e191f5649687536d4fb0faa3d7f56e" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Sun May 13 08:44:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 13 15:47:34 2012 -0400" }, "message": "openvswitch: checking wrong variable in queue_userspace_packet()\n\n\"skb\" is non-NULL here, for example we dereference it in skb_clone().\nThe intent was to test \"nskb\" which was just set.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6329bf0a03811f4644a4c8d50bf241f6db6f19b5", "tree": "3b92221c0536e4cfc414a3ff36483de00a739e96", "parents": [ "2c653ad630abce4b447292fbfb20d48c2136a13d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Feb 23 10:55:02 2012 +0000" }, "committer": { "name": "Jin Hong", "email": "jinh@codeaurora.org", "time": "Sat May 12 21:53:36 2012 -0700" }, "message": "ipsec: be careful of non existing mac headers\n\nNiccolo Belli reported ipsec crashes in case we handle a frame without\nmac header (atm in his case)\n\nBefore copying mac header, better make sure it is present.\n\nBugzilla reference: https://bugzilla.kernel.org/show_bug.cgi?id\u003d42809\n\nReported-by: Niccolò Belli \u003cdarkbasic@linuxsystems.it\u003e\nTested-by: Niccolò Belli \u003cdarkbasic@linuxsystems.it\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n\nCRs-Fixed: 344300\nChange-Id: Ic2d8f3f6b90233d6e87741373c33ef510b35aaa5\nSigned-off-by: Jin Hong \u003cjinh@codeaurora.org\u003e\n" }, { "commit": "4a873f53995cd551587ee4aad1e6f189a330ff36", "tree": "a1caacf532d6a32861399720ae2883396f443954", "parents": [ "2eb429671a4b83ea34a1a722a4656bb14ce7c971", "062e55e3960062fc2fb62a7274b4c253003eba73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David S. Miller:\n\n 1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the\n entry is dead before returning it to our caller.\n\n 2) openvswitch locking and packet validation fixes from Ansis Atteka,\n Jesse Gross, and Pravin B Shelar.\n\n 3) Fix PM resume locking in IGB driver, from Benjamin Poirier.\n\n 4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.\n\n 5) Revert a bogus network namespace isolation change that was causing\n regressions on S390 networking devices.\n\n 6) If bonding decides to process and handle a LACPDU frame, we\n shouldn\u0027t bump the rx_dropped counter. From Jiri Bohac.\n\n 7) Fix mis-calculation of available TX space in r8169 driver when doing\n TSO, which can lead to crashes and/or hung device. From Julien\n Ducourthial.\n\n 8) SCTP does not validate cached routes properly in all cases, from\n Nicolas Dichtel.\n\n 9) Link status interrupt needs to be handled in ks8851 driver, from\n Stephen Boyd.\n\n10) Use capable(), not cap_raised(), in connector/userns netlink code.\n From Eric W. Biederman via Andrew Morton.\n\n11) Fix pktgen OOPS on module unload, from Eric Dumazet.\n\n12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.\n\n13) Cure division by zero in SFC driver, from Ben Hutchings.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)\n ks8851: Update link status during link change interrupt\n macvtap: restore vlan header on user read\n vhost-net: fix handle_rx buffer size\n bonding: don\u0027t increase rx_dropped after processing LACPDUs\n connector/userns: replace netlink uses of cap_raised() with capable()\n sctp: check cached dst before using it\n pktgen: fix crash at module unload\n Revert \"net: maintain namespace isolation between vlan and real device\"\n ehea: fix losing of NEQ events when one event occurred early\n igb: fix rtnl race in PM resume path\n ipv4: Do not use dead fib_info entries.\n r8169: fix unsigned int wraparound with TSO\n sfc: Fix division by zero when using one RX channel and no SR-IOV\n openvswitch: Validation of IPv6 set port action uses IPv4 header\n net: compare_ether_addr[_64bits]() has no ordering\n cdc_ether: Ignore bogus union descriptor for RNDIS devices\n bnx2x: bug fix when loading after SAN boot\n e1000: Silence sparse warnings by correcting type\n igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path\n openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n ...\n" }, { "commit": "e0268868ba064980488fc8c194db3d8e9fb2959c", "tree": "7b8bfb4cceb0a5d184a2fe651aab5aec59a216d3", "parents": [ "c57b54684060c8aced64a5b78ff69ff289af97b9" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri May 04 05:24:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:15:47 2012 -0400" }, "message": "sctp: check cached dst before using it\n\ndst_check() will take care of SA (and obsolete field), hence\nIPsec rekeying scenario is taken into account.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yaseivch \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c57b54684060c8aced64a5b78ff69ff289af97b9", "tree": "910e52b177da527183ddf4c29ccd90392b3039e3", "parents": [ "59b9997baba5242997ddc7bd96b1391f5275a5a4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 09 13:29:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:10:24 2012 -0400" }, "message": "pktgen: fix crash at module unload\n\ncommit 7d3d43dab4e9 (net: In unregister_netdevice_notifier unregister\nthe netdevices.) makes pktgen crashing at module unload.\n\n[ 296.820578] BUG: spinlock bad magic on CPU#6, rmmod/3267\n[ 296.820719] lock: ffff880310c38000, .magic: ffff8803, .owner: \u003cnone\u003e/-1, .owner_cpu: -1\n[ 296.820943] Pid: 3267, comm: rmmod Not tainted 3.4.0-rc5+ #254\n[ 296.821079] Call Trace:\n[ 296.821211] [\u003cffffffff8168a715\u003e] spin_dump+0x8a/0x8f\n[ 296.821345] [\u003cffffffff8168a73b\u003e] spin_bug+0x21/0x26\n[ 296.821507] [\u003cffffffff812b4741\u003e] do_raw_spin_lock+0x131/0x140\n[ 296.821648] [\u003cffffffff8169188e\u003e] _raw_spin_lock+0x1e/0x20\n[ 296.821786] [\u003cffffffffa00cc0fd\u003e] __pktgen_NN_threads+0x4d/0x140 [pktgen]\n[ 296.821928] [\u003cffffffffa00ccf8d\u003e] pktgen_device_event+0x10d/0x1e0 [pktgen]\n[ 296.822073] [\u003cffffffff8154ed4f\u003e] unregister_netdevice_notifier+0x7f/0x100\n[ 296.822216] [\u003cffffffffa00d2a0b\u003e] pg_cleanup+0x48/0x73 [pktgen]\n[ 296.822357] [\u003cffffffff8109528e\u003e] sys_delete_module+0x17e/0x2a0\n[ 296.822502] [\u003cffffffff81699652\u003e] system_call_fastpath+0x16/0x1b\n\nHold the pktgen_thread_lock while splicing pktgen_threads, and test\npktgen_exiting in pktgen_device_event() to make unload faster.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59b9997baba5242997ddc7bd96b1391f5275a5a4", "tree": "eaef6c0eff50403fcf871cdd4b7c4afa605f0541", "parents": [ "380ec964bc19f865af70c0339dff1cb75dc4f8f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "message": "Revert \"net: maintain namespace isolation between vlan and real device\"\n\nThis reverts commit 8a83a00b0735190384a348156837918271034144.\n\nIt causes regressions for S390 devices, because it does an\nunconditional DST drop on SKBs for vlans and the QETH device\nneeds the neighbour entry hung off the DST for certain things\non transmit.\n\nArnd can\u0027t remember exactly why he even needed this change.\n\nConflicts:\n\n\tdrivers/net/macvlan.c\n\tnet/8021q/vlan_dev.c\n\tnet/core/dev.c\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dccd9ecc374462e5d6a5b8f8110415a86c2213d8", "tree": "92985101d752308885e7b29678dc9845eabea0d6", "parents": [ "0e0c55165b638e96c8d7097ea638aa368daa268a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "message": "ipv4: Do not use dead fib_info entries.\n\nDue to RCU lookups and RCU based release, fib_info objects can\nbe found during lookup which have fi-\u003efib_dead set.\n\nWe must ignore these entries, otherwise we risk dereferencing\nthe parts of the entry which are being torn down.\n\nReported-by: Yevgen Pronenko \u003cyevgen.pronenko@sonymobile.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc46f9375a286d05f84a9464efc2b7f1f5614ff4", "tree": "8d7959826a254bbc51a5ad6d292d5d67d82dbacb", "parents": [ "ed3ac021e5038696fd38670e83219cea487f66be", "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull a NFS client bugfix from Trond Myklebust:\n \"Fix for the NFSv4 security negotiation: ensure that the security\n negotiation tries all registered security flavours\"\n\n* tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n auth_gss: the list of pseudoflavors not being parsed correctly\n" }, { "commit": "c5baa80ac879a3b38314f434c0a7255a2c2e4c86", "tree": "47b7f9e7ecedeacdcdcdbf89ac63b1d0093eebb6", "parents": [ "1c430a727fa512500a422ffe4712166c550ea06a", "072ae6314a191e3a9fc309b1e4e539ac7abc48ad" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n" }, { "commit": "420a95f37b73ecfdd89cd63f83d3369dbc4cb2ab", "tree": "02e82e7f7fc9bbbcf497700ffa899fbdc67ac87c", "parents": [ "896976df01f561dbbebf47e781d7688a1d617cca" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Fri Apr 27 12:57:39 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Tue May 08 12:51:06 2012 -0700" }, "message": "netfilter: xt_qtaguid: start tracking iface rx/tx at low level\n\nqtaguid tracks the device stats by monitoring when it goes up and down,\nthen it gets the dev_stats().\nBut devs don\u0027t correctly report stats (either they don\u0027t count headers\nsymmetrically between rx/tx, or they count internal control messages).\n\nNow qtaguid counts the rx/tx bytes/packets during raw:prerouting and\nmangle:postrouting (nat is not available in ipv6).\n\nThe results are in\n /proc/net/xt_qtaguid/iface_stat_fmt\nwhich outputs a format line (bash expansion):\n ifname total_skb_{rx,tx}_{bytes,packets}\n\nAdded event counters for pre/post handling.\nAdded extra ctrl_*() pid/uid debugging.\n\nChange-Id: Id84345d544ad1dd5f63e3842cab229e71d339297\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "896976df01f561dbbebf47e781d7688a1d617cca", "tree": "9c70a2921d11ae0ae4760cf27775a6eca749dbe8", "parents": [ "f02fac63308349b1dbde468adfd084fdb560eeae" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Thu Apr 26 23:28:35 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Tue May 08 12:47:56 2012 -0700" }, "message": "netfilter: xt_IDLETIMER: Add new netlink msg type\n\nSend notifications when the label becomes active after an idle period.\nSend netlink message notifications in addition to sysfs notifications.\nUsing a uevent with\n subsystem\u003dxt_idletimer\n INTERFACE\u003d...\n STATE\u003d{active,inactive}\n\nThis is backport from common android-3.0\ncommit: beb914e987cbbd368988d2b94a6661cb907c4d5a\nwith uevent support instead of a new netlink message type.\n\nChange-Id: I31677ef00c94b5f82c8457e5bf9e5e584c23c523\nSigned-off-by: Ashish Sharma \u003cashishsharma@google.com\u003e\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "a40eb7eceb5f5dda093ba17bc0e14575f71f42d2", "tree": "495d13c1f4ca5d772b319af03a370a0654bc96a5", "parents": [ "abe3c9c88f9cd1cbc5d3a3eec4bdbba6e3ce2107" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri May 04 11:24:59 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Tue May 08 11:36:28 2012 -0700" }, "message": "Bluetooth: Remove holding lock when sending A2MP message\n\nRemove holding the AMP manger list lock when sending the\nA2MP Change Notify message, as this uses L2CAP and will\nlock the socket and possibly sleep.\n\nThis removes a potential deadlock and a \"BUG: sleeping\nfunction called from invalid context\" message from the\nkernel log.\n\nChange-Id: Icf8c5afc1a5cde36517bb979820c83a20ee207fd\nCRs-fixed: 358736\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "f02fac63308349b1dbde468adfd084fdb560eeae", "tree": "35c39e5c3c70e40c52bc18c07a88dd7a1becb649", "parents": [ "6ff6845be02be8d53da28d2333a015d54b1234db", "d48b97b403d23f6df0b990cee652bdf9a52337a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc6\u0027 into android-3.4\n\nConflicts:\n\tarch/arm/mm/cache-l2x0.c\n\tarch/arm/mm/mmu.c\n\nChange-Id: If4f371a21c052fa597d107c44b128a093e4a8b91\n" }, { "commit": "6ff6845be02be8d53da28d2333a015d54b1234db", "tree": "131773e3e59a0c51bea05c18dc14f5fcd90b300b", "parents": [ "53013da67892f1a0e303a938816be47e3a10b1b1" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Apr 17 13:00:43 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:17:15 2012 -0700" }, "message": "Revert Bluetooth: Use the stored LTK for restabilishing security\n\nThis patch reverts commit b7d6cd72ce713a256406d47e798ea4797404d81e.\nThis patch was already applied upstream and then modified, then was\naccidentally applied again to the android-3.4 tree.\n\nChange-Id: I0c5a822f3f2a5b75564eeeb2598f13b7a149c58d\nReported-by: Andrey Konovalov \u003candrey.konovalov@linaro.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "072ae6314a191e3a9fc309b1e4e539ac7abc48ad", "tree": "d4bdf8e5c538cb1351f1cc462e65654646af7e8d", "parents": [ "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon May 07 17:21:53 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Mon May 07 17:23:10 2012 -0700" }, "message": "openvswitch: Validation of IPv6 set port action uses IPv4 header\n\nWhen the kernel validates set TCP/UDP port actions, it looks at\nthe ports in the existing flow to make sure that the L4 header exists.\nHowever, these actions always use the IPv4 version of the struct.\nFollowing patch fixes this by checking for flow ip protocol first.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "332472cb6cc8d889547a25a80a0cffdbe047d7f4", "tree": "d2758e0a44d9c378c9e106215b2d95611efdf014", "parents": [ "dafd5a663dd1f23bb5c4aff2243b1d7e3934b412" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Mon May 07 09:52:04 2012 -0700" }, "committer": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Mon May 07 10:05:28 2012 -0700" }, "message": "Bluetooth: Correctly configure L2CAP streaming mode header type\n\nIn order to support extended window sizes with L2CAP streaming mode,\nan extended window size option must be included in the outgoing\nconfiguration request when an application has requested a transmit\nwindow larger than the default transmit window.\n\nStreaming mode does not have a transmit window, so initialization of\nthe transmit window data structures was not taking place. However, the\ntransmit window socket option does trigger use of extended headers,\nwhich are required for full streaming mode support and\nqualification. Utilizing the existing transmit window initialization\ncode enables extended header use.\n\nCRs-fixed: 355437\nChange-Id: I7bf25b7a70bb2b68c0f5bfd42b2b46b99d68e990\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\n" }, { "commit": "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b", "tree": "071d9dfaa2cb307e0af570ae2455ce8deee9dbce", "parents": [ "bf32fecdc1851ad9ca960f56771b798d17c26cf1" ], "author": { "name": "Ansis Atteka", "email": "aatteka@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "message": "openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n\nThis patch fixes a possible lock-up bug where rtnl_lock might not\nget released.\n\nSigned-off-by: Ansis Atteka \u003caatteka@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "tree": "8322c9c14b0c7055ce924d12c1150d2acb0ea95e", "parents": [ "913a90416918a591e6d5ece036b795c58a08131d", "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 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) Transfer padding was wrong for full-speed USB in ASIX driver, fix\n from Ingo van Lil.\n\n 2) Propagate the negative packet offset fix into the PowerPC BPF JIT.\n From Jan Seiffert.\n\n 3) dl2k driver\u0027s private ioctls were letting unprivileged tasks make\n MII writes and other ugly bits like that. Fix from Jeff Mahoney.\n\n 4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.\n\n 5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and\n Julian Anastasov.\n\n 6) Fix races and sleeping in locked context bugs in drop_monitor, from\n Neil Horman.\n\n 7) Fix link status indication in smsc95xx driver, from Paolo Pisati.\n\n 8) Fix bridge netfilter OOPS, from Peter Huang.\n\n 9) L2TP sendmsg can return on error conditions with the socket lock\n held, oops. Fix from Sasha Levin.\n\n10) udp_diag should return meaningful values for socket memory usage,\n from Shan Wei.\n\n11) Eric Dumazet is so awesome he gets his own section:\n\n Socket memory cgroup code (I never should have applied those\n patches, grumble...) made erroneous changes to\n sk_sockets_allocated_read_positive(). It was changed to\n use percpu_counter_sum_positive (which requires BH disabling)\n instead of percpu_counter_read_positive (which does not).\n Revert back to avoid crashes and lockdep warnings.\n\n Adjust the default tcp_adv_win_scale and tcp_rmem[2] values\n to fix throughput regressions. This is necessary as a result\n of our more precise skb-\u003etruesize tracking.\n\n Fix SKB leak in netem packet scheduler.\n\n12) New device IDs for various bluetooth devices, from Manoj Iyer,\n AceLan Kao, and Steven Harms.\n\n13) Fix command completion race in ipw2200, from Stanislav Yakovlev.\n\n14) Fix rtlwifi oops on unload, from Larry Finger.\n\n15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.\n From Stephane Fillod.\n\n16) ehea driver registers it\u0027s IRQ before all the necessary state is\n setup, resulting in crashes. Fix from Thadeu Lima de Souza\n Cascardo.\n\n17) Fix PHY connection failures in davinci_emac driver, from Anatolij\n Gustschin.\n\n18) Missing break; in switch statement in bluetooth\u0027s\n hci_cmd_complete_evt(). Fix from Szymon Janc.\n\n19) Fix queue programming in iwlwifi, from Johannes Berg.\n\n20) Interrupt throttling defaults not being actually programmed into the\n hardware, fix from Jeff Kirsher and Ying Cai.\n\n21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from\n Benjamin Poirier.\n\n22) Fix blind status block RX producer pointer deref in TG3 driver, from\n Matt Carlson.\n\n23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de\n Souza Cascardo.\n\n24) Fix crashes in 6lowpan, from Alexander Smirnov.\n\n25) tcp_complete_cwr() needs to be careful to not rewind the CWND to\n ssthresh if ssthresh has the \"infinite\" value. Fix from Yuchung\n Cheng.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)\n sungem: Fix WakeOnLan\n tcp: change tcp_adv_win_scale and tcp_rmem[2]\n net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n drop_monitor: prevent init path from scheduling on the wrong cpu\n usbnet: fix failure handling in usbnet_probe\n usbnet: fix leak of transfer buffer of dev-\u003einterrupt\n ucc_geth: Add 16 bytes to max TX frame for VLANs\n net: ucc_geth, increase no. of HW RX descriptors\n netem: fix possible skb leak\n sky2: fix receive length error in mixed non-VLAN/VLAN traffic\n sky2: propogate rx hash when packet is copied\n net: fix two typos in skbuff.h\n cxgb3: Don\u0027t call cxgb_vlan_mode until q locks are initialized\n ixgbe: fix calling skb_put on nonlinear skb assertion bug\n ixgbe: Fix a memory leak in IEEE DCB\n igbvf: fix the bug when initializing the igbvf\n smsc75xx: enable mac to detect speed/duplex from phy\n smsc75xx: declare smsc75xx\u0027s MII as GMII capable\n smsc75xx: fix phy interrupt acknowledge\n smsc75xx: fix phy init reset loop\n ...\n" }, { "commit": "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c", "tree": "36cabe5902b163a66f94d7971ddba72d9aeaf0ff", "parents": [ "3617e5031b3acec04efaa36566a8111ac8f07325" ], "author": { "name": "Steve Dickson", "email": "steved@redhat.com", "time": "Thu May 03 11:47:08 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 03 12:35:33 2012 -0400" }, "message": "auth_gss: the list of pseudoflavors not being parsed correctly\n\ngss_mech_list_pseudoflavors() parses a list of registered mechanisms.\nOn that list contains a list of pseudo flavors which was not being\nparsed correctly, causing only the first pseudo flavor to be found.\n\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b49960a05e32121d29316cfdf653894b88ac9190", "tree": "101bb83073486809d5cc84505fecf772f4a77599", "parents": [ "84768edbb2721637620b2d84501bb0d5aed603f1" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed May 02 02:28:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:08:58 2012 -0400" }, "message": "tcp: change tcp_adv_win_scale and tcp_rmem[2]\n\ntcp_adv_win_scale default value is 2, meaning we expect a good citizen\nskb to have skb-\u003elen / skb-\u003etruesize ratio of 75% (3/4)\n\nIn 2.6 kernels we (mis)accounted for typical MSS\u003d1460 frame :\n1536 + 64 + 256 \u003d 1856 \u0027estimated truesize\u0027, and 1856 * 3/4 \u003d 1392.\nSo these skbs were considered as not bloated.\n\nWith recent truesize fixes, a typical MSS\u003d1460 frame truesize is now the\nmore precise :\n2048 + 256 \u003d 2304. But 2304 * 3/4 \u003d 1728.\nSo these skb are not good citizen anymore, because 1460 \u003c 1728\n\n(GRO can escape this problem because it build skbs with a too low\ntruesize.)\n\nThis also means tcp advertises a too optimistic window for a given\nallocated rcvspace : When receiving frames, sk_rmem_alloc can hit\nsk_rcvbuf limit and we call tcp_prune_queue()/tcp_collapse() too often,\nespecially when application is slow to drain its receive queue or in\ncase of losses (netperf is fast, scp is slow). This is a major latency\nsource.\n\nWe should adjust the len/truesize ratio to 50% instead of 75%\n\nThis patch :\n\n1) changes tcp_adv_win_scale default to 1 instead of 2\n\n2) increase tcp_rmem[2] limit from 4MB to 6MB to take into account\nbetter truesize tracking and to allow autotuning tcp receive window to\nreach same value than before. Note that same amount of kernel memory is\nconsumed compared to 2.6 kernels.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84768edbb2721637620b2d84501bb0d5aed603f1", "tree": "6b62fcfca8398296c12e8ebbd37985295ce698e0", "parents": [ "4fdcfa12843bca38d0c9deff70c8720e4e8f515f" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Wed May 02 03:58:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:04:33 2012 -0400" }, "message": "net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n\nl2tp_ip_sendmsg could return without releasing socket lock, making it all the\nway to userspace, and generating the following warning:\n\n[ 130.891594] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 130.894569] [ BUG: lock held when returning to user space! ]\n[ 130.897257] 3.4.0-rc5-next-20120501-sasha #104 Tainted: G W\n[ 130.900336] ------------------------------------------------\n[ 130.902996] trinity/8384 is leaving the kernel with locks still held!\n[ 130.906106] 1 lock held by trinity/8384:\n[ 130.907924] #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003cffffffff82b9503f\u003e] l2tp_ip_sendmsg+0x2f/0x550\n\nIntroduced by commit 2f16270 (\"l2tp: Fix locking in l2tp_ip.c\").\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fdcfa12843bca38d0c9deff70c8720e4e8f515f", "tree": "3ef2a92b1d6d322f9b72185e58b9d35a15564692", "parents": [ "a4723848d05dd31d298c551fb77ad28481309999" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue May 01 08:18:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:02:48 2012 -0400" }, "message": "drop_monitor: prevent init path from scheduling on the wrong cpu\n\nI just noticed after some recent updates, that the init path for the drop\nmonitor protocol has a minor error. drop monitor maintains a per cpu structure,\nthat gets initalized from a single cpu. Normally this is fine, as the protocol\nisn\u0027t in use yet, but I recently made a change that causes a failed skb\nallocation to reschedule itself . Given the current code, the implication is\nthat this workqueue reschedule will take place on the wrong cpu. If drop\nmonitor is used early during the boot process, its possible that two cpus will\naccess a single per-cpu structure in parallel, possibly leading to data\ncorruption.\n\nThis patch fixes the situation, by storing the cpu number that a given instance\nof this per-cpu data should be accessed from. In the case of a need for a\nreschedule, the cpu stored in the struct is assigned the rescheule, rather than\nthe currently executing cpu\n\nTested successfully by myself.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a94b6122f4f7a44dc1d6e6a5dfd2533cad7a3abf", "tree": "0f530e9175ad92040b1c1b3c445fa395a6031da9", "parents": [ "77664f29f52e153914812a1a82717e2e7f84bb98" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Thu Feb 23 16:07:10 2012 -0800" }, "committer": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Wed May 02 11:01:05 2012 -0700" }, "message": "Bluetooth: Add sockopts for LE Connection Params\n\nVarious LE profiles require very specific LE parameters for\nboth establishing and maintaining LE connections to remote\nperipherals. These LE only parameters are encapsulated into\na single sockopts structure, and may be passed from user space.\n\nCRs-Fixed: 335971\nChange-Id: I408edb97ab0fa9717c7d3fe5fc8ad6ac179a2fff\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "commit": "aadf030d84352a91cdadf50f947da739c5611450", "tree": "5f22ec57ee257776b4c157f0c91f3612f05ed6c5", "parents": [ "aad2732ba0dddcf3446a4e3c4843496759c1c305", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc5\u0027 into android-3.4\n" }, { "commit": "076e7779c07c56c7fa593a28c71ea7432d0c7c95", "tree": "70a4227b5d898c1abf37ed5779b0cd6f29b471bc", "parents": [ "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "tree": "f4b8561387b34fd4eec9b8a2d599937b2375d741", "parents": [ "e072b3fad5f3915102c94628b4971f52ff99dd05" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Apr 29 09:08:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 13:40:48 2012 -0400" }, "message": "netem: fix possible skb leak\n\nskb_checksum_help(skb) can return an error, we must free skb in this\ncase. qdisc_drop(skb, sch) can also be feeded with a NULL skb (if\nskb_unshare() failed), so lets use this generic helper.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0", "tree": "97742b014e6e85aabc03d84e7604ebf557d6a438", "parents": [ "4c1bcdb5a3354b250b82a67549f57ac27a3bb85f" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sun Apr 29 15:44:16 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 30 14:40:05 2012 -0400" }, "message": "mac80211: fix AP mode EAP tx for VLAN stations\n\nEAP frames for stations in an AP VLAN are sent on the main AP interface\nto avoid race conditions wrt. moving stations.\nFor that to work properly, sta_info_get_bss must be used instead of\nsta_info_get when sending EAP packets.\nPreviously this was only done for cooked monitor injected packets, so\nthis patch adds a check for tx-\u003eskb-\u003eprotocol to the same place.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1cebce36d660c83bd1353e41f3e66abd4686f215", "tree": "cd82ebc7c67f3d67e4de202dd3dafbb347f2324c", "parents": [ "05be18241e83d2ac6b656c8f924e74b3998c173f" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Mon Apr 30 06:00:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:44:39 2012 -0400" }, "message": "tcp: fix infinite cwnd in tcp_complete_cwr()\n\nWhen the cwnd reduction is done, ssthresh may be infinite\nif TCP enters CWR via ECN or F-RTO. If cwnd is not undone, i.e.,\nundo_marker is set, tcp_complete_cwr() falsely set cwnd to the\ninfinite ssthresh value. The correct operation is to keep cwnd\nintact because it has been updated in ECN or F-RTO.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5414fc12e32a0e0833ec61ba8be864c46cd19966", "tree": "ee196c526a87c126655624218969a191b60e365f", "parents": [ "3885ca785a3618593226687ced84f3f336dc3860", "6cf51852486af3d79f57bf46d00209a14244dbaa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "cbbb34498f8b2b26cbdc79532c8a2ee5cd1e756a", "tree": "faa27244aed8ab803846f85944775b0976a1975d", "parents": [ "71dfc5fa5160bb73752f0731539404569a77faca" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:52:40 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:58:51 2012 -0400" }, "message": "SUNRPC: RPC client must use the current utsname hostname string\n\nNow that the rpc client is namespace aware, it needs to use the\nutsname of the process that created it instead of using the\ninit_utsname. Both rpc_new_client and rpc_clone_client need to\nbe fixed.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\n" }, { "commit": "6cf51852486af3d79f57bf46d00209a14244dbaa", "tree": "4d7d7e19422e412bf4cb22100306fece93b8d498", "parents": [ "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Apr 27 02:00:50 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:36 2012 +0200" }, "message": "netfilter: xt_CT: fix wrong checking in the timeout assignment path\n\nThe current checking always succeeded. We have to check the first\ncharacter of the string to check that it\u0027s empty, thus, skipping\nthe timeout path.\n\nThis fixes the use of the CT target without the timeout option.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0", "tree": "7a57ad6ef5aa0147dd13bba8be9bd77ab60f3f50", "parents": [ "582b8e3eadaec77788c1aa188081a8d5059c42a6" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 07:47:44 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: kernel oops - do_ip_vs_get_ctl\n\nChange order of init so netns init is ready\nwhen register ioctl and netlink.\n\nVer2\n\tWhitespace fixes and __init added.\n\nReported-by: \"Ryan O\u0027Hara\" \u003crohara@redhat.com\u003e\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "582b8e3eadaec77788c1aa188081a8d5059c42a6", "tree": "57f869aac66f51e56499c06027c7d1055285600b", "parents": [ "4b984cd50bc1b6d492175cd77bfabb78e76ffa67" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:35 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: take care of return value from protocol init_netns\n\nip_vs_create_timeout_table() can return NULL\nAll functions protocol init_netns is affected of this patch.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4b984cd50bc1b6d492175cd77bfabb78e76ffa67", "tree": "f338dce013046c295f177ad190cd5c88040ee8cf", "parents": [ "39f618b4fd95ae243d940ec64c961009c74e3333" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:34 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:14 2012 +0200" }, "message": "ipvs: null check of net-\u003eipvs in lblc(r) shedulers\n\nAvoid crash when registering shedulers after\nthe IPVS core initialization for netns fails. Do this by\nchecking for present core (net-\u003eipvs).\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "a235e33c865813fa8ea7e72ef0f37e9c11ca0f1c", "tree": "533b0a6e4eca3d7c4941e64f869d1b41f4e5b5b3", "parents": [ "ca6fff81d8c5227515c70e1e60f7daa2e3e3da9c", "ff9718f8254b96dc313dd998c195c1c3769417ba" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Apr 28 03:54:54 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Apr 28 03:54:54 2012 -0700" }, "message": "Merge \"Bluetooth: Check for NULL pointer dereference\" into msm-3.0" }, { "commit": "3885ca785a3618593226687ced84f3f336dc3860", "tree": "a6b5af980c1295aaeee69749d4d79d47e072321a", "parents": [ "cde2e9a651b76d8db36ae94cd0febc82b637e5dd" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: Make updating data-\u003eskb smp safe\n\nEric Dumazet pointed out to me that the drop_monitor protocol has some holes in\nits smp protections. Specifically, its possible to replace data-\u003eskb while its\nbeing written. This patch corrects that by making data-\u003eskb an rcu protected\nvariable. That will prevent it from being overwritten while a tracepoint is\nmodifying it.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cde2e9a651b76d8db36ae94cd0febc82b637e5dd", "tree": "f38ea38cdde763a3a1d86412478dbcc9df892412", "parents": [ "651913ce9de2bbcedef608c5d6cf39c244248509" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: fix sleeping in invalid context warning\n\nEric Dumazet pointed out this warning in the drop_monitor protocol to me:\n\n[ 38.352571] BUG: sleeping function called from invalid context at kernel/mutex.c:85\n[ 38.352576] in_atomic(): 1, irqs_disabled(): 0, pid: 4415, name: dropwatch\n[ 38.352580] Pid: 4415, comm: dropwatch Not tainted 3.4.0-rc2+ #71\n[ 38.352582] Call Trace:\n[ 38.352592] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352599] [\u003cffffffff81063f2a\u003e] __might_sleep+0xca/0xf0\n[ 38.352606] [\u003cffffffff81655b16\u003e] mutex_lock+0x26/0x50\n[ 38.352610] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352616] [\u003cffffffff810b72d9\u003e] tracepoint_probe_register+0x29/0x90\n[ 38.352621] [\u003cffffffff8153a585\u003e] set_all_monitor_traces+0x105/0x170\n[ 38.352625] [\u003cffffffff8153a8ca\u003e] net_dm_cmd_trace+0x2a/0x40\n[ 38.352630] [\u003cffffffff8154a81a\u003e] genl_rcv_msg+0x21a/0x2b0\n[ 38.352636] [\u003cffffffff810f8029\u003e] ? zone_statistics+0x99/0xc0\n[ 38.352640] [\u003cffffffff8154a600\u003e] ? genl_rcv+0x30/0x30\n[ 38.352645] [\u003cffffffff8154a059\u003e] netlink_rcv_skb+0xa9/0xd0\n[ 38.352649] [\u003cffffffff8154a5f0\u003e] genl_rcv+0x20/0x30\n[ 38.352653] [\u003cffffffff81549a7e\u003e] netlink_unicast+0x1ae/0x1f0\n[ 38.352658] [\u003cffffffff81549d76\u003e] netlink_sendmsg+0x2b6/0x310\n[ 38.352663] [\u003cffffffff8150824f\u003e] sock_sendmsg+0x10f/0x130\n[ 38.352668] [\u003cffffffff8150abe0\u003e] ? move_addr_to_kernel+0x60/0xb0\n[ 38.352673] [\u003cffffffff81515f04\u003e] ? verify_iovec+0x64/0xe0\n[ 38.352677] [\u003cffffffff81509c46\u003e] __sys_sendmsg+0x386/0x390\n[ 38.352682] [\u003cffffffff810ffaf9\u003e] ? handle_mm_fault+0x139/0x210\n[ 38.352687] [\u003cffffffff8165b5bc\u003e] ? do_page_fault+0x1ec/0x4f0\n[ 38.352693] [\u003cffffffff8106ba4d\u003e] ? set_next_entity+0x9d/0xb0\n[ 38.352699] [\u003cffffffff81310b49\u003e] ? tty_ldisc_deref+0x9/0x10\n[ 38.352703] [\u003cffffffff8106d363\u003e] ? pick_next_task_fair+0x63/0x140\n[ 38.352708] [\u003cffffffff8150b8d4\u003e] sys_sendmsg+0x44/0x80\n[ 38.352713] [\u003cffffffff8165f8e2\u003e] system_call_fastpath+0x16/0x1b\n\nIt stems from holding a spinlock (trace_state_lock) while attempting to register\nor unregister tracepoint hooks, making in_atomic() true in this context, leading\nto the warning when the tracepoint calls might_sleep() while its taking a mutex.\nSince we only use the trace_state_lock to prevent trace protocol state races, as\nwell as hardware stat list updates on an rcu write side, we can just convert the\nspinlock to a mutex to avoid this problem.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f", "tree": "587ffa9493e4b6af014f9acb2c09177c2c54af3b", "parents": [ "afa762f6871a8cb05fbef5d0f83fac14304aa816", "985140369be1e886754d8ac0375dd64e4f727311" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "message": "Merge branch \u0027for-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth\n" }, { "commit": "ea8cfa06795bb30d2ea61f503ef129284492c06a", "tree": "48fb210bfaedbf1c488bc0b096f1591ce2c98495", "parents": [ "37629b572cc4e80fc24b4139a24df1a89415d534" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 27 13:00:17 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: traverse clients tree on PipeFS event\n\nv2: recursion was replaced by loop\n\nIf client is a clone, then it\u0027s parent can not be in the list.\nBut parent\u0027s Pipefs dentries have to be created and destroyed.\n\nNote: event skip helper for clients introduced\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "37629b572cc4e80fc24b4139a24df1a89415d534", "tree": "49d77495315e93ad187467837779f88073c37f15", "parents": [ "7aab449e5a2ebfa9c5116e87e16536bc4195e4de" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:56 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: set per-net PipeFS superblock before notification\n\nThere can be a case, when on MOUNT event RPC client (after it\u0027s dentries were\ncreated) is not longer hold by anyone except notification callback.\nI.e. on release this client will be destoroyed. And it\u0027s dentries have to be\ndestroyed as well. Which in turn requires per-net PipeFS superblock to be set.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7aab449e5a2ebfa9c5116e87e16536bc4195e4de", "tree": "c948a96ddd87c2ed708875c961c9e3577737ae08", "parents": [ "a4dff1bc492ee4a2184d384ae8b5bcab5859e150" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:18 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip clients with program without PipeFS entries\n\n1) This is sane.\n2) Otherwise there will be soft lockup:\n\ndo {\n\trpc_get_client_for_event (clnt-\u003ecl_dentry \u003d\u003d NULL \u003d\u003d\u003e choose)\n\t__rpc_pipefs_event (clnt-\u003ecl_program-\u003epipe_dir_name \u003d\u003d NULL \u003d\u003d\u003e return)\n} while (1)\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a4dff1bc492ee4a2184d384ae8b5bcab5859e150", "tree": "b6bdb438cfa7c041d6e0a7b42f8c10c213961215", "parents": [ "5794d21ef4639f0e33440927bb903f9598c21e92" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:11:02 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip dead but not buried clients on PipeFS events\n\nThese clients can\u0027t be safely dereferenced if their counter in 0.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "651913ce9de2bbcedef608c5d6cf39c244248509", "tree": "c2c25a9e8f5c1e8e29c81f857fcbdcb5c4945f64", "parents": [ "8b6efb75e9467f7c2df279cbd657f741ec3493cf" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Fri Apr 27 11:29:37 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 27 12:34:39 2012 -0400" }, "message": "tcp: clean up use of jiffies in tcp_rcv_rtt_measure()\n\nClean up a reference to jiffies in tcp_rcv_rtt_measure() that should\ninstead reference tcp_time_stamp. Since the result of the subtraction\nis passed into a function taking u32, this should not change any\nbehavior (and indeed the generated assembly does not change on\nx86_64). However, it seems worth cleaning this up for consistency and\nclarity (and perhaps to avoid bugs if this is copied and pasted\nsomewhere else).\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd0861c34d3ec2fd752791b0bc4268aa0070db2b", "tree": "8bd00106b9a4f362e04ff853b9a6b8ebb266caec", "parents": [ "e1dce2ee8e267b0c58557c830cd71d2ac28ea02f", "27a795c692e36a4c14c34531d105f270f3340418" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Apr 27 03:46:04 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Apr 27 03:46:04 2012 -0700" }, "message": "Merge \"Bluetooth: Specify underlying ACL security for connected sockets\" into msm-3.0" }, { "commit": "ff9718f8254b96dc313dd998c195c1c3769417ba", "tree": "30d1e625bc2b0eba91d76e8467d45d05b9de3714", "parents": [ "d7630b566fd314f3f4f778ce55a3b02929679d3d" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Thu Apr 26 16:17:50 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Thu Apr 26 17:15:23 2012 -0700" }, "message": "Bluetooth: Check for NULL pointer dereference\n\nPossible for l2cap_logical_link_complete handler to be scheduled\ntwice with mis-behaving PAL. Since handler clears the socket pointer\nmust check for NULL socket pointer.\n\nThis fixes an infrequent crash when performing OPP or FTP transfer\nover AMP (Bluetooth 3.0+HS).\n\nCRs-fixed: 355451\nChange-Id: I2e78529f4f1e3b411af13fe6a68a49e724a581ee\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "8a5e928f3d3d4c937f6faa2896668a2168dbdc38", "tree": "93ebb3c9406a2d37a0380fbd9dcc6d234f453e13", "parents": [ "48f19622bc11dd36dddba3fd5eb14dff11ba000b", "2b990717cafa7d97f115712bd2717957b9509813" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Apr 26 13:50:56 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu Apr 26 13:50:56 2012 -0700" }, "message": "Merge changes I13b16c71,Ic8d75e49 into msm-3.0\n\n* changes:\n nl80211: Add probe response offload attribute\n nl80211: advertise device AP SME\n" }, { "commit": "ca073fb0ae39ea974a3df3bded50349b26f6aa52", "tree": "1d6e52263303784a13b38fdecedc8869cda8d5fd", "parents": [ "d32536da4314d4493da4b990286e728ba133cb0d", "384ec676d795b5328e7f1b20d436d47d2d89ea5f" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Apr 26 07:52:21 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu Apr 26 07:52:21 2012 -0700" }, "message": "Merge \"Bluetooth: Stability fix: dev locking\" into msm-3.0" }, { "commit": "768f7c7c121e80f458a9d013b2e8b169e5dfb1e5", "tree": "dab910f7034bdb550e9b4f91f60045e64986e500", "parents": [ "8deff4af8745561efd2be34ee30cc57a6f0107c6" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: add missing spin_lock_init()\n\nAdd missing spin_lock_init() for frames list lock.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8deff4af8745561efd2be34ee30cc57a6f0107c6", "tree": "d2b3aaa6d55258ff020687c50d4122e6aebef963", "parents": [ "0848e4043014631d792a66266d6d7d64a7f21da5" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: clean up fragments list if module unloaded\n\nClean all the pending fragments and relative timers if 6lowpan link\nis going to be deleted.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0848e4043014631d792a66266d6d7d64a7f21da5", "tree": "ebaba22fad4a214419140ad021ecb797d2e9ddb1", "parents": [ "8fdd2e25fb0cf82c8af62235366fe1a223c80752" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: fix segmentation fault caused by mlme request\n\nAdd nescesary mlme callbacks to satisfy \"iz list\" request from user space.\nDue to 6lowpan device doesn\u0027t have its own phy, mlme implemented as a pipe\nto a real phy to which 6lowpan is attached.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "39f618b4fd95ae243d940ec64c961009c74e3333", "tree": "f96ef28f9d3ff364da1710f32ff44c31873fb714", "parents": [ "8d08d71ce59438a6ef06be5db07966e0c144b74e" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Wed Apr 25 00:29:58 2012 +0300" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Apr 26 15:26:35 2012 +0900" }, "message": "ipvs: reset ipvs pointer in netns\n\n\tMake sure net-\u003eipvs is reset on netns cleanup or failed\ninitialization. It is needed for IPVS applications to know that\nIPVS core is not loaded in netns.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "8d08d71ce59438a6ef06be5db07966e0c144b74e", "tree": "804e30b7bd516ff39f6f6656fc760ea8db993ead", "parents": [ "8f9b9a2fad47af27e14b037395e03cd8278d96d7" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Wed Apr 25 00:29:59 2012 +0300" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Apr 26 15:26:35 2012 +0900" }, "message": "ipvs: add check in ftp for initialized core\n\n\tAvoid crash when registering ip_vs_ftp after\nthe IPVS core initialization for netns fails. Do this by\nchecking for present core (net-\u003eipvs).\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "2300fd67b4f29eec19addb15a8571837228f63fc", "tree": "5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76", "parents": [ "86ec090e58fca1025676e775093a87ab699f7f4d", "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix NFSv4 infinite loops on open(O_TRUNC)\n - Fix an Oops and an infinite loop in the NFSv4 flock code\n - Don\u0027t register the PipeFS filesystem until it has been set up\n - Fix an Oops in nfs_try_to_update_request\n - Don\u0027t reuse NFSv4 open owners: fixes a bad sequence id storm.\n\n* tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Keep dropped state owners on the LRU list for a while\n NFSv4: Ensure that we don\u0027t drop a state owner more than once\n NFSv4: Ensure we do not reuse open owner names\n nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n NFS: put open context on error in nfs_flush_multi\n NFS: put open context on error in nfs_pagein_multi\n NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n NFSv4: Ensure that we check lock exclusive/shared type against open modes\n NFSv4: Ensure that the LOCK code sets exception-\u003einode\n NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n SUNRPC: register PipeFS file system after pernet sybsystem\n" }, { "commit": "62ad6fcd743792bf294f2a7ba26ab8f462065150", "tree": "6c8a4302149d69c5cd3933bbf09a7da5b148780e", "parents": [ "202149265770426f0965557ffa0b500fbbd701dd" ], "author": { "name": "Shan Wei", "email": "davidshan@tencent.com", "time": "Tue Apr 24 18:15:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 25 20:43:01 2012 -0400" }, "message": "udp_diag: implement idiag_get_info for udp/udplite to get queue information\n\nWhen we use netlink to monitor queue information for udp socket,\nidiag_rqueue and idiag_wqueue of inet_diag_msg are returned with 0.\n\nKeep consistent with netstat, just return back allocated rmem/wmem size.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3e99df93dcd2cc8806ce9f9833aba93d75c841f", "tree": "a488126575c694b97a5898045ba50cb4ca0604fe", "parents": [ "759104cab29dfd6bbb7d6b2340e2a0eef48ea0eb" ], "author": { "name": "Ankit Verma", "email": "ankitv@codeaurora.org", "time": "Wed Apr 25 15:42:04 2012 -0700" }, "committer": { "name": "Ankit Verma", "email": "ankitv@codeaurora.org", "time": "Wed Apr 25 15:52:31 2012 -0700" }, "message": "Bluetooth: Better locking when tearing down an HCI connection.\n\nRestarting Riva will abruptly disconnect the hci device, which can\ntear down the hci_conn struct on one processor while RFCOMM code\nis running on another. This would keep l2cap_chan_del from being\nexecuted while RFCOMM is in the middle of using a socket.\n\nCRs-fixed: 351273\nChange-Id: I37c82cac022a1d1c0fd60791f7c15b56e2415850\nSigned-off-by: Ankit Verma \u003cankitv@codeaurora.org\u003e\n" }, { "commit": "395836282f7cf8b1dac9b9c2aa2bacddfa1580b5", "tree": "5b1585dbe4f9525d54d5256875a8f038a78d0c05", "parents": [ "2a5809499e35b53a6044fd34e72b242688b7a862", "afa762f6871a8cb05fbef5d0f83fac14304aa816" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 25 13:41:25 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 25 13:41:25 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "27a795c692e36a4c14c34531d105f270f3340418", "tree": "37d755eb36bd22c73780fe63fd0b57031d8f9195", "parents": [ "868a0786271fb77f5f75bf1fbefad2d662de07f9" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Thu Apr 19 11:05:06 2012 -0700" }, "committer": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Wed Apr 25 09:00:30 2012 -0700" }, "message": "Bluetooth: Specify underlying ACL security for connected sockets\n\nOn LE connections, either side may request security elevation. This\npatch propogates the secuity level being requested by remote devices\nto local servers and clients.\n\nCRs-Fixed: 352637\n\nChange-Id: Ia9ada039f0fef03c35c19d90b415423117e00e9a\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "commit": "8f9b9a2fad47af27e14b037395e03cd8278d96d7", "tree": "5b2d738403991a960ef341ff122f5f03c9b21758", "parents": [ "7118c07a844d367560ee91adb2071bde2fabcdbf" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 18:08:43 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Apr 25 11:16:30 2012 +0200" }, "message": "ipvs: fix crash in ip_vs_control_net_cleanup on unload\n\n\tcommit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39)\n(\"Add __ip_vs_control_{init,cleanup}_sysctl()\")\nintroduced regression due to wrong __net_init for\n__ip_vs_control_cleanup_sysctl. This leads to crash when\nthe ip_vs module is unloaded.\n\n\tFix it by changing __net_init to __net_exit for\nthe function that is already renamed to ip_vs_control_net_cleanup_sysctl.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "7118c07a844d367560ee91adb2071bde2fabcdbf", "tree": "baaba6f805195e3af22a62332b832e771d93bca7", "parents": [ "6ba900676bec8baaf61aa2f85b7345c0e65774d9" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sat Apr 14 12:37:46 2012 -0400" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Apr 25 11:16:12 2012 +0200" }, "message": "ipvs: Verify that IP_VS protocol has been registered\n\nThe registration of a protocol might fail, there were no checks\nand all registrations were assumed to be correct. This lead to\nNULL ptr dereferences when apps tried registering.\n\nFor example:\n\n[ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018\n[ 1293.227038] IP: [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0\n[ 1293.227038] Oops: 0000 [#1] PREEMPT SMP\n[ 1293.227038] CPU 1\n[ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57\n[ 1293.227038] RIP: 0010:[\u003cffffffff822aacb0\u003e] [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286\n[ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000\n[ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282\n[ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000\n[ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668\n[ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000\n[ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000\n[ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0\n[ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000)\n[ 1293.227038] Stack:\n[ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580\n[ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b\n[ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580\n[ 1293.227038] Call Trace:\n[ 1293.227038] [\u003cffffffff822a716b\u003e] ip_vs_app_inc_new+0xdb/0x180\n[ 1293.227038] [\u003cffffffff822a7258\u003e] register_ip_vs_app_inc+0x48/0x70\n[ 1293.227038] [\u003cffffffff822b2fea\u003e] __ip_vs_ftp_init+0xba/0x140\n[ 1293.227038] [\u003cffffffff821c9060\u003e] ops_init+0x80/0x90\n[ 1293.227038] [\u003cffffffff821c90cb\u003e] setup_net+0x5b/0xe0\n[ 1293.227038] [\u003cffffffff821c9416\u003e] copy_net_ns+0x76/0x100\n[ 1293.227038] [\u003cffffffff810dc92b\u003e] create_new_namespaces+0xfb/0x190\n[ 1293.227038] [\u003cffffffff810dca21\u003e] unshare_nsproxy_namespaces+0x61/0x80\n[ 1293.227038] [\u003cffffffff810afd1f\u003e] sys_unshare+0xff/0x290\n[ 1293.227038] [\u003cffffffff8187622e\u003e] ? trace_hardirqs_on_thunk+0x3a/0x3f\n[ 1293.227038] [\u003cffffffff82665539\u003e] system_call_fastpath+0x16/0x1b\n[ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 \u003c66\u003e 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d\n[ 1293.227038] RIP [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] RSP \u003cffff880038c1dd18\u003e\n[ 1293.227038] CR2: 0000000000000018\n[ 1293.379284] ---[ end trace 364ab40c7011a009 ]---\n[ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "384ec676d795b5328e7f1b20d436d47d2d89ea5f", "tree": "6711ce80212a6783178a40c9dc1614c6bf0a5a73", "parents": [ "868a0786271fb77f5f75bf1fbefad2d662de07f9" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Thu Mar 08 18:41:15 2012 -0800" }, "committer": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Tue Apr 24 12:03:19 2012 -0700" }, "message": "Bluetooth: Stability fix: dev locking\n\nThe hci_dev should be locked/unlocked with the _bh form of\nthe spin lock, and function may not return while lock is held.\n\nChange-Id: I2179a59506c2b212db5fb5b57bc27bff165b2cc6\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "commit": "afa762f6871a8cb05fbef5d0f83fac14304aa816", "tree": "170556b5b27b7028ded1600358439dc66e18ebbb", "parents": [ "78cbcf2b9dbe0565820dc7721316f9c401000a68" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Mon Apr 23 14:45:15 2012 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 24 14:42:42 2012 -0400" }, "message": "mac80211: call ieee80211_mgd_stop() on interface stop\n\nieee80211_mgd_teardown() is called on netdev removal, which\noccurs after the vif was already removed from the low-level\ndriver, resulting in the following warning:\n\n[ 4809.014734] ------------[ cut here ]------------\n[ 4809.019861] WARNING: at net/mac80211/driver-ops.h:12 ieee80211_bss_info_change_notify+0x200/0x2c8 [mac80211]()\n[ 4809.030388] wlan0: Failed check-sdata-in-driver check, flags: 0x4\n[ 4809.036862] Modules linked in: wlcore_sdio(-) wl12xx wlcore mac80211 cfg80211 [last unloaded: cfg80211]\n[ 4809.046849] [\u003cc001bd4c\u003e] (unwind_backtrace+0x0/0x12c)\n[ 4809.055937] [\u003cc047cf1c\u003e] (dump_stack+0x20/0x24)\n[ 4809.065385] [\u003cc003e334\u003e] (warn_slowpath_common+0x5c/0x74)\n[ 4809.075589] [\u003cc003e408\u003e] (warn_slowpath_fmt+0x40/0x48)\n[ 4809.088291] [\u003cbf033630\u003e] (ieee80211_bss_info_change_notify+0x200/0x2c8 [mac80211])\n[ 4809.102844] [\u003cbf067f84\u003e] (ieee80211_destroy_auth_data+0x80/0xa4 [mac80211])\n[ 4809.116276] [\u003cbf068004\u003e] (ieee80211_mgd_teardown+0x5c/0x74 [mac80211])\n[ 4809.129331] [\u003cbf043f18\u003e] (ieee80211_teardown_sdata+0xb0/0xd8 [mac80211])\n[ 4809.141595] [\u003cc03b5e58\u003e] (rollback_registered_many+0x228/0x2f0)\n[ 4809.153056] [\u003cc03b5f48\u003e] (unregister_netdevice_many+0x28/0x50)\n[ 4809.165696] [\u003cbf041ea8\u003e] (ieee80211_remove_interfaces+0xb4/0xdc [mac80211])\n[ 4809.179151] [\u003cbf032174\u003e] (ieee80211_unregister_hw+0x50/0xf0 [mac80211])\n[ 4809.191043] [\u003cbf0bebb4\u003e] (wlcore_remove+0x5c/0x7c [wlcore])\n[ 4809.201491] [\u003cc02c6918\u003e] (platform_drv_remove+0x24/0x28)\n[ 4809.212029] [\u003cc02c4d50\u003e] (__device_release_driver+0x8c/0xcc)\n[ 4809.222738] [\u003cc02c4e84\u003e] (device_release_driver+0x30/0x3c)\n[ 4809.233099] [\u003cc02c4258\u003e] (bus_remove_device+0x10c/0x128)\n[ 4809.242620] [\u003cc02c26f8\u003e] (device_del+0x11c/0x17c)\n[ 4809.252150] [\u003cc02c6de0\u003e] (platform_device_del+0x28/0x68)\n[ 4809.263051] [\u003cbf0df49c\u003e] (wl1271_remove+0x3c/0x50 [wlcore_sdio])\n[ 4809.273590] [\u003cc03806b0\u003e] (sdio_bus_remove+0x48/0xf8)\n[ 4809.283754] [\u003cc02c4d50\u003e] (__device_release_driver+0x8c/0xcc)\n[ 4809.293729] [\u003cc02c4e2c\u003e] (driver_detach+0x9c/0xc4)\n[ 4809.303163] [\u003cc02c3d7c\u003e] (bus_remove_driver+0xc4/0xf4)\n[ 4809.312973] [\u003cc02c5a98\u003e] (driver_unregister+0x70/0x7c)\n[ 4809.323220] [\u003cc03809c4\u003e] (sdio_unregister_driver+0x24/0x2c)\n[ 4809.334213] [\u003cbf0df458\u003e] (wl1271_exit+0x14/0x1c [wlcore_sdio])\n[ 4809.344930] [\u003cc009b1a4\u003e] (sys_delete_module+0x228/0x2a8)\n[ 4809.354734] ---[ end trace 515290ccf5feb522 ]---\n\nRename ieee80211_mgd_teardown() to ieee80211_mgd_stop(),\nand call it on ieee80211_do_stop().\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "16cde9931bcd8d8ca968ef1cded02684ea040374", "tree": "1ecdedcee16e1bb04f22765d6299e1f17386f514", "parents": [ "ac71311e65e2c4c2dbac76db698fecbee755b016" ], "author": { "name": "Szymon Janc", "email": "szymon.janc@tieto.com", "time": "Fri Apr 13 12:32:42 2012 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Tue Apr 24 11:38:41 2012 -0300" }, "message": "Bluetooth: Fix missing break in hci_cmd_complete_evt\n\nCommand complete event for HCI_OP_USER_PASSKEY_NEG_REPLY would result\nin calling handler function also for HCI_OP_LE_SET_SCAN_PARAM. This\ncould result in undefined behaviour.\n\nSigned-off-by: Szymon Janc \u003cszymon.janc@tieto.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "a881e963c7fe1f226e991ee9bbe8907acda93294", "tree": "5d2b2c01097300377821132f743cddd4fc90fed6", "parents": [ "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "Peter Huang (Peng)", "email": "peter.huangpeng@huawei.com", "time": "Thu Apr 19 20:12:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 24 00:16:24 2012 -0400" }, "message": "set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nbridge: set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nwhen bridge is deleted before tap/vif device\u0027s delete, kernel may\nencounter an oops because of NULL reference to fake_rtable\u0027s dst.\nSet fake_rtable\u0027s dst to NULL before sending packets out can solve\nthis problem.\n\nv4 reformat, change br_drop_fake_rtable(skb) to {}\n\nv3 enrich commit header\n\nv2 introducing new flag DST_FAKE_RTABLE to dst_entry struct.\n\n[ Use \"do { } while (0)\" for nop br_drop_fake_rtable()\n implementation -DaveM ]\n\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Peter Huang \u003cpeter.huangpeng@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b990717cafa7d97f115712bd2717957b9509813", "tree": "0705131bb4154018547573f4575dbed90e9a16b2", "parents": [ "a86a02fb86538076001f9c23e491baaf776d56e7" ], "author": { "name": "Deepthi Gowri", "email": "deepthi@codeaurora.org", "time": "Mon Apr 23 20:31:08 2012 +0530" }, "committer": { "name": "Deepthi Gowri", "email": "deepthi@codeaurora.org", "time": "Mon Apr 23 20:31:08 2012 +0530" }, "message": "nl80211: Add probe response offload attribute\n\nNotify user-space about probe-response offloading support in the driver.\nA wiphy flag is used to indicate support and a bitmap of protocols\ndetermines which protocols are supported.\n\nChange-Id: I13b16c71449ab61f4308b6caa1cca35529f905b4\nSigned-off-by: Deepthi Gowri \u003cdeepthi@codeaurora.org\u003e\n" }, { "commit": "a86a02fb86538076001f9c23e491baaf776d56e7", "tree": "242cf03d012b4a1b5f72d2fe642ffee84a93cb20", "parents": [ "d41707f4211d9b6e40e4a972035d90d0db38a988" ], "author": { "name": "Deepthi Gowri", "email": "deepthi@codeaurora.org", "time": "Mon Apr 23 19:27:30 2012 +0530" }, "committer": { "name": "Deepthi Gowri", "email": "deepthi@codeaurora.org", "time": "Mon Apr 23 20:27:09 2012 +0530" }, "message": "nl80211: advertise device AP SME\n\nAdd the ability to advertise that the device contains the AP SME and\nwhat features it can support.There are currently no features in the\nbitmap -- probe response offload will be advertised by a few patches\nArik is working on now (who took over from Guy Eilam) and a device\nwith AP SME will typically implement and require response offload.\n\nChange-Id: Ic8d75e4933d795d43a0c30df6ec187f4d0ab6d8c\nSigned-off-by: Deepthi Gowri \u003cdeepthi@codeaurora.org\u003e\n" }, { "commit": "d135c522f1234f62e81be29cebdf59e9955139ad", "tree": "7e151f3995d6a30499c2bec2c07b2bf68754788e", "parents": [ "163faf31778e536ac6125bc8b14f4667adc910e9" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sun Apr 22 09:45:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 22 17:09:35 2012 -0400" }, "message": "tcp: fix TCP_MAXSEG for established IPv6 passive sockets\n\nCommit f5fff5d forgot to fix TCP_MAXSEG behavior IPv6 sockets, so IPv6\nTCP server sockets that used TCP_MAXSEG would find that the advmss of\nchild sockets would be incorrect. This commit mirrors the advmss logic\nfrom tcp_v4_syn_recv_sock in tcp_v6_syn_recv_sock. Eventually this\nlogic should probably be shared between IPv4 and IPv6, but this at\nleast fixes this issue.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbe362be5368b9f531b95a4a9b502ae2832e1dac", "tree": "6f31a927c4224e5366d97c621362020ccf7dd689", "parents": [ "e8195b24feb208f6e944e7542779f4397776794d" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Apr 19 07:16:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 16:28:38 2012 -0400" }, "message": "drop_monitor: allow more events per second\n\nIt seems there is a logic error in trace_drop_common(), since we store\nonly 64 drops, even if they are from same location.\n\nThis fix is a one liner, but we probably need more work to avoid useless\natomic dec/inc\n\nNow I can watch 1 Mpps drops through dropwatch...\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "48584718bcf6d82c427b4bfd6714077adfc15fe0", "tree": "2ee368dee8b52bf9d2dffafa4ba2ddfea5b30a54", "parents": [ "02cbdf8034c140cccc5f5e54f694c0484f780162" ], "author": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Fri Apr 20 15:47:58 2012 +0530" }, "committer": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Fri Apr 20 15:59:44 2012 +0530" }, "message": "Bluetooth: If link is encrypted, do not send encrpt link request\n\nWhen BT2.1 link is in encrypted state, if HOST posts\nSET_CONNECTION_ENCRYPTION with enable as on, in some cases\nSoC fails to generate ENCRYPT_CHANGE event. Since the link is\nalready in encrypted state with current link key, HOST can avoid\nrepeated request for encrypting the link while doing service level\nauthentication. This patch avoids the repeated request for encrypting\nthe link after service level authentication from HOST, if the link\nis already encrypted by current link key.\n\nChange-Id: I9402d64310f0e4e6240ca6ed610e0108de061a12\nSigned-off-by: Prabhakaran Mc \u003cprabhakaranmc@codeaurora.org\u003e\n" }, { "commit": "ab2965eefef95a2eecfd54c12b0eb243162862e9", "tree": "c947fdc158e144c2d060486b65d10ee67d254039", "parents": [ "a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595", "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc3\u0027 into android-3.4\n\nConflicts:\n\tdrivers/staging/android/lowmemorykiller.c\n\nChange-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306\n" }, { "commit": "3adadc08cc1e2cbcc15a640d639297ef5fcb17f5", "tree": "20990c83f62157caf753736e63ea98548404a954", "parents": [ "996f73937cd85031da8dbcd3222a710cb762d428" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Apr 18 16:11:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 15:37:48 2012 -0400" }, "message": "net ax25: Reorder ax25_exit to remove races.\n\nWhile reviewing the sysctl code in ax25 I spotted races in ax25_exit\nwhere it is possible to receive notifications and packets after already\nfreeing up some of the data structures needed to process those\nnotifications and updates.\n\nCall unregister_netdevice_notifier early so that the rest of the cleanup\ncode does not need to deal with network devices. This takes advantage\nof my recent enhancement to unregister_netdevice_notifier to send\nunregister notifications of all network devices that are current\nregistered.\n\nMove the unregistration for packet types, socket types and protocol\ntypes before we cleanup any of the ax25 data structures to remove the\npossibilities of other races.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f32d982aa5f8eb55304505a36602879c93766068", "tree": "62a780e4f76c267e42ff50ffff0614bf79177cbf", "parents": [ "be8ee19082a253eca97b1d7e07e79fab70717a3b" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Mon Apr 09 17:52:01 2012 -0700" }, "committer": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Wed Apr 18 14:58:04 2012 -0700" }, "message": "Bluetooth: Change locking function for process context code\n\nCode executing in process context should use hci_dev_lock_bh()\nand hci_dev_unlock_bh() instead of hci_dev_lock/hci_dev_unlock\nwhen dealing with the hci_dev lock so that it cannot be\ninterrupted while the lock is held.\n\nChange-Id: Iebc2da96837db29ab4911b0429399e3e9ba4b93e\nCRs-fixed: 350532\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n" }, { "commit": "22b4a4f22da4b39c6f7f679fd35f3d35c91bf851", "tree": "6cd9d5d169384e39c030e18f75c1b1e0d792e5bd", "parents": [ "56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Apr 18 10:14:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 16:52:45 2012 -0400" }, "message": "tcp: fix retransmit of partially acked frames\n\nAlexander Beregalov reported skb_over_panic errors and provided stack\ntrace.\n\nI occurs commit a21d45726aca (tcp: avoid order-1 allocations on wifi and\ntx path) added a regression, when a retransmit is done after a partial\nACK.\n\ntcp_retransmit_skb() tries to aggregate several frames if the first one\nhas enough available room to hold the following ones payload. This is\ncontrolled by /proc/sys/net/ipv4/tcp_retrans_collapse tunable (default :\nenabled)\n\nProblem is we must make sure _pskb_trim_head() doesnt fool\nskb_availroom() when pulling some bytes from skb (this pull is done when\nreceiver ACK part of the frame).\n\nReported-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nCc: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b8e586dd5954841c39be70f185bb391fd5dcb29d", "tree": "e0a36c4933d198258748adfd6bd0f2e73b296a1c", "parents": [ "e78f8cd270d3af681f4084764cb47206c52cf124" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Tue Apr 17 16:00:07 2012 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Wed Apr 18 13:15:29 2012 -0700" }, "message": "netfilter: xt_qtaguid: fix ipv6 protocol lookup\n\nWhen updating the stats for a given uid it would incorrectly assume\nIPV4 and pick up the wrong protocol when IPV6.\n\nChange-Id: Iea4a635012b4123bf7aa93809011b7b2040bb3d5\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "e78f8cd270d3af681f4084764cb47206c52cf124", "tree": "0e01bed72892c8359e8c283633733d8146e35ecc", "parents": [ "7e08da1fab9c184a9e4b1f640e0100b6e92a3e0b" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Fri Apr 13 19:22:35 2012 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Wed Apr 18 13:15:22 2012 -0700" }, "message": "netfilter: qtaguid: initialize a local var to keep compiler happy.\n\nThere was a case that might have seemed like new_tag_stat was not\ninitialized and actually used.\nAdded comment explaining why it was impossible, and a BUG()\nin case the logic gets changed.\n\nChange-Id: I1eddd1b6f754c08a3bf89f7e9427e5dce1dfb081\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47", "tree": "cb367e928baae532e552dd285700a9fb1f290391", "parents": [ "b922934d017f1cc831b017913ed7d1a56c558b43", "dbd717e37bf1409fd250d13aef2cab07bcae8c88" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 15:26:52 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 15:26:52 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nFrom John:\n\nAnother batch of fixes intended for 3.4...\n\nFirst up, we have a minor signedness fix for libertas from Amitkumar\nKarwar. Next, Arend gives us a brcm80211 fix for correctly enabling\nTx FIFOs on channels 12 and 13. Bing Zhao gives us some register\naddress corrections for mwifiex. Felix give us a trio of fixes --\none for ath9k to wake the hardware properly from full sleep, one for\nmac80211 to properly handle packets in cooked monitor mode, and one\nfor ensuring that the proper HT mode selection is honored.\n\nHauke gives us a bcma fix for handling the lack of an sprom. Jonathon\nBither gives us an ath5k fix for a missing THIS_MODULE build issue,\nand another ath5k fix for an io mapping leak. Lukasz Kucharczyk\nfixes a bitwise check in cfg80211, and Sujith gives us an ath9k fix\nfor assigning sequence numbers for fragmented frames. Finally, we\nhave a MAINTAINERS change from Wey-Yi Guy -- congrats to Johannes\nBerg for taking the lead on iwlwifi. :-)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbd717e37bf1409fd250d13aef2cab07bcae8c88", "tree": "1e8c0b94388bf7a5822a49ff3c47bddc06382c2b", "parents": [ "9fe5642f4a3b13beb43c2633db7df22dd9d99250", "fd09c85fe15aa66a69f091ba178817d5ef82476d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 13:37:33 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 13:37:33 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "adae0fe0ea87e8fb1a72dde304937c60759b495f", "tree": "27cab6b39b71e4264779a3123b62d49e6afb0a17", "parents": [ "6c216ec636f75d834461be15f83ec41a6759bd2b" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Thu Apr 05 21:04:37 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 11:05:48 2012 -0400" }, "message": "SUNRPC: register PipeFS file system after pernet sybsystem\n\nPipeFS superblock creation routine relays on SUNRPC pernet data presense, which\nis created on register_pernet_subsys() call in SUNRPC module init function.\nRegistering of PipeFS filesystem prior to registering of per-net subsystem\nleads to races (mount of PipeFS can dereference uninitialized data).\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b922934d017f1cc831b017913ed7d1a56c558b43", "tree": "6d0d08fc459a3eb2d36bccea023059ef76b90dfe", "parents": [ "9fe5642f4a3b13beb43c2633db7df22dd9d99250" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Apr 16 04:43:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 00:05:33 2012 -0400" }, "message": "netns: do not leak net_generic data on failed init\n\nops_init should free the net_generic data on\ninit failure and __register_pernet_operations should not\ncall ops_free when NET_NS is not enabled.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nReviewed-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4d846f02392a710f9604892ac3329e628e60a230", "tree": "8c8a8cd663914e546b324d0657fdfad2c8becdee", "parents": [ "48159f009f5f92ef5962e7c278ac615d74242fa5" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 16 23:28:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:32:00 2012 -0400" }, "message": "tcp: fix tcp_grow_window() for large incoming frames\n\ntcp_grow_window() has to grow rcv_ssthresh up to window_clamp, allowing\nsender to increase its window.\n\ntcp_grow_window() still assumes a tcp frame is under MSS, but its no\nlonger true with LRO/GRO.\n\nThis patch fixes one of the performance issue we noticed with GRO on.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6741e7f048dacc92e37c5d724ff5c64e45f6c2c9", "tree": "23e0385e77d8b773a19c4a23677f34945a6da1e2", "parents": [ "15fae50a9bd28a9fe490b053ff4353f8a38ea5a0" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Apr 16 22:10:42 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 17 14:17:04 2012 -0400" }, "message": "mac80211: fix logic error in ibss channel type check\n\nThe broken check leads to rate control attempting to use HT40 while\nthe driver is configured for HT20. This leads to interesting hardware\nissues.\n\nHT40 can only be used if the channel type is either HT40- or HT40+\nand if the channel type of the cell matches the local type.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "973ef21a676e55a8e1a100a6e109f0c116ea75e8", "tree": "f1cde80fd13225f7fbc18562408459eb8e32fd3c", "parents": [ "32998cc96a76cc3f42f66b55fec301377e439c66" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Apr 16 14:56:48 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 17 14:17:04 2012 -0400" }, "message": "mac80211: fix truncated packets in cooked monitor rx\n\nCooked monitor rx was recently changed to use ieee80211_add_rx_radiotap_header\ninstead of generating only limited radiotap information.\nieee80211_add_rx_radiotap_header assumes that FCS info is still present if\nthe hardware supports receiving it, however when cooked monitor rx packets\nare processed, FCS info has already been stripped.\nFix this by adding an extra flag indicating FCS presence.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "244b65dbfede788f2fa3fe2463c44d0809e97c6b", "tree": "10d2c717d7a5e547b4451b61e35b162c0457b8b9", "parents": [ "a49bcabedc18319f673319d5e71b5751e3978179" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Sun Apr 15 12:31:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 16 23:51:07 2012 -0400" }, "message": "net_sched: gred: Fix oops in gred_dump() in WRED mode\n\nA parameter set exists for WRED mode, called wred_set, to hold the same\nvalues for qavg and qidlestart across all VQs. The WRED mode values had\nbeen previously held in the VQ for the default DP. After these values\nwere moved to wred_set, the VQ for the default DP was no longer created\nautomatically (so that it could be omitted on purpose, to have packets\nin the default DP enqueued directly to the device without using RED).\n\nHowever, gred_dump() was overlooked during that change; in WRED mode it\nstill reads qavg/qidlestart from the VQ for the default DP, which might\nnot even exist. As a result, this command sequence will cause an oops:\n\ntc qdisc add dev $DEV handle $HANDLE parent $PARENT gred setup \\\n DPs 3 default 2 grio\ntc qdisc change dev $DEV handle $HANDLE gred DP 0 prio 8 $RED_OPTIONS\ntc qdisc change dev $DEV handle $HANDLE gred DP 1 prio 8 $RED_OPTIONS\n\nThis fixes gred_dump() in WRED mode to use the values held in wred_set.\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "81d475790d1f9d760019dbe785b16e8a270d4892" }