Merge tag 'v3.10.80' into update
authorStricted <info@stricted.net>
Wed, 21 Mar 2018 21:45:22 +0000 (22:45 +0100)
committerStricted <info@stricted.net>
Wed, 21 Mar 2018 21:45:22 +0000 (22:45 +0100)
This is the 3.10.80 stable release

1  2 
Makefile
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.h
drivers/usb/storage/unusual_devs.h
fs/binfmt_elf.c
fs/ext4/inode.c
net/socket.c

diff --cc Makefile
index f6548c343572a0c81b1e9195b050060d3aaccc58,06743321998416963c5f992d8c7fc4d0e69c1b67..2a1fc8777d7ab05206e8a76c351d415880c8b3e5
+++ b/Makefile
@@@ -374,7 -374,7 +374,7 @@@ KBUILD_CFLAGS   := -Wall -Wundef -Wstri
                   -Werror-implicit-function-declaration \
                   -Wno-format-security \
                   -fno-delete-null-pointer-checks \
-                  -w
 -                 -std=gnu89
++                 -w -std=gnu89
  
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=
Simple merge
Simple merge
Simple merge
diff --cc fs/binfmt_elf.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
diff --cc net/socket.c
Simple merge