summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Gynther <pgynther@google.com>2019-05-12 23:26:41 -0700
committerPetri Gynther <pgynther@google.com>2019-05-12 23:26:41 -0700
commitc3e73f0df75ac331ab432dc907f17faeb0d19f05 (patch)
tree948a973bb9fa03b7d09e1afdcffed1738b44f4fa
parente44097becd72ebc9538b69e02267e6d21578057d (diff)
downloadmarlin-kernel-c3e73f0df75ac331ab432dc907f17faeb0d19f05.tar.gz
marlin: update kernel prebuilt
d74b074a4 Merge branch 'android-msm-marlin-3.18-pi-qpr3' into android-msm-marlin-3.18 cf6b63a03 touchscreen: synaptics_dsx: prevent NULL pointer dereference 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 989acb04b iommu: dma-mapping-fast: Add a check for count in fast_smmu_alloc Linux version 3.18.137-gd74b074a4c76 (android- build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019 Bug: 36696768 Bug: 37755815 Bug: 62673086 Bug: 78530292 Bug: 116872291 Bug: 129850483 Bug: 129850941 Bug: 129851238 Bug: 130890737 Bug: 131238123 Change-Id: I9d6bb30e3582c815cc4d9d1b933dc129f9c1d170 Pick-Prebuilt: 247612761 Source-Branch: android-msm-marlin-3.18 Pick-Prebuilt: 247612761 Signed-off-by: Petri Gynther <pgynther@google.com>
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb4
-rw-r--r--.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb4
-rw-r--r--Image.lz4-dtbbin21150903 -> 21150772 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_apibin15080345 -> 15080387 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_hangbin15084647 -> 15085287 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_lockingbin15137070 -> 15136757 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_debug_memorybin15113561 -> 15114424 bytes
-rw-r--r--debug/Image.gz-dtb.marlin_kasanbin19164535 -> 19163925 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_apibin15038147 -> 15038189 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_hangbin15042449 -> 15043089 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_lockingbin15094872 -> 15094559 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_debug_memorybin15071363 -> 15072226 bytes
-rw-r--r--debug/Image.gz-dtb.sailfish_kasanbin19122337 -> 19121727 bytes
22 files changed, 22 insertions, 22 deletions
diff --git a/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb b/.prebuilt_info/kernel/prebuilt_info_Image_lz4-dtb.asciipb
index 956caae..fe9d36b 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: "5476932"
+ build_id: "5556356"
target: "kernel"
source_file: "Image.lz4-dtb"
}
dest_file: "Image.lz4-dtb"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
index 0e74c59..8143e66 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_api.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_api"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_api"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
index b519597..b52be6d 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_hang.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_hang"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_hang"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
index ae08cc0..6484649 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_locking.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_locking"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_locking"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
index ee1c88e..8b83215 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_debug_memory.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_memory"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_debug_memory"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
index 217a69f..1487324 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_marlin_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_kasan"
source_file: "Image.gz-dtb.marlin"
}
dest_file: "debug/Image.gz-dtb.marlin_kasan"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
index 6f19f13..37b716a 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_api.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_api"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_api"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
index 188cf84..988a868 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_hang.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_hang"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_hang"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
index 0d1e426..fce30f8 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_locking.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_locking"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_locking"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
index 02849e9..00f03c3 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_debug_memory.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_debug_memory"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_debug_memory"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
index ed59326..8bbb2f3 100644
--- a/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
+++ b/.prebuilt_info/kernel/prebuilt_info_debug_Image_gz-dtb_sailfish_kasan.asciipb
@@ -1,11 +1,11 @@
drops {
android_build_drop {
- build_id: "5476932"
+ build_id: "5556356"
target: "kernel_kasan"
source_file: "Image.gz-dtb.sailfish"
}
dest_file: "debug/Image.gz-dtb.sailfish_kasan"
- version: "Linux version 3.18.137-g06f1743ee93b (android-build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019"
+ version: "Linux version 3.18.137-gd74b074a4c76 (android-build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019"
version_group: "kernel"
git_project: "device/google/marlin-kernel"
}
diff --git a/Image.lz4-dtb b/Image.lz4-dtb
index cf9eac2..1833138 100644
--- a/Image.lz4-dtb
+++ b/Image.lz4-dtb
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_api b/debug/Image.gz-dtb.marlin_debug_api
index 1d5a8bc..1ce3cc5 100644
--- a/debug/Image.gz-dtb.marlin_debug_api
+++ b/debug/Image.gz-dtb.marlin_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_hang b/debug/Image.gz-dtb.marlin_debug_hang
index 953b346..9f2c600 100644
--- a/debug/Image.gz-dtb.marlin_debug_hang
+++ b/debug/Image.gz-dtb.marlin_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_locking b/debug/Image.gz-dtb.marlin_debug_locking
index a8d8965..3f245bb 100644
--- a/debug/Image.gz-dtb.marlin_debug_locking
+++ b/debug/Image.gz-dtb.marlin_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_debug_memory b/debug/Image.gz-dtb.marlin_debug_memory
index a5312f7..5f40684 100644
--- a/debug/Image.gz-dtb.marlin_debug_memory
+++ b/debug/Image.gz-dtb.marlin_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.marlin_kasan b/debug/Image.gz-dtb.marlin_kasan
index fd4351c..9f6691d 100644
--- a/debug/Image.gz-dtb.marlin_kasan
+++ b/debug/Image.gz-dtb.marlin_kasan
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_api b/debug/Image.gz-dtb.sailfish_debug_api
index 172adcb..bc8126f 100644
--- a/debug/Image.gz-dtb.sailfish_debug_api
+++ b/debug/Image.gz-dtb.sailfish_debug_api
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_hang b/debug/Image.gz-dtb.sailfish_debug_hang
index 47cc979..9172435 100644
--- a/debug/Image.gz-dtb.sailfish_debug_hang
+++ b/debug/Image.gz-dtb.sailfish_debug_hang
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_locking b/debug/Image.gz-dtb.sailfish_debug_locking
index e9d0ebd..47abf9b 100644
--- a/debug/Image.gz-dtb.sailfish_debug_locking
+++ b/debug/Image.gz-dtb.sailfish_debug_locking
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_debug_memory b/debug/Image.gz-dtb.sailfish_debug_memory
index 9f5e793..631a833 100644
--- a/debug/Image.gz-dtb.sailfish_debug_memory
+++ b/debug/Image.gz-dtb.sailfish_debug_memory
Binary files differ
diff --git a/debug/Image.gz-dtb.sailfish_kasan b/debug/Image.gz-dtb.sailfish_kasan
index de15204..9dfb20a 100644
--- a/debug/Image.gz-dtb.sailfish_kasan
+++ b/debug/Image.gz-dtb.sailfish_kasan
Binary files differ