diff options
author | Petri Gynther <pgynther@google.com> | 2018-12-12 22:20:00 -0800 |
---|---|---|
committer | Petri Gynther <pgynther@google.com> | 2018-12-12 22:20:00 -0800 |
commit | 137165977a9d203231e249efb99e91e425167ff8 (patch) | |
tree | f0fe92f57254b1b6cc48b3b098a00a854df52382 | |
parent | e4159b459056ab0bc2a490c1ab79543c80977697 (diff) | |
download | marlin-kernel-137165977a9d203231e249efb99e91e425167ff8.tar.gz |
marlin: update kernel prebuilt [ DO NOT MERGE ]
8cf5239d5 Merge android-msm-marlin-3.18-pi-qpr1 into -pi-qpr2
f2646f50d Merge android-msm-marlin-3.18-pi into -pi-qpr1
8e04596a2 Revert "msm: vidc: ignore processing responses in invalid state"
Linux version 3.18.122-g8cf5239d58fd (android-
build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 UTC 2018
Bug: 120647440
Change-Id: I5da163a8266af5c0d5276593a01cca37af8faf9d
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.asciipb | 4 | ||||
-rw-r--r-- | .prebuilt_info/kernel/prebuilt_info_Image_gz-dtb_sailfish_kasan.asciipb | 4 | ||||
-rw-r--r-- | .prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb | 4 | ||||
-rw-r--r-- | Image.gz-dtb.marlin_kasan | bin | 19129232 -> 19128327 bytes | |||
-rw-r--r-- | Image.gz-dtb.sailfish_kasan | bin | 19087034 -> 19086129 bytes | |||
-rw-r--r-- | Image.lz4-dtb | bin | 21124275 -> 21123912 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 37de1ac..35ea0b2 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: "5155942" + build_id: "5179113" target: "kernel_kasan" source_file: "Image.gz-dtb.marlin" } dest_file: "Image.gz-dtb.marlin_kasan" - 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: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 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 86260cb..f3677c9 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: "5155942" + build_id: "5179113" target: "kernel_kasan" source_file: "Image.gz-dtb.sailfish" } dest_file: "Image.gz-dtb.sailfish_kasan" - 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: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 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 fcd88c9..e1d766a 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: "5155942" + build_id: "5179113" target: "kernel" source_file: "Image.lz4-dtb" } dest_file: "Image.lz4-dtb" - 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: "Linux version 3.18.122-g8cf5239d58fd (android-build@wphq5.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Dec 12 23:34:23 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 Binary files differindex e60f64e..486c86e 100644 --- a/Image.gz-dtb.marlin_kasan +++ b/Image.gz-dtb.marlin_kasan diff --git a/Image.gz-dtb.sailfish_kasan b/Image.gz-dtb.sailfish_kasan Binary files differindex 747d375..272bf99 100644 --- a/Image.gz-dtb.sailfish_kasan +++ b/Image.gz-dtb.sailfish_kasan diff --git a/Image.lz4-dtb b/Image.lz4-dtb Binary files differindex 7ffbeba..ba6da08 100644 --- a/Image.lz4-dtb +++ b/Image.lz4-dtb |