diff --git a/[refs] b/[refs] index 5d00d51395d2..c310c55f84e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a6b1f1c0c492a6bb6f778dff0f9f5facb90d1a1 +refs/heads/master: a8735821d198675dd326cc5847e79df79c735119 diff --git a/trunk/Makefile b/trunk/Makefile index d1216fea0c92..8fb9bfce212c 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -344,7 +344,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration + -Werror-implicit-function-declaration \ + -Wno-format-security KBUILD_AFLAGS := -D__ASSEMBLY__ # Read KERNELRELEASE from include/config/kernel.release (if it exists)