From 1f65ff5092cf5ebdc85eb33226848020fc15e4a2 Mon Sep 17 00:00:00 2001 From: Siddharth Kapoor Date: Fri, 30 Nov 2018 13:32:26 +0800 Subject: marlin: update kernel prebuilt [ DO NOT MERGE ] e760c8f3b Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 afb742820 Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 09cd7113f Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi 5dbdd3698 binder: fix race between munmap() and direct reclaim d1d838864 msm: ipa3: Fix to validate the user inputs fa4051e05 ext4: add corruption check in ext4_xattr_set_entry() c72ec0abd ext4: always verify the magic number in xattr blocks 87a895c7c /proc/iomem: only expose physical resource addresses to privileged users b5fe55044 Make file credentials available to the seqfile interfaces 9b38b2987 msm: ipa: Protect ipa default routing table 73594b468 msm: vidc: ignore processing responses in invalid state 10dfe3d27 UPSTREAM: binder: fix proc->files use-after-free 143582c95 Revert "FROMLIST: binder: fix proc->files use-after-free" b26b1d7ff Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-security-next Linux version 3.18.122-ge760c8f3be79 (android- build@wprl12.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 30 04:21:30 UTC 2018 Bug: 109741776 Bug: 116406063 Bug: 117422211 Bug: 119052051 Bug: 119053086 Bug: 119687561 Bug: 120025196 Bug: 120025789 Test: booted on marlin Change-Id: I8446896f1b0cae07b75479953760135a193f7bf0 Source-Branch: android-msm-marlin-3.18-pi-qpr2 Signed-off-by: Siddharth Kapoor (cherry picked from commit e4159b459056ab0bc2a490c1ab79543c80977697) --- ...prebuilt_info_Image_gz-dtb_marlin_kasan.asciipb | 4 ++-- ...ebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb | 4 ++-- .../kernel/prebuilt_info_Image_lz4-dtb.asciipb | 4 ++-- Image.gz-dtb.marlin_kasan | Bin 19131956 -> 19129232 bytes Image.gz-dtb.sailfish_kasan | Bin 19089758 -> 19087034 bytes Image.lz4-dtb | Bin 21123463 -> 21124275 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 a3c40e9..37de1ac 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: "5121642" + build_id: "5155942" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - 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: "Linux version 3.18.122-ge760c8f3be79 (android-build@wprl12.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 30 04:21:30 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 4f35e30..86260cb 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: "5121642" + build_id: "5155942" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - 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: "Linux version 3.18.122-ge760c8f3be79 (android-build@wprl12.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 30 04:21:30 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 9af5ecb..fcd88c9 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: "5121642" + build_id: "5155942" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - 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: "Linux version 3.18.122-ge760c8f3be79 (android-build@wprl12.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Nov 30 04:21:30 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 278e854..e60f64e 100644 Binary files a/Image.gz-dtb.marlin_kasan and b/Image.gz-dtb.marlin_kasan differ diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan index 57a3fc2..747d375 100644 Binary files a/Image.gz-dtb.sailfish_kasan and b/Image.gz-dtb.sailfish_kasan differ diff --git a/Image.lz4-dtb b/Image.lz4-dtb index e62160c..7ffbeba 100644 Binary files a/Image.lz4-dtb and b/Image.lz4-dtb differ -- cgit v1.2.3