summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Gynther <pgynther@google.com>2018-11-09 11:37:33 -0800
committerPetri Gynther <pgynther@google.com>2018-11-09 11:37:33 -0800
commit23de4bd253c234e9d6af651597c84dff6373c3ab (patch)
tree962c6902ac3a4ca9aabee969a2595769e62a49c9
parenta6f27e3a789e0aebe916b48c9f8064cf29a979e0 (diff)
downloadmarlin-kernel-23de4bd253c234e9d6af651597c84dff6373c3ab.tar.gz
marlin: update kernel prebuilt [ DO NOT MERGE ]
409022857 Merge android-msm-marlin-3.18-pi-qpr1 into -pi-qpr2 16330f2b3 Merge android-msm-marlin-3.18-pi into -pi-qpr1 486754a4d mremap: properly flush TLB before releasing the page Linux version 3.18.122-g409022857f70 (android- build@wphl8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:23:31 UTC 2018 Bug: 118836219 Change-Id: Idbc2f367937b9ddfc6a583617fbe03fc4942e24a Source-Branch: android-msm-marlin-3.18-pi-qpr2 Signed-off-by: Petri Gynther <pgynther@google.com>
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb4
-rw-r--r--Image.gz-dtb.marlin_kasanbin19130729 -> 19131956 bytes
-rw-r--r--Image.gz-dtb.sailfish_kasanbin19088531 -> 19089758 bytes
-rw-r--r--Image.lz4-dtbbin21124323 -> 21123463 bytes
6 files changed, 6 insertions, 6 deletions
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
index 59941f0..a3c40e9 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5116651"
+ build_id: "5121642"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.122-g9d08d9aa0830 (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Nov 7 19:22:45 UTC 2018"
+ version: "Linux version 3.18.122-g409022857f70 (android-build@wphl8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:23:31 UTC 2018"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
index 8052db6..4f35e30 100644
--- a/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5116651"
+ build_id: "5121642"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.122-g9d08d9aa0830 (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Nov 7 19:22:45 UTC 2018"
+ version: "Linux version 3.18.122-g409022857f70 (android-build@wphl8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:23:31 UTC 2018"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
index 94c801b..9af5ecb 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: "5116651"
+ build_id: "5121642"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.122-g9d08d9aa0830 (android-build@wprc4.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Nov 7 19:22:45 UTC 2018"
+ version: "Linux version 3.18.122-g409022857f70 (android-build@wphl8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 9 16:23:31 UTC 2018"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.gz-dtb.marlin_kasan b/Image.gz-dtb.marlin_kasan
index beaa251..278e854 100644
--- a/Image.gz-dtb.marlin_kasan
+++ b/Image.gz-dtb.marlin_kasan
Binary files differ
diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan
index 44b27ae..57a3fc2 100644
--- a/Image.gz-dtb.sailfish_kasan
+++ b/Image.gz-dtb.sailfish_kasan
Binary files differ
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index 3f9e278..e62160c 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ