)]}' { "log": [ { "commit": "46857aa9043599d19f8e9ac82272188674c22d58", "tree": "53747cad3da5fe3c91d6f61ee92ae12aa746fecb", "parents": [ "8d9db3c8417c860b9241ffaa456c743c505d945e", "52ed47fbcfdec2e5c440da4b68ed0ea202075ab9" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Feb 24 14:35:31 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Feb 24 14:35:31 2016 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-4.1\u0027 into android-hikey-linaro-4.1\n" }, { "commit": "52ed47fbcfdec2e5c440da4b68ed0ea202075ab9", "tree": "032666002f976d3cf54273461a09dc34eca5d65b", "parents": [ "7901ce3f41363fc5642bdd199955c2d49230dd47" ], "author": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Mon Feb 08 16:47:41 2016 -0800" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "ANDROID: dm: Rebase on top of 4.1\n\n1. \"dm: optimize use SRCU and RCU\" removes the use of dm_table_put.\n2. \"dm: remove request-based logic from make_request_fn wrapper\" necessitates\n calling dm_setup_md_queue or else the request_queue\u0027s make_request_fn\n pointer ends being unset.\n\n[ 7.711600] Internal error: Oops - bad mode: 0 [#1] PREEMPT SMP\n[ 7.717519] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 4.1.15-02273-gb057d16-dirty #33\n[ 7.726559] Hardware name: HiKey Development Board (DT)\n[ 7.731779] task: ffffffc005f8acc0 ti: ffffffc005f8c000 task.ti: ffffffc005f8c000\n[ 7.739257] PC is at 0x0\n[ 7.741787] LR is at generic_make_request+0x8c/0x108\n....\n[ 9.082931] Call trace:\n[ 9.085372] [\u003c (null)\u003e] (null)\n[ 9.090074] [\u003cffffffc0003f4ac0\u003e] submit_bio+0x98/0x1e0\n[ 9.095212] [\u003cffffffc0001e2618\u003e] _submit_bh+0x120/0x1f0\n[ 9.096165] cfg80211: Calling CRDA to update world regulatory domain\n[ 9.106781] [\u003cffffffc0001e5450\u003e] __bread_gfp+0x94/0x114\n[ 9.112004] [\u003cffffffc00024a748\u003e] ext4_fill_super+0x18c/0x2d64\n[ 9.117750] [\u003cffffffc0001b275c\u003e] mount_bdev+0x194/0x1c0\n[ 9.122973] [\u003cffffffc0002450dc\u003e] ext4_mount+0x14/0x1c\n[ 9.128021] [\u003cffffffc0001b29a0\u003e] mount_fs+0x3c/0x194\n[ 9.132985] [\u003cffffffc0001d059c\u003e] vfs_kern_mount+0x4c/0x134\n[ 9.138467] [\u003cffffffc0001d2168\u003e] do_mount+0x204/0xbbc\n[ 9.143514] [\u003cffffffc0001d2ec4\u003e] SyS_mount+0x94/0xe8\n[ 9.148479] [\u003cffffffc000c54074\u003e] mount_block_root+0x120/0x24c\n[ 9.154222] [\u003cffffffc000c543e8\u003e] mount_root+0x110/0x12c\n[ 9.159443] [\u003cffffffc000c54574\u003e] prepare_namespace+0x170/0x1b8\n[ 9.165273] [\u003cffffffc000c53d98\u003e] kernel_init_freeable+0x23c/0x260\n[ 9.171365] [\u003cffffffc0009b1748\u003e] kernel_init+0x10/0x118\n[ 9.176589] Code: bad PC value\n[ 9.179807] ---[ end trace 75e1bc52ba364d13 ]---\n\nBug: 27175947\n\nSigned-off-by: Badhri Jagan Sridharan \u003cBadhri@google.com\u003e\nChange-Id: I952d86fd1475f0825f9be1386e3497b36127abd0\n" }, { "commit": "7901ce3f41363fc5642bdd199955c2d49230dd47", "tree": "24490454656e89a33046aa95a276ff524a3a34a2", "parents": [ "f3e815cee7a35fe04f5aad21a9a181d31ff86e07" ], "author": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Mon Feb 08 16:28:43 2016 -0800" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "ANDROID: dm-android-verity: Rebase on top of 4.1\n\nFollowing CLs in upstream causes minor changes to dm-android-verity target.\n1. keys: change asymmetric keys to use common hash definitions\n2. block: Abstract out bvec iterator\nRebase dm-android-verity on top of these changes.\n\nBug: 27175947\n\nSigned-off-by: Badhri Jagan Sridharan \u003cBadhri@google.com\u003e\nChange-Id: Icfdc3e7b3ead5de335a059cade1aca70414db415\n" }, { "commit": "f3e815cee7a35fe04f5aad21a9a181d31ff86e07", "tree": "550fdacf47faf50addb78e895de8abfebe7900eb", "parents": [ "a196ec9fcb69b3fa81dfbd3adddb638006f3af72" ], "author": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Mon Dec 14 20:09:39 2015 -0800" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "ANDROID: dm: Add android verity target\n\nThis device-mapper target is virtually a VERITY target. This\ntarget is setup by reading the metadata contents piggybacked\nto the actual data blocks in the block device. The signature\nof the metadata contents are verified against the key included\nin the system keyring. Upon success, the underlying verity\ntarget is setup.\n\nBUG: 27175947\n\nChange-Id: I7e99644a0960ac8279f02c0158ed20999510ea97\nSigned-off-by: Badhri Jagan Sridharan \u003cBadhri@google.com\u003e\n" }, { "commit": "a196ec9fcb69b3fa81dfbd3adddb638006f3af72", "tree": "37c412bdcb65442568159af80023eb81c790509d", "parents": [ "6328e3d5fd7a8f1bb185018a40661382d1be4aa6" ], "author": { "name": "Rasmus Villemoes", "email": "linux@rasmusvillemoes.dk", "time": "Thu Jun 25 15:02:22 2015 -0700" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: lib/string.c: introduce strreplace()\n\nStrings are sometimes sanitized by replacing a certain character (often\n\u0027/\u0027) by another (often \u0027!\u0027). In a few places, this is done the same way\nSchlemiel the Painter would do it. Others are slightly smarter but still\ndo multiple strchr() calls. Introduce strreplace() to do this using a\nsingle function call and a single pass over the string.\n\nOne would expect the return value to be one of three things: void, s, or\nthe number of replacements made. I chose the fourth, returning a pointer\nto the end of the string. This is more likely to be useful (for example\nallowing the caller to avoid a strlen call).\n\nBUG: 27175947\n\nSigned-off-by: Rasmus Villemoes \u003clinux@rasmusvillemoes.dk\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nChange-Id: I1ddb88534a189f2e78ae1b5b074c0662781c7665\n" }, { "commit": "6328e3d5fd7a8f1bb185018a40661382d1be4aa6", "tree": "b9839bc8721e037c1cc09222ad1137b89e5b4a50", "parents": [ "86dd1b8493acd33a42f87ec94385ad428a39224f" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Wed Jun 09 17:47:38 2010 -0500" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "CHROMIUM: dm: boot time specification of dm\u003d\n\nThis is a wrap-up of three patches pending upstream approval.\nI\u0027m bundling them because they are interdependent, and it\u0027ll be\neasier to drop it on rebase later.\n\n1. dm: allow a dm-fs-style device to be shared via dm-ioctl\n\nIntegrates feedback from Alisdair, Mike, and Kiyoshi.\n\nTwo main changes occur here:\n\n- One function is added which allows for a programmatically created\nmapped device to be inserted into the dm-ioctl hash table. This binds\nthe device to a name and, optional, uuid which is needed by udev and\nallows for userspace management of the mapped device.\n\n- dm_table_complete() was extended to handle all of the final\nfunctional changes required for the table to be operational once\ncalled.\n\n2. init: boot to device-mapper targets without an initr*\n\nAdd a dm\u003d kernel parameter modeled after the md\u003d parameter from\ndo_mounts_md. It allows for device-mapper targets to be configured at\nboot time for use early in the boot process (as the root device or\notherwise). It also replaces /dev/XXX calls with major:minor opportunistically.\n\nThe format is dm\u003d\"name uuid ro,table line 1,table line 2,...\". The\nparser expects the comma to be safe to use as a newline substitute but,\notherwise, uses the normal separator of space. Some attempt has been\nmade to make it forgiving of additional spaces (using skip_spaces()).\n\nA mapped device created during boot will be assigned a minor of 0 and\nmay be access via /dev/dm-0.\n\nAn example dm-linear root with no uuid may look like:\n\nroot\u003d/dev/dm-0 dm\u003d\"lroot none ro, 0 4096 linear /dev/ubdb 0, 4096 4096 linear /dv/ubdc 0\"\n\nOnce udev is started, /dev/dm-0 will become /dev/mapper/lroot.\n\nOlder upstream threads:\nhttp://marc.info/?l\u003ddm-devel\u0026m\u003d127429492521964\u0026w\u003d2\nhttp://marc.info/?l\u003ddm-devel\u0026m\u003d127429499422096\u0026w\u003d2\nhttp://marc.info/?l\u003ddm-devel\u0026m\u003d127429493922000\u0026w\u003d2\n\nLatest upstream threads:\nhttps://patchwork.kernel.org/patch/104859/\nhttps://patchwork.kernel.org/patch/104860/\nhttps://patchwork.kernel.org/patch/104861/\n\nBug: 27175947\n\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\n\nReview URL: http://codereview.chromium.org/2020011\n\nChange-Id: I92bd53432a11241228d2e5ac89a3b20d19b05a31\n" }, { "commit": "86dd1b8493acd33a42f87ec94385ad428a39224f", "tree": "b90f70604fcee2698d522e8f36db73e3476bfa29", "parents": [ "b0d6648a5c2020fbe4351b75d7b6c619d3843f42" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Dec 03 14:26:31 2015 +0000" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: dm verity: add ignore_zero_blocks feature\n\nIf ignore_zero_blocks is enabled dm-verity will return zeroes for blocks\nmatching a zero hash without validating the content.\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: Id92e20a8347d4f7846dffbf5bcf326fad3265eca\n" }, { "commit": "b0d6648a5c2020fbe4351b75d7b6c619d3843f42", "tree": "58d2aa0f88f50077623fb285043b87d968eea554", "parents": [ "5649a3dc94f11422c944e99061cbdac1d453149f" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Dec 03 14:26:30 2015 +0000" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "BACKPORT: dm verity: add support for forward error correction\n\nAdd support for correcting corrupted blocks using Reed-Solomon.\n\nThis code uses RS(255, N) interleaved across data and hash\nblocks. Each error-correcting block covers N bytes evenly\ndistributed across the combined total data, so that each byte is a\nmaximum distance away from the others. This makes it possible to\nrecover from several consecutive corrupted blocks with relatively\nsmall space overhead.\n\nIn addition, using verity hashes to locate erasures nearly doubles\nthe effectiveness of error correction. Being able to detect\ncorrupted blocks also improves performance, because only corrupted\nblocks need to corrected.\n\nFor a 2 GiB partition, RS(255, 253) (two parity bytes for each\n253-byte block) can correct up to 16 MiB of consecutive corrupted\nblocks if erasures can be located, and 8 MiB if they cannot, with\n16 MiB space overhead.\n\nMerge conflicts in:\ndrivers/md/dm-verity-target.c\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: Ib597efc1da1fc84e9bf267bd312ab84d04f0efbe\n" }, { "commit": "5649a3dc94f11422c944e99061cbdac1d453149f", "tree": "76c5f873d1dcaa6bc95bd654971ed1262ed00f8f", "parents": [ "d8b345dd9b212b782039ab56b0e364e95f1bf1b5" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Dec 03 16:30:36 2015 -0500" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: dm verity: factor out verity_for_bv_block()\n\nverity_for_bv_block() will be re-used by optional dm-verity object.\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: Ibb92babd75f71a829a65cc63f28acaf2c3839de0\n" }, { "commit": "d8b345dd9b212b782039ab56b0e364e95f1bf1b5", "tree": "5be2e8f875f168ace61278cba1f60e9ec9bfa767", "parents": [ "0e716b957a587fa4193623f86134ffae364628c8" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Dec 03 16:01:51 2015 -0500" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "BACKPORT: dm verity: factor out structures and functions useful to separate object\n\nPrepare for an optional verity object to make use of existing dm-verity\nstructures and functions.\n\nMerge conflicts in:\ndrivers/md/dm-verity-target.c\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: I06c5e22a7f90a136b40f91521061f445981b5872\n" }, { "commit": "0e716b957a587fa4193623f86134ffae364628c8", "tree": "164f9137d552953ce895fde7ecf4cac05c030482", "parents": [ "f647636ac46ec81361f13ef62ba7c92a0bf6ed7b" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Dec 03 15:36:00 2015 -0500" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c\n\nPrepare for extending dm-verity with an optional object. Follows the\nnaming convention used by other DM targets (e.g. dm-cache and dm-era).\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: Icc5c2802ebf2fce303d085ab5e52d825776cc436\n" }, { "commit": "f647636ac46ec81361f13ef62ba7c92a0bf6ed7b", "tree": "25a82572471d15658be3c28d358fded8ecf23edc", "parents": [ "4834f5d785c17889608ae930d414a22d25c745c5" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Nov 05 02:02:32 2015 +0000" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: dm verity: separate function for parsing opt args\n\nMove optional argument parsing into a separate function to make it\neasier to add more of them without making verity_ctr even longer.\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: I6426dc3ac7e95c3456205fdafa1078fbe9a26743\n" }, { "commit": "4834f5d785c17889608ae930d414a22d25c745c5", "tree": "31e16567a43a8c6e8238253129c89c0662979941", "parents": [ "336e299457a488dde45ca67e5e68aa1a5b6c9d4a" ], "author": { "name": "Sami Tolvanen", "email": "samitolvanen@google.com", "time": "Thu Nov 05 02:02:31 2015 +0000" }, "committer": { "name": "Badhri Jagan Sridharan", "email": "Badhri@google.com", "time": "Wed Feb 24 13:07:44 2016 -0800" }, "message": "UPSTREAM: dm verity: clean up duplicate hashing code\n\nHandle dm-verity salting in one place to simplify the code.\n\nBug: 27175947\n\nSigned-off-by: Sami Tolvanen \u003csamitolvanen@google.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Badhri Jagan Sridharan \u003cbadhri@google.com\u003e\nChange-Id: Iea337445fe4f8380cf1af0e491c7935b6db2092a\n" }, { "commit": "336e299457a488dde45ca67e5e68aa1a5b6c9d4a", "tree": "f90210e996a7d2643cb879552de876b8fc85eeff", "parents": [ "45f08da5f55fc3f85fa0bc8148e4d993f3017f2a" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Feb 24 12:44:42 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Feb 24 12:44:42 2016 -0800" }, "message": "Revert \"mmc: Extend wakelock if bus is dead\"\n\nThis reverts commit dde72f9e313fc52d467ef0aad41cecd2c9f9f212.\n" }, { "commit": "45f08da5f55fc3f85fa0bc8148e4d993f3017f2a", "tree": "554b1c50ee3fa84813d07c3adbdde1e79266a29a", "parents": [ "52cca7009d6dfedd490779e93fb80af4efbf55a1" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Feb 23 13:01:53 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Feb 23 13:01:53 2016 -0800" }, "message": "Revert \"mmc: core: Hold a wake lock accross delayed work + mmc rescan\"\n\nPatch mmc: core: Signal wakeup event at card insert/removal\nprovides wake lock for mmc_detect_change()\n\nThis reverts commit bdbc5cfe7c034175466285da10d4b2a84addd9c3.\n" }, { "commit": "52cca7009d6dfedd490779e93fb80af4efbf55a1", "tree": "ba60f0f495f7e980ee0064b74a2139f25850c508", "parents": [ "07e3edc5d7b3b64fe83caa321f1ba7d70d5daa1c" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Tue Jan 19 16:36:40 2016 -0800" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Feb 22 10:55:07 2016 -0800" }, "message": "ANDROID: mmc: move to a SCHED_FIFO thread\n\n(cherry picked from commit 011e507b413393eab8279dac8b778ad9b6e9971b)\n\nRunning mmcqd as a prio 120 thread forces it to compete with standard\nuser processes for IO performance, especially when the system is under\nsevere CPU load. Move it to a SCHED_FIFO thread to reduce the impact of\nload on IO performance.\n\nSigned-off-by: Tim Murray \u003ctimmurray@google.com\u003e\nBug: 25392275\nChange-Id: I1edfe73baa25e181367c30c1f40fee886e92b60d\n" }, { "commit": "07e3edc5d7b3b64fe83caa321f1ba7d70d5daa1c", "tree": "c3d0144444921b710ec9960a1685ced37a6ce532", "parents": [ "dc582695e70da54b0907ed74f46d01fb1072cc0c" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Sep 11 15:31:24 2015 +0100" }, "committer": { "name": "Pavel Labath", "email": "labath@google.com", "time": "Thu Feb 18 10:28:15 2016 +0000" }, "message": "UPSTREAM: arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers\n\n(cherry picked from commit e56d82a116176f7af9d642b560abbbd3a2b68013)\n\nWe have a couple of CPU hotplug notifiers for resetting the CPU debug\nstate to a sane value when a CPU comes online.\n\nThis patch ensures that we mask out CPU_TASKS_FROZEN so that we don\u0027t\nmiss any online events occuring due to suspend/resume.\n\nAcked-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\n\nSigned-off-by: Pavel Labath \u003clabath@google.com\u003e\nBug: 27189927\nChange-Id: I72549149b9bf1f0d05cb17a1db98f9a342c580c0\n" }, { "commit": "dc582695e70da54b0907ed74f46d01fb1072cc0c", "tree": "24dfadc70d305f917c92e8f60ef5760f52a7776e", "parents": [ "7b65e308f3eea338822c1bfda8f9ac009e536b7d" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Feb 10 14:44:42 2016 -0800" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Feb 10 23:15:31 2016 +0000" }, "message": "android: base-cfg: Add CONFIG_IP_MULTICAST\n\n(cherry pick from commit 1d0f72986958c2bf3528cadf7d7acf0771465fd1)\n\nSigned-off-by: Mark Salyzyn \u003csalyzyn@google.com\u003e\nBug: 19173869\nChange-Id: I4ccd6161e87df7a87f3bd990cfe1de1f7567bf4c\n" }, { "commit": "7b65e308f3eea338822c1bfda8f9ac009e536b7d", "tree": "2e2aa27e9fde9d3667b228a29db5615fee6bd141", "parents": [ "a884540f5a58461512475fa88d547160e48b55e2" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Feb 09 12:31:42 2016 -0800" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Feb 09 20:38:45 2016 +0000" }, "message": "android: recommended.cfg: enable taskstats\n\nCONFIG_TASKSTATS\u003dy\nCONFIG_TASK_DELAY_ACCT\u003dy\nCONFIG_TASK_XACCT\u003dy\nCONFIG_TASK_IO_ACCOUNTING\u003dy\n\nSigned-off-by: Mark Salyzyn \u003csalyzyn@google.com\u003e\nBug: 21334988\nBug: 26966375\nChange-Id: Id54be2aad6acdb51040ba613d5d987dd693cd591\n" }, { "commit": "a884540f5a58461512475fa88d547160e48b55e2", "tree": "bc6703cbe855c70fb927a6df8b850f4f56e8b344", "parents": [ "a4291fedcbb40d43c095b54033a156949a71f12b" ], "author": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Mon Feb 08 11:47:13 2016 +0530" }, "committer": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Mon Feb 08 11:47:13 2016 +0530" }, "message": "Revert \"usb: gadget: composite: Fix corruption when changing configuration\"\n\nThis reverts commit 4b749ddcb21c8cffd9989d200ef4a1bef7877e09.\n\nWe do not need this fix with Android ConfigFS gadgets.\n\nChange-Id: I7dffb884a49ecb2f5d619150edfa3e51808ef8cc\nSigned-off-by: Amit Pundir \u003camit.pundir@linaro.org\u003e\n" }, { "commit": "8d9db3c8417c860b9241ffaa456c743c505d945e", "tree": "ebdc19d140bd466ca6751d4e84b6b3d61834d2c2", "parents": [ "7b70a1df99084ecd51f436c9e2f1cdf9aa7c1db8" ], "author": { "name": "Xinliang Liu", "email": "xinliang.liu@linaro.org", "time": "Wed Dec 23 18:14:29 2015 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:33 2016 -0800" }, "message": "gpu/mali: fix get_unused_fd build issue\n\nNew kernel should use get_unused_fd_flags instead of get_unused_fd.\n\nSigned-off-by: Xinliang Liu \u003cxinliang.liu@linaro.org\u003e\n" }, { "commit": "7b70a1df99084ecd51f436c9e2f1cdf9aa7c1db8", "tree": "e23b646082daae0e45eb7ba92ffb0ff3dd150014", "parents": [ "f7364ab617b5ae9bbc44b7efa255ef39049dfd3c" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Nov 10 13:39:46 2015 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:32 2016 -0800" }, "message": "mali_hikey: Modify irq initialization in mali hikey platform logic\n\nDue to the irq domain code landing upstream in 3.19, the logic\nfor requesting irqs in the hikey platform code no longer works.\n\nThis patch tries to sovle the issue by using platform_irq_get\nto fetch irq details from the DT entry (which properly sets up\nthe irq through the GIC), and then re-writes the static tables\nso irq code gets the right irq number.\n\nThis patch cheats a bit, since it only calls platform_irq_get()\nonce on the first interrupt value in the DT, but that\u0027s because\nthe mali device shares interrupts.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "f7364ab617b5ae9bbc44b7efa255ef39049dfd3c", "tree": "c91e66209899a919080a58d6a8899f80f728c712", "parents": [ "470676f54761f294784b26637a5cfa447ccef1ee" ], "author": { "name": "xinliang.liu", "email": "xinliang.liu@linaro.org", "time": "Mon Jun 08 19:27:38 2015 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:32 2016 -0800" }, "message": "drivers/gpu/arm/utgard: Disable fbdev physical address check\n\nhikey don\u0027t specific the base of fbdev reserve memery.\nThe reserve mememery is allocate dymanic, so it doesn\u0027t\nneed a check.\n\nSigned-off-by: xinliang.liu \u003cxinliang.liu@linaro.org\u003e\n" }, { "commit": "470676f54761f294784b26637a5cfa447ccef1ee", "tree": "547452c69eb61f5370ea2972ba53398dcd1134bd", "parents": [ "003d394e38cedc4c6ffd0a71125b1d90ee8f27b7" ], "author": { "name": "Scott Bambrough", "email": "scott.bambrough@linaro.org", "time": "Wed Apr 01 10:01:11 2015 -0400" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:31 2016 -0800" }, "message": "drivers/gpu: arm/utgard: Fix build issue.\n\nThe following statement doesn\u0027t have consistent behaviour on all machines:\n$(wildcard $(src)/linux/license/gpl/*)\nOn some it actually returns the name of the GPL header file, on others it is a blank string.\nSince the driver is in-tree, we can assume GPL compliance.\n" }, { "commit": "003d394e38cedc4c6ffd0a71125b1d90ee8f27b7", "tree": "5faecc17d942680a861c913521d9e4d5154a48a9", "parents": [ "a7276d6df79404f033075eca50370b16d692336c" ], "author": { "name": "Guillaume Tucker", "email": "guillaume.tucker@arm.com", "time": "Fri Feb 20 15:43:19 2015 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:30 2016 -0800" }, "message": "drivers/gpu/arm/utgard: add basic HiKey platform files\n\nAdd Mali Utgard GPU driver platform files to support the\nHiKey board (HI6220), based on the Balong platform.\n\nNote: GPU DVFS is not implemented and a custom Device Tree\n entry is needed by these platform files. This is a\n first working version that needs to be improved.\n\nSigned-off-by: Guillaume Tucker \u003cguillaume.tucker@arm.com\u003e\n[jstultz: Build fixes]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "a7276d6df79404f033075eca50370b16d692336c", "tree": "2e49c6d5791fae0841a833714a9df512e665b349", "parents": [ "12c1ba4058ffb825bdbafb24e833b4dc6356b241" ], "author": { "name": "Guillaume Tucker", "email": "guillaume.tucker@arm.com", "time": "Mon Mar 02 16:20:25 2015 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:30 2016 -0800" }, "message": "drivers/gpu/arm/utgard: add Hi6220 register definitions\n\nAdd mali_hikey_hi6220_registers_gpu.h with the list of Hi6220 SoC\nregisters that are needed to use the Mali Utgard GPU.\n\nSigned-off-by: Guillaume Tucker \u003cguillaume.tucker@arm.com\u003e\n" }, { "commit": "12c1ba4058ffb825bdbafb24e833b4dc6356b241", "tree": "1e86aff38f3886eec52c92597a0a23cf2fbbd3fa", "parents": [ "b6ee9bc31cd139fd8feb8f0a7963f5af98b46691" ], "author": { "name": "Guillaume Tucker", "email": "guillaume.tucker@arm.com", "time": "Mon Feb 23 11:52:29 2015 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:29 2016 -0800" }, "message": "drivers/gpu/arm/utgard: add option for custom device tree\n\nSome Mali 450 Utgard GPU platform integration files like\nthe HiKey need a custom Device Tree entry. This config\noption is to disable the standard driver code that expects\nthings in the device tree which conflict with what the\nplatform files need.\n\nThis is only an interim solution, tne platform files should\nreally be tidied-up to enable the standard device tree\ninstead (would require adding more IRQ and other resources).\n\nSigned-off-by: Guillaume Tucker \u003cguillaume.tucker@arm.com\u003e\n" }, { "commit": "b6ee9bc31cd139fd8feb8f0a7963f5af98b46691", "tree": "494a811a9f69f79c213d57955e9d8d9b0d77c765", "parents": [ "e718041d13e35f8d0ee162f959a899aa1f6de72c" ], "author": { "name": "Xinliang Liu", "email": "xinliang.liu@linaro.org", "time": "Wed Dec 23 17:32:42 2015 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:29 2016 -0800" }, "message": "drivers/gpu: update ARM Mali Utgard to r6p0 driver\n\nAdd ARM Mali Utgard driver from this release:\nDX910-SW-99002-r6p0-01rel0\n\nThis is a direct file drop from the public release original archive.\n\nSigned-off-by: Xinliang Liu \u003cxinliang.liu@linaro.org\u003e\n" }, { "commit": "e718041d13e35f8d0ee162f959a899aa1f6de72c", "tree": "fdda34290603d7a150a9d051ebac2f48b36e38e5", "parents": [ "fdf903e81ea0564f7843c7249f7a7243693fe06d" ], "author": { "name": "Xinliang Liu", "email": "xinliang.liu@linaro.org", "time": "Mon Dec 21 16:31:50 2015 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:28 2016 -0800" }, "message": "drm/hisilicon: dsi: Reset dsi when detect dsi transfer error\n\nThis is a workaround for bootup blanking issue.\nHDMI can detect dsi transfer error, when this error happened\nreseting dsi can bring display to normal.\n\nSigned-off-by: Xinliang Liu \u003cxinliang.liu@linaro.org\u003e\n" }, { "commit": "fdf903e81ea0564f7843c7249f7a7243693fe06d", "tree": "e6f25f9d9968611a5c560b97d238c74f1e27a8f7", "parents": [ "cd1de16487296f65121e0aee7b528301af4db453" ], "author": { "name": "Xinliang Liu", "email": "xinliang.liu@linaro.org", "time": "Wed Dec 23 16:51:46 2015 +0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 19:32:28 2016 -0800" }, "message": "drm/hisilicon: Clear underflow irq\n\nSigned-off-by: Xinliang Liu \u003cxinliang.liu@linaro.org\u003e\n" }, { "commit": "cd1de16487296f65121e0aee7b528301af4db453", "tree": "88f9057b58c7e8f3095af9614ddc5a8c45266b0c", "parents": [ "9a591fb9ffbe4fc59a0992c19ef830dc118527b4" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 15:16:28 2016 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 02 15:21:17 2016 -0800" }, "message": "hikey_defconfig: Enable HID_APPLE to support apple bluetooth keyboards\n\nAfter chasing my tail for a bit, I realized my cheap 3rd party bt\nkeyboard was targetted as an ipad keyboard, and thus tries to\nbehave like an apple keyboard.\n\nAdding support for HID_APPLE resolves the issues I was seeing with\nbt keyboards not working.\n\nChange-Id: I3112b32a7c1cd0ba1b8fea0c79268a9d3803cfdd\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "a4291fedcbb40d43c095b54033a156949a71f12b", "tree": "d2433805e70734f0e9e87bdd2eb321d713e44de5", "parents": [ "b43f700a268c2262d95a44b2270f5358b7cba174" ], "author": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Thu Jan 28 14:12:20 2016 +0530" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Mon Feb 01 13:52:30 2016 -0800" }, "message": "Revert \"net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option\"\n\nThis reverts commit ae06550aade22de89e84a69d543ade8b31dd9f10.\n\nWIFI_CONTROL_FUNC config is not used anywhere in android-3.10+\nkernels. Its usage can be last tracked to BCMDHD wireless driver\nin android-3.4 kernel.\n\nChange-Id: I8092bf10b70dd84a9bb3aade4aca80891742d504\nSigned-off-by: Amit Pundir \u003camit.pundir@linaro.org\u003e\n" }, { "commit": "9a591fb9ffbe4fc59a0992c19ef830dc118527b4", "tree": "e26f50f681a562b927b06ca6b1047dc61bcc6e17", "parents": [ "7770981554ead4f1c246df510bd299dec112d7f3" ], "author": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Sun Jan 31 18:16:50 2016 -0800" }, "committer": { "name": "Jeffrey Vander Stoep", "email": "jeffv@google.com", "time": "Mon Feb 01 02:35:09 2016 +0000" }, "message": "hikey_defconfig: disable devtmpfs\n\nSelinux file labeling of /dev is done by ueventd. Devtmpfs may also create\nfiles in /dev without properly labeling - leading to a race condition\nwhere files are accessed before labeling or created after labeling.\nDisabling devtmpfs such that all file creation in /dev is done by ueventd\nresolves these issues.\n\nAddresses:\navc: denied { write } for name\u003d\"/\" dev\u003d\"devtmpfs\" ino\u003d1025 scontext\u003du:r:kernel:s0 tcontext\u003du:object_r:device:s0 tclass\u003ddir\navc: denied { mknod } for capability\u003d27 scontext\u003du:r:kernel:s0 tcontext\u003du:r:kernel:s0 tclass\u003dcapability\navc: denied { add_name } for name\u003d\"usb_accessory\" scontext\u003du:r:kernel:s0 tcontext\u003du:object_r:device:s0 tclass\u003ddir\navc: denied { create } for name\u003d\"usb_accessory\" scontext\u003du:r:kernel:s0 tcontext\u003du:object_r:device:s0 tclass\u003dchr_file\navc: denied { setattr } for name\u003d\"usb_accessory\" dev\u003d\"devtmpfs\" ino\u003d2082 scontext\u003du:r:kernel:s0 tcontext\u003du:object_r:device:s0 tclass\u003dchr_file\n\nChange-Id: Iccc06afb035339ba82a9bdd323b14a17d6ee864f\n" }, { "commit": "7770981554ead4f1c246df510bd299dec112d7f3", "tree": "6ff030ca61c5949f892ecde4ae2d92fb7174f5f7", "parents": [ "c0e6b254ce11336085d536e2ab184012fb8c7583" ], "author": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Sat Jan 30 07:36:20 2016 -0800" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Sat Jan 30 07:36:20 2016 -0800" }, "message": "hikey_defconfig: remove SYSVIPC\n\nSystem V IPCs are not compliant with Android\u0027s application lifecycle\nbecause allocated resources are not freeable by the low memory killer.\nThis lead to global kernel resource leakage.\n\nFor example, there is no way to automatically release a SysV\nsemaphore allocated in the kernel when:\n- a buggy or malicious process exits\n- a non-buggy and non-malicious process crashes or is explicitly\n killed.\n\nKilling processes automatically to make room for new ones is an\nimportant part of Android\u0027s application lifecycle implementation.\nThis means that, even assuming only non-buggy and non-malicious\ncode, it is very likely that over time, the kernel global tables\nused to implement SysV IPCs will fill up.\n\nBug: 22300191\nBug: 24551430\nSigned-off-by: Jeff Vander Stoep \u003cjeffv@google.com\u003e\n" }, { "commit": "c0e6b254ce11336085d536e2ab184012fb8c7583", "tree": "4530cf878d0e8e946516a4b68d1fac93aafa3bca", "parents": [ "f02330d48efb97b4e13e708e8d93dc337c247563" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 27 10:25:24 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 27 10:25:54 2016 -0800" }, "message": "hikey: Adjust SquashFS configuration\n\nCONFIG_SQUASHFS_FILE_DIRECT\u003dy\nCONFIG_SQUASHFS_DECOMP_MULTI_PERCPU\u003dy\nCONFIG_SQUASHFS_XATTR\u003dy\nCONFIG_SQUASHFS_LZ4\u003dy\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n" }, { "commit": "b43f700a268c2262d95a44b2270f5358b7cba174", "tree": "ce924103634d9e1f7d15f9acdd3851e935e0197a", "parents": [ "2e9d4f240193f46048a8f811684be0a036c18dd0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 05 13:42:07 2015 +0000" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 10:11:34 2016 -0800" }, "message": "UPSTREAM: ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN\n\nThe uaccess_with_memcpy() code is currently incompatible with the SW\nPAN code: it takes locks within the region that we\u0027ve changed the DACR,\npotentially sleeping as a result. As we do not save and restore the\nDACR across co-operative sleep events, can lead to an incorrect DACR\nvalue later in this code path.\n\nReported-by: Peter Rosin \u003cpeda@axentia.se\u003e\nTested-by: Peter Rosin \u003cpeda@axentia.se\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\n(cherry picked from commit c014953d84ec21a4df9a43be2378861ea6e9246e)\nChange-Id: I9c9d1789cb69dcb6ecd1e4055833a5dfebe2045e\n" }, { "commit": "2e9d4f240193f46048a8f811684be0a036c18dd0", "tree": "dcf26e2c016130efdc54720eb3078704ff441f7d", "parents": [ "6588b7fe09f583f92407ca90630f9f9a5e4a32f2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Sep 23 11:06:30 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:28:20 2016 -0800" }, "message": "UPSTREAM: ARM: alignment: fix alignment handling for uaccess changes\n\nJonathan Liu reports that the recent addition of CPU_SW_DOMAIN_PAN\ncauses wpa_supplicant to die due to the following kernel oops:\n\nUnhandled fault: page domain fault (0x81b) at 0x001017a2\npgd \u003d ee1b8000\n[001017a2] *pgd\u003d6ebee831, *pte\u003d6c35475f, *ppte\u003d6c354c7f\nInternal error: : 81b [#1] SMP ARM\nModules linked in: rt2800usb rt2x00usb rt2800librt2x00lib crc_ccitt mac80211\nCPU: 1 PID: 202 Comm: wpa_supplicant Not tainted 4.3.0-rc2 #1\nHardware name: Allwinner sun7i (A20) Family\ntask: ec872f80 ti: ee364000 task.ti: ee364000\nPC is at do_alignment_ldmstm+0x1d4/0x238\nLR is at 0x0\npc : [\u003cc001d1d8\u003e] lr : [\u003c00000000\u003e] psr: 600c0113\nsp : ee365e18 ip : 00000000 fp : 00000002\nr10: 001017a2 r9 : 00000002 r8 : 001017aa\nr7 : ee365fb0 r6 : e8820018 r5 : 001017a2 r4 : 00000003\nr3 : d49e30e0 r2 : 00000000 r1 : ee365fbc r0 : 00000000\nFlags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none[ 34.393106] Control: 10c5387d Table: 6e1b806a DAC: 00000051\nProcess wpa_supplicant (pid: 202, stack limit \u003d 0xee364210)\nStack: (0xee365e18 to 0xee366000)\n...\n[\u003cc001d1d8\u003e] (do_alignment_ldmstm) from [\u003cc001d510\u003e] (do_alignment+0x1f0/0x904)\n[\u003cc001d510\u003e] (do_alignment) from [\u003cc00092a0\u003e] (do_DataAbort+0x38/0xb4)\n[\u003cc00092a0\u003e] (do_DataAbort) from [\u003cc0013d7c\u003e] (__dabt_usr+0x3c/0x40)\nException stack(0xee365fb0 to 0xee365ff8)\n5fa0: 00000000 56c728c0 001017a2 d49e30e0\n5fc0: 775448d2 597d4e74 00200800 7a9e1625 00802001 00000021 b6deec84 00000100\n5fe0: 08020200 be9f4f20 0c0b0d0a b6d9b3e0 600c0010 ffffffff\nCode: e1a0a005 e1a0000c 1affffe8 e5913000 (e4ea3001)\n---[ end trace 0acd3882fcfdf9dd ]---\n\nThis is caused by the alignment handler not being fixed up for the\nuaccess changes, and userspace issuing an unaligned LDM instruction.\nSo, fix the problem by adding the necessary fixups.\n\nReported-by: Jonathan Liu \u003cnet147@gmail.com\u003e\nTested-by: Jonathan Liu \u003cnet147@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 274e91b81ed22957b510ad2988359584eea95dae)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I804b6a6d037ef1603565f98decee9190e19b03d6\n" }, { "commit": "6588b7fe09f583f92407ca90630f9f9a5e4a32f2", "tree": "9d87ea283613c8df3417c2b89e660a4bc9dfbf65", "parents": [ "a410153a08c71144474d76c7a2d3bae1b295ebf1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Aug 19 20:40:41 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:28:12 2016 -0800" }, "message": "UPSTREAM: ARM: software-based priviledged-no-access support\n\nProvide a software-based implementation of the priviledged no access\nsupport found in ARMv8.1.\n\nUserspace pages are mapped using a different domain number from the\nkernel and IO mappings. If we switch the user domain to \"no access\"\nwhen we enter the kernel, we can prevent the kernel from touching\nuserspace.\n\nHowever, the kernel needs to be able to access userspace via the\nvarious user accessor functions. With the wrapping in the previous\npatch, we can temporarily enable access when the kernel needs user\naccess, and re-disable it afterwards.\n\nThis allows us to trap non-intended accesses to userspace, eg, caused\nby an inadvertent dereference of the LIST_POISON* values, which, with\nappropriate user mappings setup, can be made to succeed. This in turn\ncan allow use-after-free bugs to be further exploited than would\notherwise be possible.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit a5e090acbf545c0a3b04080f8a488b17ec41fe02)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: Ic57a2969ba8199fab04fc657f15777422be3b2fa\n" }, { "commit": "a410153a08c71144474d76c7a2d3bae1b295ebf1", "tree": "cb227bdce4a5ccc07abc6b07b35fd405bbfdf068", "parents": [ "bad6c993d9ebd088c16f3249e4c8bc2af1d1fc7e" ], "author": { "name": "Robert Jarzmik", "email": "robert.jarzmik@free.fr", "time": "Fri Sep 11 17:12:27 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:28:04 2016 -0800" }, "message": "UPSTREAM: ARM: 8431/1: fix alignement of __bug_table section entries\n\nOn old ARM chips, unaligned accesses to memory are not trapped and\nfixed. On module load, symbols are relocated, and the relocation of\n__bug_table symbols is done on a u32 basis. Yet the section is not\naligned to a multiple of 4 address, but to a multiple of 2.\n\nThis triggers an Oops on pxa architecture, where address 0xbf0021ea\nis the first relocation in the __bug_table section :\n apply_relocate(): pxa3xx_nand: section 13 reloc 0 sym \u0027\u0027\n Unable to handle kernel paging request at virtual address bf0021ea\n pgd \u003d e1cd0000\n [bf0021ea] *pgd\u003dc1cce851, *pte\u003dc1cde04f, *ppte\u003dc1cde01f\n Internal error: Oops: 23 [#1] ARM\n Modules linked in:\n CPU: 0 PID: 606 Comm: insmod Not tainted 4.2.0-rc8-next-20150828-cm-x300+ #887\n Hardware name: CM-X300 module\n task: e1c68700 ti: e1c3e000 task.ti: e1c3e000\n PC is at apply_relocate+0x2f4/0x3d4\n LR is at 0xbf0021ea\n pc : [\u003cc000e7c8\u003e] lr : [\u003cbf0021ea\u003e] psr: 80000013\n sp : e1c3fe30 ip : 60000013 fp : e49e8c60\n r10: e49e8fa8 r9 : 00000000 r8 : e49e7c58\n r7 : e49e8c38 r6 : e49e8a58 r5 : e49e8920 r4 : e49e8918\n r3 : bf0021ea r2 : bf007034 r1 : 00000000 r0 : bf000000\n Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none\n Control: 0000397f Table: c1cd0018 DAC: 00000051\n Process insmod (pid: 606, stack limit \u003d 0xe1c3e198)\n [\u003cc000e7c8\u003e] (apply_relocate) from [\u003cc005ce5c\u003e] (load_module+0x1248/0x1f5c)\n [\u003cc005ce5c\u003e] (load_module) from [\u003cc005dc54\u003e] (SyS_init_module+0xe4/0x170)\n [\u003cc005dc54\u003e] (SyS_init_module) from [\u003cc000a420\u003e] (ret_fast_syscall+0x0/0x38)\n\nFix this by ensuring entries in __bug_table are all aligned to at least\nof multiple of 4. This transforms a module section __bug_table as :\n- [12] __bug_table PROGBITS 00000000 002232 000018 00 A 0 0 1\n+ [12] __bug_table PROGBITS 00000000 002232 000018 00 A 0 0 4\n\nSigned-off-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nReviewed-by: Dave Martin \u003cDave.Martin@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit a4a5a7379e4ca03c192b732d61e446994eb67bbc)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I0ea8e41d6f71e177b37160487c8b26ff8bea37c5\n" }, { "commit": "bad6c993d9ebd088c16f3249e4c8bc2af1d1fc7e", "tree": "a364b79573853e97c43cf39abb4432066f4c79af", "parents": [ "4fe92225a5024052f095e9e24dce9242a5ad3007" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Sep 11 08:34:52 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:27:56 2016 -0800" }, "message": "UPSTREAM: ARM: domains: add memory dependencies to get_domain/set_domain\n\nWe need to have memory dependencies on get_domain/set_domain to avoid\nthe compiler over-optimising these inline assembly instructions.\n\nLoads/stores must not be reordered across a set_domain(), so introduce\na compiler barrier for that assembly.\n\nThe value of get_domain() must not be cached across a set_domain(), but\nwe still want to allow the compiler to optimise it away. Introduce a\ndependency on current_thread_info()-\u003ecpu_domain to avoid this; the new\nmemory clobber in set_domain() should therefore cause the compiler to\nre-load this. The other advantage of using this is we should have its\naddress in the register set already, or very soon after at most call\nsites.\n\nTested-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 6e8f580d1fcc18e290713984c379cb97131c015a)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I44021c2e0af72a2f20bab4d5af7d67d20ca0a211\n" }, { "commit": "4fe92225a5024052f095e9e24dce9242a5ad3007", "tree": "4c18402d209b0952e354d2b129e73da19bdf0a5b", "parents": [ "b59db83c6edc5e9c48ea4ddaaaa7cd7f174df3a5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Sep 11 08:17:39 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:27:38 2016 -0800" }, "message": "UPSTREAM: ARM: domains: thread_info.h no longer needs asm/domains.h\n\nAs of 1eef5d2f1b46 (\"ARM: domains: switch to keeping domain value in\nregister\") we no longer need to include asm/domains.h into\nasm/thread_info.h. Remove it.\n\nTested-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 716ff1921a86c637b8875c7bb312fc6755fa9300)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I35ba6851bd5d1e688e8d16771efd3f738dbd5436\n" }, { "commit": "b59db83c6edc5e9c48ea4ddaaaa7cd7f174df3a5", "tree": "12d7d182b250f0050f1cc7e4e28987b3a6ab2842", "parents": [ "0e18e5355bb66e54159bb685e2766779aa75ac74" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Sep 09 21:19:49 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:27:29 2016 -0800" }, "message": "UPSTREAM: ARM: uaccess: fix undefined instruction on ARMv7M/noMMU\n\nThe use of get_domain() in copy_thread() results in an oops on\nARMv7M/noMMU systems. The thread cpu_domain value is only used when\nCONFIG_CPU_USE_DOMAINS is enabled, so there\u0027s no need to save the\nvalue in copy_thread() except when this is enabled, and this option\nwill never be enabled on these platforms.\n\nUnhandled exception: IPSR \u003d 00000006 LR \u003d fffffff1\nCPU: 0 PID: 0 Comm: swapper Not tainted 4.2.0-next-20150909-00001-gb8ec5ad #41\nHardware name: NXP LPC18xx/43xx (Device Tree)\ntask: 2823fbe0 ti: 2823c000 task.ti: 2823c000\nPC is at copy_thread+0x18/0x92\nLR is at copy_thread+0x19/0x92\npc : [\u003c2800a46e\u003e] lr : [\u003c2800a46f\u003e] psr: 4100000b\nsp : 2823df00 ip : 00000000 fp : 287c81c0\nr10: 00000000 r9 : 00800300 r8 : 287c8000\nr7 : 287c8000 r6 : 2818908d r5 : 00000000 r4 : 287ca000\nr3 : 00000000 r2 : 00000000 r1 : fffffff0 r0 : 287ca048\nxPSR: 4100000b\n\nReported-by: Ariel D\u0027Alessandro \u003cariel@vanguardiasur.com.ar\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit af4cb25df93d2e7a97d65db2bfacaa4400988dea)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I2aa2bf6c1153732c68919ff465ada7878d327310\n" }, { "commit": "0e18e5355bb66e54159bb685e2766779aa75ac74", "tree": "e984ab911925eff8754acc9eb1f64ffa4df8ab03", "parents": [ "6cc9b9815f2f100499f7934aca1a214fedc7de68" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 07 00:30:06 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:27:16 2016 -0800" }, "message": "UPSTREAM: ARM: uaccess: remove unneeded uaccess_save_and_disable macro\n\nThis macro is never referenced, remove it.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 296254f3223d201f2aa53f5f717eedfdc63f3db8)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I647251a8c51c81c2b89cc0cd35a5f60eba1a4855\n" }, { "commit": "6cc9b9815f2f100499f7934aca1a214fedc7de68", "tree": "21a0c4ba5d17f5065c270dd272a9642d92212a75", "parents": [ "7d8fb5cf801ae6f92dca85bb32cfe29a707faece" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 07 00:29:15 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:26:38 2016 -0800" }, "message": "UPSTREAM: ARM: swpan: fix nwfpe for uaccess changes\n\nNWFPE needs to access userspace to check whether the next instruction\nis another FP instruction. Allow userspace access for this read.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 39dc53deff30d9b239ac36cfeb0ef2022d03a449)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: Ia9a0fd707d14f8a8f4b181a210a8e27fabd9060d\n" }, { "commit": "7d8fb5cf801ae6f92dca85bb32cfe29a707faece", "tree": "e610d66ebe99f8e6b1b1c4b0558f788443015865", "parents": [ "9a1f6e83b6a0197f0c4cdc6e289865a8ab6ed4eb" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 21 09:42:10 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:26:28 2016 -0800" }, "message": "UPSTREAM: ARM: domains: remove DOMAIN_TABLE\n\nDOMAIN_TABLE is not used; in any case, it aliases to the kernel domain.\nRemove this definition.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 1fb6755f16872ad256c18cce2830f9087502dffd)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I87e5aabbd57de2f6b6d96ac1ed6d1e85ceda4ed6\n" }, { "commit": "9a1f6e83b6a0197f0c4cdc6e289865a8ab6ed4eb", "tree": "dcab2e39506f40af9c6841ccf33af5837df04d05", "parents": [ "b2cfef831e74fe04838e29c6d254b6d99a3dc614" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 21 09:38:31 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:26:15 2016 -0800" }, "message": "UPSTREAM: ARM: domains: keep vectors in separate domain\n\nKeep the machine vectors in its own domain to avoid software based\nuser access control from making the vector code inaccessible, and\nthereby deadlocking the machine.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit a02d8dfd54cdf3b1b0464ccc2c1c4afe2c003a35)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I2f912a55c606a08b9e123de2819bc77f8dac955b\n" }, { "commit": "b2cfef831e74fe04838e29c6d254b6d99a3dc614", "tree": "13aafb509132e5ef2f3e53237973678057a3ea54", "parents": [ "ab4e6d754114b8bfe3e26766b3eeb226fd951b69" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 21 09:30:16 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:26:00 2016 -0800" }, "message": "UPSTREAM: ARM: domains: get rid of manager mode for user domain\n\nSince we switched to early trap initialisation in 94e5a85b3be0\n(\"ARM: earlier initialization of vectors page\") we haven\u0027t been writing\ndirectly to the vectors page, and so there\u0027s no need for this domain\nto be in manager mode. Switch it to client mode.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 3c2aed5b28819564e1a07b4686bd89802bcc4d6b)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I6a31f15cd3cc8d431ee50fcc041e95becf2ed7df\n" }, { "commit": "ab4e6d754114b8bfe3e26766b3eeb226fd951b69", "tree": "71129b96a32ea9b5fe49affad247e77a6288a354", "parents": [ "07127c1717bfc572a259e5ccdc9d452e4da5bb08" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 21 09:23:26 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:25:47 2016 -0800" }, "message": "BACKPORT: ARM: domains: move initial domain setting value to asm/domains.h\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 0171356a7708af01ad3224702b7f0aaa5b7a1399)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nConflicts:\n\tarch/arm/kernel/head.S\n\nChange-Id: If8fb66d8887e88c2e8a576b9855225df6ddb3471\n" }, { "commit": "07127c1717bfc572a259e5ccdc9d452e4da5bb08", "tree": "7b4593e2a8d7a7e010eb4a62f2325252504b2ee0", "parents": [ "f1806e08194739e8c13ec39d8c2a38e9ec2a2ea8" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Aug 19 22:36:24 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:25:29 2016 -0800" }, "message": "UPSTREAM: ARM: domains: provide domain_mask()\n\nProvide a macro to generate the mask for a domain, rather than using\ndomain_val(, DOMAIN_MANAGER) which won\u0027t work when CPU_USE_DOMAINS\nis turned off.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 8e798706f7e9cd7f096aa194de90269dde83773e)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I3f732beb6f8d094648636c6030c47115382c6dd7\n" }, { "commit": "f1806e08194739e8c13ec39d8c2a38e9ec2a2ea8", "tree": "9b79cdbc6871ca67681998a6ca2bc7a7980025f4", "parents": [ "591eba9c503f592b4b3467bd65391d6bc4676c7e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Aug 19 21:23:48 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:25:19 2016 -0800" }, "message": "UPSTREAM: ARM: domains: switch to keeping domain value in register\n\nRather than modifying both the domain access control register and our\nper-thread copy, modify only the domain access control register, and\nuse the per-thread copy to save and restore the register over context\nswitches. We can also avoid the explicit initialisation of the\ninit thread_info structure.\n\nThis allows us to avoid needing to gain access to the thread information\nat the uaccess control sites.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 1eef5d2f1b461c120bcd82077edee5ec706ac53b)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: If903ec86006c4de1a440bf918c5d2491e34ade05\n" }, { "commit": "591eba9c503f592b4b3467bd65391d6bc4676c7e", "tree": "fcd30d7eae34943f828bf40dca3be8e03e03973c", "parents": [ "9b980da7c20bf852483f7d1324fa95fa4e9d19c8" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Aug 19 11:02:28 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:24:58 2016 -0800" }, "message": "UPSTREAM: ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore()\n\nProvide uaccess_save_and_enable() and uaccess_restore() to permit\ncontrol of userspace visibility to the kernel, and hook these into\nthe appropriate places in the kernel where we need to access\nuserspace.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 3fba7e23f754a9a6e639b640fa2a393712ffe1b8)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I0a43fd4f18edb95b47dc1ec622ec37bea8018663\n" }, { "commit": "9b980da7c20bf852483f7d1324fa95fa4e9d19c8", "tree": "2b11d04d4b6cfc931cd7687e59517196ce6198e2", "parents": [ "1d2d8b218624c388338aff4fd2feadb4bcb2c7c8" ], "author": { "name": "David Hildenbrand", "email": "dahi@linux.vnet.ibm.com", "time": "Mon May 11 17:52:16 2015 +0200" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:24:47 2016 -0800" }, "message": "UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_op_inuser() explicitly\n\nThe !CONFIG_SMP implementation of futex_atomic_op_inuser() seems to rely\non disabled preemption to guarantee mutual exclusion.\n\nFrom commit e589ed23dd27 (\"[ARM] 5218/1: arm: improved futex support\"):\n\n \"For UP it\u0027s enough to disable preemption to ensure mutual exclusion...\"\n\nFrom the code itself:\n\n \"!SMP, we can work around lack of atomic ops by disabling preemption\"\n\nLet\u0027s make this explicit, to prepare for pagefault_disable() not\ntouching preemption anymore.\n\nReviewed-and-tested-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Hildenbrand \u003cdahi@linux.vnet.ibm.com\u003e\nSigned-off-by: Peter Zijlstra (Intel) \u003cpeterz@infradead.org\u003e\nCc: David.Laight@ACULAB.COM\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: airlied@linux.ie\nCc: akpm@linux-foundation.org\nCc: benh@kernel.crashing.org\nCc: bigeasy@linutronix.de\nCc: borntraeger@de.ibm.com\nCc: daniel.vetter@intel.com\nCc: heiko.carstens@de.ibm.com\nCc: herbert@gondor.apana.org.au\nCc: hocko@suse.cz\nCc: hughd@google.com\nCc: mst@redhat.com\nCc: paulus@samba.org\nCc: ralf@linux-mips.org\nCc: schwidefsky@de.ibm.com\nCc: yang.shi@windriver.com\nLink: http://lkml.kernel.org/r/1431359540-32227-12-git-send-email-dahi@linux.vnet.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 388b0e0adbc98a1b12a077dc92851a3ce016db42)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I6a50b38852b18d90315040fa8fd66ea8cc0f3aa7\n" }, { "commit": "1d2d8b218624c388338aff4fd2feadb4bcb2c7c8", "tree": "6c027ef376788d719b79b17297aa5f2cb6aed777", "parents": [ "fdc83cef58776960501c800dac1cd07dd0c7d52d" ], "author": { "name": "David Hildenbrand", "email": "dahi@linux.vnet.ibm.com", "time": "Mon May 11 17:52:15 2015 +0200" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:24:37 2016 -0800" }, "message": "UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly\n\nThe !CONFIG_SMP implementation of futex_atomic_cmpxchg_inatomic()\nrequires preemption to be disabled to guarantee mutual exclusion.\nLet\u0027s make this explicit.\n\nThis patch is based on a patch by Sebastian Andrzej Siewior on the\n-rt branch.\n\nReviewed-and-tested-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Hildenbrand \u003cdahi@linux.vnet.ibm.com\u003e\nSigned-off-by: Peter Zijlstra (Intel) \u003cpeterz@infradead.org\u003e\nCc: David.Laight@ACULAB.COM\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: airlied@linux.ie\nCc: akpm@linux-foundation.org\nCc: benh@kernel.crashing.org\nCc: bigeasy@linutronix.de\nCc: borntraeger@de.ibm.com\nCc: daniel.vetter@intel.com\nCc: heiko.carstens@de.ibm.com\nCc: herbert@gondor.apana.org.au\nCc: hocko@suse.cz\nCc: hughd@google.com\nCc: mst@redhat.com\nCc: paulus@samba.org\nCc: ralf@linux-mips.org\nCc: schwidefsky@de.ibm.com\nCc: yang.shi@windriver.com\nLink: http://lkml.kernel.org/r/1431359540-32227-11-git-send-email-dahi@linux.vnet.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 39919b01ae4c1949736b40b79e27178d0c0bc406)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: Iaf1f4cb9b81607be9835ee8bb53d11cec36089d7\n" }, { "commit": "fdc83cef58776960501c800dac1cd07dd0c7d52d", "tree": "911de05c16326ff18ef121227856a6527ffe0074", "parents": [ "7e2ab218b8a652cb364e0954c728fdcc33e09a53" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 18 23:06:25 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:24:26 2016 -0800" }, "message": "UPSTREAM: ARM: uaccess: simplify user access assembly\n\nThe user assembly for byte and word accesses was virtually identical.\nRather than duplicating this, use a macro instead.\n\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit b64d1f66517a89b9b0f6bd0bca86b05a55a5e742)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: Ica8078048d18285a7adaffc7825a0ef5ab817ac8\n" }, { "commit": "7e2ab218b8a652cb364e0954c728fdcc33e09a53", "tree": "898fbcafe254af33335038ba8bf7d30fb575e4e3", "parents": [ "278aaf4ed89b77d7c9fb2201bddda6fb987c1ebf" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 20 10:32:02 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:24:11 2016 -0800" }, "message": "UPSTREAM: ARM: entry: provide uaccess assembly macro hooks\n\nProvide hooks into the kernel entry and exit paths to permit control\nof userspace visibility to the kernel. The intended use is:\n\n- on entry to kernel from user, uaccess_disable will be called to\n disable userspace visibility\n- on exit from kernel to user, uaccess_enable will be called to\n enable userspace visibility\n- on entry from a kernel exception, uaccess_save_and_disable will be\n called to save the current userspace visibility setting, and disable\n access\n- on exit from a kernel exception, uaccess_restore will be called to\n restore the userspace visibility as it was before the exception\n occurred.\n\nThese hooks allows us to keep userspace visibility disabled for the\nvast majority of the kernel, except for localised regions where we\nwant to explicitly access userspace.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 2190fed67ba6f3e8129513929f2395843645e928)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: I167ccd396ff29f87d15ea910f55f9d0b65c9a1b2\n" }, { "commit": "278aaf4ed89b77d7c9fb2201bddda6fb987c1ebf", "tree": "db1ac2de40f4862c338156c71dd865af582469cd", "parents": [ "d4820ee1c7071966fa95543e60f9ed34ad7d47cf" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Aug 26 20:07:25 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:23:57 2016 -0800" }, "message": "UPSTREAM: ARM: entry: get rid of multiple macro definitions\n\nThe following structure is just asking for trouble:\n\n #ifdef CONFIG_symbol\n\t.macro foo\n\t...\n\t.endm\n\t.macro bar\n\t...\n\t.endm\n\t.macro baz\n\t...\n\t.endm\n #else\n\t.macro foo\n\t...\n\t.endm\n\t.macro bar\n\t...\n\t.endm\n #ifdef CONFIG_symbol2\n\t.macro baz\n\t...\n\t.endm\n #else\n\t.macro baz\n\t...\n\t.endm\n #endif\n #endif\n\nsuch as one defintion being updated, but the other definitions miss out.\nWhere the contents of a macro needs to be conditional, the hint is in\nthe first clause of this very sentence. \"contents\" \"conditional\". Not\nmultiple separate definitions, especially not when much of the macro\nis the same between different configs.\n\nThis patch fixes this bad style, which had caused the Thumb2 code to\nmiss-out on the uaccess updates.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit aa06e5c1f9c2b466712be904cc5b56a813e24cfd)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: Ie9d35de00dbae1451157259f7551af388cd37d3b\n" }, { "commit": "d4820ee1c7071966fa95543e60f9ed34ad7d47cf", "tree": "c72387526b9a25f92fc2a2c56112345a0a50149e", "parents": [ "3ab57a4f6ef0f92ab9da1c2497249ee870e4e102" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 25 14:59:15 2015 +0100" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jan 25 09:23:44 2016 -0800" }, "message": "UPSTREAM: ARM: mm: improve do_ldrd_abort macro\n\nImprove the do_ldrd_abort macro code - firstly, it inefficiently checks\nfor the LDRD encoding by doing a multi-stage test of various bits. This\ncan be simplified by generating a mask, bitmasking the instruction and\nthen comparing the result.\n\nSecondly, we want to be able to test the result rather than branching\nto do_DataAbort, so remove the branch at the end and rename the macro\nto \u0027teq_ldrd\u0027 to reflect it\u0027s new usage. teq_ldrd macro returns \u0027eq\u0027\nif the instruction was a LDRD.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n\nBug: 25672827\nPatchset: PAN emulation\n\n(cherry picked from commit 08446b129bbde34665c423d882f857a45b8c3aed)\nSigned-off-by: Kees Cook \u003ckeescook@google.com\u003e\n\nChange-Id: If7b0db1bbdc7b4749c29346cad80baa8c1cf614f\n" }, { "commit": "3ab57a4f6ef0f92ab9da1c2497249ee870e4e102", "tree": "d47a7321c4e830ae24c9be63c126be8b5aeffa6c", "parents": [ "8a8431507f8f5910db5ac85b72dbdc4ed8f6b308" ], "author": { "name": "Stephen Smalley", "email": "sds@tycho.nsa.gov", "time": "Mon Nov 23 16:07:41 2015 -0500" }, "committer": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Wed Jan 20 10:43:51 2016 -0800" }, "message": "UPSTREAM: selinux: fix bug in conditional rules handling\n\n(cherry picked from commit commit f3bef67992e8698897b584616535803887c4a73e)\n\ncommit fa1aa143ac4a (\"selinux: extended permissions for ioctls\")\nintroduced a bug into the handling of conditional rules, skipping the\nprocessing entirely when the caller does not provide an extended\npermissions (xperms) structure. Access checks from userspace using\n/sys/fs/selinux/access do not include such a structure since that\ninterface does not presently expose extended permission information.\nAs a result, conditional rules were being ignored entirely on userspace\naccess requests, producing denials when access was allowed by\nconditional rules in the policy. Fix the bug by only skipping\ncomputation of extended permissions in this situation, not the entire\nconditional rules processing.\n\nChange-Id: I8182999ee217bb9ca5f2ab4bbeb1806daef3b98a\nReported-by: Laurent Bigonville \u003cbigon@debian.org\u003e\nSigned-off-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\n[PM: fixed long lines in patch description]\nCc: stable@vger.kernel.org # 4.3\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\n" }, { "commit": "8a8431507f8f5910db5ac85b72dbdc4ed8f6b308", "tree": "59988aae02d1fcc8fdb0747ab1aa6cd126a2d4d8", "parents": [ "11510e146b89e521ad4a5c7abf34b51778468f8e" ], "author": { "name": "Yevgeny Pats", "email": "yevgeny@perception-point.io", "time": "Tue Jan 19 22:09:04 2016 +0000" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Jan 20 07:36:12 2016 -0800" }, "message": "UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()\n\n(cherry pick from commit 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2)\n\nThis fixes CVE-2016-0728.\n\nIf a thread is asked to join as a session keyring the keyring that\u0027s already\nset as its session, we leak a keyring reference.\n\nThis can be tested with the following program:\n\n\t#include \u003cstddef.h\u003e\n\t#include \u003cstdio.h\u003e\n\t#include \u003csys/types.h\u003e\n\t#include \u003ckeyutils.h\u003e\n\n\tint main(int argc, const char *argv[])\n\t{\n\t\tint i \u003d 0;\n\t\tkey_serial_t serial;\n\n\t\tserial \u003d keyctl(KEYCTL_JOIN_SESSION_KEYRING,\n\t\t\t\t\"leaked-keyring\");\n\t\tif (serial \u003c 0) {\n\t\t\tperror(\"keyctl\");\n\t\t\treturn -1;\n\t\t}\n\n\t\tif (keyctl(KEYCTL_SETPERM, serial,\n\t\t\t KEY_POS_ALL | KEY_USR_ALL) \u003c 0) {\n\t\t\tperror(\"keyctl\");\n\t\t\treturn -1;\n\t\t}\n\n\t\tfor (i \u003d 0; i \u003c 100; i++) {\n\t\t\tserial \u003d keyctl(KEYCTL_JOIN_SESSION_KEYRING,\n\t\t\t\t\t\"leaked-keyring\");\n\t\t\tif (serial \u003c 0) {\n\t\t\t\tperror(\"keyctl\");\n\t\t\t\treturn -1;\n\t\t\t}\n\t\t}\n\n\t\treturn 0;\n\t}\n\nIf, after the program has run, there something like the following line in\n/proc/keys:\n\n3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty\n\nwith a usage count of 100 * the number of times the program has been run,\nthen the kernel is malfunctioning. If leaked-keyring has zero usages or\nhas been garbage collected, then the problem is fixed.\n\nReported-by: Yevgeny Pats \u003cyevgeny@perception-point.io\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Don Zickus \u003cdzickus@redhat.com\u003e\nAcked-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\nChange-Id: I6052fa14ab54e32878ac9895356f1049bb96a138\n" }, { "commit": "11510e146b89e521ad4a5c7abf34b51778468f8e", "tree": "4171ef05b8727d91ccb7e43d3c6850af246d7767", "parents": [ "7a3c57bad676bd7655a00c20ceb721dad6abf5cb" ], "author": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Tue Jan 19 01:17:30 2016 +0530" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 19 13:37:21 2016 -0800" }, "message": "ion: fix page pool cache policy\n\nFix redundant \"buffer-\u003eprivate_flags \u0026 ION_PRIV_FLAG_SHRINKER_FREE\"\nchecks in if(!cached ...) condition block.\n\nAOSP Change-Id: I98ee8902df0c80135dddfa998c4ca4c2bb44e40e,\n\"ion: Handle the memory mapping correctly on x86\", is broken\non android-3.18+ kernels. It conflicts with upstream commit\n53a91c68fa7b, \"staging: ion: Add private buffer flag to skip\npage pooling on free\", and break the ION_PRIV_FLAG_SHRINKER_FREE\nprivate flag check logic.\n\nChange-Id: I9cee4bcc3545cf92e07c21c2b42d27cf88da3316\nReported-by: chenfeng \u003cpuck.chen@hisilicon.com\u003e\nSigned-off-by: Amit Pundir \u003camit.pundir@linaro.org\u003e\n" }, { "commit": "7a3c57bad676bd7655a00c20ceb721dad6abf5cb", "tree": "c507981949edc8e6a5ed4386da1f20a185f22538", "parents": [ "6aeebbacc0ce77337cb1e82f219ade77350562eb" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Jan 14 14:33:52 2016 +0100" }, "committer": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Tue Jan 19 18:47:01 2016 +0000" }, "message": "UPSTREAM: memcg: Only free spare array when readers are done\n\nA spare array holding mem cgroup threshold events is kept around\nto make sure we can always safely deregister an event and have an\narray to store the new set of events in.\n\nIn the scenario where we\u0027re going from 1 to 0 registered events, the\npointer to the primary array containing 1 event is copied to the spare\nslot, and then the spare slot is freed because no events are left.\nHowever, it is freed before calling synchronize_rcu(), which means\nreaders may still be accessing threshold-\u003eprimary after it is freed.\n\nFixed by only freeing after synchronize_rcu().\n\nSigned-off-by: Martijn Coenen \u003cmaco@google.com\u003e\n" }, { "commit": "f02330d48efb97b4e13e708e8d93dc337c247563", "tree": "8e54b0c6f434c5367c6e4c4ddd18b36f93e3dca1", "parents": [ "5179ae7ce9286ebd62cc381557df345a5860599a" ], "author": { "name": "Vishal Bhoj", "email": "vishal.bhoj@linaro.org", "time": "Mon Jan 18 15:31:49 2016 +0000" }, "committer": { "name": "Vishal Bhoj", "email": "vishal.bhoj@linaro.org", "time": "Mon Jan 18 15:31:49 2016 +0000" }, "message": "hikey: defconfig: enable BT mouse support\n\nSigned-off-by: Vishal Bhoj \u003cvishal.bhoj@linaro.org\u003e\n" }, { "commit": "5179ae7ce9286ebd62cc381557df345a5860599a", "tree": "34cb665291bf11db1fba49f601de6032accbe4f9", "parents": [ "f7f0771338b0314bb2610d1355d4ba04e9e3b9f8" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 15:34:14 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 15:34:58 2016 -0800" }, "message": "hikey: Enable CONFIGFS for rndis, mtp, ptp acc and uevents\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n" }, { "commit": "6aeebbacc0ce77337cb1e82f219ade77350562eb", "tree": "d7d0de245d30e3905c48bc0d8c7fc5732dc1ecc3", "parents": [ "ba525f83100f79129e46a790e4de442170af02e3" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Mon Oct 19 00:06:58 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:25 2016 -0800" }, "message": "Input: xpad - fix clash of presence handling with LED setting\n\nDo not call xpad_identify_controller at init with wireless devices: it\nconflicts with the already sent presence packet and will be called by\nxpad360w_process_packet as needed anyway.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "ba525f83100f79129e46a790e4de442170af02e3", "tree": "8210decbd7d38c8ed22892e65a42f0691352ac73", "parents": [ "d4d3daf5bdb756e35eb6b418c945016e427f10d9" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Sat Oct 10 09:36:17 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:24 2016 -0800" }, "message": "Input: xpad - query wireless controller state at init\n\nWhen we initialize the driver/device, we really don\u0027t know how many\ncontrollers are connected. So send a \"query presence\" command to the\nbase-station. (Command discovered by Zachary Lund)\n\nPresence packet taken from:\n\nhttps://github.com/computerquip/xpad5\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "d4d3daf5bdb756e35eb6b418c945016e427f10d9", "tree": "6407d7bae96b3ab7ddb49bbb3647c2cc8141396c", "parents": [ "18915b8685a8346d0a923499ffe12bb099521a77" ], "author": { "name": "Pierre-Loup A. Griffais", "email": "pgriffais@valvesoftware.com", "time": "Sat Oct 10 09:34:17 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:23 2016 -0800" }, "message": "Input: xpad - move the input device creation to a new function\n\nTo allow us to later create / destroy the input device from the urb\ncallback, we need to initialize/ deinitialize the input device from a\nseparate function. So pull that logic out now to make later patches\nmore \"obvious\" as to what they do.\n\nSigned-off-by: \"Pierre-Loup A. Griffais\" \u003cpgriffais@valvesoftware.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "18915b8685a8346d0a923499ffe12bb099521a77", "tree": "5c1bcfb171f7962c42e19634948a7b7565eb480c", "parents": [ "2d3f9bde3e222fd5ac7e7b5bb980d1cd43c62017" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Sat Oct 10 09:33:52 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:22 2016 -0800" }, "message": "Input: xpad - x360w: report dpad as buttons and axes\n\nas discussed here[0], x360w is the only pad that maps dpad_to_button.\nThis is bad for downstream developers as they have to differ between\nx360 and x360w which is not intuitive.\n\nThis patch implements the suggested solution of exposing the dpad both\nas axes and as buttons. This retains backward compatibility with software\nalready dealing with the difference while makes new software work as\nexpected across x360/ x360w pads.\n\n[0] http://www.spinics.net/lists/linux-input/msg34421.html\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "2d3f9bde3e222fd5ac7e7b5bb980d1cd43c62017", "tree": "d8647422f5f1d995f2142f4f3bd3a7ea87a991dc", "parents": [ "2b85031882517a36d70bd6f8e329b5b32c8f8e43" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Sat Oct 10 09:32:55 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:22 2016 -0800" }, "message": "Input: xpad - factor out URB submission in xpad_play_effect\n\nMove submission logic to a single point at the end of the function.\nThis makes it easy to add locking/ queuing code later on.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "2b85031882517a36d70bd6f8e329b5b32c8f8e43", "tree": "d4bf2b0e86712ff221ec02a3fd5ce5e11f1c7e83", "parents": [ "23b08fb3423029a962debf22be2cfb88a91cf8a1" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Tue Oct 06 17:07:31 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:21 2016 -0800" }, "message": "Input: xpad - remove needless bulk out URB used for LED setup\n\nThis code was probably wrong ever since and is redundant with\nxpad_send_led_command. Both try to send a similar command to the xbox360\ncontroller. However xpad_send_led_command correctly uses the pad_nr instead\nof bInterfaceNumber to select the led and re-uses the irq_out URB instead\nof creating a new one.\n\nNote that this change only affects the two supported wireless controllers.\nTested using the xbox360 wireless controller (PC).\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "23b08fb3423029a962debf22be2cfb88a91cf8a1", "tree": "9d1df1414f61dd188feac0a83ca60a50633a3da0", "parents": [ "d94258a447f62b1263799747277805adda97c110" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Sat Oct 10 10:00:49 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:20 2016 -0800" }, "message": "Input: xpad - use ida() for finding the pad_nr\n\nThe pad_nr corresponds to the lit up LED on the controller. Therefore there\nshould be no gaps when enumerating. Currently a LED is only re-assigned\nafter a controller is re-connected 4 times.\n\nThis patch uses ida to track connected pads - this way we can re-assign\nfreed up pad number immediately.\n\nConsider the following case:\n1. pad A is connected and gets pad_nr \u003d 0\n2. pad B is connected and gets pad_nr \u003d 1\n3. pad A is disconnected\n4. pad A is connected again\n\nusing ida_simple_get() controller A now correctly gets pad_nr \u003d 0 again.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "d94258a447f62b1263799747277805adda97c110", "tree": "ae0f883f64d944c2bed1cdb43651db6a7af74ad7", "parents": [ "6db4ce3f5f715382347480c6f9803c41f88467cb" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Tue Oct 06 17:06:16 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:19 2016 -0800" }, "message": "Input: xpad - clarify LED enumeration\n\nRename led_no -\u003e pad_nr: the number stored there is not the LED number - it\ngets translated later on to a LED number in xpad_identify_controller;\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "6db4ce3f5f715382347480c6f9803c41f88467cb", "tree": "a8ac303f3a29c469dc6a91088c229dc01587f7bb", "parents": [ "10eac698adbbec90fc55888024c308cf8d562439" ], "author": { "name": "Dario Scarpa", "email": "dario.scarpa@duskzone.it", "time": "Tue Oct 06 17:04:36 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:19 2016 -0800" }, "message": "Input: xpad - fix Razer Atrox Arcade Stick button mapping\n\nThe \"Razer Atrox Arcade Stick\" features 10 buttons, and two of them (LT/RT)\ndon\u0027t work properly. Change its definition in xpad_device[] (mapping\nfield) to fix.\n\nSigned-off-by: Dario Scarpa \u003cdario.scarpa@duskzone.it\u003e\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "10eac698adbbec90fc55888024c308cf8d562439", "tree": "059e815453fcb5d65fd196543152f7a777ad7d78", "parents": [ "37cdf041b6dc73d890314be701345107e427230b" ], "author": { "name": "Erik Lundgren", "email": "eriklundgren93@gmail.com", "time": "Tue Oct 06 17:04:11 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:18 2016 -0800" }, "message": "Input: xpad - add Covert Forces edition of the Xbox One controller\n\nIt is identical to the Xbox One controller but has a different product ID.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "37cdf041b6dc73d890314be701345107e427230b", "tree": "103838ebb91153a7155c497ce4312a3fd51453ca", "parents": [ "5cea098039af0ff16caedfb5627ff0861197fd43" ], "author": { "name": "Pavel Rojtberg", "email": "rojtberg@gmail.com", "time": "Mon Jun 22 14:11:30 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:17 2016 -0800" }, "message": "Input: xpad - re-send LED command on present event\n\nThe controller only receives commands when its present. So for the\ncorrect LED to be lit the LED command has to be sent on the present\nevent.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "5cea098039af0ff16caedfb5627ff0861197fd43", "tree": "0778350caa011d9548b642019a9915e4098c3c63", "parents": [ "b28cc29c5d1e4e006f56fd17f278ff64eacad923" ], "author": { "name": "Pierre-Loup A. Griffais", "email": "pgriffais@valvesoftware.com", "time": "Mon Jun 22 14:10:36 2015 -0700" }, "committer": { "name": "Rom Lemarchand", "email": "romlem@google.com", "time": "Wed Jan 13 14:33:16 2016 -0800" }, "message": "Input: xpad - set the LEDs properly on XBox Wireless controllers\n\nBased on Patch by Pierre-Loup A. Griffais \u003cpgriffais@valvesoftware.com\u003e:\nAdd the logic to set the LEDs on XBox Wireless controllers. Command\nsequence found by sniffing the Windows data stream when plugging the\ndevice in.\n\nUpdated based on comments on linux-input:\nunify codepaths in xpad_send_led_command for wired/ wireless controller.\nAlso document command values for clarification.\nAll values tested on Xbox 360 Wireless Controller.\n\nSigned-off-by: Pavel Rojtberg \u003crojtberg@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n\nSigned-off-by: Tim Clark \u003ctim.clark.82@gmail.com\u003e\n" }, { "commit": "b28cc29c5d1e4e006f56fd17f278ff64eacad923", "tree": "7094b8d62fc7f74dd0bbd1556f4680de347f714b", "parents": [ "7cfefc7988b73d438f0d52c50ce8cc0aa5d02953" ], "author": { "name": "liping.zhang", "email": "liping.zhang@spreadtrum.com", "time": "Mon Jan 11 13:31:01 2016 +0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 13:39:19 2016 -0800" }, "message": "xt_qtaguid: fix a race condition in if_tag_stat_update\n\nMiss a lock protection in if_tag_stat_update while doing get_iface_entry. So if\none CPU is doing iface_stat_create while another CPU is doing if_tag_stat_update,\nrace will happened.\n\nChange-Id: Ib8d98e542f4e385685499f5b7bb7354f08654a75\nSigned-off-by: Liping Zhang \u003cliping.zhang@spreadtrum.com\u003e\n" }, { "commit": "f7f0771338b0314bb2610d1355d4ba04e9e3b9f8", "tree": "2b3f0c53632c4b0433f23576e2aaf29d12542f52", "parents": [ "3d23e9a50dbf7e979fc36bfe6d42d0b982b39304" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 05 16:26:58 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 10:26:44 2016 -0800" }, "message": "hikey: dts: Add pstore support for HiKey\n\nThis patch reserves some memory in the DTS and sets up a\npstore device tree node to enable pstore support on HiKey.\n\nThis also enables the needed config options in the defconfig.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "3d23e9a50dbf7e979fc36bfe6d42d0b982b39304", "tree": "cf1bebe0bad5d2e41020d8e42fee24696a763fea", "parents": [ "bbc40da956b18310fb8f2591f5ade5cb04d16692", "7cfefc7988b73d438f0d52c50ce8cc0aa5d02953" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 10:25:29 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 13 10:25:29 2016 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-4.1\u0027 into android-hikey-linaro-4.1\n" }, { "commit": "7cfefc7988b73d438f0d52c50ce8cc0aa5d02953", "tree": "c946ac8ab13d93c5d6385326e84dce51b48529c1", "parents": [ "05754cd567170b0d5f4aee19741ba544c508767e" ], "author": { "name": "Greg Hackmann", "email": "ghackmann@google.com", "time": "Fri Oct 23 17:25:42 2015 -0700" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 12 15:14:47 2016 -0800" }, "message": "FROMLIST: pstore-ram: add Device Tree bindings\n\nramoops is one of the remaining places where ARM vendors still rely on\nboard-specific shims. Device Tree lets us replace those shims with\ngeneric code.\n\nThese bindings mirror the ramoops module parameters, with two small\ndifferences:\n\n(1) dump_oops becomes an optional \"no-dump-oops\" property, since ramoops\n sets dump_oops\u003d1 by default.\n\n(2) mem_type\u003d1 becomes the more self-explanatory \"unbuffered\" property.\n\n(am from https://lkml.org/lkml/2016/1/7/750)\n\nChange-Id: I2140199a861d50fc2bcbbe85b16bf17fb9ccaa1d\nSigned-off-by: Greg Hackmann \u003cghackmann@google.com\u003e\n" }, { "commit": "05754cd567170b0d5f4aee19741ba544c508767e", "tree": "68e315e500cc58b2a82706bfcf73d565b4d01741", "parents": [ "2497307b1b840b1903d6ca02e25cc52b1dfd4329" ], "author": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:51:16 2016 -0800" }, "committer": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:51:59 2016 -0800" }, "message": "FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.\n\n(cherry picked from commit https://lkml.org/lkml/2015/12/21/339)\n\nx86: arch_mmap_rnd() uses hard-coded values, 8 for 32-bit and 28 for\n64-bit, to generate the random offset for the mmap base address.\nThis value represents a compromise between increased ASLR\neffectiveness and avoiding address-space fragmentation. Replace it\nwith a Kconfig option, which is sensibly bounded, so that platform\ndevelopers may choose where to place this compromise. Keep default\nvalues as new minimums.\n\nBug: 24047224\nSigned-off-by: Daniel Cashman \u003cdcashman@android.com\u003e\nSigned-off-by: Daniel Cashman \u003cdcashman@google.com\u003e\nChange-Id: Ic38735a8de2943843a73b5c20855ccfa92513422\n" }, { "commit": "2497307b1b840b1903d6ca02e25cc52b1dfd4329", "tree": "b48a1f7eec36e22589eca7f462c40e7189505121", "parents": [ "27a1f9227c20347bb45c3abed617c8f1c60d700b" ], "author": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:47:53 2016 -0800" }, "committer": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:48:34 2016 -0800" }, "message": "FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS.\n\n(cherry picked from commit https://lkml.org/lkml/2015/12/21/340)\n\narm64: arch_mmap_rnd() uses STACK_RND_MASK to generate the\nrandom offset for the mmap base address. This value represents a\ncompromise between increased ASLR effectiveness and avoiding\naddress-space fragmentation. Replace it with a Kconfig option, which\nis sensibly bounded, so that platform developers may choose where to\nplace this compromise. Keep default values as new minimums.\n\nBug: 24047224\nSigned-off-by: Daniel Cashman \u003cdcashman@android.com\u003e\nSigned-off-by: Daniel Cashman \u003cdcashman@google.com\u003e\nChange-Id: I0be0bf8b1ed412863f248323e2d86b1df5bf21c6\n" }, { "commit": "27a1f9227c20347bb45c3abed617c8f1c60d700b", "tree": "f9eaecc1a645151a13ed6236afe30d7fe28ddc60", "parents": [ "ed0ff596bcaa39aad363b4eef2c77814f241361e" ], "author": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:44:35 2016 -0800" }, "committer": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:45:35 2016 -0800" }, "message": "FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS.\n\n(cherry picked from commit https://lkml.org/lkml/2015/12/21/341)\n\narm: arch_mmap_rnd() uses a hard-code value of 8 to generate the\nrandom offset for the mmap base address. This value represents a\ncompromise between increased ASLR effectiveness and avoiding\naddress-space fragmentation. Replace it with a Kconfig option, which\nis sensibly bounded, so that platform developers may choose where to\nplace this compromise. Keep 8 as the minimum acceptable value.\n\nBug: 24047224\nSigned-off-by: Daniel Cashman \u003cdcashman@android.com\u003e\nSigned-off-by: Daniel Cashman \u003cdcashman@google.com\u003e\nChange-Id: I438ae2dae939ea7f311246832cb789afdd6cba4e\n" }, { "commit": "ed0ff596bcaa39aad363b4eef2c77814f241361e", "tree": "9be1932ad14c4e17985212d1c74dd9ff0beb5832", "parents": [ "c85d30ec377a519645dac14c7595e3883ed6edf7" ], "author": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:18:57 2016 -0800" }, "committer": { "name": "dcashman", "email": "dcashman@google.com", "time": "Tue Jan 12 09:20:39 2016 -0800" }, "message": "FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR.\n\n(cherry picked from commit https://lkml.org/lkml/2015/12/21/337)\n\nASLR only uses as few as 8 bits to generate the random offset for the\nmmap base address on 32 bit architectures. This value was chosen to\nprevent a poorly chosen value from dividing the address space in such\na way as to prevent large allocations. This may not be an issue on all\nplatforms. Allow the specification of a minimum number of bits so that\nplatforms desiring greater ASLR protection may determine where to place\nthe trade-off.\n\nBug: 24047224\nSigned-off-by: Daniel Cashman \u003cdcashman@android.com\u003e\nSigned-off-by: Daniel Cashman \u003cdcashman@google.com\u003e\nChange-Id: Ibf9ed3d4390e9686f5cc34f605d509a20d40e6c2\n" }, { "commit": "bbc40da956b18310fb8f2591f5ade5cb04d16692", "tree": "3cd02e639636ba9985a5a4ba4835ee498e2f614d", "parents": [ "e1817ef59291dd91e7fa408affd29a428cd0f097" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Fri Jan 08 15:09:51 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Fri Jan 08 15:09:51 2016 -0800" }, "message": "ARM64: hikey: Enable CONFIG_SECCOMP\u003dy\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n" }, { "commit": "c85d30ec377a519645dac14c7595e3883ed6edf7", "tree": "9e92a7c28a789cf2642182bf37eab2261cca8d70", "parents": [ "0dd79c3ed408d297384be1e5428a3e296fd3239a" ], "author": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Wed Dec 30 03:05:44 2015 +0530" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Thu Jan 07 10:57:53 2016 -0800" }, "message": "usb: gadget: rndis: use %z format specifier for size_t\n\nUse \u0027%z\u0027 format specifier for sizeof operator instead\nof \u0027%u\u0027 to fix build warnings like:\n\n warning: format \u0027%u\u0027 expects type \u0027unsigned int\u0027, but argument 3 has type \u0027long unsigned int\u0027\n\nSigned-off-by: Amit Pundir \u003camit.pundir@linaro.org\u003e\n" }, { "commit": "0dd79c3ed408d297384be1e5428a3e296fd3239a", "tree": "caea6d25cad464fc1400567365f2a3f58cbde953", "parents": [ "0543ecd591ea9b6dc66fde86ca9239f528c60217" ], "author": { "name": "Vasily Kulikov", "email": "segoon@openwall.com", "time": "Wed Sep 09 15:36:00 2015 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Thu Jan 07 10:36:14 2016 -0800" }, "message": "UPSTREAM: include/linux/poison.h: fix LIST_POISON{1,2} offset\n\n(cherry pick from commit 8a5e5e02fc83aaf67053ab53b359af08c6c49aaf)\n\nPoison pointer values should be small enough to find a room in\nnon-mmap\u0027able/hardly-mmap\u0027able space. E.g. on x86 \"poison pointer space\"\nis located starting from 0x0. Given unprivileged users cannot mmap\nanything below mmap_min_addr, it should be safe to use poison pointers\nlower than mmap_min_addr.\n\nThe current poison pointer values of LIST_POISON{1,2} might be too big for\nmmap_min_addr values equal or less than 1 MB (common case, e.g. Ubuntu\nuses only 0x10000). There is little point to use such a big value given\nthe \"poison pointer space\" below 1 MB is not yet exhausted. Changing it\nto a smaller value solves the problem for small mmap_min_addr setups.\n\nThe values are suggested by Solar Designer:\nhttp://www.openwall.com/lists/oss-security/2015/05/02/6\n\nSigned-off-by: Vasily Kulikov \u003csegoon@openwall.com\u003e\nCc: Solar Designer \u003csolar@openwall.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill.shutemov@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nBug: 26429468\nBug: 26186802\nChange-Id: I6660764071f316992c88e7d9d48b2cbd63ac146b\n" }, { "commit": "e1817ef59291dd91e7fa408affd29a428cd0f097", "tree": "5da1444cab158688691bdb6b6852743bbe5abb82", "parents": [ "90b597d35f3a49352ba42c23617e04c0f0549376", "56855172f226af81194f28490a36ac81a3e02628" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Wed Jan 06 20:42:32 2016 +0000" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Wed Jan 06 20:42:32 2016 +0000" }, "message": "Merge \"hikey_defconfig: Enable CONFIG_LOCALVERSION_AUTO\" into android-hikey-linaro-4.1" }, { "commit": "90b597d35f3a49352ba42c23617e04c0f0549376", "tree": "74be899def55b0c75a1df1fa9354d92034f4da30", "parents": [ "3ae72792f187885dafadf598c93249d50e0bdd71", "0a619d75c4c4dc51c6f54b559928827b636bbf0c" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 13:31:22 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 13:31:22 2016 -0800" }, "message": "Merge remote-tracking branch \u0027linaro-ext/android-hikey-linaro-4.1\u0027 into android-hikey-linaro-4.1\n" }, { "commit": "56855172f226af81194f28490a36ac81a3e02628", "tree": "dede2472cb8258e1ebdff493bf94460c06d96650", "parents": [ "3ae72792f187885dafadf598c93249d50e0bdd71" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 12:24:28 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 12:24:28 2016 -0800" }, "message": "hikey_defconfig: Enable CONFIG_LOCALVERSION_AUTO\n\nIt will add git postfix to kernel name\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n" }, { "commit": "3ae72792f187885dafadf598c93249d50e0bdd71", "tree": "4346c5aaaaa222646c1566e3e68c9eb106e8309a", "parents": [ "37b507afa0d6704fd442725e747d90091de89488", "0543ecd591ea9b6dc66fde86ca9239f528c60217" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 10:58:01 2016 -0800" }, "committer": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Tue Jan 05 10:58:01 2016 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-4.1\u0027 into android-hikey-linaro-4.1\n" }, { "commit": "0a619d75c4c4dc51c6f54b559928827b636bbf0c", "tree": "7952d3b5ae7ebec6c940ccae78f0c89d60b6fede", "parents": [ "4dc90021b8af8de9f2097c13d7a7e15470fc83d2", "116e56ad0135aa8f7b73b2c20974d5ade6e97734" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 05 08:21:34 2016 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 05 08:21:43 2016 -0800" }, "message": "Merge branch \u0027android-hikey-linaro-4.1-topic-hikey\u0027 into android-hikey-linaro-4.1\n\nPull in a few extra thermal fixes.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "0543ecd591ea9b6dc66fde86ca9239f528c60217", "tree": "1f795debec318b27ffac09f3018cb9fc15b7e2df", "parents": [ "e275d57de4c0c9b496eb997434872fbc5298f007" ], "author": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Tue Jan 05 17:36:31 2016 +0530" }, "committer": { "name": "Amit Pundir", "email": "amit.pundir@linaro.org", "time": "Tue Jan 05 17:51:12 2016 +0530" }, "message": "kbuild: Makefile.clean: make Kbuild and Makefile optional\n\nAOSP commit b13ce9f4aa6f \"ARM64: add option to build\nImage.gz/dtb combo\" broke archclean / mrproper build\ntargets and we run into:\n----------\n./scripts/Makefile.clean:14: arch/arm64/boot/amd/Makefile: No such file or directory\nmake[2]: *** No rule to make target `arch/arm64/boot/amd/Makefile\u0027. Stop.\nmake[1]: *** [arch/arm64/boot/amd] Error 2\nmake: *** [archclean] Error 2\n----------\n\nThis patch skip the missing Kbuild/Makefile reporting\nerror. It does the job (i.e cleanup dts/*/*.dtb and\ndo not spit out missing file error messages as well).\n\nSigned-off-by: Amit Pundir \u003camit.pundir@linaro.org\u003e\n" }, { "commit": "116e56ad0135aa8f7b73b2c20974d5ade6e97734", "tree": "811f97db497d6e81f905c74eef238ab45a6dfa7f", "parents": [ "4bc5d5ed8ea8fc62ae4f6f455f91bbcf8ca031ab" ], "author": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Tue Jan 05 15:32:05 2016 +0800" }, "committer": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Tue Jan 05 15:32:05 2016 +0800" }, "message": "thermal: hisilicon: polish code for only one actor\n\nAt beginning, the thermal driver registers two actors for separate\ncluster. But this is redundant for Hikey board for two clusters are\nbound with clock domain. So polish code to only register only one actor\nwill be enough.\n\nSigned-off-by: Leo Yan \u003cleo.yan@linaro.org\u003e\n" }, { "commit": "4bc5d5ed8ea8fc62ae4f6f455f91bbcf8ca031ab", "tree": "6c8733b081f22e67aaf5c2dc4e2f6afe33bbc0ff", "parents": [ "96a0724cafedc3dd31e96be950bbde50615b78da" ], "author": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Tue Jan 05 15:29:46 2016 +0800" }, "committer": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Tue Jan 05 15:29:46 2016 +0800" }, "message": "thermal: hisilicon: increase temperature resolution\n\nWhen calculate temperature, old code firstly do division and then\nconvert to \"millicelsius\" unit. This will lose resolution and\nonly can read back temperature with \"Celsius\" unit.\n\nSo firstly scale step value to \"millicelsius\" and then do division, so\nfinally we can increase resolution for temperature value. Also refine\nthe calculation from temperature value to step value.\n\nSigned-off-by: Leo Yan \u003cleo.yan@linaro.org\u003e\n" }, { "commit": "4dc90021b8af8de9f2097c13d7a7e15470fc83d2", "tree": "2abcfaaa958fba5ceb78674d255e586cd5773a57", "parents": [ "ef2c679bc4130f0ef8672642e8402bcb01afe3a9", "07cc49f66973f49a391c91bf4b158fa0f2562ca8" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 21:56:36 2016 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 21:56:36 2016 -0800" }, "message": "Merge remote-tracking branch \u0027stable/linux-4.1.y\u0027 into android-hikey-linaro-4.1\n\nMerge in security fixes, etc from the 4.1-stable branch.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n\nConflicts:\n\tdrivers/tty/serial/amba-pl011.c\n" }, { "commit": "ef2c679bc4130f0ef8672642e8402bcb01afe3a9", "tree": "2bd1cbe3900f5b4363e6a2259c6a3d511644308d", "parents": [ "96a0724cafedc3dd31e96be950bbde50615b78da", "e275d57de4c0c9b496eb997434872fbc5298f007" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 21:35:51 2016 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 21:35:51 2016 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-4.1\u0027 into android-hikey-linaro-4.1\n\nMerge in common/android-4.1 updates.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "96a0724cafedc3dd31e96be950bbde50615b78da", "tree": "29887e52a4c0cf263d98e93e4e4bc46f23cb3fb6", "parents": [ "18936684f3e200dc327939b15efd400d5cc4d674" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 20:44:06 2016 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jan 04 20:44:06 2016 -0800" }, "message": "hikey_defconfig: Enable the power allocator govenor in the defconfig\n\nEnables the IPA thermal code in the defconfig.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "e275d57de4c0c9b496eb997434872fbc5298f007", "tree": "6bc51ce51290f461b78d05817b6b8f178129f939", "parents": [ "4f6645557491446971e316bc0f5171283aa4be8c" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Dec 30 09:26:15 2015 -0800" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Wed Dec 30 11:08:27 2015 -0800" }, "message": "ANDROID: rtc-palmas: correct for bcd year\n\nReplace bcd2bin and bin2bcd with one that maps years 1970 to 2129\nin a pattern that works with the underlying hardware.\n\nThe only transition that does not work correctly for this rtc clock\nis the transition from 2099 to 2100, it proceeds to 2000. The rtc\nclock retains and transitions the year correctly in all other\ncircumstances.\n\nSigned-off-by: Mark Salyzyn \u003csalyzyn@google.com\u003e\nBug: 26346842\nChange-Id: Ie527700190b1ae4b4bc3c12279d875aa5985b168\n" }, { "commit": "4f6645557491446971e316bc0f5171283aa4be8c", "tree": "d3b9cfd7907167c356e9fd254835d547704c7477", "parents": [ "997ead7e6c11338d0b90f3da0d0c77ad0c4646cd" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Nov 06 16:30:06 2015 -0800" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Dec 28 10:01:27 2015 -0800" }, "message": "UPSTREAM: proc: actually make proc_fd_permission() thread-friendly\n\n(cherry pick from commit 54708d2858e79a2bdda10bf8a20c80eb96c20613)\n\nThe commit 96d0df79f264 (\"proc: make proc_fd_permission() thread-friendly\")\nfixed the access to /proc/self/fd from sub-threads, but introduced another\nproblem: a sub-thread can\u0027t access /proc/\u003ctid\u003e/fd/ or /proc/thread-self/fd\nif generic_permission() fails.\n\nChange proc_fd_permission() to check same_thread_group(pid_task(), current).\n\nFixes: 96d0df79f264 (\"proc: make proc_fd_permission() thread-friendly\")\nReported-by: \"Jin, Yihua\" \u003cyihua.jin@intel.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nBug: 26016905\nChange-Id: I172c80c94f253d6f2af9ca143fde704091c487ed\n" }, { "commit": "18936684f3e200dc327939b15efd400d5cc4d674", "tree": "ce3ea61010abe8d93c89eee06fede770750fe951", "parents": [ "fff43e278cf3a0c9b5c6c9aeb6a4faf68e2d5b2c" ], "author": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Wed Dec 23 13:20:58 2015 +0800" }, "committer": { "name": "Leo Yan", "email": "leo.yan@linaro.org", "time": "Wed Dec 23 13:20:58 2015 +0800" }, "message": "arm64: hi6220: binding with IPA\n\nBinding device tree with IPA, so can use IPA for thermal management.\n\nSigned-off-by: Leo Yan \u003cleo.yan@linaro.org\u003e\n" } ], "next": "fff43e278cf3a0c9b5c6c9aeb6a4faf68e2d5b2c" }