summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-08-23 06:45:02 +0000
committerXin Li <delphij@google.com>2019-08-23 06:45:02 +0000
commit89283ceac1e639376e01cb4870faafb57f544bf5 (patch)
tree0053e0eb82ed1185ee6fd4f1a812417d7efb27e0
parentc17342874077e48f7b27f94f44340cc5c76046eb (diff)
parent495166f22410880b45573cf602d60167b34e03d7 (diff)
downloadmarlin-kernel-89283ceac1e639376e01cb4870faafb57f544bf5.tar.gz
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-mastertemp_140451723
Bug: 139893257 Change-Id: I85b20939ce3aa8119f7cf360a6dc046180f1e350
-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-dtbbin21179176 -> 21179659 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_apibin15101943 -> 15101456 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_hangbin15108658 -> 15108872 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_lockingbin15163627 -> 15162602 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_memorybin15137781 -> 15137407 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_kasanbin19193174 -> 19192453 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_apibin15059745 -> 15059258 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_hangbin15066460 -> 15066674 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_lockingbin15121429 -> 15120404 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_memorybin15095583 -> 15095209 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_kasanbin19150976 -> 19150255 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 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
index ff8b42d..abbc8e6 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 ae86da0..f20f407 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 f4ef0a9..fbcd54b 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 e3ee9d1..77f4865 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 b947368..eaaa422 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 059540a..47a2d70 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 a2664bd..d2d8537 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 19c7679..3bec342 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 8646e7e..012b01e 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 d6386df..b2f4d7d 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 bb8017f..44f8787 100644
--- a/debug/Image.gz-dtb.sailfish_kasan
+++ b/debug/Image.gz-dtb.sailfish_kasan
Binary files differ