[linux] 01/01: Update to 4.13-rc7

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch master
in repository linux.

commit df8a5bf53a58a8ba2337505ee3804fad42e1a16c
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Tue Aug 29 22:07:26 2017 +0200

    Update to 4.13-rc7
---
 debian/changelog                                   |  2 +-
 ...-not-use-hyphen-in-exported-variable-name.patch | 47 ----------------------
 .../all/kbuild-fix-recordmcount-dependency.patch   |  2 +-
 debian/patches/series                              |  1 -
 4 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 035d8b6..4cda361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux (4.13~rc6-1~exp1) UNRELEASED; urgency=medium
+linux (4.13~rc7-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/patches/bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch b/debian/patches/bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
deleted file mode 100644
index 76857c7..0000000
--- a/debian/patches/bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sat, 19 Aug 2017 21:37:18 +0100
-Subject: kbuild: Do not use hyphen in exported variable name
-Bug-Debian: https://bugs.debian.org/833561
-Forwarded: https://marc.info/?l=linux-kbuild&m=150317820622984&w=2
-
-This definition in Makefile.dtbinst:
-
-    export dtbinst-root ?= $(obj)
-
-should define and export dtbinst-root when handling the root dts
-directory, and do nothing in the subdirectories.  However some shells,
-including dash, will not pass through environment variables whose name
-includes a hyphen.  Usually GNU make does not use a shell to recurse,
-but if e.g. $(srctree) contains '~' it will use a shell here.
-
-Rename the variable to dtbinst_root.
-
-References: https://bugs.debian.org/833561
-Fixes: 323a028d39cdi ("dts, kbuild: Implement support for dtb vendor subdirs")
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- scripts/Makefile.dtbinst | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 34614a48b717..993fb85982df 100644
---- a/scripts/Makefile.dtbinst
-+++ b/scripts/Makefile.dtbinst
-@@ -14,7 +14,7 @@ src := $(obj)
- PHONY := __dtbs_install
- __dtbs_install:
- 
--export dtbinst-root ?= $(obj)
-+export dtbinst_root ?= $(obj)
- 
- include include/config/auto.conf
- include scripts/Kbuild.include
-@@ -27,7 +27,7 @@ dtbinst-dirs	:= $(dts-dirs)
- quiet_cmd_dtb_install =	INSTALL $<
-       cmd_dtb_install =	mkdir -p $(2); cp $< $(2)
- 
--install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
-+install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
- 
- $(dtbinst-files): %.dtb: $(obj)/%.dtb
- 	$(call cmd,dtb_install,$(install-dir))
diff --git a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
index da98870..ac20ba8 100644
--- a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
+++ b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch
@@ -11,7 +11,7 @@ sources.
 +++ b/scripts/Makefile.build
 @@ -241,6 +241,11 @@ cmd_record_mcount =						\
  	fi;
- endif
+ endif # CONFIG_FTRACE_MCOUNT_RECORD
  
 +# Don't require recordmcount source for an OOT build.
 +ifdef KBUILD_EXTMOD
diff --git a/debian/patches/series b/debian/patches/series
index 10fd5af..35a8905 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -74,7 +74,6 @@ features/arm64/ARM64-dts-marvell-armada-37xx-Enable-uSD-on-ESPRESSO.patch
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
 bugfix/all/disable-some-marvell-phys.patch
 bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
-bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
 bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
 bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 bugfix/all/rtlwifi-fix-memory-leak-when-firmware-request-fails.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git