Merge tag 'v4.9.170' into khadas-vim3-4.9.y
authorNick <nick@khadas.com>
Tue, 21 May 2019 09:54:57 +0000 (17:54 +0800)
committerNick <nick@khadas.com>
Tue, 21 May 2019 09:54:57 +0000 (17:54 +0800)
commit1e0a9ded9d6ea014642d0963246c8f9a984ac1cb
tree63df7cf3463be64b4137c3fbcb1fd555b485a055
parentc4725a6d1f3f08370490476a2d210426304b135f
parentad387ec4bcdf087faaf084a3db8f681295463b01
Merge tag 'v4.9.170' into khadas-vim3-4.9.y

This is the 4.9.170 stable release

 Conflicts:
fs/ext4/ioctl.c
Makefile
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
fs/ext4/ioctl.c
fs/f2fs/super.c
kernel/events/core.c