diff options
author | Jens Axboe <axboe@kernel.dk> | 2018-08-06 03:32:09 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-08-06 03:32:09 +0200 |
commit | 05b9ba4b550ff67d7362608828405f9e389e8988 (patch) | |
tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 /scripts/Makefile.modsign | |
parent | scsi: Check sense buffer size at build time (diff) | |
parent | Linux 4.18-rc6 (diff) | |
download | linux-05b9ba4b550ff67d7362608828405f9e389e8988.tar.xz linux-05b9ba4b550ff67d7362608828405f9e389e8988.zip |
Merge tag 'v4.18-rc6' into for-4.19/block2
Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a
merge conflict down the line.
Signed-of-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'scripts/Makefile.modsign')
-rw-r--r-- | scripts/Makefile.modsign | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/Makefile.modsign b/scripts/Makefile.modsign index 171483bc0538..da56aa78d245 100644 --- a/scripts/Makefile.modsign +++ b/scripts/Makefile.modsign @@ -27,7 +27,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) $(modules): $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir)) -# Declare the contents of the .PHONY variable as phony. We keep that -# information in a variable se we can use it in if_changed and friends. - .PHONY: $(PHONY) |