Merge tag 'v4.9.213' into khadas-vims-4.9.y
authorNick Xie <nick@khadas.com>
Wed, 27 May 2020 09:57:20 +0000 (17:57 +0800)
committerNick Xie <nick@khadas.com>
Wed, 27 May 2020 09:57:20 +0000 (17:57 +0800)
This is the 4.9.213 stable release

1  2 
Makefile
arch/arm64/boot/Makefile
drivers/usb/dwc3/core.c
fs/namei.c
mm/mempolicy.c
net/ipv6/ip6_vti.c

diff --cc Makefile
Simple merge
  # Based on the ia64 boot/Makefile.
  #
  
 +include $(srctree)/arch/arm64/boot/dts/Makefile
 +
  OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S
  
- targets := Image Image.gz
+ targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo
  
 +DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
 +ifneq ($(DTB_NAMES),)
 +DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
 +else
 +DTB_LIST := $(dtb-y)
 +endif
 +DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))
 +
  $(obj)/Image: vmlinux FORCE
        $(call if_changed,objcopy)
  
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc mm/mempolicy.c
Simple merge
Simple merge