[linux] 01/02: Update some patches to the latest versions forwarded upstream

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Mon Sep 28 01:59:06 UTC 2015


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

benh pushed a commit to branch master
in repository linux.

commit c0eccb7ba33263db91caf90e4bd2bae58ea71c32
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Sep 28 02:53:19 2015 +0100

    Update some patches to the latest versions forwarded upstream
---
 .../all/docbook-use-a-fixed-encoding-for-output.patch      | 10 ++++++++--
 ...mentation-avoid-creating-man-pages-in-source-tree.patch |  3 ++-
 ...x_usb_ms-use-msleep_interruptible-in-polling-loop.patch |  9 +++++----
 debian/patches/features/all/efi-autoload-efi-pstore.patch  | 10 +++++-----
 ...-pkg-add-automatic-support-for-armhf-architecture.patch | 14 ++++++--------
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/debian/patches/bugfix/all/docbook-use-a-fixed-encoding-for-output.patch b/debian/patches/bugfix/all/docbook-use-a-fixed-encoding-for-output.patch
index b5874ce..9fd67af 100644
--- a/debian/patches/bugfix/all/docbook-use-a-fixed-encoding-for-output.patch
+++ b/debian/patches/bugfix/all/docbook-use-a-fixed-encoding-for-output.patch
@@ -1,6 +1,7 @@
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Thu, 27 Aug 2015 01:56:46 +0100
+Date: Mon, 28 Sep 2015 01:09:52 +0100
 Subject: DocBook: Use a fixed encoding for output
+Forwarded: http://mid.gmane.org/1443398992.2517.13.camel@decadent.org.uk
 
 Currently the encoding of documents generated by DocBook depends on
 the current locale.  Make the output reproducible independently of
@@ -69,7 +70,12 @@ Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
  subdir-y                     += mod
 --- /dev/null
 +++ b/scripts/check-lc_ctype.c
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,11 @@
++/*
++ * Check that a specified locale works as LC_CTYPE.  Used by the
++ * DocBook build system to probe for C.UTF-8 support.
++ */
++
 +#include <locale.h>
 +
 +int main(void)
diff --git a/debian/patches/bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch b/debian/patches/bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch
index 1b6a23a..c9d919b 100644
--- a/debian/patches/bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch
+++ b/debian/patches/bugfix/all/documentation-avoid-creating-man-pages-in-source-tree.patch
@@ -1,6 +1,7 @@
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 21 Aug 2015 18:06:56 +0200
+Date: Mon, 28 Sep 2015 01:09:02 +0100
 Subject: Documentation: Avoid creating man pages in source tree
+Forwarded: http://mid.gmane.org/1443398942.2517.12.camel@decadent.org.uk
 
 Currently kernel-doc generates a dummy DocBook file when asked to
 convert a C source file with no structured comments.  For an
diff --git a/debian/patches/bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch b/debian/patches/bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
index 3a7f93e..64a86aa 100644
--- a/debian/patches/bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
+++ b/debian/patches/bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
@@ -1,8 +1,8 @@
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 26 Oct 2014 03:39:42 +0000
+Date: Mon, 28 Sep 2015 01:34:21 +0100
 Subject: rtsx_usb_ms: Use msleep_interruptible() in polling loop
 Bug-Debian: https://bugs.debian.org/765717
-Forwarded: http://mid.gmane.org/1415237557.3398.41.camel@decadent.org.uk
+Forwarded: http://mid.gmane.org/1443400461.2517.22.camel@decadent.org.uk
 
 rtsx_usb_ms creates a task that mostly sleeps, but tasks in
 uninterruptible sleep still contribute to the load average (for
@@ -13,8 +13,9 @@ Change the sleep to be interruptible, but still ignore signals.
 
 A better fix might be to replace this loop with a delayed work item.
 
-diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
-index a7282b7..7356780 100644
+References: https://bugs.debian.org/765717
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
 --- a/drivers/memstick/host/rtsx_usb_ms.c
 +++ b/drivers/memstick/host/rtsx_usb_ms.c
 @@ -706,7 +706,8 @@ poll_again:
diff --git a/debian/patches/features/all/efi-autoload-efi-pstore.patch b/debian/patches/features/all/efi-autoload-efi-pstore.patch
index 27672c9..612049a 100644
--- a/debian/patches/features/all/efi-autoload-efi-pstore.patch
+++ b/debian/patches/features/all/efi-autoload-efi-pstore.patch
@@ -1,12 +1,12 @@
 From: Ben Hutchings <ben at decadent.org.uk>
-Subject: x86/efi: Autoload efi-pstore
-Date: Wed, 24 Dec 2014 17:44:06 +0100
-Bug-Debian: https://bugs.debian.org/703363
-Bug-Debian: https://bugs.debian.org/773309
-Forwarded: no
+Subject: efi: Auto-load efi-pstore
+Date: Mon, 28 Sep 2015 01:44:16 +0100
+Forwarded: http://mid.gmane.org/1443401056.2517.27.camel@decadent.org.uk
 
 efi-pstore should be auto-loaded on EFI systems, same as efivars.
 
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
 --- a/drivers/firmware/efi/efi-pstore.c
 +++ b/drivers/firmware/efi/efi-pstore.c
 @@ -400,3 +400,4 @@ module_exit(efivars_pstore_exit);
diff --git a/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch b/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
index 3347d89..0b97390 100644
--- a/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
+++ b/debian/patches/features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
@@ -1,7 +1,7 @@
-Subject: deb-pkg: Add automatic support for armhf architecture
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Mon, 09 Jun 2014 01:21:34 +0100
-Forwarded: http://mid.gmane.org/1402273294.23860.59.camel@deadeye.wl.decadent.org.uk
+Date: Mon, 28 Sep 2015 02:34:40 +0100
+Subject: deb-pkg: Add automatic support for armhf architecture
+Forwarded: http://mid.gmane.org/1443404080.2517.30.camel@decadent.org.uk
 
 The Debian armhf architecture uses the ARM EABI hard-float variant,
 whereas armel uses the soft-float variant.  Although the kernel
@@ -11,13 +11,11 @@ soft-float userland.  So set the architecture to armhf by default when
 CONFIG_AEABI and CONFIG_VFP are both enabled.
 
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Ian Campbell <ijc at hellion.org.uk>
+Acked-by: Fathi Boudra <fathi.boudra at linaro.org>
 ---
 v2: rebased
-
-After discussion with Hector, we agreed this would be a worthwhile
-change.  Hector may later improve this by using gcc specs.
-
-Ben.
+v3: rebased
 
  scripts/package/builddeb | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)

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



More information about the Kernel-svn-changes mailing list