summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-09-30 00:15:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-09-30 00:15:07 +0000
commit391a2adfea86d94fd2e14bc8744e748334fd71bc (patch)
tree5940370b3fc50744faf45da7453970c73422bbc3
parent8a651df4b0ef3ec8c90c9bb41aa7c0adbe774fb1 (diff)
parentcb362ca6e09077a949ba00ebcdfe52d2dfbe2a7a (diff)
downloadmarlin-kernel-android10-s2-release.tar.gz
Merge cherrypicks of [9472848, 9472987, 9472988, 9472868, 9472869, 9472849, 9472850, 9472851] into sparse-5878874-L67400000371535416android-10.0.0_r5android-10.0.0_r17android10-s3-releaseandroid10-s2-release
Change-Id: Idcfe18d3e265a2dafe9c59c7e17390faa166c5ec
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb4
-rw-r--r--Image.lz4-dtbbin21158229 -> 21159184 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_apibin15087193 -> 15086247 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_hangbin15095500 -> 15095076 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_lockingbin15149334 -> 15150413 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_memorybin15125813 -> 15126397 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_kasanbin19175849 -> 19174817 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_apibin15044995 -> 15044049 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_hangbin15053302 -> 15052878 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_lockingbin15107136 -> 15108215 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_memorybin15083615 -> 15084199 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_kasanbin19133651 -> 19132619 bytes
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 85a392e..c377db8 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: "5795593"
+ build_id: "5905560"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 9d92f16..01707cc 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 5badd21..9b64839 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 b49db8c..e30bc9a 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 48d2812..006a2c5 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 ec2c867..b1eebf9 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: "5795593"
+ build_id: "5905560"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 d4839e4..608c5f9 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 162076a..9496192 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 bfddcf8..6629eee 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 45c91fc..887d9d9 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: "5795593"
+ build_id: "5905560"
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-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 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 bc20fa2..2ca4b21 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: "5795593"
+ build_id: "5905560"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.137-g51348c59c3d4 (android-build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019"
+ version: "Linux version 3.18.137-g72a7a64494e (android-build@wphn3.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Sep 27 18:40:34 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index 6a74c50..11e7716 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_api b/debug/Image.gz-dtb.marlin_debug_api
index 04d1616..ee88a12 100644
--- a/debug/Image.gz-dtb.marlin_debug_api
+++ b/debug/Image.gz-dtb.marlin_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_hang b/debug/Image.gz-dtb.marlin_debug_hang
index b64ce17..59d597e 100644
--- a/debug/Image.gz-dtb.marlin_debug_hang
+++ b/debug/Image.gz-dtb.marlin_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_locking b/debug/Image.gz-dtb.marlin_debug_locking
index df2e5fd..4a65a77 100644
--- a/debug/Image.gz-dtb.marlin_debug_locking
+++ b/debug/Image.gz-dtb.marlin_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_memory b/debug/Image.gz-dtb.marlin_debug_memory
index a6986e9..53f3e4b 100644
--- a/debug/Image.gz-dtb.marlin_debug_memory
+++ b/debug/Image.gz-dtb.marlin_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_kasan b/debug/Image.gz-dtb.marlin_kasan
index 0bc8329..31c1b48 100644
--- a/debug/Image.gz-dtb.marlin_kasan
+++ b/debug/Image.gz-dtb.marlin_kasan
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_api b/debug/Image.gz-dtb.sailfish_debug_api
index 1fbfc4b..2a9eb30 100644
--- a/debug/Image.gz-dtb.sailfish_debug_api
+++ b/debug/Image.gz-dtb.sailfish_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_hang b/debug/Image.gz-dtb.sailfish_debug_hang
index 59af8d9..d4e5bd0 100644
--- a/debug/Image.gz-dtb.sailfish_debug_hang
+++ b/debug/Image.gz-dtb.sailfish_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_locking b/debug/Image.gz-dtb.sailfish_debug_locking
index dd7ccdd..b35a114 100644
--- a/debug/Image.gz-dtb.sailfish_debug_locking
+++ b/debug/Image.gz-dtb.sailfish_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_memory b/debug/Image.gz-dtb.sailfish_debug_memory
index 043d42b..84e70e9 100644
--- a/debug/Image.gz-dtb.sailfish_debug_memory
+++ b/debug/Image.gz-dtb.sailfish_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_kasan b/debug/Image.gz-dtb.sailfish_kasan
index 6389cab..19f38e7 100644
--- a/debug/Image.gz-dtb.sailfish_kasan
+++ b/debug/Image.gz-dtb.sailfish_kasan
Binary files differ