summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel de Dios <migueldedios@google.com>2019-01-11 14:39:34 -0800
committerHarrison Lingren <hlingren@google.com>2019-01-12 00:34:53 +0000
commit0353af25ad624df76f72e96c56fafc13b9dd7253 (patch)
treecd3548a784ff425aeba40b66d0b8808e3ea7c08e
parent137165977a9d203231e249efb99e91e425167ff8 (diff)
downloadmarlin-kernel-0353af25ad624df76f72e96c56fafc13b9dd7253.tar.gz
marlin: update kernel prebuilt [ DO NOT MERGE ]pie-b4s4-dev
665c9a1d4 Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 c31e2d78b Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 eccd57866 Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi d3d9fdf92 Revert "Revert "msm: vidc: ignore processing responses in invalid state"" e06da1578 Revert "msm: vidc: ignore processing responses in invalid state" 5a19ffd24 UPSTREAM: binder: fix race that allows malicious free of live buffer 42abdbd97 binder: create node flag to request sender's security context 04a180786 msm: vidc: do not set video state to DEINIT very early aeac61419 qcacld-2.0: Integer overflow in wma_unified_link_peer_stats_event_handler d7af6a17f qcacld-2.0: Fix OOB write in wma_extscan_change_results_event_handler 761f35015 qcacld-2.0: Possible buffer overflow in wma_stats_ext_event_handler fc76f1627 qcacld-2.0: Fix buffer overflow in ol_tx_inspect_handler 49c8c596a jbd2: don't mark block as modified if the handle is out of credits efa3e263c ext4: avoid running out of journal credits when appending to an inline file fbfcd73a9 af_key: unconditionally clone on broadcast 0a721fbba Revert "Revert "msm: vidc: ignore processing responses in invalid state"" 4195485b6 qcacld-2.0: Add length check in ndp event handler 96227283d qcacld-2.0: Add vdev id sanity check in wma stats event handlers Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 UTC 2019 Bug: 25646100 Bug: 109741946 Bug: 111127853 Bug: 111128301 Bug: 111128838 Bug: 112277221 Bug: 112278150 Bug: 116855682 Bug: 117311198 Bug: 119053086 Bug: 120487091 Bug: 120647440 Bug: 122351661 Change-Id: Icd06a80ebfadd87ae17cfb156f87bb8d58a853d0 Source-Branch: android-msm-marlin-3.18-pi-qpr2 Signed-off-by: Miguel de Dios <migueldedios@google.com> Test: build, boot, flash, setup, wifi, video/YT, apps, webpage, camera
-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_kasanbin19128327 -> 19129600 bytes
-rw-r--r--Image.gz-dtb.sailfish_kasanbin19086129 -> 19087402 bytes
-rw-r--r--Image.lz4-dtbbin21123912 -> 21121575 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 35ea0b2..508ecd4 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: "5179113"
+ build_id: "5226165"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "Image.gz-dtb.marlin_kasan"
- 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: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 f3677c9..276b451 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: "5179113"
+ build_id: "5226165"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "Image.gz-dtb.sailfish_kasan"
- 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: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 e1d766a..592b4ac 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: "5179113"
+ build_id: "5226165"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- 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: "Linux version 3.18.122-g665c9a1 (android-build@abfarm338) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 11 21:46:31 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 486c86e..c163f48 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 272bf99..22feb25 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 ba6da08..548989b 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ