)]}' { "log": [ { "commit": "735038cae09a33a6a9fa3c650377671a0e8f45a6", "tree": "a9b4837b7485050da95f72d2015c8d81aab2dd32", "parents": [ "21b8a2b0040d263e8d32c7ce1c06531ab75fd12d" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jun 09 18:50:47 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:22 2011 -0700" }, "message": "Bluetooth: Add support for LE Start Encryption\n\nThis adds support for starting SMP Phase 2 Encryption, when the initial\nSMP negotiation is successful. This adds the LE Start Encryption and LE\nLong Term Key Request commands and related events.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "21b8a2b0040d263e8d32c7ce1c06531ab75fd12d", "tree": "8d8e00537ffcbe26b557ec72187807fe566fa738", "parents": [ "c8e856e3c7c0bc0315143c6a966766852002c36d" ], "author": { "name": "Anderson Briglia", "email": "anderson.briglia@openbossa.org", "time": "Thu Jun 09 18:50:46 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:21 2011 -0700" }, "message": "Bluetooth: Add SMP confirmation checks methods\n\nThis patch includes support for generating and sending the random value\nused to produce the confirmation value.\n\nSigned-off-by: Anderson Briglia \u003canderson.briglia@openbossa.org\u003e\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "c8e856e3c7c0bc0315143c6a966766852002c36d", "tree": "43a43d75625de88b7961e9ba4cd11913a9b005ac", "parents": [ "8e7a3c532241b8fad2343348461931ea4b7f10d2" ], "author": { "name": "Anderson Briglia", "email": "anderson.briglia@openbossa.org", "time": "Thu Jun 09 18:50:45 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:21 2011 -0700" }, "message": "Bluetooth: Add SMP confirmation structs\n\nThis patch adds initial support for verifying the confirmation value\nthat the remote side has sent.\n\nSigned-off-by: Anderson Briglia \u003canderson.briglia@openbossa.org\u003e\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "09fabbca0029353a6b18d11dd084c3eca9599141", "tree": "5adf5adb66878e390045e096014d6c9acc8acb88", "parents": [ "13b4839cb23cffc4d432905f0ce3e2b13d331418" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jun 09 18:50:43 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:21 2011 -0700" }, "message": "Bluetooth: Add support for using the crypto subsystem\n\nThis will allow using the crypto subsystem for encrypting data. As SMP\n(Security Manager Protocol) is implemented almost entirely on the host\nside and the crypto module already implements the needed methods\n(AES-128), it makes sense to use it.\n\nThere\u0027s now a new module option to enable/disable SMP support.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Anderson Briglia \u003canderson.briglia@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "13b4839cb23cffc4d432905f0ce3e2b13d331418", "tree": "dd50627a078f44766c7f6b271c424ecd53287232", "parents": [ "ea370126950d9d8931d323d6e61a3d76d291f466" ], "author": { "name": "Anderson Briglia", "email": "anderson.briglia@openbossa.org", "time": "Thu Jun 09 18:50:42 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:21 2011 -0700" }, "message": "Bluetooth: Add simple SMP pairing negotiation\n\nThis implementation only exchanges SMP messages between the Host and the\nRemote. No keys are being generated. TK and STK generation will be\nprovided in further patches.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "133e14c158da76cd047f592fb08b9619d746fd09", "tree": "3b1678324a5a03b526beae06f2a0c5ac39762aa1", "parents": [ "d7649a5cab7bd3dc44327f3e3787923aebdd7a49" ], "author": { "name": "Anderson Briglia", "email": "anderson.briglia@openbossa.org", "time": "Thu Jun 09 18:50:40 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:20 2011 -0700" }, "message": "Bluetooth: Implement the first SMP commands\n\nThese simple commands will allow the SMP procedure to be started\nand terminated with a not supported error. This is the first step\ntoward something useful.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Anderson Briglia \u003canderson.briglia@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "446b49bee3ce865fd4a4ca1df2a749ecc6162d9a", "tree": "66b728de9509a0ad4f01ee1f4475eb15510f292c", "parents": [ "bd69b5ae05398e0849b0dd755ce42ba60da6d9d9" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue May 17 15:13:19 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:20 2011 -0700" }, "message": "Bluetooth: keep reference if any ERTM timer is enabled\n\nERTM use the generic L2CAP timer functions to keep a reference to the\nchannel. This is useful for avoiding crashes.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "bd69b5ae05398e0849b0dd755ce42ba60da6d9d9", "tree": "ce03649812f194bb3318e73ab9a5d827ac1fda6d", "parents": [ "4a6aa524c95b91ae13ae6857fb21938695ea94fa" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue May 17 14:59:01 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:20 2011 -0700" }, "message": "Bluetooth: Make timer functions generic\n\nWe now plan to use l2cap_set_timer and l2cap_clear_timer in ERTM timers.\n\nChange-Id: Ie62b01e003f8885ae89c73e2e64195c21cbadddd\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "4a6aa524c95b91ae13ae6857fb21938695ea94fa", "tree": "277cc5928e9d33dd583acb53efe3fc46a0470fb1", "parents": [ "f1b394acd99a6e2919e2c61481abf0a12804a143" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue May 17 14:34:52 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:19 2011 -0700" }, "message": "Bluetooth: Add refcnt to struct l2cap_chan\n\nstruct l2cap_chan has now its own refcnt that is compatible with the\nsocket refcnt, i.e., we won\u0027t see sk_refcnt \u003d 0 and chan-\u003erefcnt \u003e 0.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "f1b394acd99a6e2919e2c61481abf0a12804a143", "tree": "c8566e6c6b0172d4bba30eb57da8d012958efa9a", "parents": [ "c4cf743414819597b2f5565c64e6b72c04e6122e" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jun 03 00:19:47 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:19 2011 -0700" }, "message": "Bluetooth: Add state tracking to struct l2cap_chan\n\nNow socket state is tracked by struct sock and channel state is tracked by\nchan-\u003estate. At this point both says the same, but this is going to change\nwhen we add AMP Support for example.\n\nChange-Id: Idbf873f5e8dd94f5b2482ba960c52193d28ce5dd\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "c4cf743414819597b2f5565c64e6b72c04e6122e", "tree": "9cbf1ab4b76e8099758bafd2e845609dbb39d67f", "parents": [ "162025cbf7cbbc3c43d9a3bcc0975f8de4cccc42" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon May 16 18:23:24 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:19 2011 -0700" }, "message": "Bluetooth: add close() callback to l2cap_chan_ops\n\nclose() calls l2cap_sock_kill() on l2cap_sock.c\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "162025cbf7cbbc3c43d9a3bcc0975f8de4cccc42", "tree": "f9b8b6f1da0ae206cf78ef750223313c854887e8", "parents": [ "b090c4b586097e4bfdb2dcd7b203db960e783a95" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon May 16 17:57:22 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:19 2011 -0700" }, "message": "Bluetooth: add recv() callback to l2cap_chan_ops\n\nThis abstracts the call to sock_queue_recv_skb() into\nl2cap_chan_ops-\u003erecv().\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "b090c4b586097e4bfdb2dcd7b203db960e783a95", "tree": "5bf7f328546e4aa1b42e47659eea7cb79ab2fe72", "parents": [ "b87bf5b81d38fb89758fc52d80ebb987745af2cb" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon May 16 17:24:37 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:19 2011 -0700" }, "message": "Bluetooth: Add l2cap_chan_ops abstraction\n\nAdd an abstraction layer between L2CAP core and its users (only\nl2cap_sock.c now). The first function implemented is new_connection() that\nreplaces calls to l2cap_sock_alloc() in l2cap_core.c\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "3f8e1e36bc2432ba3943f3ee5e781d8d30425cf1", "tree": "5208c06dd36c5ca7683ccc1f7ef63a5e9296604d", "parents": [ "941df95185ae299c391a41b72bee6112c741d7f4" ], "author": { "name": "Waldemar Rymarkiewicz", "email": "waldemar.rymarkiewicz@tieto.com", "time": "Tue Jun 07 11:18:06 2011 +0200" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:18 2011 -0700" }, "message": "Bluetooth: Clean up some code style issues\n\nFix lines longer than 80 chars in length.\n\nChange-Id: I448077965c5f7723a4a9537977bfa664cfe104fd\nSigned-off-by: Waldemar Rymarkiewicz \u003cwaldemar.rymarkiewicz@tieto.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "514abe61e146e18b256782fe959d8686a420c133", "tree": "9cb3da70369da648c6f4305614388f4ee0d15714", "parents": [ "9f449e005059cd645b6ebbb44bd51bc4a60e7d73" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon May 23 18:06:04 2011 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:17 2011 -0700" }, "message": "Bluetooth: Add BT_POWER L2CAP socket option.\n\nAdd BT_POWER socket option used to control the power\ncharacteristics of the underlying ACL link. When the remote end\nhas put the link in sniff mode and the host stack wants to send\ndata we need need to explicitly exit sniff mode to work well with\ncertain devices (For example, A2DP on Plantronics Voyager 855).\nHowever, this causes problems with HID devices.\n\nHence, moving into active mode when sending data, irrespective\nof who set the sniff mode has been made as a socket option. By\ndefault, we will move into active mode. HID devices can set the\nL2CAP socket option to prevent this from happening.\n\nCurrently, this has been implemented for L2CAP sockets. This has been\ntested with incoming and outgoing L2CAP sockets for HID and A2DP.\n\nBased on discussions on linux-bluetooth and patches submitted by\nAndrei Emeltchenko.\n\nSigned-off-by: Jaikumar Ganesh \u003cjaikumar@google.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "149c097ce73e6f301c8d257828334506028be307", "tree": "a6999e366d7fa9ff00ef87db69e98a7274e88d10", "parents": [ "54444290da43c96a66c30233c170f08b30fe6633" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Tue May 31 14:20:54 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:15 2011 -0700" }, "message": "Bluetooth: Add \u0027dst_type\u0027 field to struct hci_conn\n\nThis patch adds a new field (dst_type) to the struct hci_conn which\nholds the type of the destination address (bdaddr_t dst). This\napproach is needed in order to use the struct hci_conn as an\nabstraction of LE connections in HCI Layer. For non-LE this field\nis ignored.\n\nThis patch also set properly the \u0027dst_type\u0027 field after initializing\nLE hci_conn structures.\n\nChange-Id: I1e363bb6de263fdb1fe976a5a16ed5debc9b8c0c\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "62c5f52fdfcfc33134793c46a054c241736113f4", "tree": "8fa615fbd3d0db8be4235c1420cf2e15fe588bc8", "parents": [ "45e600fedef0ca2d9b5b5a09772f9e7a9d74d3b6" ], "author": { "name": "Waldemar Rymarkiewicz", "email": "waldemar.rymarkiewicz@tieto.com", "time": "Tue May 31 15:49:25 2011 +0200" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:14 2011 -0700" }, "message": "Bluetooth: Fix auth_complete_evt for legacy units\n\nLegacy devices don\u0027t re-authenticate the link properly if a link key\nalready exists. Thus, don\u0027t update sec_level for this case even if\nhci_auth_complete_evt indicates success. Otherwise the sec_level will\nnot reflect a real security on the link.\n\nSigned-off-by: Waldemar Rymarkiewicz \u003cwaldemar.rymarkiewicz@tieto.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "45e600fedef0ca2d9b5b5a09772f9e7a9d74d3b6", "tree": "d4572fbd21762483400af4f7326c15a62a44c330", "parents": [ "726e1334c7e975a0be3e675f9a67633ddd8afae3" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu May 26 16:23:53 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:14 2011 -0700" }, "message": "Bluetooth: Advertising entries lifetime\n\nThis patch adds a timer to clear \u0027adv_entries\u0027 after three minutes.\n\nAfter some amount of time, the advertising entries cached during\nthe last LE scan should be considered expired and they should be\nremoved from the advertising cache.\n\nIt was chosen a three minutes timeout as an initial attempt. This\nvalue might change in future.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "726e1334c7e975a0be3e675f9a67633ddd8afae3", "tree": "0139519501408c8279f6842457a85409835079d8", "parents": [ "5df108f14fb99cbb52ff96511f813f19c9fcbaa9" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu May 26 16:23:52 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:14 2011 -0700" }, "message": "Bluetooth: Clear advertising cache before scanning\n\nThe LE advertising cache should be cleared before performing a LE\nscanning. This will force the cache to contain only fresh advertising\nentries.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "6c77c8c0256e9ae63162d35359c39ede5592d959", "tree": "3fc48fdf7e74432c9dc0c8f9ade2490ec1f07ace", "parents": [ "1c3cc11882674a9037d2d63dd815927bf45bcbcf" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu May 26 16:23:50 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:13 2011 -0700" }, "message": "Bluetooth: LE advertising cache\n\nThis patch implements the LE advertising cache. It stores sensitive\ninformation (bdaddr and bdaddr_type so far) gathered from LE\nadvertising report events.\n\nOnly advertising entries from connectables devices are added to the\ncache.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "1c3cc11882674a9037d2d63dd815927bf45bcbcf", "tree": "85d206a7d54007b56b1872247c823af3483f5160", "parents": [ "762a9905bdcc1ce73cc62440341063df0408e802" ], "author": { "name": "Anderson Briglia", "email": "anderson.briglia@openbossa.org", "time": "Thu May 26 16:23:49 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:13 2011 -0700" }, "message": "Bluetooth: Add advertising report meta event structs\n\nThis patch adds definitions and a new struct for Advertising Report\nEvent from LE and Dual Mode controllers.\n\nSigned-off-by: Anderson Briglia \u003canderson.briglia@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "762a9905bdcc1ce73cc62440341063df0408e802", "tree": "ff6686667ebd58c37e1419c4935289ebae79543b", "parents": [ "1eb5ad7859c58ad6ba073860f57989048f2e2dfe" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed May 04 19:42:50 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:13 2011 -0700" }, "message": "Bluetooth: Rename __l2cap_chan_close() to l2cap_chan_close()\n\nTo make it consistent with the rest of the API.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "1eb5ad7859c58ad6ba073860f57989048f2e2dfe", "tree": "ec35ed2d4499fd49fca75177aed0e8c4f00d3b9d", "parents": [ "13003e04ed891cdfa52ccc7023867c896e1ca611" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed May 04 19:35:27 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:13 2011 -0700" }, "message": "Bluetooth: Remove export of l2cap_chan_clear_timer()\n\nThe call to l2cap_chan_clear_timer() is not really needed in l2cap_sock.c.\nThis patch also adds a call to l2cap_chan_clear_timer() to the only place\nin __l2cap_sock_close() that wasn\u0027t calling it. It\u0027s safe call it there\nbecause l2cap_chan_clear_timer() check first for timer_peding().\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "13003e04ed891cdfa52ccc7023867c896e1ca611", "tree": "988269c3273f85eedcda1f1bd32815d4f2071c5e", "parents": [ "8974c545aed982bde3160fee7294714c26903bdd" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon May 02 18:25:01 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:13 2011 -0700" }, "message": "Bluetooth: create channel timer to replace sk_timer\n\nThe new timer does not belong to struct sock, tought it still touch some\nsock things, but this will be sorted out soon.\n\nChange-Id: I55dc122657f3b8e80e76acf8c479e2d5c9889af5\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "8974c545aed982bde3160fee7294714c26903bdd", "tree": "5aec947053e1a7db14d97e91102153a648e1d29f", "parents": [ "dcb1cc3af7a7e91f69f0086ed8bd37acc1a4eabb" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon May 02 17:13:55 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:12 2011 -0700" }, "message": "Bluetooth: Add chan-\u003echan_type struct member\n\nchan_type says if our chan is raw(direclty access to HCI),\nconnection less or connection oriented.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "dcb1cc3af7a7e91f69f0086ed8bd37acc1a4eabb", "tree": "cbce299b263c8f8a92001d8aefae8854211b9b06", "parents": [ "6e9e43f35ced9745b4df25457c73aba269f22d40" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Thu Apr 28 18:50:17 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:12 2011 -0700" }, "message": "Bluetooth: Create l2cap_chan_send()\n\nThis move all the sending logic to l2cap_core.c, but we still have a\nsocket dependence there, struct msghdr. It will be removed in some of the\nfurther commits.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "6e9e43f35ced9745b4df25457c73aba269f22d40", "tree": "410dc7708a0dba645a93f5e7ade37090811b49af", "parents": [ "ceb723b8a337b6544594b39427bd3c2e5eaf0102" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Thu Apr 28 17:55:53 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:12 2011 -0700" }, "message": "Bluetooth: Create __l2cap_chan_close()\n\nThis is actually __l2cap_sock_close() renamed to __l2cap_chan_close().\nAt a first look it may not make sense, but with the further cleanups that\nwill come it will.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0", "tree": "103470d3c4a2865d1cafc4d4527f97d62660fc5d", "parents": [ "814cdea670616252e4cdf297a07b02ce59698bf1" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:27:59 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Fri Jul 08 14:15:44 2011 -0700" }, "message": "plist: Remove the need to supply locks to plist heads\n\nThis was legacy code brought over from the RT tree and\nis no longer necessary.\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nLink: http://lkml.kernel.org/r/1310084879-10351-2-git-send-email-dima@android.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "814cdea670616252e4cdf297a07b02ce59698bf1", "tree": "c4a5665995e813c252b07f1e863166059bfb5bcb", "parents": [ "487ffb052891a552fecf865ad4b24bbe7945a413", "fe0d42203cb5616eeff68b14576a0f7e2dd56625" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc6\u0027 into android-3.0\n" }, { "commit": "f2230156c74b8923ff7b84eab955761471104b9b", "tree": "2760d5c604c47cae00d834bf9a3d05a2ee8d16cd", "parents": [ "75dc25a8708d905afffd6da5f4fe69356f4eac33" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Jul 06 16:53:21 2011 -0700" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Jul 06 19:45:30 2011 -0700" }, "message": "ion: fix ION_HEAP_\u003cxxx\u003e_MASK definitions\n\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "aababb9766f0e874da26a17acbbec867bf9501f0", "tree": "4dea1f04d8c6d66ce00bb0ab49b939c165c3f33b", "parents": [ "b2bc4782191cb574924a1d09f48083ea8b33a93b", "3e86f1d8e397b1ef59a97910089e16a99e8f31f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "message": "Merge branch \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x\n\n* \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:\n vesafb: fix memory leak\n fbdev: amba: Link fb device to its parent\n fsl-diu-fb: remove check for pixel clock ranges\n udlfb: Correct sub-optimal resolution selection.\n hecubafb: add module_put on error path in hecubafb_probe()\n sm501fb: fix section mismatch warning\n gx1fb: Fix section mismatch warnings\n fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane\n" }, { "commit": "8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec", "tree": "67982a268cc4573aba1df10725019418b207d442", "parents": [ "6e139047e2eecd0ccf8bc2f1564e82747cb6e56c", "4f3c7a18d9e8a287d31f828a259d713fe4859471" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:26:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:26:53 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size\n ALSA: hdspm - Fix compile warnings with PPC\n ALSA: cs5535 - Fix invalid big-endian conversions\n ALSA: HDMI - fix ELD monitor name length\n ALSA: atmel - update author email for ABDAC, AC97C and AT73C213\n ALSA: HDA: Add model\u003dauto quirk for Acer Aspire 3830TG\n ALSA: HDA: Add a new Conexant codec ID (506c)\n" }, { "commit": "e6ee124528d520d429bf40303340e8be0bcefdaa", "tree": "e2d4fd0c9d9c5c6444e5425310f11cf54b134c2b", "parents": [ "c80005ae9ef788dce825629ea07e658714a2adad" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 12:19:55 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Thu Jun 30 15:15:14 2011 -0700" }, "message": "gpu: ion: Several fixes\n\nFix some cases where locks were not released on error paths\nChange heap-\u003eprio to heap-\u003eid to make meaning clearer\nFix kernel doc to match sources\n" }, { "commit": "4f3c7a18d9e8a287d31f828a259d713fe4859471", "tree": "eb587895c24cdf975caa9241443be4f1038d6d8a", "parents": [ "286bed0f0c447b6660e72093d7e778784fdd9ee6" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jun 30 15:08:04 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jun 30 15:33:57 2011 +0200" }, "message": "ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size\n\nOne of ioctl definition in sound/sb16_csp.h contains the data size\nover 8kB, and this causes build errors on architectures like MIPS,\nwhich define _IOC_SIZEBITS\u003d13.\n\nFor avoiding this build errors but keeping the compatibility, manually\nexpand with _IOC() instead of using _IOW() for the problematic ioctl.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c80005ae9ef788dce825629ea07e658714a2adad", "tree": "2fe6bc7a2b3341fa1465ce5a63a696d7f5e3ad97", "parents": [ "e55d4fa96762fd767a3b6d842c904e994db6bb2e" ], "author": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "committer": { "name": "Rebecca Schultz Zavin", "email": "rebecca@android.com", "time": "Wed Jun 29 19:44:29 2011 -0700" }, "message": "gpu: ion: Add ION Memory Manager\n\nSigned-off-by: Rebecca Schultz Zavin \u003crebecca@android.com\u003e\n" }, { "commit": "e55d4fa96762fd767a3b6d842c904e994db6bb2e", "tree": "c74157e01cb128cb97f106a50cfadc4c8b872c41", "parents": [ "e32c14667e4fe9f16ac9b918d15d29abd2315a55", "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc5\u0027 into android-3.0\n" }, { "commit": "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "tree": "6cf4a6e23f68f3b65906210dccb272ab2f9c5c74", "parents": [ "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "663dd6dcaf7e95526e469e91f41972a9c0cca30c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Connector: Correctly set the error code in case of success when dispatching receive callbacks\n Connector: Set the CN_NETLINK_USERS correctly\n pti: PTI semantics fix in pti_tty_cleanup.\n pti: ENXIO error case memory leak PTI fix.\n pti: double-free security PTI fix\n drivers:misc: ti-st: fix skipping of change remote baud\n drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n st_kim: Handle case of no device found for ID 0\n firmware: fix GOOGLE_SMI kconfig dependency warning\n" }, { "commit": "04b905942b482092a547798a2477f21e32a8f65d", "tree": "9ad2837587f5ce284f830432fec3569ecf44fbcb", "parents": [ "d90ce8711ceb516de823ae878270e5a21d11dede", "3bc46b312b1486b1fe2db4246a34a30160d26d8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: bcm63xx_uart: fix irq storm after rx fifo overrun.\n amba pl011: platform data for reg lockup and glitch v2\n amba pl011: workaround for uart registers lockup\n tty: n_gsm: improper skb_pull() use was leaking framed data\n tty: n_gsm: Fixed logic to decode break signal from modem status\n TTY: ntty, add one more sanity check\n TTY: ldisc, do not close until there are readers\n 8250: Fix capabilities when changing the port type\n 8250_pci: Fix missing const from merges\n ARM: SAMSUNG: serial: Fix on handling of one clock source for UART\n serial: ioremap warning fix for jsm driver.\n 8250_pci: add -ENODEV code for Intel EG20T PCH\n" }, { "commit": "08142579b6ca35883c1ed066a2681de6f6917062", "tree": "00735ed37753533f3b645714770b4fb036b5f7e0", "parents": [ "9b679320a5fbf46454011e5c62e0b8991b0956d1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jun 27 16:18:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "mm: fix assertion mapping-\u003enrpages \u003d\u003d 0 in end_writeback()\n\nUnder heavy memory and filesystem load, users observe the assertion\nmapping-\u003enrpages \u003d\u003d 0 in end_writeback() trigger. This can be caused by\npage reclaim reclaiming the last page from a mapping in the following\nrace:\n\n\tCPU0\t\t\t\tCPU1\n ...\n shrink_page_list()\n __remove_mapping()\n __delete_from_page_cache()\n radix_tree_delete()\n\t\t\t\t\tevict_inode()\n\t\t\t\t\t truncate_inode_pages()\n\t\t\t\t\t truncate_inode_pages_range()\n\t\t\t\t\t pagevec_lookup() - finds nothing\n\t\t\t\t\t end_writeback()\n\t\t\t\t\t mapping-\u003enrpages !\u003d 0 -\u003e BUG\n page-\u003emapping \u003d NULL\n mapping-\u003enrpages--\n\nFix the problem by doing a reliable check of mapping-\u003enrpages under\nmapping-\u003etree_lock in end_writeback().\n\nAnalyzed by Jay \u003cjinshan.xiong@whamcloud.com\u003e, lost in LKML, and dug out\nby Miklos Szeredi \u003cmszeredi@suse.de\u003e.\n\nCc: Jay \u003cjinshan.xiong@whamcloud.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "507c5f1224014f9956e604ee8703b3bbea7da4a4", "tree": "8af568077785c6159d5698741215b282788d661c", "parents": [ "2b4b2482e70eba10dd98653a3a5ac68126565e24" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Jun 27 16:18:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "include/linux/compat.h: declare compat_sys_sendmmsg()\n\nThis is required for tilegx to be able to use the compat unistd.h header\nwhere compat_sys_sendmmsg() is now mentioned.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9d90e5eb70e09903dadff42099b6c948f814050", "tree": "c3ab73df6dee61f9403bfd819a6b0cb9f3ca6085", "parents": [ "94c1e62df4494b79782cb9c7279f827212d1de70" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: add shmem_read_mapping_page_gfp\n\nAlthough it is used (by i915) on nothing but tmpfs, read_cache_page_gfp()\nis unsuited to tmpfs, because it inserts a page into pagecache before\ncalling the filesystem\u0027s -\u003ereadpage: tmpfs may have pages in swapcache\nwhich only it knows how to locate and switch to filecache.\n\nAt present tmpfs provides a -\u003ereadpage method, and copes with this by\ncopying pages; but soon we can simplify it by removing its -\u003ereadpage.\nProvide shmem_read_mapping_page_gfp() now, ready for that transition,\n\nExport shmem_read_mapping_page_gfp() and add it to list in shmem_fs.h,\nwith shmem_read_mapping_page() inline for the common mapping_gfp case.\n\n(shmem_read_mapping_page_gfp or shmem_read_cache_page_gfp? Generally the\nread_mapping_page functions use the mapping\u0027s -\u003ereadpage, and the\nread_cache_page functions use the supplied filler, so I think\nread_cache_page_gfp was slightly misnamed.)\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "94c1e62df4494b79782cb9c7279f827212d1de70", "tree": "43013fb403e592c535e6a7770be105b635ac9b63", "parents": [ "072441e21ddcd1140606b7d4ef6eab579a86b0b3" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: take control of its truncate_range\n\n2.6.35\u0027s new truncate convention gave tmpfs the opportunity to control\nits file truncation, no longer enforced from outside by vmtruncate().\nWe shall want to build upon that, to handle pagecache and swap together.\n\nSlightly redefine the -\u003etruncate_range interface: let it now be called\nbetween the unmap_mapping_range()s, with the filesystem responsible for\ndoing the truncate_inode_pages_range() from it - just as the filesystem\nis nowadays responsible for doing that from its -\u003esetattr.\n\nLet\u0027s rename shmem_notify_change() to shmem_setattr(). Instead of\ncalling the generic truncate_setsize(), bring that code in so we can\ncall shmem_truncate_range() - which will later be updated to perform its\nown variant of truncate_inode_pages_range().\n\nRemove the punch_hole unmap_mapping_range() from shmem_truncate_range():\nnow that the COW\u0027s unmap_mapping_range() comes after -\u003etruncate_range,\nthere is no need to call it a third time.\n\nExport shmem_truncate_range() and add it to the list in shmem_fs.h, so\nthat i915_gem_object_truncate() can call it explicitly in future; get\nthis patch in first, then update drm/i915 once this is available (until\nthen, i915 will just be doing the truncate_inode_pages() twice).\n\nThough introduced five years ago, no other filesystem is implementing\n-\u003etruncate_range, and its only other user is madvise(,,MADV_REMOVE): we\nexpect to convert it to fallocate(,FALLOC_FL_PUNCH_HOLE,,) shortly,\nwhereupon -\u003etruncate_range can be removed from inode_operations -\nshmem_truncate_range() will help i915 across that transition too.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "072441e21ddcd1140606b7d4ef6eab579a86b0b3", "tree": "6f059ad83c09dfbeb1def29e805839db3e5bf85f", "parents": [ "5b8ba10198a109f8a02380648c5d29000caa9c55" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move shmem prototypes to shmem_fs.h\n\nBefore adding any more global entry points into shmem.c, gather such\nprototypes into shmem_fs.h. Remove mm\u0027s own declarations from swap.h,\nbut for now leave the ones in mm.h: because shmem_file_setup() and\nshmem_zero_setup() are called from various places, and we should not\nforce other subsystems to update immediately.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d258b25d947521c8b913154db61ec55198243f8", "tree": "4f74f744797e92a0555705dc121ac8aaa041e750", "parents": [ "a64227b0855c42b5c037011afa80580ca3228527" ], "author": { "name": "Vitaliy Ivanov", "email": "vitalivanov@gmail.com", "time": "Mon Jun 27 19:07:08 2011 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 16:06:19 2011 -0700" }, "message": "Fix some kernel-doc warnings\n\nFix \u0027make htmldocs\u0027 warnings:\n\n Warning(/include/linux/hrtimer.h:153): No description found for parameter \u0027clockid\u0027\n Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member \u0027of_match\u0027 description in \u0027device\u0027\n Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member \u0027sk_rmem_alloc\u0027 description in \u0027sock\u0027\n\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a64227b0855c42b5c037011afa80580ca3228527", "tree": "8633fc0989fd6e53c9f3f0bb5774c1a54bd5f18e", "parents": [ "c6830c22603aaecf65405af23f6da2d55892f9cb", "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: queue: bring discard_granularity/alignment into line with SCSI\n mmc: queue: append partition subname to queue thread name\n mmc: core: make erase timeout calculation allow for gated clock\n mmc: block: switch card to User Data Area when removing the block driver\n mmc: sdio: reset card during power_restore\n mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS\n mmc: sdhi: DMA slave ID 0 is invalid\n mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling\n mmc: omap_hsmmc: use original sg_len for dma_unmap_sg\n mmc: omap_hsmmc: fix ocr mask usage\n mmc: sdio: fix runtime PM path during driver removal\n mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n mmc: sdhi: fix module unloading\n mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c\n mmc: vub300: fix null dereferences in error handling\n" }, { "commit": "c6830c22603aaecf65405af23f6da2d55892f9cb", "tree": "19458ebc7c32bef8a4ed59630cabb5785b1bdc11", "parents": [ "af4087e0e682df12bdffec5cfafc2fec9208716e" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jun 16 17:28:07 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:13:09 2011 -0700" }, "message": "Fix node_start/end_pfn() definition for mm/page_cgroup.c\n\ncommit 21a3c96 uses node_start/end_pfn(nid) for detection start/end\nof nodes. But, it\u0027s not defined in linux/mmzone.h but defined in\n/arch/???/include/mmzone.h which is included only under\nCONFIG_NEED_MULTIPLE_NODES\u003dy.\n\nThen, we see\n mm/page_cgroup.c: In function \u0027page_cgroup_init\u0027:\n mm/page_cgroup.c:308: error: implicit declaration of function \u0027node_start_pfn\u0027\n mm/page_cgroup.c:309: error: implicit declaration of function \u0027node_end_pfn\u0027\n\nSo, fixiing page_cgroup.c is an idea...\n\nBut node_start_pfn()/node_end_pfn() is a very generic macro and\nshould be implemented in the same manner for all archs.\n(m32r has different implementation...)\n\nThis patch removes definitions of node_start/end_pfn() in each archs\nand defines a unified one in linux/mmzone.h. It\u0027s not under\nCONFIG_NEED_MULTIPLE_NODES, now.\n\nA result of macro expansion is here (mm/page_cgroup.c)\n\nfor !NUMA\n start_pfn \u003d ((\u0026contig_page_data)-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (\u0026contig_page_data); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nfor NUMA (x86-64)\n start_pfn \u003d ((node_data[nid])-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (node_data[nid]); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nChangelog:\n - fixed to avoid using \"nid\" twice in node_end_pfn() macro.\n\nReported-and-acked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d362ad280fca0f2e098de607534f72f2c243e12", "tree": "25ff37b4c546f8a2cd58e7dc7111f8be53817e07", "parents": [ "536142f950f7ea4f3d146a138ad6938f28a34f33", "e0938118576954ac4deafbdb9950cebd34f726c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 25 07:23:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 25 07:23:27 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: Remove unneeded version.h includes from sound/\n ASoC: pxa-ssp: Correct check for stream presence\n ASoC: imx: add missing module informations\n ASoC: imx: Remove unused Kconfig SND_MXC_SOC_SSI entry\n ALSA: HDA: Pinfix quirk for HP Z200 Workstation\n ALSA: VIA HDA: Create a master amplifier control for VT1718S.\n ALSA: VIA HDA: Mute/unmute mixer conncted to Headphone for VT1718S.\n ALSA: VIA HDA: Modify initial verbs list for VT1718S.\n ALSA: hda - Remove ALC268 model override for CPR2000\n ALSA: HDA: Remove quirk for an HP device\n ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus\n" }, { "commit": "5220cc9382e11ca955ce946ee6a5bac577bb14ff", "tree": "7949f52a5ca0c7fa74ec8e49ba89a00d0e4114a9", "parents": [ "726ce0656b99ac6436b590d83613fe8447b4769e", "155d109b5f52ffd749219b27702462dcd9cf4f8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: add REQ_SECURE to REQ_COMMON_MASK\n block: use the passed in @bdev when claiming if partno is zero\n block: Add __attribute__((format(printf...) and fix fallout\n block: make disk_block_events() properly wait for work cancellation\n block: remove non-syncing __disk_block_events() and fold it into disk_block_events()\n block: don\u0027t use non-syncing event blocking in disk_check_events()\n cfq-iosched: fix locking around ioc-\u003eioc_data assignment\n" }, { "commit": "e0938118576954ac4deafbdb9950cebd34f726c6", "tree": "87000bd3ce37651b4b559489e7f1f6dbd4385e0c", "parents": [ "16866741bda5d16f3d30d1656ce941faf5dad34c", "53dea36c70c1857149a8c447224e3936eb8b5339" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 24 12:36:25 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 24 12:36:25 2011 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "39785eb1d3e6c58cc8bf8f6990956a58037ecc75", "tree": "b896a48b483803124c940ff99e7ffdfd4a4a171c", "parents": [ "9377c51752970c305fae29ac634501fde44378cb" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jun 23 20:20:26 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jun 24 17:08:49 2011 +0900" }, "message": "fsl-diu-fb: remove check for pixel clock ranges\n\nThe Freescale DIU framebuffer driver defines two constants, MIN_PIX_CLK and\nMAX_PIX_CLK, that are supposed to represent the lower and upper limits of\nthe pixel clock. These values, however, are true only for one platform\nclock rate (533MHz) and only for the MPC8610. So the actual range for\nthe pixel clock is chip-specific, which means the current values are almost\nalways wrong. The chance of an out-of-range pixel clock being used are also\nremote.\n\nRather than try to detect an out-of-range clock in the DIU driver, we depend\non the board-specific pixel clock function (e.g. p1022ds_set_pixel_clock)\nto clamp the pixel clock to a supported value.\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "68d0080f1e222757c85606d3eaf81b5c4aa7719f", "tree": "5f177f7571a56e7dfe3888f67fcc86532be8235c", "parents": [ "f957db4fcdd8f03e186aa8f041f4049e76ab741c", "a5f76d5eba157bf637beb2dd18026db2917c512e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PCI / PM: Block races between runtime PM and system sleep\n PM / Domains: Update documentation\n PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset\n PM: Fix async resume following suspend failure\n PM: Free memory bitmaps if opening /dev/snapshot fails\n PM: Rename dev_pm_info.in_suspend to is_prepared\n PM: Update documentation regarding sysdevs\n PM / Runtime: Update doc: usage count no longer incremented across system PM\n" }, { "commit": "2992c4bd5742b31a0ee00a76eee9c1c284507418", "tree": "b2af7d776ec6a4ae69b5f245ee0586359a99eabd", "parents": [ "e08f6d4131ab964420f0bcabecc68d75fb49df79", "1650add23578b5ca35c1f1e863987180a8c03779" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 2011 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix decode_secinfo_maxsz\n NFSv4.1: Fix an off-by-one error in pnfs_generic_pg_test\n NFSv4.1: Fix some issues with pnfs_generic_pg_test\n NFSv4.1: file layout must consider pg_bsize for coalescing\n pnfs-obj: No longer needed to take an extra ref at add_device\n SUNRPC: Ensure the RPC client only quits on fatal signals\n NFSv4: Fix a readdir regression\n nfs4.1: mark layout as bad on error path in _pnfs_return_layout\n nfs4.1: prevent race that allowed use of freed layout in _pnfs_return_layout\n NFSv4.1: need to put_layout_hdr on _pnfs_return_layout error path\n NFS: (d)printks should use %zd for ssize_t arguments\n NFSv4.1: fix break condition in pnfs_find_lseg\n nfs4.1: fix several problems with _pnfs_return_layout\n NFSv4.1: allow zero fh array in filelayout decode layout\n NFSv4.1: allow nfs_fhget to succeed with mounted on fileid\n NFSv4.1: Fix a refcounting issue in the pNFS device id cache\n NFSv4.1: deprecate headerpadsz in CREATE_SESSION\n NFS41: do not update isize if inode needs layoutcommit\n NLM: Don\u0027t hang forever on NLM unlock requests\n NFS: fix umount of pnfs filesystems\n" }, { "commit": "6d0e0e84f66d32c33511984dd3badd32364b863c", "tree": "215916af1632fbaff9d46676d14dafd52143d578", "parents": [ "8440f4b19494467883f8541b7aa28c7bbf6ac92b" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 22:42:09 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:20:20 2011 +0200" }, "message": "PM: Fix async resume following suspend failure\n\nThe PM core doesn\u0027t handle suspend failures correctly when it comes to\nasynchronously suspended devices. These devices are moved onto the\ndpm_suspended_list as soon as the corresponding async thread is\nstarted up, and they remain on the list even if they fail to suspend\nor the sleep transition is cancelled before they get suspended. As a\nresult, when the PM core unwinds the transition, it tries to resume\nthe devices even though they were never suspended.\n\nThis patch (as1474) fixes the problem by adding a new \"is_suspended\"\nflag to dev_pm_info. Devices are resumed only if the flag is set.\n\n[rjw:\n * Moved the dev-\u003epower.is_suspended check into device_resume(),\n because we need to complete dev-\u003epower.completion and clear\n dev-\u003epower.is_prepared too for devices whose\n dev-\u003epower.is_suspended flags are unset.\n * Fixed __device_suspend() to avoid setting dev-\u003epower.is_suspended\n if async_error is different from zero.]\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "f76b168b6f117a49d36307053e1acbe30580ea5b", "tree": "2aa0cc19b27764d8eb55ce85eaf226a60ce27756", "parents": [ "78420884e680da8fbc3240de2d3106437042381e" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 20:22:23 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:19:50 2011 +0200" }, "message": "PM: Rename dev_pm_info.in_suspend to is_prepared\n\nThis patch (as1473) renames the \"in_suspend\" field in struct\ndev_pm_info to \"is_prepared\", in preparation for an upcoming change.\nThe new name is more descriptive of what the field really means.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "890879cfa08f5ceaa09810611f46e890f7d57ff6", "tree": "c8898ae7a5bf00f315cfaa13d58a08aafa5002f9", "parents": [ "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f", "de1b794130b130e77ffa975bb58cb843744f9ae5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd2: Fix oops in jbd2_journal_remove_journal_head()\n jbd2: Remove obsolete parameters in the comments for some jbd2 functions\n ext4: fixed tracepoints cleanup\n ext4: use FIEMAP_EXTENT_LAST flag for last extent in fiemap\n ext4: Fix max file size and logical block counting of extent format file\n ext4: correct comments for ext4_free_blocks()\n" }, { "commit": "79568f5be06c91071697c065f01f3ebfbeb25a61", "tree": "81fc2bb54bebffc7ef22390bfc37c7ba818a30df", "parents": [ "f5fc5567dd24c15b1d95aa9ee2aaada04d835a0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "message": "vfs: i_state needs to be \u0027unsigned long\u0027 for now\n\nCommit 13e12d14e2dc (\"vfs: reorganize \u0027struct inode\u0027 layout a bit\")\nmoved things around a bit changed i_state to be unsigned int instead of\nunsigned long. That was to help structure layout for the 64-bit case,\nand shrink \u0027struct inode\u0027 a bit (admittedly that only happened when\nspinlock debugging was on and i_flags didn\u0027t pack with i_lock).\n\nHowever, Meelis Roos reports that this results in unaligned exceptions\non sprc, and it turns out that the bit-locking primitives that we use\nfor the I_NEW bit want to use the bitops. Which want \u0027unsigned long\u0027,\nnot \u0027unsigned int\u0027.\n\nWe really should fix the bit locking code to not have that kind of\nrequirement, but that\u0027s a much bigger change. So for now, revert that\nfield back to \u0027unsigned long\u0027 (but keep the other re-ordering changes\nfrom the commit that caused this).\n\nAndi points out that we have played games with this in \u0027struct page\u0027, so\nit\u0027s solvable with other hacks too, but since right now the struct inode\nsize advantage only happens with some rare config options, it\u0027s not\nworth fighting.\n\nIt _would_ be worth fixing the bitlocking code, though. Especially\nsince there is no type safety in the bitlocking code (this never caused\nany warnings, and worked fine on x86-64, because the bitlocks take a\n\u0027void *\u0027 and x86-64 doesn\u0027t care that deeply about alignment). So it\u0027s\ncurrently a very easy problem to trigger by mistake and never notice.\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eda0841094a3a232357ca10a24b40da461db3fcf", "tree": "08f6ffd17275e6fab7bd8014d849d2fce46632d9", "parents": [ "6e158d21986fa15d21fd32cf241d167d4d741ae3", "105f4622104848ff1ee1f644d661bef9dec3eb27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd4: fix break_lease flags on nfsd open\n nfsd: link returns nfserr_delay when breaking lease\n nfsd: v4 support requires CRYPTO\n nfsd: fix dependency of nfsd on auth_rpcgss\n" }, { "commit": "6e158d21986fa15d21fd32cf241d167d4d741ae3", "tree": "b2377e488386e613028e1d02ac7f788d5ecf165b", "parents": [ "36698206504fca9198b8563f1fc2c9e38e063e11", "384420409d9b5d4443940abace49363d26135412" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:18 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)\n pxa168_eth: fix race in transmit path.\n ipv4, ping: Remove duplicate icmp.h include\n netxen: fix race in skb-\u003elen access\n sgi-xp: fix a use after free\n hp100: fix an skb-\u003elen race\n netpoll: copy dev name of slaves to struct netpoll\n ipv4: fix multicast losses\n r8169: fix static initializers.\n inet_diag: fix inet_diag_bc_audit()\n gigaset: call module_put before restart of if_open()\n farsync: add module_put to error path in fst_open()\n net: rfs: enable RFS before first data packet is received\n fs_enet: fix freescale FCC ethernet dp buffer alignment\n netdev: bfin_mac: fix memory leak when freeing dma descriptors\n vlan: don\u0027t call ndo_vlan_rx_register on hardware that doesn\u0027t have vlan support\n caif: Bugfix - XOFF removed channel from caif-mux\n tun: teach the tun/tap driver to support netpoll\n dp83640: drop PHY status frames in the driver.\n dp83640: fix phy status frame event parsing\n phylib: Allow BCM63XX PHY to be selected only on BCM63XX.\n ...\n" }, { "commit": "36698206504fca9198b8563f1fc2c9e38e063e11", "tree": "f02b63c9b35a7962786b5dcdb1af15a63f5de1cf", "parents": [ "ef46222e7b56e728e423527d430cb2013c595491", "482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n devcgroup_inode_permission: take \"is it a device node\" checks to inlined wrapper\n fix comment in generic_permission()\n kill obsolete comment for follow_down()\n proc_sys_permission() is OK in RCU mode\n reiserfs_permission() doesn\u0027t need to bail out in RCU mode\n proc_fd_permission() is doesn\u0027t need to bail out in RCU mode\n nilfs2_permission() doesn\u0027t need to bail out in RCU mode\n logfs doesn\u0027t need -\u003epermission() at all\n coda_ioctl_permission() is safe in RCU mode\n cifs_permission() doesn\u0027t need to bail out in RCU mode\n bad_inode_permission() is safe from RCU mode\n ubifs: dereferencing an ERR_PTR in ubifs_mount()\n" }, { "commit": "934abcf52a9831d35fb578048b737313e5a9e717", "tree": "4074b53eac0c6fec645b622ec421e01054e77bbd", "parents": [ "d8cfaaaf6817a0279f0faef8ee5ddd52de12839a" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 12:41:46 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 13:15:08 2011 -0700" }, "message": "netfilter: add xt_qtaguid matching module\n\nThis module allows tracking stats at the socket level for given UIDs.\nIt replaces xt_owner.\nIf the --uid-owner is not specified, it will just count stats based on\nwho the skb belongs to. This will even happen on incoming skbs as it\nlooks into the skb via xt_socket magic to see who owns it.\nIf an skb is lost, it will be assigned to uid\u003d0.\n\nTo control what sockets of what UIDs are tagged by what, one uses:\n echo t $sock_fd $accounting_tag $the_billed_uid \\\n \u003e /proc/net/xt_qtaguid/ctrl\n So whenever an skb belongs to a sock_fd, it will be accounted against\n $the_billed_uid\n and matching stats will show up under the uid with the given\n $accounting_tag.\n\nBecause the number of allocations for the stats structs is not that big:\n ~500 apps * 32 per app\nwe\u0027ll just do it atomic. This avoids walking lists many times, and\nthe fancy worker thread handling. Slabs will grow when needed later.\n\nIt use netdevice and inetaddr notifications instead of hooks in the core dev\ncode to track when a device comes and goes. This removes the need for\nexposed iface_stat.h.\n\nPut procfs dirs in /proc/net/xt_qtaguid/\n ctrl\n stats\n iface_stat/\u003ciface\u003e/...\nThe uid stats are obtainable in ./stats.\n\nChange-Id: I01af4fd91c8de651668d3decb76d9bdc1e343919\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "d8cfaaaf6817a0279f0faef8ee5ddd52de12839a", "tree": "4c6bdd7fad3e803b74e2870b2dbccbe3aa16421e", "parents": [ "cf7addf29b41f90d979267b2c5111ec6d137231a" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Wed Jun 15 16:52:40 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jun 20 13:15:08 2011 -0700" }, "message": "nf: xt_socket: export the fancy sock finder code\n\nThe socket matching function has some nifty logic to get the struct sock\nfrom the skb or from the connection tracker.\nWe export this so other xt_* can use it, similarly to ho how\nxt_socket uses nf_tproxy_get_sock.\n\nChange-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "19345cb299e8234006c5125151ab723e851a1d24", "tree": "43bde1db751eb50afbdabfbd26814431c8be573c", "parents": [ "df18d127f4fed7a0284bcfa8d2843800cdb63b72" ], "author": { "name": "Benny Halevy", "email": "benny@tonian.com", "time": "Sun Jun 19 18:33:46 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jun 20 16:12:26 2011 -0400" }, "message": "NFSv4.1: file layout must consider pg_bsize for coalescing\n\nOtherwise we end up overflowing the rpc buffer size on the receive end.\n\nSigned-off-by: Benny Halevy \u003cbenny@tonian.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c01ad4081939f91ebd7277e8e731fd90ceb3e632", "tree": "8eb0eccce6e0681400ddb5e33a9f13bfeb8a1fde", "parents": [ "90a800de0a29426ea900ecd53f2929d5f4bc4578", "cca23d0b5350c9ca0473625c3f5879422ba534a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 08:59:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 08:59:46 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: sh_keysc - 8x8 MODE_6 fix\n Input: omap-keypad - add missing input_sync()\n Input: evdev - try to wake up readers only if we have full packet\n Input: properly assign return value of clamp() macro.\n" }, { "commit": "482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba", "tree": "68d885682da34a08c29908d012a356344882a487", "parents": [ "8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jun 19 13:01:04 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 20 10:46:04 2011 -0400" }, "message": "devcgroup_inode_permission: take \"is it a device node\" checks to inlined wrapper\n\ninode_permission() calls devcgroup_inode_permission() and almost all such\ncalls are _not_ for device nodes; let\u0027s at least keep the common path\nstraight...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "155d109b5f52ffd749219b27702462dcd9cf4f8d", "tree": "980be2955bbf656963ad3edc9ff311d4528b70f1", "parents": [ "d4c208b86b8be4254eba0e74071496e599f94639" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Mon Jun 20 13:23:14 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 20 13:23:14 2011 +0200" }, "message": "block: add REQ_SECURE to REQ_COMMON_MASK\n\nAdd REQ_SECURE flag to REQ_COMMON_MASK so that\ninit_request_from_bio() can pass it to @req-\u003ecmd_flags.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nAcked-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nCc: stable@kernel.org # 2.6.36 and newer\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "8816ead9d8e7c2745788e0684797e1912b504f33", "tree": "2a619a821024d31be2ce6ff422f287792379fe5b", "parents": [ "357ed6b1a110048ff8106f99092d6c4a7aadb45a", "203db2952bc87f5d610c9ad53a7d02b85897721f", "d8ad7d1123a960cc9f276bd499f9325c6f5e1bd1", "b5199515c25cca622495eb9c6a8a1d275e775088", "c1f5c54b57341e872a9d375dccef7257f86033ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 09:00:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 09:00:18 2011 -0700" }, "message": "Merge branches \u0027perf-urgent-for-linus\u0027, \u0027sched-urgent-for-linus\u0027, \u0027timers-urgent-for-linus\u0027 and \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tools/perf: Fix static build of perf tool\n tracing: Fix regression in printk_formats file\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n clocksource: Make watchdog robust vs. interruption\n timerfd: Fix wakeup of processes when timer is cancelled on clock change\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, MAINTAINERS: Add x86 MCE people\n x86, efi: Do not reserve boot services regions within reserved areas\n" }, { "commit": "357ed6b1a110048ff8106f99092d6c4a7aadb45a", "tree": "ff4eb7e809e547bc3c0680dfd51793a8f57b2063", "parents": [ "de505e709ffb09a7382ca8e0d8c7dbb171ba5830", "f8b7fc6b514f34a51875dd48dff70d4d17a54f38" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 08:56:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 08:56:56 2011 -0700" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: Move RCU_BOOST #ifdefs to header file\n rcu: use softirq instead of kthreads except when RCU_BOOST\u003dy\n rcu: Use softirq to address performance regression\n rcu: Simplify curing of load woes\n" }, { "commit": "be98ca652faa6468916a9b7608befff215a8ca70", "tree": "13ed7ba7e41eb98acf9c9d5230e683d8b7f96e9e", "parents": [ "742a0c7cae9bd0f913c71722289b8ec862d70a2b" ], "author": { "name": "Manoj Iyer", "email": "manoj.iyer@canonical.com", "time": "Thu May 26 11:19:05 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sat Jun 18 22:18:18 2011 -0400" }, "message": "mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n\nSigned-off-by: Manoj Iyer \u003cmanoj.iyer@canonical.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "cca23d0b5350c9ca0473625c3f5879422ba534a6", "tree": "160e5a664d02bedb597d5e4e9bd9fd75c3427a23", "parents": [ "b27af563befa95686c8d1abc491408aa6b9a31dc" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Sat Jun 18 02:51:52 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Jun 18 02:55:01 2011 -0700" }, "message": "Input: sh_keysc - 8x8 MODE_6 fix\n\nAccording to the data sheet for G4, AP4 and AG5 KEYSC MODE_6 is 8x8 keys.\nBump up MAXKEYS to 64 too.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "cf7addf29b41f90d979267b2c5111ec6d137231a", "tree": "539c14ee0f04dd3af9df6723349dcc399067be2c", "parents": [ "ba3673bf79dbaa02a48a9ba7618d071b364bbf5e" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Jun 01 22:17:36 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Jun 17 22:27:20 2011 -0400" }, "message": "USB: gadget: f_mtp: Add PTP variant of MTP USB function\n\nThis is the same as MTP but with PTP interface descriptor.\nAlso removed obsolete ioctl for switching between MTP and PTP mode\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "aab96815ae9a40e05600b8e351561b514233afca", "tree": "b96a69b2be5f648ee17581246acf97895f1c72bf", "parents": [ "94df1bdfdca9be6d4bbe6cc56354b4ee536cb15a" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Tue Apr 19 20:37:33 2011 -0700" }, "committer": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Fri Jun 17 16:02:37 2011 -0700" }, "message": "usb: gadget: android: Update android gadget driver\n\n* Functions and the device descriptor are configured from user space:\necho 0 \u003e /sys/class/android_usb/android0/enable\necho adb,acm \u003e /sys/class/android_usb/android0/functions\necho 2 \u003e /sys/class/android_usb/android0/f_acm/instances\necho 1 \u003e /sys/class/android_usb/android0/enable\n\n* Driver does not require platform data anymore\n\n* Moved function initialization to android.c instead of each\nfunction file\n\n* Replaced switches by uevents\n\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\nChange-Id: If5ad9267c111ad0a442f0d87a0d31082dc5381b6\n" }, { "commit": "94df1bdfdca9be6d4bbe6cc56354b4ee536cb15a", "tree": "931674516b4ed279dafb466957c01166df9636b1", "parents": [ "f6e7d49e03c475a7f129a0b13ff80bff2abbb2b2" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Wed May 25 23:59:43 2011 -0700" }, "committer": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Fri Jun 17 16:02:36 2011 -0700" }, "message": "usb: gadget: composite: Add usb_remove_config\n\nThis allows composite drivers to dynamically change their configuration.\nFor example, a driver might remove a configuration and register a new\none with a different set of functions.\nUser should prevent the host from enumerating the device while changing\nthe configuration:\n\n\tusb_gadget_disconnect(cdev-\u003egadget);\n\tusb_remove_config(cdev, old_config);\n\tusb_add_config(cdev, new_config, new_conf_bind);\n\tusb_gadget_connect(cdev-\u003egadget);\n\nChange-Id: Icbfb4ce41685fde9bf63d5d58fca1ad242aa69f9\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n" }, { "commit": "9902e0b5c53bba7469e7163e539fa696f09e35cc", "tree": "82d118d4b32eabcac59506453ce22a542af071d7", "parents": [ "0d9f3c2791c1e19796d3a41d8ec45093583817e7" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Feb 02 11:52:56 2011 -0500" }, "committer": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Fri Jun 17 16:02:31 2011 -0700" }, "message": "USB: gadget: f_accessory: New gadget driver for android USB accesories\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Misc improvements and cleanup:\n\n- Add URI string\n\n- Replace type string with a description string\n\n- Add a control call to retrieve accessory protocol version (currently 1)\n\n- Driver read() and write() calls now fail after USB disconnect until\n driver file is closed and reopened.\n\n- Misc cleanup work\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Clear accessory strings when USB is disconnected\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Clear previous strings on ACCESSORY_GET_PROTOCOL\n\nClearing strings on disconnect does not work since we may receive\na disconnect on some devices when transitioning into accessory mode.\nWe require an accessory to send ACCESSORY_GET_PROTOCOL before\nsending any strings, so any strings from a previous session will be cleared.\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Clear disconnected flag when driver file is opened\n\nFixes a race condition that can occur when entering accessory mode.\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Add string for accessory\u0027s unique serial number\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n\nUSB: gadget: f_accessory: Set bNumEndpoints to correct value of 2\n\nChange-Id: I24f4e36f196d45436e0573301500c3b93215953d\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "0835619348b097404f4f85bc5195c6e23a2f8de4", "tree": "a81ae35390d440ad1fc655ae2e8715f6fae0b652", "parents": [ "add794467a20463d7ea50dc9f158a6371d396175", "c001fb72a7b705f902bdfdd05b5d2408efe6f848", "e479c60456ef22b0869432887216186aabaed086" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 10:36:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 10:36:32 2011 -0700" }, "message": "Merge branches \u0027gpio/merge\u0027 and \u0027spi/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027gpio/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio: add GPIOF_ values regardless on kconfig settings\n gpio: include linux/gpio.h where needed\n gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.\n\n* \u0027spi/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/bfin_spi: fix handling of default bits per word setting\n" }, { "commit": "879669961b11e7f40b518784863a259f735a72bf", "tree": "9bff5392e365caf656c9dd9be38f7471c182278c", "parents": [ "eb96c925152fc289311e5d7e956b919e9b60ab53" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jun 17 11:25:59 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 09:40:48 2011 -0700" }, "message": "KEYS/DNS: Fix ____call_usermodehelper() to not lose the session keyring\n\n____call_usermodehelper() now erases any credentials set by the\nsubprocess_inf::init() function. The problem is that commit\n17f60a7da150 (\"capabilites: allow the application of capability limits\nto usermode helpers\") creates and commits new credentials with\nprepare_kernel_cred() after the call to the init() function. This wipes\nall keyrings after umh_keys_init() is called.\n\nThe best way to deal with this is to put the init() call just prior to\nthe commit_creds() call, and pass the cred pointer to init(). That\nmeans that umh_keys_init() and suchlike can modify the credentials\n_before_ they are published and potentially in use by the rest of the\nsystem.\n\nThis prevents request_key() from working as it is prevented from passing\nthe session keyring it set up with the authorisation token to\n/sbin/request-key, and so the latter can\u0027t assume the authority to\ninstantiate the key. This causes the in-kernel DNS resolver to fail\nwith ENOKEY unconditionally.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nTested-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8ad7d1123a960cc9f276bd499f9325c6f5e1bd1", "tree": "0260df1b5b5b1601f56229c7dde54594d2dfebcb", "parents": [ "eb96c925152fc289311e5d7e956b919e9b60ab53" ], "author": { "name": "Takao Indoh", "email": "indou.takao@jp.fujitsu.com", "time": "Tue Mar 29 12:35:04 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 17 10:17:12 2011 +0200" }, "message": "generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts\n\nThere is a problem that kdump(2nd kernel) sometimes hangs up due\nto a pending IPI from 1st kernel. Kernel panic occurs because IPI\ncomes before call_single_queue is initialized.\n\nTo fix the crash, rename init_call_single_data() to call_function_init()\nand call it in start_kernel() so that call_single_queue can be\ninitialized before enabling interrupts.\n\nThe details of the crash are:\n\n (1) 2nd kernel boots up\n\n (2) A pending IPI from 1st kernel comes when irqs are first enabled\n in start_kernel().\n\n (3) Kernel tries to handle the interrupt, but call_single_queue\n is not initialized yet at this point. As a result, in the\n generic_smp_call_function_single_interrupt(), NULL pointer\n dereference occurs when list_replace_init() tries to access\n \u0026q-\u003elist.next.\n\nTherefore this patch changes the name of init_call_single_data()\nto call_function_init() and calls it before local_irq_enable()\nin start_kernel().\n\nSigned-off-by: Takao Indoh \u003cindou.takao@jp.fujitsu.com\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: kexec@lists.infradead.org\nLink: http://lkml.kernel.org/r/D6CBEE2F420741indou.takao@jp.fujitsu.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3009adf5acb2245216651318c2226812fd1b01a6", "tree": "3fa6a085be2eab409aec447ab8bd7c4737321688", "parents": [ "9281b2a2e2e02ad4bcc2fdd11797709b815d5f8e", "42c1edd345c8412d96e7a362ee06feb7be73bb6c" ], "author": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 21:38:01 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 21:38:01 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "eb96c925152fc289311e5d7e956b919e9b60ab53", "tree": "93d106629c5dd09d8eeac3331109319b1bb078f8", "parents": [ "8b97b21e0f4f59801d05a5c536417f04ecfb5603", "b81157d016a48b8025ccfcb286827679b35f16aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 17:54:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 17:54:41 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: use helper functions for fence read/write\n drm/radeon/kms: set DP link config properly for DP bridges\n drm/radeon/kms/atom: AdjustPixelClock fixes for DP bridges\n drm/radeon/kms: fix handling of DP to LVDS bridges\n drm/radeon/kms: issue blank/unblank commands for ext encoders\n drm/radeon/kms: fix support for DDC on dp bridges\n drm/radeon/kms: add support for load detection on dp bridges\n drm/radeon/kms: add missing external encoder action\n drm/radeon/kms: rework atombios_get_encoder_mode()\n drm/radeon/kms: fix num crtcs for Cedar and Caicos\n Revert \"drm/i915: Enable GMBUS for post-gen2 chipsets\"\n drivers/gpu/drm: use printk_ratelimited instead of printk_ratelimit\n drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.\n drm: make debug levels match in edid failure code.\n drm/radeon/kms: clear wb memory by default\n drm/radeon/kms: be more pedantic about the g5 quirk (v2)\n drm/radeon/kms: signed fix for evergreen thermal\n drm: populate irq_by_busid-member for pci\n" }, { "commit": "c16d51a32bbb61ac8fd96f78b5ce2fccfe0fb4c3", "tree": "3899f24f4b1cc06e24055952f1d9114dc493caf0", "parents": [ "57f2104f39995bac332ddc492fbf60aa28e0c35e" ], "author": { "name": "Shreshtha Kumar Sahu", "email": "shreshthakumar.sahu@stericsson.com", "time": "Mon Jun 13 10:11:33 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jun 16 12:01:57 2011 -0700" }, "message": "amba pl011: workaround for uart registers lockup\n\nThis workaround aims to break the deadlock situation\nwhich raises during continuous transfer of data for long\nduration over uart with hardware flow control. It is\nobserved that CTS interrupt cannot be cleared in uart\ninterrupt register (ICR). Hence further transfer over\nuart gets blocked.\n\nIt is seen that during such deadlock condition ICR\ndon\u0027t get cleared even on multiple write. This leads\npass_counter to decrease and finally reach zero. This\ncan be taken as trigger point to run this UART_BT_WA.\n\nWorkaround backups the register configuration, does soft\nreset of UART using BIT-0 of PRCC_K_SOFTRST_SET/CLEAR\nregisters and restores the registers.\n\nThis patch also provides support for uart init and exit\nfunction calls if present.\n\nSigned-off-by: Shreshtha Kumar Sahu \u003cshreshthakumar.sahu@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b5199515c25cca622495eb9c6a8a1d275e775088", "tree": "250fc4f3d02c58eddf770e9d040edeafd0012e76", "parents": [ "1123d93963cbd2546449d4d9f0c568e323cb0ac6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 16:22:08 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 19:30:53 2011 +0200" }, "message": "clocksource: Make watchdog robust vs. interruption\n\nThe clocksource watchdog code is interruptible and it has been\nobserved that this can trigger false positives which disable the TSC.\n\nThe reason is that an interrupt storm or a long running interrupt\nhandler between the read of the watchdog source and the read of the\nTSC brings the two far enough apart that the delta is larger than the\nunstable treshold. Move both reads into a short interrupt disabled\nregion to avoid that.\n\nReported-and-tested-by: Vernon Mauery \u003cvernux@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: stable@kernel.org\n" }, { "commit": "8dac6bee32425dd5145b40fa2307648cb7fb4d4a", "tree": "b7165517729b755686f336b3066ebc982c8793ea", "parents": [ "f8f44f09eaa2bfb40651e7fc6054d65c8091499a", "d6e43f751f252c68ca69fa6d18665d88d69ef8b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 10:21:59 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 10:21:59 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n AFS: Use i_generation not i_version for the vnode uniquifier\n AFS: Set s_id in the superblock to the volume name\n vfs: Fix data corruption after failed write in __block_write_begin()\n afs: afs_fill_page reads too much, or wrong data\n VFS: Fix vfsmount overput on simultaneous automount\n fix wrong iput on d_inode introduced by e6bc45d65d\n Delay struct net freeing while there\u0027s a sysfs instance refering to it\n afs: fix sget() races, close leak on umount\n ubifs: fix sget races\n ubifs: split allocation of ubifs_info into a separate function\n fix leak in proc_set_super()\n" }, { "commit": "42c1edd345c8412d96e7a362ee06feb7be73bb6c", "tree": "5b05b0324b8186fe8bc40ffced48c856b099547d", "parents": [ "2c38de4c1f8da799bdca0e4bb40ca13f2174d3e8" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Thu Jun 16 17:29:22 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 16 17:29:22 2011 +0200" }, "message": "netfilter: nf_nat: avoid double seq_adjust for loopback\n\n\tAvoid double seq adjustment for loopback traffic\nbecause it causes silent repetition of TCP data. One\nexample is passive FTP with DNAT rule and difference in the\nlength of IP addresses.\n\n\tThis patch adds check if packet is sent and\nreceived via loopback device. As the same conntrack is\nused both for outgoing and incoming direction, we restrict\nseq adjustment to happen only in POSTROUTING.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c001fb72a7b705f902bdfdd05b5d2408efe6f848", "tree": "a8c15469c4a09c3690479e1508ab7ca7acbfcbe7", "parents": [ "158f1e95180d01ebfd7cd5c8de23050528303f26" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 14 17:05:11 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 16 08:40:52 2011 -0600" }, "message": "gpio: add GPIOF_ values regardless on kconfig settings\n\nMake GPIOF_ defined values available even when GPIOLIB nor GENERIC_GPIO\nis enabled by moving them to \u003clinux/gpio.h\u003e.\n\nFixes these build errors in linux-next:\nsound/soc/codecs/ak4641.c:524: error: \u0027GPIOF_OUT_INIT_LOW\u0027 undeclared (first use in this function)\nsound/soc/codecs/wm8915.c:2921: error: \u0027GPIOF_OUT_INIT_LOW\u0027 undeclared (first use in this function)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4a9a8b71e12d41abb71c4e741bff524f016cfef4", "tree": "e5b3589c7568897a2184646665ca2f67257b62a5", "parents": [ "f49dadb82dde88092827b6d058e7164e75e96759" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Tue Jun 14 06:13:55 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 16 16:30:54 2011 +1000" }, "message": "drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.\n\nSome RS690 chipsets seem to end up with floating connectors, either\na DVI connector isn\u0027t actually populated, or an add-in HDMI card\nis available but not installed. In this case we seem to get a NULL byte\nresponse for each byte of the i2c transaction, so we detect this\ncase and if we see it we don\u0027t do anymore DDC transactions on this\nconnector.\n\nI\u0027ve tested this on my RS690 without the HDMI card installed and\nit seems to work fine.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\n" }, { "commit": "49b24d6b41c576ba43153fc94695f871cce139a5", "tree": "21ccb6f8bc29d6c8c2a96b83bbbb3850b9ccc489", "parents": [ "9e6f343852cb16ea961ba5be2ca8dde609aa6f23" ], "author": { "name": "Nicolas Kaiser", "email": "nikai@nikai.net", "time": "Wed Jun 15 15:08:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:04:00 2011 -0700" }, "message": "include/asm-generic/pgtable.h: fix unbalanced parenthesis\n\nSigned-off-by: Nicolas Kaiser \u003cnikai@nikai.net\u003e\nReviewed-by: Andrea Arcangeli \u003caarcange@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": "bd5dc17be87b3a3073d50b23802647db3ae3fa8e", "tree": "b8abfc57e4282d943bb2bb21762a868efa29bd20", "parents": [ "ca39599c633fb02aceac31a7e67563612e4fe347" ], "author": { "name": "Josh Triplett", "email": "josh@joshtriplett.org", "time": "Wed Jun 15 15:08:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:04:00 2011 -0700" }, "message": "uts: make default hostname configurable, rather than always using \"(none)\"\n\nThe \"hostname\" tool falls back to setting the hostname to \"localhost\" if\n/etc/hostname does not exist. Distribution init scripts have the same\nfallback. However, if userspace never calls sethostname, such as when\nbooting with init\u003d/bin/sh, or otherwise booting a minimal system without\nthe usual init scripts, the default hostname of \"(none)\" remains,\nunhelpfully appearing in various places such as prompts (\"root@(none):~#\")\nand logs. Furthermore, \"(none)\" doesn\u0027t typically resolve to anything\nuseful.\n\nMake the default hostname configurable. This removes the need for the\nstandard fallback, provides a useful default for systems that never call\nsethostname, and makes minimal systems that much more useful with less\nconfiguration. Distributions could choose to use \"localhost\" here to\navoid the fallback, while embedded systems may wish to use a specific\ntarget hostname.\n\nSigned-off-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: Kel Modderman \u003ckel@otaku42.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ca39599c633fb02aceac31a7e67563612e4fe347", "tree": "03652bd70063ec578b6b59cce14614a282e3d93e", "parents": [ "3957c7768e5ea02fd3345176ddd340f820e5d285" ], "author": { "name": "Dr. David Alan Gilbert", "email": "linux@treblig.org", "time": "Wed Jun 15 15:08:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:04:00 2011 -0700" }, "message": "BUILD_BUG_ON_ZERO: fix sparse breakage\n\nBUILD_BUG_ON_ZERO and BUILD_BUG_ON_NULL must return values, even in the\nCHECKER case otherwise various users of it become syntactically invalid.\n\nSigned-off-by: Dr. David Alan Gilbert \u003clinux@treblig.org\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32e45ff43eaf5c17f5a82c9ad358d515622c2562", "tree": "be4984b6be4b3ffe259ef19efac7bb12f3b26c2a", "parents": [ "17441227f6258fc379c6ebfe21c3eec43b6f0de3" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Wed Jun 15 15:08:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "mm: increase RECLAIM_DISTANCE to 30\n\nRecently, Robert Mueller reported (http://lkml.org/lkml/2010/9/12/236)\nthat zone_reclaim_mode doesn\u0027t work properly on his new NUMA server (Dual\nXeon E5520 + Intel S5520UR MB). He is using Cyrus IMAPd and it\u0027s built on\na very traditional single-process model.\n\n * a master process which reads config files and manages the other\n process\n * multiple imapd processes, one per connection\n * multiple pop3d processes, one per connection\n * multiple lmtpd processes, one per connection\n * periodical \"cleanup\" processes.\n\nThere are thousands of independent processes. The problem is, recent\nIntel motherboard turn on zone_reclaim_mode by default and traditional\nprefork model software don\u0027t work well on it. Unfortunatelly, such models\nare still typical even in the 21st century. We can\u0027t ignore them.\n\nThis patch raises the zone_reclaim_mode threshold to 30. 30 doesn\u0027t have\nany specific meaning. but 20 means that one-hop QPI/Hypertransport and\nsuch relatively cheap 2-4 socket machine are often used for traditional\nservers as above. The intention is that these machines don\u0027t use\nzone_reclaim_mode.\n\nNote: ia64 and Power have arch specific RECLAIM_DISTANCE definitions.\nThis patch doesn\u0027t change such high-end NUMA machine behavior.\n\nDave Hansen said:\n\n: I know specifically of pieces of x86 hardware that set the information\n: in the BIOS to \u002721\u0027 *specifically* so they\u0027ll get the zone_reclaim_mode\n: behavior which that implies.\n:\n: They\u0027ve done performance testing and run very large and scary benchmarks\n: to make sure that they _want_ this turned on. What this means for them\n: is that they\u0027ll probably be de-optimized, at least on newer versions of\n: the kernel.\n:\n: If you want to do this for particular systems, maybe _that_\u0027s what we\n: should do. Have a list of specific configurations that need the\n: defaults overridden either because they\u0027re buggy, or they have an\n: unusual hardware configuration not really reflected in the distance\n: table.\n\nAnd later said:\n\n: The original change in the hardware tables was for the benefit of a\n: benchmark. Said benchmark isn\u0027t going to get run on mainline until the\n: next batch of enterprise distros drops, at which point the hardware where\n: this was done will be irrelevant for the benchmark. I\u0027m sure any new\n: hardware will just set this distance to another yet arbitrary value to\n: make the kernel do what it wants. :)\n:\n: Also, when the hardware got _set_ to this initially, I complained. So, I\n: guess I\u0027m getting my way now, with this patch. I\u0027m cool with it.\n\nReported-by: Robert Mueller \u003crobm@fastmail.fm\u003e\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nAcked-by: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ac5622418bbff9cd3dc607aa57dfb4f62a7f2043", "tree": "a41d3d942acae278b67bb2fa92b4aa791dc02dc4", "parents": [ "50c35e5ba255fd8428cef8ff076da8d23bfd4909" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Jun 15 15:08:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "kmsg_dump.h: fix build when CONFIG_PRINTK is disabled\n\nFix \u003clinux/kmsg_dump.h\u003e when CONFIG_PRINTK is not enabled:\n\n include/linux/kmsg_dump.h:56: error: \u0027EINVAL\u0027 undeclared (first use in this function)\n include/linux/kmsg_dump.h:61: error: \u0027EINVAL\u0027 undeclared (first use in this function)\n\nLooks like commit 595dd3d8bf95 (\"kmsg_dump: fix build for\nCONFIG_PRINTK\u003dn\") uses EINVAL without having the needed header file(s),\nbut I\u0027m sure that I build tested that patch also. oh well.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d7911ef30cb7bec52234c2b7a5c275ac8f07905a", "tree": "c3d9dc8ffc5d9478da434faecc27759ee34edf83", "parents": [ "83cd81a34357a632509f7491eec81e62e71d65f7" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Wed Jun 15 15:08:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "vmscan: implement swap token priority aging\n\nWhile testing for memcg aware swap token, I observed a swap token was\noften grabbed an intermittent running process (eg init, auditd) and they\nnever release a token.\n\nWhy?\n\nSome processes (eg init, auditd, audispd) wake up when a process exiting.\nAnd swap token can be get first page-in process when a process exiting\nmakes no swap token owner. Thus such above intermittent running process\noften get a token.\n\nAnd currently, swap token priority is only decreased at page fault path.\nThen, if the process sleep immediately after to grab swap token, the swap\ntoken priority never be decreased. That\u0027s obviously undesirable.\n\nThis patch implement very poor (and lightweight) priority aging. It only\nbe affect to the above corner case and doesn\u0027t change swap tendency\nworkload performance (eg multi process qsbench load)\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "83cd81a34357a632509f7491eec81e62e71d65f7", "tree": "cc96e65bd3000fd9090dacfabdd8810e9c66e0c9", "parents": [ "a433658c30974fc87ba3ff52d7e4e6299762aa3d" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Wed Jun 15 15:08:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "vmscan: implement swap token trace\n\nThis is useful for observing swap token activity.\n\nexample output:\n\n zsh-1845 [000] 598.962716: update_swap_token_priority:\nmm\u003dffff88015eaf7700 old_prio\u003d1 new_prio\u003d0\n memtoy-1830 [001] 602.033900: update_swap_token_priority:\nmm\u003dffff880037a45880 old_prio\u003d947 new_prio\u003d949\n memtoy-1830 [000] 602.041509: update_swap_token_priority:\nmm\u003dffff880037a45880 old_prio\u003d949 new_prio\u003d951\n memtoy-1830 [000] 602.051959: update_swap_token_priority:\nmm\u003dffff880037a45880 old_prio\u003d951 new_prio\u003d953\n memtoy-1830 [000] 602.052188: update_swap_token_priority:\nmm\u003dffff880037a45880 old_prio\u003d953 new_prio\u003d955\n memtoy-1830 [001] 602.427184: put_swap_token:\ntoken_mm\u003dffff880037a45880\n zsh-1789 [000] 602.427281: replace_swap_token:\nold_token_mm\u003d (null) old_prio\u003d0 new_token_mm\u003dffff88015eaf7018\nnew_prio\u003d2\n zsh-1789 [001] 602.433456: update_swap_token_priority:\nmm\u003dffff88015eaf7018 old_prio\u003d2 new_prio\u003d4\n zsh-1789 [000] 602.437613: update_swap_token_priority:\nmm\u003dffff88015eaf7018 old_prio\u003d4 new_prio\u003d6\n zsh-1789 [000] 602.443924: update_swap_token_priority:\nmm\u003dffff88015eaf7018 old_prio\u003d6 new_prio\u003d8\n zsh-1789 [000] 602.451873: update_swap_token_priority:\nmm\u003dffff88015eaf7018 old_prio\u003d8 new_prio\u003d10\n zsh-1789 [001] 602.462639: update_swap_token_priority:\nmm\u003dffff88015eaf7018 old_prio\u003d10 new_prio\u003d12\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Rik van Riel\u003criel@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a433658c30974fc87ba3ff52d7e4e6299762aa3d", "tree": "8df65e22af520ca5c020281763e6874d0bb51bc5", "parents": [ "e1bbd19bc4afef7adb80cca163800391c4f5773d" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Wed Jun 15 15:08:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "vmscan,memcg: memcg aware swap token\n\nCurrently, memcg reclaim can disable swap token even if the swap token mm\ndoesn\u0027t belong in its memory cgroup. It\u0027s slightly risky. If an admin\ncreates very small mem-cgroup and silly guy runs contentious heavy memory\npressure workload, every tasks are going to lose swap token and then\nsystem may become unresponsive. That\u0027s bad.\n\nThis patch adds \u0027memcg\u0027 parameter into disable_swap_token(). and if the\nparameter doesn\u0027t match swap token, VM doesn\u0027t disable it.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Rik van Riel\u003criel@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": "a59ec1e7ff98cc4365d5b1bff4e7102e86b5716b", "tree": "2500a9be830853d901d6b8210f9bfbae02a9987a", "parents": [ "7f81c8890c15a10f5220bebae3b6dfae4961962a" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Wed Jun 15 15:08:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:03:59 2011 -0700" }, "message": "backlight: new driver for the ADP8870 backlight devices\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c9c30dd5f73dccaa326a54dfcf490316946aea87", "tree": "b7e4f9488c805cf5e29f93b25a75713f3922e823", "parents": [ "0f66b5984df2fe1617c05900a39a7ef493ca9de9" ], "author": { "name": "Benny Halevy", "email": "benny@tonian.com", "time": "Sat Jun 11 17:08:39 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jun 15 11:24:28 2011 -0400" }, "message": "NFSv4.1: deprecate headerpadsz in CREATE_SESSION\n\nWe don\u0027t support header padding yet so better off ditching it\n\nReported-by: Sid Moore \u003clearnmost@gmail.com\u003e\nSigned-off-by: Benny Halevy \u003cbenny@tonian.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "0b760113a3a155269a3fba93a409c640031dd68f", "tree": "699dc3e0ebe2df11b0c67045c046deafdb56282d", "parents": [ "9e3bd4e24e94d60d2e0762e919aab6c9a7fc0c5b" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue May 31 15:15:34 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jun 15 11:24:27 2011 -0400" }, "message": "NLM: Don\u0027t hang forever on NLM unlock requests\n\nIf the NLM daemon is killed on the NFS server, we can currently end up\nhanging forever on an \u0027unlock\u0027 request, instead of aborting. Basically,\nif the rpcbind request fails, or the server keeps returning garbage, we\nreally want to quit instead of retrying.\n\nTested-by: Vasily Averin \u003cvvs@sw.ru\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "09223371deac67d08ca0b70bd18787920284c967", "tree": "0ad0354a93ac209c8cfd2b79d03d0462aa3c5c58", "parents": [ "9a432736904d386cda28b987b38ba14dae960ecc" ], "author": { "name": "Shaohua Li", "email": "shaohua.li@intel.com", "time": "Tue Jun 14 13:26:25 2011 +0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Jun 14 15:25:39 2011 -0700" }, "message": "rcu: Use softirq to address performance regression\n\nCommit a26ac2455ffcf3(rcu: move TREE_RCU from softirq to kthread)\nintroduced performance regression. In an AIM7 test, this commit degraded\nperformance by about 40%.\n\nThe commit runs rcu callbacks in a kthread instead of softirq. We observed\nhigh rate of context switch which is caused by this. Out test system has\n64 CPUs and HZ is 1000, so we saw more than 64k context switch per second\nwhich is caused by RCU\u0027s per-CPU kthread. A trace showed that most of\nthe time the RCU per-CPU kthread doesn\u0027t actually handle any callbacks,\nbut instead just does a very small amount of work handling grace periods.\nThis means that RCU\u0027s per-CPU kthreads are making the scheduler do quite\na bit of work in order to allow a very small amount of RCU-related\nprocessing to be done.\n\nAlex Shi\u0027s analysis determined that this slowdown is due to lock\ncontention within the scheduler. Unfortunately, as Peter Zijlstra points\nout, the scheduler\u0027s real-time semantics require global action, which\nmeans that this contention is inherent in real-time scheduling. (Yes,\nperhaps someone will come up with a workaround -- otherwise, -rt is not\ngoing to do well on large SMP systems -- but this patch will work around\nthis issue in the meantime. And \"the meantime\" might well be forever.)\n\nThis patch therefore re-introduces softirq processing to RCU, but only\nfor core RCU work. RCU callbacks are still executed in kthread context,\nso that only a small amount of RCU work runs in softirq context in the\ncommon case. This should minimize ksoftirqd execution, allowing us to\nskip boosting of ksoftirqd for CONFIG_RCU_BOOST\u003dy kernels.\n\nSigned-off-by: Shaohua Li \u003cshaohua.li@intel.com\u003e\nTested-by: \"Alex,Shi\" \u003calex.shi@intel.com\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "bbcda3b9e1122bd747687a93a8150a0f943c3e78", "tree": "5d573c592c4c982c3e153b9275f111f1d6c73bc7", "parents": [ "5228a594412f4a676034d5efd72c16decd3a8673" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Feb 11 11:54:28 2010 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:58 2011 -0700" }, "message": "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections.\n\n__u16 sco_pkt_type is introduced to struct sockaddr_sco. It allows bitwise\nselection of SCO/eSCO packet types. Currently those bits are:\n\n0x0001 HV1 may be used.\n0x0002 HV2 may be used.\n0x0004 HV3 may be used.\n0x0008 EV3 may be used.\n0x0010 EV4 may be used.\n0x0020 EV5 may be used.\n0x0040 2-EV3 may be used.\n0x0080 3-EV3 may be used.\n0x0100 2-EV5 may be used.\n0x0200 3-EV5 may be used.\n\nThis is similar to the Packet Type parameter in the HCI Setup Synchronous\nConnection Command, except that we are not reversing the logic on the EDR bits.\nThis makes the use of sco_pkt_tpye forward portable for the use case of\nwhite-listing packet types, which we expect will be the primary use case.\n\nIf sco_pkt_type is zero, or userspace uses the old struct sockaddr_sco,\nthen the default behavior is to allow all packet types.\n\nPacket type selection is just a request made to the Bluetooth chipset, and\nit is up to the link manager on the chipset to negiotiate and decide on the\nactual packet types used. Furthermore, when a SCO/eSCO connection is eventually\nmade there is no way for the host stack to determine which packet type was used\n(however it is possible to get the link type of SCO or eSCO).\n\nsco_pkt_type is ignored for incoming SCO connections. It is possible\nto add this in the future as a parameter to the Accept Synchronous Connection\nCommand, however its a little trickier because the kernel does not\ncurrently preserve sockaddr_sco data between userspace calls to accept().\n\nThe most common use for sco_pkt_type will be to white-list only SCO packets,\nwhich can be done with the hci.h constant SCO_ESCO_MASK.\n\nThis patch is motivated by broken Bluetooth carkits such as the Motorolo\nHF850 (it claims to support eSCO, but will actually reject eSCO connections\nafter 5 seconds) and the 2007/2008 Infiniti G35/37 (fails to route audio\nif a 2-EV5 packet type is negiotiated). With this patch userspace can maintain\na list of compatible packet types to workaround remote devices such as these.\n\nBased on a patch by Marcel Holtmann.\n\nRebased to 2.6.39.\n\nChange-Id: Ide1c89574fa4f6f1b9218282e1af17051eb86315\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "9be0c37a063b657a82df718234ecfbc13307bc9b", "tree": "6adacbf883eb429236fedc712ef5f094e6ca5afc", "parents": [ "810bf5db1e7aa71994907e71d05abc6cd6a6f482" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Fri Apr 15 15:22:09 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:56 2011 -0700" }, "message": "net: Reorder incoming packets in PPPoLAC and PPPoPNS.\n\nPPP handles packet loss but does not work with out of order packets.\nThis change performs reordering of incoming data packets within a\nsliding window of one second. Since sequence number is optional,\nreceiving a packet without it will drop all queued packets.\n\nCurrently the logic is triggered by incoming packets, so queued\npackets have to wait till another packet is arrived. It is done for\nsimplicity since no additional locks or threads are required. For\nreliable protocols, a retransmission will kick it. For unreliable\nprotocols, queued packets just seem like packet loss. Time-critical\nprotocols might be broken, but they never work with queueing anyway.\n\nSigned-off-by: Chia-chi Yeh \u003cchiachi@android.com\u003e\n" }, { "commit": "810bf5db1e7aa71994907e71d05abc6cd6a6f482", "tree": "33da05b442c257b7019a2d56f5bdfb6022d21588", "parents": [ "d31005f0522b1d85cc96a39ea4c76e5f57399429" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 10 20:24:12 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:56 2011 -0700" }, "message": "net: Support nuking IPv6 sockets as well as IPv4.\n\nOn Linux, when an interface goes down all its IPv6\naddresses are deleted, so relying on knowing the previous\nIPv6 addresses on the interface is brittle. Instead,\nsupport nuking all sockets that are bound to IP addresses\nthat are not configured and up on the system. This\nbehaviour is triggered by specifying the unspecified\naddress (:: or 0.0.0.0). If an IP address is specified, the\nbehaviour is unchanged, except the ioctl now supports IPv6\nas well as IPv4.\n\nSigned-off-by: Lorenzo Colitti \u003clorenzo@google.com\u003e\n" }, { "commit": "51d4429a2839b9bc140f2a2ccac47bbd85ec920a", "tree": "3ffd59895a8b6960455e35c09fe01dac3dc72956", "parents": [ "0f3118dfc076266439c440023e09645835ca0885" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Mon Feb 14 16:58:48 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:54 2011 -0700" }, "message": "net: wireless: Add get_country_code functionality to platform\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n" } ], "next": "aecca43f09d029eb98bec88b6da3b3c6897e42f5" }