[kernel] r19022 - in dists/trunk/linux-2.6/debian/patches: bugfix/all bugfix/arm bugfix/ia64 debian features/x86/hyperv series
Ben Hutchings
benh at alioth.debian.org
Mon May 21 12:21:50 UTC 2012
Author: benh
Date: Mon May 21 12:21:37 2012
New Revision: 19022
Log:
Drop/refresh patches for 3.4
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-Fix-missing-include-for-call-to-soft_restart-in-.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-Fix-missing-linux-types.h-inclusion-in-asm-hardw.patch
dists/trunk/linux-2.6/debian/patches/debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
dists/trunk/linux-2.6/debian/patches/features/x86/hyperv/
Modified:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch Mon May 21 12:06:54 2012 (r19021)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch Mon May 21 12:21:37 2012 (r19022)
@@ -5,6 +5,7 @@
This patch adds gpiolib support for the IXP4xx platform
Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
+[bwh: Forward-ported to 3.4]
---
arch/arm/Kconfig | 2 +-
arch/arm/mach-ixp4xx/common.c | 39 +++++++++++++++++++++++++
@@ -16,22 +17,22 @@
--- source_armel_none.orig/arch/arm/Kconfig 2012-01-07 20:47:15.000000000 +0100
+++ source_armel_none/arch/arm/Kconfig 2012-01-07 20:51:00.390593917 +0100
@@ -520,7 +520,7 @@ config ARCH_IXP4XX
- depends on MMU
+ select ARCH_HAS_DMA_SET_COHERENT_MASK
select CLKSRC_MMIO
select CPU_XSCALE
- select GENERIC_GPIO
+ select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
- select HAVE_SCHED_CLOCK
select MIGHT_HAVE_PCI
+ select NEED_MACH_IO_H
Index: source_armel_none/arch/arm/mach-ixp4xx/common.c
===================================================================
--- source_armel_none.orig/arch/arm/mach-ixp4xx/common.c 2012-01-07 20:47:15.000000000 +0100
+++ source_armel_none/arch/arm/mach-ixp4xx/common.c 2012-01-07 20:51:00.390593917 +0100
@@ -37,6 +37,7 @@
- #include <asm/page.h>
#include <asm/irq.h>
#include <asm/sched_clock.h>
+ #include <asm/system_misc.h>
+#include <asm/gpio.h>
#include <asm/mach/map.h>
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch Mon May 21 12:06:54 2012 (r19021)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch Mon May 21 12:21:37 2012 (r19022)
@@ -13,8 +13,6 @@
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
-diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
-index ca16399..5a85697 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -11,8 +11,8 @@ config DRM_NOUVEAU
@@ -25,11 +23,9 @@
- select MXM_WMI if ACPI
+ select ACPI_WMI if ACPI && X86
+ select MXM_WMI if ACPI && X86
+ select POWER_SUPPLY
help
Choose this option for open-source nVidia support.
-
-diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
-index 0583677..797b808 100644
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -37,6 +37,8 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
@@ -41,8 +37,6 @@
+endif
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
-index 9c56331..9ea5a17 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -968,7 +968,7 @@ extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
@@ -54,6 +48,3 @@
void nouveau_register_dsm_handler(void);
void nouveau_unregister_dsm_handler(void);
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
---
-1.7.5.3
-
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon May 21 12:06:54 2012 (r19021)
+++ dists/trunk/linux-2.6/debian/patches/series/base Mon May 21 12:21:37 2012 (r19022)
@@ -51,47 +51,3 @@
+ features/all/fs-hardlink-creation-restrictions.patch
+ features/all/fs-hardlink-creation-restrictions-fix.patch
+ features/all/fs-hardlink-creation-restriction-cleanup.patch
-
-# Temporary, until the original change has been tested some more
-+ debian/revert-CIFS-Respect-negotiated-MaxMpxCount.patch
-
-+ bugfix/arm/ARM-Fix-missing-linux-types.h-inclusion-in-asm-hardw.patch
-+ bugfix/arm/ARM-Fix-missing-include-for-call-to-soft_restart-in-.patch
-
-# Update all Hyper-V drivers to 3.4-rc1 (no longer staging)
-+ features/x86/hyperv/0043-drivers-hv-kvp-Add-cleanup-connector-defines.patch
-+ features/x86/hyperv/0044-drivers-hv-kvp-Move-the-contents-of-hv_kvp.h-to-hype.patch
-+ features/x86/hyperv/0045-net-hyperv-Convert-camel-cased-variables-in-rndis_fi.patch
-+ features/x86/hyperv/0046-net-hyperv-Correct-the-assignment-in-netvsc_recv_cal.patch
-+ features/x86/hyperv/0047-net-hyperv-Remove-the-unnecessary-memset-in-rndis_fi.patch
-+ features/x86/hyperv/0048-Staging-hv-storvsc-Cleanup-some-comments.patch
-+ features/x86/hyperv/0049-Staging-hv-storvsc-Cleanup-storvsc_probe.patch
-+ features/x86/hyperv/0050-Staging-hv-storvsc-Cleanup-storvsc_queuecommand.patch
-+ features/x86/hyperv/0051-Staging-hv-storvsc-Introduce-defines-for-srb-status-.patch
-+ features/x86/hyperv/0052-Staging-hv-storvsc-Cleanup-storvsc_host_reset_handle.patch
-+ features/x86/hyperv/0053-Staging-hv-storvsc-Move-and-cleanup-storvsc_remove.patch
-+ features/x86/hyperv/0054-Staging-hv-storvsc-Add-a-comment-to-explain-life-cyc.patch
-+ features/x86/hyperv/0055-Staging-hv-storvsc-Get-rid-of-the-on_io_completion-i.patch
-+ features/x86/hyperv/0056-Staging-hv-storvsc-Rename-the-context-field-in-hv_st.patch
-+ features/x86/hyperv/0057-Staging-hv-storvsc-Miscellaneous-cleanup-of-storvsc-.patch
-+ features/x86/hyperv/0058-Staging-hv-storvsc-Cleanup-the-code-for-generating-p.patch
-+ features/x86/hyperv/0059-Staging-hv-storvsc-Cleanup-some-protocol-related-con.patch
-+ features/x86/hyperv/0060-Staging-hv-storvsc-Get-rid-of-some-unused-defines.patch
-+ features/x86/hyperv/0061-Staging-hv-storvsc-Consolidate-the-request-structure.patch
-+ features/x86/hyperv/0062-Staging-hv-storvsc-Consolidate-all-the-wire-protocol.patch
-+ features/x86/hyperv/0063-drivers-hv-Cleanup-the-kvp-related-state-in-hyperv.h.patch
-+ features/x86/hyperv/0064-tools-hv-Use-hyperv.h-to-get-the-KVP-definitions.patch
-+ features/x86/hyperv/0065-drivers-hv-kvp-Cleanup-the-kernel-user-protocol.patch
-+ features/x86/hyperv/0066-drivers-hv-Increase-the-number-of-VCPUs-supported-in.patch
-+ features/x86/hyperv/0067-Staging-hv-storvsc-Move-the-storage-driver-out-of-th.patch
-+ features/x86/hyperv/0069-net-hyperv-Fix-data-corruption-in-rndis_filter_recei.patch
-+ features/x86/hyperv/0070-net-hyperv-Add-support-for-vlan-trunking-from-guests.patch
-+ features/x86/hyperv/0071-Drivers-hv-Add-new-message-types-to-enhance-KVP.patch
-+ features/x86/hyperv/0073-Drivers-hv-Support-the-newly-introduced-KVP-messages.patch
-+ features/x86/hyperv/0074-Tools-hv-Fully-support-the-new-KVP-verbs-in-the-user.patch
-+ features/x86/hyperv/0075-Tools-hv-Support-enumeration-from-all-the-pools.patch
-+ features/x86/hyperv/0076-net-hyperv-Fix-the-code-handling-tx-busy.patch
-+ features/x86/hyperv/0077-hv-remove-the-second-argument-of-k-un-map_atomic.patch
-
-+ bugfix/all/brcmsmac-INTERMEDIATE-but-not-AMPDU-only-when-tracin.patch
-+ bugfix/all/NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
More information about the Kernel-svn-changes
mailing list