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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 9e14fc4 70915e2)

author	Nick <nick@khadas.com>
	Tue, 21 May 2019 08:44:45 +0000 (16:44 +0800)
committer	Nick <nick@khadas.com>
	Tue, 21 May 2019 08:44:45 +0000 (16:44 +0800)
commit	7cdb255c7a2c1654f02c25f385ed888d1d2e2056
tree	c4a7318f2a3918bd1269a7d00c41e94c8642ffc7	tree \| snapshot
parent	9e14fc405fcb1e7de50b775b92a9fd5bd31c984a	commit \| diff
parent	70915e25e1cff60c32e79e5b02e9559c1ed7bab2	commit \| diff

Merge tag 'v4.9.128' into khadas-vim3-4.9.y

This is the 4.9.128 stable release

Conflicts:
kernel/fork.c

13 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/file.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/gc.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/inline.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/node.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/segment.h	diff1 \|	diff2 \|	blob \| history
fs/f2fs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;