Re-group the patch series

This commit is contained in:
Ben Hutchings 2016-04-13 23:31:28 +01:00
parent a8c2d3c699
commit c37887e538
3 changed files with 13 additions and 13 deletions

View File

@ -26,8 +26,8 @@ Signed-off-by: Andrew Morton <akpm@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

View File

@ -112,4 +112,4 @@ Signed-off-by: Andrew Morton <akpm@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

20
debian/patches/series vendored
View File

@ -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