From: Nick Xie <nick@khadas.com>
Date: Wed, 27 May 2020 10:04:34 +0000 (+0800)
Subject: Merge tag 'v4.9.215' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=272d0cd29d4eb67f4cd130d1a67b4a51a3e53c78;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

272d0cd29d4eb67f4cd130d1a67b4a51a3e53c78
diff --cc drivers/usb/core/quirks.c
index 0b5414bd9541,ad8307140df8..1ad7633f6a0d
--- a/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 fs/ext4/ext4.h
index 5f3d2e2bdbdf,9713d3d41412..4f8107556f61
--- a/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
  };