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

This is the 4.9.170 stable release

 Conflicts:
	fs/ext4/ioctl.c

diff --cc Makefile
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc fs/ext4/ioctl.c
index 4bc35e6,2ce7328..d116ea8
--- 1/fs/ext4/ioctl.c
--- 2/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@@ -753,8 -749,12 +753,14 @@@ resizefs_out
                if (!blk_queue_discard(q))
                        return -EOPNOTSUPP;
  
 +              if ((flags & BLKDEV_DISCARD_SECURE) && !blk_queue_secure_erase(q))
 +                      return -EOPNOTSUPP;
+               /*
+                * We haven't replayed the journal, so we cannot use our
+                * block-bitmap-guided storage zapping commands.
+                */
+               if (test_opt(sb, NOLOAD) && ext4_has_feature_journal(sb))
+                       return -EROFS;
  
                if (copy_from_user(&range, (struct fstrim_range __user *)arg,
                    sizeof(range)))

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

diff --cc kernel/events/core.c
Simple merge