[linux] 01/03: Re-group the patch series

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit c37887e538982fbe037da78b5d43a5a257fc2c66
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Apr 13 23:31:28 2016 +0100

    Re-group the patch series
---
 ...mm-zone_device-depends-on-sparsemem_vmemmap.patch |  4 ++--
 .../mm-exclude-zone_device-from-gfp_zone_table.patch |  2 +-
 debian/patches/series                                | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch b/debian/patches/bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch
index 192f8fa..8747653 100644
--- a/debian/patches/bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch
+++ b/debian/patches/bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch
@@ -26,8 +26,8 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
 
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
-@@ -654,6 +654,7 @@ config ZONE_DEVICE
- 	bool "Device memory (pmem, etc...) hotplug support" if EXPERT
+@@ -656,6 +656,7 @@ config ZONE_DEVICE
+ 	depends on !ZONE_DMA
  	depends on MEMORY_HOTPLUG
  	depends on MEMORY_HOTREMOVE
 +	depends on SPARSEMEM_VMEMMAP
diff --git a/debian/patches/features/all/mm-exclude-zone_device-from-gfp_zone_table.patch b/debian/patches/features/all/mm-exclude-zone_device-from-gfp_zone_table.patch
index 9820e7c..78f4a57 100644
--- a/debian/patches/features/all/mm-exclude-zone_device-from-gfp_zone_table.patch
+++ b/debian/patches/features/all/mm-exclude-zone_device-from-gfp_zone_table.patch
@@ -112,4 +112,4 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
 -	depends on !ZONE_DMA
  	depends on MEMORY_HOTPLUG
  	depends on MEMORY_HOTREMOVE
- 	depends on X86_64 #arch_add_memory() comprehends device memory
+ 	depends on SPARSEMEM_VMEMMAP
diff --git a/debian/patches/series b/debian/patches/series
index 7bea7d9..409be86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,6 +45,8 @@ debian/snd-pcsp-disable-autoload.patch
 bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
 
 # Arch bug fixes
+bugfix/x86/vmxnet3-fix-lock-imbalance-in-vmxnet3_tq_xmit.patch
+bugfix/x86/acpi-processor-request-native-thermal-interrupt-hand.patch
 
 # Arch features
 features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
@@ -71,8 +73,12 @@ bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch
 bugfix/all/disable-some-marvell-phys.patch
 bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
+bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch
+bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 
 # Miscellaneous features
+features/all/mm-exclude-zone_device-from-gfp_zone_table.patch
+features/all/nbd-create-size-change-events-for-userspace.patch
 
 # Hardening from grsecurity
 features/all/grsecurity/grsecurity-kconfig.patch
@@ -113,9 +119,10 @@ bugfix/x86/x86-efi-bgrt-fix-kernel-panic-when-mapping-bgrt-data.patch
 bugfix/x86/x86-efi-bgrt-replace-early_memremap-with-memremap.patch
 bugfix/x86/x86-mm-pat-fix-boot-crash-when-1gb-pages-are-not-supported.patch
 bugfix/all/netfilter-x_tables-check-for-size-overflow.patch
-bugfix/x86/vmxnet3-fix-lock-imbalance-in-vmxnet3_tq_xmit.patch
-features/all/mm-exclude-zone_device-from-gfp_zone_table.patch
-bugfix/all/mm-zone_device-depends-on-sparsemem_vmemmap.patch
+bugfix/all/netfilter-x_tables-validate-e-target_offset-early.patch
+bugfix/all/netfilter-x_tables-make-sure-e-next_offset-covers-re.patch
+bugfix/all/ipv4-don-t-do-expensive-useless-work-during-inetdev-.patch
+bugfix/x86/x86-mm-32-enable-full-randomization-on-i386-and-x86_.patch
 
 # Tools bug fixes
 bugfix/all/usbip-document-tcp-wrappers.patch
@@ -138,10 +145,3 @@ bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
 bugfix/all/power-cpupower-fix-manpages-NAME.patch
 bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
 bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch
-bugfix/all/netfilter-x_tables-validate-e-target_offset-early.patch
-bugfix/all/netfilter-x_tables-make-sure-e-next_offset-covers-re.patch
-bugfix/all/ipv4-don-t-do-expensive-useless-work-during-inetdev-.patch
-bugfix/x86/x86-mm-32-enable-full-randomization-on-i386-and-x86_.patch
-bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
-bugfix/x86/acpi-processor-request-native-thermal-interrupt-hand.patch
-features/all/nbd-create-size-change-events-for-userspace.patch

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