[linux] 01/01: [armel] ARM: orion5x: fix Makefile for linkstation-lschl.dtb

[debian-kernel at lists.debian.org]

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

rosh-guest pushed a commit to branch sid
in repository linux.

commit 4b402f4b9722b3f0eb7315254434ab7e34b6db41
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Thu Feb 9 23:18:25 2017 +0900

    [armel] ARM: orion5x: fix Makefile for linkstation-lschl.dtb
    
    Note the patch in changelog and add Origin to the patch
---
 debian/changelog                                                 | 1 +
 .../arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 358b178..b45df75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,7 @@ linux (4.9.8-1) UNRELEASED; urgency=medium
   * [armel] ARM: dts: orion5x-lschl: Fix model name
   * [armel] ARM: dts: orion5x-lschl: More consistent naming on linkstation
     series
+  * [armel] ARM: orion5x: fix Makefile for linkstation-lschl.dtb
 
   [ Riku Voipio ]
   * [arm64] Revert "efi/libstub/arm*: Pass latest memory map to the kernel"
diff --git a/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch b/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch
index 19197e2..f9be940 100644
--- a/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch
+++ b/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch
@@ -1,6 +1,7 @@
 From: Arnd Bergmann <arnd at arndb.de>
-Subject: [PATCH] ARM: orion5x: fix Makefile for linkstation-lschl.dtb
 Date: Thu, 2 Feb 2017 12:38:33 +0100
+Subject: [PATCH] ARM: orion5x: fix Makefile for linkstation-lschl.dtb
+Origin: https://git.kernel.org/linus/1a902f6b70c55171ca2419d946b85274e35c9757
 
 The rename of orion5x-lschl.dts needs to be reflected in the Makefile:
 
@@ -8,16 +9,16 @@ make[3]: *** No rule to make target 'arch/arm/boot/dts/orion5x-lschl.dtb', neede
 
 Fixes: 6cfd3cd8d836 ("ARM: dts: orion5x-lschl: More consistent naming on linkstation series")
 Signed-off-by: Arnd Bergmann <arnd at arndb.de>
-Acked-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
 ---
  arch/arm/boot/dts/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index f10fe8526239..01d178a2009f 100644
+index cccdbcb557b6..20fe4a54ee5e 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -617,7 +617,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
+@@ -616,7 +616,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
  	orion5x-lacie-ethernet-disk-mini-v2.dtb \
  	orion5x-linkstation-lsgl.dtb \
  	orion5x-linkstation-lswtgl.dtb \

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