Make patch directory and forwarded states consistent

Anything Debian-specific should have 'Forwarded: not-needed' and
be in debian/.

Anything that could plausibly go upstream (maybe with significant
rework) should have an 'Origin' or 'Forwarded: no' header and
be under bugfix/ or features/.

I haven't worked out what to do with debian/dfsg/; most of those
changes ought to go upstream eventually in some form.

svn path=/dists/trunk/linux/; revision=20321

12 files changed, 11 insertions, 11 deletions

diff --git a/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch b/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
index 88c45d7db..88c45d7db 100644
--- a/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
+++ b/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
diff --git a/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch b/debian/patches/debian/AUFS_PROC_MAP-is-BROKEN.patch
index 7bc85bc0f..7bc85bc0f 100644
--- a/debian/patches/features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch
+++ b/debian/patches/debian/AUFS_PROC_MAP-is-BROKEN.patch
diff --git a/debian/patches/debian/arch-sh4-fix-uimage-build.patch b/debian/patches/debian/arch-sh4-fix-uimage-build.patch
index 399bd4388..fa66f450d 100644
--- a/debian/patches/debian/arch-sh4-fix-uimage-build.patch
+++ b/debian/patches/debian/arch-sh4-fix-uimage-build.patch
@@ -1,7 +1,7 @@
 From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 Subject: [sh4] Fix uImage build
 Bug-Debian: http://bugs.debian.org/569034
-Forwarded: no
+Forwarded: not-needed
 
 [bwh: This was added without a description, but I think it is dealing
 with a similar issue to powerpcspe-omit-uimage.patch]
diff --git a/debian/patches/features/all/aufs3/mark-as-staging.patch b/debian/patches/debian/aufs3-mark-as-staging.patch
index e2a861530..e2a861530 100644
--- a/debian/patches/features/all/aufs3/mark-as-staging.patch
+++ b/debian/patches/debian/aufs3-mark-as-staging.patch
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 85168dcdd..321d39d23 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -1,7 +1,7 @@
 From: Ian Campbell <ijc@hellion.org.uk>
 Date: Thu, 17 Jan 2013 08:55:21 +0000
 Subject: Tweak gitignore for Debian pkg-kernel using git svn.
-Forwarded: no
+Forwarded: not-needed
 
 --- a/.gitignore
 +++ b/.gitignore
diff --git a/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch b/debian/patches/debian/ia64-hardcode-arch-script-output.patch
index 13cd5a865..13cd5a865 100644
--- a/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
+++ b/debian/patches/debian/ia64-hardcode-arch-script-output.patch
diff --git a/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch b/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch
index 925667173..bad19fb06 100644
--- a/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch
+++ b/debian/patches/debian/iwlwifi-do-not-request-unreleased-firmware.patch
@@ -1,7 +1,7 @@
 From: Ben Hutchings <ben@decadent.org.uk>
 Subject: iwlwifi: Do not request unreleased firmware for IWL6000
 Bug-Debian: http://bugs.debian.org/689416
-Forwarded: no
+Forwarded: not-needed
 
 The iwlwifi driver currently supports firmware API versions 4-6 for
 these devices.  It will request the file for the latest supported
diff --git a/debian/patches/debian/doc-build-parallel.patch b/debian/patches/features/all/doc-build-parallel.patch
index 8f56a6ecf..8f56a6ecf 100644
--- a/debian/patches/debian/doc-build-parallel.patch
+++ b/debian/patches/features/all/doc-build-parallel.patch
diff --git a/debian/patches/debian/efi-autoload-efivars.patch b/debian/patches/features/all/efi-autoload-efivars.patch
index dd948af61..dd948af61 100644
--- a/debian/patches/debian/efi-autoload-efivars.patch
+++ b/debian/patches/features/all/efi-autoload-efivars.patch
diff --git a/debian/patches/debian/sysrq-mask.patch b/debian/patches/features/all/sysrq-mask.patch
index 659ede5b5..659ede5b5 100644
--- a/debian/patches/debian/sysrq-mask.patch
+++ b/debian/patches/features/all/sysrq-mask.patch
diff --git a/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch b/debian/patches/features/all/x86-memtest-WARN-if-bad-RAM-found.patch
index 20c9529fe..20c9529fe 100644
--- a/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch
+++ b/debian/patches/features/all/x86-memtest-WARN-if-bad-RAM-found.patch
diff --git a/debian/patches/series b/debian/patches/series
index b8341d866..9050e01a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 debian/version.patch
 debian/kernelvariables.patch
-debian/doc-build-parallel.patch
+features/all/doc-build-parallel.patch
 debian/gitignore.patch
 
 features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
@@ -14,16 +14,16 @@ features/all/aufs3/aufs3-standalone.patch
 features/all/aufs3/aufs3-kbuild.patch
 features/all/aufs3/aufs3-add.patch
 # mark as staging/crap
-features/all/aufs3/mark-as-staging.patch
+debian/aufs3-mark-as-staging.patch
 # hide broken config option
-features/all/aufs3/AUFS_PROC_MAP-is-BROKEN.patch
+debian/AUFS_PROC_MAP-is-BROKEN.patch
 
-bugfix/ia64/hardcode-arch-script-output.patch
+debian/ia64-hardcode-arch-script-output.patch
 bugfix/mips/disable-advansys.patch
 debian/mips-disable-werror.patch
 bugfix/powerpc/lpar-console.patch
 
-debian/sysrq-mask.patch
+features/all/sysrq-mask.patch
 
 debian/arch-sh4-fix-uimage-build.patch
 
@@ -38,7 +38,7 @@ debian/sched-autogroup-disabled.patch
 features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
 debian/cgroups-Document-the-Debian-memory-resource-controll.patch
 bugfix/arm/ixp4xx_iobe.patch
-debian/x86-memtest-WARN-if-bad-RAM-found.patch
+features/all/x86-memtest-WARN-if-bad-RAM-found.patch
 
 features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch
 
@@ -64,8 +64,8 @@ bugfix/all/ath6kl-do-not-use-virt_addr_valid.patch
 
 features/all/xen/microcode-api-update.patch
 
-debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
-debian/efi-autoload-efivars.patch
+bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
+features/all/efi-autoload-efivars.patch
 debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
 debian/powerpcspe-omit-uimage.patch