)]}' { "log": [ { "commit": "0b893f0f37736c1e26655f04d51706dfba417171", "tree": "05cb4754030b59b9ed6a72843b830098ae8f056c", "parents": [ "c477e60b6689d36121f7cabaea449c4014705078" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Sun Jul 17 16:07:23 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Thu Jul 21 18:04:46 2011 -0700" }, "message": "netfilter: xt_qtaguid: add uid permission checks during ctrl/stats access\n\n* uid handling\n - Limit UID impersonation to processes with a gid in AID_NET_BW_ACCT.\n This affects socket tagging, and data removal.\n - Limit stats lookup to own uid or the process gid is in AID_NET_BW_STATS.\n This affects stats lookup.\n\n* allow pacifying the module\n Setting passive to Y/y will make the module return immediately on\n external stimulus.\n No more stats and silent success on ctrl writes.\n Mainly used when one suspects this module of misbehaving.\n\nChange-Id: I83990862d52a9b0922aca103a0f61375cddeb7c4\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "adf0760ceb775202fe7838c21eede5788f2ac31d", "tree": "be3d3c73b598d7af930e9cf5a3626c67873f0a0d", "parents": [ "fec502d9a18bbe8045c67bd4f9d3a1ade4e78555" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 21 11:39:17 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 21 15:26:03 2011 -0700" }, "message": "USB: gadget: f_accessory: Add ioctl to detect USB accessory attached at boot\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "9a736a21691d48cc6e956ce8d49849823fd6af40", "tree": "e04b1bfcd4b39cb71c9213c0e0518bccd3a1d8e7", "parents": [ "ce4022b8d1c9e1b380dc5177f955bfe5f1327e3e" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Wed Jun 15 17:21:57 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Fri Jul 15 15:26:45 2011 -0700" }, "message": "Move x86_64 idle notifiers to generic\n\nMove the x86_64 idle notifiers originally by Andi Kleen and Venkatesh\nPallipadi to generic.\n\nChange-Id: Idf29cda15be151f494ff245933c12462643388d5\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "ce4022b8d1c9e1b380dc5177f955bfe5f1327e3e", "tree": "932bd019c44b27ff5d33822206d1386f95eab70a", "parents": [ "f558e1e53997b661e85de0ba96c2596c9cc97b4f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 14 19:42:42 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Jul 15 17:18:14 2011 -0400" }, "message": "USB: gadget: f_mtp: Add support for sending MTP header during file transfer\n\nMTP_SEND_FILE_WITH_HEADER ioctl allows sending a file with the 12 byte header\nprepended at the beginning.\nThis is to allow MTP to use a single packet for the data phase instead of two.\n\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "bb5b603036b99d80527b222dc98eba4ee8341020", "tree": "dcce59f7dd49c7f3f40ccaa1973dae94381f8fff", "parents": [ "497f5982a7eae716267213a8fdc3ea4c6ac09e5e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 19:53:24 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 22:58:35 2011 -0700" }, "message": "cgroup: Add generic cgroup subsystem permission checks\n\nRather than using explicit euid \u003d\u003d 0 checks when trying to move\ntasks into a cgroup via CFS, move permission checks into each\nspecific cgroup subsystem. If a subsystem does not specify a\n\u0027allow_attach\u0027 handler, then we fall back to doing our checks\nthe old way.\n\nUse the \u0027allow_attach\u0027 handler for the \u0027cpu\u0027 cgroup to allow\nnon-root processes to add arbitrary processes to a \u0027cpu\u0027 cgroup\nif it has the CAP_SYS_NICE capability set.\n\nThis version of the patch adds a \u0027allow_attach\u0027 handler instead\nof reusing the \u0027can_attach\u0027 handler. If the \u0027can_attach\u0027 handler\nis reused, a new cgroup that implements \u0027can_attach\u0027 but not\nthe permission checks could end up with no permission checks\nat all.\n\nChange-Id: Icfa950aa9321d1ceba362061d32dc7dfa2c64f0c\nOriginal-Author: San Mehat \u003csan@google.com\u003e\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "75c56a81116e51c5cf15c0641906d0745188cd16", "tree": "c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a", "parents": [ "b4294d618e8a19bb47826e51ae52b9fb2fe05f80", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into android-3.0\n" }, { "commit": "c15000b40d46c0affa4c142c4ecb7beee4ce03f3", "tree": "14fe31249f9f8c882fecc63542821d6b431630c6", "parents": [ "9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f", "ddc6ff31cc22720c46c1547a5310ea260a968ae9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 11 16:43:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 11 16:43:27 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n [media] msp3400: fill in v4l2_tuner based on vt-\u003etype field\n [media] tuner-core.c: don\u0027t change type field in g_tuner or g_frequency\n [media] cx18/ivtv: fix g_tuner support\n [media] tuner-core: power up tuner when called with s_power(1)\n [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK\n [media] tuner-core: simplify the standard fixup\n [media] tuner-core/v4l2-subdev: document that the type field has to be filled in\n [media] v4l2-subdev.h: remove unused s_mode tuner op\n [media] feature-removal-schedule: change in how radio device nodes are handled\n [media] bttv: fix s_tuner for radio\n [media] pvrusb2: fix g/s_tuner support\n [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner\n [media] tuner-core: fix tuner_resume: use t-\u003emode instead of t-\u003etype\n [media] tuner-core: fix s_std and s_tuner\n" }, { "commit": "511b7e32086dc7f9c18341f8702745e7ce092354", "tree": "9f74cee6965c784d2fd2a98b93ee8f1aaa7a9196", "parents": [ "ab246b81fb40a587e89f281fe9255833b7540220" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Tue Jun 21 11:14:49 2011 -0700" }, "committer": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Mon Jul 11 16:39:01 2011 -0700" }, "message": "netfilter: adding the original quota2 from xtables-addons\n\nThe original xt_quota in the kernel is plain broken:\n - counts quota at a per CPU level\n (was written back when ubiquitous SMP was just a dream)\n - provides no way to count across IPV4/IPV6.\n\nThis patch is the original unaltered code from:\n http://sourceforge.net/projects/xtables-addons\n\n at commit e84391ce665cef046967f796dd91026851d6bbf3\n\nChange-Id: I19d49858840effee9ecf6cff03c23b45a97efdeb\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "ab246b81fb40a587e89f281fe9255833b7540220", "tree": "0434320e4a18914f566811227e22886cea99622f", "parents": [ "2fc52d645892c7a5fb9915b09351f934ea03f15d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jun 24 15:58:51 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Mon Jul 11 15:30:10 2011 -0700" }, "message": "USB: otg: add otg id notifier utiltiies\n\nAdd a otg_id notifier to allow multiple drivers to cooperate to\ndetermine the type of cable connected to a USB connector without\nrequiring direct calls between the drivers.\n\nChange-Id: Ic5675f1a89daf85b17336765de24e4bdb6df6348\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "2fc52d645892c7a5fb9915b09351f934ea03f15d", "tree": "877aca8c73506a143c85ab7fc1f35859886368fa", "parents": [ "89daa34bcd42062221247172ea2653521dc89e6c" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 23:20:27 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Mon Jul 11 15:30:09 2011 -0700" }, "message": "pda_power: add support for using otg transceiver events\n\nIf the platform data sets the use_otg_notifier flag,\nthe driver will now register an otg notifier callback and listen\nto transceiver events for AC/USB plug-in events instead. This would\nnormally be used by not specifying is_xx_online callbacks and\nnot specifying any irqs so the state machine is completely driven\nfrom OTG xceiver events.\n\nChange-Id: Ic4b3bc4010f299156e41fd2411696c7ff5a88e92\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\n" }, { "commit": "89daa34bcd42062221247172ea2653521dc89e6c", "tree": "fd6c25eab6ff386327a9a1494728bd1035a59cf6", "parents": [ "1fa2de3b1af303eb0b1c04c302bb5f62b4b4c596" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Fri Jul 08 18:31:46 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:42 2011 -0700" }, "message": "Bluetooth: Add support for returning the encryption key size\n\nThis will be useful when userspace wants to restrict some kinds of\noperations based on the length of the key size used to encrypt the\nlink.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "1fa2de3b1af303eb0b1c04c302bb5f62b4b4c596", "tree": "26a788bfdf77db48c075fb62fc51caafab5e2815", "parents": [ "c00ddbfadcdc5d0d26aa2ba54fa3ba1c5226b35c" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Fri Jul 08 18:31:45 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:36 2011 -0700" }, "message": "Bluetooth: Add support for storing the key size\n\nIn some cases it will be useful having the key size used for\nencrypting the link. For example, some profiles may restrict\nsome operations depending on the key length.\n\nThe key size is stored in the key that is passed to userspace\nusing the pin_length field in the key structure.\n\nFor now this field is only valid for LE controllers. 3.0+HS\ncontrollers define the Read Encryption Key Size command, this\nfield is intended for storing the value returned by that\ncommand.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "11432053c0991fbff06351ed63a83b0796179505", "tree": "2ca08694f19ad716a2ce68082a6c215e11a957f2", "parents": [ "5d873cafa53676fa7bf652bf653ea9dd4b14a7ed" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jul 07 18:59:42 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:35 2011 -0700" }, "message": "Bluetooth: Remove unused field in hci_conn\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "7f9004d183a39af6be9e962babb3b9582bf8170d", "tree": "a0c51a2c00d04924990714f817ddca189b7dbdd6", "parents": [ "a7481beb039a29f4e384e2f70e40747b19f19703" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jul 07 18:59:36 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:34 2011 -0700" }, "message": "Bluetooth: Add functions to manipulate the link key list for SMP\n\nAs the LTK (the new type of key being handled now) has more data\nassociated with it, we need to store this extra data and retrieve\nthe keys based on that data.\n\nMethods for searching for a key and for adding a new LTK are\nintroduced here.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "a7481beb039a29f4e384e2f70e40747b19f19703", "tree": "b86b09c456a28a94a1752e5b9c2e0b0ac88dedcb", "parents": [ "c1d5e1dab83a08bd5b052f4e5af96a94c3155a08" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jul 07 18:59:35 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:34 2011 -0700" }, "message": "Bluetooth: Add new structures for supporting SM key distribution\n\nWe need these changes because SMP keys may have more information\nassociated with them, for example, in the LTK case, it has an\nencrypted diversifier (ediv) and a random number (rand).\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "c1d5e1dab83a08bd5b052f4e5af96a94c3155a08", "tree": "4b399ced9f516143b677020632029f4943b8550a", "parents": [ "119c689389cc2202a4f3a01bdd43356f9736c042" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jul 07 18:59:34 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:34 2011 -0700" }, "message": "Bluetooth: Add support for SMP phase 3 (key distribution)\n\nThis adds support for generating and distributing all the keys\nspecified in the third phase of SMP.\n\nThis will make possible to re-establish secure connections, resolve\nprivate addresses and sign commands.\n\nFor now, the values generated are random.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "119c689389cc2202a4f3a01bdd43356f9736c042", "tree": "de2a62dc21624a4db42979ca29a329edadee0e42", "parents": [ "c0675b8d3c9cef40cd0c41d341815bd4e9faf5b6" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Jul 07 09:39:03 2011 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:34 2011 -0700" }, "message": "Bluetooth: Remove L2CAP busy queue\n\nThe ERTM receive buffer is now handled in a way that does not require\nthe busy queue and the associated polling code.\n\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "c0675b8d3c9cef40cd0c41d341815bd4e9faf5b6", "tree": "0d15342a23b79a7449ad77b823e54e32212c464d", "parents": [ "d0336628cc629b3ef9c2814016c5f5af7a8f0bce" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Jul 07 09:39:02 2011 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:33 2011 -0700" }, "message": "Bluetooth: Use event-driven approach for handling ERTM receive buffer\n\nThis change moves most L2CAP ERTM receive buffer handling out of the\nL2CAP core and in to the socket code. It\u0027s up to the higher layer\n(the socket code, in this case) to tell the core when its buffer is\nfull or has space available. The recv op should always accept\nincoming ERTM data or else the connection will go down.\n\nWithin the socket layer, an skb that does not fit in the socket\nreceive buffer will be temporarily stored. When the socket is read\nfrom, that skb will be placed in the receive buffer if possible. Once\nadequate buffer space becomes available, the L2CAP core is informed\nand the ERTM local busy state is cleared.\n\nReceive buffer management for non-ERTM modes is unchanged.\n\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "c006aa0c5627e27e6cc422636a4744c43cbd5dc9", "tree": "150475cce78b762662f17f54a76f6d59a23a8e84", "parents": [ "5521abe082c05a39479d0441b883ddcec1d57765" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu Jun 30 19:20:55 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:33 2011 -0700" }, "message": "Bluetooth: Add lmp_host_le_capable() macro\n\nSince we have the extended LMP features properly implemented, we\nshould check the LMP_HOST_LE bit to know if the host supports LE.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "5521abe082c05a39479d0441b883ddcec1d57765", "tree": "d26c3259975a3c1591350de5536a20120ab0d365", "parents": [ "e326af428736971ea5632448508f356901b991a1" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu Jun 30 19:20:54 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:30 2011 -0700" }, "message": "Bluetooth: Add enable_le module parameter\n\nThis patch adds a new module parameter to enable/disable host LE\nsupport. By default host LE support is disabled.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "e326af428736971ea5632448508f356901b991a1", "tree": "0e60379416ff24755d97ce74233c4f36743787fb", "parents": [ "d5fa5134c1b1f8c450b7f3ccf68499a7df9cd63d" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu Jun 30 19:20:53 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:30 2011 -0700" }, "message": "Bluetooth: Write LE Host Supported command\n\nThis patch adds a handler to Write LE Host Supported command complete\nevents. Once this commands has completed successfully, we should\nread the extended LMP features and update the extfeatures field in\nhci_dev.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "d5fa5134c1b1f8c450b7f3ccf68499a7df9cd63d", "tree": "8af355244e61eaed463fdc87c378261cec475e17", "parents": [ "758b9e9a24102a8dc2c5ea065c8548305f2bd9a3" ], "author": { "name": "Andre Guedes", "email": "andre.guedes@openbossa.org", "time": "Thu Jun 30 19:20:52 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:28 2011 -0700" }, "message": "Bluetooth: Add extfeatures to struct hci_dev\n\nThis new field holds the extended LMP features value. Some LE\nmechanism such as discovery procedure needs to read the extended\nLMP features to work properly.\n\nSigned-off-by: Andre Guedes \u003candre.guedes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "0ea110d6ef43b593f8a2785444a3556228485086", "tree": "281354a4560c4adc7be0c9e74d6ec8725e880677", "parents": [ "0e43af42876572976c15c1b732c8fdc593bbf93b" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jun 17 15:46:46 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:27 2011 -0700" }, "message": "Bluetooth: Clean up unused struct hci_conn items\n\npriv and lock are never used\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "19f7f220ebcde5f30ee6f8475f946b334f361065", "tree": "759b6bea9f7f6b78115b7ba803c6969adaefdfcd", "parents": [ "d8e4f87b5c7261041eca098b3863cd1f8a257bba" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 30 19:15:37 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:26 2011 -0700" }, "message": "Bluetooth: Add bt_printk\n\nAdd a local logging function to emit bluetooth specific\nmessages. Using vsprintf extension %pV saves code/text\nspace.\n\nConvert the current BT_INFO and BT_ERR macros to use bt_printk.\nRemove __func__ from BT_ERR macro (and the uses).\nPrefix \"Bluetooth: \" to BT_ERR\nRemove __func__ from BT_DBG as function can be prefixed when\nusing dynamic_debug.\n\nWith allyesconfig:\n\n text data bss dec hex filename\n 129956 8632 36096 174684 2aa5c drivers/bluetooth/built-in.o.new2\n 134402 8632 36064 179098 2bb9a drivers/bluetooth/built-in.o.old\n 14778 1012 3408 19198 4afe net/bluetooth/bnep/built-in.o.new2\n 15067 1012 3408 19487 4c1f net/bluetooth/bnep/built-in.o.old\n 346595 19163 86080 451838 6e4fe net/bluetooth/built-in.o.new2\n 353751 19163 86064 458978 700e2 net/bluetooth/built-in.o.old\n 18483 1172 4264 23919 5d6f net/bluetooth/cmtp/built-in.o.new2\n 18927 1172 4264 24363 5f2b net/bluetooth/cmtp/built-in.o.old\n 19237 1172 5152 25561 63d9 net/bluetooth/hidp/built-in.o.new2\n 19581 1172 5152 25905 6531 net/bluetooth/hidp/built-in.o.old\n 59461 3884 14464 77809 12ff1 net/bluetooth/rfcomm/built-in.o.new2\n 61206 3884 14464 79554 136c2 net/bluetooth/rfcomm/built-in.o.old\n\nwith x86 defconfig (and just bluetooth):\n\n$ size net/bluetooth/built-in.o.defconfig.*\n text data bss dec hex filename\n 66358 933 100 67391 1073f net/bluetooth/built-in.o.defconfig.new\n 66643 933 100 67676 1085c net/bluetooth/built-in.o.defconfig.old\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "d8e4f87b5c7261041eca098b3863cd1f8a257bba", "tree": "ba7eb882c14a880071db001539f1653ba060cd6d", "parents": [ "6e35f04700b3ecc4f2b188f7d942eb3cf96a1e4e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Jun 29 18:18:29 2011 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:26 2011 -0700" }, "message": "Bluetooth: Rename function bt_err to bt_to_errno\n\nMake it easier to use more normal logging styles later.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "e299c1cdf83f23674c96545611306f8a1dfe7fff", "tree": "6c0212954c9edb5500fd2bf5ac3dde6797a36521", "parents": [ "2ddee5a3fdbf4298113c24bef0ff3063070824a0" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jun 10 21:28:49 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:24 2011 -0700" }, "message": "Bluetooth: Use bit operations on conn_state\n\nInstead of setting bits manually we use set_bit, test_bit, etc.\nAlso remove L2CAP_ prefix from macros.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "2ddee5a3fdbf4298113c24bef0ff3063070824a0", "tree": "d714565d999825777201f784bed6c76828134f09", "parents": [ "58d1980847d0c2b9a7fcf1a291b285097b1a783a" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jun 10 17:02:12 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:24 2011 -0700" }, "message": "Bluetooth: use bit operation on conf_state\n\nInstead of making the bit operations manually, we now use set_bit,\ntest_bit, etc.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "58d1980847d0c2b9a7fcf1a291b285097b1a783a", "tree": "1320adbcd6dbb1440b4802e9508d461999d6c25e", "parents": [ "9d90e2e88fc70b4723d39d97e90efc1f16d0d522" ], "author": { "name": "Antti Julku", "email": "antti.julku@nokia.com", "time": "Wed Jun 15 12:01:15 2011 +0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:24 2011 -0700" }, "message": "Bluetooth: Add blacklisting support for mgmt interface\n\nManagement interface commands for blocking and unblocking devices.\n\nSigned-off-by: Antti Julku \u003cantti.julku@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "9d90e2e88fc70b4723d39d97e90efc1f16d0d522", "tree": "3bd11ca58a676f7160e7db21e9a1d6e812b0c555", "parents": [ "397d9aeced79c37913ae90485a4544c04e7fb518" ], "author": { "name": "Antti Julku", "email": "antti.julku@nokia.com", "time": "Wed Jun 15 12:01:14 2011 +0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:23 2011 -0700" }, "message": "Bluetooth: Move blacklisting functions to hci_core\n\nMove blacklisting functions to hci_core.c, so that they can\nbe used by both management interface and hci socket interface.\n\nSigned-off-by: Antti Julku \u003cantti.julku@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "397d9aeced79c37913ae90485a4544c04e7fb518", "tree": "adc97c81128daa2aa90d918857233d36e4595ea1", "parents": [ "b19d5cea661d5695c683bc6ba0925ce4b96dd022" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Tue Jun 14 13:37:42 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:23 2011 -0700" }, "message": "Bluetooth: Add key size checks for SMP\n\nThis patch implements a check in smp cmd pairing request and pairing\nresponse to verify if encryption key maximum size is compatible in both\nslave and master when SMP Pairing is requested. Keys are also masked to\nthe correct negotiated size.\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": "b19d5cea661d5695c683bc6ba0925ce4b96dd022", "tree": "00fa0fca7ac02c80cdd57522ebf93c72f47b8379", "parents": [ "53fba6133266ef870ddb04138cdf746ea337c8b7" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Tue Jun 14 13:37:41 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:23 2011 -0700" }, "message": "Bluetooth: Add support for SMP timeout\n\nThis patch adds support for disconnecting the link when SMP procedure\ntakes more than 30 seconds.\n\nSMP begins when either the Pairing Request command is sent or the\nPairing Response is received, and it ends when the link is encrypted\n(or terminated). Vol 3, Part H Section 3.4.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "208dfd9cd7b736800d879bad5a1a23b6107ed85b", "tree": "16460b0033a01c66cd5b5a276f30c44c885be169", "parents": [ "403d2c85b1bcbdac6bd90945f16b1ea975cbac38" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Jun 09 18:50:51 2011 -0300" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Jul 11 11:59:22 2011 -0700" }, "message": "Bluetooth: Update the security level when link is encrypted\n\nIf the pending security level is greater than the current security\nlevel and the link is now encrypted, we should update the link\nsecurity level.\n\nThis is only useful for LE links, when the only event generated\nwhen SMP is sucessful in the Encrypt Change event.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "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": "f607e7fc5fb94d92030c4527287e9c149ddf9e65", "tree": "49ac9020b87f028e947580425fef84222332fdf8", "parents": [ "453a9bf347f1e22a5bb3605ced43b2366921221d" ], "author": { "name": "Jean-François Dagenais", "email": "dagenaisj@sonatest.com", "time": "Fri Jul 08 15:39:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 08 21:14:44 2011 -0700" }, "message": "w1: ds1wm: add a reset recovery parameter\n\nThis fixes a regression in 3.0 reported by Paul Parsons regarding the\nremoval of the msleep(1) in the ds1wm_reset() function:\n\n: The linux-3.0-rc4 DS1WM 1-wire driver is logging \"bus error, retrying\"\n: error messages on an HP iPAQ hx4700 PDA (XScale-PXA270):\n:\n: \u003csnip\u003e\n: Driver for 1-wire Dallas network protocol.\n: DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n: 1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko\n: ds1wm ds1wm: pass: 1 bus error, retrying\n: ds1wm ds1wm: pass: 2 bus error, retrying\n: ds1wm ds1wm: pass: 3 bus error, retrying\n: ds1wm ds1wm: pass: 4 bus error, retrying\n: ds1wm ds1wm: pass: 5 bus error, retrying\n: ...\n:\n: The visible result is that the battery charging LED is erratic; sometimes\n: it works, mostly it doesn\u0027t.\n:\n: The linux-2.6.39 DS1WM 1-wire driver worked OK. I haven\u0027t tried 3.0-rc1,\n: 3.0-rc2, or 3.0-rc3.\n\nThis sleep should not be required on normal circuitry provided the\npull-ups on the bus are correctly adapted to the slaves. Unfortunately,\nthis is not always the case. The sleep is restored but as a parameter to\nthe probe function in the pdata.\n\n[akpm@linux-foundation.org: coding-style fixes]\nReported-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Jean-François Dagenais \u003cdagenaisj@sonatest.com\u003e\nCc: Evgeniy Polyakov \u003cjohnpol@2ka.mipt.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\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": "2a9d6df425d7b46b23cbc8673b2dfefa4678abdb", "tree": "a6ec2ee125a3c02342b48a2e4a36598c26ca2b8b", "parents": [ "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "7b28afe01ab6ffb5f152f47831b44933facd2328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 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 drbd: we should write meta data updates with FLUSH FUA\n drbd: fix limit define, we support 1 PiByte now\n drbd: when receive times out on meta socket, also check last receive time on data socket\n drbd: account bitmap IO during resync as resync-(related-)-io\n drbd: don\u0027t cond_resched_lock with IRQs disabled\n drbd: add missing spinlock to bitmap receive\n drbd: Use the correct max_bio_size when creating resync requests\n cfq-iosched: make code consistent\n cfq-iosched: fix a rcu warning\n" }, { "commit": "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "tree": "7dcb1e8378f8ec8e7ad7684cd26e9d5a1b5b22d1", "parents": [ "075d9db13183c102770dc6cefabfee1b832f9614" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 07 12:19:48 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:21:56 2011 -0700" }, "message": "FS-Cache: Add a helper to bulk uncache pages on an inode\n\nAdd an FS-Cache helper to bulk uncache pages on an inode. This will\nonly work for the circumstance where the pages in the cache correspond\n1:1 with the pages attached to an inode\u0027s page cache.\n\nThis is required for CIFS and NFS: When disabling inode cookie, we were\nreturning the cookie and setting cifsi-\u003efscache to NULL but failed to\ninvalidate any previously mapped pages. This resulted in \"Bad page\nstate\" errors and manifested in other kind of errors when running\nfsstress. Fix it by uncaching mapped pages when we disable the inode\ncookie.\n\nThis patch should fix the following oops and \"Bad page state\" errors\nseen during fsstress testing.\n\n ------------[ cut here ]------------\n kernel BUG at fs/cachefiles/namei.c:201!\n invalid opcode: 0000 [#1] SMP\n Pid: 5, comm: kworker/u:0 Not tainted 2.6.38.7-30.fc15.x86_64 #1 Bochs Bochs\n RIP: 0010: cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n RSP: 0018:ffff88002ce6dd00 EFLAGS: 00010282\n RAX: ffff88002ef165f0 RBX: ffff88001811f500 RCX: 0000000000000000\n RDX: 0000000000000000 RSI: 0000000000000100 RDI: 0000000000000282\n RBP: ffff88002ce6dda0 R08: 0000000000000100 R09: ffffffff81b3a300\n R10: 0000ffff00066c0a R11: 0000000000000003 R12: ffff88002ae54840\n R13: ffff88002ae54840 R14: ffff880029c29c00 R15: ffff88001811f4b0\n FS: 00007f394dd32720(0000) GS:ffff88002ef00000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 00007fffcb62ddf8 CR3: 000000001825f000 CR4: 00000000000006e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process kworker/u:0 (pid: 5, threadinfo ffff88002ce6c000, task ffff88002ce55cc0)\n Stack:\n 0000000000000246 ffff88002ce55cc0 ffff88002ce6dd58 ffff88001815dc00\n ffff8800185246c0 ffff88001811f618 ffff880029c29d18 ffff88001811f380\n ffff88002ce6dd50 ffffffff814757e4 ffff88002ce6dda0 ffffffff8106ac56\n Call Trace:\n cachefiles_lookup_object+0x78/0xd4 [cachefiles]\n fscache_lookup_object+0x131/0x16d [fscache]\n fscache_object_work_func+0x1bc/0x669 [fscache]\n process_one_work+0x186/0x298\n worker_thread+0xda/0x15d\n kthread+0x84/0x8c\n kernel_thread_helper+0x4/0x10\n RIP cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n ---[ end trace 1d481c9af1804caa ]---\n\nI tested the uncaching by the following means:\n\n (1) Create a big file on my NFS server (104857600 bytes).\n\n (2) Read the file into the cache with md5sum on the NFS client. Look in\n /proc/fs/fscache/stats:\n\n\tPages : mrk\u003d25601 unc\u003d0\n\n (3) Open the file for read/write (\"bash 5\u003c\u003e/warthog/bigfile\"). Look in proc\n again:\n\n\tPages : mrk\u003d25601 unc\u003d25601\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-and-Tested-by: Suresh Jayaraman \u003csjayaraman@suse.de\u003e\ncc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27a3b735b70651f28db03e5f92775a40661ba7a6", "tree": "9f300b93aa34381aa1d3121e9d53e8c8e1623a24", "parents": [ "85746e429f8e5dc8c5c0beadc0f099cb1feab93e", "161b6ae0e067e421b20bb35caf66bdb405c929ac", "140fe3b1ab9c082182ef13359fab4ddba95c24c3", "e4c2fb0d5776b58049d2556b456144a4db3fe5a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "message": "Merge branches \u0027core-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027 and \u0027sched-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 debugobjects: Fix boot crash when kmemleak and debugobjects enabled\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n jump_label: Fix jump_label update for modules\n oprofile, x86: Fix race in nmi handler while starting counters\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Disable (revert) SCHED_LOAD_SCALE increase\n sched, cgroups: Fix MIN_SHARES on 64-bit boxen\n" }, { "commit": "85746e429f8e5dc8c5c0beadc0f099cb1feab93e", "tree": "65a6852655b441d03899d1cb7d8012ff52a915a1", "parents": [ "4dd1b49c6d215dc41ce50c80b4868388b93f31a3", "949123016a2ef578009b6aa3e98d45d1a154ebfb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:16:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:16:21 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: (31 commits)\n sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it\n net: refine {udp|tcp|sctp}_mem limits\n vmxnet3: round down # of queues to power of two\n net: sh_eth: fix the parameter for the ETHER of SH7757\n net: sh_eth: fix cannot work half-duplex mode\n net: vlan: enable soft features regardless of underlying device\n vmxnet3: fix starving rx ring whenoc_skb kb fails\n bridge: Always flood broadcast packets\n greth: greth_set_mac_add would corrupt the MAC address.\n net: bind() fix error return on wrong address family\n natsemi: silence dma-debug warnings\n net: 8139too: Initial necessary vlan_features to support vlan\n Fix call trace when interrupts are disabled while sleeping function kzalloc is called\n qlge:Version change to v1.00.00.29\n qlge: Fix printk priority so chip fatal errors are always reported.\n qlge:Fix crash caused by mailbox execution on wedged chip.\n xfrm4: Don\u0027t call icmp_send on local error\n ipv4: Don\u0027t use ufo handling on later transformed packets\n xfrm: Remove family arg from xfrm_bundle_ok\n ipv6: Don\u0027t put artificial limit on routing table size.\n ...\n" }, { "commit": "338e9e1ad541cbb2a3fa5839376ff6c138d40301", "tree": "0657639257487bc4ac5499e51e8a4083ea4de896", "parents": [ "e206fc5e3de0e38a35b6f92941c913b6d8343fc6" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 09:35:56 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 07 15:04:23 2011 -0300" }, "message": "[media] tuner-core/v4l2-subdev: document that the type field has to be filled in\n\nThe tuner ops g_frequency, g_tuner and s_tuner require that the tuner type\nfield is filled in. Document this.\n\nThe tuner-core doc is based on a patch from Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "e206fc5e3de0e38a35b6f92941c913b6d8343fc6", "tree": "37419272d1da1ccaaa26c0adce7dd7299fc63a21", "parents": [ "6293698277f04eb1623536887651381ed3abc8d0" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 09:34:56 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 07 15:03:59 2011 -0300" }, "message": "[media] v4l2-subdev.h: remove unused s_mode tuner op\n\ns_mode is no longer used, so remove it.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\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": "de3796e77a587b28f0c9d8e04c02894d3939dc4e", "tree": "f5a414a421e45e7f90c113aaf3ef30e078672f46", "parents": [ "bcb65a797eb7c51e4f227dd19295f14d38738fee", "98c32bcded0e249fd48726930ae9f393e0e318b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 06 12:16:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 06 12:16:49 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)\n [media] rc: call input_sync after scancode reports\n [media] imon: allow either proto on unknown 0xffdc\n [media] imon: auto-config ffdc 7e device\n [media] saa7134: fix raw IR timeout value\n [media] rc: fix ghost keypresses with certain hw\n [media] [staging] lirc_serial: allocate irq at init time\n [media] lirc_zilog: fix spinning rx thread\n [media] keymaps: fix table for pinnacle pctv hd devices\n [media] ite-cir: 8709 needs to use pnp resource 2\n [media] V4L: mx1-camera: fix uninitialized variable\n [media] omap_vout: Added check in reqbuf \u0026 mmap for buf_size allocation\n [media] OMAP_VOUT: Change hardcoded device node number to -1\n [media] OMAP_VOUTLIB: Fix wrong resizer calculation\n [media] uvcvideo: Disable the queue when failing to start\n [media] uvcvideo: Remove buffers from the queues when freeing\n [media] uvcvideo: Ignore entities for terminals with no supported format\n [media] v4l: Don\u0027t access media entity after is has been destroyed\n [media] media: omap3isp: fix a potential NULL deref\n [media] media: vb2: fix allocation failure check\n [media] media: vb2: reset queued_count value during queue reinitialization\n ...\n\nFix up trivial conflict in MAINTAINERS as per Mauro\n" }, { "commit": "e4c2fb0d5776b58049d2556b456144a4db3fe5a9", "tree": "04cebbb24f524408728492cfeb396d66aa6127e4", "parents": [ "cd62287e364c0d15d517c6ced4e4808b54711475" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Jul 05 10:56:32 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jul 05 11:28:18 2011 +0200" }, "message": "sched: Disable (revert) SCHED_LOAD_SCALE increase\n\nAlex reported that commit c8b281161df (\"sched: Increase\nSCHED_LOAD_SCALE resolution\") caused a power usage regression\nunder light load as it increases the number of load-balance\noperations and keeps idle cpus from staying idle.\n\nTime has run out to find the root cause for this release so\ndisable the feature for v3.0 until we can figure out what\ncauses the problem.\n\nReported-by: \"Alex, Shi\" \u003calex.shi@intel.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Nikhil Rao \u003cncrao@google.com\u003e\nCc: Ming Lei \u003ctom.leiming@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-m4onxn0sxnyn5iz9o88eskc3@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\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": "957c665f37007de93ccbe45902a23143724170d0", "tree": "d49f13d5b34ed1b1fc34828cbcd60afdbc9c4e5b", "parents": [ "11d53b4990226247a950e2b1ccfa4cf93bfbc822" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 24 15:25:00 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 17:30:43 2011 -0700" }, "message": "ipv6: Don\u0027t put artificial limit on routing table size.\n\nIPV6, unlike IPV4, doesn\u0027t have a routing cache.\n\nRouting table entries, as well as clones made in response\nto route lookup requests, all live in the same table. And\nall of these things are together collected in the destination\ncache table for ipv6.\n\nThis means that routing table entries count against the garbage\ncollection limits, even though such entries cannot ever be reclaimed\nand are added explicitly by the administrator (rather than being\ncreated in response to lookups).\n\nTherefore it makes no sense to count ipv6 routing table entries\nagainst the GC limits.\n\nAdd a DST_NOCOUNT destination cache entry flag, and skip the counting\nif it is set. Use this flag bit in ipv6 when adding routing table\nentries.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60c2ce2b4facf28f569115a55e1f479eb12bd0f1", "tree": "9771312021bbece80efea2fb0823563e4f68b611", "parents": [ "0e90ed0e8b9b1c25040442f1d20c799751b1e727", "690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 01:52:02 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 01:52:02 2011 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\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": "690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1", "tree": "9199b20addcd9167a210957ac477a284c6f9a73d", "parents": [ "16adf5d07987d93675945f3cecf0e33706566005", "a0b8de350be458b33248e48b2174d9af8a4c4798" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 30 11:26:04 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 30 11:26:04 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem\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": "7b28afe01ab6ffb5f152f47831b44933facd2328", "tree": "a537d78f49fa1b959c9a453f459c1acd767a939f", "parents": [ "726e99ab88db059fe1422e15376ae404f8c66eb4", "86e1e98e5c6b4edab97e2b058466ef553cfd878e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "message": "Merge branch \u0027for-3.0-important\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "15b493d11fcce3c5547e3d7fb6d90e11ffe12777", "tree": "0638c261a1ca0ce54e1cbeb3ddaab10075717b27", "parents": [ "cb6518cbef5e3e36b7ae90fcab610a52ea7e9fc0" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Jun 28 09:48:48 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:45 2011 +0200" }, "message": "drbd: fix limit define, we support 1 PiByte now\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\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": "a66b98db570a638afd909459e1e6bfa272344bd3", "tree": "e4e78a0602b46121548fad2e357f03d550d23c94", "parents": [ "8fcbd4dc7a1b338b393dcd6869deb1725cf1a9f3" ], "author": { "name": "Arik Nemtsov", "email": "arik@wizery.com", "time": "Thu Jun 23 00:00:24 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 27 14:45:25 2011 -0400" }, "message": "mac80211: fix rx-\u003ekey NULL dereference during mic failure\n\nSometimes when reporting a MIC failure rx-\u003ekey may be unset. This\ncode path is hit when receiving a packet meant for a multicast\naddress, and decryption is performed in HW.\n\nFortunately, the failing key_idx is not used for anything up to\n(and including) usermode, so we allow ourselves to drop it on the\nway up when a key cannot be retrieved.\n\nSigned-off-by: Arik Nemtsov \u003carik@wizery.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\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" } ], "next": "f76b168b6f117a49d36307053e1acbe30580ea5b" }