Merge 4.14.47 into android-4.14
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 30 May 2018 20:49:31 +0000 (22:49 +0200)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 30 May 2018 20:49:31 +0000 (22:49 +0200)
Changes in 4.14.47
Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU"
Linux 4.14.47

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1  2 
Makefile

diff --cc Makefile
Simple merge