tree 469a23a2ef2b35b6248956ff802fafe21c428480
parent bf548d98547d4d219ea07c7d0b56ad84b4c234aa
author Daniel Mentz <danielmentz@google.com> 1568763183 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1568945732 +0000

coral: update kernel-and-modules prebuilt [ DO NOT MERGE ]

Linux version 4.14.111-gaee1b36488dd-ab5882136 (android-build@abfarm-
    us-central1-c-0052) (Android (5484270 based on r353983c) clang
    version 9.0.3 (https://android.googlesource.com/toolchain/clang
    745b335211bb9eadfa6aa6301f84715cee4b37c5)
    (https://android.googlesource.com/toolchain/llvm
    60cf23e54e46c807513f7a36d0a7b777920b5881) (based on LLVM
    9.0.3svn)) #1 SMP PREEMPT Tue Sep 17 22:57:35 UTC 2019

build:
1553bec Rework the ABI Monitoring documentation in AOSP
673c1f8 build-tools: remove xargs as it is currently incompatible am: f41891e799
f41891e build-tools: remove xargs as it is currently incompatible
50e0a56 Merge "build_abi.sh: Comment unset ABI_DEFINITION for build.sh" am: 26bce06422
15865fe checkpatch_presubmit: match on exact ${KERNEL_DIR} on applied.prop am: 41ee76c46d
62b29ee build_abi: add options to help maintaining the abi.xml am: 697275e9e6
d681467 Merge "build.sh: Set make flags and propagate make arguments" am: 4d44b554f5
9cc5bc5 Merge "envsetup: move envsetup.sh to _setup_env.sh and deprecate envsetup.sh" am: d4372e3b95
bcb3c28 checkpatch: skip analysis for merge commits on kernel/common am: 0bfeb096c7
b089a6a Merge "[V2] build.sh: Fix the behavior of specifying CC" am: ee7ef66e21
d7ff658 build kernel module ramdisk am: 3a869acaf8
5f3714d Export all the BUILD_CONFIG env variables am: 9bad3d7e3c
8f0e70a envsetup.sh checks, but does not set ENVSETUP_SH_INCLUDED=1 am: 303324dc36
5819268 Fix removal of duplicate PATH entries am: 9f1ecd00d8
cb57682 Fix array expansion am: 497c3edc6b
adb792a Merge "Revert "build.sh: Fix the behavior of specifying CC"" am: d6aef5f374
8f16be6 Merge "build.sh: Fix the behavior of specifying CC" am: 0cd7bde04b
f716f5d Merge "abi: update libabigail to latest upstream master" am: 468fab0928
62f2bd3 add more common build tools to the kernel prebuilts am: e415a7116f
a7815d8 build: maintain a set of build-tools used during kernel builds am: 4f66c05900
7542b8c build_abi: add build/ to the path for error msg am: b6e81cd989
a3950be config.net_test: Set compilers paths to local repo's am: 8bc4f60653
bba0730 Wildcard expansion for generic FILES entries am: ac896333f6
44edbaa remove dpkg usage from build_abi.sh am: ab75f54d7d
3f51145 abi/bootstrap: Warn on non-debian systems what might need to be done am: 9344e8acf7
e9cde65 checkpatch_presubmit: be a bit more tolerant when parsing applied.prop am: 207606d6b6
0385cc9 abi: update libabigail to latest upstream master am: 8ed8746466
af49cb1 Merge changes from topic "hermetic-kernel-build" am: a41cc7e3b7 am: f173f6c800
f173f6c Merge changes from topic "hermetic-kernel-build" am: a41cc7e3b7
a4dcfc8 abi/bootstrap: ensure libebl backends are in LD_LIBRARY_PATH am: bc48ccb922 am: 46a8b96bb5
46a8b96 abi/bootstrap: ensure libebl backends are in LD_LIBRARY_PATH am: bc48ccb922
fbbc273 abi: update libabigail to latest upstream master am: 2898702ddf am: 16c50deffa
16c50de abi: update libabigail to latest upstream master am: 2898702ddf
ade1272 abi: update libabigail to latest upstream master am: 46f9bd0a1e am: 53ffcdd632
53ffcdd abi: update libabigail to latest upstream master am: 46f9bd0a1e
a57adc2 abi: replace libabigail's --short-locs by postprocessing of the abi.xml am: f2540c7355 am: 814aa67bd3
814aa67 abi: replace libabigail's --short-locs by postprocessing of the abi.xml am: f2540c7355
3805899 abi/bootstrap: build elfutils from source as well am: 2f2937cb8a am: 840a95a55a
840a95a abi/bootstrap: build elfutils from source as well am: 2f2937cb8a
4637bed abi: build_abi.sh: compare against predefined ABI am: c561e76004 am: d213e58d76
d213e58 abi: build_abi.sh: compare against predefined ABI am: c561e76004
51de746 abi/bootstrap: update libabigail to current master am: 25062fcd10 am: 08c4542b65
99d6fb2 ABI out: Use the extension .xml rather then .out am: d46fd323ff am: 9450cc0edd
08c4542 abi/bootstrap: update libabigail to current master am: 25062fcd10
9450cc0 ABI out: Use the extension .xml rather then .out am: d46fd323ff
c5894b5 Merge "checkpatch_blacklist: add TYPO_SPELLING" am: edbc774f1e am: 81c62c44cd
7636cdc build.sh: add option to define abi definition location am: 44509b0d71 am: b110e4c4ef
9e13bdc abitool.py: add various new abidw options to reduce indeterminism am: c494508155 am: 3083b6657e
1c02a9d build_abi.sh: pass through CC_LD_ARGS to `make olddefconfig` am: 334f5cfe40 am: 129b6f7708
81c62c4 Merge "checkpatch_blacklist: add TYPO_SPELLING" am: edbc774f1e
b110e4c build.sh: add option to define abi definition location am: 44509b0d71
3083b66 abitool.py: add various new abidw options to reduce indeterminism am: c494508155
129b6f7 build_abi.sh: pass through CC_LD_ARGS to `make olddefconfig` am: 334f5cfe40
6897d29 Pass CC_LD_ARG to savedefconfig am: 898f1e4a82 am: 58145ea4ec
58145ea Pass CC_LD_ARG to savedefconfig am: 898f1e4a82
7de2c50 Enable boot.img creation am: e46a937211 am: 99bdc7705d
99bdc77 Enable boot.img creation am: e46a937211
bbab8fe build_abi.sh: also check for the existence of abidiff am: 96a7e233ec am: e26b7730d2
b56587b build_abi.sh: Ensure valid abigail installation am: 680e80cafd am: b949417a96
4a1d2cc abi/bootstrap: install system dependencies without confirmation am: 02963acbce am: f67e40df19
4d7b933 abi/bootstrap: moar complete dependencies am: 11b3617ebd am: 44cd493ddf
009008c build.sh: avoid unnecessary copies and reduce overall runtime am: bec886afb9 am: 68f68907c6
8985a10 abi/bootstrap: clarify dependencies am: 7dcb786869 am: 53e66eb781
14be2d1 Merge master@5428150 into git_qt-dev-plus-aosp. am: 1272c58d97
3db6e0c Merge master@5406228 into git_qt-dev-plus-aosp. am: d1130d4956
1272c58 Merge master@5428150 into git_qt-dev-plus-aosp.
76b6de1 abi/bootstrap: only install packages if missing am: bd5e166237 am: b92549cc2a am: 334bf2270f
88a8f84 abi/bootstrap: update libabigail 1.5 -> 1.6 am: 8ce41bf7b9 am: 4138b89c1c am: 5b52e50806
334bf22 abi/bootstrap: only install packages if missing am: bd5e166237 am: b92549cc2a
5b52e50 abi/bootstrap: update libabigail 1.5 -> 1.6 am: 8ce41bf7b9 am: 4138b89c1c
39ed818 add build_abi.sh to create ABI dumps from build.sh builds am: ea2f60b2bc am: 4cd41f0a3f am: ca0428d4bd
1fb82b1 Initial version of the abi monitoring utilities am: cec41ee52f am: 3d5669113b am: 63730afa3a
8ea9670 ABI Monitoring: add bootstrap am: f7d7e4dca2 am: c1106deb49 am: d14a01d2f2
add9f9a envsetup.sh: take control of defining OUT_DIR and DIST_DIR am: ccb70faeee am: ece1967fc1 am: d1e7496e17
ca0428d add build_abi.sh to create ABI dumps from build.sh builds am: ea2f60b2bc am: 4cd41f0a3f
63730af Initial version of the abi monitoring utilities am: cec41ee52f am: 3d5669113b
d14a01d ABI Monitoring: add bootstrap am: f7d7e4dca2 am: c1106deb49
d1e7496 envsetup.sh: take control of defining OUT_DIR and DIST_DIR am: ccb70faeee am: ece1967fc1
d1130d4 Merge master@5406228 into git_qt-dev-plus-aosp.
09b7587 build.sh: define TMP_DIR relative to OUT_DIR am: 14f6db72fa am: 6fe1bc6915 am: 2557a6d42e
2557a6d build.sh: define TMP_DIR relative to OUT_DIR am: 14f6db72fa am: 6fe1bc6915
686e78a build.sh: use a gcc with target triplet from PATH if CC=gcc is set am: 0646c8d257 am: 8cd25bf96d am: 90b6781bcf
90b6781 build.sh: use a gcc with target triplet from PATH if CC=gcc is set am: 0646c8d257 am: 8cd25bf96d
fb64657 add build.config's for upstream LTS branches am: 263c177c98 am: 7ac6760cba am: c1a9ade235
c1a9ade add build.config's for upstream LTS branches am: 263c177c98 am: 7ac6760cba
7bddf2f build.sh: consistently use CC_ARG and LD_ARG am: 151047e2c3 am: 956c00bbc1 am: 4ef41d293b
4ef41d2 build.sh: consistently use CC_ARG and LD_ARG am: 151047e2c3 am: 956c00bbc1
e3a805f build.sh: doc for PRE_DEFCONFIG_CMDS + POST_KERNEL_BUILD_CMDS am: e4edd6f9ba am: 1318cc7ed5 am: d396d33209
b84367b Add PRE_DEFCONFIG + POST_KERNEL_BUILD hooks am: 0172f35846 am: 58874c5a67 am: dc585ea775
d396d33 build.sh: doc for PRE_DEFCONFIG_CMDS + POST_KERNEL_BUILD_CMDS am: e4edd6f9ba am: 1318cc7ed5
dc585ea Add PRE_DEFCONFIG + POST_KERNEL_BUILD hooks am: 0172f35846 am: 58874c5a67
9492f22 initial release of kernel/build in AOSP am: 6652d74e4b

kernel/private/tests/patchwork:
177a217 google_battery.pls: fix compile for 135907010
06d1cb4 fix: compile for 138147333

kernel/tests:
53bb87c Merge changes I8eec04a6,I0e6646fb,I4d8c76e0
32699ef net-test: change UML console detection
cfa88f7 net-test: shutdown after 1 second on panic
30410db net-test: fix leak_test.py on 5.1+
25fbaa4 net_test: Fix a typo in tcp_nuke_addr_test.py am: 7a5882fcfe
9bf26f2 net_test: re-enable terminal auto wrap at end am: eedec7f890
7a5882f net_test: Fix a typo in tcp_nuke_addr_test.py
eedec7f net_test: re-enable terminal auto wrap at end
d1a4af3 net-test: enable dummy network driver am: 0be11c13ea
6f9a9ba net_test: work around for buster's 'tty' command being too smart am: b998db0431
941ba9c Merge "Add the same mark with policy in SaInfo API" am: 97b14e5f86
3c73ff1 Use `nproc` processing units instead of 64 as default am: 0f36856b4c
8983906 net-test: switch from 'android-wear-p-preview-2' to 'master' branch of iptables am: 892892a4e7
b71fe14 net-test: Initial Debian Buster support am: b1c05f29f5
1e22b65 net-test: Set kernel cmdline 'console=' explicitly am: 297632a693
0c2ce56 net-test: Add missing kernel option checks am: afbd632fc5
561a16a [automerger skipped] DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master am: db69a44154 -s ours am skip reason: subject contains skip directive
58ad01d [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master am: 9ed8873880 -s ours am skip reason: subject contains skip directive
eac41b7 [automerger skipped] Fix tcp_repair_test that use mapped addresses am: 777b177c6f -s ours am skip reason: change_id I2b4c9f111f19dab4cfe29ce16ca130cdff2fba91 with SHA1 daa70a51ec is in history
777b177 Fix tcp_repair_test that use mapped addresses
daa70a5 Fix tcp_repair_test that use mapped addresses am: da2e9563c2 am: 9efc77a7fc
22cc34d Merge changes Ibec5b263,Iabe80f7e,I820fa224 am: ac0260176a am: 10d5719156
6f4a177 Refactor parameterization logic in net tests am: f1a12c8650 am: d9968a1e8b am: 13e7797f9a
13e7797 Refactor parameterization logic in net tests am: f1a12c8650 am: d9968a1e8b
cd122b0 Merge master@5406228 into git_qt-dev-plus-aosp. am: 17f8bde848
e2484f1 Add tests for tcp connection repair am: a3196de82e am: 0192118a65 am: c4ff7b8187
c4ff7b8 Add tests for tcp connection repair am: a3196de82e am: 0192118a65
17f8bde Merge master@5406228 into git_qt-dev-plus-aosp.
0e8bdcf net-test: allow bpf on 32-bit userspace with 64-bit kernel am: fab9a47146 am: 0508643812 am: ba594a073f
9a9bdc5 net-test: rootfs/net_test.sh - minor stylistic fixes am: 789dcf76b6 am: 3037c36ff8 am: 9dc5d59b92
e62bd37 net-test: require rootfs/net_test.sh to be error free am: 2afd2efd83 am: 495e005433 am: f2a7312d73
ba594a0 net-test: allow bpf on 32-bit userspace with 64-bit kernel am: fab9a47146 am: 0508643812
9dc5d59 net-test: rootfs/net_test.sh - minor stylistic fixes am: 789dcf76b6 am: 3037c36ff8
f2a7312 net-test: require rootfs/net_test.sh to be error free am: 2afd2efd83 am: 495e005433
88f1f09 net_test: introduce build_all_rootfs.sh am: de51b09901 am: 9d0f5a9c55 am: ede9fe3221
ede9fe3 net_test: introduce build_all_rootfs.sh am: de51b09901 am: 9d0f5a9c55
33e305c net-test: build_rootfs.sh support for i386 & armhf am: 03aa0a663f am: 14b7fb1d05 am: 2e804885d5
2d0543e net-test: build_rootfs.sh - fix post debian wheezy move to archive am: bc960f3d0f am: b5779ea931 am: b58db794d5
2e80488 net-test: build_rootfs.sh support for i386 & armhf am: 03aa0a663f am: 14b7fb1d05
b58db79 net-test: build_rootfs.sh - fix post debian wheezy move to archive am: bc960f3d0f am: b5779ea931
568a4d3 net-test: add a test for a kernel panic triggered by a bad backport am: ccad07c91f am: dce2437344 am: d4038d5017
d4038d5 net-test: add a test for a kernel panic triggered by a bad backport am: ccad07c91f am: dce2437344
4b2151c net-test: build_rootfs - add base debian os to default image name am: 1b384ccf3d am: 0e80d0648c am: e6b2ce28f8
e6b2ce2 net-test: build_rootfs - add base debian os to default image name am: 1b384ccf3d am: 0e80d0648c
4825e4b net-test: build_rootfs - fix -n being ignored am: e9e18054c2 am: 0ee596ee82 am: 1ffe120dd3
1ffe120 net-test: build_rootfs - fix -n being ignored am: e9e18054c2 am: 0ee596ee82
713b013 [automerger skipped] Merge changes from topic "vts_kernel_net_test" into pie-vts-dev am: 1bc6e4fcff am: 03fd483c6c -s ours am: b9921e93cf
b9921e9 [automerger skipped] Merge changes from topic "vts_kernel_net_test" into pie-vts-dev am: 1bc6e4fcff am: 03fd483c6c -s ours am skip reason: SHA1 03fd483c6c skipped by user lorenzo
6f7bc2c [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: fc9fde65e3 -s ours am: d1a7d74f7f -s ours am: bcf0381956 -s ours am skip reason: subject contains skip directive
bcf0381 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: fc9fde65e3 -s ours am: d1a7d74f7f -s ours am skip reason: subject contains skip directive
99e059f Merge "net-test: fix error message line wrapping" am: ff3ed2c417 am: 87d4bd24bf am: 13865bf0f5
13865bf Merge "net-test: fix error message line wrapping" am: ff3ed2c417 am: 87d4bd24bf
53dd439 Reapply "Test Updating OUTPUT_MARK on Active SAs" am: d8f2bf10a8 am: ba441ad4a7 am: 34640c8817
34640c8 Reapply "Test Updating OUTPUT_MARK on Active SAs" am: d8f2bf10a8 am: ba441ad4a7
491154a [automerger skipped] Add __NR_bpf constant for i686. am: 6b0afa1c38 am: 589d4c4ca0 -s ours am: 4fdc4a74ba -s ours am skip reason: change_id I5a8ade3a2292734001dd6e85f9c6b5cefc8de9c1 with SHA1 7993a85525 is in history
4fdc4a7 [automerger skipped] Add __NR_bpf constant for i686. am: 6b0afa1c38 am: 589d4c4ca0 -s ours am skip reason: change_id I5a8ade3a2292734001dd6e85f9c6b5cefc8de9c1 with SHA1 7993a85525 is in history
12d1ff4 Merge stage-aosp-master into pi-dev-plus-aosp am: 3da8b8d418
3da8b8d Merge stage-aosp-master into pi-dev-plus-aosp
dcd991f [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: da32dd4e15 -s ours am: c0edfa7a01 -s ours am skip reason: subject contains skip directive
c0edfa7 [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: da32dd4e15 -s ours am skip reason: subject contains skip directive
4e44104 net-test: try to detect vsyscall=none uml and warn about it. am: d8cd1253af am: 5ae2eabe24 am: 95e1f58027
95e1f58 net-test: try to detect vsyscall=none uml and warn about it. am: d8cd1253af am: 5ae2eabe24
f347483 Merge "Add tests for unset output marks on floating policies" am: 508391f2c4 am: bfa0736be8 am: d58f3912a6
d58f391 Merge "Add tests for unset output marks on floating policies" am: 508391f2c4 am: bfa0736be8
3ae222c Revert "Test Updating OUTPUT_MARK on Active SAs" am: dd2d31985f am: 85f9a53b0a am: aa782004f7
6cd242f Test Updating OUTPUT_MARK on Active SAs am: 4406bae0a2 am: 7b1f5936b8 am: 94149c5bb0
4492745 anycast_test.py: increase waiting time to 3 sec to wait CloseFileDescriptorThread finished am: 4832bbb524 am: b54c664e48 am: 25b49d1aa7 am: 124e419900
4c41b86 anycast_test.py: increase waiting time to 3 sec to wait CloseFileDescriptorThread finished am: 4832bbb524 am: a4a8e36ee1 am: 2bf3821d02
4290f8c [automerger skipped] anycast_test.py: change to use thread.join to wait CloseFileDescriptorThread finished am: 2eacd48327  -s ours am: 47610ab0d1 am: 767dc0d174 am: 19f8101ad3
373dae6 [automerger skipped] anycast_test.py: change to use thread.join to wait CloseFileDescriptorThread finished am: 2eacd48327 am: 0d5028b3ef  -s ours am: 4b104d7cc1
7e08eae Merge "anycast_test.py: increase waiting time to 3 sec to wait CloseFileDescriptorThread finished" am: 1ff603fffe am: 869b370f11 am: 66a92d628e
54e6fe4 [automerger skipped] DO NOT MERGE am: f9a1cb41a6  -s ours am: daf5778628  -s ours am: 18272fc5f4  -s ours
721a619 Merge "Test to check tcp initial rwnd size" am: 1724800a6e am: 8877e0457e am: 8bdf7a260f
0e4d3c2 net_test: fix job control in console's bash terminal am: 42f963407a am: c8f293af3f am: 9c4e89dfdb
4f01f66 net_test: workaround for 3.18 and 4.4 late urandom init am: 38f75fa58f am: 424639febe am: 8870092754
532f993 Revert "Implement a workaround for clang + PARAVIRT failure." am: e2edeed20b am: 51b6d04a74 am: cb8386fcd4
2ff7d96 net-test: deflake 4.19 entropy installation am: 86a0a4c2dd am: c37a1d3575 am: a5bf65f769
a62aa37 Use blocking sockets with timeout for xfrm_tunnel_test am: a563236b85 am: bb9ee57633 am: 92ee9f95d6
3ea20e9 Close the socket in socketCreateTest before exist am: ae95d436ff am: fccf1947d0 am: 908c88ec44
7ed8d9f Test to verify cgroup socket filter am: 09a7c89b37 am: a23cf37948 am: 55b090eaea
7e14e3d net_test - extra debugging for ReadProcNetSocket() regexp match failures am: c2d677ff32 am: 263fe1143e am: 701bf9a667
f25e745 net/test/OWNERS: passing the torch from ek@ to maze@ am: 59b602c67c am: 7fb2031f35 am: b0edad4c1b
b6332c3 run_net_test - further boost UML entropy am: e369f75633 am: d1844cbeb0 am: 406f2cb7d6
4b8f715 run_net_test.sh: Add support for arm64 am: 9ea6092b52 am: e95c9a6f1a am: 8c1a84f98c
cf85c33 build_rootfs.sh: Add support for arm64 am: 34089b083e am: a708a86d5a am: 20a7edb5a1
890ed7a [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 96bd68cde5  -s ours am: 89ed9d3c1f  -s ours am: e6b89b36c1  -s ours
0d8875b [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 69e005f650  -s ours am: 6179dfc2ac  -s ours
50fe403 [automerger skipped] Improve xfrm net test am: 7d4de3b1fc  -s ours am: 107a397016  -s ours am: 393d83d947  -s ours am: 85ff0682a0  -s ours
44a0c0e [automerger skipped] Improve xfrm net test am: 7d4de3b1fc am: 3a0e9f2863  -s ours am: 24ed12a900  -s ours
16a4250 Improve xfrm net test am: 7c68a3c3c4 am: ac9d99664e am: a016245747
8de7b49 [automerger skipped] Filter neighbour dumps by interface. am: 7389196f88  -s ours am: a950b2bc07  -s ours am: 5e9e50c7aa  -s ours am: a16773591f  -s ours
117743a [automerger skipped] Filter neighbour dumps by interface. am: 7389196f88 am: 5ef53f8146  -s ours am: a069e617fc  -s ours
6530464 run_net_test: UML - fix insufficient entropy problems am: e29f3e6f06 am: 874082355b am: d089825692
98f6113 run_net_test: handle UML's tendency to leave stdout in non-blocking mode am: 99cd00d206 am: 171d8e0a84 am: 5a00e9b90e
ebbda12 Merge "run_net_test.sh: switch to readonly by default" am: 7dfcf3b91f am: 3743b2cf7d am: 61c799cf59
e12109d Merge "Filter neighbour dumps by interface." am: bb1bd1f24f am: 6bde0a1109 am: 73f0f766c8
651c27f run_net_test: add 'no_test' test am: ac82e92466 am: b6cb3d7fe6 am: 9a443824b0
7ccd724 run_net_test.sh: fix UML --readonly flag am: 75b9e5ee69 am: f593ebfbc5 am: 2622d98e1d
2f47035 Enable virtio rng device for net tests on qemu/kvm. am: 2cc987d9dd am: 988451a599 am: 83e99aee09
a6fb7fc Add lspci & lsusb commands to stretch image. am: 56237c9b64 am: afa0d0b0ef am: f1eca1b1d6
f399942 Merge "Allow ROOTFS to use environment variables" am: d9c9eae96c am: f401cb4044 am: 03c2d2d4ed
79bb046 Check xfrm state to delete embryonic SA am: f9e22fba0a am: 6f2a1e3a99 am: 7e72c3a08e am: d724fec1b8
e45c821 Check xfrm state to delete embryonic SA am: f9e22fba0a am: 30c4cff24b am: 127d820c2a
80920bb Remove mutable default parameter in tunnel_test am: d3caaa0b9a am: b8cef96aad am: 047430b365
6ab3836 Document/enforce a bug in udp_dump_one. am: 74faec5d15 am: 9c82cd3b87 am: aca6350573
6d93025 Merge "net_test: fix sock_diag_test.py to handle ipv5 correctly" am: 2b294be524 am: 79747d4d5b am: 0be8a1e4ae
fff8262 Fix sysfs mount in net_test.sh. am: cff4420cec am: 1ebbc44b71 am: f44908b982
49c45ca Merge "Add tests for VTI rekey procedure" am: e1d7317542 am: c71e86b481 am: 71ce1c730d
19d4837 Add tests for netfilter reject policies am: a05e9a297c am: 0d4781f171 am: 8c7bade56d
b45490d Always test UDP_DIAG for 4.9 kernel am: e59c063ef4 am: a5fd5d17d7 am: 7e36f1c831 am: 1d8392e9bd
13353e1 Always test UDP_DIAG for 4.9 kernel am: e59c063ef4 am: 010a8c4229 am: 30229151e8
bae791c [automerger skipped] Fix net tests for 32-bit kernel am: e57d074dc5  -s ours am: a1bd780fb5  -s ours am: 74ee46a712  -s ours am: 20b5dc2f0d  -s ours
3ee9e0b Refactor VTI tests to support null encryption am: 91b562615b am: 06e96b06bc am: da2f2cb75b am: 838bf8a8d2
f1659af Add tunnel input tests to net_tests am: 3063949411 am: e86e1265df am: af06d43ebf am: af6b0e3c2f
afecd28 Refactor parameterization logic in net tests am: ad7a31a776 am: 2a4dec1b92 am: 0583653320 am: e80788e93b
3fa2475 Fix nobuild runs of run_net_test.sh without KERNEL_BINARY env var set am: 7878ca7eb5 am: e84422ed29 am: 2a5ab72705
e77b32c Merge "anycast_test.py: change to use thread.join to wait CloseFileDescriptorThread finished" am: 764991f419 am: 32c21e5824 am: 300c4ec6f3
ff47174 Add scripts for building the net tests rootfs. am: 2d99985d80 am: 19ce6ce997 am: 749379b794
71562c3 [automerger skipped] Fix net tests for 32-bit kernel am: e57d074dc5  -s ours am: 925c3a1a24  -s ours
bf356e0 Fix net tests for 32-bit kernel am: d6d6b2b531 am: 8d6daeda1a am: ac2bc1e715
9b31457 Enable FHANDLE to support systemd am: 9493cb18c3 am: 7c2b1c57aa am: be80a2e4a8
15a50c0 Implement a workaround for clang + PARAVIRT failure. am: 805d82cce0 am: 9eaeefbbfe am: d41bafb001
8f0c902 Add support for running the harness with QEMU. am: 473536b011 am: 3f2eea9509 am: feee048cf6
71dcd2a Annotate non-common kernel config options. am: ab987108fa am: aaee4fb498 am: 7132cc21ad
6eb205a Fix some invalid config options. am: 8f52a621c3 am: 288b176b4b am: c5092b3465
941f911 [automerger skipped] Test for getFirstMapKey of bpf maps am: 60317ba07e  -s ours am: ee364e3e5a  -s ours
5381250 Drop unnecessary CONFIG_ prefixes. am: 5055c07de5 am: 359ec13491 am: 4ea368275a
0e72b17 Fix selection of bpf syscall number with COMPAT_UTS_MACHINE. am: 90bc84211e am: 7ec5c2f0e8 am: 59119393ca
e3e096e Add __NR_bpf constant for i686. am: 7993a85525 am: 815de5b889 am: fa43c16ee8
62daef2 Fix the flaky cgroup uid bpf test am: f1231b2634 am: a4e2c377af am: 1432f8be68
aa35a8b Test for getFirstMapKey of bpf maps am: 493cfb50cb am: 0fb9943991 am: b3d776b25a
3117a0f Test experimental xfrm interfaces if supported. am: ab29790875 am: 1aceefb492 am: 544f5def74
ac7f5a5 Merge "Set SA mark to unused for Tunnel Mode" am: 940262ecf0 am: 251fdb722d am: 7045c16ccf
98b11b5 [automerger skipped] Be flexible about TCP RST and SOCK_DESTROY poll return values. am: 0146dc63d1  -s ours am: baa525aecb  -s ours
25126d1 Be flexible about TCP RST and SOCK_DESTROY poll return values. am: ec4e4087ae am: c0f8d934b2 am: 2e870e84c4
3fa62f8 [automerger skipped] Merge "Verify VTI Modification using RTM_NEWLINK" into pi-dev am: b412bdb6d2  -s ours am: ee48b5252b  -s ours
755de82 Merge "Disable qtaguid tests if qtaguid is not present." am: 46a737e174 am: ddccf57516 am: cd98d12844
0f353d0 [automerger skipped] Enable algorithm net tests for 3.18 kernels am: 5d59332e11  -s ours am: e8f1a76683  -s ours
eab641f [automerger skipped] Fix algorithm tests to ensure no lingering sockets am: 059f098b7e  -s ours am: e9b3060160  -s ours
43fe85c Verify VTI Modification using RTM_NEWLINK am: 3f132dc23b am: b78d6e9844 am: d08e96f028
b8cc631 Merge changes I27b7e463,Ie9ab9b76 am: 09ba8b2409 am: 200782f980 am: 58978faa3f

private/msm-google:
aee1b36488dd Merge branch 'android-msm-floral-4.14-qt-security-next' into android-msm-floral-4.14-qt
c749ba9070e6 msm: kgsl: Add missing check for snapshot IB dump
bd265992314b UPSTREAM: binder: Set end of SG buffer area properly.
d43bb651ac65 ext4: zero out the unused memory region in the extent tree block
981fe5a8e4c3 binder: fix possible UAF when freeing buffer
ae91d63444a4 f2fs: fix flushing node pages when checkpoint is disabled
8b393e2869d5 Revert "mm : retry for reclaim if lmk kill is possible"
afe53e97be44 mm : retry for reclaim if lmk kill is possible

Bug: 126125118
Bug: 129345239
Bug: 130199266
Bug: 133041647
Bug: 133758011
Bug: 135907010
Bug: 136210786
Bug: 138147333
Bug: 138940226
Bug: 139894444
Bug: 140201217
Bug: 140747964
Change-Id: If3e9c284789cf64b07455d3b0cecbc0c96cb0afa
Merged-In: I2e98cd85276b15d640315475aca9d1b43b22d2b3
Pick-Prebuilt: 268290038
Build-Id: 5882136
Processing-Config: kernel_headers
Signed-off-by: Daniel Mentz <danielmentz@google.com>
(cherry picked from commit 4961025bc226cd28237cd5f9764f75ef82d182e7)