)]}' { "log": [ { "commit": "4b12cc1e07276b1a39aef4f97924f8012a673154", "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", "parents": [ "86ce02bb4df84335bc5f7848696fded1821cd3e3", "eb92dc9dc2ad23abfc06c709a4941a161a4dc66d" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Oct 14 16:18:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 14 16:18:33 2020 +0000" }, "message": "Remove cuttlefish_kernel am: eb92dc9dc2\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1459923\n\nChange-Id: I25341befbe758b7055f25d09b40017a47c24c02c\n" }, { "commit": "eb92dc9dc2ad23abfc06c709a4941a161a4dc66d", "tree": "4b825dc642cb6eb9a060e54bf8d69288fbee4904", "parents": [ "ba1dd01e4ceb7be8106872ed6799716e05d8a033" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Oct 13 22:33:59 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Oct 13 22:34:01 2020 -0700" }, "message": "Remove cuttlefish_kernel\n\nAll files are moved to cuttlefish_prebuilts instead.\n\nChange-Id: Ic40768787a890dc5316837cc7996c27600be6a77\n" }, { "commit": "86ce02bb4df84335bc5f7848696fded1821cd3e3", "tree": "230a5f623e9176caeb07b9e49d8920d524f2c11f", "parents": [ "1e73c0309033ad79389a72b3b31554e12bc0f790", "ba1dd01e4ceb7be8106872ed6799716e05d8a033" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Mon Oct 12 01:10:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 12 01:10:07 2020 +0000" }, "message": "Revert \"Revert \"remove kernel, kernel modules from cuttlefish_ke...\" am: ba1dd01e4c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1455804\n\nChange-Id: I95eba49d64e634f7f13f1659efdde02164b8b9dc\n" }, { "commit": "ba1dd01e4ceb7be8106872ed6799716e05d8a033", "tree": "230a5f623e9176caeb07b9e49d8920d524f2c11f", "parents": [ "f034a42bfc811a2a6f15dab4c2971fa6d64ef66b" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Fri Oct 09 17:24:00 2020 +0000" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Fri Oct 09 17:24:00 2020 +0000" }, "message": "Revert \"Revert \"remove kernel, kernel modules from cuttlefish_ke...\"\n\nRevert^2 \"Update kernel to builds 6888926\"\n\n1e95193a84abf0960b216366c1799e2fc54c1a5a\n\nChange-Id: Iaa39b6ec023f58dc3609e37d4331e55e11174725\n" }, { "commit": "1e73c0309033ad79389a72b3b31554e12bc0f790", "tree": "f499ad85dc5598c95516cbade2660aa2be1db300", "parents": [ "9bc3e84a4c4143437bb88e9200c711a30b892969", "f034a42bfc811a2a6f15dab4c2971fa6d64ef66b" ], "author": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Fri Oct 09 07:49:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 07:49:44 2020 +0000" }, "message": "Revert \"remove kernel, kernel modules from cuttlefish_kernel\" am: f034a42bfc\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1455945\n\nChange-Id: Ifefc4b429675c27962679ebbfa7043f3d547980e\n" }, { "commit": "f034a42bfc811a2a6f15dab4c2971fa6d64ef66b", "tree": "f499ad85dc5598c95516cbade2660aa2be1db300", "parents": [ "b14d3e6ef85b4ccff44a0e79e9e7c56dc44e4324" ], "author": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Fri Oct 09 07:22:45 2020 +0000" }, "committer": { "name": "Xiao Ma", "email": "xiaom@google.com", "time": "Fri Oct 09 07:22:45 2020 +0000" }, "message": "Revert \"remove kernel, kernel modules from cuttlefish_kernel\"\n\nRevert \"Update kernel to builds 6888926\"\n\nRevert \"Update kernel to builds 6888926\"\n\nRevert \"Update kernel to builds 6889747\"\n\nRevert \"Allow downstream devices to customize vendor modules set\"\n\nRevert \"use new GKI kernel location\"\n\nRevert \"Update kernel to builds 6888926\"\n\nRevert submission 1454075-2020-10-07-gki-update\n\nReason for revert: Looks like this topic changes caused daily build broken, the error log as:\n\nerror: +out/target/product/emulator_arm64/boot.img too large (34934784 \u003e 33484800)\n\nI tried to revert this topic first and then feel free to revert revert it.\n\nReverted Changes:\nIe74ca26e8:use new GKI kernel location\nIbff0d9638:Update kernel to builds 6889747\nI693476e82:Update kernel to builds 6888926\nI35d7f320c:Update kernel to builds 6888926\nId221a7a30:Update kernel to builds 6888926\nI4421dbf67:remove kernel, kernel modules from cuttlefish_kern...\nI991f9a6af:Allow downstream devices to customize vendor modul...\nI598630e09:load kernel, kernel modules from updated locations...\n\nBug: 170451791\nChange-Id: I4ce9656d9f756df5197bc7d173d35432878d4fae\n" }, { "commit": "9bc3e84a4c4143437bb88e9200c711a30b892969", "tree": "230a5f623e9176caeb07b9e49d8920d524f2c11f", "parents": [ "81133a6041fefeb28e6db80ed95d51aae060e0a6", "b14d3e6ef85b4ccff44a0e79e9e7c56dc44e4324" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Fri Oct 09 06:05:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 06:05:16 2020 +0000" }, "message": "remove kernel, kernel modules from cuttlefish_kernel am: b14d3e6ef8\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1453724\n\nChange-Id: I5ef675239f449edbff0ca5b9040cb97b8c71bb0c\n" }, { "commit": "81133a6041fefeb28e6db80ed95d51aae060e0a6", "tree": "f499ad85dc5598c95516cbade2660aa2be1db300", "parents": [ "3b774d5a849dadcb02d3a84d6a129a7d1656c8f6", "c20ab97f3dfab0defed71594357ba9c2fd4d9445" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:20:01 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:20:01 2020 -0700" }, "message": "Skip ab/6749736 in stage.\n\nMerged-In: Ib76787a18db411e5ad27cae30c099ff8af108b60\nChange-Id: I98eb6db6f5b2464b30d2d44e287ccae6642f9807\n" }, { "commit": "b14d3e6ef85b4ccff44a0e79e9e7c56dc44e4324", "tree": "230a5f623e9176caeb07b9e49d8920d524f2c11f", "parents": [ "7d818276bfa932ae64e38ccf9604047ac3e9460e" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Wed Oct 07 16:33:18 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Wed Oct 07 16:33:18 2020 -0700" }, "message": "remove kernel, kernel modules from cuttlefish_kernel\n\nThe GKI kernel from kernel/prebuilts is now being used.\nCuttlefish kernel modules have moved to\ndevice/google/cuttlefish_prebuilts.\n\nBug: 168068690\nBug: 161563956\nChange-Id: I4421dbf6795538ae0ebf911a197d43007f868b31\n" }, { "commit": "3b774d5a849dadcb02d3a84d6a129a7d1656c8f6", "tree": "f499ad85dc5598c95516cbade2660aa2be1db300", "parents": [ "e0b343fb015f9bcb676eb182fd8a1b9d0d830dc6", "7d818276bfa932ae64e38ccf9604047ac3e9460e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 06 05:47:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 06 05:47:02 2020 +0000" }, "message": "Merge \"extract-vmlinux is build as sh_binary_host\" am: 7d818276bf\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1440892\n\nChange-Id: Iba9546c50eb1647d2accdf1230657e398590eec7\n" }, { "commit": "7d818276bfa932ae64e38ccf9604047ac3e9460e", "tree": "f499ad85dc5598c95516cbade2660aa2be1db300", "parents": [ "b07ded206805d2c5b8818defebf4d8c7779c3a1a", "5dd48e670de9e605041e422b9468a6b123447337" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 06 05:23:08 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 06 05:23:08 2020 +0000" }, "message": "Merge \"extract-vmlinux is build as sh_binary_host\"" }, { "commit": "e0b343fb015f9bcb676eb182fd8a1b9d0d830dc6", "tree": "87d65756ea82beef38858a6036703507d4cef92b", "parents": [ "7e3ab86637087aa409d70962dc74c49177c2c81f", "b07ded206805d2c5b8818defebf4d8c7779c3a1a" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Fri Oct 02 16:36:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 02 16:36:30 2020 +0000" }, "message": "Update kernel to builds 6877835 am: b07ded2068\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1446255\n\nChange-Id: I406db4373ad4c600724166f3a31c9a611f952870\n" }, { "commit": "b07ded206805d2c5b8818defebf4d8c7779c3a1a", "tree": "87d65756ea82beef38858a6036703507d4cef92b", "parents": [ "502316c92b7ac91e04f96e1fa1efba5049099067" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Thu Oct 01 17:20:13 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Thu Oct 01 17:20:13 2020 -0700" }, "message": "Update kernel to builds 6877835\n\ngit log --first-parent -100 --oneline --no-decorate b6e9fd48683f..2a7d52383a14:\n2a7d52383a14 ANDROID: rpmsg: core: Add signal API support\na2d2e27cdeba ANDROID: power_supply: Add POWER_SUPPLY_CHARGE_TYPE_TAPER\n02ebab02d016 ANDROID: Disable kthread delayed work fp check in CFI builds\n6fa60aa03b21 ANDROID: GKI: cputime: Export for thread_group_cputime_adjusted\nfbbeae5779e3 ANDROID: GKI: signal: Export for __lock_task_sighand\n7ebe21c21175 ANDROID: GKI: time: Export for nsec_to_clock_t\nf985df6c1f05 ANDROID: GKI: pid: Export for find_task_by_vpid\na0212dbcef6d ANDROID: GKI: core: Export for runqueues\n3baa6b4b08f1 ANDROID: GKI: loadavg: Export for get_avenrun\na57c53bc8b09 ANDROID: sched: add cpumask parameter to cpu capacity vendor hook\nb9dbbb956e76 ANDROID: Refresh ABI.xmls with libabigail 1.8.0-98bbf30d\n14bc969ca0c4 Merge 5.4.68 into android12-5.4\nc43f5a389e8c Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android12-5.4\nb995c14df40f ANDROID: GKI: enable CONFIG_MTK_TIMER\n\nTest: treehugger\nBug: 169892419\nChange-Id: I02dcf6f8d8e87e8fdfc4050474e79f51ef92d89e\n" }, { "commit": "5dd48e670de9e605041e422b9468a6b123447337", "tree": "b6b1294d1eadbe6d9e67859338266c1a76365bd2", "parents": [ "502316c92b7ac91e04f96e1fa1efba5049099067" ], "author": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Sep 29 20:39:39 2020 +0900" }, "committer": { "name": "Jiyong Park", "email": "jiyong@google.com", "time": "Tue Sep 29 20:43:00 2020 +0900" }, "message": "extract-vmlinux is build as sh_binary_host\n\nPreviously, it was built using cc_prebuilt_binary. The problem with that\nwas that what\u0027s installed to out/soong/host is actually a symlink to the\nsource (e.g. /home/\u003cusername\u003e/\u003candroidroot\u003e/foo/bar/...). See\nI1a600c7163ce0ec34ee8caf0ffe87fef4feb3064 for more info about the\nsymlink.\n\nSince cc_prebuilt_binary is actually for \u0027compiled\u0027 binaries, switch to\nsh_binary_host which is exactly for shell scripts. These modules are\ninstalled not as symlinks.\n\nBug: 168086242\nTest: m\n\nChange-Id: I32118f9ec9300854b8db86ae9955109ccf0dd3ca\n" }, { "commit": "7e3ab86637087aa409d70962dc74c49177c2c81f", "tree": "e7b39a17e5bbd765d1d6bd1192dd1d393b978212", "parents": [ "1995d39e11b90f86bd308246363a18037a029407", "502316c92b7ac91e04f96e1fa1efba5049099067" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Sat Sep 26 02:11:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 26 02:11:13 2020 +0000" }, "message": "Update kernel to builds 6862348 am: 502316c92b\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1439315\n\nChange-Id: I6bc8b876422f11ccdaae788688813ae9a8ea6663\n" }, { "commit": "502316c92b7ac91e04f96e1fa1efba5049099067", "tree": "e7b39a17e5bbd765d1d6bd1192dd1d393b978212", "parents": [ "bc77a8cbad5e7406e2f23389b00b348362a6bcd8" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Fri Sep 25 11:22:33 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Fri Sep 25 11:22:33 2020 -0700" }, "message": "Update kernel to builds 6862348\n\ngit log --first-parent -100 --oneline --no-decorate 31a7728018b5..b6e9fd48683f:\nb6e9fd48683f ANDROID: build.config.common: enable LLVM\u003d1\ne009aa357096 ANDROID: Makefile: add compiler-rt dependency explicitly\n587b7a0a9444 FROMLIST: Makefile: add -fuse-ld\u003dlld to KBUILD_HOSTLDFLAGS when LLVM\u003d1\nffb6c5f41224 FROMLIST: x86/boot: allow a relocatable kernel to be linked with lld\n96eef4805896 Merge 5.4.67 into android12-5.4\n0d602d5d5597 ANDROID: GKI: update the .xml file due to UFS changes\n65a3bc4f66ca UPSTREAM: kbuild: use CONFIG_CC_VERSION_TEXT to construct LINUX_COMPILER macro\n74aaebe3ece8 UPSTREAM: kbuild: do not pass $(KBUILD_CFLAGS) to scripts/mkcompile_h\n1112d67f0f5d UPSTREAM: kbuild: ensure full rebuild when the compiler is updated\n18aa26303684 ANDROID: kallsyms: ignore ThinLTO+CFI hash suffix in kallsyms_lookup_name()\n\nTest: treehugger\nBug: 154934534\nChange-Id: I898bf559dc70ab51bb3b9ec575df72f8e135ec35\n" }, { "commit": "1995d39e11b90f86bd308246363a18037a029407", "tree": "68ba14a95e484d241db99108167417f8ef4b19f6", "parents": [ "f17c4ed3b7ee34b8018c5d6d07ba8f142bab6eb2", "bc77a8cbad5e7406e2f23389b00b348362a6bcd8" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Wed Sep 23 16:14:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 23 16:14:59 2020 +0000" }, "message": "Update kernel to builds 6855663 am: bc77a8cbad\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1434524\n\nChange-Id: I8232e0449b45b82acaad90ce4fc216796aa1418e\n" }, { "commit": "bc77a8cbad5e7406e2f23389b00b348362a6bcd8", "tree": "68ba14a95e484d241db99108167417f8ef4b19f6", "parents": [ "54f0fb3d0c2cbb456090eacb46f8ba1120ea91c4" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Tue Sep 22 17:28:38 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Tue Sep 22 17:28:38 2020 -0700" }, "message": "Update kernel to builds 6855663\n\ngit log --first-parent -100 --oneline --no-decorate 83da5d185045..31a7728018b5:\n31a7728018b5 ANDROID: Refresh ABI.xmls with libabigail 1.8.0-1dca710a\ndb46cc43dbf4 ANDROID: scsi: ufs: add a hook to add sysfs entries\n02c4f7faf694 ANDROID: scsi: ufs: add a hook to prepare command\nacb32a9bbadc ANDROID: export bkops and query/flag query functions\na342bc8d02b5 FROMLIST: scsi: add more contexts in the ufs tracepoints\n87da949e78d0 FROMLIST: scsi: ufs: clear UAC for FFU\n9ef725440c64 FROMLIST: scsi: ufs: use WQ_HIGHPRI for gating work\n028c58785837 FROMLIST: scsi: ufs: atomic update for clkgating_enable\n3278b9e0f573 ANDROID: GKI: enable CONFIG_SONY_FF\nb63f9ec1b2d2 ANDROID: GKI: rename symbol list section\nbe060bb67614 ANDROID: GKI: update abi.xml after 5.4.66 merge\nfb0be572ba0b Merge 5.4.66 into android12-5.4\n5f3415936687 UPSTREAM: dma-buf: fix resource leak on -ENOTTY error return path\n830896acd585 UPSTREAM: dma-heap: Make the symbol \u0027dma_heap_ioctl_cmds\u0027 static\n96945ab7c389 UPSTREAM: dma-buf: heaps: Remove redundant heap identifier from system heap name\n8443759b0cbc UPSTREAM: dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier\nc1db6b7b884b UPSTREAM: kselftests: Add dma-heap test\ncc50c76b1c1a UPSTREAM: dma-buf: heaps: Add CMA heap to dmabuf heaps\nc02e6ccc5a4a UPSTREAM: dma-buf: heaps: Add system heap to dmabuf heaps\n55dcf6c9842d UPSTREAM: dma-buf: heaps: Add heap helpers\n698137d90183 UPSTREAM: dma-buf: Add dma-buf heaps framework\n05a2f8bc119b ANDROID: KMI symbol lists: migrate section name\ne0639874ac78 ANDROID: ABI: refresh with latest libabigail 94f5d4ae\n\nTest: treehugger\nBug: 169191027\nChange-Id: I31c94b0e34c0e94859eeefd41c13d47f374032f0\n" }, { "commit": "f17c4ed3b7ee34b8018c5d6d07ba8f142bab6eb2", "tree": "bf6eae1c9c9f4e4b027da39d154080331086b166", "parents": [ "1ce7a988a4952a85255b92071315e7e261ceb7bd", "54f0fb3d0c2cbb456090eacb46f8ba1120ea91c4" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Thu Sep 17 01:35:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 17 01:35:01 2020 +0000" }, "message": "Update kernel to builds 6841645 am: 54f0fb3d0c\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1428208\n\nChange-Id: Ie872341e099b5195e57035d0cbb821e147480ca8\n" }, { "commit": "54f0fb3d0c2cbb456090eacb46f8ba1120ea91c4", "tree": "bf6eae1c9c9f4e4b027da39d154080331086b166", "parents": [ "1ce7a988a4952a85255b92071315e7e261ceb7bd" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Wed Sep 16 15:52:41 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Wed Sep 16 15:53:24 2020 -0700" }, "message": "Update kernel to builds 6841645\n\ngit log --first-parent -100 --oneline --no-decorate 40c744888652..83da5d185045:\n83da5d185045 ANDROID: update abi_gki_aarch64_cuttlefish\n63d1c2f0b547 ANDROID: mm: add generic __va_function and __pa_function\n75d494e3eead ANDROID: Update db845c symbol list for adding CONFIG_ARM_QCOM_CPUFREQ_HW\n6710afdc2115 ANDROID: db845c_gki.fragment: Add missing qcom drivers required for cpufreq functionality\n48ad97696bbb ANDROID: mm: add vendor padding to extend SPECULATIVE_PAGE_FAULT\n552dd7c63535 Merge 5.4.65 into android12-5.4\ned55b95ca956 ANDROID: GKI: update .xml file due to sdcardfs patch removals\n61eab9854560 Revert \"ANDROID: mnt: Add filesystem private data to mount points\"\n8f2bc3119b81 Revert \"ANDROID: mnt: Fix null pointer dereference\"\n18e87f8a36d3 Revert \"ANDROID: Add show_options2 to view private mount data\"\n347ee13f94b4 Revert \"ANDROID: fscrypt: add key removal notifier chain\"\n5762083e81c1 ANDROID: gki_defconfig: enable f2fs compression by GKI\n26dd50a30c2f ANDROID: scsi: ufs: add UFSHCD_QUIRK_KEYS_IN_PRDT\nad87a16594e9 ANDROID: scsi: ufs: add UFSHCD_QUIRK_NO_KEYSLOTS\n537d2b26e279 ANDROID: scsi: ufs: add -\u003efill_prdt() variant op\n0feb33221e0f Revert \"Revert \"ANDROID: GKI: update abi definitions now that sdcardfs is gone\"\"\n206b72cae106 Revert \"Revert \"Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\"\"\n2a02953fb123 Revert \"Revert \"ANDROID: remove sdcardfs-needed exports from whitelist\"\"\nf80d5fbe84f9 Revert \"Revert \"Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\"\"\n5776c9190ebd Revert \"Revert \"Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\"\"\n957c10275e9a Revert \"Revert \"Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\"\"\na58f846ae4e3 Revert \"Revert \"Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\"\"\ne547ee55eb88 Revert \"Revert \"ANDROID: sdcardfs: remove sdcardfs from system\"\"\ne1c9ea5fd907 Revert \"ANDROID: vendor_hooks: Add vendor hooks for key combination\"\naa0ddbda9397 ANDROID: Setting up GS before calling __restore_processor_state.\n3671eaba53da UPSTREAM: Documentation/sysctl: Document uclamp sysctl knobs\n7ecc1cf324ef BACKPORT: sched/uclamp: Add a new sysctl to control RT default boost value\ndfc642f47600 FROMGIT: binder: print warnings when detecting oneway spamming.\na51472c9375c Merge 5.4.64 into android12-5.4\n2e92971666a3 FROMGIT: scsi: ufs: Handle LINERESET indication in err handler\ndd77d5a377b9 BACKPORT: FROMGIT: scsi: ufs: Abort tasks before clearing them from doorbell\nfb663831a225 ANDROID: ABI: update allowed list for QCOM\n80d830d79a4d UPSTREAM: udp: initialize is_flist with 0 in udp_gro_receive\na8fd2b273b8f UPSTREAM: udp: Support UDP fraglist GRO/GSO.\n89986462ce8c UPSTREAM: net: Support GRO/GSO fraglist chaining.\nbdc66d647664 UPSTREAM: net: Add a netdev software feature set that defaults to off.\n1e1eeb8aa234 BACKPORT: net: Add fraglist GRO/GSO feature flags\ndd94e91ce14b ANDROID: GKI: update .xml signatures due to idr_alloc_u32 addition\n2d65e6a459a7 ANDROID: update abi for idr_alloc_u32\n\nTest: treehugger\nBug: 168640569\nChange-Id: I36d8b188010e948434841d2112d0c45d6c66e55a\n" }, { "commit": "1ce7a988a4952a85255b92071315e7e261ceb7bd", "tree": "807b473f2269dfb8fff625c3317377b6503735f2", "parents": [ "ef4c0d1ea1da50f828391c792d273646311fea40", "92c5b62176f447630dd7473b4e26a674313bcd87" ], "author": { "name": "Ram Muthiah", "email": "rammuthiah@google.com", "time": "Tue Sep 08 22:34:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 08 22:34:15 2020 +0000" }, "message": "Update kernel to builds 6819164 am: 92c5b62176\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1421908\n\nChange-Id: I039c1b14f417d39ac8712c01e260598c41fbb49b\n" }, { "commit": "92c5b62176f447630dd7473b4e26a674313bcd87", "tree": "807b473f2269dfb8fff625c3317377b6503735f2", "parents": [ "270d5b7a8b65f21d428ce04421c7f96e73fcd44f" ], "author": { "name": "Ram Muthiah", "email": "rammuthiah@google.com", "time": "Tue Sep 08 11:09:07 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Sep 08 18:21:44 2020 +0000" }, "message": "Update kernel to builds 6819164\n\ngit log --first-parent -100 --oneline --no-decorate b34eef469821..40c744888652:\n40c744888652 ANDROID: GKI: update android12-5.4 xml file\n98fda21f54f7 FROMLIST: clk: sunxi-ng: add support for the Allwinner A100 CCU\nc99fd3bf1076 UPSTREAM: spi: add power control when set_cs\n0ef1db7b69dd Merge 5.4.63 into android12-5.4\n26ff807b734b UPSTREAM: nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage\n3f20ba7d5d1d Merge 5.4.62 into android12-5.4\n0ddc717be4a9 ANDROID: gki_defconfig: initialize locals with zeroes\n5b9a2a2aa44d UPSTREAM: security: allow using Clang\u0027s zero initialization for stack variables\n64bcb38ef720 ANDROID: GKI: Update ABI for virtio_transport symbols\n050354b654ba ANDROID: Update abi_gki_aarch64_cuttlefish\n0ede4657b27f ANDROID: vendor_hooks: Add vendor hooks for key combination\n19fe02ec3ac9 ANDROID: power_supply: Add a helper function to retrieve psy array from phandle\n3f84f0c1ff00 ANDROID: vendor_hooks: Add new android vendor hooks for ipi stop\ne58b9f8fe9a6 FROMLIST: pinctrl: sunxi: add support for the Allwinner A100 pin controller\ndaddf4fb363c ANDROID: perf: Export clock_set_rate tracepoint\n8453279c7cd4 BACKPORT: cfg80211: Adjust 6 GHz frequency to channel conversion\n0c56561dafe0 UPSTREAM: arm64: dts: sdm845: add Inline Crypto Engine registers and clock\nc70d67b617f2 BACKPORT: scsi: ufs-qcom: Add Inline Crypto Engine support\na8ab3b3c9c0e UPSTREAM: scsi: ufs-qcom: Name the dev_ref_clk_ctrl registers\n17fa70105e14 BACKPORT: scsi: firmware: qcom_scm: Add support for programming inline crypto keys\n8c7912e41381 UPSTREAM: scsi: ufs-mediatek: Add inline encryption support\nd4a92e638a64 ANDROID: GKI: update .xml file after recent v4l changes.\n\nTest: treehugger\nBug: 167618781\nBug: 168028722\nChange-Id: Ib50072f03e75c4d17b402430516aecb156ef8823\n" }, { "commit": "ef4c0d1ea1da50f828391c792d273646311fea40", "tree": "e4dabf35a9cbc21fb4926f314ef3c6faef24bf44", "parents": [ "6d11a3bf7493b719683d8a439ac2222070b0ce59", "270d5b7a8b65f21d428ce04421c7f96e73fcd44f" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Sep 02 16:33:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 02 16:33:27 2020 +0000" }, "message": "Update kernel to builds 6803710 am: 270d5b7a8b\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1416772\n\nChange-Id: I3047d46f0e9a4a6d1393c29edcf42d1a495346c8\n" }, { "commit": "270d5b7a8b65f21d428ce04421c7f96e73fcd44f", "tree": "e4dabf35a9cbc21fb4926f314ef3c6faef24bf44", "parents": [ "1749400794347a8ef9154c6253c1ef464ac81e9c" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Sep 01 09:31:40 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Sep 01 16:42:36 2020 +0000" }, "message": "Update kernel to builds 6803710\n\ngit log --first-parent -100 --oneline --no-decorate 8c7bf5fe0edb..b34eef469821:\nb34eef469821 ANDROID: GKI: Enable IR RC support\n700ba04e5a06 BACKPORT: media: v4l: Add definitions for HEVC stateless decoding\n01f9a91f382a ANDROID: GKI: add built-in BCM Bluetooth driver\nebd04e3463fb ANDROID: Update ABI\n2d8ce5be6941 ANDROID: net: enable wireless core features with GKI_LEGACY_WEXT_ALLCONFIG\ne15cc541b749 Revert \"binder: Prevent context manager from incrementing ref 0\"\nfc1a0129c871 ANDROID: gki_defconfig: enable CONFIG_ARCH_SUNXI.\nff8fbf470b6b ANDROID: GKI: Enable V4L MEM2MEM drivers\n9c6c621c2464 UPSTREAM: media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last states\nb016bc9d9b24 UPSTREAM: media: v4l2_ctrl: Add const pointer to ctrl_ptr\n95ffa7c4d8eb UPSTREAM: media: v4l2: Use FIELD_SIZEOF directly\nb960deac79a2 UPSTREAM: media: v4l2-mem2mem: Fix hold buf flag checks\n15d60cc06c26 UPSTREAM: media: v4l2-ctrl: Use p_const when possible\n5ff71c90fe89 UPSTREAM: media: v4l2_core: Add p_area to struct v4l2_ext_control\n69eaed6d827b UPSTREAM: media: v4l2_ctrl: Add p_def to v4l2_ctrl_config\n4cd2f831b6b0 UPSTREAM: media: v4l2-dv-timings: Use DIV_ROUND_CLOSEST directly to make it readable\ndc109cf58e4f UPSTREAM: media: v4l2-dev: disable frequency and tuner ioctls for touch\nfdd3ea4e39e7 UPSTREAM: media: v4l2-dev: fix is_tch checks\n2bc8202c21c0 UPSTREAM: media: v4l2-dev: simplify the SDR checks\na91197ef0d09 UPSTREAM: media: v4l2-core: correctly validate video and metadata ioctls\n1b0efa074ecd UPSTREAM: media: v4l2-mem2mem: add new_frame detection\n2c772a8759d4 UPSTREAM: media: v4l2-mem2mem: add stateless_(try_)decoder_cmd ioctl helpers\n4b50832785b7 UPSTREAM: media: videodev2.h: add V4L2_DEC_CMD_FLUSH\n395f404bec44 UPSTREAM: media: v4l2-mem2mem: support held capture buffers\ne638fe602bce UPSTREAM: media: vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF\nff3f4b349036 UPSTREAM: media: v4l2-common: add RGB565 and RGB55 to v4l2_format_info\n06766f06682f UPSTREAM: media: v4l2-common: add pixel encoding support\nd69bfd4c3636 UPSTREAM: media: add V4L2_CID_UNIT_CELL_SIZE control\n7875a06b12b6 UPSTREAM: media: add V4L2_CTRL_TYPE_AREA control type\n0ad30aa530c5 UPSTREAM: media: v4l2-core: Implement v4l2_ctrl_new_std_compound\n9f82483240fa Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android12-5.4\n34364883b1f7 ANDROID: ion: export some ion symbols\nf058ed1ec2aa ANDROID: GKI: Add CONFIG_KVM and CONFIG_VHOST_VSOCK\n6a607f66e96a UPSTREAM: vsock/virtio: add WARN_ON check on virtio_transport_get_ops()\n36260bf9e2b7 UPSTREAM: vsock/virtio: fix null-pointer dereference in virtio_transport_recv_listen()\nd2fe372869ba UPSTREAM: vsock: avoid to assign transport if its initialization fails\n4da6b5e86124 UPSTREAM: hv_sock: Remove the accept port restriction\n57b291a793f7 UPSTREAM: vhost/vsock: refuse CID assigned to the guest-\u003ehost transport\ndf5f942b25a4 UPSTREAM: vsock: fix bind() behaviour taking care of CID\n9cc7f2c1b914 UPSTREAM: vsock: prevent transport modules unloading\nba5d2b9a92c5 UPSTREAM: vsock/vmci: register vmci_transport only when VMCI guest/host are active\nabaa6bd823d5 UPSTREAM: vsock: add multi-transports support\n0dfeed4eaa6b UPSTREAM: hv_sock: set VMADDR_CID_HOST in the hvs_remote_addr_init()\nc1931890714a UPSTREAM: vsock: move vsock_insert_unbound() in the vsock_create()\nc845167450e4 UPSTREAM: vsock: add vsock_create_connected() called by transports\nbf0fbfaae380 UPSTREAM: vsock: handle buffer_size sockopts in the core\n5328dba25fec UPSTREAM: vsock: add \u0027struct vsock_sock *\u0027 param to vsock_core_get_transport()\n09d66fd10d10 BACKPORT: vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock()\n626838ac08fe UPSTREAM: vsock: add \u0027transport\u0027 member in the struct vsock_sock\n17a51d6bf16f UPSTREAM: vsock: remove include/linux/vm_sockets.h file\n3c12a0f2191f UPSTREAM: vsock: remove vm_sockets_get_local_cid()\nf9e2fa53ab24 UPSTREAM: vsock/vmci: remove unused VSOCK_DEFAULT_CONNECT_TIMEOUT\n03106e8f2938 ANDROID: Revert \"hv_sock: Remove the accept port restriction\"\n1bd2e4c18e44 UPSTREAM: media: v4l2-dv-timings.c: fix format string\n4915c32a2f6b ANDROID: GKI: update xml due change of SCSI_UFS_QCOM\n7db5214fae07 ANDROID: db845c_gki.fragment: enable CONFIG_SCSI_UFS_QCOM as m\n12094e27bafe ANDROID: Incremental fs: fix magic compatibility again\na59e6aa87fd7 Merge 5.4.61 into android12-5.4\na254a08c1327 BACKPORT: FROMLIST: clk: Export clk_register_composite\n19c0a223b81e ANDROID: GKI: Remove SCSI_UFS_QCOM from gki_defconfig\n15a24ac5c3d4 ANDROID: power: Export log_{suspend_abort,abnormal_wakeup}_reason\n623715b470c6 ANDROID: dts: hi3660: Fix duplicate adv7533 nodes\n931718fa65fe ANDROID: drop KERNEL_DIR setting in build.config.common\nd495efcd5bed ANDROID: symbol update for hikey960 (fix adv7511 functionality)\n\nTest: treehugger\nBug: 161831173\nBug: 167398528\nChange-Id: I265e06a9ce88ce0c49cb09010568e1683b5d841f\n" }, { "commit": "6d11a3bf7493b719683d8a439ac2222070b0ce59", "tree": "e87cf8e5f2d68023770a7d921ec9c49f6b371c8b", "parents": [ "1749400794347a8ef9154c6253c1ef464ac81e9c", "fee6ca291605c766717882a10a9ed6e1222aeb2f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 09:44:04 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Aug 27 09:44:04 2020 -0700" }, "message": "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged\n\nBug: 166295507\nMerged-In: Id153518d74c84513c4ad56e38d9ff5ca9110f5b5\nChange-Id: Ia11399befe3196db6c5ca3c49162ee40e6158d6d\n" }, { "commit": "1749400794347a8ef9154c6253c1ef464ac81e9c", "tree": "e87cf8e5f2d68023770a7d921ec9c49f6b371c8b", "parents": [ "2e158b0b858be9b54cab97e254f660c4dd7073bd", "3db4e0d57904a0e921d68c9792d2378f10ec818a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 24 22:13:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 24 22:13:25 2020 +0000" }, "message": "Merge \"Update kernel to builds 6785702\" am: 3db4e0d579\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1408798\n\nChange-Id: Ida98c42e2065014f02176634125e08d9e7c46aaf\n" }, { "commit": "3db4e0d57904a0e921d68c9792d2378f10ec818a", "tree": "e87cf8e5f2d68023770a7d921ec9c49f6b371c8b", "parents": [ "2e158b0b858be9b54cab97e254f660c4dd7073bd", "0a14d0a4e60abfc5f372422bede866474a503f3e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 24 21:40:40 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 24 21:40:40 2020 +0000" }, "message": "Merge \"Update kernel to builds 6785702\"" }, { "commit": "0a14d0a4e60abfc5f372422bede866474a503f3e", "tree": "e87cf8e5f2d68023770a7d921ec9c49f6b371c8b", "parents": [ "506f698ba7c59cece5c6acecb84a1ba44feeb6a8" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Mon Aug 24 12:25:20 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Mon Aug 24 12:25:20 2020 -0700" }, "message": "Update kernel to builds 6785702\n\ngit log --first-parent -100 --oneline --no-decorate c3221b7ac740..8c7bf5fe0edb:\n8c7bf5fe0edb ANDROID: GKI: update xml due to 5.4.60 changes\nd457f47f3685 Merge 5.4.60 into android12-5.4\nbc7938cc6449 ANDROID: GKI: update abi xml definitions\n2f4d6c9fd77c ANDROID: arm64: add __va_function\n45551fb3ebd9 ANDROID: sched: add vendor hook for correcting cpu capacity\n5229669e072c ANDROID: sched: Use normal vendor hook in scheduler tick\n23609a58cd0e ANDROID: Add vendor hooks to the scheduler\n17245be70d1d ANDROID: tty: fix tty name overflow\n8f0baddfd871 ANDROID: futex: Add vendor hook for wait queue\n5aeda5a3ccb1 ANDROID: sched: add vendor hooks to handle scheduling priority\n1ac5934602a3 ANDROID: rwsem: Add vendor hook to the rw-semaphore\na627568e986e ANDROID: binder: Add vendor hook to the binder\n2619c1d6b3a0 BACKPORT: FROMGIT: scsi: ufs: Properly release resources if a task is aborted successfully\neb8beed2a5f2 BACKPORT: FROMGIT: scsi: ufs: Fix a race condition between error handler and runtime PM ops\n2ba867947762 FROMGIT: scsi: ufs: Move dumps in IRQ handler to error handler\n70919caeae8d BACKPORT: FROMGIT: scsi: ufs: Recover HBA runtime PM error in error handler\n4a1580fcd3bd BACKPORT: FROMGIT: scsi: ufs: Fix concurrency of error handler and other error recovery paths\n999af2acc813 BACKPORT: FROMGIT: scsi: ufs: Add some debug information to ufshcd_print_host_state()\n1cab1d810d0c FROMGIT: scsi: ufs-qcom: Remove testbus dump in ufs_qcom_dump_dbg_regs\nccc0fb140805 FROMGIT: scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config()\n1989bdb553d1 FROMGIT: scsi: ufs: Add checks before setting clk-gating states\n013a1a228267 ANDROID: sched: add restrict vendor hook to modify task placement policy in EAS\na8021ba684c5 ANDROID: vendor_hooks: Add vendor hook to the net\na2bf50800d51 ANDROID: update abi for ieee80211_get_channel_khz and ieee80211_channel_to_freq_khz\n1d079bc4f1e1 ANDROID: Update abi_gki_aarch64_cuttlefish\n420f16042de4 ANDROID: vendor_hooks: add waiting information for blocked tasks\n010ff9a0f65f FROMLIST: tty: serial: qcom_geni_serial: Drop __init from qcom_geni_console_setup\ndedebfe0ae5f ANDROID: GKI: update abi due to 5.4.59 changes\n6d7a8d3f1316 Merge 5.4.59 into android12-5.4\n178e614ccc10 ANDROID: GKI: Update ABI representation\nf3492da43133 ANDROID: GKI: ABI list update for cuttlefish\nc5f9ea8f27f3 ANDROID: GKI: Enable CONFIG_USB_ACM\n55735e48d24f ANDROID: GKI: Build CEC_{CORE,NOTIFIER,PIN} in\n78354b512fd2 ANDROID: fix a bug in quota2\n61837660f575 ANDROID: ABI: update ABI after 6GHz bad support\nb1be76eeab19 BACKPORT: cfg80211: require HE capabilities for 6 GHz band\nf67b93bdcffa BACKPORT: cfg80211: reject HT/VHT capabilities on 6 GHz band\n2d4788c052e2 BACKPORT: cfg80211: treat 6 GHz channels as valid regardless of capability\nae769fa4f380 BACKPORT: mac80211: Add HE 6GHz capabilities element to probe request\n3df5081a17c7 BACKPORT: mac80211: add HE 6 GHz Band Capability element\nced510ec6bef BACKPORT: cfg80211: add and expose HE 6 GHz band capabilities\nc31b55b1a14a BACKPORT: cfg80211: handle 6 GHz capability of new station\nb065936ca6fb BACKPORT: ieee80211: add HE ext EIDs and 6 GHz capability defines\n471d4d7afd0d BACKPORT: ieee80211: add code to obtain and parse 6 GHz operation field\ncc5781256d38 BACKPORT: cfg80211: add a helper to identify 6 GHz PSCs\n9b2d1002f610 BACKPORT: cfg80211: adapt to new channelization of the 6GHz band\nbf1be1644022 BACKPORT: cfg80211: fix 6 GHz frequencies to kHz\nc594051168e9 BACKPORT: cfg80211: express channels with a KHz component\ndb4c5bdbbd7a ANDROID: GKI: Enable CEC support\n0881b55787d3 ANDROID: db845c: set BUILD_INITRAMFS\u003d1\n\nTest: treehugger\nBug: 166127069\nChange-Id: I53e67f7b16fdf9810c649ec091982d7f7de81f64\n" }, { "commit": "2e158b0b858be9b54cab97e254f660c4dd7073bd", "tree": "a6e63a49ca45ee7e88e4aa02a39a30112fa63d85", "parents": [ "8b68db95b0a512d27e47494ec255a5f2c1364c42", "506f698ba7c59cece5c6acecb84a1ba44feeb6a8" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Sun Aug 16 23:18:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Aug 16 23:18:01 2020 +0000" }, "message": "Update kernel to builds 6764805 am: 506f698ba7\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1401707\n\nChange-Id: Ifc4506e42578363480ed20ff594f7906d27f7022\n" }, { "commit": "506f698ba7c59cece5c6acecb84a1ba44feeb6a8", "tree": "a6e63a49ca45ee7e88e4aa02a39a30112fa63d85", "parents": [ "d1f215c61e10dbe787095cbd23c524fe7a381306" ], "author": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Sun Aug 16 12:34:00 2020 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@google.com", "time": "Sun Aug 16 12:36:47 2020 -0700" }, "message": "Update kernel to builds 6764805\n\ngit log --first-parent -100 --oneline --no-decorate 928d72f69121..c3221b7ac740:\nc3221b7ac740 FROMLIST: ufs: change the way to complete fDeviceInit\n8f461a35778c UPSTREAM: update to latest version of scripts/checkpatch.pl\nfc9e35d72c06 ANDROID: GKI: enable CONFIG_LEDS_TRIGGER_TIMER\n00dc5af368b7 ANDROID: GKI: add some padding to some driver core structures\n0f9671b21cdd BACKPORT: scsi: ufs: Fix and simplify setup_xfer_req variant operation\n5a415c7efe6c ANDROID: GKI: enable USB UVC drivers\n3eca640a57dc ANDROID: GKI: enabled CONFIG_USB_CONFIGFS_NCM\u003dy\n46090d578669 ANDROID: GKI: enable LEDS_CLASS_FLASH\n7fc27297c44d Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android12-5.4\ne8681c2b66ea Revert \"drm/drm_fb_helper: fix fbdev with sparc64\"\n8068891661ad Merge 5.4.58 into android12-5.4\n469f79148e88 ANDROID: Update ABI xml and symbol lists\nd75bf6018379 ANDROID: fscrypt: add support for hardware-wrapped keys\nd989796ef43b ANDROID: dm: Add wrapped key support in dm-default-key\n77548fb7d5a5 ANDROID: dm: add support for passing through derive_raw_secret\n2130e2937260 ANDROID: block: add hardware-wrapped key support\n30d84babf8e9 ANDROID: dm: add dm-default-key target for metadata encryption\nfc918350c35b ANDROID: block: export symbols needed for modules to use inline crypto\n1b9e5fd94da8 ANDROID: dm: enable may_passthrough_inline_crypto on some targets\n48f6e9313844 ANDROID: dm: add support for passing through inline crypto support\n1b9fc3f983d6 ANDROID: block: Introduce passthrough keyslot manager\nebabaa9c7acf ANDROID: f2fs: add back compress inode check\n58ecbf7b805d FROMLIST: f2fs: support direct I/O with fscrypt using blk-crypto\n3e72a1f93513 BACKPORT, FROMLIST: ext4: support direct I/O with fscrypt using blk-crypto\na2186f3d588b FROMLIST: direct-io: add support for fscrypt using blk-crypto\n3691693c702a FROMLIST: fscrypt: Add functions for direct I/O support\na3375307e5bb UPSTREAM: fscrypt: don\u0027t load -\u003ei_crypt_info before it\u0027s known to be valid\na8d75fb8be44 UPSTREAM: fscrypt: document inline encryption support\n5e4e7d9a4439 UPSTREAM: fscrypt: use smp_load_acquire() for -\u003ei_crypt_info\n9d0a4fbe3db2 UPSTREAM: fscrypt: use smp_load_acquire() for -\u003es_master_keys\n1d1718fed6cf UPSTREAM: fscrypt: use smp_load_acquire() for fscrypt_prepared_key\n5f7f0784a8a4 BACKPORT: fscrypt: switch fscrypt_do_sha256() to use the SHA-256 library\n8ceb5a537772 UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS\n025ff09794f7 UPSTREAM: fscrypt: rename FS_KEY_DERIVATION_NONCE_SIZE\ne3138348d6c5 UPSTREAM: fscrypt: add comments that describe the HKDF info strings\nc83e73f88a6b BACKPORT: ext4: add inline encryption support\n2b35e22bf47d BACKPORT: f2fs: add inline encryption support\n72d6b779a665 UPSTREAM: fscrypt: add inline encryption support\neb2c1f80fb5d UPSTREAM: fs: introduce SB_INLINECRYPT\n1b18d719b9cd BACKPORT: scsi: ufs: Add program_key() variant op\n28b7a9ce4090 BACKPORT: scsi: ufs: Add inline encryption support to UFS\nf81e4c5b35d5 BACKPORT: scsi: ufs: UFS crypto API\n23670502884f BACKPORT: scsi: ufs: UFS driver v2.1 spec crypto additions\nfeefb39e579d UPSTREAM: block: blk-crypto-fallback: remove redundant initialization of variable err\na8b555bac0d1 BACKPORT: block: blk-crypto-fallback for Inline Encryption\nd47fe9a4d1a6 UPSTREAM: block: Make blk-integrity preclude hardware inline encryption\n02fea3fe34f4 BACKPORT: block: Inline encryption support for blk-mq\n1bdac79c4793 UPSTREAM: block: Keyslot Manager for Inline Encryption\n9c6aceff57ac UPSTREAM: Documentation: Document the blk-crypto framework\n64c6f35df5ae Revert inline encryption support\n9f431d767d53 ANDROID: fix redefinition error for restricted vendor hooks\ndf9cd6bf799e UPSTREAM: loop: Fix wrong masking of status flags\ne4807df7062c UPSTREAM: loop: Add LOOP_CONFIGURE ioctl\ndaa86da815aa UPSTREAM: loop: Clean up LOOP_SET_STATUS lo_flags handling\neb425a8b3ff9 UPSTREAM: loop: Rework lo_ioctl() __user argument casting\n3fe6915ebd0f UPSTREAM: loop: Move loop_set_status_from_info() and friends up\n7f6a6216fb4b BACKPORT: loop: Factor out configuring loop from status\n97c5cda64222 UPSTREAM: loop: Remove figure_loop_size()\n2663804d23bc UPSTREAM: loop: Refactor loop_set_status() size calculation\n212302eb3b9a UPSTREAM: loop: Factor out setting loop device size\n7ca11ae6de62 UPSTREAM: loop: Remove sector_t truncation checks\n1211cc367625 UPSTREAM: loop: Call loop_config_discard() only after new config is applied\n99256a8c206b FROMLIST: rpmsg: Guard against null endpoint ops in destroy\n67817383aee3 Merge 5.4.57 into android12-5.4\n3d6f2b505984 ANDROID: Update ABI xml\nf7faa6935c56 UPSTREAM: of: property: Add device link support for pinctrl-0 through pinctrl-8\ne79ed9c83c7f UPSTREAM: of: property: Add device link support for multiple DT bindings\n263aa40afe1c UPSTREAM: driver core: Change delimiter in devlink device\u0027s name to \"--\"\n3c25c31da81f UPSTREAM: driver core: Fix sleeping in invalid context during device link deletion\n2d358bf53c93 BACKPORT: driver core: Add waiting_for_supplier sysfs file for devices\nd661c79e9025 UPSTREAM: driver core: Add state_synced sysfs file for devices that support it\na62ec7f41456 UPSTREAM: driver core: Expose device link details in sysfs\n85094daca20b UPSTREAM: driver core: Avoid deferred probe due to fw_devlink_pause/resume()\n06883b8d0861 UPSTREAM: driver core: Rename dev_links_info.defer_sync to defer_hook\n5b32d579426d UPSTREAM: driver core: Don\u0027t do deferred probe in parallel with kernel_init thread\nf11088f40a03 UPSTREAM: arm64/module: Optimize module load time by optimizing PLT counting\n20874555c706 FROMGIT: scsi: block: pm: Simplify resume handling\n8555f0d9d303 ANDROID: Remove abi_gki_aarch64_android_internal\n87915c1e4624 ANDROID: Update abi_gki_aarch64_hikey960\n0dad4df3f8b4 ANDROID: build.config.hikey960: Enable KMI list updates with build_abi.sh\nfa2b3f683be5 ANDROID: Update abi_gki_aarch64_db845c\n10dadba8c732 ANDROID: build.config.db845c: Enable KMI list updates with build_abi.sh\n750930c292ae Revert \"Revert \"ANDROID: ASoC: compress: fix unsigned integer overflow check\"\"\nfc75d2f6e534 ANDROID: build.config.gki.aarch64: Set MODULES_ORDER\n829e5a74a206 Merge 5.4.56 into android12-5.4\n1646c5e997e6 ANDROID: kallsyms: increase KSYM_NAME_LEN\n534f199b1ea1 ANDROID: GKI: update KMI after RCU CONFIGs added\nbb10162adaa2 ANDROID: GKI: enable RCU configs\n5f50a7737b1d FROMGIT: f2fs: should avoid inode eviction in synchronous path\n5c524b17ccd3 ANDROID: GKI: update abi xml files\n114a95bb9fc1 Merge 5.4.55 into android12-5.4\na6b381772d46 FROMLIST: power: add \"Wireless\" to power_supply_type and power_supply_type_text\nd75ddc924b99 Revert \"ANDROID: ASoC: compress: fix unsigned integer overflow check\"\nb38e25081b40 Revert \"ANDROID: ALSA: jack: Update supported jack switch types\"\nc612a0397f8f ANDROID: build.config.hikey960: use MAKE_GOALS and specify hi3660-hikey960.dtb\n95c511558b3b ANDROID: Specify MAKE_GOALS and optimize targets\nf311d00f3041 Merge 5.4.54 into android12-5.4\n87938782e894 BACKPORT: FROMLIST: cpuidle: change enter_s2idle() prototype\n7a8ee138118a ANDROID: staging: android: ion: Fix compilation error for ion_trace.h\n16970050f18f ANDROID: build: update ABI definitions\n\nTest: treehugger\nBug: 163218447\nChange-Id: I9e43416bd129c783959980f73dc51991fd7ab769\n" }, { "commit": "c20ab97f3dfab0defed71594357ba9c2fd4d9445", "tree": "d3312675a010ab6e72b46f2384169ccb77e7756e", "parents": [ "78669b669327a1f424a3cbf260db9ccfafcff45b", "d9289c4e43713d09471b1b7d8a1f17c3108b9e04" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon Jul 27 18:18:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 27 18:18:22 2020 +0000" }, "message": "Update kernel to builds 6710135 am: d1f215c61e am: 8b68db95b0 am: d9289c4e43\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1372916\n\nChange-Id: Ib76787a18db411e5ad27cae30c099ff8af108b60\n" }, { "commit": "d9289c4e43713d09471b1b7d8a1f17c3108b9e04", "tree": "d3312675a010ab6e72b46f2384169ccb77e7756e", "parents": [ "fee6ca291605c766717882a10a9ed6e1222aeb2f", "8b68db95b0a512d27e47494ec255a5f2c1364c42" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon Jul 27 18:05:01 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 27 18:05:01 2020 +0000" }, "message": "Update kernel to builds 6710135 am: d1f215c61e am: 8b68db95b0\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1372916\n\nChange-Id: Iab1bd63507100b606fce538218670a7b260597fb\n" }, { "commit": "8b68db95b0a512d27e47494ec255a5f2c1364c42", "tree": "d3312675a010ab6e72b46f2384169ccb77e7756e", "parents": [ "0ec740214403e1e23898364faab089cc1a1f7add", "d1f215c61e10dbe787095cbd23c524fe7a381306" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon Jul 27 17:54:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 27 17:54:37 2020 +0000" }, "message": "Update kernel to builds 6710135 am: d1f215c61e\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1372916\n\nChange-Id: I2692d971467bd7ed91b8c28046cdacbe61264be5\n" }, { "commit": "d1f215c61e10dbe787095cbd23c524fe7a381306", "tree": "d3312675a010ab6e72b46f2384169ccb77e7756e", "parents": [ "f5e9dde255adaefafedefc01944118342975ca3e" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Sun Jul 26 15:34:13 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Sun Jul 26 15:36:27 2020 -0700" }, "message": "Update kernel to builds 6710135\n\nFor virtiofs, xhci hcd. This also pulls in bootconfig.\n\n928d72f69121 ANDROID: GKI: Update cf symbol list for XHCI\n5c3841e16e44 ANDROID: GKI: Update ABI for new FUSE symbols\nc0571d9bdc40 ANDROID: GKI: Don\u0027t compact fuse_req when CONFIG_VIRTIO_FS\u003dn\n1efa6b03d52e ANDROID: GKI: Update cf symbol list for virtio-fs\n844c60a3ee7f UPSTREAM: lkdtm/heap: Avoid edge and middle of slabs\n1b10f83ba8b9 UPSTREAM: lkdtm: Avoid more compiler optimizations for bad writes\nbf505f50ca31 ANDROID: Incremental fs: magic number compatible 32-bit\n7efcf422eb98 ANDROID: kbuild: don\u0027t merge .*..compoundliteral in modules\n2d7ae7b61421 ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC\ncaed3ce0f7ff ANDROID: GKI: Don\u0027t compact data structures when CONFIG_ZSMALLOC\u003dn\n5937633bf76a ANDROID: GKI: Update ABI since moving zsmalloc to vendor fragment\n6ebdde7e9458 ANDROID: GKI: Update cuttlefish symbol list (zsmalloc moved)\n1c77c2c81861 ANDROID: GKI defconfig: Remove ZSMALLOC from gki_defconfig\nee47ab2ce1c5 ANDROID: GKI: update abi definitions for 5.4.53\n71bf0108cfbd Revert \"arm64/alternatives: use subsections for replacement sequences\"\n07485fb974ed Merge 5.4.53 into android12-5.4\nf51ce0659c2a ANDROID: power: wakeup_reason: export log_threaded_irq_wakeup_reason\n8d7cf271dc73 ANDROID: power: wakeup_reason: refine wakeup logs\ne6cae5574a9a ANDROID: GKI: Update ABI since moving zram to vendor fragment\n677c2683f143 ANDROID: GKI: Update cuttlefish symbol list\n2f90f81ed2e1 ANDROID: GKI defconfig: Remove ZRAM from gki defconfig\n0c0d417747d8 ANDROID: setlocalversion: fix posix issue with \"[[\"\ned51ffd0c17c ANDROID: GKI: Update abi representation\n59bd4dfa9c45 Revert \"ANDROID: GKI: Revert \"mm: unexport free_reserved_area\"\"\n0724842a95bd ANDROID: GKI: Update the abi due to changes in 5.4.52\n725d11d2829a Merge 5.4.52 into android12-5.4\na3312386e989 ANDROID: GKI: Update ABI and export list for qcom\nfba2ba34d0fe Revert \"ANDROID: net: enable wireless core features with GKI_LEGACY_WEXT_ALLCONFIG\"\nb1bfd222ea07 ANDROID: update the kernel release format for GKI\nd148b2c1de5b ANDROID: db845c_gki.fragment: drop CONFIG_USB_EHCI_HCD and CONFIG_USB_EHCI_HCD_PLATFORM\naf58d04929ef ANDROID: GKI: build in more Bluetooth drivers\nf9b9ab8db435 ANDROID: GKI: update abi xml file\n960fc1f8c1e4 ANDROID: GKI: Enable CONFIG_BT_HIDP as it is needed by some platforms\nd2f309e5569d ANDROID: GKI: add CONFIG_BT to x86 gki_defconfig\na015458a0add ANDROID: GKI: enable usb storage drivers\n2b1e27a8240d ANDROID: GKI: support CONFIG_USB_EHCI_HCD_PLATFORM\n95f26af6ee7d ANDROID: GKI: support CONFIG_USB_EHCI_HCD\n42adbe0458e6 ANDROID: fscrypt: fix DUN contiguity with inline encryption + IV_INO_LBLK_32 policies\nbefea131d1d7 ANDROID: ABI updates for db845c (enabling wifi)\n3b861306c570 ANDROID: db845c_gki.fragment: Enable wifi on db845c w/ android-5.4\ne5defbb91add UPSTREAM: arm64: dts: qcom: sdm845: Add APSS watchdog node\ne1aaf1f859ba UPSTREAM: arm64: dts: qcom: db845c: Move remoteproc firmware to sdm845\nad2873b43b3a UPSTREAM: ath10k: qmi: Sleep for a while before assigning MSA memory\n1466ca111d28 UPSTREAM: soc: qcom: qmi: Return EPROBE_DEFER if no address family\n22b73c7316d2 ANDROID: GKI: set CONFIG_STATIC_USERMODEHELPER_PATH\nfd98495a63a8 ANDROID: sound: usb: Add vendor\u0027s hooking interface\n76c227a62c1f UPSTREAM: tools/bootconfig: Add testcase for show-command and quotes test\n4af580cb58e5 UPSTREAM: tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig\n38fbbf9f6666 UPSTREAM: tools/bootconfig: Fix to use correct quotes for value\n9de05d53a85c UPSTREAM: proc/bootconfig: Fix to use correct quotes for value\n111324dcbd1f UPSTREAM: tools/bootconfig: Add a summary of test cases and return error\n98f540a51202 UPSTREAM: bootconfig: Fix to prevent warning message if no bootconfig option\n335876854d0b UPSTREAM: tools/bootconfig: Fix apply_xbc() to return zero on success\nc686b3a5dfa1 UPSTREAM: tools/bootconfig: Fix resource leak in apply_xbc()\nd75f91d7ba5d UPSTREAM: bootconfig: Fix to remove bootconfig data from initrd while boot\ne210177626f6 UPSTREAM: tools/bootconfig: Show line and column in parse error\ne80007e3933a UPSTREAM: bootconfig: Support O\u003d\u003cbuilddir\u003e option\nb15ac9e50d71 UPSTREAM: bootconfig: Add append value operator support\n9aa0c77a68a8 UPSTREAM: bootconfig: Prohibit re-defining value on same key\na184e1d129f2 UPSTREAM: bootconfig: Print array as multiple commands for legacy command line\nb3be16d48d8b UPSTREAM: bootconfig: Reject subkey and value on same parent key\n63cb6011034a UPSTREAM: tools/bootconfig: Remove unneeded error message silencer\n2e0afa7d0142 UPSTREAM: bootconfig: Add bootconfig magic word for indicating bootconfig explicitly\ndb4fe8709910 ANDROID: GKI: Enable BOOT_CONFIG\nd8b8dcff5766 BACKPORT: bootconfig: Set CONFIG_BOOT_CONFIG\u003dn by default\n5b534893cfe0 UPSTREAM: bootconfig: Mark boot_config_checksum() static\n450f476e72fa UPSTREAM: Documentation: bootconfig: fix Sphinx block warning\n59f56b09d3c4 UPSTREAM: tools/bootconfig: Suppress non-error messages\n149111c243eb UPSTREAM: bootconfig: Allocate xbc_nodes array dynamically\n4218eec760b9 UPSTREAM: bootconfig: Use parse_args() to find bootconfig and \u0027--\u0027\n2ccf3fbef5ff UPSTREAM: bootconfig: Remove unneeded CONFIG_LIBXBC\n06e470eb8f0c UPSTREAM: tools/bootconfig: Fix wrong __VA_ARGS__ usage\n16ebe9b24b6f UPSTREAM: bootconfig: Show the number of nodes on boot message\ncbb72a6ed974 UPSTREAM: tools/bootconfig: Show the number of bootconfig nodes\nb1a7a4779415 UPSTREAM: bootconfig: Add more parse error messages\n6b8b3a13bc2f UPSTREAM: bootconfig: Use bootconfig instead of boot config\nd37934a14731 BACKPORT: bootconfig: Only load bootconfig if \"bootconfig\" is on the kernel cmdline\na6daefae35cc UPSTREAM: tools: bootconfig: Fix spelling mistake \"faile\" -\u003e \"failed\"\n7aaf746f861c UPSTREAM: Documentation: bootconfig: Fix typos in bootconfig documentation\nccc5ab805ccb UPSTREAM: bootconfig: Fix Kconfig help message for BOOT_CONFIG\ne7c59f06dd85 BACKPORT: Documentation: bootconfig: Add a doc for extended boot config\ndc4076687c26 UPSTREAM: bootconfig: init: Allow admin to use bootconfig for init command line\ndca811b6c434 UPSTREAM: bootconfig: init: Allow admin to use bootconfig for kernel command line\n35376c57eb17 UPSTREAM: init/main.c: Alloc initcall_command_line in do_initcall() and free it\ne43f2f7755b6 UPSTREAM: proc: bootconfig: Add /proc/bootconfig to show boot config list\ne81eb14e2d70 UPSTREAM: tools: bootconfig: Add bootconfig test script\ne29ec0add027 UPSTREAM: tools: bootconfig: Add bootconfig command\n71dd63b59040 UPSTREAM: bootconfig: Load boot config from the tail of initrd\nd8b9ff235b72 UPSTREAM: bootconfig: Add Extra Boot Config support\n9de16c6eb7c3 UPSTREAM: slimbus: core: Set fwnode for a device when setting of_node\n70f740a59235 ANDROID: f2fs: add back compress inode check\na65bb671702d ANDROID: Correct branch name after rename\nd16111a8cf53 ANDROID: PM: sleep: export device_pm_callback_start/end trace event\nb303edc95d21 ANDROID: GKI: update abi definitions\n99505549a80c ANDROID: mm: add vendor padding for SPECULATIVE_PAGE_FAULTS\n43cb883475a5 ANDROID: GKI: update ABI due to power supply changes\n3884142d2e11 UPSTREAM: power: supply: core: add POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED\n50838b53c20a UPSTREAM: power: supply: core: add manufacture date properties\ne00791f6c6aa UPSTREAM: power: supply: core: add capacity error margin property\n8643235e866c UPSTREAM: power: supply: core: Add type property to uevent env\ncc4f8bc51480 UPSTREAM: power: supply: core: Add a macro that maps enum properties to text values\n7997d091b515 UPSTREAM: power: supply: core: Use designated initializer for property text arrays\n34b830881d43 UPSTREAM: power: supply: core: Cleanup power supply sysfs attribute list\nd398f3a7517a UPSTREAM: power: supply: core: reduce power_supply_show_usb_type() parameters\n751ce8dc6bbf ANDROID: fix copyright notice\nbbc26e22b844 ANDROID: add support for vendor hooks\n027ff03c186c ANDROID: GKI: update abi definitions\nb847aec98e83 Merge 5.4.51 into android12-5.4\n07da2129a868 ANDROID: Update ABI representation for libabigail update\n2bd8bd576f61 ANDROID: Update the ABI representation\n33f6768a3518 ANDROID: GKI: Update CF abi list for virtio-console\n\nTest: TreeHugger\nBug: 157247714\nBug: 161843089\nBug: 162074442\nChange-Id: I509a86375004f37dc349186f216d3c8e81fce27a\n" }, { "commit": "78669b669327a1f424a3cbf260db9ccfafcff45b", "tree": "46d012960b71f9214cd1435c00a057781ae596cb", "parents": [ "7a21bc81bf503e56982ffee619af9ad47250e35f", "fee6ca291605c766717882a10a9ed6e1222aeb2f" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 08 18:55:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 08 18:55:28 2020 +0000" }, "message": "Update kernel to builds 6661949 am: f5e9dde255 am: 0ec7402144 am: fee6ca2916\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1358464\n\nChange-Id: Ie48a912c5a78cb30ff67d7555222ff11514f2c15\n" }, { "commit": "fee6ca291605c766717882a10a9ed6e1222aeb2f", "tree": "46d012960b71f9214cd1435c00a057781ae596cb", "parents": [ "8797ea336d5fef808dbd1127b8d539de9ceaf280", "0ec740214403e1e23898364faab089cc1a1f7add" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 08 18:46:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 08 18:46:23 2020 +0000" }, "message": "Update kernel to builds 6661949 am: f5e9dde255 am: 0ec7402144\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1358464\n\nChange-Id: Id153518d74c84513c4ad56e38d9ff5ca9110f5b5\n" }, { "commit": "0ec740214403e1e23898364faab089cc1a1f7add", "tree": "46d012960b71f9214cd1435c00a057781ae596cb", "parents": [ "f0db0eba937482aa96a42bdd99fc254905c092a8", "f5e9dde255adaefafedefc01944118342975ca3e" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 08 18:33:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 08 18:33:38 2020 +0000" }, "message": "Update kernel to builds 6661949 am: f5e9dde255\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1358464\n\nChange-Id: Ia39ba994cc25b631ac26d164f470a8656f0d2d57\n" }, { "commit": "f5e9dde255adaefafedefc01944118342975ca3e", "tree": "46d012960b71f9214cd1435c00a057781ae596cb", "parents": [ "dee79cba425998e21282504bd289641f3a8a4c12" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 08 08:54:13 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 08 08:59:14 2020 -0700" }, "message": "Update kernel to builds 6661949\n\nTo add back virtio-console, which is now usable in crosvm.\n\nb8018578d1c3 ANDROID: ion: remove kmap from begin[end]_cpu_access\n1099a8c450f5 ANDROID: db845c_gki.fragment: Remove nonexistent CONFIG_USB_DWC3_DISABLE_GADGET_SG value\nf54f21a7a4e3 ANDROID: db845c: Remove CONFIG_USB_ROLE_SWITCH from db845c_gki.fragment\nac07b8ea76a9 ANDROID: GKI: make VIDEOBUF2_DMA_CONTIG under GKI_HIDDEN_MEDIA_CONFIGS\n7c8a73f320ef ANDROID: GKI: enable CONFIG_V4L_PLATFORM_DRIVERS\n6f753c72777f ANDROID: fix copyright notice\ne571c0b15e58 ANDROID: GKI: add android_vendor.h\n51ddbb57397e UPSTREAM: usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle\n6cb5e3536b66 ANDROID: GKI: move abi files to android/\nc4b72ad25c23 ANDROID: GKI: drop unneeded \"_whitelist\" off of symbol filenames\n45217b91eaaa UPSTREAM: net: bpf: Make bpf_ktime_get_ns() available to non GPL programs\n9e9a4c05a0b0 ANDROID: Makefile: append BUILD_NUMBER to version string when defined\nec57e3434c4a UPSTREAM: bpf: Add gso_size to __sk_buff\n93dc81bbbde5 ANDROID: GKI: scripts: Makefile: update the lz4 command (#2)\n14693a753f56 Merge 5.4.50 into android-5.4\ncc1bcfc463e6 ANDROID: ABI updates for hikey960 (related to TYPEC_TCPM and UFS_HISI)\nae78c73104aa ANDROID: hikey960_gki.fragment: Remove UFS and USB bits\n\nTest: TreeHugger\nBug: 160341724\nChange-Id: I49e08b741416a2f9d80dd8265ede291da6b5c65e\n" }, { "commit": "7a21bc81bf503e56982ffee619af9ad47250e35f", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "34a2b0b14d0aa8843abaddc77271efb8203a55a0", "8797ea336d5fef808dbd1127b8d539de9ceaf280" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 07:04:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 07:04:37 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6638796 am: f0c9d0b1fe -s ours am: 8797ea336d -s ours\n\nam skip reason: Change-Id I2ee2db16ca68ad3f4edf55cdc8d93d1341559129 with SHA-1 dee79cba42 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11995650\n\nChange-Id: I24b937758bd40e6623ad0ad022ff620959d74419\n" }, { "commit": "34a2b0b14d0aa8843abaddc77271efb8203a55a0", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "d19cda07ab0c7b3a8717ea212cf5dfef873ab9bb", "045b001fd68771d5c411feb97ab0c6be67d8f255" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 07:04:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 07:04:12 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6638796 am: f0c9d0b1fe am: 045b001fd6 -s ours\n\nam skip reason: Change-Id I2ee2db16ca68ad3f4edf55cdc8d93d1341559129 with SHA-1 dee79cba42 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11995650\n\nChange-Id: I6a5a998f057a22e19b18688bf99b73241bfc0c5e\n" }, { "commit": "8797ea336d5fef808dbd1127b8d539de9ceaf280", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "89187975ca51403b072557904629ee19abe90100", "f0c9d0b1fef284c085a5bd3a62dbf950161e26de" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 06:54:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 06:54:46 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6638796 am: f0c9d0b1fe -s ours\n\nam skip reason: Change-Id I2ee2db16ca68ad3f4edf55cdc8d93d1341559129 with SHA-1 dee79cba42 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11995650\n\nChange-Id: Ibf5ec7f1801ed7469a8b584c2bc7d2426daacc70\n" }, { "commit": "045b001fd68771d5c411feb97ab0c6be67d8f255", "tree": "2a9396841feb7a2d73e69e32bb65c0694cda1dee", "parents": [ "7418a5ec3cbc5873ef2c52b757f3049539c9bf0f", "f0c9d0b1fef284c085a5bd3a62dbf950161e26de" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 06:54:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 06:54:30 2020 +0000" }, "message": "Update kernel to builds 6638796 am: f0c9d0b1fe\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11995650\n\nChange-Id: If3393924849364c50a948d71733739efb1ef9260\n" }, { "commit": "f0c9d0b1fef284c085a5bd3a62dbf950161e26de", "tree": "2a9396841feb7a2d73e69e32bb65c0694cda1dee", "parents": [ "5f66ee79ceb9931e4ae79489c977b97cee89eb6f" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jun 24 23:20:59 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 04:18:08 2020 +0000" }, "message": "Update kernel to builds 6638796\n\nTo enable ext4 casefolding, incrementalfs as a module, and fix the\nwhitelist for cuttlefish arm64.\n\nThis also makes the kernel an LZ4-compressed artifact.\n\nad0c0ab1dc9a ANDROID: GKI: revert part of the ufshcd_* export removals\n91f19a26c8db ANDROID: GKI: update ABI definitions based on recent wifi backports\ne1f28e7d042d BACKPORT: cfg80211: Configure PMK lifetime and reauth threshold for PMKSA entries\n2d0e01ce4686 BACKPORT: nl80211: add no pre-auth attribute and ext. feature flag for ctrl. port\ndc58762f1284 BACKPORT: nl80211: modify TID-config API\n7a59f8cab6af BACKPORT: nl80211: Add NL command to support TID speicific configurations\n02d9f7e3168b BACKPORT: cfg80211: Support key configuration for Beacon protection (BIGTK)\nc97196363981 BACKPORT: cfg80211: More error messages for key addition failures\n67a67ac328b1 BACKPORT: cfg80211: Enhance the AKM advertizement to support per interface.\n92a63a3d99f4 BACKPORT: nl80211: add handling for BSS color\n50635d9eba3b BACKPORT: cfg80211: VLAN offload support for set_key and set_sta_vlan\n9d21bcd4897b Revert \"ANDROID: fscrypt: add key removal notifier chain\"\nee48a99fffd4 UPSTREAM: scsi: ufs: Fix imprecise load calculation in devfreq window\n03911e93a01d UPSTREAM: scsi: ufs: Add trace event for UIC commands\n95821c4676d8 UPSTREAM: scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices\nec9cb276d980 UPSTREAM: scsi: ufs-mediatek: Allow unbound mphy\n332ca84ae310 UPSTREAM: scsi: ufs-mediatek: Fix unbalanced clock on/off\ne957d1ef81e6 UPSTREAM: scsi: ufs-mediatek: Introduce low-power mode for device power supply\nc214857a9e5c UPSTREAM: scsi: ufs-mediatek: Do not gate clocks if auto-hibern8 is not entered yet\n767e264476c2 UPSTREAM: scsi: ufs-mediatek: Fix imprecise waiting time for ref-clk control\nf05b5ebadf9b BACKPORT: scsi: ufs: Disable WriteBooster capability in non-supported UFS device\n7d7025426c05 BACKPORT: scsi: ufs: Fix WriteBooster flush during runtime suspend\nf9e7e458ec0b BACKPORT: scsi: ufs: Fix index of attributes query for WriteBooster feature\n3b7a80ece86a BACKPORT: scsi: ufs: Allow WriteBooster on UFS 2.2 devices\n43dcb17356a3 UPSTREAM: scsi: ufs-mediatek: Customize WriteBooster flush policy\n7e6050a292b7 UPSTREAM: scsi: ufs: Customize flush threshold for WriteBooster\n79ec7f299825 BACKPORT: scsi: ufs: Introduce ufs_hba_variant_params to group customizable parameters\nf3fe388ed3a5 UPSTREAM: scsi: ufs-mediatek: Make ufs_mtk_fixup_dev_quirks static\na75bb434015d UPSTREAM: scsi: ufs: Cleanup WriteBooster feature\n3ea1305d5aa0 UPSTREAM: scsi: ufs-mediatek: Enable WriteBooster capability\n1d3b062a354f BACKPORT: scsi: ufs: Add LU Dedicated buffer mode support for WriteBooster\n003f641e0968 BACKPORT: scsi: ufs: Add \"index\" in parameter list of ufshcd_query_flag()\n5698f58e2f18 UPSTREAM: scsi: ufs-mediatek: Add fixup_dev_quirks vops\n38eebefa26a4 UPSTREAM: scsi: ufs: Export ufs_fixup_device_setup() function\ndcda3bd59fc1 BACKPORT: scsi: ufs: Introduce fixup_dev_quirks vops\ne854924b254e UPSTREAM: scsi: ufs-mediatek: add error recovery for suspend and resume\n77c34d53279c UPSTREAM: scsi: ufs: export ufshcd_link_recovery\nca2a30f1ae15 UPSTREAM: scsi: ufs-mediatek: customize the delay for enabling host\nb55279445bd7 UPSTREAM: scsi: ufs: make HCE polling more compact to improve initialization latency\nbc215bc7f44a BACKPORT: scsi: ufs: allow custom delay prior to host enabling\n63350d1025c5 UPSTREAM: scsi: ufs-mediatek: use common delay function\nc25f60d280e3 UPSTREAM: scsi: ufs: introduce common and flexible delay function\n058a7d039527 UPSTREAM: scsi: ufs: fix uninitialized tx_lanes in ufshcd_disable_tx_lcc()\n8880ad49163a UPSTREAM: scsi: ufs-mediatek: fix HOST_PA_TACTIVATE quirk for Samsung UFS Devices\n0f30b1ed21a4 BACKPORT: scsi: ufs: Add max_lu_supported in struct ufs_dev_info\n7b096eac4f71 ANDROID: GKI: remove ufshcd_* exports from whitelists\n11b71f23d9e1 ANDROID: GKI: enable CONFIG_SCSI_UFS_DWC_TC_PLATFORM\ncd0992a39500 ANDROID: GKI: enable QCOM and HISI UFS drivers\n65343a49009d ANDROID: GKI: enable UFS for x86 gki builds and SCSI_UFSHCD_PCI\n85d29c4d6e12 UPSTREAM: amba: Retry adding deferred devices at late_initcall\n191e77e38709 ANDROID: GKI: Enable INTERVAL_TREE\nbf0e4f96e4db FROMGIT: binder: fix null deref of proc-\u003econtext\ncf99ddf1b0f7 ANDROID: Makefile: append BUILD_NUMBER to version string when defined\n6591327ca7de ANDROID: GKI: update the abi definitions due to 5.4.49 and padding\nd45a57da92db ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget\nc55dd6d1b6bf ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint\n90dbaed65a46 Merge 5.4.49 into android-5.4-stable\n954d16b089d1 ANDROID: ext4: Optimize match for casefolded encrypted dirs\n268041d71e8b ANDROID: ext4: Handle casefolding with encryption\n18df2d2ddba8 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4-stable\n754986db95d9 ANDROID: abi_gki_aarch64_qcom_whitelist: Add reboot_mode\nc7535717e701 ANDROID: Update kabi for db845c (following moving pinctrl to a module)\n4a56fb71edf8 ANDROID: GKI: Remove msm_pinctrl-* symbols from the abi lists\nf3cc55c9dd2e ANDROID: db845c_gki.fragment: Add PINCTRL_MSM\u003dm\n8bd3ec8eabf1 ANDROID: GKI: Remove PINCTRL_MSM as built in driver\n5edcc7517c2a ANDROID: pinctrl: qcom: Allow pinctrl-msm code to be loadable as a module\n16e0b6d5b2bc ANDROID: GKI: update ABI after struct vm_fault changes\nf63dfd804b85 ANDROID: GKI: mm: add struct vm_fault fields for SPECULATIVE_PAGE_FAULTS\nd32db25eea08 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4-stable\nec877350d0e8 FROMLIST: f2fs: fix use-after-free when accessing bio-\u003ebi_crypt_context\n9acda3388b3a ANDROID: GKI: Update ABI for incremental fs\ne3621d385b4c ANDROID: GKI: Update whitelist and defconfig for incfs\na48f7629606a ANDROID: gki_defconfig: x86: Enable KERNEL_LZ4\nf5a506d17552 ANDROID: GKI: scripts: Makefile: update the lz4 command\n24200c344d25 ANDROID: Use depmod from the hermetic toolchain\n4f2d982f4f05 ANDROID: ABI/Whitelist: update symbols of unisoc whitelist\nfa46997961a3 Merge 5.4.48 into android-5.4-stable\n22e35a1de440 ANDROID: GKI: enable some more USB configfs options\neaaa29ec5a4b Merge 5.4.47 into android-5.4-stable\n\nTest: TreeHugger\nBug: 138322712\nFixes: 150391496\nFixes: 159343293\nChange-Id: I65802ab23a55d00dcbe83a66900cf8bea019b908\nMerged-In: I2ee2db16ca68ad3f4edf55cdc8d93d1341559129\n" }, { "commit": "d19cda07ab0c7b3a8717ea212cf5dfef873ab9bb", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "3e6358e4afd6005bd7ed194a51342c4d38a0f57e", "89187975ca51403b072557904629ee19abe90100" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 01:07:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 01:07:28 2020 +0000" }, "message": "Update kernel to builds 6640030 am: dee79cba42 am: f0db0eba93 am: 89187975ca\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1353172\n\nChange-Id: I6b803a4a88a329a749abedcdd2b36718dec3a701\n" }, { "commit": "89187975ca51403b072557904629ee19abe90100", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "6ed21a85e9cdfe979cd265bbc182f5abe1becb8d", "f0db0eba937482aa96a42bdd99fc254905c092a8" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 00:53:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 00:53:22 2020 +0000" }, "message": "Update kernel to builds 6640030 am: dee79cba42 am: f0db0eba93\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1353172\n\nChange-Id: Iec765dd0cfe02700ace82e508b541df1b8a1c807\n" }, { "commit": "f0db0eba937482aa96a42bdd99fc254905c092a8", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "3a8d7202389944b9b70089a55dc9f51b69dc055e", "dee79cba425998e21282504bd289641f3a8a4c12" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed Jul 01 00:38:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 01 00:38:10 2020 +0000" }, "message": "Update kernel to builds 6640030 am: dee79cba42\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1353172\n\nChange-Id: I3e9b4eab17191bce8e9b076b9df7e461a7a9e635\n" }, { "commit": "dee79cba425998e21282504bd289641f3a8a4c12", "tree": "542a07f719a30967bc73ae6bf8ad53c84e069f5e", "parents": [ "74325a0a79f0321ad380bc9ba5908a8478559ec1" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Fri Jun 26 09:29:28 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue Jun 30 11:24:26 2020 -0700" }, "message": "Update kernel to builds 6640030\n\nTo enable ext4 casefolding, incrementalfs as a module, and fix the\nwhitelist for cuttlefish arm64.\n\nThis also makes the kernel an LZ4-compressed artifact.\n\n8a0e70eb4734 ANDROID: Re-generate whitelists and abi for sdcardfs.ko\naa0f65dd60bf ANDROID: db845c_gki.fragment: remove CONFIG_SCSI_UFS_QCOM\u003dm\nf9c1d0597dd6 UPSTREAM: scsi: ufs: Fix imprecise load calculation in devfreq window\n4a398c4ce4fe UPSTREAM: scsi: ufs: Add trace event for UIC commands\n024879d8e482 UPSTREAM: scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices\naf1fcf8cb597 UPSTREAM: scsi: ufs-mediatek: Allow unbound mphy\n87d68cc6b7d7 UPSTREAM: scsi: ufs-mediatek: Fix unbalanced clock on/off\nfdb33afa970e UPSTREAM: scsi: ufs-mediatek: Introduce low-power mode for device power supply\n745c7d9dd4c7 UPSTREAM: scsi: ufs-mediatek: Do not gate clocks if auto-hibern8 is not entered yet\n8e640908e0b8 UPSTREAM: scsi: ufs-mediatek: Fix imprecise waiting time for ref-clk control\n666864e9553d BACKPORT: scsi: ufs: Disable WriteBooster capability in non-supported UFS device\n53c670a33955 BACKPORT: scsi: ufs: Fix WriteBooster flush during runtime suspend\n6937ed0f720f BACKPORT: scsi: ufs: Fix index of attributes query for WriteBooster feature\ndca52b9d5917 BACKPORT: scsi: ufs: Allow WriteBooster on UFS 2.2 devices\n88f1d6834915 UPSTREAM: scsi: ufs-mediatek: Customize WriteBooster flush policy\n559d814b1ca7 UPSTREAM: scsi: ufs: Customize flush threshold for WriteBooster\nff34db6f2f7a BACKPORT: scsi: ufs: Introduce ufs_hba_variant_params to group customizable parameters\nf2824b2c2db5 UPSTREAM: scsi: ufs-mediatek: Make ufs_mtk_fixup_dev_quirks static\n431d40422d64 UPSTREAM: scsi: ufs: Cleanup WriteBooster feature\n74c611a17e10 UPSTREAM: scsi: ufs-mediatek: Enable WriteBooster capability\ne0db0d2897ce BACKPORT: scsi: ufs: Add LU Dedicated buffer mode support for WriteBooster\nf71a733e25ae BACKPORT: scsi: ufs: Add \"index\" in parameter list of ufshcd_query_flag()\n0e664dbe35eb UPSTREAM: scsi: ufs-mediatek: Add fixup_dev_quirks vops\n3a00398cba15 UPSTREAM: scsi: ufs: Export ufs_fixup_device_setup() function\n64a24e84a71f BACKPORT: scsi: ufs: Introduce fixup_dev_quirks vops\n81005111ed03 BACKPORT: scsi: ufs: Enable WriteBooster on some pre-3.1 UFS devices\nc6e4f3c8b348 ANDROID: GKI: remove ufshcd_* exports from whitelists\n5ffb3f1ab6ee ANDROID: GKI: enable CONFIG_SCSI_UFS_DWC_TC_PLATFORM\nbb765ef8427e ANDROID: GKI: enable QCOM and HISI UFS drivers\n320b6225aa75 ANDROID: GKI: enable UFS for x86 gki builds and SCSI_UFSHCD_PCI\n1885d3d6847d UPSTREAM: amba: Retry adding deferred devices at late_initcall\n54ec87ec7a59 ANDROID: GKI: Update whitelist and defconfig for incfs\nd8776a0de2d4 ANDROID: GKI: Enable INTERVAL_TREE\naa2f91764051 ANDROID: GKI: defconfig: Enable CONFIG_PSTORE_PMSG in gki_defconfig\nc8c4041e5dab ANDROID: GKI: update the abi definitions due to 5.4.49 and padding\n49716e996a54 Merge 5.4.49 into android-5.4\ncbe59e17494c ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget\n96accc59a4a1 ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint\nb2b5494a9736 ANDROID: ext4: Optimize match for casefolded encrypted dirs\n2030e5414415 ANDROID: ext4: Handle casefolding with encryption\n06c254923b8d ANDROID: GKI: support CONFIG_INPUT_TOUCHSCREEN\n5625a6460e96 ANDROID: GKI: enable CONFIG_TYPEC_TCPM\n7c64ab675e98 ANDROID: ABI updates for hikey960\ne2c5dec67bbe ANDROID: hikey960_gki.fragment: Remove unused CONFIG_SERIAL_8250_DW\ne6bb6f5e8095 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\na11b4db23eaa ANDROID: ABI updates for db845c\n864a80688657 ANDROID: gki_defconfig: x86: Enable KERNEL_LZ4\n8b2d14b083d7 ANDROID: GKI: scripts: Makefile: update the lz4 command\n24fb21d13984 FROMLIST: f2fs: fix use-after-free when accessing bio-\u003ebi_crypt_context\n45dd29fa1755 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\ndf7bda31a807 ANDROID: Use depmod from the hermetic toolchain\ndaa2cef41540 Merge 5.4.48 into android-5.4\n5eb96e454e88 ANDROID: GKI: Update cuttlefish whitelist for drm/debugfs\n266858a3dca3 ANDROID: GKI: enable some more USB configfs options\n148ce8b4304b Merge 5.4.47 into android-5.4\n8e6c65a07bb4 ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL.\n30c93f3226d8 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\n5757b2c128ab ANDROID: ABI: Add typec symbols to QCOM ABI whitelist\n3dc4727b51c6 UPSTREAM: usb: typec: Remove the callback members from struct typec_capability\n040e755ade30 UPSTREAM: usb: typec: ucsi: Start using struct typec_operations\nec23ee8c2593 UPSTREAM: usb: typec: tps6598x: Start using struct typec_operations\n89a2878f4f89 UPSTREAM: usb: typec: tcpm: Start using struct typec_operations\n423f1d2ffe8e UPSTREAM: usb: typec: Separate the operations vector\ndf77bb282d82 UPSTREAM: usb: typec: Introduce typec_get_drvdata()\n66180b9dcf82 UPSTREAM: usb: typec: Copy everything from struct typec_capability during registration\na191332e9e93 ANDROID: GKI: ABI update after re-enabling CONFIG_KPROBES\nae5878ffa74f Revert \"ANDROID: gki_defconfig: disable KPROBES\"\n4a78c71885fa ANDROID: kbuild: merge more sections with LTO\n1aaff3260a39 UPSTREAM: driver core: Remove unnecessary is_fwnode_dev variable in device_add()\n110fac491a4c UPSTREAM: driver core: Remove check in driver_deferred_probe_force_trigger()\nc1a996f5048c UPSTREAM: of: platform: Batch fwnode parsing when adding all top level devices\n1e490ebb1776 BACKPORT: driver core: fw_devlink: Add support for batching fwnode parsing\na144e09dde5a BACKPORT: driver core: Look for waiting consumers only for a fwnode\u0027s primary device\n91d2b0a4c0ab UPSTREAM: usb: musb: Add support for MediaTek musb controller\n0d81410aca52 UPSTREAM: usb: musb: Add musb_clearb/w() interface\n4bbfc7cf0a26 UPSTREAM: usb: musb: Add noirq type of dma create interface\n8814ad0ad7b3 UPSTREAM: usb: musb: Add get/set toggle hooks\n8f8e86abd30d UPSTREAM: dt-bindings: usb: musb: Add support for MediaTek musb controller\nad0296cf48d6 Merge 5.4.46 into android-5.4\nf1fd663e63b1 Revert \"ANDROID: Remove default y on BRIDGE_IGMP_SNOOPING\"\n512dacc958bd ANDROID: GKI: enable CONFIG_EROFS_FS\u003dm\ne33d025bf6a3 UPSTREAM: mmc: sdhci-msm: Deactivate CQE during SDHC reset\na94dfc3e8b29 UPSTREAM: mmc: cqhci: Add cqhci_deactivate()\nc78098a56427 UPSTREAM: mmc: sdhci-msm: Add CQHCI support for sdhci-msm\nb2b5494a9736 ANDROID: ext4: Optimize match for casefolded encrypted dirs\n2030e5414415 ANDROID: ext4: Handle casefolding with encryption\n06c254923b8d ANDROID: GKI: support CONFIG_INPUT_TOUCHSCREEN\n5625a6460e96 ANDROID: GKI: enable CONFIG_TYPEC_TCPM\n7c64ab675e98 ANDROID: ABI updates for hikey960\ne2c5dec67bbe ANDROID: hikey960_gki.fragment: Remove unused CONFIG_SERIAL_8250_DW\ne6bb6f5e8095 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\na11b4db23eaa ANDROID: ABI updates for db845c\n864a80688657 ANDROID: gki_defconfig: x86: Enable KERNEL_LZ4\n8b2d14b083d7 ANDROID: GKI: scripts: Makefile: update the lz4 command\n24fb21d13984 FROMLIST: f2fs: fix use-after-free when accessing bio-\u003ebi_crypt_context\n45dd29fa1755 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\ndf7bda31a807 ANDROID: Use depmod from the hermetic toolchain\ndaa2cef41540 Merge 5.4.48 into android-5.4\n5eb96e454e88 ANDROID: GKI: Update cuttlefish whitelist for drm/debugfs\n266858a3dca3 ANDROID: GKI: enable some more USB configfs options\n148ce8b4304b Merge 5.4.47 into android-5.4\n8e6c65a07bb4 ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL.\n30c93f3226d8 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\n5757b2c128ab ANDROID: ABI: Add typec symbols to QCOM ABI whitelist\n3dc4727b51c6 UPSTREAM: usb: typec: Remove the callback members from struct typec_capability\n040e755ade30 UPSTREAM: usb: typec: ucsi: Start using struct typec_operations\nec23ee8c2593 UPSTREAM: usb: typec: tps6598x: Start using struct typec_operations\n89a2878f4f89 UPSTREAM: usb: typec: tcpm: Start using struct typec_operations\n423f1d2ffe8e UPSTREAM: usb: typec: Separate the operations vector\ndf77bb282d82 UPSTREAM: usb: typec: Introduce typec_get_drvdata()\n66180b9dcf82 UPSTREAM: usb: typec: Copy everything from struct typec_capability during registration\na191332e9e93 ANDROID: GKI: ABI update after re-enabling CONFIG_KPROBES\nae5878ffa74f Revert \"ANDROID: gki_defconfig: disable KPROBES\"\n4a78c71885fa ANDROID: kbuild: merge more sections with LTO\n1aaff3260a39 UPSTREAM: driver core: Remove unnecessary is_fwnode_dev variable in device_add()\n110fac491a4c UPSTREAM: driver core: Remove check in driver_deferred_probe_force_trigger()\nc1a996f5048c UPSTREAM: of: platform: Batch fwnode parsing when adding all top level devices\n1e490ebb1776 BACKPORT: driver core: fw_devlink: Add support for batching fwnode parsing\na144e09dde5a BACKPORT: driver core: Look for waiting consumers only for a fwnode\u0027s primary device\n91d2b0a4c0ab UPSTREAM: usb: musb: Add support for MediaTek musb controller\n0d81410aca52 UPSTREAM: usb: musb: Add musb_clearb/w() interface\n4bbfc7cf0a26 UPSTREAM: usb: musb: Add noirq type of dma create interface\n8814ad0ad7b3 UPSTREAM: usb: musb: Add get/set toggle hooks\n8f8e86abd30d UPSTREAM: dt-bindings: usb: musb: Add support for MediaTek musb controller\nad0296cf48d6 Merge 5.4.46 into android-5.4\nf1fd663e63b1 Revert \"ANDROID: Remove default y on BRIDGE_IGMP_SNOOPING\"\n512dacc958bd ANDROID: GKI: enable CONFIG_EROFS_FS\u003dm\ne33d025bf6a3 UPSTREAM: mmc: sdhci-msm: Deactivate CQE during SDHC reset\na94dfc3e8b29 UPSTREAM: mmc: cqhci: Add cqhci_deactivate()\nc78098a56427 UPSTREAM: mmc: sdhci-msm: Add CQHCI support for sdhci-msm\nd497239fd6c5 ANDROID: GKI: ABI update after enabling CONFIG_DEBUG_FS\n4123e4a20494 ANDROID: GKI: Enable CONFIG_DEBUG_FS for Android S\nde63639926dc ANDROID: Incremental fs: Fix four error-path bugs\n88622d7b4cea ANDROID: dm-bow: Add block_size option\n057457843419 ANDROID: GKI: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16\ncd7b88924604 ANDROID: GKI fix up abi definitions after mmc changes\n81acaab87b94 UPSTREAM: mmc: sdhci: Let a vendor driver supply and update ADMA descriptor size\n71046479074b UPSTREAM: mmc: core: expose info about enhanced rpmb support\n34ecdbd79ba4 UPSTREAM: mmc: sdhci-msm: Introduce new ops to dump vendor specific registers\n99f615840ba4 FROMGIT: scsi: ufs: Remove unnecessary memset for dev_info\nfef579e78c4a ANDROID: Incremental fs: Remove dependency on PKCS7_MESSAGE_PARSER\n549e9581338f ANDROID: Incremental fs: Cache successful hash calculations\n1410460d9db7 Merge 5.4.45 into android-5.4\n8b41eaf1ffa9 ANDROID: Update ABI representation\n788fe852d3be Merge 5.4.44 into android-5.4\nda0e525a6ec7 ANDROID: GKI fix up abi definitions after UFS changes\ne929fb3f3432 ANDROID: scs: fix recursive spinlock in scs_check_usage\n163e09b08bb5 FROMGIT: scsi: ufs-qcom: Configure write booster type\n2a1cf9ff1abb FROMGIT: scsi: ufs: sysfs: Add sysfs entries for write booster\n3a3f8a74395c BACKPORT: FROMGIT: scsi: ufs: Add write booster feature support\nf8aa5f514ccb ANDROID: GKI: Enable SYS_HYPERVISOR\ned21d463f856 Revert \"ANDROID: sdcardfs: remove sdcardfs from system\"\ne196d8121f15 Revert \"Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\"\ne06c5dc6e3a9 Revert \"Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\"\n0b80c3e538fd Revert \"Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\"\n91303af088c3 Revert \"Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\"\n0348fad13a7c Revert \"ANDROID: remove sdcardfs-needed exports from whitelist\"\nd1f32ae30687 Revert \"ANDROID: GKI: update abi definitions now that sdcardfs is gone\"\n32ea849d28ac Revert \"Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\"\n5006e0b31efe UPSTREAM: usb: raw-gadget: fix null-ptr-deref when reenabling endpoints\n60f0ec6addb7 UPSTREAM: usb: raw-gadget: documentation updates\nf1bafa5cc904 UPSTREAM: usb: raw-gadget: support stalling/halting/wedging endpoints\ne5bbc9261f6c UPSTREAM: usb: raw-gadget: fix gadget endpoint selection\nd77503418484 UPSTREAM: usb: raw-gadget: improve uapi headers comments\n87b81c265f68 UPSTREAM: usb: raw-gadget: fix return value of ep read ioctls\nd583fe446db9 UPSTREAM: usb: raw-gadget: fix raw_event_queue_fetch locking\n59c4eb62e5d4 UPSTREAM: usb: raw-gadget: Fix copy_to/from_user() checks\n9b26d323fe7a FROMGIT: USB: dummy-hcd: use configurable endpoint naming scheme\naf2b56c502d6 ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu\n939dbbe02910 Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\n80c0ec609c09 ANDROID: GKI: update abi definitions now that sdcardfs is gone\n2f8cd6b5f217 ANDROID: remove sdcardfs-needed exports from whitelist\n0faa05cdd0a9 Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\n7cabc852a16b Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\n89936d1ae03b Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\n4dd8873b82fe Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\ne56ab22f5dae ANDROID: sdcardfs: remove sdcardfs from system\neb60e11d611f FROMGIT: driver core: Update device link status correctly for SYNC_STATE_ONLY links\nfd2d241e7467 UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links\n7b3547c78ebe UPSTREAM: driver core: Fix SYNC_STATE_ONLY device link implementation\n4f7036e47988 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\nfe0e53c052b8 Merge 5.4.43 into android-5.4\n76732966f329 Revert \"ANDROID: Incremental fs: Avoid continually recalculating hashes\"\n413e6e69993f ANDROID: scsi: ufs: Handle clocks when lrbp fails\nea7bbd69ade9 UPSTREAM: serial: samsung: 32-bit access for TX/RX hold registers\n13d0653a99ca BACKPORT: serial: samsung: dt-bindings: Add reg-io-width compatible\n9e1870ee4da8 UPSTREAM: serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg\n01b0584902c5 ANDROID: staging: ion: Fix potential memory corruption\n08ea0a4cb274 ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32\nbc4a2722e5a1 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies\n8ca744822f5e ANDROID: GKI update kernel abi for 5.4.42 merge\nfb0106807289 Merge 5.4.42 into android-5.4\n\nTest: TreeHugger\nBug: 138322712\nChange-Id: I2ee2db16ca68ad3f4edf55cdc8d93d1341559129\n" }, { "commit": "3e6358e4afd6005bd7ed194a51342c4d38a0f57e", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "1701126fdfb077489e8ebd541ed70f6b55d08462", "6ed21a85e9cdfe979cd265bbc182f5abe1becb8d" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Jun 18 11:28:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 11:28:13 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6598026 am: 5f66ee79ce -s ours am: 6ed21a85e9 -s ours\n\nam skip reason: Change-Id I1ccefd81140ad408d82b96ed0e45ddb128e79756 with SHA-1 74325a0a79 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11897680\n\nChange-Id: I6fdb848ee32a5e70feae55b901af4059143b5fa4\n" }, { "commit": "1701126fdfb077489e8ebd541ed70f6b55d08462", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "4096d72f4fc6b435a59e80d307eeec74a7d68904", "7418a5ec3cbc5873ef2c52b757f3049539c9bf0f" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Jun 18 11:27:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 11:27:57 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6598026 am: 5f66ee79ce am: 7418a5ec3c -s ours\n\nam skip reason: Change-Id I1ccefd81140ad408d82b96ed0e45ddb128e79756 with SHA-1 74325a0a79 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11897680\n\nChange-Id: I3e0a34a1bf5b936db9961d5930f2353bd815e9f5\n" }, { "commit": "6ed21a85e9cdfe979cd265bbc182f5abe1becb8d", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "0f883c92faad41a116c72ef2ed29867c1af055e1", "5f66ee79ceb9931e4ae79489c977b97cee89eb6f" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Jun 18 11:11:41 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 11:11:41 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6598026 am: 5f66ee79ce -s ours\n\nam skip reason: Change-Id I1ccefd81140ad408d82b96ed0e45ddb128e79756 with SHA-1 74325a0a79 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11897680\n\nChange-Id: I8529a8fd8b31f7cc6ad3676700bef443322041e3\n" }, { "commit": "7418a5ec3cbc5873ef2c52b757f3049539c9bf0f", "tree": "f355230a9472d8c5a2793a3a217f03299b86eb41", "parents": [ "99e376c15821b7b7784cccf53e43d86ef4bd0654", "5f66ee79ceb9931e4ae79489c977b97cee89eb6f" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Jun 18 11:11:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 11:11:27 2020 +0000" }, "message": "Update kernel to builds 6598026 am: 5f66ee79ce\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11897680\n\nChange-Id: I98d94b60c3e1010fe3d75d7b6354146093ff70ab\n" }, { "commit": "5f66ee79ceb9931e4ae79489c977b97cee89eb6f", "tree": "f355230a9472d8c5a2793a3a217f03299b86eb41", "parents": [ "19b5bfad528326029c6ff253bd52cc5d927533f0" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 21:20:06 2020 +0200" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Thu Jun 18 05:59:51 2020 +0000" }, "message": "Update kernel to builds 6598026\n\nff939413a727 ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL.\n5ad12102f2e3 Merge remote-tracking branch\n\u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4-stable\n11e8c6dc441a ANDROID: arch: arm: Increase kernel command line size\n7039f35498dc ANDROID: arch: arm64: Increase kernel command line size\n6cf054895be0 ANDROID: ABI: Add typec symbols to QCOM ABI whitelist\ndb38bbafc897 UPSTREAM: usb: typec: Remove the callback members from\nstruct typec_capability\n6b309cd65d15 UPSTREAM: usb: typec: ucsi: Start using struct\ntypec_operations\n0534741a06a6 UPSTREAM: usb: typec: tps6598x: Start using struct\ntypec_operations\na1b0fda1b5f4 UPSTREAM: usb: typec: tcpm: Start using struct\ntypec_operations\na19c1a938d45 UPSTREAM: usb: typec: Separate the operations vector\n7855b7565d90 UPSTREAM: usb: typec: Introduce typec_get_drvdata()\n0b594aea8d74 UPSTREAM: usb: typec: Copy everything from struct\ntypec_capability during registration\nf31cfc8907f9 ANDROID: kbuild: merge more sections with LTO\n358df78b821a UPSTREAM: driver core: Remove unnecessary is_fwnode_dev\nvariable in device_add()\n373cfc0f8d62 UPSTREAM: driver core: Remove check in\ndriver_deferred_probe_force_trigger()\nb82a5ead71a9 UPSTREAM: of: platform: Batch fwnode parsing when adding\nall top level devices\n9acfa80c3d1e BACKPORT: driver core: fw_devlink: Add support for batching\nfwnode parsing\nbf50baa3a39f BACKPORT: driver core: Look for waiting consumers only for\na fwnode\u0027s primary device\n2b5f94b92590 UPSTREAM: usb: musb: Add support for MediaTek musb\ncontroller\nb46bf63177fe UPSTREAM: usb: musb: Add musb_clearb/w() interface\n4f79e7c30490 UPSTREAM: usb: musb: Add noirq type of dma create interface\nb62eca39e8f6 UPSTREAM: usb: musb: Add get/set toggle hooks\nd7056b4731aa UPSTREAM: dt-bindings: usb: musb: Add support for MediaTek\nmusb controller\n34a7766e99b2 Merge 5.4.46 into android-5.4-stable\nbb34bf99883a Revert \"ANDROID: Remove default y on BRIDGE_IGMP_SNOOPING\"\n2ce29d3f637d ANDROID: GKI: Update ABI after scsi/ufs changes\n4c5477a217bb FROMLIST: Documentation:sysfs-ufs: Add WriteBooster\ndocumentation\na083287ef5e7 FROMGIT: scsi: ufs-qcom: Configure write booster type\n44059abd5df8 FROMGIT: scsi: ufs: sysfs: Add sysfs entries for write\nbooster\n01850059edd1 BACKPORT: FROMGIT: scsi: ufs: Add write booster feature\nsupport\nf74f3040c502 ANDROID: ABI/Whitelist: update symbols of unisoc whitelist\nec794a662365 BACKPORT: FROMGIT: scsi: ufs: Remove unnecessary memset for\ndev_info\ndad12176d7b5 ANDROID: staging: ion: Fix potential memory corruption\n48675044f980 ANDROID: staging: ion: optimize cache operation for\nnon-cached buffer\n8d814964bcc4 ANDROID: staging: ion: Skip sync if not mapped\nd4d176595239 ANDROID: staging: ion: use dma_[un]map_sg_attrs\n7bbd50f11d30 ANDROID: arch: arm64: vdso: export the symbols for time()\n227f8ea88e05 ANDROID: dm-bow: Add block_size option\n1ca17a46be64 ANDROID: GKI: remove squashfs-needed symbols from exported\nabi\nc7f82f0e1dc5 ANDROID: GKI: remove erofs symbols from exported abi\n1971b1cf9541 ANDROID: GKI: enable CONFIG_EROFS_FS\u003dy\ne467b8c7dbe1 ANDROID: scs: fix recursive spinlock in scs_check_usage\nf829d7f05b83 ANDROID: GKI: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16\n41d89c69896f ANDROID: Incremental fs: Remove dependency on\nPKCS7_MESSAGE_PARSER\nbff7633337ba ANDROID: Incremental fs: Cache successful hash calculations\n6a5003146f87 ANDROID: Incremental fs: Fix four error-path bugs\na9a13eeea952 Merge 5.4.45 into android-5.4-stable\n2068976fd7b1 ANDROID: GKI: Enable SYS_HYPERVISOR\nfa4a4735f572 ANDROID: Update ABI representation\ndb2c395d7bfb ANDROID: GKI: disable CONFIG_I2C_CHARDEV\nf520ca124ca7 Merge 5.4.44 into android-5.4-stable\n9f12374175d5 ANDROID: GKI: remove netfilter apis from supported symbols\n525530c9486f ANDROID: GKI: enable CONFIG_USB_DUMMY_HCD\n90087296b3b1 FROMGIT: USB: dummy-hcd: use configurable endpoint naming\nscheme\n20b83be407a0 ANDROID: GKI: enable a bunch of HID config options \u003dy\nf7a0ee1aab0b UPSTREAM: usb: raw-gadget: fix null-ptr-deref when\nreenabling endpoints\n01871d260bde UPSTREAM: usb: raw-gadget: documentation updates\n5261cfe10a0f UPSTREAM: usb: raw-gadget: support stalling/halting/wedging\nendpoints\n6f6bff3e0250 UPSTREAM: usb: raw-gadget: fix gadget endpoint selection\ndb424a691a03 UPSTREAM: usb: raw-gadget: improve uapi headers comments\nbbe8b957253c UPSTREAM: usb: raw-gadget: fix return value of ep read\nioctls\n30d554f1ba59 UPSTREAM: usb: raw-gadget: fix raw_event_queue_fetch\nlocking\n47d3f93cccd7 UPSTREAM: usb: raw-gadget: Fix copy_to/from_user() checks\n877b6a928b96 ANDROID: GKI: update abi definitions after enabling\nPCIEPORTBUS\n63355962d844 Revert \"ANDROID: gki_defconfig: Drop CONFIG_PCIEPORTBUS\"\n\nTest: TreeHugger\nBug: 158733532\nMerged-In: I1ccefd81140ad408d82b96ed0e45ddb128e79756\nChange-Id: Ic881220d8b28913d19af42151a8ac0fe7019b564\n" }, { "commit": "4096d72f4fc6b435a59e80d307eeec74a7d68904", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "7e295e47487208c77c6fd1a7cfb77401d7f841b8", "0f883c92faad41a116c72ef2ed29867c1af055e1" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 20:08:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 17 20:08:28 2020 +0000" }, "message": "Update kernel to builds 6598025 am: 74325a0a79 am: 3a8d720238 am: 0f883c92fa\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1336407\n\nChange-Id: Ie11c1425127a8e47a2cd9221e32f4478df4273e8\n" }, { "commit": "0f883c92faad41a116c72ef2ed29867c1af055e1", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "71dfc3dfa7c62085238606a273475e2d6ca36877", "3a8d7202389944b9b70089a55dc9f51b69dc055e" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 19:49:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 17 19:49:48 2020 +0000" }, "message": "Update kernel to builds 6598025 am: 74325a0a79 am: 3a8d720238\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1336407\n\nChange-Id: Ic2d3fd01690e1ac58ce1a374013f33bab00ca0a5\n" }, { "commit": "3a8d7202389944b9b70089a55dc9f51b69dc055e", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "aac14c2c09be39e554cb9b71f4a2d3e764a633ad", "74325a0a79f0321ad380bc9ba5908a8478559ec1" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 19:36:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 17 19:36:10 2020 +0000" }, "message": "Update kernel to builds 6598025 am: 74325a0a79\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1336407\n\nChange-Id: I506f6faa994d617f44b2e0d72bf859e0974c9879\n" }, { "commit": "74325a0a79f0321ad380bc9ba5908a8478559ec1", "tree": "fdbb2c8764debf58a582c57b68d42a30e0a0d5c6", "parents": [ "aac14c2c09be39e554cb9b71f4a2d3e764a633ad" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 09:41:32 2020 +0200" }, "committer": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Wed Jun 17 09:48:15 2020 +0200" }, "message": "Update kernel to builds 6598025\n\n8e6c65a07bb4 ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL.\n30c93f3226d8 Merge remote-tracking branch\n\u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\n5757b2c128ab ANDROID: ABI: Add typec symbols to QCOM ABI whitelist\n3dc4727b51c6 UPSTREAM: usb: typec: Remove the callback members from\nstruct typec_capability\n040e755ade30 UPSTREAM: usb: typec: ucsi: Start using struct\ntypec_operations\nec23ee8c2593 UPSTREAM: usb: typec: tps6598x: Start using struct\ntypec_operations\n89a2878f4f89 UPSTREAM: usb: typec: tcpm: Start using struct\ntypec_operations\n423f1d2ffe8e UPSTREAM: usb: typec: Separate the operations vector\ndf77bb282d82 UPSTREAM: usb: typec: Introduce typec_get_drvdata()\n66180b9dcf82 UPSTREAM: usb: typec: Copy everything from struct\ntypec_capability during registration\na191332e9e93 ANDROID: GKI: ABI update after re-enabling CONFIG_KPROBES\nae5878ffa74f Revert \"ANDROID: gki_defconfig: disable KPROBES\"\n4a78c71885fa ANDROID: kbuild: merge more sections with LTO\n1aaff3260a39 UPSTREAM: driver core: Remove unnecessary is_fwnode_dev\nvariable in device_add()\n110fac491a4c UPSTREAM: driver core: Remove check in\ndriver_deferred_probe_force_trigger()\nc1a996f5048c UPSTREAM: of: platform: Batch fwnode parsing when adding\nall top level devices\n1e490ebb1776 BACKPORT: driver core: fw_devlink: Add support for batching\nfwnode parsing\na144e09dde5a BACKPORT: driver core: Look for waiting consumers only for\na fwnode\u0027s primary device\n91d2b0a4c0ab UPSTREAM: usb: musb: Add support for MediaTek musb\ncontroller\n0d81410aca52 UPSTREAM: usb: musb: Add musb_clearb/w() interface\n4bbfc7cf0a26 UPSTREAM: usb: musb: Add noirq type of dma create interface\n8814ad0ad7b3 UPSTREAM: usb: musb: Add get/set toggle hooks\n8f8e86abd30d UPSTREAM: dt-bindings: usb: musb: Add support for MediaTek\nmusb controller\nad0296cf48d6 Merge 5.4.46 into android-5.4\nf1fd663e63b1 Revert \"ANDROID: Remove default y on BRIDGE_IGMP_SNOOPING\"\n512dacc958bd ANDROID: GKI: enable CONFIG_EROFS_FS\u003dm\ne33d025bf6a3 UPSTREAM: mmc: sdhci-msm: Deactivate CQE during SDHC reset\na94dfc3e8b29 UPSTREAM: mmc: cqhci: Add cqhci_deactivate()\nc78098a56427 UPSTREAM: mmc: sdhci-msm: Add CQHCI support for sdhci-msm\nd497239fd6c5 ANDROID: GKI: ABI update after enabling CONFIG_DEBUG_FS\n4123e4a20494 ANDROID: GKI: Enable CONFIG_DEBUG_FS for Android S\nde63639926dc ANDROID: Incremental fs: Fix four error-path bugs\n88622d7b4cea ANDROID: dm-bow: Add block_size option\n057457843419 ANDROID: GKI: set CONFIG_BLK_DEV_LOOP_MIN_COUNT to 16\ncd7b88924604 ANDROID: GKI fix up abi definitions after mmc changes\n81acaab87b94 UPSTREAM: mmc: sdhci: Let a vendor driver supply and update\nADMA descriptor size\n71046479074b UPSTREAM: mmc: core: expose info about enhanced rpmb\nsupport\n34ecdbd79ba4 UPSTREAM: mmc: sdhci-msm: Introduce new ops to dump vendor\nspecific registers\n99f615840ba4 FROMGIT: scsi: ufs: Remove unnecessary memset for dev_info\nfef579e78c4a ANDROID: Incremental fs: Remove dependency on\nPKCS7_MESSAGE_PARSER\n549e9581338f ANDROID: Incremental fs: Cache successful hash calculations\n1410460d9db7 Merge 5.4.45 into android-5.4\n8b41eaf1ffa9 ANDROID: Update ABI representation\n788fe852d3be Merge 5.4.44 into android-5.4\nda0e525a6ec7 ANDROID: GKI fix up abi definitions after UFS changes\ne929fb3f3432 ANDROID: scs: fix recursive spinlock in scs_check_usage\n163e09b08bb5 FROMGIT: scsi: ufs-qcom: Configure write booster type\n2a1cf9ff1abb FROMGIT: scsi: ufs: sysfs: Add sysfs entries for write\nbooster\n3a3f8a74395c BACKPORT: FROMGIT: scsi: ufs: Add write booster feature\nsupport\nf8aa5f514ccb ANDROID: GKI: Enable SYS_HYPERVISOR\n\nTest: TreeHugger\nBug: 158733532\nChange-Id: I1ccefd81140ad408d82b96ed0e45ddb128e79756\n" }, { "commit": "7e295e47487208c77c6fd1a7cfb77401d7f841b8", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "3e7a03a191d076bc7d92ee8f11adc873ab367da4", "71dfc3dfa7c62085238606a273475e2d6ca36877" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Jun 03 10:34:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 10:34:24 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6542846 am: 19b5bfad52 -s ours am: 71dfc3dfa7 -s ours\n\nam skip reason: Change-Id I6085a447bf60635dfe62f70eaa831129a9014f77 with SHA-1 f2fcc1a1f7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11692389\n\nChange-Id: I7dcde38110c734fa2ab8ccb2d2cff750135ce33b\n" }, { "commit": "3e7a03a191d076bc7d92ee8f11adc873ab367da4", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "81b40b44d016f30eabab53e1cd621a5190928b38", "99e376c15821b7b7784cccf53e43d86ef4bd0654" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Jun 03 10:33:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 10:33:34 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6542846 am: 19b5bfad52 am: 99e376c158 -s ours\n\nam skip reason: Change-Id I6085a447bf60635dfe62f70eaa831129a9014f77 with SHA-1 f2fcc1a1f7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11692389\n\nChange-Id: I6ad3acbcea32be2f9fc1f7e1359e4b87d3498a82\n" }, { "commit": "71dfc3dfa7c62085238606a273475e2d6ca36877", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "ef47aadda9cb9fe9769ffdc6ed47c884f600c16b", "19b5bfad528326029c6ff253bd52cc5d927533f0" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Jun 03 10:19:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 10:19:50 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6542846 am: 19b5bfad52 -s ours\n\nam skip reason: Change-Id I6085a447bf60635dfe62f70eaa831129a9014f77 with SHA-1 f2fcc1a1f7 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11692389\n\nChange-Id: I225eb5b847f3e672ac7860f33bda2b354ff15441\n" }, { "commit": "99e376c15821b7b7784cccf53e43d86ef4bd0654", "tree": "1a143e0756d56488334340f248843adf6258a064", "parents": [ "392ff2595ec88207b40a52582b0933b8eb3e1ac1", "19b5bfad528326029c6ff253bd52cc5d927533f0" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Wed Jun 03 10:18:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 10:18:33 2020 +0000" }, "message": "Update kernel to builds 6542846 am: 19b5bfad52\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/11692389\n\nChange-Id: I9627d3777fe2f9029708a9967978ccc0528e001c\n" }, { "commit": "81b40b44d016f30eabab53e1cd621a5190928b38", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "f6350abc817b6fc9af3fa340a20beb1403588171", "ef47aadda9cb9fe9769ffdc6ed47c884f600c16b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 03 04:36:32 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 04:36:32 2020 +0000" }, "message": "Merge \"Update kernel to builds 6551880\" am: 1f4a0df5a9 am: aac14c2c09 am: ef47aadda9\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1321054\n\nChange-Id: I6a3067305dac37dc74c39da7b5cf910435b24f7b\n" }, { "commit": "ef47aadda9cb9fe9769ffdc6ed47c884f600c16b", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "813f1cfb35fd8484d3f3008047e380565806367d", "aac14c2c09be39e554cb9b71f4a2d3e764a633ad" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 03 04:22:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 04:22:30 2020 +0000" }, "message": "Merge \"Update kernel to builds 6551880\" am: 1f4a0df5a9 am: aac14c2c09\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1321054\n\nChange-Id: I4cfbeda800832df0221265dee0c70fdce0173955\n" }, { "commit": "aac14c2c09be39e554cb9b71f4a2d3e764a633ad", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "660636c6971b7652460b3aa115da4e1cf4438167", "1f4a0df5a97a479361c4693a5c9f0e2b1dcf57f6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 03 04:10:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 03 04:10:17 2020 +0000" }, "message": "Merge \"Update kernel to builds 6551880\" am: 1f4a0df5a9\n\nOriginal change: https://android-review.googlesource.com/c/device/google/cuttlefish_kernel/+/1321054\n\nChange-Id: I13da66fd5883980dc4bf8431caa6cab4f768d6f3\n" }, { "commit": "1f4a0df5a97a479361c4693a5c9f0e2b1dcf57f6", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "660636c6971b7652460b3aa115da4e1cf4438167", "f2fcc1a1f78467b8656dd29b64694f437f5da77e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 03 03:58:19 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 03 03:58:19 2020 +0000" }, "message": "Merge \"Update kernel to builds 6551880\"" }, { "commit": "f2fcc1a1f78467b8656dd29b64694f437f5da77e", "tree": "63ee0017364462b5ca8846a7b3ad603f5ac71697", "parents": [ "b0c8cc9500c2bfccead9849a6bc9f6107efbeabf" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sat May 30 07:15:56 2020 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Tue Jun 02 18:16:44 2020 -0700" }, "message": "Update kernel to builds 6551880\n\ned21d463f856 Revert \"ANDROID: sdcardfs: remove sdcardfs from system\"\ne196d8121f15 Revert \"Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\"\ne06c5dc6e3a9 Revert \"Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\"\n0b80c3e538fd Revert \"Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\"\n91303af088c3 Revert \"Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\"\n0348fad13a7c Revert \"ANDROID: remove sdcardfs-needed exports from whitelist\"\nd1f32ae30687 Revert \"ANDROID: GKI: update abi definitions now that sdcardfs is gone\"\n32ea849d28ac Revert \"Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\"\n5006e0b31efe UPSTREAM: usb: raw-gadget: fix null-ptr-deref when reenabling endpoints\n60f0ec6addb7 UPSTREAM: usb: raw-gadget: documentation updates\nf1bafa5cc904 UPSTREAM: usb: raw-gadget: support stalling/halting/wedging endpoints\ne5bbc9261f6c UPSTREAM: usb: raw-gadget: fix gadget endpoint selection\nd77503418484 UPSTREAM: usb: raw-gadget: improve uapi headers comments\n87b81c265f68 UPSTREAM: usb: raw-gadget: fix return value of ep read ioctls\nd583fe446db9 UPSTREAM: usb: raw-gadget: fix raw_event_queue_fetch locking\n59c4eb62e5d4 UPSTREAM: usb: raw-gadget: Fix copy_to/from_user() checks\n9b26d323fe7a FROMGIT: USB: dummy-hcd: use configurable endpoint naming scheme\naf2b56c502d6 ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu\n939dbbe02910 Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\n80c0ec609c09 ANDROID: GKI: update abi definitions now that sdcardfs is gone\n2f8cd6b5f217 ANDROID: remove sdcardfs-needed exports from whitelist\n0faa05cdd0a9 Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\n7cabc852a16b Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\n89936d1ae03b Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\n4dd8873b82fe Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\ne56ab22f5dae ANDROID: sdcardfs: remove sdcardfs from system\neb60e11d611f FROMGIT: driver core: Update device link status correctly for SYNC_STATE_ONLY links\nfd2d241e7467 UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links\n7b3547c78ebe UPSTREAM: driver core: Fix SYNC_STATE_ONLY device link implementation\n4f7036e47988 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4\nfe0e53c052b8 Merge 5.4.43 into android-5.4\n76732966f329 Revert \"ANDROID: Incremental fs: Avoid continually recalculating hashes\"\n413e6e69993f ANDROID: scsi: ufs: Handle clocks when lrbp fails\nea7bbd69ade9 UPSTREAM: serial: samsung: 32-bit access for TX/RX hold registers\n13d0653a99ca BACKPORT: serial: samsung: dt-bindings: Add reg-io-width compatible\n9e1870ee4da8 UPSTREAM: serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg\n01b0584902c5 ANDROID: staging: ion: Fix potential memory corruption\n08ea0a4cb274 ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32\nbc4a2722e5a1 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies\n8ca744822f5e ANDROID: GKI update kernel abi for 5.4.42 merge\nfb0106807289 Merge 5.4.42 into android-5.4\n\nTest: TreeHugger\nBug: 149816401\nChange-Id: I6085a447bf60635dfe62f70eaa831129a9014f77\n" }, { "commit": "19b5bfad528326029c6ff253bd52cc5d927533f0", "tree": "1a143e0756d56488334340f248843adf6258a064", "parents": [ "a7030b026395cfabe0dc0708df6e61f57e23c0c2" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Jun 01 17:40:26 2020 -0700" }, "committer": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Jun 01 17:51:05 2020 -0700" }, "message": "Update kernel to builds 6542846\n\n5885059bb36c ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu\n83ab243879f4 ANDROID: GKI: update abi definitions now that sdcardfs is gone\n441ba323addb Revert \"ANDROID: sdcardfs: Enable modular sdcardfs\"\n6e2d51b07c99 ANDROID: remove sdcardfs-needed exports from whitelist\n04acc4cf604c Revert \"ANDROID: vfs: Add setattr2 for filesystems with per mount permissions\"\n750140e3c409 Revert \"ANDROID: vfs: Add permission2 for filesystems with per mount permissions\"\n74594e1ba59c Revert \"ANDROID: vfs: add d_canonical_path for stacked filesystem support\"\n5118529b0b17 Revert \"ANDROID: fs: Restore vfs_path_lookup() export\"\nc6d419d9ff6e ANDROID: sdcardfs: remove sdcardfs from system\n2f41feec8543 FROMGIT: driver core: Update device link status correctly for SYNC_STATE_ONLY links\nb57a0e113101 UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links\n5a46cfebe8b1 UPSTREAM: driver core: Fix SYNC_STATE_ONLY device link implementation\nf7b4f375c715 Merge 5.4.43 into android-5.4-stable\na146823f0a1f Revert \"ANDROID: Incremental fs: Avoid continually recalculating hashes\"\n57b59aec93c4 Merge remote-tracking branch \u0027aosp/upstream-f2fs-stable-linux-5.4.y\u0027 into android-5.4-stable\na845d1601427 ANDROID: remove unused variable\nf78013d4ec0b ANDROID: scsi: ufs: Handle clocks when lrbp fails\ne02c9a69eee9 ANDROID: ABI/Whitelist: add erofs whitelist to unisoc whitelist\n65a35b28e81b ANDROID: GKI: Update abi for 5.4.42 update\ndfc45ba1ff0f UPSTREAM: serial: samsung: 32-bit access for TX/RX hold registers\n6928a95fab65 BACKPORT: serial: samsung: dt-bindings: Add reg-io-width compatible\n30a33770ff48 UPSTREAM: serial: samsung: Replace rd_regb/wr_regb with rd_reg/wr_reg\n8de6a8d30bee ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32\ndb0818c76ea5 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies\na93d8ad9bad1 Merge 5.4.42 into android-5.4-stable\n\nManually:\n mv stable-arm64 5.4-arm64\n mv stable-x86_64 5.4-x86_64\n mv 5.4-arm64/kernel-stable 5.4-arm64/kernel-5.4\n mv 5.4-arm64/kernel-stable-gz 5.4-arm64/kernel-5.4-gz\n mv 5.4-arm64/kernel-stable-lz4 5.4-arm64/kernel-5.4-lz4\n\nTest: TreeHugger\nBug: 149816401\nChange-Id: If9f4167250f9e0391e71c7ff394f7b01ea3a6f62\nMerged-In: I6085a447bf60635dfe62f70eaa831129a9014f77\n" }, { "commit": "f6350abc817b6fc9af3fa340a20beb1403588171", "tree": "010906ce83f6a884bfbdc19df6029cb165e81a26", "parents": [ "c55a320f80161e311c5b74fc6b895eb59df3dcf2", "813f1cfb35fd8484d3f3008047e380565806367d" ], "author": { "name": "Yongqin Liu", "email": "yongqin.liu@linaro.org", "time": "Wed May 27 22:31:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 27 22:31:06 2020 +0000" }, "message": "extract-vmlinux: update to check to search \"MS-DOS executable\" am: b0c8cc9500 am: 660636c697 am: 813f1cfb35\n\nChange-Id: I64c588831713a193adc40e1e7e6349650d91bc1e\n" }, { "commit": "813f1cfb35fd8484d3f3008047e380565806367d", "tree": "010906ce83f6a884bfbdc19df6029cb165e81a26", "parents": [ "dd9f2e9f507894b1531c44de02ac2c82280ca39a", "660636c6971b7652460b3aa115da4e1cf4438167" ], "author": { "name": "Yongqin Liu", "email": "yongqin.liu@linaro.org", "time": "Wed May 27 22:12:48 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 27 22:12:48 2020 +0000" }, "message": "extract-vmlinux: update to check to search \"MS-DOS executable\" am: b0c8cc9500 am: 660636c697\n\nChange-Id: Id9746c6777fc7bb20076fcb8ad4651deb106833a\n" }, { "commit": "660636c6971b7652460b3aa115da4e1cf4438167", "tree": "010906ce83f6a884bfbdc19df6029cb165e81a26", "parents": [ "58133a7ecbbc1af2fc809ae3224d657ff34b861b", "b0c8cc9500c2bfccead9849a6bc9f6107efbeabf" ], "author": { "name": "Yongqin Liu", "email": "yongqin.liu@linaro.org", "time": "Wed May 27 21:59:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 27 21:59:25 2020 +0000" }, "message": "extract-vmlinux: update to check to search \"MS-DOS executable\" am: b0c8cc9500\n\nChange-Id: I27c53e6ce27696f3c39911ea0a8bda8e3223692c\n" }, { "commit": "b0c8cc9500c2bfccead9849a6bc9f6107efbeabf", "tree": "010906ce83f6a884bfbdc19df6029cb165e81a26", "parents": [ "fd08d3aa39139bef85c562bfc5a7fffd9a04dd1c" ], "author": { "name": "Yongqin Liu", "email": "yongqin.liu@linaro.org", "time": "Wed May 27 20:46:13 2020 +0800" }, "committer": { "name": "Yongqin Liu", "email": "yongqin.liu@linaro.org", "time": "Wed May 27 20:53:10 2020 +0800" }, "message": "extract-vmlinux: update to check to search \"MS-DOS executable\"\n\ninstead of check if there is a line that ends with \"MS-DOS executable\",\nas on some host OS, there might be other information printed\nafter \"MS-DOS executable\".\n\nLike on Debian OS, the output is something like following:\n$ cat /etc/issue\nDebian GNU/Linux bullseye/sid \\n \\l\n\n$ file cuttlefish_assembly/vmlinux\ncuttlefish_assembly/vmlinux: MS-DOS executable PE32+ executable (EFI application) Aarch64 (stripped to external PDB), for MS Windows\n$\n\nTest: boot test manually with launch_cvd command\n\nSigned-off-by: Yongqin Liu \u003cyongqin.liu@linaro.org\u003e\nChange-Id: I0e6d761271f4182d8efa45a1851e4a3bea013952\n" }, { "commit": "c55a320f80161e311c5b74fc6b895eb59df3dcf2", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "a515158fa5f74e5b97927bce1e7b89bfc43367c6", "dd9f2e9f507894b1531c44de02ac2c82280ca39a" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 20:39:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 20:39:28 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6508545 am: a7030b0263 -s ours am: dd9f2e9f50 -s ours\n\nam skip reason: Change-Id Ib3827c30f7499fe277d168c6556b3a6903aa00cd with SHA-1 fd08d3aa39 is in history\n\nChange-Id: I195f14217fc4a4955b9f632bf520e819d58ff19a\n" }, { "commit": "a515158fa5f74e5b97927bce1e7b89bfc43367c6", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "ef24e8fd221032b9bce679c534d0e811a3c21a14", "392ff2595ec88207b40a52582b0933b8eb3e1ac1" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 20:39:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 20:39:16 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6508545 am: a7030b0263 am: 392ff2595e -s ours\n\nam skip reason: Change-Id Ib3827c30f7499fe277d168c6556b3a6903aa00cd with SHA-1 fd08d3aa39 is in history\n\nChange-Id: Iee5f1442462f1d7cb883349a7169de353e87c231\n" }, { "commit": "dd9f2e9f507894b1531c44de02ac2c82280ca39a", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "b556d4fb8f9b7d1e981ea753ddb0375c947f4eae", "a7030b026395cfabe0dc0708df6e61f57e23c0c2" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 20:23:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 20:23:40 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6508545 am: a7030b0263 -s ours\n\nam skip reason: Change-Id Ib3827c30f7499fe277d168c6556b3a6903aa00cd with SHA-1 fd08d3aa39 is in history\n\nChange-Id: I3c6a850ed2716233212b95ee5063448f91027b94\n" }, { "commit": "392ff2595ec88207b40a52582b0933b8eb3e1ac1", "tree": "4a90ad823212dac22d48bb2f486e764f4771a4ca", "parents": [ "dee67f38da669b030a6e8a9f63ce6de80bb03f2e", "a7030b026395cfabe0dc0708df6e61f57e23c0c2" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 20:23:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 20:23:39 2020 +0000" }, "message": "Update kernel to builds 6508545 am: a7030b0263\n\nChange-Id: I22c71afcc95762962ffce95c4f418f6f13bda1d7\n" }, { "commit": "ef24e8fd221032b9bce679c534d0e811a3c21a14", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "ad7224170f45565e74b87672a78c891c7835fce5", "b556d4fb8f9b7d1e981ea753ddb0375c947f4eae" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 18:47:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 18:47:39 2020 +0000" }, "message": "Update kernel to builds 6508538 am: fd08d3aa39 am: 58133a7ecb am: b556d4fb8f\n\nChange-Id: I5edd31c3f860986e0ff646bfd5c3ca5f56fc0924\n" }, { "commit": "b556d4fb8f9b7d1e981ea753ddb0375c947f4eae", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "3f4e71602d97a9a6a1814f1738b02f24fd6cc289", "58133a7ecbbc1af2fc809ae3224d657ff34b861b" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 18:30:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 18:30:30 2020 +0000" }, "message": "Update kernel to builds 6508538 am: fd08d3aa39 am: 58133a7ecb\n\nChange-Id: I5c1becd4226395cdec6d734dd637ac7fa68939d9\n" }, { "commit": "58133a7ecbbc1af2fc809ae3224d657ff34b861b", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "00f39961f636d01d4e359fdad3621e0e0b12ee5f", "fd08d3aa39139bef85c562bfc5a7fffd9a04dd1c" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 18:09:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 20 18:09:44 2020 +0000" }, "message": "Update kernel to builds 6508538 am: fd08d3aa39\n\nChange-Id: Id24519250042a2a0ef85489b0170b5553ab09ad4\n" }, { "commit": "a7030b026395cfabe0dc0708df6e61f57e23c0c2", "tree": "4a90ad823212dac22d48bb2f486e764f4771a4ca", "parents": [ "d36e8ad612167314c3fb149b37992ae9469ddcbd" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 19 22:39:34 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 06:19:35 2020 +0000" }, "message": "Update kernel to builds 6508545\n\nTo enable additional net testing options.\n\nd82402a2608f ANDROID: clang: update to 11.0.1\n213e89e40b02 FROMLIST: x86_64: fix jiffies ODR violation\na076f3ab4645 ANDROID: ABI/Whitelist: add ufs whitelist to unisoc whitelist\n2ae23d00ca00 ANDROID: GKI: Enable net testing options\n1184ff999d06 ANDROID: fscrypt: set dun_bytes more precisely\n17731f1f036e ANDROID: dm-default-key: set dun_bytes more precisely\n1af79e47ae87 ANDROID: block: backport the ability to specify max_dun_bytes\n29624453676b ANDROID: Incremental fs: wake up log pollers less often\n272a098a8cc3 ANDROID: Incremental fs: Fix scheduling while atomic error\n5fa3402c6da5 ANDROID: Incremental fs: Avoid continually recalculating hashes\n64024afaea33 ANDROID: export: Disable symbol trimming on modules\na3ded74aa47f ANDROID: ABI/Whitelist: add the symbol sdhci_request_atomic to unisoc whitelist\n50d59f032fea FROMGIT: media: uapi: h264: Add new profile and levels\nb3629481afde FROMGIT: media: v4l2-ctrl: Add H264 profile and levels\n2791d3184c03 ANDROID: GKI: abi update due to mmc patches merged\n72c2c666a0bd FROMGIT: mmc: host: sdhci-sprd: Implement the request_atomic() API\n00c0cd436f4e FROMGIT: mmc: host: sdhci: Implement the request_atomic() API\n9cd06c93af8e FROMGIT: mmc: host: Introduce the request_atomic() for the host\n1746da507ae9 FROMGIT: mmc: sdhci: Reduce maximum time under spinlock in sdhci_send_command()\n7343e424d25d FROMGIT: mmc: sdhci: Tidy sdhci_request() a bit\n51a976d740d0 FROMGIT: mmc: sdhci: Remove unneeded forward declaration of sdhci_finish_data()\n95ed3158f617 FROMGIT: mmc: sdhci: Stop exporting sdhci_send_command()\nf7960e1a1e1f FROMGIT: mmc: sdhci: Add helpers for the auto-CMD23 flag\n0140dbb03397 FROMGIT: mmc: sdhci-sprd: Drop redundant cap flags\naee688a9120a ANDROID: GKI: update abi definition due to 5.4.41 merge\n5e169f689fa8 Merge 5.4.41 into android-5.4-stable\n\nTest: TreeHugger\nBug: 144061615\nChange-Id: I556c459a62c8f0476802c2fc4613065ce5ba55b0\nMerged-In: Ib3827c30f7499fe277d168c6556b3a6903aa00cd\n" }, { "commit": "fd08d3aa39139bef85c562bfc5a7fffd9a04dd1c", "tree": "a074e1ccb225d8a4cf3338fa6dbd55c8c696e841", "parents": [ "a7798b885b5ea550d3089a2b82ae9f15f287cd6e" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 19 23:03:47 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 20 06:19:09 2020 +0000" }, "message": "Update kernel to builds 6508538\n\nTo enable additional net testing options.\n\nb507b85143d2 ANDROID: clang: update to 11.0.1\nd7027ab53c53 FROMLIST: x86_64: fix jiffies ODR violation\n6edec6fa1f2e ANDROID: abi_gki_aarch64_qcom_whitelist: Add reboot_mode\nb818fc58f06b ANDROID: Incremental fs: wake up log pollers less often\n36c5596ff7bb ANDROID: Incremental fs: Fix scheduling while atomic error\n968e917dcd12 ANDROID: Incremental fs: Avoid continually recalculating hashes\n49f0d7723a6b ANDROID: export: Disable symbol trimming on modules\n16e64eebed6e FROMGIT: media: uapi: h264: Add new profile and levels\nc2037c63fde7 FROMGIT: media: v4l2-ctrl: Add H264 profile and levels\nfbbfb699b157 ANDROID: fscrypt: set dun_bytes more precisely\n02bae85ed8d1 ANDROID: dm-default-key: set dun_bytes more precisely\na44d7ee7efa2 ANDROID: block: backport the ability to specify max_dun_bytes\nc0c4e3090022 ANDROID: GKI: abi update due to mmc patches merged\ne4f32fd3d40a FROMGIT: mmc: host: sdhci-sprd: Implement the request_atomic() API\n899e443efd64 FROMGIT: mmc: host: sdhci: Implement the request_atomic() API\nfa38d624738e FROMGIT: mmc: host: Introduce the request_atomic() for the host\nde5e8d16ed0e FROMGIT: mmc: sdhci: Reduce maximum time under spinlock in sdhci_send_command()\nbf56e0c8654d FROMGIT: mmc: sdhci: Tidy sdhci_request() a bit\n3038d9fefa41 FROMGIT: mmc: sdhci: Remove unneeded forward declaration of sdhci_finish_data()\n61af624b4078 FROMGIT: mmc: sdhci: Stop exporting sdhci_send_command()\n184f1476406d FROMGIT: mmc: sdhci: Add helpers for the auto-CMD23 flag\n2e9c65bd0a66 FROMGIT: mmc: sdhci-sprd: Drop redundant cap flags\n067aa9bbfcb6 ANDROID: GKI: update abi definition due to 5.4.41 merge\n407e5734962a Merge 5.4.41 into android-5.4\n\nTest: TreeHugger\nBug: 144061615\nChange-Id: Ib3827c30f7499fe277d168c6556b3a6903aa00cd\n" }, { "commit": "ad7224170f45565e74b87672a78c891c7835fce5", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "1656c19db5a2bba9cc026f9c8a22ae5e85d0bc44", "dee67f38da669b030a6e8a9f63ce6de80bb03f2e" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 15:54:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 15:54:45 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6487912 am: d36e8ad612 am: dee67f38da -s ours\n\nam skip reason: Change-Id I2b9b3eb475c4f55af77e122b0eb3096f7590662d with SHA-1 a7798b885b is in history\n\nChange-Id: Ic69b6007caad12e63e0ea8ccfe7f13d7487cc1cc\n" }, { "commit": "1656c19db5a2bba9cc026f9c8a22ae5e85d0bc44", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "28f6b552e5b7e85369ca1d6688c5d96e87068848", "3f4e71602d97a9a6a1814f1738b02f24fd6cc289" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 15:51:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 15:51:14 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6487912 am: d36e8ad612 -s ours am: 3f4e71602d -s ours\n\nam skip reason: Change-Id I2b9b3eb475c4f55af77e122b0eb3096f7590662d with SHA-1 a7798b885b is in history\n\nChange-Id: I48aec43f83bcc1310c0987c443f6dd041bbb6918\n" }, { "commit": "dee67f38da669b030a6e8a9f63ce6de80bb03f2e", "tree": "0916918b6c2313693c5c946567b92344dbae10cb", "parents": [ "7f4f4838611b2dd227f495e3c76d13040a8ee611", "d36e8ad612167314c3fb149b37992ae9469ddcbd" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 15:38:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 15:38:55 2020 +0000" }, "message": "Update kernel to builds 6487912 am: d36e8ad612\n\nChange-Id: Ib710f39ac65cd607bfe0ea9cc10f8bf47e2ce6c0\n" }, { "commit": "3f4e71602d97a9a6a1814f1738b02f24fd6cc289", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "59e6f5ce409a8701d960747ee90a497ca32b6945", "d36e8ad612167314c3fb149b37992ae9469ddcbd" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 15:38:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 15:38:50 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6487912 am: d36e8ad612 -s ours\n\nam skip reason: Change-Id I2b9b3eb475c4f55af77e122b0eb3096f7590662d with SHA-1 a7798b885b is in history\n\nChange-Id: I4f9bb287f9078763fa54b7a8b17669852c54b6b5\n" }, { "commit": "28f6b552e5b7e85369ca1d6688c5d96e87068848", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "d04c2b99eeb1d6bdcdf54442a9bc5bbecb1bc264", "59e6f5ce409a8701d960747ee90a497ca32b6945" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 08:01:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 08:01:59 2020 +0000" }, "message": "Update kernel to builds 6487909 am: a7798b885b am: 00f39961f6 am: 59e6f5ce40\n\nChange-Id: Ie4991f73c30ad90e1799f708a0cf98b5e4e16bec\n" }, { "commit": "59e6f5ce409a8701d960747ee90a497ca32b6945", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "cbe6b0d9055034c7481df02e4ba1cc528c2faded", "00f39961f636d01d4e359fdad3621e0e0b12ee5f" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 07:49:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 07:49:54 2020 +0000" }, "message": "Update kernel to builds 6487909 am: a7798b885b am: 00f39961f6\n\nChange-Id: I8a339934986d9a832738da36b8a9db98c0c8f55d\n" }, { "commit": "00f39961f636d01d4e359fdad3621e0e0b12ee5f", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "38b5175c25c253ea2e9960a5b9c4766a89eed064", "a7798b885b5ea550d3089a2b82ae9f15f287cd6e" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Wed May 13 07:29:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 07:29:50 2020 +0000" }, "message": "Update kernel to builds 6487909 am: a7798b885b\n\nChange-Id: I61aaa4b24926a45b98f05be0d2bd8668c2ebb4d0\n" }, { "commit": "d36e8ad612167314c3fb149b37992ae9469ddcbd", "tree": "0916918b6c2313693c5c946567b92344dbae10cb", "parents": [ "2a48389e2c62ca616e7ec90f7f1eed4d96470c51" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 21:26:21 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 21:31:30 2020 -0700" }, "message": "Update kernel to builds 6487912\n\nTo enable CONFIG_STATIC_USERMODEHELPER which is checked by CTS.\n\n$ git log --first-parent --no-decorate --oneline 46f5ad7..\n79c00997a007 ANDROID: GKI: enable CONFIG_IRQ_TIME_ACCOUNTING\nd8cd93821de4 ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER\n228c59bb379b ANDROID: dm-default-key: Update key size for wrapped keys\n\nTest: TreeHugger\nBug: 156358723\nChange-Id: I802aaffa9c66d4a2254f353db5446eb90fcfbfb9\nMerged-In: I2b9b3eb475c4f55af77e122b0eb3096f7590662d\n" }, { "commit": "a7798b885b5ea550d3089a2b82ae9f15f287cd6e", "tree": "08256a51b4bcc3829b08c79296d4eb29dec00976", "parents": [ "d81e1d9139c68a0a5f9d0bb1a0d42b0f6687f725" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 21:13:39 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 21:14:58 2020 -0700" }, "message": "Update kernel to builds 6487909\n\nTo enable CONFIG_STATIC_USERMODEHELPER which is checked by CTS.\n\n$ git log --first-parent --no-decorate --oneline 46f5ad7..\n79c00997a007 ANDROID: GKI: enable CONFIG_IRQ_TIME_ACCOUNTING\nd8cd93821de4 ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER\n228c59bb379b ANDROID: dm-default-key: Update key size for wrapped keys\n\nTest: TreeHugger\nBug: 156358723\nChange-Id: I2b9b3eb475c4f55af77e122b0eb3096f7590662d\n" }, { "commit": "d04c2b99eeb1d6bdcdf54442a9bc5bbecb1bc264", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "20cdd7d49ec9b62c9296e74b76c3f9bba0246aef", "cbe6b0d9055034c7481df02e4ba1cc528c2faded" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 15:36:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 15:36:49 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6481528 am: 2a48389e2c -s ours am: cbe6b0d905 -s ours\n\nam skip reason: Change-Id I1c4774be490469495f4ce0876cd13364f5045a68 with SHA-1 d81e1d9139 is in history\n\nChange-Id: I437237cc43965354269d39af219260f5c8d5e0d2\n" }, { "commit": "20cdd7d49ec9b62c9296e74b76c3f9bba0246aef", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "1c01d7f9dcf71f8b97a85e58ae2e4262c14bca19", "7f4f4838611b2dd227f495e3c76d13040a8ee611" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 15:36:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 15:36:36 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6481528 am: 2a48389e2c am: 7f4f483861 -s ours\n\nam skip reason: Change-Id I1c4774be490469495f4ce0876cd13364f5045a68 with SHA-1 d81e1d9139 is in history\n\nChange-Id: Ic81211dc759cef41cc160261c5bf8f1754032049\n" }, { "commit": "cbe6b0d9055034c7481df02e4ba1cc528c2faded", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "dcd64ca4f283102d2c7968342e596b61ef516cbd", "2a48389e2c62ca616e7ec90f7f1eed4d96470c51" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 15:23:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 15:23:25 2020 +0000" }, "message": "[automerger skipped] Update kernel to builds 6481528 am: 2a48389e2c -s ours\n\nam skip reason: Change-Id I1c4774be490469495f4ce0876cd13364f5045a68 with SHA-1 d81e1d9139 is in history\n\nChange-Id: Iae01f2e643333bb1a40f70eef579c0db26c5a2a8\n" }, { "commit": "7f4f4838611b2dd227f495e3c76d13040a8ee611", "tree": "475fac0cee005958da938874e702c6da35aff6d5", "parents": [ "126d2e47bdeff0ed976bb201d14d1b1fbaa0cc11", "2a48389e2c62ca616e7ec90f7f1eed4d96470c51" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Tue May 12 15:22:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 12 15:22:34 2020 +0000" }, "message": "Update kernel to builds 6481528 am: 2a48389e2c\n\nChange-Id: Ib67b70bd89c11175d9290bc97dec442fe676022d\n" }, { "commit": "1c01d7f9dcf71f8b97a85e58ae2e4262c14bca19", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "42f2c83ca919b204acb10d7a1c6bd7e8069b288e", "dcd64ca4f283102d2c7968342e596b61ef516cbd" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 20:10:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 20:10:21 2020 +0000" }, "message": "Update kernel to builds 6481591 am: d81e1d9139 am: 38b5175c25 am: dcd64ca4f2\n\nChange-Id: I37faa79424610af8828b4be2e3bd685932875ab2\n" }, { "commit": "dcd64ca4f283102d2c7968342e596b61ef516cbd", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "a3e4316cb838a92ae3d48e14b9ba7f8774b3ae82", "38b5175c25c253ea2e9960a5b9c4766a89eed064" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 19:52:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 19:52:15 2020 +0000" }, "message": "Update kernel to builds 6481591 am: d81e1d9139 am: 38b5175c25\n\nChange-Id: Ib3a1dbc9af0460aa04879de99edbf138668c8b1f\n" }, { "commit": "38b5175c25c253ea2e9960a5b9c4766a89eed064", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "37087ec3b4b2c28cc68827a7b14c6e933b5e2f76", "d81e1d9139c68a0a5f9d0bb1a0d42b0f6687f725" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 19:38:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 11 19:38:40 2020 +0000" }, "message": "Update kernel to builds 6481591 am: d81e1d9139\n\nChange-Id: I7cccd22fdfcebb780cd9596a17b796ea2927997e\n" }, { "commit": "2a48389e2c62ca616e7ec90f7f1eed4d96470c51", "tree": "475fac0cee005958da938874e702c6da35aff6d5", "parents": [ "27132cb88357e6fa4df637eff28ef139ddedeb10" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 08:44:37 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 10:13:05 2020 -0700" }, "message": "Update kernel to builds 6481528\n\n$ git log --first-parent --no-decorate --oneline bbdcb89..216913e\n216913e02dac Merge 5.4.40 into android-5.4-stable\na727d8194f5d ANDROID: GKI: x86: Drop CONFIG_DEVPORT\n4ab9bd485bd1 ANDROID: GKI: update abi definition due to FAIR_GROUP_SCHED removal\n40fbdc171ffe ANDROID: GKI: Remove FAIR_GROUP_SCHED\n1dd9206b1db5 ANDROID: Drop ABI monitoring from KASAN build config\ne29f0087eb4b ANDROID: Enforce KMI stability\ne752c9f98dc3 Merge 5.4.39 into android-5.4-stable\nfdf31223c1a2 ANDROID: Rename build.config.gki.arch_kasan\nee0aa633958c ANDROID: Incremental fs: Fix issues with very large files\n8aec82415ce8 ANDROID: Correct build.config branch name\n0db9b0e1a581 FROMGIT: f2fs: fix missing check for f2fs_unlock_op\n2899f55cf23c ANDROID: Fix build.config.gki-debug\n06e4191ed621 UPSTREAM: vdso: Fix clocksource.h macro detection\n4fd5adaa350b Merge 5.4.38 into android-5.4-stable\n3ab4d3fab9fc ANDROID: GKI: update abi definition due to added padding\n81e3966955b5 ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure\nd7924763c40e ANDROID: GKI: timer.h: add Android ABI padding to a structure\na39dfd4cd754 ANDROID: GKI: quota.h: add Android ABI padding to some structures\n5ed2f2a28b55 ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures\nfd2434be5289 ANDROID: GKI: mm.h: add Android ABI padding to a structure\n3e9392bc0aad ANDROID: GKI: kobject.h: add Android ABI padding to some structures\n7e8ead333b28 ANDROID: GKI: kernfs.h: add Android ABI padding to some structures\nedc0b633e4f5 ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure\nd3980ddfc032 ANDROID: GKI: ioport.h: add Android ABI padding to a structure\n897af37a8292 ANDROID: GKI: iomap.h: add Android ABI padding to a structure\n6c63338ed2a2 ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure\n1df9ac6c120c ANDROID: GKI: genhd.h: add Android ABI padding to some structures\n0f1aad38b887 ANDROID: GKI: ethtool.h: add Android ABI padding to a structure\n36ebd5071af1 ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure\n31189b44667c ANDROID: GKI: sched: add Android ABI padding to some structures\ndf04cb4bf9e0 ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures\n36f48845cf88 ANDROID: GKI: blk_types.h: add Android ABI padding to a structure\n02a7ee2f6e5b ANDROID: GKI: scsi.h: add Android ABI padding to a structure\nac9ec3f639f6 ANDROID: GKI: pci: add Android ABI padding to some structures\n266f90881710 ANDROID: GKI: update abi definition due to 5.4.37 merge\nae0dae9ffc05 Merge 5.4.37 into android-5.4-stable\ncacd25a9a1a9 ANDROID: Update ABI representation after enabling CONFIG_HID_BATTERY_STRENGTH\n578fe33bc87e ANDROID: GKI: enable CONFIG_HID_BATTERY_STRENGTH\n\nTest: TreeHugger\nBug: 156165388\nChange-Id: I1ae2c99db865528c23c56868d1e327410046cc86\nMerged-In: I1c4774be490469495f4ce0876cd13364f5045a68\n" }, { "commit": "d81e1d9139c68a0a5f9d0bb1a0d42b0f6687f725", "tree": "d4739c85ac4a999663b2aaaa86ea198e19b76785", "parents": [ "472e26dab52d0a9a893f23f04e99a6122031891c" ], "author": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 08:31:24 2020 -0700" }, "committer": { "name": "Alistair Delva", "email": "adelva@google.com", "time": "Mon May 11 08:49:19 2020 -0700" }, "message": "Update kernel to builds 6481591\n\n$ git log --first-parent --no-decorate --oneline c36aedd..46f5ad7\n46f5ad774ada Merge 5.4.40 into android-5.4\nd6943e6313ab ANDROID: GKI: x86: Drop CONFIG_DEVPORT\n2c3b4cba8ab3 ANDROID: staging: ion: optimize cache operation for non-cached buffer\n8c464aedacd3 ANDROID: GKI: update abi definition due to FAIR_GROUP_SCHED removal\n1a325fa64384 ANDROID: GKI: Remove FAIR_GROUP_SCHED\nee4982d298f6 ANDROID: Drop ABI monitoring from KASAN build config\ndb0cef2fbf05 Merge 5.4.39 into android-5.4\nf5be18b729ec ANDROID: remove unused variable\ne52c85a3140c ANDROID: Rename build.config.gki.arch_kasan\n644ae915cd5d ANDROID: staging: ion: Skip sync if not mapped\n320edd089c7c ANDROID: Incremental fs: Fix issues with very large files\ncb1091257636 UPSTREAM: vdso: Fix clocksource.h macro detection\n92af1db5c822 ANDROID: Fix build.config.gki-debug\n307fef1b71be Merge 5.4.38 into android-5.4\n04ae7f0f4cb7 FROMGIT: f2fs: fix missing check for f2fs_unlock_op\n4519a937255a ANDROID: GKI: update abi definition due to added padding\na70850c7b715 ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure\n157a59a1245b ANDROID: GKI: timer.h: add Android ABI padding to a structure\n1ab378ac1039 ANDROID: GKI: quota.h: add Android ABI padding to some structures\n22c282cbe0c7 ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures\ne7050cf83ffd ANDROID: GKI: mm.h: add Android ABI padding to a structure\nb7ffab7b2ae8 ANDROID: GKI: kobject.h: add Android ABI padding to some structures\n4e14350efdfe ANDROID: GKI: kernfs.h: add Android ABI padding to some structures\ncea320cbb74c ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure\naa173ad57ae9 ANDROID: GKI: ioport.h: add Android ABI padding to a structure\n2e4824bd1917 ANDROID: GKI: iomap.h: add Android ABI padding to a structure\nd20608673db7 ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure\nbeefa66417d1 ANDROID: GKI: genhd.h: add Android ABI padding to some structures\n3dde852c48ee ANDROID: GKI: ethtool.h: add Android ABI padding to a structure\nf87d042fb622 ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure\n2672e3804298 ANDROID: GKI: sched: add Android ABI padding to some structures\n94aa9c24bc5a ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures\n026606a88ebe ANDROID: GKI: blk_types.h: add Android ABI padding to a structure\n8b6ad9b832d1 ANDROID: GKI: scsi.h: add Android ABI padding to a structure\nb48528a3359c ANDROID: GKI: pci: add Android ABI padding to some structures\nce99f6748d97 ANDROID: GKI: update abi definition due to 5.4.37 merge\ne2cdd8b6515d Merge 5.4.37 into android-5.4\nc229624a99ca Revert \"[WIP -- DO NOT SUBMIT] ANDROID: add support for vendor hooks\"\nddd544ecc082 Revert \"[DO NOT SUBMIT] Example vendor hook\"\n699c9c4e3606 Revert \"[DO NOT SUBMIT] Example restricted vendor hook\"\n0c0628ce9e44 Revert \"[DO NOT SUBMIT] Example of module attaching to hooks\"\nc339040f14b0 [DO NOT SUBMIT] Example of module attaching to hooks\n2a9c9ee0d159 [DO NOT SUBMIT] Example restricted vendor hook\n4082ebee733c [DO NOT SUBMIT] Example vendor hook\nabd908dadf08 [WIP -- DO NOT SUBMIT] ANDROID: add support for vendor hooks\n9ebafd437b7b ANDROID: build.config.gki.aarch64: Enable WHITELIST_STRICT_MODE\n641351414322 ANDROID: abi_gki_aarch64_qcom_whitelist: remove stale symbols\nbde394e0a556 ANDROID: abi_gki_aarch64_unisoc_whitelist: remove stale symbols\n53e197974198 ANDROID: abi_gki_aarch64_hikey960_whitelist: remove stale symbol\nc3d38a3fa646 ANDROID: abi_gki_aarch64_exynos_whitelist: remove stale symbols\n\nTest: TreeHugger\nBug: 156165388\nChange-Id: I1c4774be490469495f4ce0876cd13364f5045a68\n" }, { "commit": "42f2c83ca919b204acb10d7a1c6bd7e8069b288e", "tree": "9f07b8a5100ab57bc91f33438479a5d3d6a76ccc", "parents": [ "2d1711542c44984f4772d369ef273e0dcee1ee67", "a3e4316cb838a92ae3d48e14b9ba7f8774b3ae82" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon May 04 22:58:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 22:58:38 2020 +0000" }, "message": "Add METADATA to cuttlefish_kernel: Apache2\u003dNOTICE am: 472e26dab5 am: 37087ec3b4 am: a3e4316cb8\n\nChange-Id: I18022bcf0b98650847f31a6a11ff78de59e68f7f\n" }, { "commit": "a3e4316cb838a92ae3d48e14b9ba7f8774b3ae82", "tree": "9f07b8a5100ab57bc91f33438479a5d3d6a76ccc", "parents": [ "ed071ea94be91215da527a6a0b5a20cc94e74ece", "37087ec3b4b2c28cc68827a7b14c6e933b5e2f76" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon May 04 22:47:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 22:47:39 2020 +0000" }, "message": "Add METADATA to cuttlefish_kernel: Apache2\u003dNOTICE am: 472e26dab5 am: 37087ec3b4\n\nChange-Id: I43d858e5d74b300377e24578129c685694d405b5\n" }, { "commit": "37087ec3b4b2c28cc68827a7b14c6e933b5e2f76", "tree": "9f07b8a5100ab57bc91f33438479a5d3d6a76ccc", "parents": [ "b76847199d0ad7b354bed6957f3066c6f6f4ed57", "472e26dab52d0a9a893f23f04e99a6122031891c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon May 04 22:38:26 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 22:38:26 2020 +0000" }, "message": "Add METADATA to cuttlefish_kernel: Apache2\u003dNOTICE am: 472e26dab5\n\nChange-Id: I12c8c5a52ed90f44c211c5284c557dbeef9f5e2a\n" } ], "next": "2d1711542c44984f4772d369ef273e0dcee1ee67" }