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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: e8d0391 6f8dc95)

author	Nick Xie <nick@khadas.com>
	Wed, 27 May 2020 09:56:54 +0000 (17:56 +0800)
committer	Nick Xie <nick@khadas.com>
	Wed, 27 May 2020 09:56:54 +0000 (17:56 +0800)
commit	4dc2370beebe945bd6a8a4ea135b7eeec1b0a517
tree	c19c00130a3de1f5c943627c19bb8af881840127	tree \| snapshot
parent	e8d039181326a714cec0dd1127a7710469c475c1	commit \| diff
parent	6f8dc95670980e30a1de22c75999d61fd143b693	commit \| diff

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

This is the 4.9.212 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
Conflicts:
drivers/net/phy/phy_device.c

14 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/sleep.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
drivers/hwtracing/coresight/coresight-tmc-etf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/cifs/connect.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inline.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
scripts/recordmcount.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;