4.14-stable patches

added patches:
	gitignore-move-.dtb-and-.dtb.s-patterns-to-the-top-level-.gitignore.patch
	gitignore-sort-normal-pattern-rules-alphabetically.patch
	kbuild-rpm-pkg-keep-spec-file-until-make-mrproper.patch
	series

diff --git a/queue-4.14/gitignore-move-.dtb-and-.dtb.s-patterns-to-the-top-level-.gitignore.patch b/queue-4.14/gitignore-move-.dtb-and-.dtb.s-patterns-to-the-top-level-.gitignore.patch
new file mode 100644 (file)
index 0000000..a4e0b36
--- /dev/null
+++ b/queue-4.14/gitignore-move-.dtb-and-.dtb.s-patterns-to-the-top-level-.gitignore.patch
@@ -0,0 +1,105 @@
+From 10b62a2f785ab55857380f0c63d9fa468fd8c676 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Tue, 31 Oct 2017 00:33:46 +0900
+Subject: .gitignore: move *.dtb and *.dtb.S patterns to the top-level .gitignore
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit 10b62a2f785ab55857380f0c63d9fa468fd8c676 upstream.
+
+Most of DT files are compiled under arch/*/boot/dts/, but we have some
+other directories, like drivers/of/unittest-data/.  We often miss to
+add gitignore patterns per directory.  Since there are no source files
+that end with .dtb or .dtb.S, we can ignore the patterns globally.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Signed-off-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ .gitignore                          |    2 ++
+ arch/arc/boot/.gitignore            |    1 -
+ arch/arm/boot/.gitignore            |    1 -
+ arch/arm64/boot/dts/.gitignore      |    1 -
+ arch/metag/boot/.gitignore          |    1 -
+ arch/microblaze/boot/.gitignore     |    1 -
+ arch/mips/boot/.gitignore           |    1 -
+ arch/nios2/boot/.gitignore          |    1 -
+ arch/powerpc/boot/.gitignore        |    1 -
+ arch/xtensa/boot/.gitignore         |    1 -
+ drivers/of/unittest-data/.gitignore |    2 --
+ 11 files changed, 2 insertions(+), 11 deletions(-)
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -14,6 +14,8 @@
+ *.bin
+ *.bz2
+ *.c.[012]*.*
++*.dtb
++*.dtb.S
+ *.dwo
+ *.elf
+ *.gcno
+--- a/arch/arc/boot/.gitignore
++++ b/arch/arc/boot/.gitignore
+@@ -1,2 +1 @@
+-*.dtb*
+ uImage
+--- a/arch/arm/boot/.gitignore
++++ b/arch/arm/boot/.gitignore
+@@ -3,4 +3,3 @@ zImage
+ xipImage
+ bootpImage
+ uImage
+-*.dtb
+--- a/arch/arm64/boot/dts/.gitignore
++++ /dev/null
+@@ -1 +0,0 @@
+-*.dtb
+--- a/arch/metag/boot/.gitignore
++++ b/arch/metag/boot/.gitignore
+@@ -1,4 +1,3 @@
+ vmlinux*
+ uImage*
+ ramdisk.*
+-*.dtb*
+--- a/arch/microblaze/boot/.gitignore
++++ b/arch/microblaze/boot/.gitignore
+@@ -1,3 +1,2 @@
+-*.dtb
+ linux.bin*
+ simpleImage.*
+--- a/arch/mips/boot/.gitignore
++++ b/arch/mips/boot/.gitignore
+@@ -5,4 +5,3 @@ zImage
+ zImage.tmp
+ calc_vmlinuz_load_addr
+ uImage
+-*.dtb
+--- a/arch/nios2/boot/.gitignore
++++ b/arch/nios2/boot/.gitignore
+@@ -1,2 +1 @@
+-*.dtb
+ vmImage
+--- a/arch/powerpc/boot/.gitignore
++++ b/arch/powerpc/boot/.gitignore
+@@ -18,7 +18,6 @@ otheros.bld
+ uImage
+ cuImage.*
+ dtbImage.*
+-*.dtb
+ treeImage.*
+ vmlinux.strip
+ zImage
+--- a/arch/xtensa/boot/.gitignore
++++ b/arch/xtensa/boot/.gitignore
+@@ -1,3 +1,2 @@
+ uImage
+ zImage.redboot
+-*.dtb
+--- a/drivers/of/unittest-data/.gitignore
++++ /dev/null
+@@ -1,2 +0,0 @@
+-testcases.dtb
+-testcases.dtb.S

diff --git a/queue-4.14/gitignore-sort-normal-pattern-rules-alphabetically.patch b/queue-4.14/gitignore-sort-normal-pattern-rules-alphabetically.patch
new file mode 100644 (file)
index 0000000..0d2cdb2
--- /dev/null
+++ b/queue-4.14/gitignore-sort-normal-pattern-rules-alphabetically.patch
@@ -0,0 +1,82 @@
+From 1377dd3e29878b8f5d9f5c9000975f50a428a0cd Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Tue, 31 Oct 2017 00:33:45 +0900
+Subject: .gitignore: sort normal pattern rules alphabetically
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit 1377dd3e29878b8f5d9f5c9000975f50a428a0cd upstream.
+
+We are having more and more ignore patterns.  Sort the list
+alphabetically.  We will easily catch duplicated patterns if any.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Signed-off-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ .gitignore |   42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -7,38 +7,38 @@
+ # command after changing this file, to see if there are
+ # any tracked files which get ignored after the change.
+ #
+-# Normal rules
++# Normal rules (sorted alphabetically)
+ #
+ .*
++*.a
++*.bin
++*.bz2
++*.c.[012]*.*
++*.dwo
++*.elf
++*.gcno
++*.gz
++*.i
++*.ko
++*.ll
++*.lst
++*.lz4
++*.lzma
++*.lzo
++*.mod.c
+ *.o
+ *.o.*
+-*.a
++*.order
++*.patch
+ *.s
+-*.ko
+ *.so
+ *.so.dbg
+-*.mod.c
+-*.i
+-*.lst
++*.su
+ *.symtypes
+-*.order
+-*.elf
+-*.bin
+ *.tar
+-*.gz
+-*.bz2
+-*.lzma
+ *.xz
+-*.lz4
+-*.lzo
+-*.patch
+-*.gcno
+-*.ll
+-modules.builtin
+ Module.symvers
+-*.dwo
+-*.su
+-*.c.[012]*.*
++modules.builtin
+ 
+ #
+ # Top-level generic files

diff --git a/queue-4.14/kbuild-rpm-pkg-keep-spec-file-until-make-mrproper.patch b/queue-4.14/kbuild-rpm-pkg-keep-spec-file-until-make-mrproper.patch
new file mode 100644 (file)
index 0000000..3730268
--- /dev/null
+++ b/queue-4.14/kbuild-rpm-pkg-keep-spec-file-until-make-mrproper.patch
@@ -0,0 +1,58 @@
+From af60e207087975d069858741c44ed4f450330ac4 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Sat, 30 Sep 2017 10:10:10 +0900
+Subject: kbuild: rpm-pkg: keep spec file until make mrproper
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit af60e207087975d069858741c44ed4f450330ac4 upstream.
+
+If build fails during (bin)rpm-pkg, the spec file is not cleaned by
+anyone until the next successful build of the package.
+
+We do not have to immediately delete the spec file in case somebody
+may want to take a look at it.  Instead, make them ignored by git,
+and cleaned up by make mrproper.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ .gitignore               |    5 +++++
+ scripts/package/Makefile |    4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -56,6 +56,11 @@ modules.builtin
+ /Module.markers
+ 
+ #
++# RPM spec file (make rpm-pkg)
++#
++/*.spec
++
++#
+ # Debian directory (make deb-pkg)
+ #
+ /debian/
+--- a/scripts/package/Makefile
++++ b/scripts/package/Makefile
+@@ -50,7 +50,6 @@ rpm-pkg rpm: FORCE
+       $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
+       $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
+       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
+-      rm $(KERNELPATH).tar.gz kernel.spec
+ 
+ # binrpm-pkg
+ # ---------------------------------------------------------------------------
+@@ -59,7 +58,8 @@ binrpm-pkg: FORCE
+       $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
+       +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
+               $(UTS_MACHINE) -bb $(objtree)/binkernel.spec
+-      rm binkernel.spec
++
++clean-files += $(objtree)/*.spec
+ 
+ # Deb target
+ # ---------------------------------------------------------------------------

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..a26ba2f
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1,3 @@
+gitignore-sort-normal-pattern-rules-alphabetically.patch
+gitignore-move-.dtb-and-.dtb.s-patterns-to-the-top-level-.gitignore.patch
+kbuild-rpm-pkg-keep-spec-file-until-make-mrproper.patch