)]}' { "log": [ { "commit": "eb9bc6e9a0ac668d2283b8fea1534f8ba31d1692", "tree": "91e9c684e967a7959cce3ae6de256d0f9ac51f85", "parents": [ "0a40acb24602783fcf6881f915659148aa9807d7" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Mar 05 01:03:54 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:25 2012 -0500" }, "message": "NFC: NCI code identation fixes\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0a40acb24602783fcf6881f915659148aa9807d7", "tree": "aad4a42c270c615fdc67f454f974794e8fcd2160", "parents": [ "427a2eb1f568c9c5934a36105232c94553db9b69" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Mar 05 01:03:53 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:25 2012 -0500" }, "message": "NFC: Core code identation fixes\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "47807d3dbb62e93850cbcb797db1a9ee1806f986", "tree": "f8e1970083547290e35830e5bedb4a4ce7237f97", "parents": [ "9dda50f4c98f84e32a5f6dc4d9dd7af6085add43" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Mar 05 01:03:50 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:23 2012 -0500" }, "message": "NFC: Remove the rf mode parameter from the DEP link up routine\n\nWhen calling nfc_dep_link_up, we implicitely are in initiator mode.\nWhich means we also can provide the general bytes as a function argument,\nas all drivers will eventually request them.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c970a1ac4e75a5d31c7b6e8e9f0bb192b0a511e7", "tree": "8c1e110d2c21b69132b5912a0a8f4e1f65855f15", "parents": [ "c3b1e1e8a76fdaa507daaa95ba7bd1d8d0c74b6b" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Mar 05 01:03:34 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:19 2012 -0500" }, "message": "NFC: Add device powered netlink attribute\n\nFor user space to know if a device is up or down.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "10d8493cd9efd38b1947b7a74276dbdc8311aa1a", "tree": "69caa6570a2582667783dd03c8ce5c204881f398", "parents": [ "4ac887cfdad909f16ee1886fe4fa19b452fc7fd3" ], "author": { "name": "Arend van Spriel", "email": "arend@broadcom.com", "time": "Tue Mar 06 15:50:48 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:18 2012 -0500" }, "message": "bcma: add support for on-chip OTP memory used for SPROM storage\n\nWireless Broadcom chips can have either their SPROM data stored\non either external SPROM or on-chip OTP memory. Both are accessed\nthrough the same register space. This patch adds support for the\non-chip OTP memory.\n\nTested with:\nBCM43224 OTP and SPROM\nBCM4331 SPROM\nBCM4313 OTP\n\nThis patch is in response to linux-wireless thread [1].\n\n[1] http://article.gmane.org/gmane.linux.kernel.wireless.general/85426\n\nTested-by: Saul St. John \u003csaul.stjohn@gmail.com\u003e\nTested-by: Rafal Milecki \u003czajec5@gmail.com\u003e\nTested-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nCc: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8097e1494459a4f9cdbaba7440334d9bd11a39f0", "tree": "c04b23569e81b35711a56f55ae60ad8ebf6e0563", "parents": [ "2e7eb117586198386e5a06d0bc4279a9d7cbaeb6" ], "author": { "name": "Thomas Pedersen", "email": "thomas@cozybit.com", "time": "Mon Mar 05 15:31:47 2012 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:17 2012 -0500" }, "message": "cfg80211: expose cfg80211_calculate_bitrate()\n\nSigned-off-by: Thomas Pedersen \u003cthomas@cozybit.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "804483e90794256f9ed53e795ffbf1e94de237c8", "tree": "22a4d8ade674bb42aaf4d3e878dfd6a73b618dcc", "parents": [ "769009b89d8c29c410a99eee3cd63764b1fff869" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Mar 05 22:18:41 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Mar 06 15:16:05 2012 -0500" }, "message": "cfg80211/mac80211: report signal strength for mgmt frames\n\nAdd the signal strength (in dBm only for now) to\nframes that are received via nl80211\u0027s various\nframe APIs.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1b658f118b11de3c4052ed8cbdd5803cd1fa5670", "tree": "162160c05d29fc99b18d1914ffe2d614f2c9af6a", "parents": [ "d665508b98d3cdbeb476e7d6848a513184a81ed0" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vthiagar@qca.qualcomm.com", "time": "Fri Mar 02 15:50:02 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:38:34 2012 -0500" }, "message": "cfg80211: Add an attribute to set inactivity timeout in AP mode\n\nThis patch adds an attribute, NL80211_ATTR_INACTIVITY_TIMEOUT,\nto set the inactivity timeout which can be used to remove the\nstation in AP mode. This can be passed in NL80211_CMD_START_AP\nand used by the drivers which have AP MLME in firmware but\ndon\u0027t support get_station() properly. To disable inactivity\ntimer in userspace, wpa_s for example, there is a new flag,\nNL80211_FEATURE_INACTIVITY_TIMER, in nl80211_feature_flags\nthrough which drivers can register their capability to use\nthe inactivity timeout to free the stations.\n\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvthiagar@qca.qualcomm.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fe8431f89e25de722610ee5beb2892bd019d1fed", "tree": "93212c4f0e7f897c8c53bbd0b93f31640ec33e4b", "parents": [ "c04a4ff71b6a59cb5c8deec961b9196226e89573" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Thu Mar 01 18:00:07 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:38:32 2012 -0500" }, "message": "mac80211: add an rx flag for ignoring a packet\u0027s signal strength\n\nFor A-MPDU rx it makes sense to only process the signal strength once per\naggregate instead of once per subframe. Additonally, some hardware (e.g.\nAtheros) only provides valid signal strength information for the last\nsubframe.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c04a4ff71b6a59cb5c8deec961b9196226e89573", "tree": "fa60388b03f24eebbe925a5398422aa6b4e8d99f", "parents": [ "888d04dfbe7e09f930fdaafb257cce2c54c9c3f3" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Mar 01 15:28:19 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:38:32 2012 -0500" }, "message": "cfg80211: fix kernel-doc\n\nI forgot to update the kernel-doc in my patch\nto redesign AP mode APIs, fix that now.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5533513784a88049e19dd2ab380a452b61e5171e", "tree": "8e48d0cf30f3e94475ee80479308e98908b3c0bc", "parents": [ "5809802180b2b638762465cbad3f51a9ac8ff0b3" ], "author": { "name": "Ashok Nagarajan", "email": "ashok@cozybit.com", "time": "Tue Feb 28 17:04:08 2012 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:23:15 2012 -0500" }, "message": "{nl,cfg,mac}80211: Implement RSSI threshold for mesh peering\n\nMesh peer links are established only if average rssi of the peer\ncandidate satisfies the threshold. This is not in 802.11s specification\nbut was requested by David Fulgham, an open80211s user. This is a way to avoid\nmarginal peer links with stations that are barely within range.\n\nThis patch adds a new mesh configuration parameter, mesh_rssi_threshold. This\nfeature is supported only for hardwares that report signal in dBm.\n\nSigned-off-by: Ashok Nagarajan \u003cashok@cozybit.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a027237a56f7d519eee5749cfb720e568d0bb0b6", "tree": "0d408171f47086b66330a844701747d8aa0e37fc", "parents": [ "1c9351cf2180924c91bb85e5ba607f24a3d875b1" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:10 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:50 2012 -0500" }, "message": "bcma: add support for sprom not found on the device\n\nOn SoCs the sprom is stored in the nvram in a special partition on the\nflash chip. The nvram contains the sprom for the main bus, but\nsometimes also for a pci devices using bcma. This patch makes it\npossible for the arch code to register a function to fetch the needed\nsprom from the nvram and provide it to the bcma code.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1c9351cf2180924c91bb85e5ba607f24a3d875b1", "tree": "4e09e2efb552bf11454912b817d8d81c4430670f", "parents": [ "52aa63f5322aab23e07a52ff8ddd246d34799eb5" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:09 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:50 2012 -0500" }, "message": "bcma: export bcma_find_core\n\nThis function is needed by the bcm47xx arch code to get the number of\nthe ieee80211 core.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "52aa63f5322aab23e07a52ff8ddd246d34799eb5", "tree": "e019d203d419f74dce114d191a86ef7feb1ca7e4", "parents": [ "03a5642b6a578d8de355b77efff49bbc45b8be6d" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:08 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:49 2012 -0500" }, "message": "ssb: add some missing sprom attributes\n\nThis patch extends the sprom struct to contain all sprom attributes\nfound in sprom version 1 to 9. This was done accordingly to the open\nsource part of the Broadcom SDK.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "03a5642b6a578d8de355b77efff49bbc45b8be6d", "tree": "21d4b1f2efae6e770775d986b045996bbec2337c", "parents": [ "3b64e6f9050ff87a746c8e07dc04d97c7f26c5e2" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:07 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:49 2012 -0500" }, "message": "ssb: add alpha2\n\nThis member contains the country code encoded with two chars\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3b64e6f9050ff87a746c8e07dc04d97c7f26c5e2", "tree": "d03d38affb96f51c501755504483f83ade07c2ca", "parents": [ "f8f8a660ba501ad14617ccd0d91a1ed8ce54d6d0" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:06 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:49 2012 -0500" }, "message": "ssb: fix per path sprom vars\n\nOn sprom version 4 and 5 there are 4 values for pa_2g, pa_5gl, pa_5g\nand pa_5gh, for sprom version 8 and 9 there are only 3. Make the per\npath sprom store also work for older sprom versions.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f8f8a660ba501ad14617ccd0d91a1ed8ce54d6d0", "tree": "d0eaa1a008b0c128981841c3f9956dba4e1abcc5", "parents": [ "edd8d90b624e97105d26615d1655da22a3605fff" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:05 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:49 2012 -0500" }, "message": "ssb: remove 5GHz antenna gain from sprom\n\nThere is no 2.4 GHz or 5GHz antenna gain stored in sprom. The sprom\njust stores the gain values for antenna 1 and 2 or 1 to 4 for more\nrecent sprom versions. On old devices antenna 2 was used for 5 GHz wifi.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "edd8d90b624e97105d26615d1655da22a3605fff", "tree": "7911b9b5b82db681be3567584522723c514f48c1", "parents": [ "4e0ad2591adde7bec878a4b37a073427aec3e19c" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Feb 28 00:56:04 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Mar 05 15:20:48 2012 -0500" }, "message": "ssb: sprom fix some sizes / signedness\n\nSome parts of the sprom struct are bigger than needed.\nThe leddc and maxpwr values are just 8 bit long and not 16.\nrxpo2g and rxpo5g are signed\n\nI got these information for the open source part of the Broadcom SDK\ncovering sprom version 1 to 9. rxpo2g contained a negative number on my\nbcm5354 based device, this cased an error and Broadcom SDK says this is\nsigned.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "02f2f1a951f87644166926862ec32fb13511e2f3", "tree": "77d5ac88a112aeb9f18887277dabf311b7ec0e8a", "parents": [ "5eb02e44adc92a71bae3ff60acb1eea5ada14e93" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Feb 27 12:18:30 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 29 14:14:54 2012 -0500" }, "message": "mac80211: handle non-bufferable MMPDUs correctly\n\nThis renames the IEEE80211_TX_CTL_POLL_RESPONSE\nTX flag to IEEE80211_TX_CTL_NO_PS_BUFFER and also\nuses it for non-bufferable MMPDUs (all MMPDUs but\ndeauth, disassoc and action frames.)\n\nPreviously, mac80211 would let the MMPDU through\nbut not set the flag so drivers supporting some\nhardware aids for avoiding the PS races would\nthen reject the frame.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "63c9c5e77c36f8793dddf0e905a4bc43a0972735", "tree": "88c7d307b7369806c75245ca9cff8129e334580a", "parents": [ "4d94c157f87eebdcd84e9e5e27ad65978f776c2e" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Feb 24 13:50:51 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 29 14:11:33 2012 -0500" }, "message": "cfg80211: remove cookies from callbacks\n\nIn \"cfg80211: no cookies in cfg80211_send_XXX()\"\nHolger Schurig removed the cookies in the calls\nfrom mac80211 to cfg80211, but the ones in the\nother direction were left in. Remove them now.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8860020e0be1f03d83dc9e9e93e18a4ddbe01038", "tree": "09fa9089770e8a42e913f6c11abbba04bec20fad", "parents": [ "4e3bc141d480661634d0fadad7dbb1ddde70b4d4" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Feb 13 15:17:18 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 22 14:51:18 2012 -0500" }, "message": "cfg80211: restructure AP/GO mode API\n\nThe AP/GO mode API isn\u0027t very clearly defined, it\nhas \"set beacon\" and \"new beacon\" etc.\n\nModify the API to the following:\n * start AP -- all settings\n * change beacon -- new beacon data\n * stop AP -- stop AP mode operation\n\nThis also reflects in the nl80211 API, rename\nthe commands there correspondingly (but keep\nthe old names for compatibility.)\n\nOverall, this makes it much clearer what\u0027s going\non in the API.\n\nKalle developed the ath6kl changes, I created\nthe rest of the patch.\n\nSigned-off-by: Kalle Valo \u003ckvalo@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ca994a36f585432458ead9133fcfe05440edbb7b", "tree": "be05512153a9cd5cbe1f1234bc09fd9cd388ec58", "parents": [ "12325280dfeba18164f9c47e226a40ab34e23ee7", "2504a6423b9ab4c36df78227055995644de19edb" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 15 16:24:37 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 15 16:24:37 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nConflicts:\n\tnet/mac80211/debugfs_sta.c\n\tnet/mac80211/sta_info.h\n" }, { "commit": "6de32750822d00bfa92c341166132b0714c5b559", "tree": "b267e43e5a597578e923cd373961348e7cc7f6fb", "parents": [ "403f048a57050add364827fb3e2650af86463168" ], "author": { "name": "Ulisses Furquim", "email": "ulisses@profusion.mobi", "time": "Mon Jan 30 18:26:28 2012 -0200" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:26 2012 +0200" }, "message": "Bluetooth: Remove usage of __cancel_delayed_work()\n\n__cancel_delayed_work() is being used in some paths where we cannot\nsleep waiting for the delayed work to finish. However, that function\nmight return while the timer is running and the work will be queued\nagain. Replace the calls with safer cancel_delayed_work() version\nwhich spins until the timer handler finishes on other CPUs and\ncancels the delayed work.\n\nSigned-off-by: Ulisses Furquim \u003culisses@profusion.mobi\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "a51cd2be864a3cc0272359b1995e213341dfc7e7", "tree": "6d67396ca7e3243ad8dcfb94457e9f0583fe16ac", "parents": [ "b5a30dda6598af216c070165ece6068f9f00f33a" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Fri Jan 27 19:42:02 2012 -0300" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:26 2012 +0200" }, "message": "Bluetooth: Fix potential deadlock\n\nWe don\u0027t need to use the _sync variant in hci_conn_hold and\nhci_conn_put to cancel conn-\u003edisc_work delayed work. This way\nwe avoid potential deadlocks like this one reported by lockdep.\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: possible circular locking dependency detected ]\n3.2.0+ #1 Not tainted\n-------------------------------------------------------\nkworker/u:1/17 is trying to acquire lock:\n (\u0026hdev-\u003elock){+.+.+.}, at: [\u003cffffffffa0041155\u003e] hci_conn_timeout+0x62/0x158 [bluetooth]\n\nbut task is already holding lock:\n ((\u0026(\u0026conn-\u003edisc_work)-\u003ework)){+.+...}, at: [\u003cffffffff81035751\u003e] process_one_work+0x11a/0x2bf\n\nwhich lock already depends on the new lock.\n\nthe existing dependency chain (in reverse order) is:\n\n-\u003e #2 ((\u0026(\u0026conn-\u003edisc_work)-\u003ework)){+.+...}:\n [\u003cffffffff81057444\u003e] lock_acquire+0x8a/0xa7\n [\u003cffffffff81034ed1\u003e] wait_on_work+0x3d/0xaa\n [\u003cffffffff81035b54\u003e] __cancel_work_timer+0xac/0xef\n [\u003cffffffff81035ba4\u003e] cancel_delayed_work_sync+0xd/0xf\n [\u003cffffffffa00554b0\u003e] smp_chan_create+0xde/0xe6 [bluetooth]\n [\u003cffffffffa0056160\u003e] smp_conn_security+0xa3/0x12d [bluetooth]\n [\u003cffffffffa0053640\u003e] l2cap_connect_cfm+0x237/0x2e8 [bluetooth]\n [\u003cffffffffa004239c\u003e] hci_proto_connect_cfm+0x2d/0x6f [bluetooth]\n [\u003cffffffffa0046ea5\u003e] hci_event_packet+0x29d1/0x2d60 [bluetooth]\n [\u003cffffffffa003dde3\u003e] hci_rx_work+0xd0/0x2e1 [bluetooth]\n [\u003cffffffff810357af\u003e] process_one_work+0x178/0x2bf\n [\u003cffffffff81036178\u003e] worker_thread+0xce/0x152\n [\u003cffffffff81039a03\u003e] kthread+0x95/0x9d\n [\u003cffffffff812e7754\u003e] kernel_thread_helper+0x4/0x10\n\n-\u003e #1 (slock-AF_BLUETOOTH-BTPROTO_L2CAP){+.+...}:\n [\u003cffffffff81057444\u003e] lock_acquire+0x8a/0xa7\n [\u003cffffffff812e553a\u003e] _raw_spin_lock_bh+0x36/0x6a\n [\u003cffffffff81244d56\u003e] lock_sock_nested+0x24/0x7f\n [\u003cffffffffa004d96f\u003e] lock_sock+0xb/0xd [bluetooth]\n [\u003cffffffffa0052906\u003e] l2cap_chan_connect+0xa9/0x26f [bluetooth]\n [\u003cffffffffa00545f8\u003e] l2cap_sock_connect+0xb3/0xff [bluetooth]\n [\u003cffffffff81243b48\u003e] sys_connect+0x69/0x8a\n [\u003cffffffff812e6579\u003e] system_call_fastpath+0x16/0x1b\n\n-\u003e #0 (\u0026hdev-\u003elock){+.+.+.}:\n [\u003cffffffff81056d06\u003e] __lock_acquire+0xa80/0xd74\n [\u003cffffffff81057444\u003e] lock_acquire+0x8a/0xa7\n [\u003cffffffff812e3870\u003e] __mutex_lock_common+0x48/0x38e\n [\u003cffffffff812e3c75\u003e] mutex_lock_nested+0x2a/0x31\n [\u003cffffffffa0041155\u003e] hci_conn_timeout+0x62/0x158 [bluetooth]\n [\u003cffffffff810357af\u003e] process_one_work+0x178/0x2bf\n [\u003cffffffff81036178\u003e] worker_thread+0xce/0x152\n [\u003cffffffff81039a03\u003e] kthread+0x95/0x9d\n [\u003cffffffff812e7754\u003e] kernel_thread_helper+0x4/0x10\n\nother info that might help us debug this:\n\nChain exists of:\n \u0026hdev-\u003elock --\u003e slock-AF_BLUETOOTH-BTPROTO_L2CAP --\u003e (\u0026(\u0026conn-\u003edisc_work)-\u003ework)\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock((\u0026(\u0026conn-\u003edisc_work)-\u003ework));\n lock(slock-AF_BLUETOOTH-BTPROTO_L2CAP);\n lock((\u0026(\u0026conn-\u003edisc_work)-\u003ework));\n lock(\u0026hdev-\u003elock);\n\n *** DEADLOCK ***\n\n2 locks held by kworker/u:1/17:\n #0: (hdev-\u003ename){.+.+.+}, at: [\u003cffffffff81035751\u003e] process_one_work+0x11a/0x2bf\n #1: ((\u0026(\u0026conn-\u003edisc_work)-\u003ework)){+.+...}, at: [\u003cffffffff81035751\u003e] process_one_work+0x11a/0x2bf\n\nstack backtrace:\nPid: 17, comm: kworker/u:1 Not tainted 3.2.0+ #1\nCall Trace:\n [\u003cffffffff812e06c6\u003e] print_circular_bug+0x1f8/0x209\n [\u003cffffffff81056d06\u003e] __lock_acquire+0xa80/0xd74\n [\u003cffffffff81021ef2\u003e] ? arch_local_irq_restore+0x6/0xd\n [\u003cffffffff81022bc7\u003e] ? vprintk+0x3f9/0x41e\n [\u003cffffffff81057444\u003e] lock_acquire+0x8a/0xa7\n [\u003cffffffffa0041155\u003e] ? hci_conn_timeout+0x62/0x158 [bluetooth]\n [\u003cffffffff812e3870\u003e] __mutex_lock_common+0x48/0x38e\n [\u003cffffffffa0041155\u003e] ? hci_conn_timeout+0x62/0x158 [bluetooth]\n [\u003cffffffff81190fd6\u003e] ? __dynamic_pr_debug+0x6d/0x6f\n [\u003cffffffffa0041155\u003e] ? hci_conn_timeout+0x62/0x158 [bluetooth]\n [\u003cffffffff8105320f\u003e] ? trace_hardirqs_off+0xd/0xf\n [\u003cffffffff812e3c75\u003e] mutex_lock_nested+0x2a/0x31\n [\u003cffffffffa0041155\u003e] hci_conn_timeout+0x62/0x158 [bluetooth]\n [\u003cffffffff810357af\u003e] process_one_work+0x178/0x2bf\n [\u003cffffffff81035751\u003e] ? process_one_work+0x11a/0x2bf\n [\u003cffffffff81055af3\u003e] ? lock_acquired+0x1d0/0x1df\n [\u003cffffffffa00410f3\u003e] ? hci_acl_disconn+0x65/0x65 [bluetooth]\n [\u003cffffffff81036178\u003e] worker_thread+0xce/0x152\n [\u003cffffffff810407ed\u003e] ? finish_task_switch+0x45/0xc5\n [\u003cffffffff810360aa\u003e] ? manage_workers.isra.25+0x16a/0x16a\n [\u003cffffffff81039a03\u003e] kthread+0x95/0x9d\n [\u003cffffffff812e7754\u003e] kernel_thread_helper+0x4/0x10\n [\u003cffffffff812e5db4\u003e] ? retint_restore_args+0x13/0x13\n [\u003cffffffff8103996e\u003e] ? __init_kthread_worker+0x55/0x55\n [\u003cffffffff812e7750\u003e] ? gs_change+0x13/0x13\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nReviewed-by: Ulisses Furquim \u003culisses@profusion.mobi\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "b5a30dda6598af216c070165ece6068f9f00f33a", "tree": "049eff0341a243dbd02af3c83a7166f941177833", "parents": [ "331660637b4e5136602a98200a84f6b65ed8d5be" ], "author": { "name": "Octavian Purdila", "email": "tavi.purdila@gmail.com", "time": "Sun Jan 22 00:28:34 2012 +0200" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:26 2012 +0200" }, "message": "Bluetooth: silence lockdep warning\n\nSince bluetooth uses multiple protocols types, to avoid lockdep\nwarnings, we need to use different lockdep classes (one for each\nprotocol type).\n\nThis is already done in bt_sock_create but it misses a couple of cases\nwhen new connections are created. This patch corrects that to fix the\nfollowing warning:\n\n\u003c4\u003e[ 1864.732366] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\u003c4\u003e[ 1864.733030] [ INFO: possible circular locking dependency detected ]\n\u003c4\u003e[ 1864.733544] 3.0.16-mid3-00007-gc9a0f62 #3\n\u003c4\u003e[ 1864.733883] -------------------------------------------------------\n\u003c4\u003e[ 1864.734408] t.android.btclc/4204 is trying to acquire lock:\n\u003c4\u003e[ 1864.734869] (rfcomm_mutex){+.+.+.}, at: [\u003cc14970ea\u003e] rfcomm_dlc_close+0x15/0x30\n\u003c4\u003e[ 1864.735541]\n\u003c4\u003e[ 1864.735549] but task is already holding lock:\n\u003c4\u003e[ 1864.736045] (sk_lock-AF_BLUETOOTH){+.+.+.}, at: [\u003cc1498bf7\u003e] lock_sock+0xa/0xc\n\u003c4\u003e[ 1864.736732]\n\u003c4\u003e[ 1864.736740] which lock already depends on the new lock.\n\u003c4\u003e[ 1864.736750]\n\u003c4\u003e[ 1864.737428]\n\u003c4\u003e[ 1864.737437] the existing dependency chain (in reverse order) is:\n\u003c4\u003e[ 1864.738016]\n\u003c4\u003e[ 1864.738023] -\u003e #1 (sk_lock-AF_BLUETOOTH){+.+.+.}:\n\u003c4\u003e[ 1864.738549] [\u003cc1062273\u003e] lock_acquire+0x104/0x140\n\u003c4\u003e[ 1864.738977] [\u003cc13d35c1\u003e] lock_sock_nested+0x58/0x68\n\u003c4\u003e[ 1864.739411] [\u003cc1493c33\u003e] l2cap_sock_sendmsg+0x3e/0x76\n\u003c4\u003e[ 1864.739858] [\u003cc13d06c3\u003e] __sock_sendmsg+0x50/0x59\n\u003c4\u003e[ 1864.740279] [\u003cc13d0ea2\u003e] sock_sendmsg+0x94/0xa8\n\u003c4\u003e[ 1864.740687] [\u003cc13d0ede\u003e] kernel_sendmsg+0x28/0x37\n\u003c4\u003e[ 1864.741106] [\u003cc14969ca\u003e] rfcomm_send_frame+0x30/0x38\n\u003c4\u003e[ 1864.741542] [\u003cc1496a2a\u003e] rfcomm_send_ua+0x58/0x5a\n\u003c4\u003e[ 1864.741959] [\u003cc1498447\u003e] rfcomm_run+0x441/0xb52\n\u003c4\u003e[ 1864.742365] [\u003cc104f095\u003e] kthread+0x63/0x68\n\u003c4\u003e[ 1864.742742] [\u003cc14d5182\u003e] kernel_thread_helper+0x6/0xd\n\u003c4\u003e[ 1864.743187]\n\u003c4\u003e[ 1864.743193] -\u003e #0 (rfcomm_mutex){+.+.+.}:\n\u003c4\u003e[ 1864.743667] [\u003cc1061ada\u003e] __lock_acquire+0x988/0xc00\n\u003c4\u003e[ 1864.744100] [\u003cc1062273\u003e] lock_acquire+0x104/0x140\n\u003c4\u003e[ 1864.744519] [\u003cc14d2c70\u003e] __mutex_lock_common+0x3b/0x33f\n\u003c4\u003e[ 1864.744975] [\u003cc14d303e\u003e] mutex_lock_nested+0x2d/0x36\n\u003c4\u003e[ 1864.745412] [\u003cc14970ea\u003e] rfcomm_dlc_close+0x15/0x30\n\u003c4\u003e[ 1864.745842] [\u003cc14990d9\u003e] __rfcomm_sock_close+0x5f/0x6b\n\u003c4\u003e[ 1864.746288] [\u003cc1499114\u003e] rfcomm_sock_shutdown+0x2f/0x62\n\u003c4\u003e[ 1864.746737] [\u003cc13d275d\u003e] sys_socketcall+0x1db/0x422\n\u003c4\u003e[ 1864.747165] [\u003cc14d42f0\u003e] syscall_call+0x7/0xb\n\nSigned-off-by: Octavian Purdila \u003coctavian.purdila@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "331660637b4e5136602a98200a84f6b65ed8d5be", "tree": "0fe6f4a3bd4ba98855b039af5a4c066d50ac7cc7", "parents": [ "6e1da683f79a22fafaada62d547138daaa9e3456" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Wed Jan 04 11:57:17 2012 -0300" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:26 2012 +0200" }, "message": "Bluetooth: Fix using an absolute timeout on hci_conn_put()\n\nqueue_delayed_work() expects a relative time for when that work\nshould be scheduled.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "6e1da683f79a22fafaada62d547138daaa9e3456", "tree": "d3502a1dd0a2df2d13e9d53a70042f68381e0ee3", "parents": [ "a63752552b95624a9f1dfa3d763870f72f964ad0" ], "author": { "name": "Andrzej Kaczmarek", "email": "andrzej.kaczmarek@tieto.com", "time": "Wed Jan 04 12:10:42 2012 +0100" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:25 2012 +0200" }, "message": "Bluetooth: l2cap_set_timer needs jiffies as timeout value\n\nAfter moving L2CAP timers to workqueues l2cap_set_timer expects timeout\nvalue to be specified in jiffies but constants defined in miliseconds\nare used. This makes timeouts unreliable when CONFIG_HZ is not set to\n1000.\n\n__set_chan_timer macro still uses jiffies as input to avoid multiple\nconversions from/to jiffies for sk_sndtimeo value which is already\nspecified in jiffies.\n\nSigned-off-by: Andrzej Kaczmarek \u003candrzej.kaczmarek@tieto.com\u003e\nAckec-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "4aa832c27edf902130f8bace1d42cf22468823fa", "tree": "0145f7d8455de5a7e06a3b9be52f2c2ac3857bb2", "parents": [ "19ad9e94f6e2b4b3e1feccfb2466eb6e3e5b8c2a" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Sun Jan 08 22:51:16 2012 +0200" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Wed Feb 15 13:09:25 2012 +0200" }, "message": "Bluetooth: Remove bogus inline declaration from l2cap_chan_connect\n\nAs reported by Dan Carpenter this function causes a Sparse warning and\nshouldn\u0027t be declared inline:\n\ninclude/net/bluetooth/l2cap.h:837:30 error: marked inline, but without a\ndefinition\"\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\n" }, { "commit": "885bd8eca6ac172e299750d99bd5c9fddbed89b9", "tree": "7ce2265d4738f6ea1f40f13d86d96c150bef73cf", "parents": [ "3dc5e1751803e812806d7aa46150af92f91ef489" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Thu Feb 02 17:44:55 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:55:51 2012 -0500" }, "message": "mac80211: support hw scan while idle\n\nCurrently, mac80211 goes to idle-off before starting a scan.\nHowever, some devices that implement hw scan might not\nneed going idle-off in order to perform a hw scan, and\nthus saving some energy and simplifying their state machine.\n\n(Note that this is also the case for sched scan - it\ncurrently doesn\u0027t make mac80211 go idle-off)\n\nAdd a new flag to indicate support for hw scan while idle.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "267335d63b808dc861f3a4dc81a605489a8a13ac", "tree": "2f114b6f45147d17ea4cbd57cf33289a57248a1b", "parents": [ "3eda95de19e1781612091869e866a5014257f462" ], "author": { "name": "Antonio Quartulli", "email": "ordex@autistici.org", "time": "Tue Jan 31 20:25:47 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:53:10 2012 -0500" }, "message": "cfg80211/mac80211: userspace peer authorization in IBSS\n\nIf the IBSS network is RSN-protected, let userspace authorize the stations\ninstead of adding them as AUTHORIZED by default.\n\nSigned-off-by: Antonio Quartulli \u003cordex@autistici.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d6865dcc58f252480515101fd13532f0fc420b53", "tree": "4e8ee3ef60d44b81d31337925c018f19929ea7f5", "parents": [ "8f9ada4fa1926e540b1562cb9bacb3e51a698c35" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:37 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:53:06 2012 -0500" }, "message": "bcma: add extra sprom check\n\nThis check is needed on the BCM43224 device as it says in the\ncapabilities it has an sprom but is extra check says it has not.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8f9ada4fa1926e540b1562cb9bacb3e51a698c35", "tree": "def07cbceee8d55da9288ab1157835d784360805", "parents": [ "49dc9577155576b10ff79f0c1486c816b01f58bf" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:36 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:53:05 2012 -0500" }, "message": "bcma: add bus num counter\n\nIf we have two bcma buses on one computer the second will not work\nwithout this patch. Now each bus gets an own number.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "49dc9577155576b10ff79f0c1486c816b01f58bf", "tree": "c193e6110c54234ab5ed3d816cc2dc15df165f37", "parents": [ "d1a7a8e1d367e34e5adce91f48cae07dc08d9e6c" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:35 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:53:04 2012 -0500" }, "message": "bcma: add PCIe host controller\n\nSome SoCs have a PCIe host controller to make it possible to attach\nsome other devices to it, like an other Wifi card.\nThis code was tested with an Netgear WNDR3400 (bcm4716 based), but\nshould work with all bcma based SoCs.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d1a7a8e1d367e34e5adce91f48cae07dc08d9e6c", "tree": "b4e279942e10a4bfc51e6bfeef052c3cca088964", "parents": [ "4b259a5cc5ea967fa243dfc1f95a59ae74106f5b" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:34 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:53:03 2012 -0500" }, "message": "bcma: make some functions __devinit\n\nbcma_core_pci_hostmode_init() has to be in __devinit as it will call a\nfunction in that section and so all functions calling it also have to\nbe in __devinit.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2be25cac8402fab56bb51166f464d1b420bcf744", "tree": "ec50aa8592b81476adff3bc77779a4a08e1eb9e1", "parents": [ "5f2d6171e1e70584b9819771443485750453fd16" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:32 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:52:56 2012 -0500" }, "message": "bcma: add constants for PCI and use them\n\nThere are many magic numbers used in the PCIe code. Replace them with\nsome constants from the Broadcom SDK and also use them in the pcie host\ncontroller.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5f2d6171e1e70584b9819771443485750453fd16", "tree": "29a8f4dfc08d8cef4c5f3b13e0a78c52b61abe1e", "parents": [ "268bd858df5052f97722b123e990119c89171fd7" ], "author": { "name": "Hauke Mehrtens", "email": "hauke@hauke-m.de", "time": "Tue Jan 31 00:03:31 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:50:39 2012 -0500" }, "message": "bcma: add the core unit number\n\nSome SoCs have two pcie or gmac cores and we need to know the number of\nthe specific core on the bus. This is the case for the BCM4706.\n\nSigned-off-by: Hauke Mehrtens \u003chauke@hauke-m.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4c0c0b75e0c35ddb8f61c06bcbffede63ab4f4a2", "tree": "5d3ee488424ac02ef06330ebff3e5de6e5058941", "parents": [ "95de817b9034d50860319f6033ec85d25024694c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jan 20 13:55:26 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:50:37 2012 -0500" }, "message": "cfg80211: export cfg80211_ref_bss\n\nThis is needed by mac80211 to keep a reference\nto a BSS alive for the auth process. Remove the\nold version of cfg80211_ref_bss() since it\u0027s\nnot actually used.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "95de817b9034d50860319f6033ec85d25024694c", "tree": "8dc100ec6a5ee527a6e86b33e904f5f9d14181ab", "parents": [ "7852e36186d2a1983c215836d7e3d7b8927c930d" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jan 20 13:55:25 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:50:37 2012 -0500" }, "message": "cfg80211: stop tracking authenticated state\n\nTo track authenticated state seems to have been\na design mistake in cfg80211. It is possible to\nhave out of band authentication (FT), tracking\nmultiple authentications caused more problems\nthan it ever helped, and the implementation in\nmac80211 is too complex.\n\nRemove all this complexity, and let userspace\ndo whatever it wants to, mac80211 can deal with\nthat just fine. Association is still tracked of\ncourse, but authentication no longer is. Local\nauth state changes are thus no longer of value,\nso ignore them completely.\n\nThis will also help implement SAE -- asking the\ndriver to do an authentication is now almost\nequivalent to sending an authentication frame,\nwith the exception of shared key authentication\nwhich is still handled completely.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f09603a259ffef69ad4516a04eb06cd65ac522fe", "tree": "3f826769c697eb15a76771e25291bbb54f9f58ab", "parents": [ "71ec375c75095002f36f083ceb32bbb8725734ae" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jan 20 13:55:21 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Feb 06 14:48:24 2012 -0500" }, "message": "mac80211: add sta_state callback\n\n(based on Eliad\u0027s patch)\n\nAdd a callback to notify the low-level driver whenever\nthe state of a station changes. The driver is only\nnotified when the station is actually in the mac80211\nhash table, not for pre-insert state transitions.\n\nTo allow the driver to replace sta_add/remove calls\nwith this, call extra transitions with the NOTEXIST\nstate.\n\nThis callback can fail, so we need to be careful in\nhandling it when a station is inserted, particularly\nin the IBSS case where we still keep the station entry\naround for mac80211 purposes.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "19468413e8d98d44be8daf0acaf8d576dfc53fa2", "tree": "99d7df720566824c4588ccff03c65e60c381e60d", "parents": [ "24db78c05b1e3ccb5a78aedd17aa1008c91dab5a" ], "author": { "name": "Simon Wunderlich", "email": "simon.wunderlich@s2003.tu-chemnitz.de", "time": "Sat Jan 28 17:25:33 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 30 15:48:26 2012 -0500" }, "message": "mac80211: add support for mcs masks\n\n* Handle MCS masks set by the user.\n* Match rates provided by the rate control algorithm to the mask set,\n also in HT mode, and switch back to legacy mode if necessary.\n* add debugfs files to observate the rate selection\n\nSigned-off-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: Mathias Kretschmer \u003cmathias.kretschmer@fokus.fraunhofer.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "24db78c05b1e3ccb5a78aedd17aa1008c91dab5a", "tree": "f41babc8ada871a26619be23f983121ad557da91", "parents": [ "d273bb20c00340748e3ca9730f87524ec5abbd64" ], "author": { "name": "Simon Wunderlich", "email": "simon.wunderlich@s2003.tu-chemnitz.de", "time": "Sat Jan 28 17:25:32 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 30 15:48:25 2012 -0500" }, "message": "nl80211: add support for mcs masks\n\nAllow to set mcs masks through nl80211. We also allow to set MCS\nrates but no legacy rates (and vice versa).\n\nSigned-off-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: Mathias Kretschmer \u003cmathias.kretschmer@fokus.fraunhofer.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4acb41903b2f99f3dffd4c3df9acc84ca5942cb2", "tree": "3a2dc1739d654effecd86749e49a40d41019e645", "parents": [ "8a8ee9aff6c3077dd9c2c7a77478e8ed362b96c6" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Mon Jan 30 01:20:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:41:06 2012 -0500" }, "message": "net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL\n\nsysctl_tcp_mem() initialization was moved to sysctl_tcp_ipv4.c\nin commit 3dc43e3e4d0b52197d3205214fe8f162f9e0c334, since it\nbecame a per-ns value.\n\nThat code, however, will never run when CONFIG_SYSCTL is\ndisabled, leading to bogus values on those fields - causing hung\nTCP sockets.\n\nThis patch fixes it by keeping an initialization code in\ntcp_init(). It will be overwritten by the first net namespace\ninit if CONFIG_SYSCTL is compiled in, and do the right thing if\nit is compiled out.\n\nIt is also named properly as tcp_init_mem(), to properly signal\nits non-sysctl side effect on TCP limits.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nLink: http://lkml.kernel.org/r/4F22D05A.8030604@parallels.com\n[ renamed the function, tidied up the changelog a bit ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ee4433efe99b9f39f6eff5052a177bbcfe72cea", "tree": "0be8ae9b59828b3fee0fdf5cac9432604a317230", "parents": [ "cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Jan 26 14:02:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 21:06:02 2012 -0500" }, "message": "netns: Fail conspicously if someone uses net_generic at an inappropriate time.\n\nBy definition net_generic should never be called when it can return\nNULL. Fail conspicously with a BUG_ON to make it clear when people mess\nup that a NULL return should never happen.\n\nRecently there was a bug in the CAIF subsystem where it was registered\nwith register_pernet_device instead of register_pernet_subsys. It was\nerroneously concluded that net_generic could validly return NULL and\nthat net_assign_generic was buggy (when it was just inefficient).\nHopefully this BUG_ON will prevent people to coming to similar erroneous\nconclusions in the futrue.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "15f0ebc23b7c68176ee3f9729d4a7f566cc6c311", "tree": "7462bd7c17432906f0fd49bd7484c7d61624c3fc", "parents": [ "67e43de6dbc9caf52fa7bcf4c813fd088ba6fbfc" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:03:00 2012 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 27 14:56:58 2012 -0500" }, "message": "kernel-doc: fix new warnings in cfg80211.h\n\nFix new kernel-doc warnings:\n\nWarning(include/net/cfg80211.h:1165): No description found for parameter \u0027channel_type\u0027\nWarning(include/net/cfg80211.h:2090): No description found for parameter \u0027probe_resp_offload\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc:\tJohannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc:\tlinux-wireless@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "94f9065648a2645b28187b44ec7778c30cf58758", "tree": "734ee883e3fbd99de04240da97716d773d64bb6d", "parents": [ "2da8f419e78a0ebccc91c095328278fe668a7932" ], "author": { "name": "Chun-Yeow Yeoh", "email": "yeohchunyeow@gmail.com", "time": "Sat Jan 21 01:02:16 2012 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 27 14:56:56 2012 -0500" }, "message": "{nl,cfg,mac}80211: Add support of setting non-forwarding entity in Mesh\n\nA mesh node that joins the mesh network is by default a forwarding entity. This patch allows\nthe mesh node to set as non-forwarding entity. Whenever dot11MeshForwarding is set to 0, the\nmesh node can prevent itself from forwarding the traffic which is not destined to him.\n\nSigned-off-by: Chun-Yeow Yeoh \u003cyeohchunyeow@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ea086359a63bd0dd85c1d784d0425340649613fa", "tree": "e00130d16f0907bfdde4bc679e862159c058361b", "parents": [ "c1288b1278d00169e12495eb53ad128e09560b69" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 19 09:29:58 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 27 14:56:54 2012 -0500" }, "message": "mac80211: make CQM RSSI support per virtual interface\n\nSimilar to the previous beacon filtering patch,\nmake CQM RSSI support depend on the flags that\nthe driver set for virtual interfaces.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c1288b1278d00169e12495eb53ad128e09560b69", "tree": "8edc1a74f040763f406abe830cea98eac4b6124d", "parents": [ "47d505ccc7535c825f6b28aaaf105d4b75f25196" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 19 09:29:57 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 27 14:56:53 2012 -0500" }, "message": "mac80211: make beacon filtering per virtual interface\n\nDue to firmware limitations, we may not be able to\nsupport beacon filtering on all virtual interfaces.\nTo allow this in mac80211, introduce per-interface\ndriver capability flags that the driver sets when\nan interface is added.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9018e93948c6f8f95fbcc9fa05f6c403d6adb406", "tree": "491bb99eb3633a54a1d1f03e671ce16c922b6e74", "parents": [ "f18da14565819ba43b8321237e2426a2914cc2ef" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Jan 26 12:09:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 17:13:26 2012 -0500" }, "message": "net: explicitly add jump_label.h header to sock.h\n\nCommit 36a1211970193ce215de50ed1e4e1272bc814df1 removed linux/module.h\ninclude statement from one of the headers that end up in net/sock.h.\nIt was providing us with static_branch() definition implicitly, so\nafter its removal the build got broken.\n\nTo fix this, and avoid having this happening in the future,\nlet me do the right thing and include linux/jump_label.h\nexplicitly in sock.h.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "701b259f446be2f3625fb852bceb93afe76e206d", "tree": "93f15bcd00bd59c38b4e59fed9af7ddf6b06c8b3", "parents": [ "d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5", "efc3dbc37412c027e363736b4f4c74ee5e8ecffc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nDavem says:\n\n1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.\n\n2) tg3 header length computation correction from Eric Dumazet.\n\n3) More build and reference counting fixes for socket memory cgroup\n code from Glauber Costa.\n\n4) module.h snuck back into a core header after all the hard work we\n did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.\n\n5) Fix PHY naming regression and add some new PCI IDs in stmmac, from\n Alessandro Rubini.\n\n6) Netlink message generation fix in new team driver, should only advertise\n the entries that changed during events, from Jiri Pirko.\n\n7) SRIOV VF registration and unregistration fixes, and also add a\n missing PCI ID, from Roopa Prabhu.\n\n8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.\n\n9) ftgmac100/ftmac100 build fix, missing interrupt.h include.\n\n10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.\n\n11) Off by one fix in netem packet scheduler, from Vijay Subramanian.\n\n12) TCP loss detection fix from Yuchung Cheng.\n\n13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.\n\n14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.\n\n15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC\n congestion control modules, fix from Neal Cardwell.\n\n16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.\n\n17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.\n\n18) Statistics bug fixes in mlx4 from Eugenia Emantayev.\n\n19) rds locking bug fix during info dumps, from your\u0027s truly.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)\n rds: Make rds_sock_lock BH rather than IRQ safe.\n netprio_cgroup.h: dont include module.h from other includes\n net: flow_dissector.c missing include linux/export.h\n team: send only changed options/ports via netlink\n net/hyperv: fix possible memory leak in do_set_multicast()\n drivers/net: dsa/mv88e6xxx.c files need linux/module.h\n stmmac: added PCI identifiers\n llc: Fix race condition in llc_ui_recvmsg\n stmmac: fix phy naming inconsistency\n dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.\n tg3: fix ipv6 header length computation\n skge: add byte queue limit support\n mv643xx_eth: Add Rx Discard and Rx Overrun statistics\n bnx2x: fix compilation error with SOE in fw_dump\n bnx2x: handle CHIP_REVISION during init_one\n bnx2x: allow user to change ring size in ISCSI SD mode\n bnx2x: fix Big-Endianess in ethtool -t\n bnx2x: fixed ethtool statistics for MF modes\n bnx2x: credit-leakage fixup on vlan_mac_del_all\n macvlan: fix a possible use after free\n ...\n" }, { "commit": "36a1211970193ce215de50ed1e4e1272bc814df1", "tree": "58cf4dbb13b90116be153457174a2369b1360173", "parents": [ "c452ed70771cea3af73d21a5914989137fbd28b8" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Jan 24 11:33:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 16:42:26 2012 -0500" }, "message": "netprio_cgroup.h: dont include module.h from other includes\n\nA considerable effort was invested in wiping out module.h\nfrom being present in all the other standard includes. This\none leaked back in, but once again isn\u0027t strictly necessary,\nso remove it.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b82b9183d4f18f9b8c4bb31f223eb6c79b734eb0", "tree": "c93bb04e52255fe3e313ce4469dd2df6c2a62789", "parents": [ "c11bf1c8baff170fa478adc04964da519d160e62" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jan 24 05:16:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 15:51:00 2012 -0500" }, "message": "team: send only changed options/ports via netlink\n\nThis patch changes event message behaviour to send only updated records\ninstead of whole list. This fixes bug on which userspace receives non-actual\ndata in case multiple events occur in row.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5", "tree": "4ba57a6ec31f3a4683e7766fbf4f182d459a8b51", "parents": [ "4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518", "46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 12:12:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 12:12:40 2012 -0800" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:\n quota: Pass information that quota is stored in system file to userspace\n ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls\n jbd: Issue cache flush after checkpointing\n" }, { "commit": "019c4fbaa790e2b3f11dab0c8b7d9896d77db3e5", "tree": "593fc051bc96a40e48406f6cba883b1f95822422", "parents": [ "25a1d9dc850b1bdcc4760eb625f0a67057f54d26" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Jan 18 13:16:14 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:32:29 2012 -0500" }, "message": "NFC: Add NCI multiple targets support\n\nAdd the ability to select between multiple targets in NCI.\nIf only one target is found, it will be auto-activated.\nIf more than one target is found, then DISCOVER_NTF will be\ngenerated for each target, and the host should select one by\ncalling DISCOVER_SELECT_CMD. Then, the target will be activated.\nIf the activation fails, GENERIC_ERROR_NTF is generated.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "25a1d9dc850b1bdcc4760eb625f0a67057f54d26", "tree": "d717fdf49f8183899f8c98ce8860c5b1c4dceb2d", "parents": [ "8939e47fc953cce6ef53e79e9ff9b53319d1a72d" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Jan 18 13:16:13 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:32:28 2012 -0500" }, "message": "NFC: NFC core layer should not set the target_idx\n\nThe NFC core layer should not set the target_idx.\nInstead, the driver layer (e.g. NCI, PN533) should set the\ntarget_idx, so that it will be able to identify the target\nwhen its I/F (e.g. activate_target) is called.\nThis is required in order to support multiple targets.\nNote that currently supported drivers (PN533 and NCI) don\u0027t\nuse the target_idx in their implementation.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8939e47fc953cce6ef53e79e9ff9b53319d1a72d", "tree": "fba0ffe539b4d6937bfb2bd9986fe989917b8039", "parents": [ "6d810f10325522cfcf498dc6d64b9f96e1f5153f" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Jan 18 13:16:12 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:32:28 2012 -0500" }, "message": "NFC: Clearly separate NCI states from flags\n\nMake a clear separation between NCI states and flags.\nThis is required in order to support more NCI states (e.g.\nfor multiple targets support).\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c4bf98b220cba7a8618405261d69ee53a265110e", "tree": "2710efffaefc519f0d08f116ba669b1648aaab4a", "parents": [ "889cbb911a195b832745f77240f547cb2a2885bc" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Tue Jan 17 12:03:50 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:21:55 2012 -0500" }, "message": "NFC: Add NCI data exchange timer\n\nAdd NCI data exchange timer to catch timeouts,\nand call the data exchange callback with an error.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d5a2ca60e41fec4ede7b82d3608278523cffe77b", "tree": "64faf8e66edaf03fe35b9bd61e8263817a17cca9", "parents": [ "bfeb4dbc5cb36ae774fabe7b0e0d559e621a2ccd" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Tue Jan 17 11:06:43 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:21:15 2012 -0500" }, "message": "NFC: Export new attributes sensb_res and sensf_res\n\nExport new attributes sensb_res for tech B and sensf_res\nfor tech F in the target info (returned as a response to\nNFC_CMD_GET_TARGET).\nThe max size of the attributes nfcid1, sensb_res and sensf_res\nis exported to user space though include/linux/nfc.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "eccc068e8e84c8fe997115629925e0422a98e4de", "tree": "399c387868028130d6d9ca530cb23557103de4dc", "parents": [ "e2d75c136f8df4a4e28ece75c475a65b9292729a" ], "author": { "name": "Hong Wu", "email": "Hong.Wu@dspg.com", "time": "Wed Jan 11 20:33:39 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:16:54 2012 -0500" }, "message": "wireless: Save original maximum regulatory transmission power for the calucation of the local maximum transmit power\n\nThe local maximum transmit power is the maximum power a wireless device\nallowed to transmit. If Power Constraint is presented, the local maximum\npower equals to the maximum allowed power defined in regulatory domain\nminus power constraint.\n\nThe maximum transmit power is maximum power a wireless device capable of\ntransmitting, and should be used in Power Capability element (7.3.2.16\nIEEE802.11 2007).\n\nThe transmit power from a wireless device should not greater than the\nlocal maximum transmit power.\n\nThe maximum transmit power was not calculated correctly in the current\nLinux wireless/mac80211 when Power Constraint is presented.\n\nSigned-off-by: Hong Wu \u003chong.wu@dspg.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "11ee51589a61fa836b1540293ad6c7dfd7de544a", "tree": "0c7a00d54e61d86b4f2ea1ceecdd019985d07ee8", "parents": [ "bd7e01bc7e7a90b33470173618f6f6805143cd42" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Sun Jan 08 13:43:02 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:08:39 2012 -0500" }, "message": "NFC: Increase NCI deactivate timeout\n\nIncrease NCI deactivate timeout from 5 sec to 30 sec.\nNCI deactivate procedure might take a long time,\ndepending on the local and remote parameters.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b0f70292053a0f68f406564a721a7a3f2d66b44f", "tree": "48e68f1c2ae6d6b7df11326fc31d9e749acedd62", "parents": [ "35b88623692f7ffbfdf16e4c2358784a060c20ed" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Mon Jan 02 08:41:23 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:06:04 2012 -0500" }, "message": "ssb: SPROM: extract each core power info\n\nWe already extract some basic info but it\u0027s incomplete, reads info\nabout the first core only. Used data structure doesn\u0027t allow easy\nadding of more cores.\nThis patch adds new struct and array for storing power info. The plan\nis to: switch all extractors (including the ones using NVRAM) to new\nstruct, switch drivers, then deprecate and finally drop old SSB fields.\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c1aab02dac690af7ff634d8e1cb3be6a04387eef", "tree": "9018361108b2c370d247452e4517937057bf9895", "parents": [ "ac1e3d4f5c1097422c6e72aeae322033e9a8c803" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Jan 24 11:41:32 2012 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 17:17:45 2012 -0800" }, "message": "migrate_mode.h is not exported to user mode\n\nso move its include into fs.h inside the __KERNEL__ protection.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ac1e3d4f5c1097422c6e72aeae322033e9a8c803", "tree": "adcebdad5f515a8453bfe48940822f57a6904c9d", "parents": [ "eaed435a7b870a38d89dbdb535c7842d618d3214", "e4c89a508f4385a0cd8681c2749a2cd2fa476e40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "message": "Merge tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fixes for 3.3\n\nTwo fixes for regressions introduced during the merge window, one fix for\na long-standing obscure issue in the computation of hibernate image size\nand two small PM documentation fixes.\n\n* tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Sleep: Fix read_unlock_usermodehelper() call.\n PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression\n PM / Hibernate: Correct additional pages number calculation\n PM / Documentation: Fix minor issue in freezing_of_tasks.txt\n PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt\n" }, { "commit": "a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99", "tree": "d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76", "parents": [ "4f57d865f1d863346ac50db9c25859e73a86499c", "b4d20859362fde976bb2fa53eb51b798cdba1afc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "message": "Merge branch \u0027kernel-doc\u0027 from Randy Dunlap\n\nThe usual kernel-doc fixups from Randy. Some of them David acked as\nmerged in his tree, this is the random left-overs.\n\n* kernel-doc:\n docbook: fix sched source file names in device-drivers book\n docbook: change iomap source filename in deviceiobook\n docbook: don\u0027t use serial_core.h in device-drivers book\n kernel-doc: fix kernel-doc warnings in sched\n kernel-doc: fix new warnings in cfg80211.h\n kernel-doc: fix new warning in usb.h\n kernel-doc: fix new warnings in device.h\n kernel-doc: fix new warnings in debugfs\n kernel-doc: fix new warning in regulator core\n kernel-doc: fix new warnings in pci\n kernel-doc: fix new warnings in driver-core\n kernel-doc: fix new warnings in auditsc.c\n scripts/kernel-doc: fix fatal error caused by cfg80211.h\n" }, { "commit": "4f57d865f1d863346ac50db9c25859e73a86499c", "tree": "ac3cf5abdc3ce4b5c051f03c682f8b0668d66caf", "parents": [ "46c5b83bcc5ab4db34716954fc64645eba7038ca", "c25a785d6647984505fa165b5cd84cfc9a95970b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 09:27:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 09:27:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027\n\nQuoth Andrew:\n \"Random fixes. And a simple new LED driver which I\u0027m trying to sneak\n in while you\u0027re not looking.\"\n\nSneaking successful.\n\n* akpm:\n score: fix off-by-one index into syscall table\n mm: fix rss count leakage during migration\n SHM_UNLOCK: fix Unevictable pages stranded after swap\n SHM_UNLOCK: fix long unpreemptible section\n kdump: define KEXEC_NOTE_BYTES arch specific for s390x\n mm/hugetlb.c: undo change to page mapcount in fault handler\n mm: memcg: update the correct soft limit tree during migration\n proc: clear_refs: do not clear reserved pages\n drivers/video/backlight/l4f00242t03.c: return proper error in l4f00242t03_probe if regulator_get() fails\n drivers/video/backlight/adp88x0_bl.c: fix bit testing logic\n kprobes: initialize before using a hlist\n ipc/mqueue: simplify reading msgqueue limit\n leds: add led driver for Bachmann\u0027s ot200\n mm: __count_immobile_pages(): make sure the node is online\n mm: fix NULL ptr dereference in __count_immobile_pages\n mm: fix warnings regarding enum migrate_mode\n" }, { "commit": "7908b3ef6809e49c77d914342dfaa4b946476d7a", "tree": "44af103c5457b4c2286400158dcfc18846a7c4f0", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f", "acbbb76a26648dfae6fed0989879e40d75692bfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:59:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:59:49 2012 -0800" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\n* git://git.samba.org/sfrench/cifs-2.6:\n CIFS: Rename *UCS* functions to *UTF16*\n [CIFS] ACL and FSCACHE support no longer EXPERIMENTAL\n [CIFS] Fix build break with multiuser patch when LANMAN disabled\n cifs: warn about impending deprecation of legacy MultiuserMount code\n cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts\n cifs: sanitize username handling\n keys: add a \"logon\" key type\n cifs: lower default wsize when unix extensions are not used\n cifs: better instrumentation for coalesce_t2\n cifs: integer overflow in parse_dacl()\n cifs: Fix sparse warning when calling cifs_strtoUCS\n CIFS: Add descriptions to the brlock cache functions\n" }, { "commit": "fa757281a08799fd6c0f7ec6f111d1cd66afc97b", "tree": "664f8728e55e3d37ca8eb3c6c9087d2da9860463", "parents": [ "2f6c76aa5f0fb53059730c628ac59ef62a14ed7a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:03:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix kernel-doc warnings in sched\n\nFix new kernel-doc notation warnings:\n\nWarning(include/linux/sched.h:2094): No description found for parameter \u0027p\u0027\nWarning(include/linux/sched.h:2094): Excess function parameter \u0027tsk\u0027 description in \u0027is_idle_task\u0027\nWarning(kernel/sched/cpupri.c:139): No description found for parameter \u0027newpri\u0027\nWarning(kernel/sched/cpupri.c:139): Excess function parameter \u0027pri\u0027 description in \u0027cpupri_set\u0027\nWarning(kernel/sched/cpupri.c:208): Excess function parameter \u0027bootmem\u0027 description in \u0027cpupri_init\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc:\tIngo Molnar \u003cmingo@elte.hu\u003e\nCc:\tPeter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f6c76aa5f0fb53059730c628ac59ef62a14ed7a", "tree": "cdbcd0c168a1df960779c042054ac168f81d3e81", "parents": [ "4d922612df8bd1202a1f51d95b78aca3d67302cd" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:03:00 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix new warnings in cfg80211.h\n\nFix new kernel-doc warnings:\n\nWarning(include/net/cfg80211.h:1165): No description found for parameter \u0027channel_type\u0027\nWarning(include/net/cfg80211.h:2090): No description found for parameter \u0027probe_resp_offload\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc:\tJohannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc:\tlinux-wireless@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d922612df8bd1202a1f51d95b78aca3d67302cd", "tree": "1529f0b5d3c52da76a25189474ba4d25122764a1", "parents": [ "2eda013f4894bc200124f791a56c4defb613a0cc" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix new warning in usb.h\n\nFix new kernel-doc warning:\n\nWarning(include/linux/usb.h:1251): No description found for parameter \u0027num_mapped_sgs\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2eda013f4894bc200124f791a56c4defb613a0cc", "tree": "a186229c34e0629b72d64ed767076257edcdea94", "parents": [ "b5763accd3b5fc131ee06e26ce56e63ae0322c9b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:53 2012 -0800" }, "message": "kernel-doc: fix new warnings in device.h\n\nFix new kernel-doc warnings:\n\nWarning(include/linux/device.h:299): No description found for parameter \u0027name\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027subsys\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027node\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027add_dev\u0027\nWarning(include/linux/device.h:299): No description found for parameter \u0027remove_dev\u0027\nWarning(include/linux/device.h:685): No description found for parameter \u0027id\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__driver\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__register\u0027\nWarning(include/linux/device.h:1009): No description found for parameter \u0027__unregister\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "245132643e1cfcd145bbc86a716c1818371fcb93", "tree": "e5bf3cb56efedb059b1a68fd8efd37482131783b", "parents": [ "85046579bde15e532983438f86b36856e358f417" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Fri Jan 20 14:34:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:48 2012 -0800" }, "message": "SHM_UNLOCK: fix Unevictable pages stranded after swap\n\nCommit cc39c6a9bbde (\"mm: account skipped entries to avoid looping in\nfind_get_pages\") correctly fixed an infinite loop; but left a problem\nthat find_get_pages() on shmem would return 0 (appearing to callers to\nmean end of tree) when it meets a run of nr_pages swap entries.\n\nThe only uses of find_get_pages() on shmem are via pagevec_lookup(),\ncalled from invalidate_mapping_pages(), and from shmctl SHM_UNLOCK\u0027s\nscan_mapping_unevictable_pages(). The first is already commented, and\nnot worth worrying about; but the second can leave pages on the\nUnevictable list after an unusual sequence of swapping and locking.\n\nFix that by using shmem_find_get_pages_and_swap() (then ignoring the\nswap) instead of pagevec_lookup().\n\nBut I don\u0027t want to contaminate vmscan.c with shmem internals, nor\nshmem.c with LRU locking. So move scan_mapping_unevictable_pages() into\nshmem.c, renaming it shmem_unlock_mapping(); and rename\ncheck_move_unevictable_page() to check_move_unevictable_pages(), looping\ndown an array of pages, oftentimes under the same lock.\n\nLeave out the \"rotate unevictable list\" block: that\u0027s a leftover from\nwhen this was used for /proc/sys/vm/scan_unevictable_pages, whose flawed\nhandling involved looking at pages at tail of LRU.\n\nWas there significance to the sequence first ClearPageUnevictable, then\ntest page_evictable, then SetPageUnevictable here? I think not, we\u0027re\nunder LRU lock, and have no barriers between those.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Shaohua Li \u003cshaohua.li@intel.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e [back to 3.1 but will need respins]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb78edfdcef5259ac9e9088bd63810d21299928d", "tree": "a318408e90b77169486464342d28d08119ef58bb", "parents": [ "409eb8c2611b4310947a150af988111f7f52ab15" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Fri Jan 20 14:34:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:48 2012 -0800" }, "message": "kdump: define KEXEC_NOTE_BYTES arch specific for s390x\n\nkdump only allocates memory for the prstatus ELF note. For s390x,\nbesides of prstatus multiple ELF notes for various different register\ntypes are stored. Therefore the currently allocated memory is not\nsufficient. With this patch the KEXEC_NOTE_BYTES macro can be defined\nby architecture code and for s390x it is set to the correct size now.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6536e3123e5d3371a6f52e32a3d0694bcc987702", "tree": "45212bcb96a33d3a40cd1c631d9670a1bae52c2b", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Fri Jan 20 14:33:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:47 2012 -0800" }, "message": "mm: fix warnings regarding enum migrate_mode\n\nsparc64 allmodconfig:\n\nIn file included from include/linux/compat.h:15,\n from /usr/src/25/arch/sparc/include/asm/siginfo.h:19,\n from include/linux/signal.h:5,\n from include/linux/sched.h:73,\n from arch/sparc/kernel/asm-offsets.c:13:\ninclude/linux/fs.h:618: warning: parameter has incomplete type\n\nIt seems that my sparc64 compiler (gcc-3.4.5) doesn\u0027t like the forward\ndeclaration of enums.\n\nFix this by moving the \"enum migrate_mode\" definition into its own header\nfile.\n\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andy Isaacson \u003cadi@hexapodia.org\u003e\nCc: Nai Xia \u003cnai.xia@gmail.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1cc16b8e643096adb92bbcb76c6c4c564141c40", "tree": "c82c5be4c43ab5c82cf9fad022a4c77df30e90cc", "parents": [ "0e90b31f4ba77027a7c21cbfc66404df0851ca21" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 14:45:14 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "bluetooth: hci: Fix type of \"enable_hs\" to bool.\n\nFixes:\n\nnet/bluetooth/hci_core.c: In function ‘__check_enable_hs’:\nnet/bluetooth/hci_core.c:2587:1: warning: return from incompatible pointer type [enabled by default]\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e90b31f4ba77027a7c21cbfc66404df0851ca21", "tree": "10dc6c443e2f058869d3953a90e6d48fb53f83ae", "parents": [ "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "net: introduce res_counter_charge_nofail() for socket allocations\n\nThere is a case in __sk_mem_schedule(), where an allocation\nis beyond the maximum, but yet we are allowed to proceed.\nIt happens under the following condition:\n\n\tsk-\u003esk_wmem_queued + size \u003e\u003d sk-\u003esk_sndbuf\n\nThe network code won\u0027t revert the allocation in this case,\nmeaning that at some point later it\u0027ll try to do it. Since\nthis is never communicated to the underlying res_counter\ncode, there is an inbalance in res_counter uncharge operation.\n\nI see two ways of fixing this:\n\n1) storing the information about those allocations somewhere\n in memcg, and then deducting from that first, before\n we start draining the res_counter,\n2) providing a slightly different allocation function for\n the res_counter, that matches the original behavior of\n the network code more closely.\n\nI decided to go for #2 here, believing it to be more elegant,\nsince #1 would require us to do basically that, but in a more\nobscure way.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026", "tree": "5c526f7ced428e65db025ba7af29ca114031c302", "parents": [ "376be5ff8a6a36efadd131860cf26841f366d44c" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "cgroup: make sure memcg margin is 0 when over limit\n\nFor the memcg sock code, we\u0027ll need to register allocations\nthat are temporarily over limit. Let\u0027s make sure that margin\nis 0 in this case.\n\nI am keeping this as a separate patch, so that if any weirdness\ninteraction appears in the future, we can now exactly what caused\nit.\n\nSuggested by Johannes Weiner\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCC: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "376be5ff8a6a36efadd131860cf26841f366d44c", "tree": "af7c37842eeb37c4a79195c46fc1dabbaf84be6f", "parents": [ "1a3bc369ba547c11ca8b3ed079d7584f27499e70" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "net: fix socket memcg build with !CONFIG_NET\n\nThere is still a build bug with the sock memcg code, that triggers\nwith !CONFIG_NET, that survived my series of randconfig builds.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCC: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a3bc369ba547c11ca8b3ed079d7584f27499e70", "tree": "6de8906d5345da3eb8b3b34489f8437b653b3b19", "parents": [ "af58f1d62853cd883c1fa26556fb470f05878f21" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 09:03:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "kernel-doc: fix new warning in net/sock.h\n\nFix new kernel-doc warning:\n\nWarning(include/net/sock.h:372): No description found for parameter \u0027sk_cgrp_prioidx\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "974c12360dfe6ab01201fe9e708e7755c413f8b6", "tree": "8cdf87f44c8be550af2ec1530f8cb271fb1a2e1f", "parents": [ "d0249e44432aa0ffcf710b64449b8eaa3722547e" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Thu Jan 19 14:42:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:44 2012 -0500" }, "message": "tcp: detect loss above high_seq in recovery\n\nCorrectly implement a loss detection heuristic: New sequences (above\nhigh_seq) sent during the fast recovery are deemed lost when higher\nsequences are SACKed.\n\nCurrent code does not catch these losses, because tcp_mark_head_lost()\ndoes not check packets beyond high_seq. The fix is straight-forward by\nchecking packets until the highest sacked packet. In addition, all the\nFLAG_DATA_LOST logic are in-effective and redundant and can be removed.\n\nUpdate the loss heuristic comments. The algorithm above is documented\nas heuristic B, but it is redundant too because heuristic A already\ncovers B.\n\nNote that this change only marks some forward-retransmitted packets LOST.\nIt does NOT forbid TCP performing further CWR on new losses. A potential\nfollow-up patch under preparation is to perform another CWR on \"new\"\nlosses such as\n1) sequence above high_seq is lost (by resetting high_seq to snd_nxt)\n2) retransmission is lost.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93ece0c1a7ace88f10411dbb5643d2aa2fe00ebf", "tree": "c6a00edd4504b9c026bc555e3d74fe155cacadbf", "parents": [ "35fb9afbdeef9d5859d9a878d0372907baf119e1" ], "author": { "name": "Eugenia Emantayev", "email": "eugenia@mellanox.co.il", "time": "Thu Jan 19 09:45:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:43 2012 -0500" }, "message": "mlx4_en: eth statistics modification\n\nIn native mode display all available staticstics.\nIn SRIOV mode on VF display only SW counters statistics,\nin SRIOV mode on hypervisor display SW counters and errors (got from FW)\nstatistics.\n\nSigned-off-by: Eugenia Emantayev \u003ceugenia@mellanox.co.il\u003e\nReviewed-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72081624d5ad3cf56deb6e727b78c4e7a55e4eec", "tree": "853ed00967d6567af191fbb85b625638970ce15f", "parents": [ "160cb5a97daef0cb894685d84c9d4700bb7cccb4" ], "author": { "name": "Srivatsa S. Bhat", "email": "srivatsa.bhat@linux.vnet.ibm.com", "time": "Thu Jan 19 23:25:33 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 19 23:25:33 2012 +0100" }, "message": "PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression\n\nCommit 33e638b, \"PM / Sleep: Use the freezer_count() functions in\n[un]lock_system_sleep() APIs\" introduced an undesirable change in the\nbehaviour of unlock_system_sleep() since freezer_count() internally calls\ntry_to_freeze() - which we don\u0027t need in unlock_system_sleep().\n\nAnd commit bcda53f, \"PM / Sleep: Replace mutex_[un]lock(\u0026pm_mutex) with\n[un]lock_system_sleep()\" made these APIs wide-spread. This caused a\nregression in suspend-to-disk where snapshot_read() and snapshot_write()\nwere getting frozen due to the try_to_freeze embedded in\nunlock_system_sleep(), since these functions were invoked when the freezing\ncondition was still in effect.\n\nFix this by rewriting unlock_system_sleep() by open-coding freezer_count()\nand dropping the try_to_freeze() part. Not only will this fix the\nregression but this will also ensure that the API only does what it is\nintended to do, and nothing more, under the hood.\n\nWhile at it, make the code more correct and robust by ensuring that the\nPF_FREEZER_SKIP flag gets cleared with pm_mutex held, to avoid a race with\nthe freezer.\n\nAlso, to be on the safer side, open-code freezer_do_not_count() as well\n(inside lock_system_sleep()), to ensure that any unrelated modification to\nfreezer[_do_not]_count() does not break things again!\n\nReported-and-tested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "456a8167e94b66f406c27400a46a707b870452b0", "tree": "6c6eedf5ff8819dc4c6346db651be9e8758e0df7", "parents": [ "f6b24579d099ebb67f39cd7924a72a7eec0ce6ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Jan 18 10:04:29 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jan 19 16:17:35 2012 +1100" }, "message": "KEYS: Permit key_serial() to be called with a const key pointer\n\nPermit key_serial() to be called with a const key pointer.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "4ba3069fea9f0771dad3f4906b305ab50d5a1b30", "tree": "3f75f2c0a320a6f38538c5e63f46ef79b0b3f1d1", "parents": [ "507a03c1cba0e32309223d23d19a1bfc0916c140", "895f3022523361e9b383cf48f51feb1f7d5e7e53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:59:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:59:18 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)\n target: Set additional sense length field in sense data\n target: Remove legacy device status check from transport_execute_tasks\n target: Remove __transport_execute_tasks() for each processing context\n target: Remove extra se_device-\u003eexecute_task_lock access in fast path\n target: Drop se_device TCQ queue_depth usage from I/O path\n target: Fix possible NULL pointer with __transport_execute_tasks\n target: Remove TFO-\u003echeck_release_cmd() fabric API caller\n tcm_fc: Convert ft_send_work to use target_submit_cmd\n target: Add target_submit_cmd() for process context fabric submission\n target: Make target_put_sess_cmd use target_release_cmd_kref\n target: Set response format in INQUIRY response\n target: tcm_mod_builder: small fixups\n Documentation/target: Fix tcm_mod_builder.py build breakage\n target: remove overagressive ____cacheline_aligned annoations\n tcm_loop: bump max_sectors\n target/configs: remove trailing newline from udev_path and alias\n iscsi-target: fix chap identifier simple_strtoul usage\n target: remove useless casts\n target: simplify target_check_cdb_and_preempt\n target: Move core_scsi3_check_cdb_abort_and_preempt\n ...\n" }, { "commit": "507a03c1cba0e32309223d23d19a1bfc0916c140", "tree": "8da15f9c635733948a73bfe35cb50e1195702952", "parents": [ "be405411f712489f2f780ab085e1069e8fb85f19", "79ba0db69c5887f1ad4ed51d58894e7e889084b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nThis includes initial support for the recently published ACPI 5.0 spec.\nIn particular, support for the \"hardware-reduced\" bit that eliminates\nthe dependency on legacy hardware.\n\nAPEI has patches resulting from testing on real hardware.\n\nPlus other random fixes.\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits)\n acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec\n intel_idle: Split up and provide per CPU initialization func\n ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2\n ACPI processor: Remove unneeded cpuidle_unregister_driver call\n intel idle: Make idle driver more robust\n intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle\n ACPI: kernel-parameters.txt : Add intel_idle.max_cstate\n intel_idle: remove redundant local_irq_disable() call\n ACPI processor: Fix error path, also remove sysdev link\n ACPI: processor: fix acpi_get_cpuid for UP processor\n intel_idle: fix API misuse\n ACPI APEI: Convert atomicio routines\n ACPI: Export interfaces for ioremapping/iounmapping ACPI registers\n ACPI: Fix possible alignment issues with GAS \u0027address\u0027 references\n ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)\n ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)\n ACPI: Store SRAT table revision\n ACPI, APEI, Resolve false conflict between ACPI NVS and APEI\n ACPI, Record ACPI NVS regions\n ACPI, APEI, EINJ, Refine the fix of resource conflict\n ...\n" }, { "commit": "4a7c1ff2362b7bfbc04990f42c21cefdff57f997", "tree": "82ac9c30ca95b6a92084f5535e6406866eb99cf3", "parents": [ "9278e634b4e063f415b46923a9ca4e74f42ec932", "36be126cb0ebe3000a65c1049f339a3e882a9a47" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:53:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:53:54 2012 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)\n [media] as3645a: Fix compilation by including slab.h\n [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c\n [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c\n [media] ds3000: using logical \u0026\u0026 instead of bitwise \u0026\n [media] v4l2-ctrls: make control names consistent\n [media] DVB: dib0700, add support for Nova-TD LEDs\n [media] DVB: dib0700, add corrected Nova-TD frontend_attach\n [media] DVB: dib0700, separate stk7070pd initialization\n [media] DVB: dib0700, move Nova-TD Stick to a separate set\n [media] : add MODULE_FIRMWARE to dib0700\n [media] DVB-CORE: remove superfluous DTV_CMDs\n [media] s5p-jpeg: adapt to recent videobuf2 changes\n [media] s5p-g2d: fixed a bug in controls setting function\n [media] s5p-mfc: Fix volatile controls setup\n [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test\n [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test\n [media] s5p-fimc: Fix incorrect control ID assignment\n [media] dvb_frontend: Don\u0027t call get_frontend() if idle\n [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T\n [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters\n ...\n" }, { "commit": "d71f5be276bf79eda14c40f3cafcf827326f10cb", "tree": "581dadb90b06b950882a8eb75deee23d3370a4ab", "parents": [ "92b5abbb44e05cdbc4483219f30a435dd871a8ea", "76ffe8a3f766358a0ade543153625b3e4e66159d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:35:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:35:17 2012 -0800" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\nSCSI updates on 20120118\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (49 commits)\n [SCSI] libfc: remove redundant timer init for fcp\n [SCSI] fcoe: Move fcoe_debug_logging from fcoe.h to fcoe.c\n [SCSI] libfc: Declare local functions static\n [SCSI] fcoe: fix regression on offload em matching function for initiator/target\n [SCSI] qla4xxx: Update driver version to 5.02.00-k12\n [SCSI] qla4xxx: Cleanup modinfo display\n [SCSI] qla4xxx: Update license\n [SCSI] qla4xxx: Clear the RISC interrupt bit during FW init\n [SCSI] qla4xxx: Added error logging for firmware abort\n [SCSI] qla4xxx: Disable generating pause frames in case of FW hung\n [SCSI] qla4xxx: Temperature monitoring for ISP82XX core.\n [SCSI] megaraid: fix sparse warnings\n [SCSI] sg: convert to kstrtoul_from_user()\n [SCSI] don\u0027t change sdev starvation list order without request dispatched\n [SCSI] isci: fix, prevent port from getting stuck in the \u0027configuring\u0027 state\n [SCSI] isci: fix start OOB\n [SCSI] isci: fix io failures while wide port links are coming up\n [SCSI] isci: allow more time for wide port targets\n [SCSI] isci: enable wide port targets\n [SCSI] isci: Fix IO fails when pull cable from phy in x4 wideport in MPC mode.\n ...\n" }, { "commit": "92b5abbb44e05cdbc4483219f30a435dd871a8ea", "tree": "15490d1c7fd415575ec6beec1baa5ce89f747bf9", "parents": [ "ccb19d263fd1c9e34948e2158c53eacbff369344", "df3481399042200792822b6243e36a95a557b57e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "message": "Merge git://git.infradead.org/users/willy/linux-nvme\n\n* git://git.infradead.org/users/willy/linux-nvme: (105 commits)\n NVMe: Set number of queues correctly\n NVMe: Version 0.8\n NVMe: Set queue flags correctly\n NVMe: Simplify nvme_unmap_user_pages\n NVMe: Mark the end of the sg list\n NVMe: Fix DMA mapping for admin commands\n NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT\n NVMe: Merge the nvme_bio and nvme_prp data structures\n NVMe: Change nvme_completion_fn to take a dev\n NVMe: Change get_nvmeq to take a dev instead of a namespace\n NVMe: Simplify completion handling\n NVMe: Update Identify Controller data structure\n NVMe: Implement doorbell stride capability\n NVMe: Version 0.7\n NVMe: Don\u0027t probe namespace 0\n Fix calculation of number of pages in a PRP List\n NVMe: Create nvme_identify and nvme_get_features functions\n NVMe: Fix memory leak in nvme_dev_add()\n NVMe: Fix calls to dma_unmap_sg\n NVMe: Correct sg list setup in nvme_map_user_pages\n ...\n" }, { "commit": "ccb19d263fd1c9e34948e2158c53eacbff369344", "tree": "6683e55f183920dcbf3e1a5b749e7f9780c465b3", "parents": [ "6a488979f574cb4287880db2dbc8b13cee30c5be", "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n net: fix NULL-deref in WARN() in skb_gso_segment()\n net: WARN if skb_checksum_help() is called on skb requiring segmentation\n caif: Remove bad WARN_ON in caif_dev\n caif: Fix typo in Vendor/Product-ID for CAIF modems\n bnx2x: Disable AN KR work-around for BCM57810\n bnx2x: Remove AutoGrEEEn for BCM84833\n bnx2x: Remove 100Mb force speed for BCM84833\n bnx2x: Fix PFC setting on BCM57840\n bnx2x: Fix Super-Isolate mode for BCM84833\n net: fix some sparse errors\n net: kill duplicate included header\n net: sh-eth: Fix build error by the value which is not defined\n net: Use device model to get driver name in skb_gso_segment()\n bridge: BH already disabled in br_fdb_cleanup()\n net: move sock_update_memcg outside of CONFIG_INET\n mwl8k: Fixing Sparse ENDIAN CHECK warning\n ...\n" }, { "commit": "79ba0db69c5887f1ad4ed51d58894e7e889084b0", "tree": "72948278c60e0997ad2e7cc0181d469c61b62fa8", "parents": [ "cb7971756b901abd61d47f6eb1011066abfb348d", "c130bd6f82e5dda28b1a19741c4c2fe269713199", "5c2a9f06a9cd7194f884cdc88144866235dec07d", "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "9f10f6a520deb3639fac78d81151a3ade88b4e7f", "553575f1ae048aa44682b46b3c51929a0b3ad337" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "message": "Merge branches \u0027einj\u0027, \u0027intel_idle\u0027, \u0027misc\u0027, \u0027srat\u0027 and \u0027turbostat-ivb\u0027 into release\n" }, { "commit": "c130bd6f82e5dda28b1a19741c4c2fe269713199", "tree": "7561dc50d4c256ca9eb19cd55569bc7867289af7", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Tue Jan 17 12:10:16 2012 -0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:14:17 2012 -0500" }, "message": "acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec\n\nACPI 5.0 provides extensions to the EINJ mechanism to specify the\ntarget for the error injection - by APICID for cpu related errors,\nby address for memory related errors, and by segment/bus/device/function\nfor PCIe related errors. Also extensions for vendor specific error\ninjections.\n\nTested-by: Chen Gong \u003cgong.chen@linux.intel.com\u003e\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "cb7971756b901abd61d47f6eb1011066abfb348d", "tree": "c822e575f95c6f8ee5814648f6ccc1fb3226f6fc", "parents": [ "037d76f40430ba1269dc7d1fee22382cd9672997", "700130b41f4ee54520ac2ef2f7f1d072789711a4" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 00:46:30 2012 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 00:46:30 2012 -0500" }, "message": "Merge branch \u0027atomicio-remove\u0027 into release\n" }, { "commit": "037d76f40430ba1269dc7d1fee22382cd9672997", "tree": "0a378e88951655aa0042645fbd12b7058be95c3e", "parents": [ "5d1f86572685d577b76142b7c61453000e1a5e26", "4134b8c8811f23aa8a281db50dcee64dda414736" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 00:18:10 2012 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 00:18:10 2012 -0500" }, "message": "Merge branch \u0027apei\u0027 into release\n" }, { "commit": "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "tree": "fd98dd21fafcbeec668bbc2e61812b65bee7919e", "parents": [ "3bd81a8710710f8bf5d1a5ebac315c842c20bdd3" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Tue Jan 17 22:40:08 2012 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Jan 17 23:59:12 2012 -0500" }, "message": "intel_idle: Split up and provide per CPU initialization func\n\nFunction split up, should have no functional change.\n\nProvides entry point for physically hotplugged CPUs\nto initialize and activate cpuidle.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nCC: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nCC: Shaohua Li \u003cshaohua.li@intel.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "9f6ed2ca257fa8650b876377833e6f14e272848b", "tree": "8b664dced5415a6d463a56c2bc98756bd5ea5e44", "parents": [ "ce91acb3acae26f4163c5a6f1f695d1a1e8d9009" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Tue Jan 17 16:09:11 2012 -0500" }, "committer": { "name": "Steve French", "email": "smfrench@gmail.com", "time": "Tue Jan 17 22:39:40 2012 -0600" }, "message": "keys: add a \"logon\" key type\n\nFor CIFS, we want to be able to store NTLM credentials (aka username\nand password) in the keyring. We do not, however want to allow users\nto fetch those keys back out of the keyring since that would be a\nsecurity risk.\n\nUnfortunately, due to the nuances of key permission bits, it\u0027s not\npossible to do this. We need to grant search permissions so the kernel\ncan find these keys, but that also implies permissions to read the\npayload.\n\nResolve this by adding a new key_type. This key type is essentially\nthe same as key_type_user, but does not define a .read op. This\nprevents the payload from ever being visible from userspace. This\nkey type also vets the description to ensure that it\u0027s \"qualified\"\nby checking to ensure that it has a \u0027:\u0027 in it that is preceded by\nother characters.\n\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csmfrench@gmail.com\u003e\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "a25a2b84098eb5e001cb8086603d692aa95bf2ec", "tree": "02c01b36251f7b0afb1a98093e14efb17d015910", "parents": [ "f429ee3b808118591d1f3cdf3c0d0793911a5677", "f1be242c95257b199d8b679bc952ca33487c9af6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n integrity: digital signature config option name change\n lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts\n lib: MPILIB Kconfig description update\n lib: digital signature dependency fix\n lib: digital signature config option name change\n encrypted-keys: fix rcu and sparse messages\n keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n KEYS: Add missing smp_rmb() primitives to the keyring search code\n TOMOYO: Accept \\000 as a valid character.\n security: update MAINTAINERS file with new git repo\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "f9156c7288e2d11501ded4d7fe6d9a3a41ee4057", "tree": "7bd26fc9a111c6af1601ecd2d1b0ab60da32f3f0", "parents": [ "67175b855bfd6ed95ffeff95532173c07de6432d", "96bdc7dc61fb1b1e8e858dafb13abee8482ba064" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:49:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:49:54 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (62 commits)\n Btrfs: use larger system chunks\n Btrfs: add a delalloc mutex to inodes for delalloc reservations\n Btrfs: space leak tracepoints\n Btrfs: protect orphan block rsv with spin_lock\n Btrfs: add allocator tracepoints\n Btrfs: don\u0027t call btrfs_throttle in file write\n Btrfs: release space on error in page_mkwrite\n Btrfs: fix btrfsck error 400 when truncating a compressed\n Btrfs: do not use btrfs_end_transaction_throttle everywhere\n Btrfs: add balance progress reporting\n Btrfs: allow for resuming restriper after it was paused\n Btrfs: allow for canceling restriper\n Btrfs: allow for pausing restriper\n Btrfs: add skip_balance mount option\n Btrfs: recover balance on mount\n Btrfs: save balance parameters to disk\n Btrfs: soft profile changing mode (aka soft convert)\n Btrfs: implement online profile changing\n Btrfs: do not reduce profile in do_chunk_alloc()\n Btrfs: virtual address space subset filter\n ...\n\nFix up trivial conflict in fs/btrfs/ioctl.c due to the use of the new\nmnt_drop_write_file() helper.\n" }, { "commit": "5e8898e97a5db4125d944070922164d1d09a2689", "tree": "a5319fcc60499e63fecc7a08d923a1de8f9c7622", "parents": [ "6ac6172a935d1faf7ef259802267657bc0007a62" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@intel.com", "time": "Tue Jan 17 17:12:03 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:46:21 2012 +1100" }, "message": "lib: digital signature config option name change\n\nIt was reported that DIGSIG is confusing name for digital signature\nmodule. It was suggested to rename DIGSIG to SIGNATURE.\n\nRequested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSuggested-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ee0b31a25a010116f44fca6c96f4516d417793dd", "tree": "d7670d202d0f4888b5213ed73d88c9a80bd05b74", "parents": [ "efde8b6e16f11e7d1681c68d86c7fd51053cada7" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Jan 17 20:39:51 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:41:29 2012 +1100" }, "message": "keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n\nDefine rcu_assign_keypointer(), which uses the key payload.rcudata instead\nof payload.data, to resolve the CONFIG_SPARSE_RCU_POINTER message:\n\"incompatible types in comparison expression (different address spaces)\"\n\nReplace the rcu_assign_pointer() calls in encrypted/trusted keys with\nrcu_assign_keypointer().\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "67175b855bfd6ed95ffeff95532173c07de6432d", "tree": "2f98cccf78987db9b319c67a523ab44edc7bde3b", "parents": [ "e268337dfe26dfc7efd422a804dbb27977a3cccc" ], "author": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Tue Jan 17 21:14:05 2012 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:40:51 2012 -0800" }, "message": "Fix compile breakage with kref.h\n\nThis set of build failures just started appearing on parisc:\n\n In file included from drivers/input/serio/serio_raw.c:12:\n include/linux/kref.h: In function \u0027kref_get\u0027:\n include/linux/kref.h:40: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n include/linux/kref.h:40: error: (Each undeclared identifier is reported only once\n include/linux/kref.h:40: error: for each function it appears in.)\n include/linux/kref.h: In function \u0027kref_sub\u0027:\n include/linux/kref.h:65: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n\nIt happens because TAINT_WARN is defined in kernel.h and this particular\ncompile doesn\u0027t seem to include it (no idea why it\u0027s just manifesting ..\nprobably some #include file untangling exposed it).\n\nFix by adding\n\n #include \u003clinux/kernel.h\u003e\n\nto linux/kref.h\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "10d68360871657204885371cdf2594412675d2f9" }