diff options
author | Wei Wang <wvw@google.com> | 2018-01-16 10:19:30 -0800 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-18 22:41:47 +0000 |
commit | 1f4c5604b403e71137cd5630e00a658dd2f16823 (patch) | |
tree | 1d2ba89569fc785c5d882000a91dd3eab8917a52 | |
parent | edf28980784e6e3d58d53aecf3322e80fda6ac8f (diff) | |
download | dragon-kernel-1f4c5604b403e71137cd5630e00a658dd2f16823.tar.gz |
Merge Kernel into oc-mr1-release
ryu: update kernel prebuilt
796a90d2 Merge "UPSTREAM: ALSA: usb-audio: Kill stray URB at exiting" into android-chromeos-dragon-3.18
84d48f2d Merge "UPSTREAM: ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor" into android-chromeos-dragon-3.18
52b381ab UPSTREAM: ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
a9bd8176 UPSTREAM: USB: fix out-of-bounds in usb_set_configuration
765d5ae6 UPSTREAM: ALSA: usb-audio: Kill stray URB at exiting
adce0e0e ANDROID: sdcardfs: Add default_normal option
a30386cd ANDROID: sdcardfs: notify lower file of opens
d44787f8 ANDROID: qtaguid: Fix the UAF probelm with tag_ref_tree
d32d5a95 ALSA: seq: Fix use-after-free at creating a port
b62896b1 iovec: make sure the caller actually wants anything in memcpy_fromiovecend
4b55b715 clocksource: arch_timer: make virtual counter access configurable
29d25ddf arm64: issue isb when trapping CNTVCT_EL0 access
475fcb48 BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
30e0d312 BACKPORT: arm64: Add CNTVCT_EL0 trap handler
00134d41 UPSTREAM: arm64: Add macros to read/write system registers
2dd3a0cf UPSTREAM: crypto: algif_skcipher - Load TX SG list after waiting
Linux version 3.18.0-g796a90d2749 (android-
build@wpiv4.hot.corp.google.com) (gcc version 4.9.x-google
20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 12 00:07:54
UTC 2018
Bug: 31432001
Bug: 36279469
Bug: 64386293
Bug: 64672411
Bug: 65853158
Bug: 67900971
Bug: 68266545
Bug: 69051382
Bug: 69051731
Bug: 69052055
Bug: 70706497
Change-Id: Iaf62568774b328a6e91531da4ad67d54586cac07
Source-Branch: android-chromeos-dragon-3.18
Signed-off-by: Wei Wang <wvw@google.com>
(cherry picked from commit dff841b5c25d3ef58d1858c229527e7fb5534d23)
-rw-r--r-- | Image.fit | bin | 7827692 -> 7827916 bytes |
-rw-r--r-- | Image.fit.kasan | bin | 12916580 -> 12917052 bytes |
2 files changed, 0 insertions, 0 deletions
Binary files differ diff --git a/Image.fit.kasan b/Image.fit.kasan Binary files differindex 4f7d369..7b664df 100644 --- a/Image.fit.kasan +++ b/Image.fit.kasan |