compat-drivers: Move around patches and selectively apply them
PATCH 1/2 compat-drivers: Move around patches and selectively apply them
Put wlan/bt/eth related patches under network/ subdirectories. Apply them only if the network subsystem is enabled (For now, it is enabled by default).
Create empty network/ placeholders under patch directories.
Signed-off-by Ozan Çağlayan <[email protected]>
---
The patch is too big for this mailing list. The link to the patch is:
http://ozancaglayan.com/files/compat/0001-compat-drivers-Move-around-patches-and-selectively-a.patch
...-QCA-ethernet-driver-which-supercedes-atl.patch | 13498 ------------------- crap/0002-backport-alx.patch | 133 - crap/0003-remove-atl1c-devices-from-alx.patch | 19 - ...s-adds-the-802.11ad-60-GHz-wil6210-driver.patch | 5757 -------- ...-QCA-ethernet-driver-which-supercedes-atl.patch | 13498 +++++++++++++++++++ crap/network/0002-backport-alx.patch | 133 + .../0003-remove-atl1c-devices-from-alx.patch | 19 + ...s-adds-the-802.11ad-60-GHz-wil6210-driver.patch | 5757 ++++++++ patches/0001-netdev_ops.patch | 279 - patches/0002-net-misc.patch | 68 - patches/0003-netdev-needed_headroom_tailroom.patch | 36 - patches/0004-wext-namespace.patch | 58 - patches/02-ksize.patch | 69 - patches/03-rfkill.patch | 66 - patches/04-netns.patch | 149 - patches/05-usb.patch | 26 - patches/06-header-changes.patch | 117 - patches/07-change-default-rate-alg.patch | 34 - patches/08-rename-config-options.patch | 167 - patches/09-cfg80211-wext-padding.patch | 62 - patches/09-threaded-irq.patch | 129 - patches/10-add-wext-handlers-to-netdev.patch | 47 - patches/11-dev-pm-ops.patch | 396 - patches/12-iw_handler-changes.patch | 14 - patches/12-mac80211-disable-tx-status.patch | 24 - patches/14-device-type.patch | 56 - patches/15-symbol-export-conflicts.patch | 18 - patches/16-bluetooth.patch | 576 - patches/17-netdev-queue.patch | 47 - patches/18-rename-usb-net-symbols.patch | 53 - patches/21-capi-proc_fops.patch | 73 - patches/22-multiqueue.patch | 43 - patches/24-pcmcia.patch | 1414 -- patches/25-multicast-list_head.patch | 820 -- patches/26-sdio-quirks.patch | 32 - patches/27-hermes-read-pda-conflict.patch | 56 - patches/29-sdio_no_suspend.patch | 199 - patches/30-bridge-port.patch | 45 - patches/32-remove-ns-type.patch | 28 - patches/35-fix-makefile-includes.patch | 71 - patches/36-workqueue.patch | 16 - patches/37-vsnprintk.patch | 35 - patches/38-led-max-brightness.patch | 24 - patches/39-remove_blink_set.patch | 56 - patches/40-netdev-hw-features.patch | 372 - patches/42-netlink_seq.patch | 12 - patches/43-rename_pm_qos_request.patch | 14 - patches/44-deactivate-mac80211-tracing.patch | 15 - patches/45-remove-platform-id-table.patch | 23 - patches/46-use_other_workqueue.patch | 19 - patches/47-no_trans_start_on_netdev_queue.patch | 17 - patches/48-use_skb_get_queue_mapping.patch | 38 - patches/50-libertas-olpc-ec-wakeup.patch | 23 - patches/52-tty-dev.patch | 32 - patches/53-pr_fmt.patch | 821 -- patches/54-get_ts_info.patch | 39 - patches/55-iwlwifi-msg-trace-fix.patch | 70 - patches/56-mac80211-trace-fix.patch | 79 - patches/57-iwlwifi-debug-fix.patch | 19 - patches/61-netdev-addr_assign_type.patch | 53 - patches/62-usb_driver_lpm.patch | 276 - patches/63-tty-termios.patch | 49 - patches/64-b44-32bit-stats.patch | 54 - patches/65-ignore-dismantle.patch | 23 - patches/99-change-makefiles.patch | 100 - patches/network/0001-netdev_ops.patch | 279 + patches/network/0002-net-misc.patch | 68 + .../0003-netdev-needed_headroom_tailroom.patch | 36 + patches/network/0004-wext-namespace.patch | 58 + patches/network/02-ksize.patch | 69 + patches/network/03-rfkill.patch | 66 + patches/network/04-netns.patch | 149 + patches/network/05-usb.patch | 26 + patches/network/06-header-changes.patch | 117 + patches/network/07-change-default-rate-alg.patch | 34 + patches/network/08-rename-config-options.patch | 167 + patches/network/09-cfg80211-wext-padding.patch | 62 + patches/network/09-threaded-irq.patch | 129 + .../network/10-add-wext-handlers-to-netdev.patch | 47 + patches/network/11-dev-pm-ops.patch | 396 + patches/network/12-iw_handler-changes.patch | 14 + .../network/12-mac80211-disable-tx-status.patch | 24 + patches/network/14-device-type.patch | 56 + patches/network/15-symbol-export-conflicts.patch | 18 + patches/network/16-bluetooth.patch | 576 + patches/network/17-netdev-queue.patch | 47 + patches/network/18-rename-usb-net-symbols.patch | 53 + patches/network/21-capi-proc_fops.patch | 73 + patches/network/22-multiqueue.patch | 43 + patches/network/24-pcmcia.patch | 1414 ++ patches/network/25-multicast-list_head.patch | 820 ++ patches/network/26-sdio-quirks.patch | 32 + patches/network/27-hermes-read-pda-conflict.patch | 56 + patches/network/29-sdio_no_suspend.patch | 199 + patches/network/30-bridge-port.patch | 45 + patches/network/32-remove-ns-type.patch | 28 + patches/network/35-fix-makefile-includes.patch | 71 + patches/network/36-workqueue.patch | 16 + patches/network/37-vsnprintk.patch | 35 + patches/network/38-led-max-brightness.patch | 24 + patches/network/39-remove_blink_set.patch | 56 + patches/network/40-netdev-hw-features.patch | 372 + patches/network/42-netlink_seq.patch | 12 + patches/network/43-rename_pm_qos_request.patch | 14 + .../network/44-deactivate-mac80211-tracing.patch | 15 + patches/network/45-remove-platform-id-table.patch | 23 + patches/network/46-use_other_workqueue.patch | 19 + .../47-no_trans_start_on_netdev_queue.patch | 17 + patches/network/48-use_skb_get_queue_mapping.patch | 38 + patches/network/50-libertas-olpc-ec-wakeup.patch | 23 + patches/network/52-tty-dev.patch | 32 + patches/network/53-pr_fmt.patch | 821 ++ patches/network/54-get_ts_info.patch | 39 + patches/network/55-iwlwifi-msg-trace-fix.patch | 70 + patches/network/56-mac80211-trace-fix.patch | 79 + patches/network/57-iwlwifi-debug-fix.patch | 19 + patches/network/61-netdev-addr_assign_type.patch | 53 + patches/network/62-usb_driver_lpm.patch | 276 + patches/network/63-tty-termios.patch | 49 + patches/network/64-b44-32bit-stats.patch | 54 + patches/network/65-ignore-dismantle.patch | 23 + patches/network/99-change-makefiles.patch | 100 + scripts/admin-update.sh | 63 +- 123 files changed, 26997 insertions(+), 26982 deletions(-) delete mode 100644 crap/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch delete mode 100644 crap/0002-backport-alx.patch delete mode 100644 crap/0003-remove-atl1c-devices-from-alx.patch delete mode 100644 crap/0004-wireless-adds-the-802.11ad-60-GHz-wil6210-driver.patch create mode 100644 crap/network/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch create mode 100644 crap/network/0002-backport-alx.patch create mode 100644 crap/network/0003-remove-atl1c-devices-from-alx.patch create mode 100644 crap/network/0004-wireless-adds-the-802.11ad-60-GHz-wil6210-driver.patch create mode 100644 linux-next-cherry-picks/network/.gitignore create mode 100644 linux-next-pending/network/.gitignore delete mode 100644 patches/0001-netdev_ops.patch delete mode 100644 patches/0002-net-misc.patch delete mode 100644 patches/0003-netdev-needed_headroom_tailroom.patch delete mode 100644 patches/0004-wext-namespace.patch delete mode 100644 patches/02-ksize.patch delete mode 100644 patches/03-rfkill.patch delete mode 100644 patches/04-netns.patch delete mode 100644 patches/05-usb.patch delete mode 100644 patches/06-header-changes.patch delete mode 100644 patches/07-change-default-rate-alg.patch delete mode 100644 patches/08-rename-config-options.patch delete mode 100644 patches/09-cfg80211-wext-padding.patch delete mode 100644 patches/09-threaded-irq.patch delete mode 100644 patches/10-add-wext-handlers-to-netdev.patch delete mode 100644 patches/11-dev-pm-ops.patch delete mode 100644 patches/12-iw_handler-changes.patch delete mode 100644 patches/12-mac80211-disable-tx-status.patch delete mode 100644 patches/14-device-type.patch delete mode 100644 patches/15-symbol-export-conflicts.patch delete mode 100644 patches/16-bluetooth.patch delete mode 100644 patches/17-netdev-queue.patch delete mode 100644 patches/18-rename-usb-net-symbols.patch delete mode 100644 patches/21-capi-proc_fops.patch delete mode 100644 patches/22-multiqueue.patch delete mode 100644 patches/24-pcmcia.patch delete mode 100644 patches/25-multicast-list_head.patch delete mode 100644 patches/26-sdio-quirks.patch delete mode 100644 patches/27-hermes-read-pda-conflict.patch delete mode 100644 patches/29-sdio_no_suspend.patch delete mode 100644 patches/30-bridge-port.patch delete mode 100644 patches/32-remove-ns-type.patch delete mode 100644 patches/35-fix-makefile-includes.patch delete mode 100644 patches/36-workqueue.patch delete mode 100644 patches/37-vsnprintk.patch delete mode 100644 patches/38-led-max-brightness.patch delete mode 100644 patches/39-remove_blink_set.patch delete mode 100644 patches/40-netdev-hw-features.patch delete mode 100644 patches/42-netlink_seq.patch delete mode 100644 patches/43-rename_pm_qos_request.patch delete mode 100644 patches/44-deactivate-mac80211-tracing.patch delete mode 100644 patches/45-remove-platform-id-table.patch delete mode 100644 patches/46-use_other_workqueue.patch delete mode 100644 patches/47-no_trans_start_on_netdev_queue.patch delete mode 100644 patches/48-use_skb_get_queue_mapping.patch delete mode 100644 patches/50-libertas-olpc-ec-wakeup.patch delete mode 100644 patches/52-tty-dev.patch delete mode 100644 patches/53-pr_fmt.patch delete mode 100644 patches/54-get_ts_info.patch delete mode 100644 patches/55-iwlwifi-msg-trace-fix.patch delete mode 100644 patches/56-mac80211-trace-fix.patch delete mode 100644 patches/57-iwlwifi-debug-fix.patch delete mode 100644 patches/61-netdev-addr_assign_type.patch delete mode 100644 patches/62-usb_driver_lpm.patch delete mode 100644 patches/63-tty-termios.patch delete mode 100644 patches/64-b44-32bit-stats.patch delete mode 100644 patches/65-ignore-dismantle.patch delete mode 100644 patches/99-change-makefiles.patch create mode 100644 patches/network/0001-netdev_ops.patch create mode 100644 patches/network/0002-net-misc.patch create mode 100644 patches/network/0003-netdev-needed_headroom_tailroom.patch create mode 100644 patches/network/0004-wext-namespace.patch create mode 100644 patches/network/02-ksize.patch create mode 100644 patches/network/03-rfkill.patch create mode 100644 patches/network/04-netns.patch create mode 100644 patches/network/05-usb.patch create mode 100644 patches/network/06-header-changes.patch create mode 100644 patches/network/07-change-default-rate-alg.patch create mode 100644 patches/network/08-rename-config-options.patch create mode 100644 patches/network/09-cfg80211-wext-padding.patch create mode 100644 patches/network/09-threaded-irq.patch create mode 100644 patches/network/10-add-wext-handlers-to-netdev.patch create mode 100644 patches/network/11-dev-pm-ops.patch create mode 100644 patches/network/12-iw_handler-changes.patch create mode 100644 patches/network/12-mac80211-disable-tx-status.patch create mode 100644 patches/network/14-device-type.patch create mode 100644 patches/network/15-symbol-export-conflicts.patch create mode 100644 patches/network/16-bluetooth.patch create mode 100644 patches/network/17-netdev-queue.patch create mode 100644 patches/network/18-rename-usb-net-symbols.patch create mode 100644 patches/network/21-capi-proc_fops.patch create mode 100644 patches/network/22-multiqueue.patch create mode 100644 patches/network/24-pcmcia.patch create mode 100644 patches/network/25-multicast-list_head.patch create mode 100644 patches/network/26-sdio-quirks.patch create mode 100644 patches/network/27-hermes-read-pda-conflict.patch create mode 100644 patches/network/29-sdio_no_suspend.patch create mode 100644 patches/network/30-bridge-port.patch create mode 100644 patches/network/32-remove-ns-type.patch create mode 100644 patches/network/35-fix-makefile-includes.patch create mode 100644 patches/network/36-workqueue.patch create mode 100644 patches/network/37-vsnprintk.patch create mode 100644 patches/network/38-led-max-brightness.patch create mode 100644 patches/network/39-remove_blink_set.patch create mode 100644 patches/network/40-netdev-hw-features.patch create mode 100644 patches/network/42-netlink_seq.patch create mode 100644 patches/network/43-rename_pm_qos_request.patch create mode 100644 patches/network/44-deactivate-mac80211-tracing.patch create mode 100644 patches/network/45-remove-platform-id-table.patch create mode 100644 patches/network/46-use_other_workqueue.patch create mode 100644 patches/network/47-no_trans_start_on_netdev_queue.patch create mode 100644 patches/network/48-use_skb_get_queue_mapping.patch create mode 100644 patches/network/50-libertas-olpc-ec-wakeup.patch create mode 100644 patches/network/52-tty-dev.patch create mode 100644 patches/network/53-pr_fmt.patch create mode 100644 patches/network/54-get_ts_info.patch create mode 100644 patches/network/55-iwlwifi-msg-trace-fix.patch create mode 100644 patches/network/56-mac80211-trace-fix.patch create mode 100644 patches/network/57-iwlwifi-debug-fix.patch create mode 100644 patches/network/61-netdev-addr_assign_type.patch create mode 100644 patches/network/62-usb_driver_lpm.patch create mode 100644 patches/network/63-tty-termios.patch create mode 100644 patches/network/64-b44-32bit-stats.patch create mode 100644 patches/network/65-ignore-dismantle.patch create mode 100644 patches/network/99-change-makefiles.patch create mode 100644 pending-stable/network/.gitignore
Signature · 1 line
1.7.11.2
PATCH 2/2 compat-drivers: Add DRM patches
These patches are part of the GSoC project for backporting the DRM drivers onto older kernels.
Merge them into the compat-drivers tree.
Signed-off-by Ozan Çağlayan <[email protected]>
--- patches/drm/01-dma_buf_ops-addition.patch | 54 +++ patches/drm/02-revert-vm_mmap.patch | 100 ++++++ patches/drm/03-swiotlb.patch | 87 +++++ patches/drm/04-revert-prime-support.patch | 384 ++++++++++++++++++++++ patches/drm/05-i915-define-acpi-video-class.patch | 18 + patches/drm/98-pr_fmt.patch | 199 +++++++++++ patches/drm/99-change-makefile.patch | 28 ++ 7 files changed, 870 insertions(+) create mode 100644 patches/drm/01-dma_buf_ops-addition.patch create mode 100644 patches/drm/02-revert-vm_mmap.patch create mode 100644 patches/drm/03-swiotlb.patch create mode 100644 patches/drm/04-revert-prime-support.patch create mode 100644 patches/drm/05-i915-define-acpi-video-class.patch create mode 100644 patches/drm/98-pr_fmt.patch create mode 100644 patches/drm/99-change-makefile.patch
patches/drm/01-dma_buf_ops-addition.patch new file +54 -0
@@ -0,0 +1,54 @@ +Assign vmap, vunmap and mmap fields in dma_buf_ops structs only +if kernel version >= 3.5.0 as they are added in 3.5. + +Note that the dma-buf itself was added with 3.4. It is not available +on kernels < 3.4. + +Index: compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c +=================================================================== +--- compat-drm.orig/drivers/gpu/drm/i915/i915_gem_dmabuf.c ++++ compat-drm/drivers/gpu/drm/i915/i915_gem_dmabuf.c +@@ -159,9 +159,11 @@ static const struct dma_buf_ops i915_dma + .kmap_atomic = i915_gem_dmabuf_kmap_atomic, + .kunmap = i915_gem_dmabuf_kunmap, + .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .mmap = i915_gem_dmabuf_mmap, + .vmap = i915_gem_dmabuf_vmap, + .vunmap = i915_gem_dmabuf_vunmap, ++#endif + }; + + struct dma_buf *i915_gem_prime_export(struct drm_device *dev, +Index: compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c +=================================================================== +--- compat-drm.orig/drivers/gpu/drm/nouveau/nouveau_prime.c ++++ compat-drm/drivers/gpu/drm/nouveau/nouveau_prime.c +@@ -111,9 +111,11 @@ static const struct dma_buf_ops nouveau_ + .kmap_atomic = nouveau_gem_kmap_atomic, + .kunmap = nouveau_gem_kunmap, + .kunmap_atomic = nouveau_gem_kunmap_atomic, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .mmap = nouveau_gem_prime_mmap, + .vmap = nouveau_gem_prime_vmap, + .vunmap = nouveau_gem_prime_vunmap, ++#endif + }; + + static int +Index: compat-drm/drivers/gpu/drm/radeon/radeon_prime.c +=================================================================== +--- compat-drm.orig/drivers/gpu/drm/radeon/radeon_prime.c ++++ compat-drm/drivers/gpu/drm/radeon/radeon_prime.c +@@ -134,9 +134,11 @@ const static struct dma_buf_ops radeon_d + .kmap_atomic = radeon_gem_kmap_atomic, + .kunmap = radeon_gem_kunmap, + .kunmap_atomic = radeon_gem_kunmap_atomic, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .mmap = radeon_gem_prime_mmap, + .vmap = radeon_gem_prime_vmap, + .vunmap = radeon_gem_prime_vunmap, ++#endif + }; + + static int radeon_prime_create(struct drm_device *dev,
patches/drm/02-revert-vm_mmap.patch new file +100 -0
100 lines not on this page · raw message
patches/drm/03-swiotlb.patch new file +87 -0
87 lines not on this page · raw message
patches/drm/04-revert-prime-support.patch new file +384 -0
384 lines not on this page · raw message
patches/drm/05-i915-define-acpi-video-class.patch new file +18 -0
@@ -0,0 +1,18 @@ +The definition of ACPI_VIDEO_CLASS was moved from video.c +to video.h in 3.1. Define it here to fix build for kernels older +than 3.1. + +Index: compat-drm/drivers/gpu/drm/i915/intel_opregion.c +=================================================================== +--- compat-drm.orig/drivers/gpu/drm/i915/intel_opregion.c ++++ compat-drm/drivers/gpu/drm/i915/intel_opregion.c +@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st + struct acpi_bus_event *event = data; + int ret = NOTIFY_OK; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) ++#define ACPI_VIDEO_CLASS "video" ++#endif + if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0) + return NOTIFY_DONE; +
patches/drm/98-pr_fmt.patch new file +199 -0
199 lines not on this page · raw message
patches/drm/99-change-makefile.patch new file +28 -0
@@ -0,0 +1,28 @@ +Remove drivers that we do not want to build from gpu/drm/Makefile + +Index: compat-drm/drivers/gpu/drm/Makefile +=================================================================== +--- compat-drm.orig/drivers/gpu/drm/Makefile ++++ compat-drm/drivers/gpu/drm/Makefile +@@ -28,21 +28,14 @@ CFLAGS_drm_trace_points.o := -I$(src) + obj-$(CONFIG_DRM) += drm.o + obj-$(CONFIG_DRM_USB) += drm_usb.o + obj-$(CONFIG_DRM_TTM) += ttm/ +-obj-$(CONFIG_DRM_TDFX) += tdfx/ +-obj-$(CONFIG_DRM_R128) += r128/ + obj-$(CONFIG_DRM_RADEON)+= radeon/ +-obj-$(CONFIG_DRM_MGA) += mga/ + obj-$(CONFIG_DRM_I810) += i810/ + obj-$(CONFIG_DRM_I915) += i915/ + obj-$(CONFIG_DRM_MGAG200) += mgag200/ + obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/ +-obj-$(CONFIG_DRM_SIS) += sis/ +-obj-$(CONFIG_DRM_SAVAGE)+= savage/ + obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ + obj-$(CONFIG_DRM_VIA) +=via/ + obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ +-obj-$(CONFIG_DRM_EXYNOS) +=exynos/ + obj-$(CONFIG_DRM_GMA500) += gma500/ +-obj-$(CONFIG_DRM_UDL) += udl/ + obj-$(CONFIG_DRM_AST) += ast/ + obj-y += i2c/
Signature · 1 line
1.7.11.2
Quoted 2 lines · On Fri, Aug 17, 2012 at 12:26 PM, Ozan =C3=87a=C4=9Flayan <[email protected]=…
Put wlan/bt/eth related patches under network/ subdirectories. Apply them only if the network subsystem is enabled (For now, it is enabled by defau=
lt).
Quoted 8 lines
Create empty network/ placeholders under patch directories.
Signed-off-by Ozan =C3=87a=C4=9Flayan <[email protected]>---
The patch is too big for this mailing list. The link to the patch is:
http://ozancaglayan.com/files/compat/0001-compat-drivers-Move-around-pa=
tches-and-selectively-a.patch
Thanks! However the pending patches do not apply starting with:
[PATCH 1/2 v2] compat-drivers: Add ability to select drivers to fetch
Can you respin your pending set but also use git format-patch -M option but first attach this to your $HOME/.gitconfig :
[diff]
renamelimit=3D0
Luis
Quoted 4 lines
Thanks! However the pending patches do not apply starting with:
[PATCH 1/2 v2] compat-drivers: Add ability to select drivers to fetch
There was 1 more patch before that I think you missed that. I'm resending with -M + renamelimit thinks set. Thanks.
--=20
Ozan =C3=87a=C4=9Flayan