Merge tag 'v4.9.181' into khadas-vims-4.9.y-update
authorNick Xie <nick@khadas.com>
Thu, 25 Jul 2019 10:03:59 +0000 (18:03 +0800)
committerNick Xie <nick@khadas.com>
Thu, 25 Jul 2019 10:03:59 +0000 (18:03 +0800)
This is the 4.9.181 stable release

 Conflicts:
drivers/android/binder.c
drivers/firmware/efi/libstub/arm-stub.c
drivers/firmware/efi/libstub/efi-stub-helper.c

20 files changed:
1  2 
Makefile
drivers/firmware/efi/libstub/efi-stub-helper.c
drivers/media/usb/uvc/uvc_driver.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
drivers/tty/serial/serial_core.c
drivers/usb/core/quirks.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
fs/fuse/dev.c
fs/fuse/file.c
fs/open.c
fs/read_write.c
include/linux/cpu.h
include/linux/fs.h
include/linux/mm.h
include/uapi/linux/fuse.h
kernel/cpu.c
kernel/trace/trace.c
net/core/fib_rules.c
net/ipv6/raw.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/fuse/dev.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/open.c
Simple merge
diff --cc fs/read_write.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cpu.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/raw.c
Simple merge