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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 3721189 9c51e11)

author	Nick Xie <nick@khadas.com>
	Thu, 25 Jul 2019 10:07:39 +0000 (18:07 +0800)
committer	Nick Xie <nick@khadas.com>
	Thu, 25 Jul 2019 10:07:39 +0000 (18:07 +0800)
commit	d8161669c17558f6ad9c7873d148eabbe03c4d1b
tree	c7a6c250c2685d820d05dac45f4337062d1f80ff	tree \| snapshot
parent	372118922baeffadda3b179bea0c7a1201c6646c	commit \| diff
parent	9c51e1102c95e1c4849bf9b88c8b0c3da56b9c13	commit \| diff

Merge tag 'v4.9.185' into khadas-vims-4.9.y-update

This is the 4.9.185 stable release

Conflicts:
Makefile
arch/arm64/kernel/vdso.c

13 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/vdso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ufs/ufshcd.c	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-gcc.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
mm/mlock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;