From bb67ef032a61f5d0fdc6fa32ee28ed94503555e4 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Date: Thu, 29 Nov 2012 17:27:25 -0800
Subject: [PATCH] compat-drivers: move all patch types under patches/

The number of patch directories for the different life
cycle a patch can be on its way upstream had reached 4:

  * pending-stable
  * linux-next-pending
  * linux-next-cherry-picks
  * crap

Apart from this we also had the backport related patches.
In the future I see potential for other directories for
different categories of patches. Consider how we are
breaking down the backport patches into specific documented
collateral evolutions and of those type of collateral
evolutions there may be different types of collateral
evolutions which we could likely treat / document differently.
Another type of patch that I forsee us having to deal with
are patches for drivers that are not upstrea -- like crap,
but for drivers in a unified driver tree that is *designed*
from scratch to be targetting upstream Linux inclusion using
the same coccinelle technology I forsee us using for backporting
collateral evolutions.

Since the number of patch directories can get out of hand
at the top level lets just stuff then all under patches/
and deal with patches there. This also places the backport
patches into a directory called collateral-evolutions/ to
help promote and educate on the nature of the changes
that we have to deal with when backporting.

Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Adrian Chadd <adrian@freebsd.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---
 patches/{ => collateral-evolutions}/README    |  4 ++--
 .../drm/01-dma_buf_ops-addition.patch         |  0
 .../drm/02-revert-vm_mmap.patch               |  0
 .../drm/03-swiotlb.patch                      |  0
 .../drm/04-revert-prime-support.patch         |  0
 .../drm/05-i915-define-acpi-video-class.patch |  0
 .../drm/06-rename-config-options.patch        |  0
 .../drm/07-intel-gtt.patch                    |  0
 .../drm/08-shmem_truncate_range.patch         |  0
 .../09-nouveau-compatify-kconfig-vars.patch   |  0
 ...-radeon-revert-acpi-table-size-check.patch |  0
 .../drm/98-pr_fmt.patch                       |  0
 .../drm/99-change-makefile.patch              |  0
 .../network/0001-netdev_ops.patch             |  0
 .../network/0002-net-misc.patch               |  0
 ...0003-netdev-needed_headroom_tailroom.patch |  0
 .../network/0004-wext-namespace.patch         |  0
 .../network/0005-netlink-portid.patch         |  0
 .../network/02-ksize.patch                    |  0
 .../network/03-rfkill.patch                   |  0
 .../network/04-netns.patch                    |  0
 .../network/05-usb.patch                      |  0
 .../network/06-header-changes.patch           |  0
 .../network/07-change-default-rate-alg.patch  |  0
 .../network/08-rename-config-options.patch    |  0
 .../network/09-cfg80211-wext-padding.patch    |  0
 .../network/09-threaded-irq.patch             |  0
 .../10-add-wext-handlers-to-netdev.patch      |  0
 .../network/11-dev-pm-ops.patch               |  0
 .../network/12-iw_handler-changes.patch       |  0
 .../12-mac80211-disable-tx-status.patch       |  0
 .../network/14-device-type.patch              |  0
 .../network/15-symbol-export-conflicts.patch  |  0
 .../network/16-bluetooth.patch                |  0
 .../network/17-netdev-queue.patch             |  0
 .../network/18-rename-usb-net-symbols.patch   |  0
 .../network/21-capi-proc_fops.patch           |  0
 .../network/22-multiqueue.patch               |  0
 .../network/24-pcmcia.patch                   |  0
 .../network/25-multicast-list_head.patch      |  0
 .../network/26-sdio-quirks.patch              |  0
 .../network/27-hermes-read-pda-conflict.patch |  0
 .../network/29-sdio_no_suspend.patch          |  0
 .../network/30-bridge-port.patch              |  0
 .../network/32-remove-ns-type.patch           |  0
 .../network/35-fix-makefile-includes.patch    |  0
 .../network/36-workqueue.patch                |  0
 .../network/37-vsnprintk.patch                |  0
 .../network/38-led-max-brightness.patch       |  0
 .../network/39-remove_blink_set.patch         |  0
 .../network/40-netdev-hw-features.patch       |  0
 .../network/42-netlink_seq.patch              |  0
 .../network/43-rename_pm_qos_request.patch    |  0
 .../44-deactivate-mac80211-tracing.patch      |  0
 .../network/45-remove-platform-id-table.patch |  0
 .../network/46-use_other_workqueue.patch      |  0
 .../47-no_trans_start_on_netdev_queue.patch   |  0
 .../48-use_skb_get_queue_mapping.patch        |  0
 .../network/50-libertas-olpc-ec-wakeup.patch  |  0
 .../network/52-tty-dev.patch                  |  0
 .../network/53-pr_fmt.patch                   |  0
 .../network/54-get_ts_info.patch              |  0
 .../network/55-iwlwifi-msg-trace-fix.patch    |  0
 .../network/56-mac80211-trace-fix.patch       |  0
 .../network/57-iwlwifi-debug-fix.patch        |  0
 .../network/61-netdev-addr_assign_type.patch  |  0
 .../network/62-usb_driver_lpm.patch           |  0
 .../network/63-tty-termios.patch              |  0
 .../network/64-b44-32bit-stats.patch          |  0
 .../network/65-ignore-dismantle.patch         |  0
 .../network/66-uapi-changes.patch             |  0
 .../network/67-use_spinlock_t.patch           |  0
 .../network/99-change-makefiles.patch         |  0
 {crap => patches/crap}/README                 |  0
 .../linux-next-cherry-picks}/README           |  0
 .../network/.gitignore                        |  0
 .../linux-next-pending}/README                |  0
 .../linux-next-pending}/network/.gitignore    |  0
 .../pending-stable}/.ignore                   |  0
 .../pending-stable}/README                    |  0
 .../pending-stable}/network/.gitignore        |  0
 scripts/admin-update.sh                       | 22 +++++++++----------
 82 files changed, 13 insertions(+), 13 deletions(-)
 rename patches/{ => collateral-evolutions}/README (82%)
 rename patches/{ => collateral-evolutions}/drm/01-dma_buf_ops-addition.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/02-revert-vm_mmap.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/03-swiotlb.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/04-revert-prime-support.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/05-i915-define-acpi-video-class.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/06-rename-config-options.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/07-intel-gtt.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/08-shmem_truncate_range.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/09-nouveau-compatify-kconfig-vars.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/10-radeon-revert-acpi-table-size-check.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/98-pr_fmt.patch (100%)
 rename patches/{ => collateral-evolutions}/drm/99-change-makefile.patch (100%)
 rename patches/{ => collateral-evolutions}/network/0001-netdev_ops.patch (100%)
 rename patches/{ => collateral-evolutions}/network/0002-net-misc.patch (100%)
 rename patches/{ => collateral-evolutions}/network/0003-netdev-needed_headroom_tailroom.patch (100%)
 rename patches/{ => collateral-evolutions}/network/0004-wext-namespace.patch (100%)
 rename patches/{ => collateral-evolutions}/network/0005-netlink-portid.patch (100%)
 rename patches/{ => collateral-evolutions}/network/02-ksize.patch (100%)
 rename patches/{ => collateral-evolutions}/network/03-rfkill.patch (100%)
 rename patches/{ => collateral-evolutions}/network/04-netns.patch (100%)
 rename patches/{ => collateral-evolutions}/network/05-usb.patch (100%)
 rename patches/{ => collateral-evolutions}/network/06-header-changes.patch (100%)
 rename patches/{ => collateral-evolutions}/network/07-change-default-rate-alg.patch (100%)
 rename patches/{ => collateral-evolutions}/network/08-rename-config-options.patch (100%)
 rename patches/{ => collateral-evolutions}/network/09-cfg80211-wext-padding.patch (100%)
 rename patches/{ => collateral-evolutions}/network/09-threaded-irq.patch (100%)
 rename patches/{ => collateral-evolutions}/network/10-add-wext-handlers-to-netdev.patch (100%)
 rename patches/{ => collateral-evolutions}/network/11-dev-pm-ops.patch (100%)
 rename patches/{ => collateral-evolutions}/network/12-iw_handler-changes.patch (100%)
 rename patches/{ => collateral-evolutions}/network/12-mac80211-disable-tx-status.patch (100%)
 rename patches/{ => collateral-evolutions}/network/14-device-type.patch (100%)
 rename patches/{ => collateral-evolutions}/network/15-symbol-export-conflicts.patch (100%)
 rename patches/{ => collateral-evolutions}/network/16-bluetooth.patch (100%)
 rename patches/{ => collateral-evolutions}/network/17-netdev-queue.patch (100%)
 rename patches/{ => collateral-evolutions}/network/18-rename-usb-net-symbols.patch (100%)
 rename patches/{ => collateral-evolutions}/network/21-capi-proc_fops.patch (100%)
 rename patches/{ => collateral-evolutions}/network/22-multiqueue.patch (100%)
 rename patches/{ => collateral-evolutions}/network/24-pcmcia.patch (100%)
 rename patches/{ => collateral-evolutions}/network/25-multicast-list_head.patch (100%)
 rename patches/{ => collateral-evolutions}/network/26-sdio-quirks.patch (100%)
 rename patches/{ => collateral-evolutions}/network/27-hermes-read-pda-conflict.patch (100%)
 rename patches/{ => collateral-evolutions}/network/29-sdio_no_suspend.patch (100%)
 rename patches/{ => collateral-evolutions}/network/30-bridge-port.patch (100%)
 rename patches/{ => collateral-evolutions}/network/32-remove-ns-type.patch (100%)
 rename patches/{ => collateral-evolutions}/network/35-fix-makefile-includes.patch (100%)
 rename patches/{ => collateral-evolutions}/network/36-workqueue.patch (100%)
 rename patches/{ => collateral-evolutions}/network/37-vsnprintk.patch (100%)
 rename patches/{ => collateral-evolutions}/network/38-led-max-brightness.patch (100%)
 rename patches/{ => collateral-evolutions}/network/39-remove_blink_set.patch (100%)
 rename patches/{ => collateral-evolutions}/network/40-netdev-hw-features.patch (100%)
 rename patches/{ => collateral-evolutions}/network/42-netlink_seq.patch (100%)
 rename patches/{ => collateral-evolutions}/network/43-rename_pm_qos_request.patch (100%)
 rename patches/{ => collateral-evolutions}/network/44-deactivate-mac80211-tracing.patch (100%)
 rename patches/{ => collateral-evolutions}/network/45-remove-platform-id-table.patch (100%)
 rename patches/{ => collateral-evolutions}/network/46-use_other_workqueue.patch (100%)
 rename patches/{ => collateral-evolutions}/network/47-no_trans_start_on_netdev_queue.patch (100%)
 rename patches/{ => collateral-evolutions}/network/48-use_skb_get_queue_mapping.patch (100%)
 rename patches/{ => collateral-evolutions}/network/50-libertas-olpc-ec-wakeup.patch (100%)
 rename patches/{ => collateral-evolutions}/network/52-tty-dev.patch (100%)
 rename patches/{ => collateral-evolutions}/network/53-pr_fmt.patch (100%)
 rename patches/{ => collateral-evolutions}/network/54-get_ts_info.patch (100%)
 rename patches/{ => collateral-evolutions}/network/55-iwlwifi-msg-trace-fix.patch (100%)
 rename patches/{ => collateral-evolutions}/network/56-mac80211-trace-fix.patch (100%)
 rename patches/{ => collateral-evolutions}/network/57-iwlwifi-debug-fix.patch (100%)
 rename patches/{ => collateral-evolutions}/network/61-netdev-addr_assign_type.patch (100%)
 rename patches/{ => collateral-evolutions}/network/62-usb_driver_lpm.patch (100%)
 rename patches/{ => collateral-evolutions}/network/63-tty-termios.patch (100%)
 rename patches/{ => collateral-evolutions}/network/64-b44-32bit-stats.patch (100%)
 rename patches/{ => collateral-evolutions}/network/65-ignore-dismantle.patch (100%)
 rename patches/{ => collateral-evolutions}/network/66-uapi-changes.patch (100%)
 rename patches/{ => collateral-evolutions}/network/67-use_spinlock_t.patch (100%)
 rename patches/{ => collateral-evolutions}/network/99-change-makefiles.patch (100%)
 rename {crap => patches/crap}/README (100%)
 rename {linux-next-cherry-picks => patches/linux-next-cherry-picks}/README (100%)
 rename {linux-next-cherry-picks => patches/linux-next-cherry-picks}/network/.gitignore (100%)
 rename {linux-next-pending => patches/linux-next-pending}/README (100%)
 rename {linux-next-pending => patches/linux-next-pending}/network/.gitignore (100%)
 rename {pending-stable => patches/pending-stable}/.ignore (100%)
 rename {pending-stable => patches/pending-stable}/README (100%)
 rename {pending-stable => patches/pending-stable}/network/.gitignore (100%)

diff --git a/patches/README b/patches/collateral-evolutions/README
similarity index 82%
rename from patches/README
rename to patches/collateral-evolutions/README
index 3e3b4d8c581d..4580c0e595bd 100644
--- a/patches/README
+++ b/patches/collateral-evolutions/README
@@ -1,6 +1,6 @@
 
-compat-drivers patches
-=======================
+compat-drivers collateral evolutions patches
+============================================
 
 You must have a really good reason to be adding files
 in this directory. Your reasoning should either match the
diff --git a/patches/drm/01-dma_buf_ops-addition.patch b/patches/collateral-evolutions/drm/01-dma_buf_ops-addition.patch
similarity index 100%
rename from patches/drm/01-dma_buf_ops-addition.patch
rename to patches/collateral-evolutions/drm/01-dma_buf_ops-addition.patch
diff --git a/patches/drm/02-revert-vm_mmap.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap.patch
similarity index 100%
rename from patches/drm/02-revert-vm_mmap.patch
rename to patches/collateral-evolutions/drm/02-revert-vm_mmap.patch
diff --git a/patches/drm/03-swiotlb.patch b/patches/collateral-evolutions/drm/03-swiotlb.patch
similarity index 100%
rename from patches/drm/03-swiotlb.patch
rename to patches/collateral-evolutions/drm/03-swiotlb.patch
diff --git a/patches/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
similarity index 100%
rename from patches/drm/04-revert-prime-support.patch
rename to patches/collateral-evolutions/drm/04-revert-prime-support.patch
diff --git a/patches/drm/05-i915-define-acpi-video-class.patch b/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class.patch
similarity index 100%
rename from patches/drm/05-i915-define-acpi-video-class.patch
rename to patches/collateral-evolutions/drm/05-i915-define-acpi-video-class.patch
diff --git a/patches/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch
similarity index 100%
rename from patches/drm/06-rename-config-options.patch
rename to patches/collateral-evolutions/drm/06-rename-config-options.patch
diff --git a/patches/drm/07-intel-gtt.patch b/patches/collateral-evolutions/drm/07-intel-gtt.patch
similarity index 100%
rename from patches/drm/07-intel-gtt.patch
rename to patches/collateral-evolutions/drm/07-intel-gtt.patch
diff --git a/patches/drm/08-shmem_truncate_range.patch b/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch
similarity index 100%
rename from patches/drm/08-shmem_truncate_range.patch
rename to patches/collateral-evolutions/drm/08-shmem_truncate_range.patch
diff --git a/patches/drm/09-nouveau-compatify-kconfig-vars.patch b/patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars.patch
similarity index 100%
rename from patches/drm/09-nouveau-compatify-kconfig-vars.patch
rename to patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars.patch
diff --git a/patches/drm/10-radeon-revert-acpi-table-size-check.patch b/patches/collateral-evolutions/drm/10-radeon-revert-acpi-table-size-check.patch
similarity index 100%
rename from patches/drm/10-radeon-revert-acpi-table-size-check.patch
rename to patches/collateral-evolutions/drm/10-radeon-revert-acpi-table-size-check.patch
diff --git a/patches/drm/98-pr_fmt.patch b/patches/collateral-evolutions/drm/98-pr_fmt.patch
similarity index 100%
rename from patches/drm/98-pr_fmt.patch
rename to patches/collateral-evolutions/drm/98-pr_fmt.patch
diff --git a/patches/drm/99-change-makefile.patch b/patches/collateral-evolutions/drm/99-change-makefile.patch
similarity index 100%
rename from patches/drm/99-change-makefile.patch
rename to patches/collateral-evolutions/drm/99-change-makefile.patch
diff --git a/patches/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
similarity index 100%
rename from patches/network/0001-netdev_ops.patch
rename to patches/collateral-evolutions/network/0001-netdev_ops.patch
diff --git a/patches/network/0002-net-misc.patch b/patches/collateral-evolutions/network/0002-net-misc.patch
similarity index 100%
rename from patches/network/0002-net-misc.patch
rename to patches/collateral-evolutions/network/0002-net-misc.patch
diff --git a/patches/network/0003-netdev-needed_headroom_tailroom.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch
similarity index 100%
rename from patches/network/0003-netdev-needed_headroom_tailroom.patch
rename to patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch
diff --git a/patches/network/0004-wext-namespace.patch b/patches/collateral-evolutions/network/0004-wext-namespace.patch
similarity index 100%
rename from patches/network/0004-wext-namespace.patch
rename to patches/collateral-evolutions/network/0004-wext-namespace.patch
diff --git a/patches/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch
similarity index 100%
rename from patches/network/0005-netlink-portid.patch
rename to patches/collateral-evolutions/network/0005-netlink-portid.patch
diff --git a/patches/network/02-ksize.patch b/patches/collateral-evolutions/network/02-ksize.patch
similarity index 100%
rename from patches/network/02-ksize.patch
rename to patches/collateral-evolutions/network/02-ksize.patch
diff --git a/patches/network/03-rfkill.patch b/patches/collateral-evolutions/network/03-rfkill.patch
similarity index 100%
rename from patches/network/03-rfkill.patch
rename to patches/collateral-evolutions/network/03-rfkill.patch
diff --git a/patches/network/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch
similarity index 100%
rename from patches/network/04-netns.patch
rename to patches/collateral-evolutions/network/04-netns.patch
diff --git a/patches/network/05-usb.patch b/patches/collateral-evolutions/network/05-usb.patch
similarity index 100%
rename from patches/network/05-usb.patch
rename to patches/collateral-evolutions/network/05-usb.patch
diff --git a/patches/network/06-header-changes.patch b/patches/collateral-evolutions/network/06-header-changes.patch
similarity index 100%
rename from patches/network/06-header-changes.patch
rename to patches/collateral-evolutions/network/06-header-changes.patch
diff --git a/patches/network/07-change-default-rate-alg.patch b/patches/collateral-evolutions/network/07-change-default-rate-alg.patch
similarity index 100%
rename from patches/network/07-change-default-rate-alg.patch
rename to patches/collateral-evolutions/network/07-change-default-rate-alg.patch
diff --git a/patches/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch
similarity index 100%
rename from patches/network/08-rename-config-options.patch
rename to patches/collateral-evolutions/network/08-rename-config-options.patch
diff --git a/patches/network/09-cfg80211-wext-padding.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch
similarity index 100%
rename from patches/network/09-cfg80211-wext-padding.patch
rename to patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch
diff --git a/patches/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch
similarity index 100%
rename from patches/network/09-threaded-irq.patch
rename to patches/collateral-evolutions/network/09-threaded-irq.patch
diff --git a/patches/network/10-add-wext-handlers-to-netdev.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch
similarity index 100%
rename from patches/network/10-add-wext-handlers-to-netdev.patch
rename to patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch
diff --git a/patches/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
similarity index 100%
rename from patches/network/11-dev-pm-ops.patch
rename to patches/collateral-evolutions/network/11-dev-pm-ops.patch
diff --git a/patches/network/12-iw_handler-changes.patch b/patches/collateral-evolutions/network/12-iw_handler-changes.patch
similarity index 100%
rename from patches/network/12-iw_handler-changes.patch
rename to patches/collateral-evolutions/network/12-iw_handler-changes.patch
diff --git a/patches/network/12-mac80211-disable-tx-status.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch
similarity index 100%
rename from patches/network/12-mac80211-disable-tx-status.patch
rename to patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch
diff --git a/patches/network/14-device-type.patch b/patches/collateral-evolutions/network/14-device-type.patch
similarity index 100%
rename from patches/network/14-device-type.patch
rename to patches/collateral-evolutions/network/14-device-type.patch
diff --git a/patches/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
similarity index 100%
rename from patches/network/15-symbol-export-conflicts.patch
rename to patches/collateral-evolutions/network/15-symbol-export-conflicts.patch
diff --git a/patches/network/16-bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth.patch
similarity index 100%
rename from patches/network/16-bluetooth.patch
rename to patches/collateral-evolutions/network/16-bluetooth.patch
diff --git a/patches/network/17-netdev-queue.patch b/patches/collateral-evolutions/network/17-netdev-queue.patch
similarity index 100%
rename from patches/network/17-netdev-queue.patch
rename to patches/collateral-evolutions/network/17-netdev-queue.patch
diff --git a/patches/network/18-rename-usb-net-symbols.patch b/patches/collateral-evolutions/network/18-rename-usb-net-symbols.patch
similarity index 100%
rename from patches/network/18-rename-usb-net-symbols.patch
rename to patches/collateral-evolutions/network/18-rename-usb-net-symbols.patch
diff --git a/patches/network/21-capi-proc_fops.patch b/patches/collateral-evolutions/network/21-capi-proc_fops.patch
similarity index 100%
rename from patches/network/21-capi-proc_fops.patch
rename to patches/collateral-evolutions/network/21-capi-proc_fops.patch
diff --git a/patches/network/22-multiqueue.patch b/patches/collateral-evolutions/network/22-multiqueue.patch
similarity index 100%
rename from patches/network/22-multiqueue.patch
rename to patches/collateral-evolutions/network/22-multiqueue.patch
diff --git a/patches/network/24-pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia.patch
similarity index 100%
rename from patches/network/24-pcmcia.patch
rename to patches/collateral-evolutions/network/24-pcmcia.patch
diff --git a/patches/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch
similarity index 100%
rename from patches/network/25-multicast-list_head.patch
rename to patches/collateral-evolutions/network/25-multicast-list_head.patch
diff --git a/patches/network/26-sdio-quirks.patch b/patches/collateral-evolutions/network/26-sdio-quirks.patch
similarity index 100%
rename from patches/network/26-sdio-quirks.patch
rename to patches/collateral-evolutions/network/26-sdio-quirks.patch
diff --git a/patches/network/27-hermes-read-pda-conflict.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict.patch
similarity index 100%
rename from patches/network/27-hermes-read-pda-conflict.patch
rename to patches/collateral-evolutions/network/27-hermes-read-pda-conflict.patch
diff --git a/patches/network/29-sdio_no_suspend.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch
similarity index 100%
rename from patches/network/29-sdio_no_suspend.patch
rename to patches/collateral-evolutions/network/29-sdio_no_suspend.patch
diff --git a/patches/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch
similarity index 100%
rename from patches/network/30-bridge-port.patch
rename to patches/collateral-evolutions/network/30-bridge-port.patch
diff --git a/patches/network/32-remove-ns-type.patch b/patches/collateral-evolutions/network/32-remove-ns-type.patch
similarity index 100%
rename from patches/network/32-remove-ns-type.patch
rename to patches/collateral-evolutions/network/32-remove-ns-type.patch
diff --git a/patches/network/35-fix-makefile-includes.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes.patch
similarity index 100%
rename from patches/network/35-fix-makefile-includes.patch
rename to patches/collateral-evolutions/network/35-fix-makefile-includes.patch
diff --git a/patches/network/36-workqueue.patch b/patches/collateral-evolutions/network/36-workqueue.patch
similarity index 100%
rename from patches/network/36-workqueue.patch
rename to patches/collateral-evolutions/network/36-workqueue.patch
diff --git a/patches/network/37-vsnprintk.patch b/patches/collateral-evolutions/network/37-vsnprintk.patch
similarity index 100%
rename from patches/network/37-vsnprintk.patch
rename to patches/collateral-evolutions/network/37-vsnprintk.patch
diff --git a/patches/network/38-led-max-brightness.patch b/patches/collateral-evolutions/network/38-led-max-brightness.patch
similarity index 100%
rename from patches/network/38-led-max-brightness.patch
rename to patches/collateral-evolutions/network/38-led-max-brightness.patch
diff --git a/patches/network/39-remove_blink_set.patch b/patches/collateral-evolutions/network/39-remove_blink_set.patch
similarity index 100%
rename from patches/network/39-remove_blink_set.patch
rename to patches/collateral-evolutions/network/39-remove_blink_set.patch
diff --git a/patches/network/40-netdev-hw-features.patch b/patches/collateral-evolutions/network/40-netdev-hw-features.patch
similarity index 100%
rename from patches/network/40-netdev-hw-features.patch
rename to patches/collateral-evolutions/network/40-netdev-hw-features.patch
diff --git a/patches/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch
similarity index 100%
rename from patches/network/42-netlink_seq.patch
rename to patches/collateral-evolutions/network/42-netlink_seq.patch
diff --git a/patches/network/43-rename_pm_qos_request.patch b/patches/collateral-evolutions/network/43-rename_pm_qos_request.patch
similarity index 100%
rename from patches/network/43-rename_pm_qos_request.patch
rename to patches/collateral-evolutions/network/43-rename_pm_qos_request.patch
diff --git a/patches/network/44-deactivate-mac80211-tracing.patch b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing.patch
similarity index 100%
rename from patches/network/44-deactivate-mac80211-tracing.patch
rename to patches/collateral-evolutions/network/44-deactivate-mac80211-tracing.patch
diff --git a/patches/network/45-remove-platform-id-table.patch b/patches/collateral-evolutions/network/45-remove-platform-id-table.patch
similarity index 100%
rename from patches/network/45-remove-platform-id-table.patch
rename to patches/collateral-evolutions/network/45-remove-platform-id-table.patch
diff --git a/patches/network/46-use_other_workqueue.patch b/patches/collateral-evolutions/network/46-use_other_workqueue.patch
similarity index 100%
rename from patches/network/46-use_other_workqueue.patch
rename to patches/collateral-evolutions/network/46-use_other_workqueue.patch
diff --git a/patches/network/47-no_trans_start_on_netdev_queue.patch b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue.patch
similarity index 100%
rename from patches/network/47-no_trans_start_on_netdev_queue.patch
rename to patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue.patch
diff --git a/patches/network/48-use_skb_get_queue_mapping.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch
similarity index 100%
rename from patches/network/48-use_skb_get_queue_mapping.patch
rename to patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch
diff --git a/patches/network/50-libertas-olpc-ec-wakeup.patch b/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup.patch
similarity index 100%
rename from patches/network/50-libertas-olpc-ec-wakeup.patch
rename to patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup.patch
diff --git a/patches/network/52-tty-dev.patch b/patches/collateral-evolutions/network/52-tty-dev.patch
similarity index 100%
rename from patches/network/52-tty-dev.patch
rename to patches/collateral-evolutions/network/52-tty-dev.patch
diff --git a/patches/network/53-pr_fmt.patch b/patches/collateral-evolutions/network/53-pr_fmt.patch
similarity index 100%
rename from patches/network/53-pr_fmt.patch
rename to patches/collateral-evolutions/network/53-pr_fmt.patch
diff --git a/patches/network/54-get_ts_info.patch b/patches/collateral-evolutions/network/54-get_ts_info.patch
similarity index 100%
rename from patches/network/54-get_ts_info.patch
rename to patches/collateral-evolutions/network/54-get_ts_info.patch
diff --git a/patches/network/55-iwlwifi-msg-trace-fix.patch b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch
similarity index 100%
rename from patches/network/55-iwlwifi-msg-trace-fix.patch
rename to patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch
diff --git a/patches/network/56-mac80211-trace-fix.patch b/patches/collateral-evolutions/network/56-mac80211-trace-fix.patch
similarity index 100%
rename from patches/network/56-mac80211-trace-fix.patch
rename to patches/collateral-evolutions/network/56-mac80211-trace-fix.patch
diff --git a/patches/network/57-iwlwifi-debug-fix.patch b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch
similarity index 100%
rename from patches/network/57-iwlwifi-debug-fix.patch
rename to patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch
diff --git a/patches/network/61-netdev-addr_assign_type.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
similarity index 100%
rename from patches/network/61-netdev-addr_assign_type.patch
rename to patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
similarity index 100%
rename from patches/network/62-usb_driver_lpm.patch
rename to patches/collateral-evolutions/network/62-usb_driver_lpm.patch
diff --git a/patches/network/63-tty-termios.patch b/patches/collateral-evolutions/network/63-tty-termios.patch
similarity index 100%
rename from patches/network/63-tty-termios.patch
rename to patches/collateral-evolutions/network/63-tty-termios.patch
diff --git a/patches/network/64-b44-32bit-stats.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats.patch
similarity index 100%
rename from patches/network/64-b44-32bit-stats.patch
rename to patches/collateral-evolutions/network/64-b44-32bit-stats.patch
diff --git a/patches/network/65-ignore-dismantle.patch b/patches/collateral-evolutions/network/65-ignore-dismantle.patch
similarity index 100%
rename from patches/network/65-ignore-dismantle.patch
rename to patches/collateral-evolutions/network/65-ignore-dismantle.patch
diff --git a/patches/network/66-uapi-changes.patch b/patches/collateral-evolutions/network/66-uapi-changes.patch
similarity index 100%
rename from patches/network/66-uapi-changes.patch
rename to patches/collateral-evolutions/network/66-uapi-changes.patch
diff --git a/patches/network/67-use_spinlock_t.patch b/patches/collateral-evolutions/network/67-use_spinlock_t.patch
similarity index 100%
rename from patches/network/67-use_spinlock_t.patch
rename to patches/collateral-evolutions/network/67-use_spinlock_t.patch
diff --git a/patches/network/99-change-makefiles.patch b/patches/collateral-evolutions/network/99-change-makefiles.patch
similarity index 100%
rename from patches/network/99-change-makefiles.patch
rename to patches/collateral-evolutions/network/99-change-makefiles.patch
diff --git a/crap/README b/patches/crap/README
similarity index 100%
rename from crap/README
rename to patches/crap/README
diff --git a/linux-next-cherry-picks/README b/patches/linux-next-cherry-picks/README
similarity index 100%
rename from linux-next-cherry-picks/README
rename to patches/linux-next-cherry-picks/README
diff --git a/linux-next-cherry-picks/network/.gitignore b/patches/linux-next-cherry-picks/network/.gitignore
similarity index 100%
rename from linux-next-cherry-picks/network/.gitignore
rename to patches/linux-next-cherry-picks/network/.gitignore
diff --git a/linux-next-pending/README b/patches/linux-next-pending/README
similarity index 100%
rename from linux-next-pending/README
rename to patches/linux-next-pending/README
diff --git a/linux-next-pending/network/.gitignore b/patches/linux-next-pending/network/.gitignore
similarity index 100%
rename from linux-next-pending/network/.gitignore
rename to patches/linux-next-pending/network/.gitignore
diff --git a/pending-stable/.ignore b/patches/pending-stable/.ignore
similarity index 100%
rename from pending-stable/.ignore
rename to patches/pending-stable/.ignore
diff --git a/pending-stable/README b/patches/pending-stable/README
similarity index 100%
rename from pending-stable/README
rename to patches/pending-stable/README
diff --git a/pending-stable/network/.gitignore b/patches/pending-stable/network/.gitignore
similarity index 100%
rename from pending-stable/network/.gitignore
rename to patches/pending-stable/network/.gitignore
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index f05081a4150b..c3f163f2e38d 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -150,19 +150,19 @@ nagometer() {
 	let CHANGES=$ADD+$DEL
 
 	case `dirname $1` in
-	"patches")
+	"patches/collateral-evolutions")
 		brag_backport $ORIG_CODE $CHANGES $ADD $DEL
 		;;
-	"pending-stable")
+	"patches/pending-stable")
 		nag_pending_stable $ORIG_CODE $CHANGES $ADD $DEL
 		;;
-	"linux-next-cherry-picks")
+	"patches/linux-next-cherry-picks")
 		nag_next_cherry_pick $ORIG_CODE $CHANGES $ADD $DEL
 		;;
-	"linux-next-pending")
+	"patches/linux-next-pending")
 		nag_pending $ORIG_CODE $CHANGES $ADD $DEL
 		;;
-	"crap")
+	"patches/crap")
 		nag_crap $ORIG_CODE $CHANGES $ADD $DEL
 		;;
 	*)
@@ -212,7 +212,7 @@ ENABLE_NETWORK=1
 ENABLE_DRM=1
 SUBSYSTEMS=
 
-EXTRA_PATCHES="patches"
+EXTRA_PATCHES="patches/collateral-evolutions"
 REFRESH="n"
 GET_STABLE_PENDING="n"
 POSTFIX_RELEASE_TAG=""
@@ -225,23 +225,23 @@ if [ $# -ge 1 ]; then
 		case $1 in
 			"-s")
 				GET_STABLE_PENDING="y"
-				EXTRA_PATCHES="${EXTRA_PATCHES} pending-stable"
-				EXTRA_PATCHES="${EXTRA_PATCHES} pending-stable/backports/"
+				EXTRA_PATCHES="${EXTRA_PATCHES} patches/pending-stable"
+				EXTRA_PATCHES="${EXTRA_PATCHES} patches/pending-stable/backports/"
 				POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}s"
 				shift
 				;;
 			"-n")
-				EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-cherry-picks"
+				EXTRA_PATCHES="${EXTRA_PATCHES} patches/linux-next-cherry-picks"
 				POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}n"
 				shift
 				;;
 			"-p")
-				EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-pending"
+				EXTRA_PATCHES="${EXTRA_PATCHES} patches/linux-next-pending"
 				POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}p"
 				shift
 				;;
 			"-c")
-				EXTRA_PATCHES="${EXTRA_PATCHES} crap"
+				EXTRA_PATCHES="${EXTRA_PATCHES} patches/crap"
 				POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}c"
 				shift
 				;;
-- 
2.30.2