review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9e2e233 4cd4444)

author	Nick Xie <nick@khadas.com>
	Wed, 27 May 2020 10:04:34 +0000 (18:04 +0800)
committer	Nick Xie <nick@khadas.com>
	Wed, 27 May 2020 10:04:34 +0000 (18:04 +0800)
commit	272d0cd29d4eb67f4cd130d1a67b4a51a3e53c78
tree	871030c14af834b17e0a935c8059dd8fab99e1e3	tree \| snapshot
parent	9e2e2332bbe86490da805da5ddc0994cae46898b	commit \| diff
parent	4cd444443b6f3732fbe0552315cc5e5b35112a85	commit \| diff

Merge tag 'v4.9.215' into khadas-vims-4.9.y

This is the 4.9.215 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
Conflicts:
drivers/usb/core/quirks.c
fs/ext4/ext4.h
net/netfilter/xt_bpf.c

16 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/alternative.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ashmem.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/composite.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-mem.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;