diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-16 02:55:35 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-16 02:55:35 +0000 |
commit | 495166f22410880b45573cf602d60167b34e03d7 (patch) | |
tree | 0053e0eb82ed1185ee6fd4f1a812417d7efb27e0 | |
parent | aa31dac7cc9543203c6db7afb6a679c6dbfc46aa (diff) | |
parent | fe3999567a9d4f772aeb9b4e64363c304a93987c (diff) | |
download | marlin-kernel-495166f22410880b45573cf602d60167b34e03d7.tar.gz |
Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074, 8660602, 8662138, 8660127] into qt-releaseandroid-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r47android-10.0.0_r46android-10.0.0_r3android-10.0.0_r2android-10.0.0_r1android10-security-releaseandroid10-s1-release
Change-Id: I4bc63b1a26d4586c8480b67b6343ec4009a0a4db
22 files changed, 22 insertions, 22 deletions
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb index ad2ff2e..4bd527a 100644 --- a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb index 6e9dfee..c44c4bd 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_api" source_file: "Image.gz-dtb.marlin" } dest_file: "debug/Image.gz-dtb.marlin_debug_api" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb index 858c102..8e221b3 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_hang" source_file: "Image.gz-dtb.marlin" } dest_file: "debug/Image.gz-dtb.marlin_debug_hang" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb index c50d5a5..a2d1556 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_locking" source_file: "Image.gz-dtb.marlin" } dest_file: "debug/Image.gz-dtb.marlin_debug_locking" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb index 26a7488..f5e2ecf 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_memory" source_file: "Image.gz-dtb.marlin" } dest_file: "debug/Image.gz-dtb.marlin_debug_memory" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb index b5c1bb8..05884ca 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "debug/Image.gz-dtb.marlin_kasan" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb index 2e69399..593e016 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_api" source_file: "Image.gz-dtb.sailfish" } dest_file: "debug/Image.gz-dtb.sailfish_debug_api" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb index 4e485e1..2bbd6af 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_hang" source_file: "Image.gz-dtb.sailfish" } dest_file: "debug/Image.gz-dtb.sailfish_debug_hang" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb index aa4cc9a..9be032f 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_locking" source_file: "Image.gz-dtb.sailfish" } dest_file: "debug/Image.gz-dtb.sailfish_debug_locking" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb index 83ca167..c534f36 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_debug_memory" source_file: "Image.gz-dtb.sailfish" } dest_file: "debug/Image.gz-dtb.sailfish_debug_memory" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb index 71bf44c..22d05f9 100644 --- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb +++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb @@ -1,11 +1,11 @@ drops { android_build_drop { - build_id: "5655476" + build_id: "5723540" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "debug/Image.gz-dtb.sailfish_kasan" - version: "Linux version 3.18.137-g9414e6c5024a (android-build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019" + version: "Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul 12 06:00:07 UTC 2019" version_group: "kernel" git_project: "device/google/marlin-kernel" } diff --git a/Image.lz4-dtb b/Image.lz4-dtb Binary files differindex ff8b42d..abbc8e6 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb diff --git a/debug/Image.gz-dtb.marlin_debug_api b/debug/Image.gz-dtb.marlin_debug_api Binary files differindex ae86da0..f20f407 100644 --- a/debug/Image.gz-dtb.marlin_debug_api +++ b/debug/Image.gz-dtb.marlin_debug_api diff --git a/debug/Image.gz-dtb.marlin_debug_hang b/debug/Image.gz-dtb.marlin_debug_hang Binary files differindex f4ef0a9..fbcd54b 100644 --- a/debug/Image.gz-dtb.marlin_debug_hang +++ b/debug/Image.gz-dtb.marlin_debug_hang diff --git a/debug/Image.gz-dtb.marlin_debug_locking b/debug/Image.gz-dtb.marlin_debug_locking Binary files differindex e3ee9d1..77f4865 100644 --- a/debug/Image.gz-dtb.marlin_debug_locking +++ b/debug/Image.gz-dtb.marlin_debug_locking diff --git a/debug/Image.gz-dtb.marlin_debug_memory b/debug/Image.gz-dtb.marlin_debug_memory Binary files differindex b947368..eaaa422 100644 --- a/debug/Image.gz-dtb.marlin_debug_memory +++ b/debug/Image.gz-dtb.marlin_debug_memory diff --git a/debug/Image.gz-dtb.marlin_kasan b/debug/Image.gz-dtb.marlin_kasan Binary files differindex 059540a..47a2d70 100644 --- a/debug/Image.gz-dtb.marlin_kasan +++ b/debug/Image.gz-dtb.marlin_kasan diff --git a/debug/Image.gz-dtb.sailfish_debug_api b/debug/Image.gz-dtb.sailfish_debug_api Binary files differindex a2664bd..d2d8537 100644 --- a/debug/Image.gz-dtb.sailfish_debug_api +++ b/debug/Image.gz-dtb.sailfish_debug_api diff --git a/debug/Image.gz-dtb.sailfish_debug_hang b/debug/Image.gz-dtb.sailfish_debug_hang Binary files differindex 19c7679..3bec342 100644 --- a/debug/Image.gz-dtb.sailfish_debug_hang +++ b/debug/Image.gz-dtb.sailfish_debug_hang diff --git a/debug/Image.gz-dtb.sailfish_debug_locking b/debug/Image.gz-dtb.sailfish_debug_locking Binary files differindex 8646e7e..012b01e 100644 --- a/debug/Image.gz-dtb.sailfish_debug_locking +++ b/debug/Image.gz-dtb.sailfish_debug_locking diff --git a/debug/Image.gz-dtb.sailfish_debug_memory b/debug/Image.gz-dtb.sailfish_debug_memory Binary files differindex d6386df..b2f4d7d 100644 --- a/debug/Image.gz-dtb.sailfish_debug_memory +++ b/debug/Image.gz-dtb.sailfish_debug_memory diff --git a/debug/Image.gz-dtb.sailfish_kasan b/debug/Image.gz-dtb.sailfish_kasan Binary files differindex bb8017f..44f8787 100644 --- a/debug/Image.gz-dtb.sailfish_kasan +++ b/debug/Image.gz-dtb.sailfish_kasan |