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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 83e1145 d79b857)

author	Nick <nick@khadas.com>
	Tue, 21 May 2019 09:58:15 +0000 (17:58 +0800)
committer	Nick <nick@khadas.com>
	Tue, 21 May 2019 09:58:15 +0000 (17:58 +0800)
commit	7d7a73d0e786ffa05999b8a5a7ed659dad115f21
tree	9d14ce73338ede422935b0304a95d663b9ef5ddb	tree \| snapshot
parent	83e1145cedfd76c33a35ef110fac147f137646ea	commit \| diff
parent	d79b8577dfb7d02cada8c6671d39d10c09af891b	commit \| diff

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

This is the 4.9.174 stable release

Conflicts:
arch/arm64/include/asm/system_misc.h
arch/arm64/mm/fault.c

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/system_misc.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/kasan_init.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/srpt/ib_srpt.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/message.c	diff1 \|	diff2 \|	blob \| history
include/linux/kasan.h	diff1 \|	diff2 \|	blob \| history
include/linux/usb.h	diff1 \|	diff2 \|	blob \| history
lib/test_kasan.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/kasan.c	diff1 \|	diff2 \|	blob \| history
mm/kasan/report.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;