summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Agarwal <agarwalvishal@google.com>2019-05-10 15:32:26 -0700
committerVishal Agarwal <agarwalvishal@google.com>2019-05-10 15:32:26 -0700
commita8dc3f9131b866d7415858b44deaa10218b19c7c (patch)
treefb85034de739482a0d1466fdc725eca6ae92a3d6
parent07ccae279c1581ddd0aed8b2a7bdbd84bcfb9026 (diff)
downloadmarlin-kernel-a8dc3f9131b866d7415858b44deaa10218b19c7c.tar.gz
marlin: update kernel prebuilt [ DO NOT MERGE ]
a2426c4f8 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3 8f758baf2 Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 2e5cb9dfd Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 79c9015de Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi 2a53f55b7 dsp: asm: Add check for num_channels before calling q6asm_map_channels b9e963d97 qcacld-2.0: Fix possible OOB access in limProcessDisassocFrame 0da214450 qcacld-2.0: Fix possible integer underflow in cfg80211_rx_mgmt 29f93f41d dsp: validate token before usage as array index 6ef3b69bf qcacld-2.0: Fix OOB read in sme_RrmProcessBeaconReportReqInd Linux version 3.18.131-ga2426c4f8f23 (android- build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019 Bug: 78530292 Bug: 129850483 Bug: 129850941 Bug: 129851238 Bug: 130890737 Bug: 131238123 Change-Id: I3be5b2a3b99e7ca38a908da0d958417b50e68add Pick-Prebuilt: 247612761 Source-Branch: android-msm-marlin-3.18-pi-qpr3 Pick-Prebuilt: 247612761 Signed-off-by: Vishal Agarwal <agarwalvishal@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_kasanbin19131343 -> 19128073 bytes
-rw-r--r--Image.gz-dtb.sailfish_kasanbin19089145 -> 19085875 bytes
-rw-r--r--Image.lz4-dtbbin21124448 -> 21124264 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 b4401d4..c725397 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: "5465364"
+ build_id: "5555601"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019"
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 34e866f..f894ad9 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: "5465364"
+ build_id: "5555601"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019"
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 7bbd58c..50e3a62 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: "5465364"
+ build_id: "5555601"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.131-g27a6e3d260f4 (android-build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019"
+ version: "Linux version 3.18.131-ga2426c4f8f23 (android-build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.gz-dtb.marlin_kasan b/Image.gz-dtb.marlin_kasan
index 96cd71f..6d84afc 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 ebb8605..df7ec2b 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 7db456b..21d0a61 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ