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

This is the 4.9.215 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
 Conflicts:
	drivers/usb/core/quirks.c
	fs/ext4/ext4.h
	net/netfilter/xt_bpf.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/alternative.h
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc drivers/staging/android/ashmem.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/core/quirks.c
index 0b5414bd95416d0f5662ef6ef892dda5b2d72d5c,ad8307140df8156752526e8bfbbc1bf56ce87d06..1ad7633f6a0d79c7ce831a485e5cd1873ee67209
--- 1/drivers/usb/core/quirks.c
--- 2/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@@ -291,8 -291,8 +291,10 @@@ static const struct usb_device_id usb_q
        /* INTEL VALUE SSD */
        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
  
 +      { USB_DEVICE(0x1fc9, 0x0011), .driver_info =
 +                      USB_QUIRK_DEVICE_QUALIFIER },
+       /* novation SoundControl XL */
+       { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME },
  
        { }  /* terminating entry must be last */
  };

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/ext4/ext4.h
index 5f3d2e2bdbdf754d8a260c367098d2b755b62ce0,9713d3d41412ccde8a6fbacabd1c6236d8471512..4f8107556f615930fe2735ce6e1d2862a07cf26b
--- 1/fs/ext4/ext4.h
--- 2/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -2332,16 -2371,20 +2341,19 @@@ extern int ext4_find_dest_de(struct ino
                             void *buf, int buf_size,
                             struct ext4_filename *fname,
                             struct ext4_dir_entry_2 **dest_de);
 -int ext4_insert_dentry(struct inode *dir,
 -                     struct inode *inode,
 -                     struct ext4_dir_entry_2 *de,
 -                     int buf_size,
 -                     struct ext4_filename *fname);
 +void ext4_insert_dentry(struct inode *inode,
 +                      struct ext4_dir_entry_2 *de,
 +                      int buf_size,
 +                      struct ext4_filename *fname);
  static inline void ext4_update_dx_flag(struct inode *inode)
  {
-       if (!ext4_has_feature_dir_index(inode->i_sb))
+       if (!ext4_has_feature_dir_index(inode->i_sb)) {
+               /* ext4_iget() should have caught this... */
+               WARN_ON_ONCE(ext4_has_feature_metadata_csum(inode->i_sb));
                ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);
+       }
  }
 -static unsigned char ext4_filetype_table[] = {
 +static const unsigned char ext4_filetype_table[] = {
        DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
  };
  

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge