)]}' { "log": [ { "commit": "ee5fc1b5789d5bddd8034310d03d3bd1eafdbe3a", "tree": "face2e89ec4af36c5a6ba29ce2ac925dc8cd6669", "parents": [ "fa0433af5d71ba85d96f904a173fa3c7e7269bbd" ], "author": { "name": "Mihir Shete", "email": "smihir@codeaurora.org", "time": "Sun Oct 13 05:25:30 2013 +0530" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Nov 12 07:06:02 2013 -0800" }, "message": "cfg80211: add flags to define country IE processing rules\n\n802.11 cards may have different country IE parsing behavioural\npreferences and vendors may want to support these. These preferences\nwere managed by the WIPHY_FLAG_CUSTOM_REGULATORY and the\nWIPHY_FLAG_STRICT_REGULATORY flags and their combination.\nInstead of using this existing notation, split out the country IE\nbehavioural preferences to a new flag. This will allow us to add more\ncustomizations easily and make the code more maintainable. Also add\na new flag to disable country IE hints issued by the CORE as the\nfirst customization.\n\nChange-Id: I66ba4a92ac0f029a115eea0a274b02db11279787\nCRs-Fixed: 542802\nSigned-off-by: Mihir Shete \u003csmihir@codeaurora.org\u003e\n" }, { "commit": "50b5f07287564a13d3ae28cfe243cca566407b53", "tree": "8c94e43b5da4ff1ecaa85d92d6b52f0bf1da9847", "parents": [ "3b44f9ff1137befb8a907638d6383cf8b20c7413" ], "author": { "name": "Sameer Thalappil", "email": "sameert@codeaurora.org", "time": "Fri Jul 05 14:58:32 2013 -0700" }, "committer": { "name": "Sameer Thalappil", "email": "sameert@codeaurora.org", "time": "Mon Sep 16 14:26:14 2013 -0700" }, "message": "cfg80211: Add AP stopped interface\n\nAP stopped interface can be used to indicate that the AP mode has\nstopped functioning, WLAN driver may have encountered errors that has\nforced the driver to stop the AP mode.\n\nWhen the driver is in P2P-Go mode, and when it goes thru automatic\nrecovery from firmware crashes, it uses this interface to notify the\nuserspace that the group has been deleted.\n\nCRs-Fixed: 453060\nChange-Id: Ifcd8d4f0c0b26f56a56fb8560aa474297b7521d4\nSigned-off-by: Sameer Thalappil \u003csameert@codeaurora.org\u003e\n" }, { "commit": "cb4c2165ff339d67d27092615a5f0b961e735ae0", "tree": "1e61e3e907af70ab142f6813f14d0f6c35d37782", "parents": [ "b6a01e111f335ab6cdc67ee63f89162eca2ec355" ], "author": { "name": "Hemant Gupta", "email": "hemantg@codeaurora.org", "time": "Sat Jun 08 19:07:57 2013 +0530" }, "committer": { "name": "Sridhar Gujje", "email": "sgujje@codeaurora.org", "time": "Sun Jul 07 10:30:53 2013 +0530" }, "message": "Bluetooth: hidp: Remove sysfs entry if hid connection is disconnected\n\nThis patch fixes the issue that sysfs entry for hid was not removed when\ndisconnection was initiated from remote end or if BT was reset. Sysfs\nentry prevented reconnection from HID device.\n\nCRs-Fixed: 468516, 473179\nChange-Id: I40bcd27450cd8f87180d33b66969dde4f08a34f3\nSigned-off-by: Hemant Gupta \u003chemantg@codeaurora.org\u003e\nSigned-off-by: Sridhar Gujje \u003csgujje@codeaurora.org\u003e\n" }, { "commit": "b3eb72f13a8f9146914ede4bbf36f7f4d0e58a32", "tree": "d8ceae1255c4633714a24f41972cb5358bfb3b4f", "parents": [ "d6d8da3ccb4e20edd1dbdb2f21cd88a9250fe206" ], "author": { "name": "Subramanian Srinivasan", "email": "subrsrin@codeaurora.org", "time": "Tue May 21 15:42:28 2013 -0700" }, "committer": { "name": "Sridhar Gujje", "email": "sgujje@codeaurora.org", "time": "Mon Jul 01 12:10:57 2013 +0530" }, "message": "Fix disconnect not sent from host when pairing is cancelled\n\nFixes the issue that disconnect command is not sent\nfrom the host when pairing is cancelled.\n\nCRs-fixed: 489957\n\nChange-Id: I600a526aa9b95a3f17d77d5ef16d91e206ce7161\nSigned-off-by: Subramanian Srinivasan \u003csubrsrin@codeaurora.org\u003e\nSigned-off-by: Sridhar Gujje \u003csgujje@codeaurora.org\u003e\n" }, { "commit": "5037cd143b48c0a2966ed1bace850084a37ff241", "tree": "30e8db55096f80045e8e3c475cb2039d9be33d5f", "parents": [ "bd3bfab99d9e8ab00039b095963843ce53726a17" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vthiagar@qca.qualcomm.com", "time": "Tue May 14 19:04:43 2013 +0530" }, "committer": { "name": "Sunil Dutt", "email": "duttus@codeaurora.org", "time": "Fri May 31 18:46:32 2013 +0530" }, "message": "cfg80211/nl80211: add API for MAC address ACLs\n\nAdd API to enable drivers to implement MAC address based\naccess control in AP/P2P GO mode. Capable drivers advertise\nthis capability by setting the maximum number of MAC\naddresses in such a list in wiphy-\u003emax_acl_mac_addrs.\n\nAn initial ACL may be given to the NL80211_CMD_START_AP\ncommand and/or changed later with NL80211_CMD_SET_MAC_ACL.\n\nBlack- and whitelists are supported, but not simultaneously.\n\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvthiagar@qca.qualcomm.com\u003e\n[rewrite commit log, many cleanups]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nGit-commit: 77765eaf5cfb6b8dd98ec8b54b411d74ff6095f1\nGit-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\nCRs-fixed: 487410\nChange-Id: I9593b887941be5efa5e96546ad92cd6c6bf8fb87\n[duttus@codeaurora.org: resolved 3.4 backport issues]\nSigned-off-by: Sunil Dutt \u003cduttus@codeaurora.org\u003e\n" }, { "commit": "9226223b3a45ac38ee04044b60f87d87687ef916", "tree": "9a2f4bc65d08ea7cfa70a5937e2103b15b397137", "parents": [ "04a6a868f63a4bef996af7a074b24668ef69b4e0" ], "author": { "name": "Sameer Thalappil", "email": "sameert@codeaurora.org", "time": "Tue Mar 19 14:28:37 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Wed Mar 27 18:29:45 2013 -0700" }, "message": "nl80211/cfg80211: add VHT MCS support\n\nAdd support for reporting and calculating VHT MCSes.\n\nNote that I\u0027m not completely sure that the bitrate\ncalculations are correct, nor that they can\u0027t be\nsimplified.\n\nChange-Id: Id4c132850a85ff59f0fc16396763ed717689bec0\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nGit-commit: db9c64cf8d9d3fcbc34b09d037f266d1fc9f928c\nGit-repo:\ngit://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\nSigned-off-by: Sameer Thalappil \u003csameert@codeaurora.org\u003e\n" }, { "commit": "10bd072d4527a809f8653e82340ef3b82042c523", "tree": "cff653ad782de60221c2bc7c39abdf844b5ef4f0", "parents": [ "b1cfd327a6c94b353841144fe9e1cb25a9aceed1", "a62086da23bb2c292377c128d0a67e83ac8d74e7" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Mar 26 21:15:59 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Mar 26 21:15:58 2013 -0700" }, "message": "Merge \"cfg80211: Extend support for IEEE 802.11r Fast BSS Transition\"" }, { "commit": "aebe44fbf547abbecb22ba39da552d5de8938b61", "tree": "36f4549ca48d4280731df54224c4f7588b502f73", "parents": [ "8c97b5748c9c726e9a57bc6fdefb391612ea2a81", "e38d4810daa8543b6fa88d9f9288135eb68aff23" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Mar 20 04:44:49 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Wed Mar 20 04:44:48 2013 -0700" }, "message": "Merge \"Bluetooth: GAP: Disconnect ACL immediately after Auth failure.\"" }, { "commit": "a62086da23bb2c292377c128d0a67e83ac8d74e7", "tree": "327be178fc8692f02423e70bf3db7799d38ecf4f", "parents": [ "a348a8c3b1f40c9f31a5f9afe3c73197cd549dd9" ], "author": { "name": "Jouni Malinen", "email": "jouni@qca.qualcomm.com", "time": "Tue Mar 19 14:30:49 2013 +0530" }, "committer": { "name": "Sunil Dutt", "email": "duttus@codeaurora.org", "time": "Tue Mar 19 19:27:49 2013 +0530" }, "message": "cfg80211: Extend support for IEEE 802.11r Fast BSS Transition\n\nAdd NL80211_CMD_UPDATE_FT_IES to support update of FT IEs to the\nWLAN driver and NL80211_CMD_FT_EVENT to send FT events from the\nWLAN driver. This will carry the target AP\u0027s MAC address along\ncfg80211: Extend support for IEEE 802.11r Fast BSS Transition\n\nAdd NL80211_CMD_UPDATE_FT_IES to support update of FT IEs to the\nWLAN driver and NL80211_CMD_FT_EVENT to send FT events from the\nWLAN driver. This will carry the target AP\u0027s MAC address along\nwith the relevant Information Elements. This event is used to\nreport received FT IEs (MDIE, FTIE, RSN IE, TIE, RICIE). These\nchanges allow FT to be supported with drivers that use an internal\nSME instead of user space option (like FT implementation in\nwpa_supplicant with mac80211-based drivers).\n\nSigned-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nGit-commit: 355199e02b831fd4f652c34d6c7673d973da1369\nGit-repo: http://git.kernel.org/cgit/linux/kernel/git/linville/\nwireless-testing.git/\nChange-Id: I439155b3d7bf4df9c45087a4deb6ec0cd7577225\nCRs-fixed: 434525\n[duttus@codeaurora.org: backport to 3.4-This commit includes the\nchanges from following commits to compile for jb_2.5.\n5314526b1743e8e8614293db7d86e480b4fe9824 : cfg80211: add channel\nswitch notify event\n98104fdeda63d57631c9f89e90a7b83b58fcee40 : cfg80211: add P2P\nDevice abstraction\nf4e583c8935c6f52f9385ee7cfbea8f65c66a737 : nl/cfg80211: add the\nNL80211_CMD_SET_MCAST_RATE command\ned44a951c72ab409f932b1c15914488308e86da2 : cfg80211/nl80211: Notify\nconnection request failure in AP mode\n77765eaf5cfb6b8dd98ec8b54b411d74ff6095f1 : cfg80211/nl80211: add\nAPI for MAC address ACLs.\n04f39047af2a6df64b763ea5a271db24879d0391 : nl80211/cfg80211: add\nradar detection command/event.\n3713b4e364effef4b170c97d54528b1cdb16aa6b : nl80211: allow splitting\nwiphy information in dumps.\nee2aca343c9aa64d277a75a5df043299dc84cfd9 : cfg80211: add ability\nto override VHT capabilities.\n355199e02b831fd4f652c34d6c7673d973da1369 : cfg80211: Extend\nsupport for IEEE 802.11r Fast BSS Transition.]\nSigned-off-by: Sunil Dutt \u003cduttus@codeaurora.org\u003e\n" }, { "commit": "ab8ef91c44e166f31247fb91dbd1fd706ea3a231", "tree": "6ea5b097aa73be0d481f0646dec24a6cb34d78a4", "parents": [ "84400dffffca9542a353bdca3dc42b925225e9c0", "9f6d091653c80ea56bb2ca9417bac3c4c36c65e7" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Mar 18 07:45:04 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Mon Mar 18 07:45:04 2013 -0700" }, "message": "Merge \"cfg80211: Pass station (extended) capability info to kernel\"" }, { "commit": "84400dffffca9542a353bdca3dc42b925225e9c0", "tree": "275d144063250784cab72221964a894cdd5daa9e", "parents": [ "5cf988c6bd1c827dc41125117b50262abca77975", "5fed1a7a78e57a4e268482c111cbda536d67a050" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Mar 18 07:45:03 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Mon Mar 18 07:45:03 2013 -0700" }, "message": "Merge \"{nl,cfg}80211: Peer STA VHT caps\"" }, { "commit": "a4cdefb88167c87bc84f440a9df2051f0ace4725", "tree": "42c1c69cfd360e60e37089d139054e61ade8768c", "parents": [ "b09a84341b929fbd5f409de59a2c0d847b15ad2d", "1cb41169af9e869ce9722c7f98de557264f80e2b" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Mar 11 15:17:12 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Mon Mar 11 15:17:11 2013 -0700" }, "message": "Merge \"Fix not able to disconnect from the Host after SMP requests\"" }, { "commit": "e38d4810daa8543b6fa88d9f9288135eb68aff23", "tree": "5bccf0fa2081664664a73f594a2923a3d7af6b1c", "parents": [ "3c19edb69051c42e9c1068c13d7d2acefd2e8a7c" ], "author": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Thu Jan 10 23:54:29 2013 +0530" }, "committer": { "name": "Sumit Bajpai", "email": "sbajpai@codeaurora.org", "time": "Mon Mar 04 11:50:01 2013 +0530" }, "message": "Bluetooth: GAP: Disconnect ACL immediately after Auth failure.\n\nThe patch fixes issue of ACL lingering for 2 seconds after\nAuthentication failure. Another Auth request during this\ntime results in improper connection reference and hence\nresulting in ACL to persist forever if remote doesn\u0027t\ndisconnect.\n\nChange-Id: Ief920af97d8f27e93460130dc86113b40dc5f6a5\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "1cb41169af9e869ce9722c7f98de557264f80e2b", "tree": "d2c15131671900546b153305d530caf88419fff1", "parents": [ "8aafe60a93dae84acaa82bf0fd9f63059c32ed43" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Tue Jan 29 16:20:19 2013 -0800" }, "committer": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Thu Feb 21 17:37:23 2013 -0800" }, "message": "Fix not able to disconnect from the Host after SMP requests\n\nThe following fixes were added:\n1. While using whitelist API for connection, if SMP requests are received\nbefore the L2CAP channel is correctly setup, queue the SMP requets\nand execute them once the channel state is bounded and connected and\ntherefore maintaining the correct connection reference count.\n2. If the status LE start encryption command is not successful,\nthen call hci_conn put which would decrement the HCI connection\nreference count.\n\nCRs-fixed: 447092\nChange-Id: Ibb11ecf94f28e0b0aff5eacc86d1660e7ec2e25d\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n" }, { "commit": "9f6d091653c80ea56bb2ca9417bac3c4c36c65e7", "tree": "a157d2b5870922f10825af528e2a1f00ad4d9471", "parents": [ "5fed1a7a78e57a4e268482c111cbda536d67a050" ], "author": { "name": "Jouni Malinen", "email": "jouni@qca.qualcomm.com", "time": "Thu Feb 21 13:06:54 2013 +0530" }, "committer": { "name": "Sunil Dutt", "email": "duttus@codeaurora.org", "time": "Thu Feb 21 13:10:04 2013 +0530" }, "message": "cfg80211: Pass station (extended) capability info to kernel\n\nThe information of the peer\u0027s capabilities and extended capabilities are\nrequired for the driver to perform TDLS Peer UAPSD operations and off\nchannel operations. This information of the peer is passed from user space\nusing NL80211_CMD_SET_STATION command. This commit enhances\nthe function nl80211_set_station to pass the capability information of\nthe peer to the driver.\n\nSimilarly, there may be need for capability information for other modes,\nso allow this to be provided with both add_station and change_station.\n\nChange-Id: I1e626512a0f849ae05bbbd24c4e262d303b8f8ea\nCRs-fixed: 452921\n\nSigned-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "5fed1a7a78e57a4e268482c111cbda536d67a050", "tree": "364da6a2c8f2d75d14567c5eb56505d8bfea38a2", "parents": [ "dd29395ed77577c5a69c09c8472f8ea4351c78a4" ], "author": { "name": "Mahesh Palivela", "email": "maheshp@posedge.com", "time": "Thu Feb 21 08:36:42 2013 +0530" }, "committer": { "name": "Sunil Dutt", "email": "duttus@codeaurora.org", "time": "Thu Feb 21 08:37:31 2013 +0530" }, "message": "{nl,cfg}80211: Peer STA VHT caps\n\nTo save STAs VHT caps in AP mode\n\nChange-Id: I1930ec05a3e079733c00837c93bda615289fceda\nCRs-fixed: 452921\n\nSigned-off-by: Mahesh Palivela \u003cmaheshp@posedge.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "3254baddc0c398ccadb2d0e638b9b7e7819c848a", "tree": "720f3296415ebd520deb2288e89806d430763799", "parents": [ "8ff19d42a104535a8a67a3fa8df39f72f23b2743" ], "author": { "name": "Mahesh Palivela", "email": "maheshp@posedge.com", "time": "Thu Feb 21 05:28:31 2013 +0530" }, "committer": { "name": "Sunil Dutt", "email": "duttus@codeaurora.org", "time": "Thu Feb 21 05:31:16 2013 +0530" }, "message": "cfg80211: allow advertising VHT capabilities\n\nAllow drivers to advertise their VHT capabilities\nand export them to userspace via nl80211.\n\nChange-Id: I2d2825a09dfddccca1bd3edacd7fc382d765bea5\nCRs-fixed: 452921\n\nSigned-off-by: Mahesh Palivela \u003cmaheshp@posedge.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "2738eeccbc44aaed38fef732ad27060457956310", "tree": "84a988325535e2e1d1bc0b7dce0e339e630a2398", "parents": [ "af51b7be27d6c27426c8b068f22b5f15508b28ee" ], "author": { "name": "Bhakthavatsala Raghavendra", "email": "braghave@codeaurora.org", "time": "Tue Feb 12 19:44:47 2013 +0530" }, "committer": { "name": "Bhakthavatsala Raghavendra", "email": "braghave@codeaurora.org", "time": "Fri Feb 15 14:05:07 2013 +0530" }, "message": "Bluetooth: Introduce new security level\n\nDefine new security level BT_SECURITY_VERY_HIGH\nfor BT-SAP secuirty requirements\n\nChange-Id: Iee1f60def34d64174c71934ecf55319cee087c13\nSigned-off-by: Bhakthavatsala Raghavendra \u003cbraghave@codeaurora.org\u003e\n" }, { "commit": "e833acaf2b5cfac0fb53692652a8c39667f1e559", "tree": "f530c2ea75a3d7e52045e1f543ced58757895b9d", "parents": [ "7dfc4b284ca395a035e7da058f86dfb4275dd509" ], "author": { "name": "Duy Truong", "email": "dtruong@codeaurora.org", "time": "Tue Feb 12 13:35:08 2013 -0800" }, "committer": { "name": "Duy Truong", "email": "dtruong@codeaurora.org", "time": "Tue Feb 12 13:35:08 2013 -0800" }, "message": "Update copyright to The Linux Foundation\n\nChange-Id: Ibead64ce2e901dede2ddd1b86088b88f2350ce92\nSigned-off-by: Duy Truong \u003cdtruong@codeaurora.org\u003e\n" }, { "commit": "8e71da17f73bf9d856751ecc2038a73c2e363c74", "tree": "77768598ac65b7e73efda8ac0de92c31ad69b637", "parents": [ "c5ac78a9d75f4c5c87a289f50a48d6d78a618ca1" ], "author": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Wed Nov 21 17:01:05 2012 +0530" }, "committer": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Mon Feb 04 11:26:48 2013 +0530" }, "message": "Bluetooth: GAP: Read the clock offset on ACL connection complete\n\nKeep the Clock offset valid for one Hour and read it again after\nconnection complete so that we have most recent value. This helps\nfor faster ACL connections.\n\nCRs-fixed: 430132\nChange-Id: I1526878a7365f9cc0c654e0af6c4dd214fac4cd8\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "c5ac78a9d75f4c5c87a289f50a48d6d78a618ca1", "tree": "1fe4f2ae85c92166edc1fe62fefa2335e0dd4cd9", "parents": [ "45c9e8141e54a691180c55ed9e242302a74224a8" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Tue Oct 02 17:55:55 2012 -0700" }, "committer": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Mon Feb 04 11:25:57 2013 +0530" }, "message": "Bluetooth: Fix for LE cancel Create Connection not working\n\nAdded management method to send LE cancel create connection\nHCI command\n\nCRs-fixed: 366284\nChange-Id: I17a75ecf4ecaa32cab7e3a4cb8beb8cc4b4580c4\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "a36ad995c0aa971da8d65425c41f1fd54e25bac5", "tree": "369b579e7e33180cb1ab79275772387f6582c6f6", "parents": [ "dc3b5db4258682308237c3c99a4fbf36e89c1495", "6d41bdff2b23c40c0e0c9b3a1280ea3428b8a527" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Jan 31 19:56:10 2013 -0800" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Thu Jan 31 19:56:10 2013 -0800" }, "message": "Merge \"Bluetooth: Support for Remote name request cancel command\"" }, { "commit": "6d41bdff2b23c40c0e0c9b3a1280ea3428b8a527", "tree": "050c62dd3a3d43edfb88f5bfc2bdef8b31f05f33", "parents": [ "d96001b302033d137e60e03308e87bbfeb363fca" ], "author": { "name": "Ram Mohan Korukonda", "email": "rkorukon@codeaurora.org", "time": "Tue Nov 27 16:13:54 2012 +0530" }, "committer": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Tue Jan 29 19:13:59 2013 +0530" }, "message": "Bluetooth: Support for Remote name request cancel command\n\nAdd support for remote name request cancel command in mgmtops\nplugin.\n\nChange-Id: If8bec8b457461f7bca90af940d2473b810677322\nCRs-fixed: 414884\nSigned-off-by: Ram Mohan Korukonda \u003crkorukon@codeaurora.org\u003e\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "4918bd31c24124843d768061fce0f079db24ecad", "tree": "fd06abb6e182ed33350d4c1dcb5e620ff401403f", "parents": [ "d1066785a41c2e8b689d95bf5edaf7684d5e1823" ], "author": { "name": "Jouni Malinen", "email": "jouni@qca.qualcomm.com", "time": "Tue Jan 15 13:36:11 2013 -0800" }, "committer": { "name": "Madan Mohan Koyyalamudi", "email": "mkoyya@codeaurora.org", "time": "Mon Jan 28 17:34:29 2013 -0800" }, "message": "cfg80211: Add TDLS event to allow drivers to request operations\n\nThe NL80211_CMD_TDLS_OPER command was previously used only for userspace\nrequest for the kernel code to perform TDLS operations. However, there\nare also cases where the driver may need to request operations from\nuserspace, e.g., when using security on the AP path. Add a new cfg80211\nfunction for generating a TDLS operation event for drivers to request a\nnew link to be set up (NL80211_TDLS_SETUP) or an existing link to be\ntorn down (NL80211_TDLS_TEARDOWN). Drivers can optionally use these\nevents, e.g., based on noticing data traffic being sent to a peer\nstation that is seen with good signal strength.\n\nChange-Id: I778f5136fc4518bedcaed14a5412de4be6c85cf3\nSigned-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Ng Chilam \u003cchilamng@qca.qualcomm.com\u003e\n[Madan Mohan Koyyalamudi \u003cmkoyya@codeaurora.org\u003e: move changes from\ninclude/uapi/linux/nl80211.h to include/linux/nl80211.h, remove trace.h,\nremove trace_cfg80211_tdls_oper_request() in nl80211.c ]\nSigned-off-by: Madan Mohan Koyyalamudi \u003cmkoyya@codeaurora.org\u003e\n" }, { "commit": "4c64d2d0be3c839cd94f53209b6e48c50ab44c8d", "tree": "3a1e8d4ac767890452490a2060aa873b539ba63e", "parents": [ "4e28773483fa22115f8a0e84729f1260e28fe30c" ], "author": { "name": "Tianyi Gou", "email": "tgou@codeaurora.org", "time": "Mon Aug 06 17:23:26 2012 -0700" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Mon Nov 12 02:25:01 2012 -0800" }, "message": "net: sched: export an api to enable/disable flow on sch\n\nExport a function from sch_api.c that will look up\ndesired qdisc and call it\u0027s registered change function\nto enable/disable flow.\n\nChange-Id: I5b6dc7a6fd2b09b796c92b3770ba83423d19c864\nCRs-Fixed: 355156\nAcked-by: Jimi Shah \u003cjimis@qualcomm.com\u003e\nSigned-off-by: Tianyi Gou \u003ctgou@codeaurora.org\u003e\n(cherry picked from commit b8419fe690053b76658d49565c57ac654faf2eaa)\n(cherry picked from commit 3a30e7aa4487f56a74f12c12f11cece6ce1f2100)\n" }, { "commit": "320598f5aa231b6b26e69724ebd6a98179104f6d", "tree": "d00301537a8d322604d082fb3c0311a714a217cf", "parents": [ "1e8c073eb44476d16557bd30e902592f77f17400" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Mon Jul 30 14:52:56 2012 -0700" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Mon Nov 12 00:09:56 2012 -0800" }, "message": "bluetooth: LE conn whitelist implementation\n\nAdd support to create connection to LE devices using\nwhitelist. With this, the Controller can try to connect\nto multiple devices at the same time. The following\ninterfaces are added.\n1. Add/Remove device from whitelist\n2. Clear all the devices from whitelist\n3. Create Connection to devices from whitelist\n4. Cancel create connection to whitelist devices\n\nCRs-fixed: 388980\nChange-Id: I3900c71255e754f80bb2873ae19a41b94cca76c3\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n(cherry picked from commit 93bef895b01b79f49af60ba1394c9c3f6e563212)\n(cherry picked from commit 377ee2bf1fc37bcbeae872661646bdd6a5f8da31)\n" }, { "commit": "b2f194ddc27489c5f704c959e08c9a4ff4bf6aa0", "tree": "036d29edee2395e5ce5353234f47816463c932d8", "parents": [ "ce73c377e414fca2812e53374ee363120ba2b0fa" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Tue Aug 14 12:03:01 2012 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Nov 06 14:27:24 2012 -0800" }, "message": "Bluetooth: Send Disconnection reason to Bluez\n\nSend device disconnection reason to bluez on receiving the\ndiconnection complete event so that low energy profiles\nsuch as proximity can decide to reconnect if the reason\nis link loss.\n\nCRs-Fixed: 378240\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n(cherry picked from commit da09d26a75ee1c7c1911dcfbe0128fd09f6631f4)\n\nChange-Id: Iab1fede47f44342d87be6c3c5aa7590754fd950c\nSigned-off-by: Sudhir Sharma \u003csudsha@codeaurora.org\u003e\n" }, { "commit": "231689b3f454b0e6747928f25b144fae5c62999b", "tree": "209d8f42af85c9c1da261285017f8bb099a2a7d9", "parents": [ "df2d84d692a80d43462f3c6d57e484f61860f8ab" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Sep 03 18:47:50 2012 +0530" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Wed Oct 31 12:14:26 2012 -0700" }, "message": "Bluetooth: Validate hci conn validity before refering wakelock.\n\nFound in a rare case there is possibility that remote device\nsent disconnect on a connection and DUT is trying send data\non the same. In that case accessing some released wakelock\nis causing issue. The current changes are to use locking\nmechanism to validate the connection before acting on the\nwake lock.\n\nCRs-Fixed: 394651\nChange-Id: I6a4188a7d0d05a8cfbe66d3680473d549157917a\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n(cherry picked from commit 6aadc41fcbd28dc3899a4b5d098e5f316588a029)\n\nSigned-off-by: Sudhir Sharma \u003csudsha@codeaurora.org\u003e\n" }, { "commit": "6010652aeaa0f03104ea317571e19f31f72e5c72", "tree": "3e464b33d8342024ebb9981871bc33110c7ed7fa", "parents": [ "4bdc71fbb55f944f659942916737c097304afb77" ], "author": { "name": "Devin Kim", "email": "dojip.kim@lge.com", "time": "Mon Sep 17 21:15:32 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Mon Sep 17 21:57:27 2012 -0700" }, "message": "af_netlink: force credentials passing [CVE-2012-3520]\n\nPablo Neira Ayuso discovered that avahi and\npotentially NetworkManager accept spoofed Netlink messages because of a\nkernel bug. The kernel passes all-zero SCM_CREDENTIALS ancillary data\nto the receiver if the sender did not provide such data, instead of not\nincluding any such data at all or including the correct data from the\npeer (as it is the case with AF_UNIX).\n\nThis bug was introduced in commit 16e572626961\n(af_unix: dont send SCM_CREDENTIALS by default)\n\nThis patch forces passing credentials for netlink, as\nbefore the regression.\n\nAnother fix would be to not add SCM_CREDENTIALS in\nnetlink messages if not provided by the sender, but it\nmight break some programs.\n\nWith help from Florian Weimer \u0026 Petr Matousek\n\nThis issue is designated as CVE-2012-3520\n\nChange-Id: Id4f36301d407ef5c8218c5ef9f66d299766cdf57\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Petr Matousek \u003cpmatouse@redhat.com\u003e\nCc: Florian Weimer \u003cfweimer@redhat.com\u003e\nCc: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f799996e309cad545b3a7f84ef6f333a09c8b876", "tree": "e3c3f6434be96ba817652239a811122d62427ee5", "parents": [ "2e02b861173406a1287a53ca7b836a4ad5fd4255" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Wed Aug 01 18:21:37 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Fri Aug 10 21:18:18 2012 +0530" }, "message": "Bluetooth: Block SCO disconnect operation on BT_CLOSED state.\n\nHave maximum blocking time for shutdown operation as DISCONNECT_TIMEOUT.\nDuring this period when SCO connection closes, the userspace will be\nupdated on the close operation. Existing approach of immidiate return\non shutdown call can cause synchronization issues on SCO state between\nkernel and userspace. This happens when disconnect operation takes\nmore time at kernel space.\n\nChange-Id: Id9e6a61c2c3d4ba2cf6da574fc49bc6894a8f96a\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "a42b50244cdb71f93bf842a28b0fc1cecc622c55", "tree": "eccf8e699b563aab729f89a0deecb0a0d444a5c1", "parents": [ "e2e178fa0c3429b305820932493e365d65342b31" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Thu Jul 05 22:48:31 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jul 24 02:05:06 2012 -0600" }, "message": "bluetooth: Add support for LE conn param\n\nAdded support to let the userspace know about the updated\nLE connection parameters. On receiving successful connection\ncomplete and connection parameters update event from the BT\nController, send a mgmt event to the userspace bluetoothd.\n\nCRs-fixed: 380271\nChange-Id: If8c3d785188e0d4f38c7431d01c016f399137408\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n" }, { "commit": "bcdb7e7ed7c6bd659f172d3c19d340947aa84a4b", "tree": "26fc809cfc0a0e84df3407e5ed9df801be20dc32", "parents": [ "0679a81cb293699acf1f7cb30801ce11900b4420" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Tue Jun 05 13:35:39 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 29 11:40:46 2012 -0600" }, "message": "Bluetooth: Fix ATT Indicate/Confirm handling\n\nIf due to timing issues out of our control, an outbound ATT Indicate\nis delayed to the point that user space code does not receive\nconfirmation within it time-out period, both Client and Server\nsockets must be torn down. We also must always respond to incoming\nATT Indicate pkt with a Confirmation, as the Error Response is an\nillegal response for Indicate.\n\nCRs-Fixed: 363355\nChange-Id: I4003a59e1a731a08818f18d5b79db537e2aa2619\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "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": "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": "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": "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": "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": "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": "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": "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": "518fbf9cdf17875d808596afd77fc115a6f942ca", "tree": "608d2b518feafdfeade863774e14fc6e37ca31dd", "parents": [ "5414fc12e32a0e0833ec61ba8be864c46cd19966" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Apr 28 23:21:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:37:59 2012 -0400" }, "message": "net: fix sk_sockets_allocated_read_positive\n\nDenys Fedoryshchenko reported frequent crashes on a proxy server and kindly\nprovided a lockdep report that explains it all :\n\n [ 762.903868]\n [ 762.903880] \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 [ 762.903890] [ INFO: inconsistent lock state ]\n [ 762.903903] 3.3.4-build-0061 #8 Not tainted\n [ 762.904133] ---------------------------------\n [ 762.904344] inconsistent {IN-SOFTIRQ-W} -\u003e {SOFTIRQ-ON-W} usage.\n [ 762.904542] squid/1603 [HC0[0]:SC0[0]:HE1:SE1] takes:\n [ 762.904542] (key#3){+.?...}, at: [\u003cc0232cc4\u003e]\n__percpu_counter_sum+0xd/0x58\n [ 762.904542] {IN-SOFTIRQ-W} state was registered at:\n [ 762.904542] [\u003cc0158b84\u003e] __lock_acquire+0x284/0xc26\n [ 762.904542] [\u003cc01598e8\u003e] lock_acquire+0x71/0x85\n [ 762.904542] [\u003cc0349765\u003e] _raw_spin_lock+0x33/0x40\n [ 762.904542] [\u003cc0232c93\u003e] __percpu_counter_add+0x58/0x7c\n [ 762.904542] [\u003cc02cfde1\u003e] sk_clone_lock+0x1e5/0x200\n [ 762.904542] [\u003cc0303ee4\u003e] inet_csk_clone_lock+0xe/0x78\n [ 762.904542] [\u003cc0315778\u003e] tcp_create_openreq_child+0x1b/0x404\n [ 762.904542] [\u003cc031339c\u003e] tcp_v4_syn_recv_sock+0x32/0x1c1\n [ 762.904542] [\u003cc031615a\u003e] tcp_check_req+0x1fd/0x2d7\n [ 762.904542] [\u003cc0313f77\u003e] tcp_v4_do_rcv+0xab/0x194\n [ 762.904542] [\u003cc03153bb\u003e] tcp_v4_rcv+0x3b3/0x5cc\n [ 762.904542] [\u003cc02fc0c4\u003e] ip_local_deliver_finish+0x13a/0x1e9\n [ 762.904542] [\u003cc02fc539\u003e] NF_HOOK.clone.11+0x46/0x4d\n [ 762.904542] [\u003cc02fc652\u003e] ip_local_deliver+0x41/0x45\n [ 762.904542] [\u003cc02fc4d1\u003e] ip_rcv_finish+0x31a/0x33c\n [ 762.904542] [\u003cc02fc539\u003e] NF_HOOK.clone.11+0x46/0x4d\n [ 762.904542] [\u003cc02fc857\u003e] ip_rcv+0x201/0x23e\n [ 762.904542] [\u003cc02daa3a\u003e] __netif_receive_skb+0x319/0x368\n [ 762.904542] [\u003cc02dac07\u003e] netif_receive_skb+0x4e/0x7d\n [ 762.904542] [\u003cc02dacf6\u003e] napi_skb_finish+0x1e/0x34\n [ 762.904542] [\u003cc02db122\u003e] napi_gro_receive+0x20/0x24\n [ 762.904542] [\u003cf85d1743\u003e] e1000_receive_skb+0x3f/0x45 [e1000e]\n [ 762.904542] [\u003cf85d3464\u003e] e1000_clean_rx_irq+0x1f9/0x284 [e1000e]\n [ 762.904542] [\u003cf85d3926\u003e] e1000_clean+0x62/0x1f4 [e1000e]\n [ 762.904542] [\u003cc02db228\u003e] net_rx_action+0x90/0x160\n [ 762.904542] [\u003cc012a445\u003e] __do_softirq+0x7b/0x118\n [ 762.904542] irq event stamp: 156915469\n [ 762.904542] hardirqs last enabled at (156915469): [\u003cc019b4f4\u003e]\n__slab_alloc.clone.58.clone.63+0xc4/0x2de\n [ 762.904542] hardirqs last disabled at (156915468): [\u003cc019b452\u003e]\n__slab_alloc.clone.58.clone.63+0x22/0x2de\n [ 762.904542] softirqs last enabled at (156915466): [\u003cc02ce677\u003e]\nlock_sock_nested+0x64/0x6c\n [ 762.904542] softirqs last disabled at (156915464): [\u003cc0349914\u003e]\n_raw_spin_lock_bh+0xe/0x45\n [ 762.904542]\n [ 762.904542] other info that might help us debug this:\n [ 762.904542] Possible unsafe locking scenario:\n [ 762.904542]\n [ 762.904542] CPU0\n [ 762.904542] ----\n [ 762.904542] lock(key#3);\n [ 762.904542] \u003cInterrupt\u003e\n [ 762.904542] lock(key#3);\n [ 762.904542]\n [ 762.904542] *** DEADLOCK ***\n [ 762.904542]\n [ 762.904542] 1 lock held by squid/1603:\n [ 762.904542] #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003cc03055c0\u003e]\nlock_sock+0xa/0xc\n [ 762.904542]\n [ 762.904542] stack backtrace:\n [ 762.904542] Pid: 1603, comm: squid Not tainted 3.3.4-build-0061 #8\n [ 762.904542] Call Trace:\n [ 762.904542] [\u003cc0347b73\u003e] ? printk+0x18/0x1d\n [ 762.904542] [\u003cc015873a\u003e] valid_state+0x1f6/0x201\n [ 762.904542] [\u003cc0158816\u003e] mark_lock+0xd1/0x1bb\n [ 762.904542] [\u003cc015876b\u003e] ? mark_lock+0x26/0x1bb\n [ 762.904542] [\u003cc015805d\u003e] ? check_usage_forwards+0x77/0x77\n [ 762.904542] [\u003cc0158bf8\u003e] __lock_acquire+0x2f8/0xc26\n [ 762.904542] [\u003cc0159b8e\u003e] ? mark_held_locks+0x5d/0x7b\n [ 762.904542] [\u003cc0159cf6\u003e] ? trace_hardirqs_on+0xb/0xd\n [ 762.904542] [\u003cc0158dd4\u003e] ? __lock_acquire+0x4d4/0xc26\n [ 762.904542] [\u003cc01598e8\u003e] lock_acquire+0x71/0x85\n [ 762.904542] [\u003cc0232cc4\u003e] ? __percpu_counter_sum+0xd/0x58\n [ 762.904542] [\u003cc0349765\u003e] _raw_spin_lock+0x33/0x40\n [ 762.904542] [\u003cc0232cc4\u003e] ? __percpu_counter_sum+0xd/0x58\n [ 762.904542] [\u003cc0232cc4\u003e] __percpu_counter_sum+0xd/0x58\n [ 762.904542] [\u003cc02cebc4\u003e] __sk_mem_schedule+0xdd/0x1c7\n [ 762.904542] [\u003cc02d178d\u003e] ? __alloc_skb+0x76/0x100\n [ 762.904542] [\u003cc0305e8e\u003e] sk_wmem_schedule+0x21/0x2d\n [ 762.904542] [\u003cc0306370\u003e] sk_stream_alloc_skb+0x42/0xaa\n [ 762.904542] [\u003cc0306567\u003e] tcp_sendmsg+0x18f/0x68b\n [ 762.904542] [\u003cc031f3dc\u003e] ? ip_fast_csum+0x30/0x30\n [ 762.904542] [\u003cc0320193\u003e] inet_sendmsg+0x53/0x5a\n [ 762.904542] [\u003cc02cb633\u003e] sock_aio_write+0xd2/0xda\n [ 762.904542] [\u003cc015876b\u003e] ? mark_lock+0x26/0x1bb\n [ 762.904542] [\u003cc01a1017\u003e] do_sync_write+0x9f/0xd9\n [ 762.904542] [\u003cc01a2111\u003e] ? file_free_rcu+0x2f/0x2f\n [ 762.904542] [\u003cc01a17a1\u003e] vfs_write+0x8f/0xab\n [ 762.904542] [\u003cc01a284d\u003e] ? fget_light+0x75/0x7c\n [ 762.904542] [\u003cc01a1900\u003e] sys_write+0x3d/0x5e\n [ 762.904542] [\u003cc0349ec9\u003e] syscall_call+0x7/0xb\n [ 762.904542] [\u003cc0340000\u003e] ? rp_sidt+0x41/0x83\n\nBug is that sk_sockets_allocated_read_positive() calls\npercpu_counter_sum_positive() without BH being disabled.\n\nThis bug was added in commit 180d8cd942ce33\n(foundations of per-cgroup memory pressure controlling.), since previous\ncode was using percpu_counter_read_positive() which is IRQ safe.\n\nIn __sk_mem_schedule() we dont need the precise count of allocated\nsockets and can revert to previous behavior.\n\nReported-by: Denys Fedoryshchenko \u003cdenys@visp.net.lb\u003e\nSined-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\n\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": "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": "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": "a6b18a28820fe0bff062a464901089af087f6ed5", "tree": "1440c0a38fddf0cfdfef76c612fe4dda9f951185", "parents": [ "9b664f16b2c9078416206c66a1b6d76c7ed0cb89", "f371a5f164d7066a89fa696354d5fb27b0f750fc" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Apr 27 01:28:57 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Apr 27 01:28:57 2012 -0700" }, "message": "Merge \"Bluetooth: Disconnect ACL after 8sec when no service level connection.\" into msm-3.0" }, { "commit": "f371a5f164d7066a89fa696354d5fb27b0f750fc", "tree": "b07000a69244c82c796fca87c8afb0fd8eb7bc84", "parents": [ "78afc961d2093f6ee18a5348760c94bdde21f9a1" ], "author": { "name": "Rohit Singh", "email": "singhr@codeaurora.org", "time": "Tue Feb 21 17:47:17 2012 +0530" }, "committer": { "name": "Rohit Singh", "email": "singhr@codeaurora.org", "time": "Thu Apr 26 10:45:28 2012 +0530" }, "message": "Bluetooth: Disconnect ACL after 8sec when no service level connection.\n\nSome Remote device disconnects service level connection but do not initiate\nACL disconnect hence ACL connection remains alive for 40s. Reducing timer\nvalue to 8s as reconnection initated by remote device was rejected due to\nexisting ACL connection.\n\nChange-Id: I26c2665bb9754ad08e3bc8d8a58f192c47c41764\nCRs-Fixed: 337702\nSigned-off-by: Rohit Singh \u003csinghr@codeaurora.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": "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": "d3d4f0a025e621b82da08a76df4036d4267739dd", "tree": "0c4d40f6df2b919ccd8cbc596c440000b7d13b9a", "parents": [ "4d846f02392a710f9604892ac3329e628e60a230" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Tue Apr 17 14:03:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:32:00 2012 -0400" }, "message": "net/sock.h: fix sk_peek_off kernel-doc warning\n\nFix kernel-doc warning in net/sock.h:\n\nWarning(include/net/sock.h:377): No description found for parameter \u0027sk_peek_off\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cda31e10baf47a8a7d9360d9488fb76294be1ca3", "tree": "7bc647cff2900f21a493718754b5261d96562564", "parents": [ "edfb5d4687d587c9f714799c7ee27517118e12e6" ], "author": { "name": "Jiri Bohac", "email": "jbohac@suse.cz", "time": "Mon Apr 16 03:35:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:31:59 2012 -0400" }, "message": "ipv6: clean up rt6_clean_expires\n\nFunctionally, this change is a NOP.\n\nSemantically, rt6_clean_expires() wants to do rt-\u003edst.from \u003d NULL instead of\nrt-\u003edst.expires \u003d 0. It is clearing the RTF_EXPIRES flag, so the union is going\nto be treated as a pointer (dst.from) not a long (dst.expires).\n\nSigned-off-by: Jiri Bohac \u003cjbohac@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edfb5d4687d587c9f714799c7ee27517118e12e6", "tree": "a3f420b125f8b55bd9135ab3c9299a2b22a24507", "parents": [ "b95465c8fcd7c8619ff9ff7bbf8038ab31c7f34b" ], "author": { "name": "Jiri Bohac", "email": "jbohac@suse.cz", "time": "Mon Apr 16 03:34:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:31:51 2012 -0400" }, "message": "ipv6: fix rt6_update_expires\n\nCommit 1716a961 (ipv6: fix problem with expired dst cache) broke PMTU\ndiscovery. rt6_update_expires() calls dst_set_expires(), which only updates\ndst-\u003eexpires if it has not been set previously (expires \u003d\u003d 0) or if the new\nexpires is earlier than the current dst-\u003eexpires.\n\nrt6_update_expires() needs to zero rt-\u003edst.expires, otherwise it will contain\nivalid data left over from rt-\u003edst.from and will confuse dst_set_expires().\n\nSigned-off-by: Jiri Bohac \u003cjbohac@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4362aaf6054b9760652c7047cdf6fa852acb6cf7", "tree": "e4346f7ecc24d63bd657348fba1b73724214f896", "parents": [ "244b65dbfede788f2fa3fe2463c44d0809e97c6b" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Mon Apr 16 03:17:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 16 23:53:11 2012 -0400" }, "message": "net_sched: red: Make minor corrections to comments\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ec5bcadc21e13ceba8c144e4731eccac01d04f7", "tree": "f0851fd42f167cf85539d1bd9109b17e0e0bf59e", "parents": [ "745c0ce35f904aeff8e1ea325c259a14a00ff1b7" ], "author": { "name": "Vishal Agarwal", "email": "vishal.agarwal@stericsson.com", "time": "Mon Apr 16 14:44:44 2012 +0530" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Apr 16 12:57:45 2012 +0300" }, "message": "Bluetooth: Temporary keys should be retained during connection\n\nIf a key is non persistent then it should not be used in future\nconnections but it should be kept for current connection. And it\nshould be removed when connecion is removed.\n\nSigned-off-by: Vishal Agarwal \u003cvishal.agarwal@stericsson.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "745c0ce35f904aeff8e1ea325c259a14a00ff1b7", "tree": "e1d05d006621b7cfd1009265ea2afe73b5cc2149", "parents": [ "87522a433ba6886b5ccbb497e0a7cb8097def64e" ], "author": { "name": "Vishal Agarwal", "email": "vishal.agarwal@stericsson.com", "time": "Fri Apr 13 17:43:22 2012 +0530" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Apr 16 12:57:40 2012 +0300" }, "message": "Bluetooth: hci_persistent_key should return bool\n\nThis patch changes the return type of function hci_persistent_key\nfrom int to bool because it makes more sense to return information\nwhether a key is persistent or not as a bool.\n\nSigned-off-by: Vishal Agarwal \u003cvishal.agarwal@stericsson.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "1716a96101c49186bb0b8491922fd3e69030235f", "tree": "43794d2f033f439d25c63b1796e138d65fd746a8", "parents": [ "d62f8dbb5b7771910f7c4657345df8ac93acb832" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Fri Apr 06 00:13:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 12:58:29 2012 -0400" }, "message": "ipv6: fix problem with expired dst cache\n\nIf the ipv6 dst cache which copy from the dst generated by ICMPV6 RA packet.\nthis dst cache will not check expire because it has no RTF_EXPIRES flag.\nSo this dst cache will always be used until the dst gc run.\n\nChange the struct dst_entry,add a union contains new pointer from and expires.\nWhen rt6_info.rt6i_flags has no RTF_EXPIRES flag,the dst.expires has no use.\nwe can use this field to point to where the dst cache copy from.\nThe dst.from is only used in IPV6.\n\nrt6_check_expired check if rt6_info.dst.from is expired.\n\nip6_rt_copy only set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nip6_dst_destroy release the ort.\n\nAdd some functions to operate the RTF_EXPIRES flag and expires(from) together.\nand change the code to use these new adding functions.\n\nChanges from v5:\nmodify ip6_route_add and ndisc_router_discovery to use new adding functions.\n\nOnly set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afface826c3a9a6cbdd96817e3fc522dce000486", "tree": "eaab8f95ea9c12140e0fcee105845dab509b8745", "parents": [ "76a835518f89d07213ce52c1c911cd4df3b2305f" ], "author": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Tue Apr 10 11:38:35 2012 +0530" }, "committer": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Tue Apr 10 15:37:04 2012 +0530" }, "message": "Bluetooth: Grace period to re-enable encryption\n\nIf the remote device does not support Encryption Pause,\nIt might disable Encryption during role switch. Allow a\nGrace period of 500 ms for such devices to re-enable.\n\nChange-Id: I8af8082e16e185fe8c15adaf07169cc73179c59f\nCRs-fixed: 336828\nSigned-off-by: Prabhakaran Mc \u003cprabhakaranmc@codeaurora.org\u003e\n" }, { "commit": "e24fb0b1b3aa80fd5e1524d9564f21bc1df15eed", "tree": "8b0e2d1863c7f947ee017f6c6a580717a673fd8f", "parents": [ "b75f955386c8729747ab369e7d575ae3910222de" ], "author": { "name": "Mike Chan", "email": "mike@android.com", "time": "Fri May 28 14:32:19 2010 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:57:50 2012 -0700" }, "message": "net: activity_stats: Add statistics for network transmission activity\n\nWhen enabled, tracks the frequency of network transmissions\n(inbound and outbound) and buckets them accordingly.\nBuckets are determined by time between network activity.\n\nEach bucket represents the number of network transmisions that were\nN sec or longer apart. Where N is defined as 1 \u003c\u003c bucket index.\n\nThis network pattern tracking is particularly useful for wireless\nnetworks (ie: 3G) where batching network activity closely together\nis more power efficient than far apart.\n\nNew file: /proc/net/stat/activity\n\noutput:\n\nMin Bucket(sec) Count\n 1 7\n 2 0\n 4 1\n 8 0\n 16 0\n 32 2\n 64 1\n 128 0\n\nChange-Id: I4c4cd8627b872a55f326b1715c51bc3bdd6e8d92\nSigned-off-by: Mike Chan \u003cmike@android.com\u003e\n" }, { "commit": "07021e27084db612e1308da87c1ced296bb708f1", "tree": "b9a9e31b85adddeadbacbea8b0a6b918616889c6", "parents": [ "e3bac0c5c4b9ee9f581bdae6111acbbda80d0a48" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Feb 11 11:54:28 2010 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:57:49 2012 -0700" }, "message": "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections.\n\n__u16 sco_pkt_type is introduced to struct sockaddr_sco. It allows bitwise\nselection of SCO/eSCO packet types. Currently those bits are:\n\n0x0001 HV1 may be used.\n0x0002 HV2 may be used.\n0x0004 HV3 may be used.\n0x0008 EV3 may be used.\n0x0010 EV4 may be used.\n0x0020 EV5 may be used.\n0x0040 2-EV3 may be used.\n0x0080 3-EV3 may be used.\n0x0100 2-EV5 may be used.\n0x0200 3-EV5 may be used.\n\nThis is similar to the Packet Type parameter in the HCI Setup Synchronous\nConnection Command, except that we are not reversing the logic on the EDR bits.\nThis makes the use of sco_pkt_tpye forward portable for the use case of\nwhite-listing packet types, which we expect will be the primary use case.\n\nIf sco_pkt_type is zero, or userspace uses the old struct sockaddr_sco,\nthen the default behavior is to allow all packet types.\n\nPacket type selection is just a request made to the Bluetooth chipset, and\nit is up to the link manager on the chipset to negiotiate and decide on the\nactual packet types used. Furthermore, when a SCO/eSCO connection is eventually\nmade there is no way for the host stack to determine which packet type was used\n(however it is possible to get the link type of SCO or eSCO).\n\nsco_pkt_type is ignored for incoming SCO connections. It is possible\nto add this in the future as a parameter to the Accept Synchronous Connection\nCommand, however its a little trickier because the kernel does not\ncurrently preserve sockaddr_sco data between userspace calls to accept().\n\nThe most common use for sco_pkt_type will be to white-list only SCO packets,\nwhich can be done with the hci.h constant SCO_ESCO_MASK.\n\nThis patch is motivated by broken Bluetooth carkits such as the Motorolo\nHF850 (it claims to support eSCO, but will actually reject eSCO connections\nafter 5 seconds) and the 2007/2008 Infiniti G35/37 (fails to route audio\nif a 2-EV5 packet type is negiotiated). With this patch userspace can maintain\na list of compatible packet types to workaround remote devices such as these.\n\nBased on a patch by Marcel Holtmann.\n\nRebased to 2.6.39.\n\nChange-Id: Ide1c89574fa4f6f1b9218282e1af17051eb86315\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "e3bac0c5c4b9ee9f581bdae6111acbbda80d0a48", "tree": "70036dc615804c7a68ce45b33f8694b07152a4f3", "parents": [ "6bbc2b2c13d95836e3d7a16cbd3c0b67df3db3a3" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Dec 09 00:15:41 2009 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:57:49 2012 -0700" }, "message": "Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info.\n\nThis provides userspace debugging tools access to ACL flow control state.\n\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "f855a2c3742daf81a43ab1e7bfe6c2d73f82b9eb", "tree": "f54c38624435600dbf6ef480ccc7cc1e0a62b32b", "parents": [ "64f9be0265b08ed793bc91756333a4d9f15843b4" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Sep 18 18:29:23 2009 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:57:48 2012 -0700" }, "message": "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds.\n\nLegacy pairing is a bit of a problem because on the incoming end it is\nimpossible to know pairing has begun:\n\n2009-09-18 18:29:24.115692 \u003e HCI Event: Connect Request (0x04) plen 10\n bdaddr 00:23:D4:04:51:7A class 0x58020c type ACL\n2009-09-18 18:29:24.115966 \u003c HCI Command: Accept Connection Request (0x01|0x0009) plen 7\n bdaddr 00:23:D4:04:51:7A role 0x00\n Role: Master\n2009-09-18 18:29:24.117065 \u003e HCI Event: Command Status (0x0f) plen 4\n Accept Connection Request (0x01|0x0009) status 0x00 ncmd 1\n2009-09-18 18:29:24.282928 \u003e HCI Event: Role Change (0x12) plen 8\n status 0x00 bdaddr 00:23:D4:04:51:7A role 0x00\n Role: Master\n2009-09-18 18:29:24.291534 \u003e HCI Event: Connect Complete (0x03) plen 11\n status 0x00 handle 1 bdaddr 00:23:D4:04:51:7A type ACL encrypt 0x00\n2009-09-18 18:29:24.291839 \u003c HCI Command: Read Remote Supported Features (0x01|0x001b) plen 2\n handle 1\n2009-09-18 18:29:24.292144 \u003e HCI Event: Page Scan Repetition Mode Change (0x20) plen 7\n bdaddr 00:23:D4:04:51:7A mode 1\n2009-09-18 18:29:24.293823 \u003e HCI Event: Command Status (0x0f) plen 4\n Read Remote Supported Features (0x01|0x001b) status 0x00 ncmd 1\n2009-09-18 18:29:24.303588 \u003e HCI Event: Max Slots Change (0x1b) plen 3\n handle 1 slots 5\n2009-09-18 18:29:24.309448 \u003e HCI Event: Read Remote Supported Features (0x0b) plen 11\n status 0x00 handle 1\n Features: 0xff 0xff 0x2d 0xfe 0x9b 0xff 0x79 0x83\n2009-09-18 18:29:24.345916 \u003c HCI Command: Remote Name Request (0x01|0x0019) plen 10\n bdaddr 00:23:D4:04:51:7A mode 2 clkoffset 0x0000\n2009-09-18 18:29:24.346923 \u003e HCI Event: Command Status (0x0f) plen 4\n Remote Name Request (0x01|0x0019) status 0x00 ncmd 1\n2009-09-18 18:29:24.375793 \u003e HCI Event: Remote Name Req Complete (0x07) plen 255\n status 0x00 bdaddr 00:23:D4:04:51:7A name \u0027test\u0027\n2009-09-18 18:29:34.332190 \u003c HCI Command: Disconnect (0x01|0x0006) plen 3\n handle 1 reason 0x13\n\nThere are some mainline patches such as \"Add different pairing timeout for\nLegacy Pairing\" but they do not address the HCI sequence above.\n\nI think the real solution is to avoid using CreateBond(), and instead make\nthe profile connection immediately. This way both sides will use a longer\ntimeout because there is a higher level connection in progress, and we will\nnot end up with the useless HCI sequence above.\n\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "2365d054980471b7fcb6d862169ddcec1eb52f4d", "tree": "532fd00c912501470daba9a90ab5d0248843929c", "parents": [ "2038692b9acf7ae3054a35e879039ff062316bf0" ], "author": { "name": "Robert Love", "email": "rlove@google.com", "time": "Mon May 12 17:08:29 2008 -0400" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:53:15 2012 -0700" }, "message": "net: socket ioctl to reset connections matching local address\n\nIntroduce a new socket ioctl, SIOCKILLADDR, that nukes all sockets\nbound to the same local address. This is useful in situations with\ndynamic IPs, to kill stuck connections.\n\nSigned-off-by: Brian Swetland \u003cswetland@google.com\u003e\n\nnet: fix tcp_v4_nuke_addr\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\n\nnet: ipv4: Fix a spinlock recursion bug in tcp_v4_nuke.\n\nWe can\u0027t hold the lock while calling to tcp_done(), so we drop\nit before calling. We then have to start at the top of the chain again.\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\n\nnet: ipv4: Fix race in tcp_v4_nuke_addr().\n\nTo fix a recursive deadlock in 2.6.29, we stopped holding the hash table lock\nacross tcp_done() calls. This fixed the deadlock, but introduced a race where\nthe socket could die or change state.\n\nFix: Before unlocking the hash table, we grab a reference to the socket. We\ncan then unlock the hash table without risk of the socket going away. We then\nlock the socket, which is safe because it is pinned. We can then call\ntcp_done() without recursive deadlock and without race. Upon return, we unlock\nthe socket and then unpin it, killing it.\n\nChange-Id: Idcdae072b48238b01bdbc8823b60310f1976e045\nSigned-off-by: Robert Love \u003crlove@google.com\u003e\nAcked-by: Dima Zavin \u003cdima@android.com\u003e\n\nipv4: disable bottom halves around call to tcp_done().\n\nSigned-off-by: Robert Love \u003crlove@google.com\u003e\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n\nipv4: Move sk_error_report inside bh_lock_sock in tcp_v4_nuke_addr\n\nWhen sk_error_report is called, it wakes up the user-space thread, which then\ncalls tcp_close. When the tcp_close is interrupted by the tcp_v4_nuke_addr\nioctl thread running tcp_done, it leaks 392 bytes and triggers a WARN_ON.\n\nThis patch moves the call to sk_error_report inside the bh_lock_sock, which\nmatches the locking used in tcp_v4_err.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "aa331df0e5e6ebac086ed80b4fbbfd912fe6b32a", "tree": "5cc76a05498c1a161367d72f2653744c3eaa8a27", "parents": [ "0298dc9f2273fb2d596ae10d7700f054bfce601d" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Fri Apr 06 16:35:53 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 09 15:54:48 2012 -0400" }, "message": "mac80211: Convert WARN_ON to WARN_ON_ONCE\n\nWhen the control-rate tables are not set up correctly, it makes\nlittle sense to spam the logs, thus change the WARN_ON to WARN_ON_ONCE.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "41833af713457fe92f432a7354bc690587652879", "tree": "6f821f85bd33c1823d557d1482f8aa6216cde5b3", "parents": [ "f68e556e23d1a4176b563bcb25d8baf2c5313f91", "66f3b913e68e8e62bd2f9499495eeb6cc81b2662" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 09 15:47:49 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 09 15:47:49 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth\n" }, { "commit": "66f3b913e68e8e62bd2f9499495eeb6cc81b2662", "tree": "ede083c071261502b9281c42c069e0ce61937e6e", "parents": [ "2e8b506310f6433d5558387fd568d4bfb1d6a799" ], "author": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Thu Mar 29 09:47:53 2012 -0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Thu Apr 05 15:05:51 2012 -0300" }, "message": "Bluetooth: Fix userspace compatibility issue with mgmt interface\n\nTo ensure that old user space versions do not accidentally pick up and\ntry to use the management channel, use a different channel number.\n\nReported-by: Keith Packard \u003ckeithp@keithp.com\u003e\nAcked-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "a8417e6c445ac8f1b27d9d24edb32bd5d14e9fd0", "tree": "46963f845f5464dadf9681aa92d16593133ec489", "parents": [ "9df83d350cddab2e1cf7a91d5add40db56d67d37" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Wed Mar 21 16:58:17 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Thu Apr 05 07:00:41 2012 -0700" }, "message": "Bluetooth: Ensure socket pointer is set during callback\n\nFix issue where when setting up an AMP link the socket pointer\nis not set when the logical link complete callback is called,\nresulting in the L2CAP channel being disconnected.\n\nThe socket pointer must be set before the HCI logical link\ncreate command is sent, as it is possible for the logical link\ncomplete event to arrive before the HCI command send logic\nhas returned.\n\nChange-Id: I5d89c14d45bd6b4cf47d5754f822b435ce8076a8\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\nCRs-fixed: 344553\n" }, { "commit": "9b461783d3d49c74665b55b8ae1b7a1c038177a9", "tree": "e4f27485a0669871a6e331b6daf64157bec4447a", "parents": [ "cff4c16296754888b6fd8c886bc860a888e20257", "44b52bccf855b0706de624c29fc3d82ca954bb4e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:15:48 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:15:48 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "a5e3c7500f8b6cdc2ced6a30fe099a48e9f04abb", "tree": "49afe9c9a03dd7e0507f2e6050ed6b8c622d561e", "parents": [ "4e619b121cd90aab57277e931009e3e9782f3856", "072a51fd0e1f642d179358c5610d9115cbdba358" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Apr 03 04:04:57 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Apr 03 04:04:57 2012 -0700" }, "message": "Merge \"Bluetooth: Hold ref on hci_conn when setting up A2MP fixed channel\" into msm-3.0" }, { "commit": "b744ebc22836fc58a5fab52d03bb56cd376c879d", "tree": "ae440da172eb1af35a2b84c27a1c030d3f2a0c77", "parents": [ "0c5ea033f6fab587cfadca5870b0f57d6ae2e93b", "4d9772370c639db8fa7ff10c6534116e8094cee0" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Apr 03 04:04:56 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Apr 03 04:04:57 2012 -0700" }, "message": "Merge \"Bluetooth: Increase Move timeout to allow exit from Sniff mode\" into msm-3.0" }, { "commit": "072a51fd0e1f642d179358c5610d9115cbdba358", "tree": "c74759792044f43b056f159b0b14cf82bcc15ef7", "parents": [ "26417da62764b0acdd5d5b9bc9237a024d10fad8" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Mar 30 12:59:33 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Mar 30 13:59:08 2012 -0700" }, "message": "Bluetooth: Hold ref on hci_conn when setting up A2MP fixed channel\n\nTake a reference on the hci_conn and do not de-reference l2cap_conn\nwhile setting up the A2MP fixed channel. l2cap_conn is not reference\ncounted and may go away before the channel is set up.\n\nThis fixes scenario where the ACL disconnects (and l2cap_conn goes\naway) while amp_conn_ind worker is running or is on the workqueue\nwaiting to run.\n\nChange-Id: I10fc6d9b146fcc5e010f26a046f7e0570f2b93dd\nCRs-fixed: 347079\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "a76e99abc558aed633ba28ff61c5328116292bf3", "tree": "60f7677f0baafa00825accc1214839246b3e78dd", "parents": [ "a54734678ff9cb97938b9f7648547174f3b118e4", "1d05f993784973189395051cc711fdd6dd5eb389" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "message": "Merge branch \u0027Linux 3.0.21\u0027 into msm-3.0\n\nMerge Upstream\u0027s stable 3.0.21 branch into msm-3.0\nThis consists 814 commits and some merge conflicts.\n\nThe merge conflicts are because of some local changes to\nmsm-3.0 as well as some conflicts between google\u0027s tree and\nthe upstream tree.\n\nConflicts:\n\tarch/arm/kernel/head.S\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/mmc/core/core.c\n\tdrivers/tty/serial/serial_core.c\n\tdrivers/usb/host/ehci-hub.c\n\tdrivers/usb/serial/qcserial.c\n\tfs/namespace.c\n\tfs/proc/base.c\n\nChange-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\u003e\n" }, { "commit": "c732a2af12e20f2784c8b0c9d2e289579313a413", "tree": "ae70a81143cffa51241da8f6087b89a403b65612", "parents": [ "76ec9de843c3cff41b3b15b752e1d08d91f0ad18" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@intel.com", "time": "Mon Mar 19 09:42:31 2012 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Wed Mar 28 15:13:18 2012 -0300" }, "message": "Bluetooth: mgmt: Fix timeout type\n\nSilence sparse warnings:\nnet/bluetooth/mgmt.c:865:19: warning: cast to restricted __le16\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "6c0c331e4c8ff6c0f7fa6cc5fd08d853d6c579c4", "tree": "819f4bb17b492dae2d9e7929dfd8cb31f072073d", "parents": [ "84d9d0716b2d5f4a27de4801bd2dbf7aff5e1c38" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Mar 26 14:21:42 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Wed Mar 28 12:02:40 2012 -0300" }, "message": "Bluetooth: Check for minimum data length in eir_has_data_type()\n\nIf passed 0 as data_length the (parsed \u003c data_length - 1) test will be\ntrue and cause a buffer overflow. In practice we need at least two bytes\nfor the element length and type so add a test for it to the very\nbeginning of the function.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "84d9d0716b2d5f4a27de4801bd2dbf7aff5e1c38", "tree": "904a091f877be933498eed2bfbf056f404c3b61a", "parents": [ "8d7e1c7f7e5f9fe8f6279752fc33fcb77afd5001" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Mar 26 14:21:41 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Wed Mar 28 12:02:40 2012 -0300" }, "message": "Bluetooth: Don\u0027t increment twice in eir_has_data_type()\n\nThe parsed variable is already incremented inside the for-loop so there\nno need to increment it again (not to mention that the code was\nincrementing it the wrong amount).\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "94324962066231a938564bebad0f941cd2d06bb2", "tree": "fbf3906cbc625f7140bb01fe45b963ac4471add8", "parents": [ "33b69bf80a3704d45341928e4ff68b6ebd470686" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Thu Mar 15 14:48:41 2012 +0100" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Wed Mar 28 12:02:35 2012 -0300" }, "message": "Bluetooth: hci_core: fix NULL-pointer dereference at unregister\n\nMake sure hci_dev_open returns immediately if hci_dev_unregister has\nbeen called.\n\nThis fixes a race between hci_dev_open and hci_dev_unregister which can\nlead to a NULL-pointer dereference.\n\nBug is 100% reproducible using hciattach and a disconnected serial port:\n\n0. # hciattach -n /dev/ttyO1 any noflow\n\n1. hci_dev_open called from hci_power_on grabs req lock\n2. hci_init_req executes but device fails to initialise (times out\n eventually)\n3. hci_dev_open is called from hci_sock_ioctl and sleeps on req lock\n4. hci_uart_tty_close calls hci_dev_unregister and sleeps on req lock in\n hci_dev_do_close\n5. hci_dev_open (1) releases req lock\n6. hci_dev_do_close grabs req lock and returns as device is not up\n7. hci_dev_unregister sleeps in destroy_workqueue\n8. hci_dev_open (3) grabs req lock, calls hci_init_req and eventually sleeps\n9. hci_dev_unregister finishes, while hci_dev_open is still running...\n\n[ 79.627136] INFO: trying to register non-static key.\n[ 79.632354] the code is fine but needs lockdep annotation.\n[ 79.638122] turning off the locking correctness validator.\n[ 79.643920] [\u003cc00188bc\u003e] (unwind_backtrace+0x0/0xf8) from [\u003cc00729c4\u003e] (__lock_acquire+0x1590/0x1ab0)\n[ 79.653594] [\u003cc00729c4\u003e] (__lock_acquire+0x1590/0x1ab0) from [\u003cc00733f8\u003e] (lock_acquire+0x9c/0x128)\n[ 79.663085] [\u003cc00733f8\u003e] (lock_acquire+0x9c/0x128) from [\u003cc0040a88\u003e] (run_timer_softirq+0x150/0x3ac)\n[ 79.672668] [\u003cc0040a88\u003e] (run_timer_softirq+0x150/0x3ac) from [\u003cc003a3b8\u003e] (__do_softirq+0xd4/0x22c)\n[ 79.682281] [\u003cc003a3b8\u003e] (__do_softirq+0xd4/0x22c) from [\u003cc003a924\u003e] (irq_exit+0x8c/0x94)\n[ 79.690856] [\u003cc003a924\u003e] (irq_exit+0x8c/0x94) from [\u003cc0013a50\u003e] (handle_IRQ+0x34/0x84)\n[ 79.699157] [\u003cc0013a50\u003e] (handle_IRQ+0x34/0x84) from [\u003cc0008530\u003e] (omap3_intc_handle_irq+0x48/0x4c)\n[ 79.708648] [\u003cc0008530\u003e] (omap3_intc_handle_irq+0x48/0x4c) from [\u003cc037499c\u003e] (__irq_usr+0x3c/0x60)\n[ 79.718048] Exception stack(0xcf281fb0 to 0xcf281ff8)\n[ 79.723358] 1fa0: 0001e6a0 be8dab00 0001e698 00036698\n[ 79.731933] 1fc0: 0002df98 0002df38 0000001f 00000000 b6f234d0 00000000 00000004 00000000\n[ 79.740509] 1fe0: 0001e6f8 be8d6aa0 be8dac50 0000aab8 80000010 ffffffff\n[ 79.747497] Unable to handle kernel NULL pointer dereference at virtual address 00000000\n[ 79.756011] pgd \u003d cf3b4000\n[ 79.758850] [00000000] *pgd\u003d8f0c7831, *pte\u003d00000000, *ppte\u003d00000000\n[ 79.765502] Internal error: Oops: 80000007 [#1]\n[ 79.770294] Modules linked in:\n[ 79.773529] CPU: 0 Tainted: G W (3.3.0-rc6-00002-gb5d5c87 #421)\n[ 79.781066] PC is at 0x0\n[ 79.783721] LR is at run_timer_softirq+0x16c/0x3ac\n[ 79.788787] pc : [\u003c00000000\u003e] lr : [\u003cc0040aa4\u003e] psr: 60000113\n[ 79.788787] sp : cf281ee0 ip : 00000000 fp : cf280000\n[ 79.800903] r10: 00000004 r9 : 00000100 r8 : b6f234d0\n[ 79.806427] r7 : c0519c28 r6 : cf093488 r5 : c0561a00 r4 : 00000000\n[ 79.813323] r3 : 00000000 r2 : c054eee0 r1 : 00000001 r0 : 00000000\n[ 79.820190] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user\n[ 79.827728] Control: 10c5387d Table: 8f3b4019 DAC: 00000015\n[ 79.833801] Process gpsd (pid: 1265, stack limit \u003d 0xcf2802e8)\n[ 79.839965] Stack: (0xcf281ee0 to 0xcf282000)\n[ 79.844573] 1ee0: 00000002 00000000 c0040a24 00000000 00000002 cf281f08 00200200 00000000\n[ 79.853210] 1f00: 00000000 cf281f18 cf281f08 00000000 00000000 00000000 cf281f18 cf281f18\n[ 79.861816] 1f20: 00000000 00000001 c056184c 00000000 00000001 b6f234d0 c0561848 00000004\n[ 79.870452] 1f40: cf280000 c003a3b8 c051e79c 00000001 00000000 00000100 3fa9e7b8 0000000a\n[ 79.879089] 1f60: 00000025 cf280000 00000025 00000000 00000000 b6f234d0 00000000 00000004\n[ 79.887756] 1f80: 00000000 c003a924 c053ad38 c0013a50 fa200000 cf281fb0 ffffffff c0008530\n[ 79.896362] 1fa0: 0001e6a0 0000aab8 80000010 c037499c 0001e6a0 be8dab00 0001e698 00036698\n[ 79.904998] 1fc0: 0002df98 0002df38 0000001f 00000000 b6f234d0 00000000 00000004 00000000\n[ 79.913665] 1fe0: 0001e6f8 be8d6aa0 be8dac50 0000aab8 80000010 ffffffff 00fbf700 04ffff00\n[ 79.922302] [\u003cc0040aa4\u003e] (run_timer_softirq+0x16c/0x3ac) from [\u003cc003a3b8\u003e] (__do_softirq+0xd4/0x22c)\n[ 79.931945] [\u003cc003a3b8\u003e] (__do_softirq+0xd4/0x22c) from [\u003cc003a924\u003e] (irq_exit+0x8c/0x94)\n[ 79.940582] [\u003cc003a924\u003e] (irq_exit+0x8c/0x94) from [\u003cc0013a50\u003e] (handle_IRQ+0x34/0x84)\n[ 79.948913] [\u003cc0013a50\u003e] (handle_IRQ+0x34/0x84) from [\u003cc0008530\u003e] (omap3_intc_handle_irq+0x48/0x4c)\n[ 79.958404] [\u003cc0008530\u003e] (omap3_intc_handle_irq+0x48/0x4c) from [\u003cc037499c\u003e] (__irq_usr+0x3c/0x60)\n[ 79.967773] Exception stack(0xcf281fb0 to 0xcf281ff8)\n[ 79.973083] 1fa0: 0001e6a0 be8dab00 0001e698 00036698\n[ 79.981658] 1fc0: 0002df98 0002df38 0000001f 00000000 b6f234d0 00000000 00000004 00000000\n[ 79.990234] 1fe0: 0001e6f8 be8d6aa0 be8dac50 0000aab8 80000010 ffffffff\n[ 79.997161] Code: bad PC value\n[ 80.000396] ---[ end trace 6f6739840475f9ee ]---\n[ 80.005279] Kernel panic - not syncing: Fatal exception in interrupt\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "3f17790c2d8524c3ddc4946bd716714becf079e1", "tree": "ef1e5d5ff2cb57c7b9f7900f695a9d8d9b26a740", "parents": [ "22e7a424854b80f00bd5686b6539726b8ca95420" ], "author": { "name": "Hemant Gupta", "email": "hemant.gupta@stericsson.com", "time": "Wed Mar 28 17:09:09 2012 +0530" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Wed Mar 28 12:02:19 2012 -0300" }, "message": "Bluetooth: Use correct flags for checking HCI_SSP_ENABLED bit\n\nThis patch uses the correct flags for checking the HCI_SSP_ENABLED bit.\nWithout this authentication request was not being initiated.\n\nSigned-off-by: Hemant Gupta \u003chemant.gupta@stericsson.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "7dd30d447b7f4a129586cce8e57d0163dde876b0", "tree": "f6a3c26bccbd31e144c8c68fda979988739d4af5", "parents": [ "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "643c61e119459e9d750087b7b34be94491efebf9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 27 22:15:01 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 27 22:15:01 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "tree": "0b871e5f4cf3204c4c6243c7622c4787d56d48ee", "parents": [ "66f03c614c0902ccf7d6160459362a9352f33271", "94f826b8076e2cb92242061e92f21b5baa3eccc2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:52:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:52:32 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n 1) Name string overrun fix in gianfar driver from Joe Perches.\n\n 2) VHOST bug fixes from Michael S. Tsirkin and Nadav Har\u0027El\n\n 3) Fix dependencies on xt_LOG netfilter module, from Pablo Neira Ayuso.\n\n 4) Fix RCU locking in xt_CT, also from Pablo Neira Ayuso.\n\n 5) Add a parameter to skb_add_rx_frag() so we can fix the truesize\n adjustments in the drivers that use it. The individual drivers\n aren\u0027t fixed by this commit, but will be dealt with using follow-on\n commits. From Eric Dumazet.\n\n 6) Add some device IDs to qmi_wwan driver, from Andrew Bird.\n\n 7) Fix a potential rcu_read_lock() imbalancein rt6_fill_node(). From\n Eric Dumazet.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()\n net: add a truesize parameter to skb_add_rx_frag()\n gianfar: Fix possible overrun and simplify interrupt name field creation\n USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfaces\n USB: option: Ignore ZTE (Vodafone) K3570/71 net interfaces\n USB: qmi_wwan: Add ZTE (Vodafone) K3565-Z and K4505-Z net interfaces\n qlcnic: Bug fix for LRO\n netfilter: nf_conntrack: permanently attach timeout policy to conntrack\n netfilter: xt_CT: fix assignation of the generic protocol tracker\n netfilter: xt_CT: missing rcu_read_lock section in timeout assignment\n netfilter: cttimeout: fix dependency with l4protocol conntrack module\n netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6\n vhost: fix release path lockdep checks\n vhost: don\u0027t forget to schedule()\n tools/virtio: stub out strong barriers\n tools/virtio: add linux/hrtimer.h stub\n tools/virtio: add linux/module.h stub\n" }, { "commit": "66266b3ab4871958ed6a1e43f502cadaf3becfc8", "tree": "202d9da52387cd9ea0997d79c9e83bed15a9fab1", "parents": [ "e92109be7a6a04808c3ed586475ba1e5ea56ecbd" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Mar 15 13:25:41 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 26 15:07:25 2012 -0400" }, "message": "cfg80211: allow CFG80211_SIGNAL_TYPE_UNSPEC in station_info\n\nThe station_info struct had demanded dBm signal values, but the\ncfg80211 wireless extensions implementation was also accepting\n\"unspecified\" (i.e. RSSI) unit values while the nl80211 code was\ncompletely unaware of them. Resolve this by formally allowing the\n\"unspecified\" units while making nl80211 ignore them.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\n" }, { "commit": "f3d229c68bb47170f04f81e51c9ed5d4286cebdb", "tree": "9c3876f0fe7d7936c5b2c141456ab69e17bed670", "parents": [ "1d5c88e3f5403c1910477e4bcc71c3d5d40de6d5" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Wed Mar 07 23:45:44 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Mar 26 14:00:28 2012 +0200" }, "message": "netfilter: xt_LOG: don\u0027t use xchg() for simple assignment\n\nAt least on ia64 the (bogus) use of xchg() here results in the compiler\nwarning about an unused expression result. As only an assignment is\nintended here, convert it to such.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "250f6715a4112d6686670c5a62ceb9305da94616", "tree": "ee1c9b41ed1fed8174efb312421902f19c877e8c", "parents": [ "11bcb32848ddb5ab28f09f142b625e2ba4d55c4c", "313162d0b83836e2f57e51b9b8650fb4b9c396ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:41:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:41:37 2012 -0700" }, "message": "Merge tag \u0027device-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/device.h\u003e avoidance patches from Paul Gortmaker:\n \"Nearly every subsystem has some kind of header with a proto like:\n\n\tvoid foo(struct device *dev);\n\n and yet there is no reason for most of these guys to care about the\n sub fields within the device struct. This allows us to significantly\n reduce the scope of headers including headers. For this instance, a\n reduction of about 40% is achieved by replacing the include with the\n simple fact that the device is some kind of a struct.\n\n Unlike the much larger module.h cleanup, this one is simply two\n commits. One to fix the implicit \u003clinux/device.h\u003e users, and then one\n to delete the device.h includes from the linux/include/ dir wherever\n possible.\"\n\n* tag \u0027device-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n device.h: audit and cleanup users in main include dir\n device.h: cleanup users outside of linux/include (C files)\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "626cf236608505d376e4799adb4f7eb00a8594af", "tree": "eb0421fec1a7fed05cd9ea785bd18b5f40c80971", "parents": [ "5cde7656d0dd222170eb0250bd1f70c9018fd438" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Mar 23 15:02:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "poll: add poll_requested_events() and poll_does_not_wait() functions\n\nIn some cases the poll() implementation in a driver has to do different\nthings depending on the events the caller wants to poll for. An example\nis when a driver needs to start a DMA engine if the caller polls for\nPOLLIN, but doesn\u0027t want to do that if POLLIN is not requested but instead\nonly POLLOUT or POLLPRI is requested. This is something that can happen\nin the video4linux subsystem among others.\n\nUnfortunately, the current epoll/poll/select implementation doesn\u0027t\nprovide that information reliably. The poll_table_struct does have it: it\nhas a key field with the event mask. But once a poll() call matches one\nor more bits of that mask any following poll() calls are passed a NULL\npoll_table pointer.\n\nAlso, the eventpoll implementation always left the key field at ~0 instead\nof using the requested events mask.\n\nThis was changed in eventpoll.c so the key field now contains the actual\nevents that should be polled for as set by the caller.\n\nThe solution to the NULL poll_table pointer is to set the qproc field to\nNULL in poll_table once poll() matches the events, not the poll_table\npointer itself. That way drivers can obtain the mask through a new\npoll_requested_events inline.\n\nThe poll_table_struct can still be NULL since some kernel code calls it\ninternally (netfs_state_poll() in ./drivers/staging/pohmelfs/netfs.h). In\nthat case poll_requested_events() returns ~0 (i.e. all events).\n\nVery rarely drivers might want to know whether poll_wait will actually\nwait. If another earlier file descriptor in the set already matched the\nevents the caller wanted to wait for, then the kernel will return from the\nselect() call without waiting. This might be useful information in order\nto avoid doing expensive work.\n\nA new helper function poll_does_not_wait() is added that drivers can use\nto detect this situation. This is now used in sock_poll_wait() in\ninclude/net/sock.h. This was the only place in the kernel that needed\nthis information.\n\nDrivers should no longer access any of the poll_table internals, but use\nthe poll_requested_events() and poll_does_not_wait() access functions\ninstead. In order to enforce that the poll_table fields are now prepended\nwith an underscore and a comment was added warning against using them\ndirectly.\n\nThis required a change in unix_dgram_poll() in unix/af_unix.c which used\nthe key field to get the requested events. It\u0027s been replaced by a call\nto poll_requested_events().\n\nFor qproc it was especially important to change its name since the\nbehavior of that field changes with this patch since this function pointer\ncan now be NULL when that wasn\u0027t possible in the past.\n\nAny driver accessing the qproc or key fields directly will now fail to compile.\n\nSome notes regarding the correctness of this patch: the driver\u0027s poll()\nfunction is called with a \u0027struct poll_table_struct *wait\u0027 argument. This\npointer may or may not be NULL, drivers can never rely on it being one or\nthe other as that depends on whether or not an earlier file descriptor in\nthe select()\u0027s fdset matched the requested events.\n\nThere are only three things a driver can do with the wait argument:\n\n1) obtain the key field:\n\n\tevents \u003d wait ? wait-\u003ekey : ~0;\n\n This will still work although it should be replaced with the new\n poll_requested_events() function (which does exactly the same).\n This will now even work better, since wait is no longer set to NULL\n unnecessarily.\n\n2) use the qproc callback. This could be deadly since qproc can now be\n NULL. Renaming qproc should prevent this from happening. There are no\n kernel drivers that actually access this callback directly, BTW.\n\n3) test whether wait \u003d\u003d NULL to determine whether poll would return without\n waiting. This is no longer sufficient as the correct test is now\n wait \u003d\u003d NULL || wait-\u003e_qproc \u003d\u003d NULL.\n\n However, the worst that can happen here is a slight performance hit in\n the case where wait !\u003d NULL and wait-\u003e_qproc \u003d\u003d NULL. In that case the\n driver will assume that poll_wait() will actually add the fd to the set\n of waiting file descriptors. Of course, poll_wait() will not do that\n since it tests for wait-\u003e_qproc. This will not break anything, though.\n\n There is only one place in the whole kernel where this happens\n (sock_poll_wait() in include/net/sock.h) and that code will be replaced\n by a call to poll_does_not_wait() in the next patch.\n\n Note that even if wait-\u003e_qproc !\u003d NULL drivers cannot rely on poll_wait()\n actually waiting. The next file descriptor from the set might match the\n event mask and thus any possible waits will never happen.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nReviewed-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nReviewed-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c1ebd7dff700277e4d0a3da36833a406142e31d4", "tree": "fbcfed48280d81744fe77efebb91900c7db1c776", "parents": [ "a0f65a267dd62aef4e003f833ea6290fd1e07b34" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Mar 22 23:40:01 2012 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Mar 23 00:52:01 2012 +0100" }, "message": "netfilter: cttimeout: fix dependency with l4protocol conntrack module\n\nThis patch introduces nf_conntrack_l4proto_find_get() and\nnf_conntrack_l4proto_put() to fix module dependencies between\ntimeout objects and l4-protocol conntrack modules.\n\nThus, we make sure that the module cannot be removed if it is\nused by any of the cttimeout objects.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "e2a0883e4071237d09b604a342c28b96b44a04b3", "tree": "aa56f4d376b5eb1c32358c19c2669c2a94e0e1fd", "parents": [ "3a990a52f9f25f45469e272017a31e7a3fda60ed", "07c0c5d8b8c122b2f2df9ee574ac3083daefc981" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs pile 1 from Al Viro:\n \"This is _not_ all; in particular, Miklos\u0027 and Jan\u0027s stuff is not there\n yet.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)\n ext4: initialization of ext4_li_mtx needs to be done earlier\n debugfs-related mode_t whack-a-mole\n hfsplus: add an ioctl to bless files\n hfsplus: change finder_info to u32\n hfsplus: initialise userflags\n qnx4: new helper - try_extent()\n qnx4: get rid of qnx4_bread/qnx4_getblk\n take removal of PF_FORKNOEXEC to flush_old_exec()\n trim includes in inode.c\n um: uml_dup_mmap() relies on -\u003emmap_sem being held, but activate_mm() doesn\u0027t hold it\n um: embed -\u003estub_pages[] into mmu_context\n gadgetfs: list_for_each_safe() misuse\n ocfs2: fix leaks on failure exits in module_init\n ecryptfs: make register_filesystem() the last potential failure exit\n ntfs: forgets to unregister sysctls on register_filesystem() failure\n logfs: missing cleanup on register_filesystem() failure\n jfs: mising cleanup on register_filesystem() failure\n make configfs_pin_fs() return root dentry on success\n configfs: configfs_create_dir() has parent dentry in dentry-\u003ed_parent\n configfs: sanitize configfs_create()\n ...\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "40ffe67d2e89c7a475421d007becc11a2f88ea3d", "tree": "5373e71b18895b9ffd8370a88aec6c54438240a0", "parents": [ "38eff2892628fa5c4fc8962a17b7296f42833ebe" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 14 21:54:32 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:41 2012 -0400" }, "message": "switch unix_sock to struct path\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0d9cabdccedb79ee5f27b77ff51f29a9e7d23275", "tree": "8bfb64c3672d058eb90aec3c3a9c4f61cef9097c", "parents": [ "701085b219016d38f105b031381b9cee6200253a", "3ce3230a0cff484e5130153f244d4fb8a56b3a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"Out of the 8 commits, one fixes a long-standing locking issue around\n tasklist walking and others are cleanups.\"\n\n* \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list\n cgroup: Remove wrong comment on cgroup_enable_task_cg_list()\n cgroup: remove cgroup_subsys argument from callbacks\n cgroup: remove extra calls to find_existing_css_set\n cgroup: replace tasklist_lock with rcu_read_lock\n cgroup: simplify double-check locking in cgroup_attach_proc\n cgroup: move struct cgroup_pidlist out from the header file\n cgroup: remove cgroup_attach_task_current_cg()\n" }, { "commit": "26a752b8a7af75b375ea6322d6819700afe3263f", "tree": "63a7a0856ce79f33460188814cfb3ad8f732729b", "parents": [ "cf76837260758073496ce6325bcb20e657eb2066" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Tue Dec 20 11:27:40 2011 -0800" }, "committer": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Mon Mar 19 21:21:45 2012 -0700" }, "message": "Bluetooth: Poll for RSSI updates from the remote device\n\nThis feature is required for implementing Low energy\nproximity client immediate alert service. The proximtiy\nclient registers with the kernel for receiving RSSI updates\nof the remote device. The kernel starts polling for RSSI\nvalue using READ_RSSI HCI command and When it reaches\na particular threshold set by the proximity client,\nupdates are sent to the client.\n\nChange-Id: I723dd140ad3bf02978c57b3ab127bb6768f28cca\nCRs-fixed: 344936\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n" }, { "commit": "b7029072eff888d7dc6fad00c49cd8a15f81689d", "tree": "5de305b6c3df9e69041bb0e9113e8c42f968fb35", "parents": [ "16bca47b11d12bfc2f75b74b8134e02c719a8371", "453651c5db2cba83b07331199ce5e35a0f6f057b" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Mar 17 05:05:06 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Mar 17 05:05:07 2012 -0700" }, "message": "Merge \"Bluetooth: Set security level based on remote device features.\" into msm-3.0" }, { "commit": "01a282980937f9ca55a3cb06b9c6ff1cc49ea396", "tree": "07a043edc861e245a7a9764751af0898a1f1199a", "parents": [ "d5ddb4a59ed43b4c569b4efa8b508d50ef140cc6", "377526578f2c343ea281a918b18ece1fca65005c" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Mar 16 13:45:25 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Mar 16 13:45:25 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/hw.c\n" }, { "commit": "313162d0b83836e2f57e51b9b8650fb4b9c396ea", "tree": "8f39f20515a924d392cf9a72db0918fda07a34c7", "parents": [ "51990e825431089747f8896244b5c17d3a6423f1" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Jan 30 11:46:54 2012 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Mar 16 10:38:24 2012 -0400" }, "message": "device.h: audit and cleanup users in main include dir\n\nThe \u003clinux/device.h\u003e header includes a lot of stuff, and\nit in turn gets a lot of use just for the basic \"struct device\"\nwhich appears so often.\n\nClean up the users as follows:\n\n1) For those headers only needing \"struct device\" as a pointer\nin fcn args, replace the include with exactly that.\n\n2) For headers not really using anything from device.h, simply\ndelete the include altogether.\n\n3) For headers relying on getting device.h implicitly before\nbeing included themselves, now explicitly include device.h\n\n4) For files in which doing #1 or #2 uncovers an implicit\ndependency on some other header, fix by explicitly adding\nthe required header(s).\n\nAny C files that were implicitly relying on device.h to be\npresent have already been dealt with in advance.\n\nTotal removals from #1 and #2: 51. Total additions coming\nfrom #3: 9. Total other implicit dependencies from #4: 7.\n\nAs of 3.3-rc1, there were 110, so a net removal of 42 gives\nabout a 38% reduction in device.h presence in include/*\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "453651c5db2cba83b07331199ce5e35a0f6f057b", "tree": "8e24e35193f3fd83326a0351c589304ba5c6ce95", "parents": [ "ed396a57e9de8bf1d6859478fde5c28714a3cf4f" ], "author": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Fri Mar 02 11:55:59 2012 +0530" }, "committer": { "name": "Prabhakaran Mc", "email": "prabhakaranmc@codeaurora.org", "time": "Wed Mar 14 16:05:16 2012 +0530" }, "message": "Bluetooth: Set security level based on remote device features.\n\nConnection security level is modified based on remote device\u0027s\nextended feature. Deciding SSP capability of remote device\nby EIR response is incorrect, because few BT2.1 devices do not\nsend EIR and few BT2.1 devices which send EIR do not support\nSSP. SSP capability of remote device has to be decided based on\nremote_extended_features event. This patch makes sure that\nMEDIUM_SECURITY is set for non ssp devices\u0027 pairing process.\n\nChange-Id: I328a35a30895f2ab6abaaeec51b364ecd633e642\nCRs-fixed: 339166\nSigned-off-by: Prabhakaran Mc \u003cprabhakaranmc@codeaurora.org\u003e\n" } ], "next": "08166fc6f488afef37101a63881ec01613971952" }