[kernel] r16799 - in dists/sid/linux-2.6/debian/patches: bugfix/all bugfix/arm bugfix/ia64 bugfix/m68k bugfix/mips bugfix/sparc bugfix/x86 features/all features/all/mantis features/all/udlfb features/arm features/powerpc features/sparc features/x86
Ben Hutchings
benh at alioth.debian.org
Sun Jan 9 21:17:29 UTC 2011
Author: benh
Date: Sun Jan 9 21:17:20 2011
New Revision: 16799
Log:
Fix patch formatting and references
Use upstream commit messages and refer to upstream commit hash
wherever possible (using the same format as gregkh).
Remove gitweb and mailing list headers.
Push backporting credit/blame up to Signed-off-by (etc.) lines.
Use consistent separator '---' between header and body of diff.
Modified:
dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Fix-deadlock-in-vortex_error.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3875.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3876.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3877.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3880.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4250.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4342.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/Fix-flush_old_exec-setup_new_exec-split.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-Fix-hardware-type-check-for-enabling-OTP-CLK.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/atl1e-remove-broken-tsov6.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/block-blk_abort_request-lock-fix.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-dont-select-lgs8gl5.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-select-lgs8gxx.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-the-HDTV-hack-sync-adjustment.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-disable-powersave.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-give-up-on-8xx-lid-status.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-set-DIDL-using-the-ACPI-video-output-device.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-segfault-in-r600_ioctl_ioctl_wait_idle.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/e1000-enhance-fragment-detection.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-fragment-detection.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ipath-Fix-probe-failure-path.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ipc_initialize_structure_memory_to_zero.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/libiscsi-regression-fix-header-digest-errors.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/modules-Skip-empty-section-notes.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/net-Limit-socket-I-O-iovec-total-length-to-INT_MAX.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/net-r8169-improved-rx-length-check-errors.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/net-rds-remove-kmap_atomic-optimization.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/net-socket-limit-sendto-recvfrom-length.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/radeon_block_ability_userspace_app.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/sched-fix-over-scheduling-bug.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ssb-Handle-alternate-SSPROM-location.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom-fix.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-fix-ICMP-RTO-war.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie-restrict.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-dest-sglist-diff.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-exec-code-via-func-pointers.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-fix-compiler-warning.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-generic-async-requests.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-invoke-softirq-context.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-make-copy-back-optional.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-process-data-previous-requests.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-rename-variable.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-sha1-async-drivers.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-src-sglist-more.patch
dists/sid/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch
dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-crash-when-gcore-reads-gate-area.patch
dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-5da3a65d2d1ba333d61999640ef241f150c69c6b.patch
dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-9674cdc74d63f346870943ef966a034f8c71ee57.patch
dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch
dists/sid/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch
dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-DMA-computation-fix.patch
dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch
dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/HPET-unmap-unused-I-O-space.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-add-hotplug_disable-parameter.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-cpu-speed-control-on-EeePC-701.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1005PE.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1201N.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-dmi-blacklist-to-disable-pci-hotplug.patch
dists/sid/linux-2.6/debian/patches/bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch
dists/sid/linux-2.6/debian/patches/features/all/add-basic-xvr1000-framebuffer-driver.patch
dists/sid/linux-2.6/debian/patches/features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
dists/sid/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
dists/sid/linux-2.6/debian/patches/features/all/lgs8gxx-lgs8g75-request_firmware.patch
dists/sid/linux-2.6/debian/patches/features/all/m25p80-add-support-mx25l8005.patch
dists/sid/linux-2.6/debian/patches/features/all/mantis/0119-Mantis-hopper-use-MODULE_DEVICE_TABLE-use-the-macro-.patch
dists/sid/linux-2.6/debian/patches/features/all/mantis/0121-V4L-DVB-mantis-Select-correct-frontends.patch
dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch
dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware.patch
dists/sid/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-dpms.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-slab.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add_dynamic_modeset_support.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-backup-edid-write.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-big-endian-fix.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-cleanup.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-style.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-cleanup-function-naming.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-coding-style.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-enhance-edid.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-explicit-warnings-and-deps.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fbdev-char.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fix-incorrect-fb_defio-implementation.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-improve-rendering-performance.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-minor-cleanups.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-module-options.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-preallocated-urb-list-helpers.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-printk-cleanup.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-remove-metrics_misc.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-reorg-function-order.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-revamp-reference-handling.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-rework-startup.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-support-fbdev-mmap-clients.patch
dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-sysfs-expose-metrics.patch
dists/sid/linux-2.6/debian/patches/features/all/xgifb-driver.patch
dists/sid/linux-2.6/debian/patches/features/arm/arm-add-pci_sys_data.patch
dists/sid/linux-2.6/debian/patches/features/arm/compression-add-lzmo.patch
dists/sid/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-a1-powerled.patch
dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-b1-poweroff.patch
dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-c1-add-support.patch
dists/sid/linux-2.6/debian/patches/features/arm/dns323-select-phylib.patch
dists/sid/linux-2.6/debian/patches/features/arm/dockstar-support.patch
dists/sid/linux-2.6/debian/patches/features/arm/early-printk.patch
dists/sid/linux-2.6/debian/patches/features/arm/guruplug.patch
dists/sid/linux-2.6/debian/patches/features/arm/hp-t5325.patch
dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-88f6282-support.patch
dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-pcie1.patch
dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-f6192-f6180-add-a1-rev.patch
dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-factorize-pcie-init-code
dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-add-slab.patch
dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-blink-set.patch
dists/sid/linux-2.6/debian/patches/features/arm/marvell-phy-expose-ids.patch
dists/sid/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch
dists/sid/linux-2.6/debian/patches/features/arm/openrd-combine.patch
dists/sid/linux-2.6/debian/patches/features/arm/openrd-uart-selection.patch
dists/sid/linux-2.6/debian/patches/features/arm/openrd-ultimate.patch
dists/sid/linux-2.6/debian/patches/features/arm/orion-add-rnb-line-support.patch
dists/sid/linux-2.6/debian/patches/features/arm/orion-allow-rnb-callback
dists/sid/linux-2.6/debian/patches/features/arm/orion5x-fix-soft-reset.patch
dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-board.patch
dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-mpp.patch
dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-sata.patch
dists/sid/linux-2.6/debian/patches/features/arm/ts-plus.patch
dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp36.patch
dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp44.patch
dists/sid/linux-2.6/debian/patches/features/arm/ts41x-export-jp1.patch
dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch
dists/sid/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
dists/sid/linux-2.6/debian/patches/features/x86/iTCO_wdt-Add-support-for-Intel-Ibex-Peak.patch
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Fix-deadlock-in-vortex_error.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Fix-deadlock-in-vortex_error.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/3c59x-Fix-deadlock-in-vortex_error.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Sat, 4 Sep 2010 01:51:50 +0100
Subject: [PATCH] 3c59x: Fix deadlock in vortex_error()
+commit 89b12faba4f3441c9457c5278851e8a93ffd008d upstream.
+
This fixes a bug introduced in commit
de847272149365363a6043a963a6f42fb91566e2
"3c59x: Use fine-grained locks for MII and windowed register access".
@@ -17,6 +19,10 @@
call vortex_rx(), which *does* require its caller to hold window_lock,
lift that call up into vortex_interrupt(). This also removes the
potential for calling vortex_rx() on a later-generation NIC.
+
+Reported-and-tested-by: Jens Schüßler <jgs at trash.net> [in Debian's 2.6.32]
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
drivers/net/3c59x.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,8 +2,11 @@
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 12 Sep 2010 02:41:47 +0100
+commit a254dba37c5a372fc8b44ba29509ba052d4e859d upstream.
+
Reported-by: Carmen Cru <carmen.cru at belgacom.net>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
sound/synth/emux/emux_hwdep.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3875.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3875.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3875.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From fe10ae53384e48c51996941b7720ee16995cbcb7 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon at gmail.com>
Date: Wed, 10 Nov 2010 10:14:33 -0800
Subject: [PATCH] net: ax25: fix information leak to userland
+commit fe10ae53384e48c51996941b7720ee16995cbcb7 upstream.
+
Sometimes ax25_getname() doesn't initialize all members of fsa_digipeater
field of fsa struct, also the struct has padding bytes between
sax25_call and sax25_ndigis fields. This structure is then copied to
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3876.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3876.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3876.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 67286640f638f5ad41a946b9a3dc75327950248f Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon at gmail.com>
Date: Wed, 10 Nov 2010 12:09:10 -0800
Subject: [PATCH] net: packet: fix information leak to userland
+commit 67286640f638f5ad41a946b9a3dc75327950248f upstream.
+
packet_getname_spkt() doesn't initialize all members of sa_data field of
sockaddr struct if strlen(dev->name) < 13. This structure is then copied
to userland. It leads to leaking of contents of kernel stack memory.
@@ -13,12 +14,10 @@
Signed-off-by: Vasiliy Kulikov <segooon at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
-
-[ Backported to 2.6.32 ]
-
-diff -Naur source.orig/net/packet/af_packet.c source/net/packet/af_packet.c
---- source.orig/net/packet/af_packet.c 2011-01-05 11:28:10.155451000 +0100
-+++ source/net/packet/af_packet.c 2011-01-05 13:53:41.706449450 +0100
+[jmm: Backported to 2.6.32]
+---
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
@@ -1526,7 +1526,7 @@
uaddr->sa_family = AF_PACKET;
dev = dev_get_by_index(sock_net(sk), pkt_sk(sk)->ifindex);
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3877.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3877.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3877.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 88f8a5e3e7defccd3925cabb1ee4d3994e5cdb52 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon at gmail.com>
Date: Sun, 31 Oct 2010 07:10:32 +0000
Subject: [PATCH] net: tipc: fix information leak to userland
+commit 88f8a5e3e7defccd3925cabb1ee4d3994e5cdb52 upstream.
+
Structure sockaddr_tipc is copied to userland with padding bytes after
"id" field in union field "name" unitialized. It leads to leaking of
contents of kernel stack memory. We have to initialize them to zero.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3880.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3880.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-3880.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 22e76c849d505d87c5ecf3d3e6742a65f0ff4860 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage at ksplice.com>
Date: Wed, 3 Nov 2010 16:35:41 +0000
Subject: [PATCH] inet_diag: Make sure we actually run the same bytecode we audited.
+commit 22e76c849d505d87c5ecf3d3e6742a65f0ff4860 upstream.
+
We were using nlmsg_find_attr() to look up the bytecode by attribute when
auditing, but then just using the first attribute when actually running
bytecode. So, if we received a message with two attribute elements, where only
@@ -14,12 +15,10 @@
Signed-off-by: Nelson Elhage <nelhage at ksplice.com>
Signed-off-by: Thomas Graf <tgraf at infradead.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
-
-[Slightly adapted to apply against 2.6.32]
-
-diff -aur source.orig/net/ipv4/inet_diag.c source/net/ipv4/inet_diag.c
---- source.orig/net/ipv4/inet_diag.c 2009-12-03 04:51:21.000000000 +0100
-+++ source/net/ipv4/inet_diag.c 2011-01-05 11:50:52.522449113 +0100
+[jmm: Slightly adapted to apply against 2.6.32]
+---
+--- a/net/ipv4/inet_diag.c
++++ b/net/ipv4/inet_diag.c
@@ -489,9 +489,11 @@
{
struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
@@ -98,4 +97,3 @@
continue;
}
-Nur in source/net/ipv4: inet_diag.c~.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4250.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4250.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4250.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From a2ae4cc9a16e211c8a128ba10d22a85431f093ab Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis at redhat.com>
Date: Tue, 23 Nov 2010 18:18:37 -0500
Subject: [PATCH] inotify: stop kernel memory leak on file creation failure
+commit a2ae4cc9a16e211c8a128ba10d22a85431f093ab upstream.
+
If inotify_init is unable to allocate a new file for the new inotify
group we leak the new group. This patch drops the reference on the
group on file allocation failure.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4342.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4342.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CVE-2010-4342.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 4e085e76cbe558b79b54cbab772f61185879bc64 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Wed, 8 Dec 2010 18:42:23 -0800
Subject: [PATCH] econet: Fix crash in aun_incoming().
+commit 4e085e76cbe558b79b54cbab772f61185879bc64 upstream.
+
Unconditional use of skb->dev won't work here,
try to fetch the econet device via skb_dst()->dev
instead.
@@ -12,12 +13,10 @@
Reported-by: Nelson Elhage <nelhage at ksplice.com>
Tested-by: Nelson Elhage <nelhage at ksplice.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
-
-[Slightly adapted for 2.6.32]
-
-diff -aur source.orig/net/econet/af_econet.c source/net/econet/af_econet.c
---- source.orig/net/econet/af_econet.c 2011-01-05 11:28:20.395451000 +0100
-+++ source/net/econet/af_econet.c 2011-01-05 13:27:52.835450299 +0100
+[jmm: Slightly adapted for 2.6.32]
+---
+--- a/net/econet/af_econet.c
++++ b/net/econet/af_econet.c
@@ -843,9 +843,13 @@
{
struct iphdr *ip = ip_hdr(skb);
@@ -33,4 +32,3 @@
if (! edev)
goto bad;
-Nur in source/net/econet: af_econet.c~.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/Fix-flush_old_exec-setup_new_exec-split.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/Fix-flush_old_exec-setup_new_exec-split.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/Fix-flush_old_exec-setup_new_exec-split.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue, 2 Feb 2010 12:37:44 -0800
Subject: [PATCH] Fix 'flush_old_exec()/setup_new_exec()' split
+commit 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d upstream.
+
Commit 221af7f87b9 ("Split 'flush_old_exec' into two functions") split
the function at the point of no return - ie right where there were no
more error cases to check. That made sense from a technical standpoint,
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,10 @@
From: Tejun Heo <tj at kernel.org>
-To: jeff at garzik.org, linux-ide at vger.kernel.org, jens.axboe at oracle.com, linux-scsi at vger.kernel.org, James.Bottomley at suse.de, linux-kernel at vger.kernel.org
-Cc: ben at decadent.org.uk, Tejun Heo <tj at kernel.org>
Date: Thu, 13 May 2010 17:56:44 +0200
Subject: [PATCH 2/4] SCSI: implement sd_set_capacity()
+[A later version of this is
+ commit 72ec24bd7725545bc149d80cbd21a7578d9aa206 upstream.]
+
Implement sd_set_capacity() method which calls into
hostt->set_capacity() if implemented. This will be invoked by block
layer if partitions extend beyond the end of the device and can be
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,13 @@
-From 67b0f5b1177a0c348d1293ab78de4d1d6a736048 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sat, 15 May 2010 16:45:29 +0100
Subject: [PATCH] V4L/DVB: budget: Select correct frontends
+commit d46b36e7f927772bb72524dc9f1e384e3cb4a975 upstream.
+
Update the Kconfig selections to match the code.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
drivers/media/dvb/ttpci/Kconfig | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/agp-add-no-warn-since-we-have-a-fallback-to-vmalloc-.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 1c48bc5f71cd7783e19fb8d9462be53f829be177 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 15 Jun 2010 11:02:05 +1000
Subject: [PATCH] agp: add no warn since we have a fallback to vmalloc paths
+commit 1c48bc5f71cd7783e19fb8d9462be53f829be177 upstream.
+
also drop the NORETRY we can probably nearly always satisfy order 1 allocs now,
and again the vmalloc path is there.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-Fix-hardware-type-check-for-enabling-OTP-CLK.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-Fix-hardware-type-check-for-enabling-OTP-CLK.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-Fix-hardware-type-check-for-enabling-OTP-CLK.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 0f51f8b9316869fc21fd4b077a08b47698df6b0a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sat, 20 Nov 2010 04:42:28 +0000
Subject: [PATCH] atl1c: Fix hardware type check for enabling OTP CLK
+commit 33ac0b84eecaf5e7ee3baa3ef8294e8d8d267cd6 upstream.
+
Commit 496c185c9495629ef1c65387cb2594578393cfe0 "atl1c: Add support
for Atheros AR8152 and AR8152" added the condition:
@@ -17,6 +18,7 @@
the correct one. Change the former to match.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
drivers/net/atl1c/atl1c_hw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/atl1c-use-common_task-instead-of-reset_task-and-link.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From cb19054697e92a793f336380fd72c588521178ff Mon Sep 17 00:00:00 2001
From: Jie Yang <jie.yang at atheros.com>
Date: Sun, 6 Dec 2009 23:16:58 +0000
Subject: [PATCH] atl1c:use common_task instead of reset_task and link_chg_task
+commit cb19054697e92a793f336380fd72c588521178ff upstream.
+
use common_task instead of reset_task and link_chg_task, so it fix "call cancel_work_sync
from the work itself".
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/atl1e-remove-broken-tsov6.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/atl1e-remove-broken-tsov6.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/atl1e-remove-broken-tsov6.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,13 @@
From: Jie Yang <jie.yang at atheros.com>
-Date: Wed, 2 Dec 2009 11:18:34 +0800
-Subject: [PATCH net-next]atl1e:disable NETIF_F_TSO6 for hardware limit
+Date: Tue, 1 Dec 2009 17:18:34 +0000
+Subject: [PATCH] atl1e:disable NETIF_F_TSO6 for hardware limit
+
+commit 7c7afb083675b3d4d012a2aacec3a958ba484ab0 upstream.
For hardware limit to support TSOV6, just disable this feature
Signed-off-by: Jie Yang <jie.yang at atheros.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
-
drivers/net/atl1e/atl1e_main.c | 36 ------------------------------------
1 files changed, 0 insertions(+), 36 deletions(-)
@@ -63,5 +65,3 @@
return 0;
}
-
-
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/block-blk_abort_request-lock-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/block-blk_abort_request-lock-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/block-blk_abort_request-lock-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,25 +1,28 @@
From: Tejun Heo <teheo at suse.de>
-Subject: libata/SCSI: fix locking around blk_abort_request()
-References: bnc#585927
-Patch-mainline: submitted for 2.6.34-rc5 and stable (as two patches)
+Date: Thu, 15 Apr 2010 08:57:37 +0900
+Subject: [PATCH] libata: fix locking around blk_abort_request()
+
+commit fa41efdae7de61191a7bda3a00e88ef69afb5bb9 upstream.
-blk_abort_request() expects queue lock to be held by the caller.
+blk_abort_request() expectes queue lock to be held by the caller.
Grab it before calling the function.
Lack of this synchronization led to infinite loop on corrupt
q->timeout_list.
-Signed-off-by: Tejun Heo <teheo at suse.de>
+Signed-off-by: Tejun Heo <tj at kernel.org>
+Cc: Jens Axboe <axboe at kernel.dk>
+Cc: stable at kernel.org
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+References: bnc#585927
---
drivers/ata/libata-eh.c | 4 ++++
drivers/scsi/libsas/sas_ata.c | 4 ++++
drivers/scsi/libsas/sas_scsi_host.c | 4 ++++
3 files changed, 12 insertions(+)
-Index: linux-2.6.32-SLE11-SP1/drivers/ata/libata-eh.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/ata/libata-eh.c
-+++ linux-2.6.32-SLE11-SP1/drivers/ata/libata-eh.c
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
@@ -870,6 +870,8 @@ static void ata_eh_set_pending(struct at
void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
{
@@ -39,10 +42,8 @@
}
/**
-Index: linux-2.6.32-SLE11-SP1/drivers/scsi/libsas/sas_ata.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/scsi/libsas/sas_ata.c
-+++ linux-2.6.32-SLE11-SP1/drivers/scsi/libsas/sas_ata.c
+--- a/drivers/scsi/libsas/sas_ata.c
++++ b/drivers/scsi/libsas/sas_ata.c
@@ -394,11 +394,15 @@ int sas_ata_init_host_and_port(struct do
void sas_ata_task_abort(struct sas_task *task)
{
@@ -59,10 +60,8 @@
scsi_schedule_eh(qc->scsicmd->device->host);
return;
}
-Index: linux-2.6.32-SLE11-SP1/drivers/scsi/libsas/sas_scsi_host.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/scsi/libsas/sas_scsi_host.c
-+++ linux-2.6.32-SLE11-SP1/drivers/scsi/libsas/sas_scsi_host.c
+--- a/drivers/scsi/libsas/sas_scsi_host.c
++++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -1029,6 +1029,8 @@ int __sas_task_abort(struct sas_task *ta
void sas_task_abort(struct sas_task *task)
{
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 6b5b361fb06eccdd53d3e85e0366b1f3687c0b2f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Fri, 10 Sep 2010 01:23:30 +0100
Subject: [PATCH] brcm80211: Fix some initialisation failure paths
+commit eb4764c3007ca306663ba1367a2b3475bfcdf09e upstream.
+
Initialise wl_info::tasklet early so that it's safe to tasklet_kill()
it in wl_free().
@@ -13,6 +14,8 @@
Don't rely on wl_firmware::fw_cnt in wl_release_fw().
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Henry Ptasinski <henryp at broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/brcm80211/TODO | 1 -
drivers/staging/brcm80211/sys/wl_mac80211.c | 25 ++++++++++++-------------
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,6 +1,26 @@
-diff -urpN linux-source-2.6.32.orig/net/can/bcm.c linux-source-2.6.32/net/can/bcm.c
---- linux-source-2.6.32.orig/net/can/bcm.c 2009-12-02 20:51:21.000000000 -0700
-+++ linux-source-2.6.32/net/can/bcm.c 2010-08-11 18:54:13.000000000 -0600
+From: Oliver Hartkopp <socketcan at hartkopp.net>
+Date: Wed, 11 Aug 2010 16:12:35 -0700
+Subject: [PATCH] can: add limit for nframes and clean up signed/unsigned variables
+
+commit 5b75c4973ce779520b9d1e392483207d6f842cde upstream.
+
+This patch adds a limit for nframes as the number of frames in TX_SETUP and
+RX_SETUP are derived from a single byte multiplex value by default.
+Use-cases that would require to send/filter more than 256 CAN frames should
+be implemented in userspace for complexity reasons anyway.
+
+Additionally the assignments of unsigned values from userspace to signed
+values in kernelspace and vice versa are fixed by using unsigned values in
+kernelspace consistently.
+
+Signed-off-by: Oliver Hartkopp <socketcan at hartkopp.net>
+Reported-by: Ben Hawkes <hawkes at google.com>
+Acked-by: Urs Thuermann <urs.thuermann at volkswagen.de>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+--- a/net/can/bcm.c
++++ b/net/can/bcm.c
@@ -59,6 +59,13 @@
#include <net/sock.h>
#include <net/net_namespace.h>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-dont-select-lgs8gl5.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-dont-select-lgs8gl5.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-dont-select-lgs8gl5.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,7 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+
+[Included in commit fc4a7f93087a48619005111895dcaa115f807399 upstream.]
+
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -112,7 +112,6 @@
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-select-lgs8gxx.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-select-lgs8gxx.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/cxusb-select-lgs8gxx.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,7 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+
+[Included in commit fc4a7f93087a48619005111895dcaa115f807399 upstream.]
+
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -113,6 +113,7 @@
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-the-HDTV-hack-sync-adjustment.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-the-HDTV-hack-sync-adjustment.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-edid-Fix-the-HDTV-hack-sync-adjustment.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 12d7b7032e9450a742709e67366d8c2960cd8f78 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 28 Jul 2010 07:40:32 +1000
Subject: [PATCH 1/3] drm/edid: Fix the HDTV hack sync adjustment
+commit a4967de6cbb260ad0f6612a1d2035e119ef1578f upstream.
+
We're adjusting horizontal timings only here, moving vsync was just a
slavish translation of a typo in the X server.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-disable-powersave.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-disable-powersave.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-disable-powersave.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,4 +1,3 @@
-From 3d8aef4fa23bfed8ba72442eb2845d3ee17dcdf5 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Wed, 13 Jan 2010 18:56:00 +0000
Subject: [PATCH] i915: disable powersave by default
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-give-up-on-8xx-lid-status.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-give-up-on-8xx-lid-status.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-give-up-on-8xx-lid-status.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,21 +1,19 @@
-From patchwork Fri Feb 12 17:30:00 2010
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: drm/i915: give up on 8xx lid status
-Date: Fri, 12 Feb 2010 17:30:00 -0000
From: Jesse Barnes <jbarnes at virtuousgeek.org>
-X-Patchwork-Id: 78947
-Message-Id: <20100212093000.5cead4da at jbarnes-piketon>
-To: intel-gfx at lists.freedesktop.org, eric at anholt.net
+Date: Fri, 12 Feb 2010 09:30:00 -0800
+Subject: [PATCH] drm/i915: give up on 8xx lid status
+
+commit 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 upstream.
These old machines more often than not lie about their lid state. So
don't use it to detect LVDS presence, but leave the event handler to
deal with lid open/close, when we might need to reset the mode.
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-
+Fixes kernel bug #15248
+Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
+Cc: stable at kernel.org
+Signed-off-by: Eric Anholt <eric at anholt.net>
+---
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 75a9772..9f4855b 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-set-DIDL-using-the-ACPI-video-output-device.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-set-DIDL-using-the-ACPI-video-output-device.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-set-DIDL-using-the-ACPI-video-output-device.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 3143751ff51a163b77f7efd389043e038f3e008e Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang at intel.com>
Date: Mon, 29 Mar 2010 15:12:16 +0800
Subject: [PATCH] drm/i915: set DIDL using the ACPI video output device _ADR method return.
+commit 3143751ff51a163b77f7efd389043e038f3e008e upstream.
+
we used to set the DIDL in the output device detected order.
But some BIOSes requires it to be initialized in the ACPI device order.
e.g. the value of the first field in DIDL stands for the first
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-segfault-in-r600_ioctl_ioctl_wait_idle.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-segfault-in-r600_ioctl_ioctl_wait_idle.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-segfault-in-r600_ioctl_ioctl_wait_idle.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 1c9b3a143a9ddd64c390dfeb757a8f6d12b70c90 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher at gmail.com>
-Date: Mon, 27 Sep 2010 10:53:34 -0400
+Date: Mon, 27 Sep 2010 10:57:10 -0400
Subject: [PATCH] drm/radeon/kms: fix potential segfault in r600_ioctl_wait_idle
+commit e488459a0e131acc9e14df093cfee740bc431953 upstream.
+
radeon_gem_wait_idle_ioctl can apparently get called prior to
the vram page being set up or even if accel if false, so make
sure it's valid before using it.
@@ -13,6 +14,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Cc: stable at kernel.org
+Signed-off-by: Dave Airlie <airlied at redhat.com>
---
drivers/gpu/drm/radeon/r600.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-further-spread-spectrum-fixes.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 7aac5b711ff4c64bad5a6027cf6d38f1bbd53efe Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 20 Apr 2010 18:30:37 +1000
Subject: [PATCH] drm/radeon/kms: further spread spectrum fixes
+commit 267364ac17f6474c69b03034340f769b22f46105 upstream.
+
Adjust modeset ordering to fix spread spectrum.
The spread spectrum command table relies on the
crtc routing to already be set in order to work
@@ -12,10 +13,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-
-Conflicts:
-
- drivers/gpu/drm/radeon/atombios_crtc.c
+[Backported to 2.6.33 by Fedora]
---
drivers/gpu/drm/radeon/atombios_crtc.c | 5 +++++
drivers/gpu/drm/radeon/radeon_encoders.c | 25 +++++++++++++++----------
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 0fbecd400dd0a82d465b3086f209681e8c54cb0f Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez at riseup.net>
Date: Tue, 21 Sep 2010 02:15:15 +0200
Subject: [PATCH] drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
+commit 0fbecd400dd0a82d465b3086f209681e8c54cb0f upstream.
+
It makes sense for a BO to move after a process has requested
exclusive RW access on it (e.g. because the BO used to be located in
unmappable VRAM and we intercepted the CPU access from the fault
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/e1000-enhance-fragment-detection.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/e1000-enhance-fragment-detection.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/e1000-enhance-fragment-detection.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Tue, 19 Jan 2010 14:15:38 -0000
From: Jesse Brandeburg <jesse.brandeburg at intel.com>
+commit 40a14deaf411592b57cb0720f0e8004293ab9865 upstream.
+
Originally From: Neil Horman <nhorman at tuxdriver.com>
Modified by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-fragment-detection.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-fragment-detection.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/e1000e-enhance-fragment-detection.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,8 @@
-Based on:
-
-Subject: [net-2.6,2/2] e1000e: enhance frame fragment detection
-Date: Tue, 19 Jan 2010 14:15:59 -0000
From: Jesse Brandeburg <jesse.brandeburg at intel.com>
+Date: Tue, 19 Jan 2010 14:15:59 +0000
+Subject: [PATCH] e1000e: enhance frame fragment detection
+
+commit b94b50289622e816adc9f94111cfc2679c80177c upstream.
Originally patched by Neil Horman <nhorman at tuxdriver.com>
@@ -12,6 +12,12 @@
this is related to CVE-2009-4538
+Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
+CC: Neil Horman <nhorman at tuxdriver.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+[bwh: Backport to 2.6.32]
+---
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -421,6 +421,7 @@ struct e1000_info {
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/efifb_fix_v2.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,19 +1,25 @@
From: Marcin Slusarz <marcin.slusarz at gmail.com>
+Date: Mon, 22 Feb 2010 12:44:22 -0800
Subject: [PATCH] efifb: fix framebuffer handoff
-Commit 4410f3910947dcea8672280b3adecd53cec4e85e
-(fbdev: add support for handoff from firmware to hw framebuffers)
-for unknown reason didn't add fb_destroy operation to efifb.
-Change aperture_size to match size passed to request_mem_region.
+commit 89f3f2199084a160a3a45fa6d9af235696321758 upstream.
-See: http://bugzilla.kernel.org/show_bug.cgi?id=15151
+Commit 4410f3910947dcea8672280b3adecd53cec4e85e ("fbdev: add support for
+handoff from firmware to hw framebuffers") didn't add fb_destroy
+operation to efifb. Fix it and change aperture_size to match size
+passed to request_mem_region.
+Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15151
+
+Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Reported-by: Alex Zhavnerchik <alex.vizor at gmail.com>
Tested-by: Alex Zhavnerchik <alex.vizor at gmail.com>
+Acked-by: Peter Jones <pjones at redhat.com>
+Cc: Huang Ying <ying.huang at intel.com>
Cc: Dave Airlie <airlied at redhat.com>
-Cc: linux-fbdev at vger.kernel.org
-Cc: dri-devel at lists.sourceforge.net
-Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
+Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
drivers/video/efifb.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/fs-exec.c-fix-initial-stack-reservation.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From a17e18790a8c47113a73139d54a375dc9ccd8f08 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey at neuling.org>
Date: Mon, 22 Feb 2010 12:44:24 -0800
Subject: [PATCH] fs/exec.c: fix initial stack reservation
+commit a17e18790a8c47113a73139d54a375dc9ccd8f08 upstream.
+
803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial
stack space expansion to rlimit") attempts to limit the initial stack to
20*PAGE_SIZE. Unfortunately, in attempting ensure the stack is not
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-fix-inotify-oneshot-support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,12 +1,8 @@
Subject: [1/2] inotify: fix inotify oneshot support
Date: Thu, 08 Jul 2010 20:58:11 -0000
From: Eric Paris <eparis at redhat.com>
-X-Patchwork-Id: 110926
-Message-Id: <20100708205811.21351.60266.stgit at paris.rdu.redhat.com>
-To: linux-kernel at vger.kernel.org
-Cc: viro at zeniv.linux.org.uk
-RH BZ #607327
+commit ff311008ab8d2f2cfdbbefd407d1b05acc8164b2 upstream.
During the large inotify rewrite to fsnotify I completely dropped support
for IN_ONESHOT. Reimplement that support.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/inotify-send-IN_UNMOUNT-events.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,8 @@
Subject: [2/2] inotify: send IN_UNMOUNT events
-Date: Thu, 08 Jul 2010 20:58:17 -0000
+Date: Wed, 28 Jul 2010 10:18:37 -0400
From: Eric Paris <eparis at redhat.com>
-Message-Id: <20100708205817.21351.80159.stgit at paris.rdu.redhat.com>
-To: linux-kernel at vger.kernel.org
-Cc: viro at zeniv.linux.org.uk
-RH BZ #607327
+commit 611da04f7a31b2208e838be55a42c7a1310ae321 upstream.
Since the .31 or so notify rewrite inotify has not sent events about
inodes which are unmounted. This patch restores those events.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ipath-Fix-probe-failure-path.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ipath-Fix-probe-failure-path.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipath-Fix-probe-failure-path.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,14 +1,15 @@
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 11 Jun 2010 03:34:41 +0100
-Subject: [PATCH] ipath: Fix probe failure path
+Date: Sat, 12 Jun 2010 02:25:09 +0000
+Subject: [PATCH] IB/ipath: Fix probe failure path
-This has not yet been accepted upstream, but is important for Debian
-because our patch to make the SD7220 code use request_firmware() makes
-probe failure more likely.
+commit dccb816de38efe72becc5d7f90a5dfedcd6fd053 upstream.
The failure path in ipath_init_one() does not match the cleanup code
in ipath_remove_one() and appears to leave interrupts enabled in some
cases. Change it to match.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
drivers/infiniband/hw/ipath/ipath_driver.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ipc_initialize_structure_memory_to_zero.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ipc_initialize_structure_memory_to_zero.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipc_initialize_structure_memory_to_zero.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,16 +1,8 @@
-From patchwork Thu Oct 7 02:18:36 2010
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
Subject: [v2] ipc: initialize structure memory to zero for shmctl
Date: Thu, 07 Oct 2010 02:18:36 -0000
From: Kees Cook <kees.cook at canonical.com>
-X-Patchwork-Id: 237561
-Message-Id: <20101007021836.GA14666 at outflux.net>
-To: linux-kernel at vger.kernel.org
-Cc: Al Viro <viro at zeniv.linux.org.uk>,
- Andrew Morton <akpm at linux-foundation.org>, Jiri Slaby <jslaby at suse.cz>,
- "David S. Miller" <davem at davemloft.net>, stable at kernel.org
+
+[Replaced by commit 3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44 upstream.]
The old shm interface will leak a few bytes of stack contents. Explicitly
initialize the structure to zero-fill the untouched fields, using memset
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libata-ata_piix-clear-spurious-IRQ.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,7 +1,8 @@
From: Tejun Heo <tj at kernel.org>
Subject: libata,ata_piix: detect and clear spurious IRQs
-Patch-Mainline: Backported from changes pending for 2.6.34
-References: bnc#445872, bnc#589449
+
+[This is distantly related to
+ commit 27943620cbd960f710a385ff4a538e14ed3f1922 upstream.]
Backport spurious IRQ handling from 2.6.34. It isn't exactly the same
form in that it doesn't use callbacks but implements custom
@@ -10,15 +11,14 @@
Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Tejun Heo <teheo at suse.de>
+References: bnc#445872, bnc#589449
---
drivers/ata/ata_piix.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++-
drivers/ata/libata-sff.c | 12 ++++++-
2 files changed, 85 insertions(+), 3 deletions(-)
-Index: linux-2.6.32-SLE11-SP1/drivers/ata/ata_piix.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/ata/ata_piix.c
-+++ linux-2.6.32-SLE11-SP1/drivers/ata/ata_piix.c
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
@@ -949,6 +949,80 @@ static int piix_sidpr_scr_read(struct at
return 0;
}
@@ -109,10 +109,8 @@
}
static void piix_remove_one(struct pci_dev *pdev)
-Index: linux-2.6.32-SLE11-SP1/drivers/ata/libata-sff.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/ata/libata-sff.c
-+++ linux-2.6.32-SLE11-SP1/drivers/ata/libata-sff.c
+--- a/drivers/ata/libata-sff.c
++++ b/drivers/ata/libata-sff.c
@@ -1667,6 +1667,7 @@ unsigned int ata_sff_host_intr(struct at
{
struct ata_eh_info *ehi = &ap->link.eh_info;
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,10 @@
From: Tejun Heo <tj at kernel.org>
-To: jeff at garzik.org, linux-ide at vger.kernel.org, jens.axboe at oracle.com, linux-scsi at vger.kernel.org, James.Bottomley at suse.de, linux-kernel at vger.kernel.org
-Cc: ben at decadent.org.uk, Tejun Heo <tj at kernel.org>
Date: Thu, 13 May 2010 17:56:46 +0200
Subject: [PATCH 4/4] libata: implement on-demand HPA unlocking
+[A later version of this is
+ commit d8d9129ea28e2177749627c82962feb26e8d11e9 upstream.]
+
Implement ata_scsi_set_capacity() which will be called through SCSI
layer when block layer notices that partitions on a device extend
beyond the end of the device. ata_scsi_set_capacity() requests EH to
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,10 @@
From: Tejun Heo <tj at kernel.org>
-To: jeff at garzik.org, linux-ide at vger.kernel.org, jens.axboe at oracle.com, linux-scsi at vger.kernel.org, James.Bottomley at suse.de, linux-kernel at vger.kernel.org
-Cc: ben at decadent.org.uk, Tejun Heo <tj at kernel.org>
Date: Thu, 13 May 2010 17:56:45 +0200
Subject: [PATCH 3/4] libata: use the enlarged capacity after late HPA unlock
+[A later version of this is
+ commit 68939ce5fc17ee9c03ef6e543d4f82bd9f5583d4 upstream.]
+
After late HPA unlock, libata kept using the original capacity
ignoring the new larger native capacity. Enlarging device on the fly
doesn't cause any harm. Use the larger native capacity instead. This
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/libiscsi-regression-fix-header-digest-errors.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/libiscsi-regression-fix-header-digest-errors.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/libiscsi-regression-fix-header-digest-errors.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,13 +1,17 @@
-From: michaelc at cs.wisc.edu
-To: linux-scsi at vger.kernel.org
-Cc: Mike Christie <michaelc at cs.wisc.edu>
-Subject: [PATCH] libiscsi: regression: fix header digest errors
-Date: Sat, 24 Apr 2010 16:21:19 -0500
-Message-Id: <1272144079-10494-1-git-send-email-michaelc at cs.wisc.edu>
+From: Mike Christie <michaelc at cs.wisc.edu>
+Date: Sat, 24 Apr 2010 16:21:19 -0500
+Subject: [PATCH] [SCSI] libiscsi: regression: fix header digest errors
+commit 96b1f96dcab87756c0a1e7ba76bc5dc2add82b88 upstream.
This fixes a regression introduced with this commit:
-d3305f3407fa3e9452079ec6cc8379067456e4aa
+
+commit d3305f3407fa3e9452079ec6cc8379067456e4aa
+Author: Mike Christie <michaelc at cs.wisc.edu>
+Date: Thu Aug 20 15:10:58 2009 -0500
+
+ [SCSI] libiscsi: don't increment cmdsn if cmd is not sent
+
in 2.6.32.
When I moved the hdr->cmdsn after init_task, I added
@@ -17,6 +21,8 @@
change what the digest will be calculated by the target.
Signed-off-by: Mike Christie <michaelc at cs.wisc.edu>
+Cc: Stable Tree <stable at kernel.org>
+Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---
drivers/scsi/libiscsi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
@@ -42,8 +48,3 @@
--
1.6.6.1
---
-To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/modules-Skip-empty-section-notes.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/modules-Skip-empty-section-notes.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/modules-Skip-empty-section-notes.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 34c7e88db240e008758b97368d6f07631b017c92 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 18 Dec 2009 23:03:03 +0000
+Date: Sat, 19 Dec 2009 14:43:01 +0000
Subject: [PATCH] modules: Skip empty sections when exporting section notes
+commit 10b465aaf9536ee5a16652fa0700740183d48ec9 upstream.
+
Commit 35dead4 "modules: don't export section names of empty sections
via sysfs" changed the set of sections that have attributes, but did
not change the iteration over these attributes in add_notes_attrs().
@@ -16,6 +17,8 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Tested-by: Martin Michlmayr <tbm at cyrius.com>
Cc: stable at kernel.org
+Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
kernel/module.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,16 @@
-From a6a1af184afadb15482b47fa2cc3d1ff50718729 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 14 Feb 2010 05:11:49 +0000
-Subject: [PATCH 5/5] mptscsih: Fix first line of kernel-doc for a few functions
+Date: Sun, 23 May 2010 17:02:30 -0700
+Subject: [PATCH] fusion: fix kernel-doc notation
+
+commit 9b8f77a184fcc44349c547be944ba921fd4247b3 upstream.
The function name must be followed by a space, hypen, space, and a
short description.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+Cc: Eric Moore <Eric.Moore at lsi.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
drivers/message/fusion/mptscsih.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-Limit-socket-I-O-iovec-total-length-to-INT_MAX.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-Limit-socket-I-O-iovec-total-length-to-INT_MAX.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-Limit-socket-I-O-iovec-total-length-to-INT_MAX.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 8acfe468b0384e834a303f08ebc4953d72fb690a Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Thu, 28 Oct 2010 11:41:55 -0700
Subject: [PATCH] net: Limit socket I/O iovec total length to INT_MAX.
+commit 8acfe468b0384e834a303f08ebc4953d72fb690a upstream.
+
This helps protect us from overflow issues down in the
individual protocol sendmsg/recvmsg handlers. Once
we hit INT_MAX we truncate out the rest of the iovec
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-r8169-improved-rx-length-check-errors.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-r8169-improved-rx-length-check-errors.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-r8169-improved-rx-length-check-errors.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,51 +1,55 @@
From: Neil Horman <nhorman at redhat.com>
-Date: Tue, 5 Jan 2010 09:43:37 -0500
-Subject: [net] r8169: imporved rx length check errors
-Message-id: 20100105144337.GB24293 at hmsreliant.think-freely.org
-O-Subject: [kernel team] [RHEL 5.5 PATCH] imporved r8169 patch for rx length check errors (bz 522438)
-Bugzilla: 552438
-RH-Acked-by: No One <noone at redhat.com>
-
-[ cebbert : ported to 2.6.32 ]
-
-Hey-
- So we've been going back and forth about these r8169 changes( bz 550915).
-We have a hardware ideosyncracy that seems to dictate that we disable frame
-filtering, and as a result we are forced to allocate very large buffers, which
-Dave correctly points out are a major performance impact. This is further
-compllicated by the fact that we don't know which subset of hardware is affected
-by this bug. As such I've come up with this fix that I _think_ makes everyone
-as happy as possible given what we know (or more specifically, what we don't
-know). Anywho, I've posted this upstream and am waiting for comments.
-Basically, it does the following things
-
-1) Modifies the setrxbuf routine to accept an mtu paramter
-
-2) Changes the drivers open routine to force the mtu pased to the function in
-(1) a size of 16383-VLAN_ETH_HLEN-ETH_FCS_LEN
-
-3) raises the copybreak value so that we always allocate frames on rx to pass to
-the network stack.
-
-4) Adds a warning about changing the mtu to a size that is not 16383
-
-The effective result of these changes are that by default, we allocate at device
-open a ring of 16k buffers which disables filtering, and set the copybreak value
-to that size, so that instead of constantly allocating 16k buffers, we just
-allocate frame size appropriate buffers. This is still a big performance hit,
-but better than constant 16k allocations, which would quickly fail.
-
-We also (and this is the improved part), allow for user space to set mtu's
-smaller than 16383, which results in the driver reverting back to the
-pre-patched behavior. A loud warning is issued to this effect, so that people
-will realize what their doing, but if a user is in a situation where the can
-guarantee frame sizes with other equipment (switch filtering, etc), then this
-allows them the old performance levels
+Date: Mon, 29 Mar 2010 13:16:02 -0700
+Subject: [PATCH] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
-Satisfies bz 522438
+commit c0cd884af045338476b8e69a61fceb3f34ff22f1 upstream.
-Neil
+Official patch to fix the r8169 frame length check error.
+Based on this initial thread:
+http://marc.info/?l=linux-netdev&m=126202972828626&w=1
+This is the official patch to fix the frame length problems in the r8169
+driver. As noted in the previous thread, while this patch incurs a performance
+hit on the driver, its possible to improve performance dynamically by updating
+the mtu and rx_copybreak values at runtime to return performance to what it was
+for those NICS which are unaffected by the ideosyncracy (if there are any).
+
+Summary:
+
+ A while back Eric submitted a patch for r8169 in which the proper
+allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
+much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A
+long time prior to that however, Francois posted
+126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize
+setting due to the fact that the hardware behaved in odd ways when overlong
+frames were received on NIC's supported by this driver. This was mentioned in a
+security conference recently:
+http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
+
+It seems that if we can't enable frame size filtering, then, as Eric correctly
+noticed, we can find ourselves DMA-ing too much data to a buffer, causing
+corruption. As a result is seems that we are forced to allocate a frame which
+is ready to handle a maximally sized receive.
+
+This obviously has performance issues with it, so to mitigate that issue, this
+patch does two things:
+
+1) Raises the copybreak value to the frame allocation size, which should force
+appropriately sized packets to get allocated on rx, rather than a full new 16k
+buffer.
+
+2) This patch only disables frame filtering initially (i.e., during the NIC
+open), changing the MTU results in ring buffer allocation of a size in relation
+to the new mtu (along with a warning indicating that this is dangerous).
+
+Because of item (2), individuals who can't cope with the performance hit (or can
+otherwise filter frames to prevent the bug), or who have hardware they are sure
+is unaffected by this issue, can manually lower the copybreak and reset the mtu
+such that performance is restored easily.
+
+Signed-off-by: Neil Horman <nhorman at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 063d949..c241338 100644
--- a/drivers/net/r8169.c
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-rds-remove-kmap_atomic-optimization.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-rds-remove-kmap_atomic-optimization.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-rds-remove-kmap_atomic-optimization.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,34 @@
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Fri, 15 Oct 2010 11:09:28 -0700
+Subject: [PATCH] De-pessimize rds_page_copy_user
+
+commit 799c10559d60f159ab2232203f222f18fa3c4a5f upstream.
+
+Don't try to "optimize" rds_page_copy_user() by using kmap_atomic() and
+the unsafe atomic user mode accessor functions. It's actually slower
+than the straightforward code on any reasonable modern CPU.
+
+Back when the code was written (although probably not by the time it was
+actually merged, though), 32-bit x86 may have been the dominant
+architecture. And there kmap_atomic() can be a lot faster than kmap()
+(unless you have very good locality, in which case the virtual address
+caching by kmap() can overcome all the downsides).
+
+But these days, x86-64 may not be more populous, but it's getting there
+(and if you care about performance, it's definitely already there -
+you'd have upgraded your CPU's already in the last few years). And on
+x86-64, the non-kmap_atomic() version is faster, simply because the code
+is simpler and doesn't have the "re-try page fault" case.
+
+People with old hardware are not likely to care about RDS anyway, and
+the optimization for the 32-bit case is simply buggy, since it doesn't
+verify the user addresses properly.
+
+Reported-by: Dan Rosenberg <drosenberg at vsecurity.com>
+Acked-by: Andrew Morton <akpm at linux-foundation.org>
+Cc: stable at kernel.org
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
net/rds/page.c | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-socket-limit-sendto-recvfrom-length.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-socket-limit-sendto-recvfrom-length.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-socket-limit-sendto-recvfrom-length.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,11 @@
From: Linus Torvalds <torvalds at linux-foundation.org>
-Date: Fri, 29 Oct 2010 14:41:03 -0700
+Date: Sat, 30 Oct 2010 16:43:10 -0700
+Subject: [PATCH] net: Truncate recvfrom and sendto length to INT_MAX.
-I think you'd want this as well, to make sure that sendto/recvfrom
-don't generate invalid iovecs.
+commit 253eacc070b114c2ec1f81b067d2fed7305467b0 upstream.
-Feel free to add my sign-off (or just commit it as yourself) after
-giving it some testing.
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+Signed-off-by: David S. Miller <davem at davemloft.net>
---
net/socket.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From d4cde88c1c025ffa18150ec29e80e456f2a5c65a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Thu, 22 Apr 2010 19:52:43 +0200
Subject: [PATCH] p54pci: fix regression from prevent stuck rx-ring on slow system
+commit d4cde88c1c025ffa18150ec29e80e456f2a5c65a upstream.
+
This patch fixes a recently introduced use-after-free regression
from "p54pci: prevent stuck rx-ring on slow system".
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/radeon_block_ability_userspace_app.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/radeon_block_ability_userspace_app.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/radeon_block_ability_userspace_app.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 2812f9c43c50cbf0e17118e7ae7d82e44d74a1dd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 24 Feb 2010 17:17:13 +1000
Subject: [PATCH] drm/radeon: block ability for userspace app to trash 0 page and beyond
+commit 566d84d172161cb6c0c4dd834c34abbac6bf7b38 upstream.
+
radeon's have a special ability to passthrough writes in their internal
memory space directly to PCI, this ability means that if some of the internal
surfaces like the depth buffer point at 0x0, any writes to these will
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/reiserfs-fix-permissions-on-reiserfs_priv.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,30 +1,39 @@
From: Jeff Mahoney <jeffm at suse.com>
-Subject: [PATCH] reiserfs: Fix permissions on .reiserfs_priv
-References: bnc#593906 CVE-2010-1146
-Patch-mainline: Submitted 8 Apr 2010
+Date: Fri, 23 Apr 2010 13:17:37 -0400
+Subject: [PATCH] reiserfs: fix permissions on .reiserfs_priv
+
+commit cac36f707119b792b2396aed371d6b5cdc194890 upstream.
- Commit 677c9b2e393a0cd203bd54e9c18b012b2c73305a removed the magic
- from the lookup code to hide the .reiserfs_priv directory since it
- was getting loaded at mount-time instead. The intent was that the
- entry would be hidden from the user via a poisoned d_compare, but
- this was faulty.
-
- This introduced a security issue where unpriviledged users could
- access and modify extended attributes or ACLs belonging to other
- users, including root.
-
- This patch resolves the issue by properly hiding .reiserfs_priv. This
- was the intent of the xattr poisoning code, but it appears to have
- never worked as expected. This is fixed by using d_revalidate instead
- of d_compare.
-
- This patch makes -oexpose_privroot a no-op. I'm fine leaving it this
- way. The effort involved in working out the corner cases wrt permissions
- and caching outweigh the benefit of the feature.
+Commit 677c9b2e393a0cd203bd54e9c18b012b2c73305a ("reiserfs: remove
+privroot hiding in lookup") removed the magic from the lookup code to hide
+the .reiserfs_priv directory since it was getting loaded at mount-time
+instead. The intent was that the entry would be hidden from the user via
+a poisoned d_compare, but this was faulty.
+
+This introduced a security issue where unprivileged users could access and
+modify extended attributes or ACLs belonging to other users, including
+root.
+
+This patch resolves the issue by properly hiding .reiserfs_priv. This was
+the intent of the xattr poisoning code, but it appears to have never
+worked as expected. This is fixed by using d_revalidate instead of
+d_compare.
+
+This patch makes -oexpose_privroot a no-op. I'm fine leaving it this way.
+The effort involved in working out the corner cases wrt permissions and
+caching outweigh the benefit of the feature.
Signed-off-by: Jeff Mahoney <jeffm at suse.com>
+Acked-by: Edward Shishkin <edward.shishkin at gmail.com>
+Reported-by: Matt McCutchen <matt at mattmccutchen.net>
+Tested-by: Matt McCutchen <matt at mattmccutchen.net>
+Cc: Frederic Weisbecker <fweisbec at gmail.com>
+Cc: Al Viro <viro at zeniv.linux.org.uk>
+Cc: <stable at kernel.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+References: bnc#593906 CVE-2010-1146
---
-
fs/reiserfs/dir.c | 2 --
fs/reiserfs/xattr.c | 17 ++++-------------
2 files changed, 4 insertions(+), 15 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/sched-fix-over-scheduling-bug.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/sched-fix-over-scheduling-bug.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sched-fix-over-scheduling-bug.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,7 +1,8 @@
From: Alex,Shi <alex.shi at intel.com>
Date: Thu, 17 Jun 2010 06:08:13 +0000 (+0800)
Subject: sched: Fix over-scheduling bug
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3c93717cfa51316e4dbb471e7c0f9d243359d5f8
+
+commit 3c93717cfa51316e4dbb471e7c0f9d243359d5f8 upstream.
sched: Fix over-scheduling bug
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ssb-Handle-alternate-SSPROM-location.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ssb-Handle-alternate-SSPROM-location.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ssb-Handle-alternate-SSPROM-location.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 9d1ac34ec3a67713308ae0883c3359c557f14d17 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: Fri, 14 May 2010 22:08:58 -0500
Subject: [PATCH] ssb: Handle alternate SSPROM location
+commit 9d1ac34ec3a67713308ae0883c3359c557f14d17 upstream.
+
In kernel Bugzilla #15825 (2 users), in a wireless mailing list thread
(http://lists.infradead.org/pipermail/b43-dev/2010-May/000124.html), and on a
netbook owned by John Linville
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,10 @@
-From ec032742062ad1b01dfe75cfccdbc5b850837c23 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Tue, 30 Mar 2010 13:47:39 -0400
Subject: [PATCH] ssb: avoid null ptr deref in ssb_is_sprom_available
+[A later version of this is
+ commit da1fdb02d9200ff28b6f3a380d21930335fe5429 upstream.]
+
Some older devices don't have chipcommon, but they do have SPROM.
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ssb_check_for_sprom.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,10 @@
-From 380bed7aa858cbe2d4eeb783e2bed7d01828518d Mon Sep 17 00:00:00 2001
From: John W. Linville <linville at tuxdriver.com>
Date: Fri, 19 Mar 2010 14:58:01 -0400
Subject: [PATCH v4] ssb: do not read SPROM if it does not exist
+[A later version of this is
+ commit d53cdbb94a52a920d5420ed64d986c3523a56743 upstream.]
+
Attempting to read registers that don't exist on the SSB bus can cause
hangs on some boxes. At least some b43 devices are 'in the wild' that
don't have SPROMs at all. When the SSB bus support loads, it attempts
Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-fix-ICMP-RTO-war.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-fix-ICMP-RTO-war.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-fix-ICMP-RTO-war.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 598856407d4e20ebb4de01a91a93d89325924d43 Mon Sep 17 00:00:00 2001
From: Damian Lukowski <damian at tvk.rwth-aachen.de>
Date: Wed, 10 Feb 2010 18:04:08 -0800
Subject: [PATCH] tcp: fix ICMP-RTO war
+commit 598856407d4e20ebb4de01a91a93d89325924d43 upstream.
+
Make sure, that TCP has a nonzero RTT estimation after three-way
handshake. Currently, a listening TCP has a value of 0 for srtt,
rttvar and rto right after the three-way handshake is completed
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie-restrict.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie-restrict.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie-restrict.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Nicolas Pitre <nico at fluxnic.net>
Date: Thu, 21 Oct 2010 19:48:33 +0000 (-0400)
Subject: [ARM] Kirkwood: restrict the scope of the PCIe reset workaround
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=3924996bab2845bdf9a9d16ff7c20445de1ab55d
-[ARM] Kirkwood: restrict the scope of the PCIe reset workaround
+commit 3924996bab2845bdf9a9d16ff7c20445de1ab55d upstream.
Commit 21f0ba90a447 "orion/kirkwood: reset PCIe unit on boot" made the
reset of the PCIe unit unconditional. While this may fix problems on some
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/kirkwood-reset-pcie.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Olaf Rempel <razzor at kopf-tisch.de>
Date: Tue, 8 Jun 2010 20:32:38 +0000 (+0200)
Subject: [ARM] orion/kirkwood: reset PCIe unit on boot
-X-Git-Tag: v2.6.36-rc1~591^2^2~5^2~16
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=21f0ba90a447090153edeaf2f14f9f7e8bd9bc80
-[ARM] orion/kirkwood: reset PCIe unit on boot
+commit 21f0ba90a447090153edeaf2f14f9f7e8bd9bc80 upstream.
Patch found in QNAPs vendor source package, with some cleanups
(proper defines, shortened max. timeout from 1s to 200ms).
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-dest-sglist-diff.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-dest-sglist-diff.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-dest-sglist-diff.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:26:34 +0000 (+0300)
Subject: crypto: mv_cesa - Fix situation where the dest sglist is organized differently than...
-X-Git-Tag: v2.6.35-rc1~446^2~36
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f565e67ec1b8f4a95d21550f9b879fe86b4132e0
-crypto: mv_cesa - Fix situation where the dest sglist is organized differently than the source sglist
+commit f565e67ec1b8f4a95d21550f9b879fe86b4132e0 upstream.
Bugfix for situations where the destination scatterlist has a different
buffer structure than the source scatterlist (e.g. source has one 2K
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-exec-code-via-func-pointers.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-exec-code-via-func-pointers.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-exec-code-via-func-pointers.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:30:19 +0000 (+0300)
Subject: crypto: mv_cesa - Execute some code via function pointers rathr than direct calls
-X-Git-Tag: v2.6.35-rc1~446^2~32
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=a58094ac5f95d6969e5c52ff096d2fd2864542af
-crypto: mv_cesa - Execute some code via function pointers rathr than direct calls
+commit a58094ac5f95d6969e5c52ff096d2fd2864542af upstream.
Execute some code via function pointers rathr than direct calls
(to allow customization in the hashing request)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-fix-compiler-warning.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-fix-compiler-warning.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-fix-compiler-warning.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:25:56 +0000 (+0300)
Subject: crypto: mv_cesa - Remove compiler warning in mv_cesa driver
-X-Git-Tag: v2.6.35-rc1~446^2~37
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6bc6fcd609080461682c5cc0a1e3bf4345d6419d
-crypto: mv_cesa - Remove compiler warning in mv_cesa driver
+commit 6bc6fcd609080461682c5cc0a1e3bf4345d6419d upstream.
Remove compiler warning
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-generic-async-requests.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-generic-async-requests.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-generic-async-requests.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:27:33 +0000 (+0300)
Subject: crypto: mv_cesa - Enqueue generic async requests
-X-Git-Tag: v2.6.35-rc1~446^2~34
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3b61a90502481045f56c1c41a2af35ee48ca8b80
-crypto: mv_cesa - Enqueue generic async requests
+commit 3b61a90502481045f56c1c41a2af35ee48ca8b80 upstream.
Enqueue generic async requests rather than ablkcipher requests
in the driver's queue
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-invoke-softirq-context.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-invoke-softirq-context.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-invoke-softirq-context.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:25:37 +0000 (+0300)
Subject: crypto: mv_cesa - Invoke the user callback from a softirq context
-X-Git-Tag: v2.6.35-rc1~446^2~38
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0328ac267564089d9cedfb568f936d30a6debd21
-crypto: mv_cesa - Invoke the user callback from a softirq context
+commit 0328ac267564089d9cedfb568f936d30a6debd21 upstream.
Invoke the user callback from a softirq context
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-make-copy-back-optional.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-make-copy-back-optional.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-make-copy-back-optional.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:31:48 +0000 (+0300)
Subject: crypto: mv_cesa - Make the copy-back of data optional
-X-Git-Tag: v2.6.35-rc1~446^2~31
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f0d03deaad05d9cc99cd2ee0475c9ecd726c19ae
-crypto: mv_cesa - Make the copy-back of data optional
+commit f0d03deaad05d9cc99cd2ee0475c9ecd726c19ae upstream.
Make the copy-back of data optional (not done in hashing requests)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-process-data-previous-requests.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-process-data-previous-requests.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-process-data-previous-requests.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:33:26 +0000 (+0300)
Subject: crypto: mv_cesa - Support processing of data from previous requests
-X-Git-Tag: v2.6.35-rc1~446^2~30
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0c5c6c4bae8fe9ae3d86b44c332eb1267df1ec99
-crypto: mv_cesa - Support processing of data from previous requests
+commit 0c5c6c4bae8fe9ae3d86b44c332eb1267df1ec99 upstream.
Support processing of data from previous requests (as in hashing
update/final requests).
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-rename-variable.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-rename-variable.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-rename-variable.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:29:16 +0000 (+0300)
Subject: crypto: mv_cesa - Rename a variable to a more suitable name
-X-Git-Tag: v2.6.35-rc1~446^2~33
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7a5f691ef03f4c01d2703b5ec4ddd4c17e645dec
-crypto: mv_cesa - Rename a variable to a more suitable name
+commit 7a5f691ef03f4c01d2703b5ec4ddd4c17e645dec upstream.
Rename a variable to a more suitable name
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-sha1-async-drivers.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-sha1-async-drivers.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-sha1-async-drivers.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:34:55 +0000 (+0300)
Subject: crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers
-X-Git-Tag: v2.6.35-rc1~446^2~29
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=750052dd2400cd09e0864d75b63c2c0bf605056f
-crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers
+commit 750052dd2400cd09e0864d75b63c2c0bf605056f upstream.
Add sha1 and hmac(sha1) async hash drivers
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-src-sglist-more.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-src-sglist-more.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/mv_cesa-src-sglist-more.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Uri Simchoni <uri at jdland.co.il>
Date: Thu, 8 Apr 2010 16:27:02 +0000 (+0300)
Subject: crypto: mv_cesa - Fix situations where the src sglist spans more data than the reques...
-X-Git-Tag: v2.6.35-rc1~446^2~35
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=15d4dd3594221f11a7730fcf2d5f9942b96cdd7e
-crypto: mv_cesa - Fix situations where the src sglist spans more data than the request asks for
+commit 15d4dd3594221f11a7730fcf2d5f9942b96cdd7e upstream.
Fix for situations where the source scatterlist spans more data than the
request nbytes
Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/scsi-osd-build-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,4 +1,8 @@
From: Martin Michlmayr <tbm at cyrius.com>
+Date: Mon, 16 Nov 2009 20:49:25 +0200
+Subject: [PATCH] [SCSI] osd_protocol.h: Add missing #include
+
+commit 0899638688f223fd9e9fee60d662665e11693d12 upstream.
include/scsi/osd_protocol.h uses ALIGN() without an #include
<linux/kernel.h>, leading to:
@@ -6,6 +10,8 @@
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
+Cc: Stable Tree <stable at kernel.org>
+Signed-off-by: James Bottomley <James.Bottomley at suse.de>
---
include/scsi/osd_protocol.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-crash-when-gcore-reads-gate-area.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-crash-when-gcore-reads-gate-area.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ia64/fix-crash-when-gcore-reads-gate-area.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,30 +1,8 @@
-On Thu, 29 Jul 2010, dann frazier wrote:
-> On Wed, Jul 28, 2010 at 08:50:18PM -0700, Hugh Dickins wrote:
-> >
-> > Let's note that gdb's gcore is building up its own version of a
-> > coredump, not going through the get_dump_page() code I was wondering
-> > about. If I read gcore correctly (possibly not!), it will be reading
-> > selected areas from /proc/<pid>/mem i.e. using access_process_vm().
->
-> This appears to be correct. I was able to collect the following
-> stacktrace using INIT:
->
-> [ 2535.074197] Backtrace of pid 4605 (gdb)
-> [ 2535.074197]
-> [ 2535.074197] Call Trace:
-> [ 2535.074197] [<a00000010000bb00>] ia64_native_leave_kernel+0x0/0x270
-> [ 2535.074197] sp=e000004081c77c40 bsp=e000004081c71018
-> [ 2535.074197] [<a000000100334720>] __copy_user+0x160/0x960
-> [ 2535.074197] sp=e000004081c77e10 bsp=e000004081c71018
-> [ 2535.074197] [<a000000100176b00>] access_process_vm+0x2c0/0x380
-> [ 2535.074197] sp=e000004081c77e10 bsp=e000004081c70f60
-
-Thanks a lot, dann. But it was the [vdso] line in foo's /proc/<pid>/maps
-which you sent me privately, that set me thinking on the right track.
-Here's what I believe is the appropriate patch: please give it a try
-and let us know...
+From: Hugh Dickins <hughd at google.com>
+Date: Fri, 30 Jul 2010 10:58:26 -0700
+Subject: [PATCH] mm: fix ia64 crash when gcore reads gate area
-[PATCH] mm: fix ia64 crash when gcore reads gate area
+commit de51257aa301652876ab6e8f13ea4eadbe4a3846 upstream.
Debian's ia64 autobuilders have been seeing kernel freeze or reboot
when running the gdb testsuite (Debian bug 588574): dannf bisected to
@@ -46,7 +24,9 @@
Reported-by: Andreas Barth <aba at not.so.argh.org>
Bisected-by: dann frazier <dannf at debian.org>
Signed-off-by: Hugh Dickins <hughd at google.com>
+Tested-by: dann frazier <dannf at dannf.org>
Cc: stable at kernel.org
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
mm/memory.c | 16 +++++++++++++---
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-5da3a65d2d1ba333d61999640ef241f150c69c6b.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-5da3a65d2d1ba333d61999640ef241f150c69c6b.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-5da3a65d2d1ba333d61999640ef241f150c69c6b.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,121 +1,122 @@
-From 5da3a65d2d1ba333d61999640ef241f150c69c6b Mon Sep 17 00:00:00 2001
-From: Maxim Kuvyrkov <maxim at codesourcery.com>
-Date: Wed, 23 Dec 2009 11:28:42 -0800
-Subject: [PATCH] m68k: Switch to generic siginfo layout
-
-This patch switches m68k to generic siginfo layout. The custom layout
-of m68k's `struct siginfo' had several issues due to not considering
-aliasing of members in the union, e.g., _uid32 was at different offsets
-in ._kill, ._rt and ._sigchld.
-
-Signed-off-by: Maxim Kuvyrkov <maxim at codesourcery.com>
-Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
----
- arch/m68k/include/asm/siginfo.h | 91 ---------------------------------------
- 1 files changed, 0 insertions(+), 91 deletions(-)
-
-diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo.h
-index ca7dde8..851d3d7 100644
---- a/arch/m68k/include/asm/siginfo.h
-+++ b/arch/m68k/include/asm/siginfo.h
-@@ -1,97 +1,6 @@
- #ifndef _M68K_SIGINFO_H
- #define _M68K_SIGINFO_H
-
--#ifndef __uClinux__
--#define HAVE_ARCH_SIGINFO_T
--#define HAVE_ARCH_COPY_SIGINFO
--#endif
--
- #include <asm-generic/siginfo.h>
-
--#ifndef __uClinux__
--
--typedef struct siginfo {
-- int si_signo;
-- int si_errno;
-- int si_code;
--
-- union {
-- int _pad[SI_PAD_SIZE];
--
-- /* kill() */
-- struct {
-- __kernel_pid_t _pid; /* sender's pid */
-- __kernel_uid_t _uid; /* backwards compatibility */
-- __kernel_uid32_t _uid32; /* sender's uid */
-- } _kill;
--
-- /* POSIX.1b timers */
-- struct {
-- timer_t _tid; /* timer id */
-- int _overrun; /* overrun count */
-- char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-- sigval_t _sigval; /* same as below */
-- int _sys_private; /* not to be passed to user */
-- } _timer;
--
-- /* POSIX.1b signals */
-- struct {
-- __kernel_pid_t _pid; /* sender's pid */
-- __kernel_uid_t _uid; /* backwards compatibility */
-- sigval_t _sigval;
-- __kernel_uid32_t _uid32; /* sender's uid */
-- } _rt;
--
-- /* SIGCHLD */
-- struct {
-- __kernel_pid_t _pid; /* which child */
-- __kernel_uid_t _uid; /* backwards compatibility */
-- int _status; /* exit code */
-- clock_t _utime;
-- clock_t _stime;
-- __kernel_uid32_t _uid32; /* sender's uid */
-- } _sigchld;
--
-- /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-- struct {
-- void *_addr; /* faulting insn/memory ref. */
-- } _sigfault;
--
-- /* SIGPOLL */
-- struct {
-- int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
-- int _fd;
-- } _sigpoll;
-- } _sifields;
--} siginfo_t;
--
--#define UID16_SIGINFO_COMPAT_NEEDED
--
--/*
-- * How these fields are to be accessed.
-- */
--#undef si_uid
--#ifdef __KERNEL__
--#define si_uid _sifields._kill._uid32
--#define si_uid16 _sifields._kill._uid
--#else
--#define si_uid _sifields._kill._uid
--#endif
--
--#ifdef __KERNEL__
--
--#include <linux/string.h>
--
--static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
--{
-- if (from->si_code < 0)
-- memcpy(to, from, sizeof(*to));
-- else
-- /* _sigchld is currently the largest know union member */
-- memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
--}
--
--#endif /* __KERNEL__ */
--#endif /* !__uClinux__ */
--
- #endif
---
-1.7.2.3
-
+From: Maxim Kuvyrkov <maxim at codesourcery.com>
+Date: Wed, 23 Dec 2009 11:28:42 -0800
+Subject: [PATCH] m68k: Switch to generic siginfo layout
+
+commit 5da3a65d2d1ba333d61999640ef241f150c69c6b upstream.
+
+This patch switches m68k to generic siginfo layout. The custom layout
+of m68k's `struct siginfo' had several issues due to not considering
+aliasing of members in the union, e.g., _uid32 was at different offsets
+in ._kill, ._rt and ._sigchld.
+
+Signed-off-by: Maxim Kuvyrkov <maxim at codesourcery.com>
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ arch/m68k/include/asm/siginfo.h | 91 ---------------------------------------
+ 1 files changed, 0 insertions(+), 91 deletions(-)
+
+diff --git a/arch/m68k/include/asm/siginfo.h b/arch/m68k/include/asm/siginfo.h
+index ca7dde8..851d3d7 100644
+--- a/arch/m68k/include/asm/siginfo.h
++++ b/arch/m68k/include/asm/siginfo.h
+@@ -1,97 +1,6 @@
+ #ifndef _M68K_SIGINFO_H
+ #define _M68K_SIGINFO_H
+
+-#ifndef __uClinux__
+-#define HAVE_ARCH_SIGINFO_T
+-#define HAVE_ARCH_COPY_SIGINFO
+-#endif
+-
+ #include <asm-generic/siginfo.h>
+
+-#ifndef __uClinux__
+-
+-typedef struct siginfo {
+- int si_signo;
+- int si_errno;
+- int si_code;
+-
+- union {
+- int _pad[SI_PAD_SIZE];
+-
+- /* kill() */
+- struct {
+- __kernel_pid_t _pid; /* sender's pid */
+- __kernel_uid_t _uid; /* backwards compatibility */
+- __kernel_uid32_t _uid32; /* sender's uid */
+- } _kill;
+-
+- /* POSIX.1b timers */
+- struct {
+- timer_t _tid; /* timer id */
+- int _overrun; /* overrun count */
+- char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+- sigval_t _sigval; /* same as below */
+- int _sys_private; /* not to be passed to user */
+- } _timer;
+-
+- /* POSIX.1b signals */
+- struct {
+- __kernel_pid_t _pid; /* sender's pid */
+- __kernel_uid_t _uid; /* backwards compatibility */
+- sigval_t _sigval;
+- __kernel_uid32_t _uid32; /* sender's uid */
+- } _rt;
+-
+- /* SIGCHLD */
+- struct {
+- __kernel_pid_t _pid; /* which child */
+- __kernel_uid_t _uid; /* backwards compatibility */
+- int _status; /* exit code */
+- clock_t _utime;
+- clock_t _stime;
+- __kernel_uid32_t _uid32; /* sender's uid */
+- } _sigchld;
+-
+- /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+- struct {
+- void *_addr; /* faulting insn/memory ref. */
+- } _sigfault;
+-
+- /* SIGPOLL */
+- struct {
+- int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+- int _fd;
+- } _sigpoll;
+- } _sifields;
+-} siginfo_t;
+-
+-#define UID16_SIGINFO_COMPAT_NEEDED
+-
+-/*
+- * How these fields are to be accessed.
+- */
+-#undef si_uid
+-#ifdef __KERNEL__
+-#define si_uid _sifields._kill._uid32
+-#define si_uid16 _sifields._kill._uid
+-#else
+-#define si_uid _sifields._kill._uid
+-#endif
+-
+-#ifdef __KERNEL__
+-
+-#include <linux/string.h>
+-
+-static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
+-{
+- if (from->si_code < 0)
+- memcpy(to, from, sizeof(*to));
+- else
+- /* _sigchld is currently the largest know union member */
+- memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
+-}
+-
+-#endif /* __KERNEL__ */
+-#endif /* !__uClinux__ */
+-
+ #endif
+--
+1.7.2.3
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-9674cdc74d63f346870943ef966a034f8c71ee57.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-9674cdc74d63f346870943ef966a034f8c71ee57.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/linux-2.6.git-9674cdc74d63f346870943ef966a034f8c71ee57.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,214 +1,215 @@
-From 9674cdc74d63f346870943ef966a034f8c71ee57 Mon Sep 17 00:00:00 2001
-From: Maxim Kuvyrkov <maxim at codesourcery.com>
-Date: Mon, 7 Dec 2009 00:24:27 -0800
-Subject: [PATCH] m68k: Add NPTL support
-
-This patch adds several syscalls, that provide necessary
-functionality to support NPTL on m68k/ColdFire.
-The syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and
-atomic_barrier.
-The cmpxchg syscall is required for ColdFire as it doesn't support 'cas'
-instruction.
-
-Also a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to
-inspect the TLS storage.
-
-Signed-off-by: Maxim Kuvyrkov <maxim at codesourcery.com>
-Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
----
- arch/m68k/include/asm/ptrace.h | 2 +
- arch/m68k/include/asm/thread_info_mm.h | 1 +
- arch/m68k/include/asm/unistd.h | 6 ++-
- arch/m68k/kernel/entry.S | 4 ++
- arch/m68k/kernel/process.c | 4 ++
- arch/m68k/kernel/ptrace.c | 5 ++
- arch/m68k/kernel/sys_m68k.c | 81 ++++++++++++++++++++++++++++++++
- 7 files changed, 102 insertions(+), 1 deletions(-)
-
-diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
-index ee4011c..21605c7 100644
---- a/arch/m68k/include/asm/ptrace.h
-+++ b/arch/m68k/include/asm/ptrace.h
-@@ -71,5 +71,7 @@ struct switch_stack {
- #define PTRACE_GETFPREGS 14
- #define PTRACE_SETFPREGS 15
-
-+#define PTRACE_GET_THREAD_AREA 25
-+
- #ifdef __KERNEL__
-
-diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
-index 167e518..67266c6 100644
---- a/arch/m68k/include/asm/thread_info_mm.h
-+++ b/arch/m68k/include/asm/thread_info_mm.h
-@@ -16,6 +16,7 @@ struct thread_info {
- struct exec_domain *exec_domain; /* execution domain */
- int preempt_count; /* 0 => preemptable, <0 => BUG */
- __u32 cpu; /* should always be 0 on m68k */
-+ unsigned long tp_value; /* thread pointer */
- struct restart_block restart_block;
- };
- #endif /* __ASSEMBLY__ */
-diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
-index 48b87f5..d72a71d 100644
---- a/arch/m68k/include/asm/unistd.h
-+++ b/arch/m68k/include/asm/unistd.h
-@@ -336,10 +336,14 @@
- #define __NR_pwritev 330
- #define __NR_rt_tgsigqueueinfo 331
- #define __NR_perf_event_open 332
-+#define __NR_get_thread_area 333
-+#define __NR_set_thread_area 334
-+#define __NR_atomic_cmpxchg_32 335
-+#define __NR_atomic_barrier 336
-
- #ifdef __KERNEL__
-
--#define NR_syscalls 333
-+#define NR_syscalls 337
-
- #define __ARCH_WANT_IPC_PARSE_VERSION
- #define __ARCH_WANT_OLD_READDIR
-diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
-index 77fc7c1..e136b8c 100644
---- a/arch/m68k/kernel/entry.S
-+++ b/arch/m68k/kernel/entry.S
-@@ -761,4 +761,8 @@ sys_call_table:
- .long sys_pwritev /* 330 */
- .long sys_rt_tgsigqueueinfo
- .long sys_perf_event_open
-+ .long sys_get_thread_area
-+ .long sys_set_thread_area
-+ .long sys_atomic_cmpxchg_32 /* 335 */
-+ .long sys_atomic_barrier
-
-diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
-index 0529659..17c3f32 100644
---- a/arch/m68k/kernel/process.c
-+++ b/arch/m68k/kernel/process.c
-@@ -251,6 +251,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
-
- p->thread.usp = usp;
- p->thread.ksp = (unsigned long)childstack;
-+
-+ if (clone_flags & CLONE_SETTLS)
-+ task_thread_info(p)->tp_value = regs->d5;
-+
- /*
- * Must save the current SFC/DFC value, NOT the value when
- * the parent was last descheduled - RGH 10-08-96
-diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
-index 1fc217e..616e597 100644
---- a/arch/m68k/kernel/ptrace.c
-+++ b/arch/m68k/kernel/ptrace.c
-@@ -245,6 +245,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
- ret = -EFAULT;
- break;
-
-+ case PTRACE_GET_THREAD_AREA:
-+ ret = put_user(task_thread_info(child)->tp_value,
-+ (unsigned long __user *)data);
-+ break;
-+
- default:
- ret = ptrace_request(child, request, addr, data);
- break;
-diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
-index 218f441..e3ad2d6 100644
---- a/arch/m68k/kernel/sys_m68k.c
-+++ b/arch/m68k/kernel/sys_m68k.c
-@@ -28,6 +28,11 @@
- #include <asm/traps.h>
- #include <asm/page.h>
- #include <asm/unistd.h>
-+#include <linux/elf.h>
-+#include <asm/tlb.h>
-+
-+asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
-+ unsigned long error_code);
-
- asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
-@@ -595,3 +600,79 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
- : "d" (__a), "d" (__b), "d" (__c));
- return __res;
- }
-+
-+asmlinkage unsigned long sys_get_thread_area(void)
-+{
-+ return current_thread_info()->tp_value;
-+}
-+
-+asmlinkage int sys_set_thread_area(unsigned long tp)
-+{
-+ current_thread_info()->tp_value = tp;
-+ return 0;
-+}
-+
-+/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
-+ D1 (newval). */
-+asmlinkage int
-+sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
-+ unsigned long __user * mem)
-+{
-+ /* This was borrowed from ARM's implementation. */
-+ for (;;) {
-+ struct mm_struct *mm = current->mm;
-+ pgd_t *pgd;
-+ pmd_t *pmd;
-+ pte_t *pte;
-+ spinlock_t *ptl;
-+ unsigned long mem_value;
-+
-+ down_read(&mm->mmap_sem);
-+ pgd = pgd_offset(mm, (unsigned long)mem);
-+ if (!pgd_present(*pgd))
-+ goto bad_access;
-+ pmd = pmd_offset(pgd, (unsigned long)mem);
-+ if (!pmd_present(*pmd))
-+ goto bad_access;
-+ pte = pte_offset_map_lock(mm, pmd, (unsigned long)mem, &ptl);
-+ if (!pte_present(*pte) || !pte_dirty(*pte)
-+ || !pte_write(*pte)) {
-+ pte_unmap_unlock(pte, ptl);
-+ goto bad_access;
-+ }
-+
-+ mem_value = *mem;
-+ if (mem_value == oldval)
-+ *mem = newval;
-+
-+ pte_unmap_unlock(pte, ptl);
-+ up_read(&mm->mmap_sem);
-+ return mem_value;
-+
-+ bad_access:
-+ up_read(&mm->mmap_sem);
-+ /* This is not necessarily a bad access, we can get here if
-+ a memory we're trying to write to should be copied-on-write.
-+ Make the kernel do the necessary page stuff, then re-iterate.
-+ Simulate a write access fault to do that. */
-+ {
-+ /* The first argument of the function corresponds to
-+ D1, which is the first field of struct pt_regs. */
-+ struct pt_regs *fp = (struct pt_regs *)&newval;
-+
-+ /* '3' is an RMW flag. */
-+ if (do_page_fault(fp, (unsigned long)mem, 3))
-+ /* If the do_page_fault() failed, we don't
-+ have anything meaningful to return.
-+ There should be a SIGSEGV pending for
-+ the process. */
-+ return 0xdeadbeef;
-+ }
-+ }
-+}
-+
-+asmlinkage int sys_atomic_barrier(void)
-+{
-+ /* no code needed for uniprocs */
-+ return 0;
-+}
---
-1.7.2.3
-
+From: Maxim Kuvyrkov <maxim at codesourcery.com>
+Date: Mon, 7 Dec 2009 00:24:27 -0800
+Subject: [PATCH] m68k: Add NPTL support
+
+commit 9674cdc74d63f346870943ef966a034f8c71ee57 upstream.
+
+This patch adds several syscalls, that provide necessary
+functionality to support NPTL on m68k/ColdFire.
+The syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and
+atomic_barrier.
+The cmpxchg syscall is required for ColdFire as it doesn't support 'cas'
+instruction.
+
+Also a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to
+inspect the TLS storage.
+
+Signed-off-by: Maxim Kuvyrkov <maxim at codesourcery.com>
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
+---
+ arch/m68k/include/asm/ptrace.h | 2 +
+ arch/m68k/include/asm/thread_info_mm.h | 1 +
+ arch/m68k/include/asm/unistd.h | 6 ++-
+ arch/m68k/kernel/entry.S | 4 ++
+ arch/m68k/kernel/process.c | 4 ++
+ arch/m68k/kernel/ptrace.c | 5 ++
+ arch/m68k/kernel/sys_m68k.c | 81 ++++++++++++++++++++++++++++++++
+ 7 files changed, 102 insertions(+), 1 deletions(-)
+
+diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
+index ee4011c..21605c7 100644
+--- a/arch/m68k/include/asm/ptrace.h
++++ b/arch/m68k/include/asm/ptrace.h
+@@ -71,5 +71,7 @@ struct switch_stack {
+ #define PTRACE_GETFPREGS 14
+ #define PTRACE_SETFPREGS 15
+
++#define PTRACE_GET_THREAD_AREA 25
++
+ #ifdef __KERNEL__
+
+diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
+index 167e518..67266c6 100644
+--- a/arch/m68k/include/asm/thread_info_mm.h
++++ b/arch/m68k/include/asm/thread_info_mm.h
+@@ -16,6 +16,7 @@ struct thread_info {
+ struct exec_domain *exec_domain; /* execution domain */
+ int preempt_count; /* 0 => preemptable, <0 => BUG */
+ __u32 cpu; /* should always be 0 on m68k */
++ unsigned long tp_value; /* thread pointer */
+ struct restart_block restart_block;
+ };
+ #endif /* __ASSEMBLY__ */
+diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
+index 48b87f5..d72a71d 100644
+--- a/arch/m68k/include/asm/unistd.h
++++ b/arch/m68k/include/asm/unistd.h
+@@ -336,10 +336,14 @@
+ #define __NR_pwritev 330
+ #define __NR_rt_tgsigqueueinfo 331
+ #define __NR_perf_event_open 332
++#define __NR_get_thread_area 333
++#define __NR_set_thread_area 334
++#define __NR_atomic_cmpxchg_32 335
++#define __NR_atomic_barrier 336
+
+ #ifdef __KERNEL__
+
+-#define NR_syscalls 333
++#define NR_syscalls 337
+
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
+index 77fc7c1..e136b8c 100644
+--- a/arch/m68k/kernel/entry.S
++++ b/arch/m68k/kernel/entry.S
+@@ -761,4 +761,8 @@ sys_call_table:
+ .long sys_pwritev /* 330 */
+ .long sys_rt_tgsigqueueinfo
+ .long sys_perf_event_open
++ .long sys_get_thread_area
++ .long sys_set_thread_area
++ .long sys_atomic_cmpxchg_32 /* 335 */
++ .long sys_atomic_barrier
+
+diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
+index 0529659..17c3f32 100644
+--- a/arch/m68k/kernel/process.c
++++ b/arch/m68k/kernel/process.c
+@@ -251,6 +251,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
+
+ p->thread.usp = usp;
+ p->thread.ksp = (unsigned long)childstack;
++
++ if (clone_flags & CLONE_SETTLS)
++ task_thread_info(p)->tp_value = regs->d5;
++
+ /*
+ * Must save the current SFC/DFC value, NOT the value when
+ * the parent was last descheduled - RGH 10-08-96
+diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
+index 1fc217e..616e597 100644
+--- a/arch/m68k/kernel/ptrace.c
++++ b/arch/m68k/kernel/ptrace.c
+@@ -245,6 +245,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+ ret = -EFAULT;
+ break;
+
++ case PTRACE_GET_THREAD_AREA:
++ ret = put_user(task_thread_info(child)->tp_value,
++ (unsigned long __user *)data);
++ break;
++
+ default:
+ ret = ptrace_request(child, request, addr, data);
+ break;
+diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
+index 218f441..e3ad2d6 100644
+--- a/arch/m68k/kernel/sys_m68k.c
++++ b/arch/m68k/kernel/sys_m68k.c
+@@ -28,6 +28,11 @@
+ #include <asm/traps.h>
+ #include <asm/page.h>
+ #include <asm/unistd.h>
++#include <linux/elf.h>
++#include <asm/tlb.h>
++
++asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
++ unsigned long error_code);
+
+ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
+ unsigned long prot, unsigned long flags,
+@@ -595,3 +600,79 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+ : "d" (__a), "d" (__b), "d" (__c));
+ return __res;
+ }
++
++asmlinkage unsigned long sys_get_thread_area(void)
++{
++ return current_thread_info()->tp_value;
++}
++
++asmlinkage int sys_set_thread_area(unsigned long tp)
++{
++ current_thread_info()->tp_value = tp;
++ return 0;
++}
++
++/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
++ D1 (newval). */
++asmlinkage int
++sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
++ unsigned long __user * mem)
++{
++ /* This was borrowed from ARM's implementation. */
++ for (;;) {
++ struct mm_struct *mm = current->mm;
++ pgd_t *pgd;
++ pmd_t *pmd;
++ pte_t *pte;
++ spinlock_t *ptl;
++ unsigned long mem_value;
++
++ down_read(&mm->mmap_sem);
++ pgd = pgd_offset(mm, (unsigned long)mem);
++ if (!pgd_present(*pgd))
++ goto bad_access;
++ pmd = pmd_offset(pgd, (unsigned long)mem);
++ if (!pmd_present(*pmd))
++ goto bad_access;
++ pte = pte_offset_map_lock(mm, pmd, (unsigned long)mem, &ptl);
++ if (!pte_present(*pte) || !pte_dirty(*pte)
++ || !pte_write(*pte)) {
++ pte_unmap_unlock(pte, ptl);
++ goto bad_access;
++ }
++
++ mem_value = *mem;
++ if (mem_value == oldval)
++ *mem = newval;
++
++ pte_unmap_unlock(pte, ptl);
++ up_read(&mm->mmap_sem);
++ return mem_value;
++
++ bad_access:
++ up_read(&mm->mmap_sem);
++ /* This is not necessarily a bad access, we can get here if
++ a memory we're trying to write to should be copied-on-write.
++ Make the kernel do the necessary page stuff, then re-iterate.
++ Simulate a write access fault to do that. */
++ {
++ /* The first argument of the function corresponds to
++ D1, which is the first field of struct pt_regs. */
++ struct pt_regs *fp = (struct pt_regs *)&newval;
++
++ /* '3' is an RMW flag. */
++ if (do_page_fault(fp, (unsigned long)mem, 3))
++ /* If the do_page_fault() failed, we don't
++ have anything meaningful to return.
++ There should be a SIGSEGV pending for
++ the process. */
++ return 0xdeadbeef;
++ }
++ }
++}
++
++asmlinkage int sys_atomic_barrier(void)
++{
++ /* no code needed for uniprocs */
++ return 0;
++}
+--
+1.7.2.3
+
Modified: dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/m68k/m68k_add_missing_io_macros.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,16 @@
+From: Thorsten Glaser <tg at debian.org>
+Date: Sun, 3 Oct 2010 18:48:51 +0000
+Subject: [PATCH] m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA
+
+commit 779b7e64b536ff65bcd40c0292871d2bb9b6d6e5 upstream.
+
On m68k, I/O macros like inb() outw() etc. are only defined to
something useful if CONFIG_ISA is set; dummies are in place if
not, but four macros were missing from the !CONFIG_ISA case.
Adding these makes some drivers, such as speakup, compile again.
-The patch was made against Debian’s linux-2.6_2.6.32-24, but
-applies cleanly on linux-m68k master.
Signed-off-by: Thorsten Glaser <tg at debian.org>
+Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
arch/m68k/include/asm/io_mm.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
@@ -31,7 +36,3 @@
--
1.6.0.4
---
-To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/drm-ttm-build-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,4 +1,8 @@
-drm/ttm: Fix build failure due to missing struct page
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Thu, 19 Nov 2009 16:29:45 +0000
+Subject: [PATCH] drm/ttm: Fix build failure due to missing struct page
+
+commit c3a73ba13bac7fd96030f39202b2d37fb19c46a6 upstream.
drm/ttm fails to build on MIPS because "struct page" is not known:
| In file included from drivers/gpu/drm/ttm/ttm_memory.c:28:
@@ -11,7 +15,10 @@
| include/drm/ttm/ttm_memory.h:156: error: previous declaration of 'ttm_mem_global_free_page' was here
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Cc: stable at kernel.org
+Acked-by: Thomas Hellstrom <thellstrom at vmware.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -33,6 +33,7 @@
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-DMA-computation-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-DMA-computation-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-DMA-computation-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 5caa730ee2d4f95169296a7a4c75dd9a20b6683a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf at linux-mips.org>
Date: Thu, 2 Sep 2010 23:22:23 +0200
Subject: [PATCH] MIPS: DMA: Fix computation of DMA flags from device's coherent_dma_mask.
+commit 3b9c6c11f519718d618f5d7c9508daf78b207f6f upstream.
+
This only matters for ISA devices with a 24-bit DMA limit or for devices
with a 32-bit DMA limit on systems with ZONE_DMA32 enabled. The latter
currently only affects 32-bit PCI cards on Sibyte-based systems with more
Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,15 +1,21 @@
-From 4e6385d53a2ab58c327d286ebc4f8771562cd728 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 13 Jun 2010 21:23:29 +0100
-Subject: [PATCH] mips: Set io_map_base for several PCI bridges lacking it
+Date: Sun, 13 Jun 2010 22:22:59 +0100
+Subject: [PATCH] MIPS: Set io_map_base for several PCI bridges lacking it
+
+commit 8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb upstream.
Several MIPS platforms don't set pci_controller::io_map_base for their
PCI bridges. This results in a panic in pci_iomap(). (The panic is
conditional on CONFIG_PCI_DOMAINS, but that is now enabled for all PCI
MIPS systems.)
-I have tested the change to Malta in qemu; the other platforms not at
-all.
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: linux-mips at linux-mips.org
+Cc: Martin Michlmayr <tbm at cyrius.com>
+Cc: Aurelien Jarno <aurelien at aurel32.net>
+Cc: 584784 at bugs.debian.org
+Patchwork: https://patchwork.linux-mips.org/patch/1377/
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
---
arch/mips/mti-malta/malta-pci.c | 2 ++
arch/mips/nxp/pnx8550/common/pci.c | 1 +
Modified: dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,6 +1,8 @@
From: David S. Miller <davem at davemloft.net>
Subject: [PATCH] sparc64: Make prom entry spinlock NMI safe.
+commit 068a79070df63a711fe29357a62ebcbc4cf23c63 upstream.
+
If we do something like try to print to the OF console from an NMI
while we're already in OpenFirmware, we'll deadlock on the spinlock.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/HPET-unmap-unused-I-O-space.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/HPET-unmap-unused-I-O-space.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/HPET-unmap-unused-I-O-space.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,19 +1,20 @@
From: Jiri Slaby <jslaby at suse.cz>
-Subject: [PATCH -resend 1/1] HPET: unmap unused I/O space
-Date: Fri, 3 Sep 2010 10:27:54 +0200
+Date: Tue, 26 Oct 2010 14:22:11 -0700
+Subject: [PATCH] hpet: unmap unused I/O space
-When the initialization code in hpet founds a memory resource and does
-not found IRQ, it does not unmap the memory resource previously
-mapped.
-
-There are buggy BIOSes which report resources exactly like this and
-what is worse the memory region bases point to normal RAM. This
-normally would not matter since the space is not touched. But when PAT
-is turned on, ioremap causes the page to be uncached and sets this bit
-in page->flags.
+commit a56d5318716d120e040294bb258901ba89fb9c90 upstream.
+
+When the initialization code in hpet finds a memory resource and does not
+find an IRQ, it does not unmap the memory resource previously mapped.
+
+There are buggy BIOSes which report resources exactly like this and what
+is worse the memory region bases point to normal RAM. This normally would
+not matter since the space is not touched. But when PAT is turned on,
+ioremap causes the page to be uncached and sets this bit in page->flags.
+
+Then when the page is about to be used by the allocator, it is reported
+as:
-Then when the page is about to be used by the allocator, it is
-reported as:
BUG: Bad page state in process md5sum pfn:3ed00
page:ffffea0000dbd800 count:0 mapcount:0 mapping:(null) index:0x0
page flags: 0x20000001000000(uncached)
@@ -44,7 +45,7 @@
[1] For case where Timer Block is configured to consume IRQ0/IRQ8 AND
Legacy 8254/Legacy RTC hardware still exists, the device objects
associated with 8254 & RTC devices should not report IRQ0/IRQ8 as
-“consumed resources.”
+"consumed resources".
So in theory we should check whether if it is the case and use those
interrupts instead.
@@ -52,15 +53,20 @@
Anyway the address reported by the BIOS here is bogus, so non-presence
of IRQ doesn't mean the "optional" part in point 2).
-Since I got no reply previously, fix this by simply unmapping the
-space when IRQ is not found and memory region was mapped previously.
-It would be probably more safe to walk the resources again and unmap
-appropriately depending on type. But as we now use only ioremap for
-both 2 memory resource types, it is not necessarily needed right now.
+Since I got no reply previously, fix this by simply unmapping the space
+when IRQ is not found and memory region was mapped previously. It would
+be probably more safe to walk the resources again and unmap appropriately
+depending on type. But as we now use only ioremap for both 2 memory
+resource types, it is not necessarily needed right now.
+
+Addresses https://bugzilla.novell.com/show_bug.cgi?id=629908
-References: https://bugzilla.novell.com/show_bug.cgi?id=629908
+Reported-by: Olaf Hering <olaf at aepfle.de>
Signed-off-by: Jiri Slaby <jslaby at suse.cz>
Acked-by: Clemens Ladisch <clemens at ladisch.de>
+Cc: <stable at kernel.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
drivers/char/hpet.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-add-hotplug_disable-parameter.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-add-hotplug_disable-parameter.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-add-hotplug_disable-parameter.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Wed, 6 Jan 2010 22:07:40 +0100
Subject: [PATCH 1/3] eeepc-laptop: add hotplug_disable parameter
+commit 322a1356be96bcc4b97e8e370f6468c821330077 upstream.
+
Some new models need to disable wireless hotplug.
For the moment, we don't know excactly what models need that,
except 1005HA.
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-cpu-speed-control-on-EeePC-701.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-cpu-speed-control-on-EeePC-701.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-cpu-speed-control-on-EeePC-701.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Wed, 6 Jan 2010 22:07:37 +0100
Subject: [PATCH] eeepc-laptop: disable cpu speed control on EeePC 701
+commit da8ba01deb98f3dc0558b1f5a37e64f40bba7904 upstream.
+
The EeePC 4G ("701") implements CFVS, but it is not supported by the
pre-installed OS, and the original option to change it in the BIOS
setup screen was removed in later versions. Judging by the lack of
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1005PE.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1005PE.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1005PE.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Sat, 20 Feb 2010 11:02:24 +0000
Subject: [PATCH 3/3] eeepc-laptop: disable wireless hotplug for 1005PE
+commit ced69c59811f05b2f8378467cbb82ac6ed3c6a5a upstream.
+
The wireless hotplug code is not needed on this model, and it disables
the wired ethernet card. (Like on the 1005HA and 1201N).
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1201N.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1201N.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-disable-wireless-hotplug-for-1201N.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Wed, 6 Jan 2010 22:07:41 +0100
Subject: [PATCH 2/3] eeepc-laptop: disable wireless hotplug for 1201N
+commit 4194e2f551a6308e6ab34ac88210bf54858aa7df upstream.
+
Signed-off-by: Corentin Chary <corentincj at iksaif.net>
Signed-off-by: Len Brown <len.brown at intel.com>
[bwh: Backported to 2.6.32]
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-dmi-blacklist-to-disable-pci-hotplug.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-dmi-blacklist-to-disable-pci-hotplug.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/eeepc-laptop-dmi-blacklist-to-disable-pci-hotplug.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -2,6 +2,8 @@
Date: Wed, 6 Jan 2010 22:07:38 +0100
Subject: [PATCH] eeepc-laptop: dmi blacklist to disable pci hotplug code
+commit 10ae4b5663ff3092553bfbd867e7bd474ce6c553 upstream.
+
This is a short term workaround for Eeepc 1005HA.
refs: <http://bugzilla.kernel.org/show_bug.cgi?id=14570>
Modified: dists/sid/linux-2.6/debian/patches/bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From e7a3481c0246c8e45e79c629efd63b168e91fcda Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Mon, 25 Oct 2010 16:53:46 -0700
Subject: [PATCH] x86/pvclock: Zero last_value on resume
+commit e7a3481c0246c8e45e79c629efd63b168e91fcda upstream.
+
If the guest domain has been suspend/resumed or migrated, then the
system clock backing the pvclock clocksource may revert to a smaller
value (ie, can be non-monotonic across the migration/save-restore).
Modified: dists/sid/linux-2.6/debian/patches/features/all/add-basic-xvr1000-framebuffer-driver.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/add-basic-xvr1000-framebuffer-driver.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/add-basic-xvr1000-framebuffer-driver.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: David S. Miller <davem at davemloft.net>
Date: Sun, 14 Mar 2010 00:25:03 +0000 (-0800)
Subject: sparc64: Add very basic XVR-1000 framebuffer driver.
-X-Git-Tag: v2.6.34-rc3~10^2~6
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2d378b9179881b46a0faf11430efb421fe03ddd8
-sparc64: Add very basic XVR-1000 framebuffer driver.
+commit 2d378b9179881b46a0faf11430efb421fe03ddd8 upstream.
Signed-off-by: David S. Miller <davem at davemloft.net>
Acked-by: Frans van Berckel <fberckel at xs4all.nl>
Modified: dists/sid/linux-2.6/debian/patches/features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -3,6 +3,9 @@
Date: Mon, 17 Aug 2009 02:17:09 +0100
Subject: [PATCH 3/3] ib_ipath: use request_firmware() to load SD7220 firmware
+[A later version of this was applied to the qib driver in
+ commit ecd4b48a163b55d7eb4132617100b90d0d2768ec upstream.]
+
---
drivers/infiniband/hw/ipath/Makefile | 7 ++--
drivers/infiniband/hw/ipath/ipath_7220.h | 7 ----
Modified: dists/sid/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -3,6 +3,9 @@
Date: Sun, 28 Jun 2009 15:51:07 +0100
Subject: [PATCH 08/24] rt2860/2870/3070: use the firmware loader interface and library CRC code
+[A later version of this is
+ commit c22202faade08b6b45f14fd86bfb57f79d73464c upstream.]
+
Based on work by Darren Salt <linux at youmustbejoking.demon.co.uk>.
---
drivers/staging/rt2860/Kconfig | 3 +-
Modified: dists/sid/linux-2.6/debian/patches/features/all/lgs8gxx-lgs8g75-request_firmware.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/lgs8gxx-lgs8g75-request_firmware.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/lgs8gxx-lgs8g75-request_firmware.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,13 +1,17 @@
-From 04a2710a7de7f20ceec7f30c9e56d01d20284b15 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 1 Nov 2009 02:12:10 +0000
-Subject: [PATCH 20/24] V4L/DVB: lgs8gxx: remove firmware for lgs8g75
+Date: Sat, 31 Oct 2009 23:14:35 -0300
+Subject: [PATCH] V4L/DVB: lgs8gxx: remove firmware for lgs8g75
+
+commit 7638699c253620a5745592d229b7e3ba9dbd218d upstream.
The recently added support for lgs8g75 included some 8051 machine code
without accompanying source code. Replace this with use of the
firmware loader.
Compile-tested only.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
drivers/media/dvb/frontends/Kconfig | 1 +
drivers/media/dvb/frontends/lgs8gxx.c | 23 ++++++++++-------------
Modified: dists/sid/linux-2.6/debian/patches/features/all/m25p80-add-support-mx25l8005.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/m25p80-add-support-mx25l8005.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/m25p80-add-support-mx25l8005.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,16 @@
-mtd: m25p80: Add support for Macronix 25L8005
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Mon, 7 Jun 2010 19:31:01 +0100
+Subject: [PATCH] mtd: m25p80: Add support for Macronix 25L8005
+
+commit 6175f4a194653fad46218167fac05386972d995c upstream.
Add support for Macronix 25L8005. Tested on a HP t5325 Thin Client.
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
+Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
[backported to 2.6.32 -- tbm]
-
+---
--- a/drivers/mtd/devices/m25p80.c 2010-06-19 10:37:08.000000000 +0000
+++ b/drivers/mtd/devices/m25p80.c 2010-06-19 10:37:54.000000000 +0000
@@ -621,6 +621,7 @@
Modified: dists/sid/linux-2.6/debian/patches/features/all/mantis/0119-Mantis-hopper-use-MODULE_DEVICE_TABLE-use-the-macro-.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/mantis/0119-Mantis-hopper-use-MODULE_DEVICE_TABLE-use-the-macro-.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/mantis/0119-Mantis-hopper-use-MODULE_DEVICE_TABLE-use-the-macro-.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,18 +1,18 @@
-From d3536036a37e4808eeed99e783e4d2b181fdde50 Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu at gmail.com>
-Date: Thu, 11 Feb 2010 11:11:05 +0400
-Subject: [PATCH 119/120] Mantis, hopper: use MODULE_DEVICE_TABLE use the macro to make modules auto-loadable
+Date: Thu, 11 Feb 2010 04:11:05 -0300
+Subject: [PATCH 119/120] [media] Mantis, hopper: use MODULE_DEVICE_TABLE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-Thanks to Ozan ?a?layan <ozan at pardus.org.tr> for pointing it out
+commit 116d588ea21cf0278a4de1e3272e9c3220a647e7 upstream.
-From: Manu Abraham <abraham.manu at gmail.com>
+use the macro to make modules auto-loadable
+
+Thanks to Ozan Çağlayan <ozan at pardus.org.tr> for pointing it out
Signed-off-by: Manu Abraham <manu at linuxtv.org>
-(imported from http://jusst.de/hg/mantis-v4l-dvb/raw-rev/3731f71ed6bf)
-Signed-off-by: Bjørn Mork <bjorn at mork.no>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
drivers/media/dvb/mantis/hopper_cards.c | 2 ++
drivers/media/dvb/mantis/mantis_cards.c | 2 ++
Modified: dists/sid/linux-2.6/debian/patches/features/all/mantis/0121-V4L-DVB-mantis-Select-correct-frontends.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/mantis/0121-V4L-DVB-mantis-Select-correct-frontends.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/mantis/0121-V4L-DVB-mantis-Select-correct-frontends.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,12 +1,14 @@
-From 95387e011a365a5309f6a6d621a215ab776b087a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Thu, 3 Jun 2010 01:42:13 +0100
Subject: [PATCH] V4L/DVB: mantis: Select correct frontends
+commit 398630e4edadac3d21519b8d009e30c3cdd91926 upstream.
+
Update the Kconfig selections to match the code.
Add the usual condition of !DVB_FE_CUSTOMISE.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---
drivers/media/dvb/mantis/Kconfig | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
Modified: dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,6 +1,9 @@
From: Ben Hutchings <ben at decadent.org.uk>
Subject: [PATCH] r8169: remove firmware for RTL8169D PHY
+[A later version of this is
+ commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 upstream.]
+
The recently added support for RTL8169D chips included some machine
code without accompanying source code. Replace this with use of the
firmware loader.
Modified: dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-3.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,6 +1,9 @@
From: Ben Hutchings <ben at decadent.org.uk>
Subject: [PATCH] r8169: remove firmware for RTL8169D PHY
+[A later version of this is
+ commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 upstream.]
+
The recently added support for RTL8169D chips included some machine
code without accompanying source code. Replace this with use of the
firmware loader.
Modified: dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,10 @@
-From 6902a6e35ad0847c323680b3e12b909e872f0e6b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 1 Nov 2009 22:42:01 +0000
Subject: [PATCH 24/24] r8169: remove firmware for RTL8169D PHY
+[A later version of this is
+ commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 upstream.
+
The recently added support for RTL8169D chips included some machine
code without accompanying source code. Replace this with use of the
firmware loader.
Modified: dists/sid/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -3,6 +3,9 @@
Date: Sun, 28 Jun 2009 15:51:07 +0100
Subject: [PATCH] rt{2860,2870}sta: Use request_firmware() to load firmware
+[A later version of this is
+ commit c22202faade08b6b45f14fd86bfb57f79d73464c upstream.]
+
When originally introduced into staging, these drivers had custom
firmware-loading code which checked a version number and CRC at the
end of each blob. This reintroduces those checks, using crc-ccitt
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-dpms.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-dpms.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-dpms.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:10 +0000 (-0700)
Subject: staging: udlfb: add DPMS support
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~680
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9825f70f5cf465a8c31236409456d18de07fd166
-staging: udlfb: add DPMS support
+commit 9825f70f5cf465a8c31236409456d18de07fd166 upstream.
Add ability to power off monitor with standard blanking interface
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-slab.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-slab.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add-slab.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,9 @@
From: Tejun Heo <tj at kernel.org>
Date: Wed, 24 Mar 2010 08:04:11 +0000 (+0900)
Subject: include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
-X-Git-Tag: v2.6.34-rc4~71^2~5
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5a0e3ad6af8660be21ca98a971cd00f331318c05
-include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
+[Path-restricted version of
+ commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 upstream.]
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add_dynamic_modeset_support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add_dynamic_modeset_support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-add_dynamic_modeset_support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Tue, 24 Nov 2009 23:52:21 +0000 (-0800)
Subject: Staging: udlfb: add dynamic modeset support
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~304
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=59277b679f8b5ce594e367759256668eba652d0d
-Staging: udlfb: add dynamic modeset support
+commit 59277b679f8b5ce594e367759256668eba652d0d upstream.
Add dynamic modeset support
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-backup-edid-write.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-backup-edid-write.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-backup-edid-write.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:31 +0000 (-0700)
Subject: staging: udlfb: support for writing backup EDID to sysfs file
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~675
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8ef8cc4fca4a92e77c0b5aa7a852a6c3d2fba844
-staging: udlfb: support for writing backup EDID to sysfs file
+commit 8ef8cc4fca4a92e77c0b5aa7a852a6c3d2fba844 upstream.
Support writing default/backup edid via /sys/class/graphics/fb?/edid
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-big-endian-fix.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-big-endian-fix.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-big-endian-fix.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:27 +0000 (-0700)
Subject: staging: udlfb: fix big endian rendering error
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~676
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1572f91cffd7c0d64ab4e0cec71e1d2d1a3349e1
-staging: udlfb: fix big endian rendering error
+commit 1572f91cffd7c0d64ab4e0cec71e1d2d1a3349e1 upstream.
Fix big endian rendering bug (affects PowerPC)
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-cleanup.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-cleanup.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-cleanup.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:45:43 +0000 (-0800)
Subject: Staging: udlfb: checkpatch cleanup
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~75
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1d31a9ee698f9b8d72c5813fe62a5184197443c3
-Staging: udlfb: checkpatch cleanup
+commit 1d31a9ee698f9b8d72c5813fe62a5184197443c3 upstream.
Eliminate checkpatch.pl warnings and errors so later patches in series are clean
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-style.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-style.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-checkpatch-style.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 6 Sep 2010 01:29:56 +0000 (-0700)
Subject: staging: udlfb: fix checkpatch and style
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~664
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2685cffa9e799278cdbfa5f524dd9e548be6598d
-staging: udlfb: fix checkpatch and style
+commit 2685cffa9e799278cdbfa5f524dd9e548be6598d upstream.
Fix warnings detected by tools
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-cleanup-function-naming.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-cleanup-function-naming.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-cleanup-function-naming.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:04 +0000 (-0800)
Subject: Staging: udlfb: clean up function naming
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~72
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4574203f45eb26b3fd76a171a77dd298dc1dc1ae
-Staging: udlfb: clean up function naming
+commit 4574203f45eb26b3fd76a171a77dd298dc1dc1ae upstream.
Move to more consistent naming scheme
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-coding-style.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-coding-style.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-coding-style.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Soeren Moeller <soerenmoeller2001 at gmail.com>
Date: Fri, 14 May 2010 19:03:00 +0000 (+0000)
Subject: Staging: udlfb: fix coding style issues
-X-Git-Tag: v2.6.35-rc1~441^2^2~27
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b5a2104c98cb603f7053e4b0309fb88f15d6be86
-Staging: udlfb: fix coding style issues
+commit b5a2104c98cb603f7053e4b0309fb88f15d6be86 upstream.
This is a patch to the file udlfb.c that fixes a missing KERN_INFO and
removes one whitespace before a newline.
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-enhance-edid.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-enhance-edid.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-enhance-edid.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:23 +0000 (-0700)
Subject: staging: udlfb: enhance EDID and mode handling support
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~677
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=18dffdf8913ab9e4ac7403a624879a15afa5262e
-staging: udlfb: enhance EDID and mode handling support
+commit 18dffdf8913ab9e4ac7403a624879a15afa5262e upstream.
Enhance EDID and mode table handling
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-explicit-warnings-and-deps.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-explicit-warnings-and-deps.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-explicit-warnings-and-deps.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:35 +0000 (-0800)
Subject: Staging: udlfb: explicit dependencies and warnings
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~67
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dd8015f1c83bfde9966c86a5958abd466a304398
-Staging: udlfb: explicit dependencies and warnings
+commit dd8015f1c83bfde9966c86a5958abd466a304398 upstream.
Specify Kconfig dependencies, and include warnings for building as a module
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fbdev-char.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fbdev-char.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fbdev-char.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:04 +0000 (-0700)
Subject: staging: udlfb: fbdev character read and write support
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~681
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d46ecb9f79db82ce6bef4baafbcae29ac809ea67
-staging: udlfb: fbdev character read and write support
+commit d46ecb9f79db82ce6bef4baafbcae29ac809ea67 upstream.
Restore fbdev character read and write support
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fix-incorrect-fb_defio-implementation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fix-incorrect-fb_defio-implementation.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-fix-incorrect-fb_defio-implementation.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 6 Sep 2010 01:28:29 +0000 (-0700)
Subject: staging: udlfb: fix incorrect fb_defio implementation for multiple framebuffers
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~665
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5bea1fbf942363e4114a086aefc67cdca21be7f0
-staging: udlfb: fix incorrect fb_defio implementation for multiple framebuffers
+commit 5bea1fbf942363e4114a086aefc67cdca21be7f0 upstream.
Fix fb_defio bug in udlfb for multiple framebuffers
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-improve-rendering-performance.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-improve-rendering-performance.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-improve-rendering-performance.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:21 +0000 (-0800)
Subject: Staging: udlfb: improved rendering performance
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~69
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=530f43a8a69d9fa10ec6d30652244bb5e2a29694
-Staging: udlfb: improved rendering performance
+commit 530f43a8a69d9fa10ec6d30652244bb5e2a29694 upstream.
Rework rendering for improved performance
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-minor-cleanups.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-minor-cleanups.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-minor-cleanups.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 3b7b31fa7df01576cc401dff512a6a84cb3753ed Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel at ucw.cz>
Date: Sat, 3 Apr 2010 07:00:37 +0200
Subject: [PATCH] Staging: udlfb: minor cleanups
+commit 3b7b31fa7df01576cc401dff512a6a84cb3753ed upstream.
+
This cleans up udlfb a tiny bit.
Signed-off-by: Pavel Machek <pavel at ucw.cz>
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-module-options.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-module-options.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-module-options.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:39 +0000 (-0700)
Subject: staging: udlfb: add module options for console and fb_defio
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~674
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d5ed54322e54d48e5fa66dff0086b79211f1cde7
-staging: udlfb: add module options for console and fb_defio
+commit d5ed54322e54d48e5fa66dff0086b79211f1cde7 upstream.
Add module options for console and fb_defio
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-preallocated-urb-list-helpers.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-preallocated-urb-list-helpers.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-preallocated-urb-list-helpers.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:45:55 +0000 (-0800)
Subject: Staging: udlfb: pre-allocated urb list helpers
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~73
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4a4854dd2049ddc066a162a0f843dc2a78481060
-Staging: udlfb: pre-allocated urb list helpers
+commit 4a4854dd2049ddc066a162a0f843dc2a78481060 upstream.
Add functions to pre-allocate and free usb bulk urbs for core render path.
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-printk-cleanup.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-printk-cleanup.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-printk-cleanup.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:48 +0000 (-0800)
Subject: Staging: udlfb: remove printk and small cleanup
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~66
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=bd80816b2877879d36011815858c8681408cc625
-Staging: udlfb: remove printk and small cleanup
+commit bd80816b2877879d36011815858c8681408cc625 upstream.
Remove last remaining printk and clarify comments
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-remove-metrics_misc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-remove-metrics_misc.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-remove-metrics_misc.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:15 +0000 (-0700)
Subject: staging: udlfb: remove metrics_misc sysfs attribute
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~679
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f11f4bc027414bc7db5dde49c55b7149a627b591
-staging: udlfb: remove metrics_misc sysfs attribute
+commit f11f4bc027414bc7db5dde49c55b7149a627b591 upstream.
Remove metrics_misc sysfs attribute
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-reorg-function-order.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-reorg-function-order.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-reorg-function-order.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:45:49 +0000 (-0800)
Subject: Staging: udlfb: reorganize function order
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~74
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cc403dc67d10b895fec14b837fa2a6cb6ee6c8bd
-Staging: udlfb: reorganize function order
+commit cc403dc67d10b895fec14b837fa2a6cb6ee6c8bd upstream.
Reorganize the location of a few things to be closer to related code
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-revamp-reference-handling.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-revamp-reference-handling.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-revamp-reference-handling.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Sun, 5 Sep 2010 23:35:19 +0000 (-0700)
Subject: staging: udlfb: revamp reference handling to insure successful shutdown
-X-Git-Tag: v2.6.37-rc1~60^2~3^2~678
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=33077b8d3042e01da61924973e372abe589ba297
-staging: udlfb: revamp reference handling to insure successful shutdown
+commit 33077b8d3042e01da61924973e372abe589ba297 upstream.
Revamp reference handling and synchronization for unload/shutdown
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-rework-startup.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-rework-startup.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-rework-startup.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:13 +0000 (-0800)
Subject: Staging: udlfb: Rework startup and teardown to fix race conditions
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~70
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2469d5dbcafe064859475a8aaf8da00ab33d440c
-Staging: udlfb: Rework startup and teardown to fix race conditions
+commit 2469d5dbcafe064859475a8aaf8da00ab33d440c upstream.
Rework probe to use refcounts and std functions
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-support-fbdev-mmap-clients.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-support-fbdev-mmap-clients.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-support-fbdev-mmap-clients.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:26 +0000 (-0800)
Subject: Staging: udlfb: Support for fbdev mmap clients (defio)
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~68
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3e8f3d6fa672896096068296658a769649186150
-Staging: udlfb: Support for fbdev mmap clients (defio)
+commit 3e8f3d6fa672896096068296658a769649186150 upstream.
Add support for fbdev mmap clients who don't send damage ioctls
Modified: dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-sysfs-expose-metrics.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-sysfs-expose-metrics.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/udlfb/udlfb-sysfs-expose-metrics.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Bernie Thompson <bernie at plugable.com>
Date: Mon, 15 Feb 2010 14:46:08 +0000 (-0800)
Subject: Staging: udlfb: Add functions to expose sysfs metrics and controls
-X-Git-Tag: v2.6.34-rc1~10^2~1^2~71
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7d9485e2c53caaaed9606a39de1c2746cc9ba262
-Staging: udlfb: Add functions to expose sysfs metrics and controls
+commit 7d9485e2c53caaaed9606a39de1c2746cc9ba262 upstream.
Add sysfs controls for edid and performance metrics
Modified: dists/sid/linux-2.6/debian/patches/features/all/xgifb-driver.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xgifb-driver.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/all/xgifb-driver.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,8 @@
From: apatard at mandriva.com <apatard at mandriva.com>
Date: Wed, 19 May 2010 08:44:14 +0000 (+0200)
Subject: staging: Add framebuffer driver for XGI chipsets
-X-Git-Tag: v2.6.35-rc2~14^2~26
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d7636e0b0769e0f4f437ff33168d723f86e7c080
+
+commit d7636e0b0769e0f4f437ff33168d723f86e7c080 upstream.
staging: Add framebuffer driver for XGI chipsets
@@ -13,9 +13,7 @@
Signed-off-by: Arnaud Patard <apatard at mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-
[adapted Kconfig and Makefile --tbm]
-
---
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
Modified: dists/sid/linux-2.6/debian/patches/features/arm/arm-add-pci_sys_data.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/arm-add-pci_sys_data.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/arm-add-pci_sys_data.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Saeed Bishara <saeed at marvell.com>
Date: Thu, 3 Jun 2010 11:58:46 +0000 (+0300)
Subject: [ARM] PCI: add platform private data to pci_sys_data
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=bb50df36d2b275485c205b4fd5fc154f9de0b06a
-[ARM] PCI: add platform private data to pci_sys_data
+commit bb50df36d2b275485c205b4fd5fc154f9de0b06a upstream.
Add private_data pointer to the pci_sys_data, this pointer can be
used for holding platform specific data for each pci controller.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/compression-add-lzmo.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/compression-add-lzmo.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/compression-add-lzmo.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,19 @@
+From: Albin Tonnerre <albin.tonnerre at free-electrons.com>
+Date: Sat, 3 Apr 2010 11:40:28 +0100
+Subject: [PATCH] ARM: 6026/1: ARM: Add support for LZMA-compressed kernel images
+
+commit 6e8699f7d68589e0e9ab324f598a3357bceb40bc upstream.
+
+This patch allows using a kernel image compressed with LZMA on ARM.
+Extracting the image is fairly slow, but it might be useful on machines
+with a very limited amount of storage, as the size benefit is quite
+significant (about 25% smaller with LZMA compared to GZIP)
+
+Tested-by: Martin Michlmayr <tbm at cyrius.com>
+Tested-by: Paulius Zaleckas <paulius.zaleckas at gmail.com>
+Signed-off-by: Albin Tonnerre <albin.tonnerre at free-electrons.com>
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+---
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 95b9905..a42793b 100644
--- a/arch/arm/Kconfig
Modified: dists/sid/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From f63dd12da29f47c37bbc093abec098538e04357c Mon Sep 17 00:00:00 2001
From: Hemant Pedanekar <hemantp at ti.com>
Date: Wed, 2 Sep 2009 16:49:35 +0530
Subject: [PATCH] davinci: dm646x: Add support for 3.x silicon revision
+commit f63dd12da29f47c37bbc093abec098538e04357c upstream.
+
DM6467 silicon revisions 3.x have variant field in JTAGID register as '1'.
This path adds entry for the same in dm646x_ids to be able to boot on boards
with 3.x revision chips.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-a1-powerled.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-a1-powerled.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-a1-powerled.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Laurie Bradshaw <bradshaw.laurie at googlemail.com>
Date: Wed, 10 Feb 2010 16:10:43 +0000 (+0000)
Subject: [ARM] orion5x: D-link DNS-323 revision A1 power LED
-X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=b2a731aa5cbca7e0252da75e16de7ae5feb1313a
-[ARM] orion5x: D-link DNS-323 revision A1 power LED
+commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a upstream.
This patch fixes the power LED on DNS-323 revision A1, and adds timer
support for (hopefully) both A1 and B1 revisions.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-b1-poweroff.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-b1-poweroff.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-b1-poweroff.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Erik Benada <erikbenada at yahoo.ca>
Date: Sun, 24 Jan 2010 21:43:04 +0000 (-0800)
Subject: [ARM] orion5x: D-link DNS-323 rev. B1 power-off
-X-Git-Tag: v2.6.33-rc6~10^2~2^2
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=cf11052a95275c942c1f45ea5fde43ce45bbba6d;hp=e9cfa167b6b598a364c53459bee93b508f073c65
-[ARM] orion5x: D-link DNS-323 rev. B1 power-off
+commit cf11052a95275c942c1f45ea5fde43ce45bbba6d upstream.
This patch fixes power LED blinking and power-off on DNS-323 rev. B1.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-c1-add-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-c1-add-support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dns323-rev-c1-add-support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 21 Jun 2010 03:21:53 +0000 (+1000)
Subject: [ARM] orion5x: Base support for DNS-323 rev C1
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=b41d12ff57d2eccdb5d7563a23d70ce558377b64
-[ARM] orion5x: Base support for DNS-323 rev C1
+commit b41d12ff57d2eccdb5d7563a23d70ce558377b64 upstream.
This patch adds the base support for this new HW revision to the existing
dns323-setup.c file. The SoC seems to be the same as rev B1, the GPIOs
Modified: dists/sid/linux-2.6/debian/patches/features/arm/dns323-select-phylib.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dns323-select-phylib.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dns323-select-phylib.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,16 @@
-Subject: [PATCH] Orion: DNS-323 C1 requires phylib
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Fri, 16 Jul 2010 16:31:51 +0100
+Subject: [PATCH] [ARM] Orion: DNS-323 C1 requires phylib
+
+commit 3aa2c8c6a4ee77f1106cfbc537cdf970ee217d2f upstream.
The code to support the DNS-323 rev C1 added a call to
phy_register_fixup_for_uid() and therefore phylib has to
be built in.
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+---
--- a/arch/arm/mach-orion5x/Kconfig 2010-07-15 22:54:05.000000000 +0000
+++ b/arch/arm/mach-orion5x/Kconfig 2010-07-15 22:54:16.000000000 +0000
@@ -26,6 +26,7 @@
Modified: dists/sid/linux-2.6/debian/patches/features/arm/dockstar-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dockstar-support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dockstar-support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Eric Cooper <ecc at cmu.edu>
Date: Thu, 5 Aug 2010 21:38:46 +0000 (-0400)
Subject: [ARM] Kirkwood: support for Seagate DockStar
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=3fc2462b191a8dea9cd82806d7a4823f4bbb0ec0
-[ARM] Kirkwood: support for Seagate DockStar
+commit 3fc2462b191a8dea9cd82806d7a4823f4bbb0ec0 upstream.
This patch adds support for the Seagate FreeAgent DockStar, a Marvell
Sheevaplug derivative. I have already registered the DOCKSTAR machine
Modified: dists/sid/linux-2.6/debian/patches/features/arm/early-printk.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/early-printk.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/early-printk.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,8 @@
From: Catalin Marinas <catalin.marinas at arm.com>
Date: Wed, 9 Dec 2009 10:02:18 +0000 (+0000)
Subject: ARM: Add an earlyprintk debug console
-X-Git-Tag: v2.6.33-rc1~286^2~4
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=93fd03a8c6728b58879f8af20ffd55d9c32a778b
+
+commit 93fd03a8c6728b58879f8af20ffd55d9c32a778b upstream.
ARM: Add an earlyprintk debug console
Modified: dists/sid/linux-2.6/debian/patches/features/arm/guruplug.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/guruplug.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/guruplug.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Siddarth Gore <gores at marvell.com>
Date: Mon, 22 Mar 2010 09:28:20 +0000 (-0700)
Subject: [ARM] Kirkwood: Marvell GuruPlug support
-X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=d8f089d2ad35861c432618900fa08ca70c168d76
-[ARM] Kirkwood: Marvell GuruPlug support
+commit d8f089d2ad35861c432618900fa08ca70c168d76 upstream.
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0
GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
Modified: dists/sid/linux-2.6/debian/patches/features/arm/hp-t5325.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/hp-t5325.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/hp-t5325.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,16 @@
-Subject: [PATCH] Kirkwood: Add support for HP t5325 Thin Client
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Sun, 13 Jun 2010 20:00:16 +0100
+Subject: [PATCH] [ARM] Kirkwood: Add support for HP t5325 Thin Client
+
+commit b529ee4acfc65ecf4517ad4f22023d6a58e671a6 upstream.
Add support for the HP t5325 Thin Client. This thin client is based
on a Marvell Kirkwood chip at 1.2 GHz and features 512 MB RAM, 512 MB
SATA-attached flash and an XGI Volari Z11 GPU.
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+---
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 29b2163..4278271 100644
--- a/arch/arm/mach-kirkwood/Kconfig
Modified: dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-88f6282-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-88f6282-support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-88f6282-support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Saeed Bishara <saeed at marvell.com>
Date: Tue, 1 Jun 2010 15:09:27 +0000 (+0300)
Subject: [ARM] Kirkwood: Add support for 88f6282
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=33d30695fba469517a172001c43e0c21fa0b82b5
-[ARM] Kirkwood: Add support for 88f6282
+commit 33d30695fba469517a172001c43e0c21fa0b82b5 upstream.
The 6282 SoC is compatible to 6280 and features faster CPU, DDR3, additional
PCIe interface, and LCD controller. More information can be found here:
Modified: dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-pcie1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-pcie1.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-add-pcie1.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Saeed Bishara <saeed at marvell.com>
Date: Tue, 8 Jun 2010 11:21:34 +0000 (+0300)
Subject: [ARM] Kirkwood: add support for PCIe1
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=5ced0d7e0ea58a353923a49974d091460719fe04
-[ARM] Kirkwood: add support for PCIe1
+commit 5ced0d7e0ea58a353923a49974d091460719fe04 upstream.
This patch extends the kirkwood's PCIe support up to 2 controllers as in the 6282 devices.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-f6192-f6180-add-a1-rev.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-f6192-f6180-add-a1-rev.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-f6192-f6180-add-a1-rev.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Saeed Bishara <saeed at marvell.com>
Date: Tue, 1 Jun 2010 15:09:26 +0000 (+0300)
Subject: [ARM] Kirkwood: add support for rev A1 of the 88f6192 and 88f6180 chips.
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=c0eb6394f0aaae6abc172d278feebb94b3a8624f
-[ARM] Kirkwood: add support for rev A1 of the 88f6192 and 88f6180 chips.
+commit c0eb6394f0aaae6abc172d278feebb94b3a8624f upstream.
Signed-off-by: Saeed Bishara <saeed at marvell.com>
Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
Modified: dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-factorize-pcie-init-code
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-factorize-pcie-init-code Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/kirkwood-factorize-pcie-init-code Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Nicolas Pitre <nico at fluxnic.net>
Date: Mon, 5 Jul 2010 17:59:56 +0000 (-0400)
Subject: [ARM] Kirkwood: more factorization of the PCIe init code
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=8a04d063c4e21fae8b290f89588ef59c46b1bf45
-[ARM] Kirkwood: more factorization of the PCIe init code
+commit 8a04d063c4e21fae8b290f89588ef59c46b1bf45 upstream.
Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
---
Modified: dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-add-slab.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-add-slab.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-add-slab.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,9 @@
From: Tejun Heo <tj at kernel.org>
Date: Wed, 24 Mar 2010 08:04:11 +0000 (+0900)
Subject: include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
-X-Git-Tag: v2.6.34-rc4~71^2~5
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5a0e3ad6af8660be21ca98a971cd00f331318c05
-include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
+[Path-restricted version of
+ commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 upstream.]
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
Modified: dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-blink-set.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-blink-set.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/leds-gpio-blink-set.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Sat, 22 May 2010 10:54:55 +0000 (+1000)
Subject: leds: leds-gpio: Change blink_set callback to be able to turn off blinking
-X-Git-Tag: v2.6.35-rc1~32^2~5
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2146325df2c2640059a9e064890c30c6e259b458
-leds: leds-gpio: Change blink_set callback to be able to turn off blinking
+commit 2146325df2c2640059a9e064890c30c6e259b458 upstream.
The leds-gpio blink_set() callback follows the same prototype as the
main leds subsystem blink_set() one.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/marvell-phy-expose-ids.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/marvell-phy-expose-ids.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/marvell-phy-expose-ids.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 21 Jun 2010 03:20:46 +0000 (+1000)
Subject: net/phy/marvell: Expose IDs and flags in a .h and add dns323 LEDs setup flag
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=5ca4425e3e9bae222c6c9f399aeaeaa7e85c74d7
-net/phy/marvell: Expose IDs and flags in a .h and add dns323 LEDs setup flag
+commit 5ca4425e3e9bae222c6c9f399aeaeaa7e85c74d7 upstream.
This moves the various known Marvell PHY IDs to include/linux/marvell_phy.h
along with dev_flags definitions for use by the driver.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/mpp-update-for-f6282.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Benjamin Zores <benjamin.zores at alcatel-lucent.com>
Date: Tue, 8 Jun 2010 08:00:22 +0000 (+0200)
Subject: [ARM] Kirkwood: update MPP definition.
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=6605742f2a352c62e56b50e0d4321583181fb287
-[ARM] Kirkwood: update MPP definition.
+commit 6605742f2a352c62e56b50e0d4321583181fb287 upstream.
Add MPP definitions for Marvell Kirkwood 88F6282 revision.
Update some defines to reflect datasheet's MPP names.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/openrd-combine.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/openrd-combine.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/openrd-combine.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Alexander Clouter <alex at digriz.org.uk>
Date: Mon, 18 Jan 2010 23:38:19 +0000 (+0000)
Subject: [ARM] kirkwood: combine support for openrd base/client support
-X-Git-Tag: v2.6.34-rc2~66^2~53^2~9
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b2fdb5660fccc060e47658baad8911a963397ced
-[ARM] kirkwood: combine support for openrd base/client support
+commit b2fdb5660fccc060e47658baad8911a963397ced upstream.
Inspired by the mach-ep93xx flattening work, there is really not
much difference between the OpenRD base and client board support
Modified: dists/sid/linux-2.6/debian/patches/features/arm/openrd-uart-selection.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/openrd-uart-selection.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/openrd-uart-selection.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Tanmay Upadhyay <tanmay.upadhyay at einfochips.com>
Date: Thu, 26 Aug 2010 05:41:58 +0000 (+0530)
Subject: [ARM] OpenRD: Enable SD/UART selection for serial port 1
-X-Git-Url:
-http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=f2ac38dcbc95c19ce97207f1e02d0623c7052610
-[ARM] OpenRD: Enable SD/UART selection for serial port 1
+commit f2ac38dcbc95c19ce97207f1e02d0623c7052610 upstream.
This patch enables users to choose either the SDIO interface or UART1
(RS232/RS485). The selection can be done through kernel parameter.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/openrd-ultimate.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/openrd-ultimate.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/openrd-ultimate.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,21 +1,16 @@
-Hi!
-This patch adds support for the OpenRD Ultimate machine(could be found at http://www.arm.linux.org.uk/developer/machines/list.php?id=2884)
+From: Dmytro Milinevskyy <milinevskyy at gmail.com>
+Date: Thu, 10 Jun 2010 22:12:55 +0300
+Subject: [PATCH] [ARM] Marvell OpenRD-Ultimate machine support
-Besides adding machine description this patch adds correction for PHY address for Ultimate version.
+commit 43b56074b69f3b6d0296e7986e792c7adb1d89c6 upstream.
-Differences from the previous attempt:
- - Correctly filled instances of mv643xx_eth_platform_data in case of ultimate version.
- - Do PCIE initialization for Ultimate version along with Base and Client
- - Init ge01 if (!openrd-base) to make the code cleaner
-
-Regards,
-
--- Dmytro Milinevskyy
+This patch adds support for the OpenRD Ultimate machine (could be found
+at http://www.arm.linux.org.uk/developer/machines/list.php?id=2884)
Signed-off-by: Dmytro Milinevskyy <milinevskyy at gmail.com>
-
+Acked-by: Lennert Buytenhek <buytenh at wantstofly.org>
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
[tbm: adapted Kconfig]
-
---
arch/arm/mach-kirkwood/Kconfig | 7 +++++++
Modified: dists/sid/linux-2.6/debian/patches/features/arm/orion-add-rnb-line-support.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/orion-add-rnb-line-support.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/orion-add-rnb-line-support.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Ben Dooks <ben at simtec.co.uk>
Date: Tue, 20 Apr 2010 09:26:18 +0000 (+0100)
Subject: mtd: orion/kirkwood: add RnB line support to orion mtd driver
-X-Git-Tag: v2.6.35-rc1~465^2~42
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=eedfea252690435858722a8da1109d104d639087
-mtd: orion/kirkwood: add RnB line support to orion mtd driver
+commit eedfea252690435858722a8da1109d104d639087 upstream.
Add support for a board to register a callback to get the state of the
RnB line if it has it attached.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/orion-allow-rnb-callback
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/orion-allow-rnb-callback Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/orion-allow-rnb-callback Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Ben Dooks <ben at simtec.co.uk>
Date: Tue, 20 Apr 2010 09:26:19 +0000 (+0100)
Subject: mtd: kirkwood: allow machines to register RnB callback
-X-Git-Tag: v2.6.35-rc1~465^2~41
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=010937ec9a550e2df97f87252a9d12d8a534c6d8
-mtd: kirkwood: allow machines to register RnB callback
+commit 010937ec9a550e2df97f87252a9d12d8a534c6d8 upstream.
Add a kirkwood_nand_init_rnb() call to allow boards which
have RnB line detection to register this instead of a
Modified: dists/sid/linux-2.6/debian/patches/features/arm/orion5x-fix-soft-reset.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/orion5x-fix-soft-reset.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/orion5x-fix-soft-reset.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 21 Jun 2010 03:22:08 +0000 (+1000)
Subject: [ARM] orion5x: Fix soft-reset for some platforms
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=bdb0eafd534a2319c00bbc7655ddc9749a58aeda
-[ARM] orion5x: Fix soft-reset for some platforms
+commit bdb0eafd534a2319c00bbc7655ddc9749a58aeda upstream.
Some platforms, such as the DNS-323 rev C requires the soft reset line
to be toggled on and back off for the reset to work.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-board.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-board.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-board.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,15 +1,13 @@
From: John Holland <john.holland at cellent-fs.de>
Date: Fri, 19 Feb 2010 22:10:58 +0000 (+0100)
Subject: [ARM] eSATA SheevaPlug basic board support
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d8ecb3490050b33bf46ce77c7f239e0fc51a6835
-[ARM] eSATA SheevaPlug basic board support
+commit d8ecb3490050b33bf46ce77c7f239e0fc51a6835 upstream.
Allow basic eSATA SheevaPlug board configuration and build.
Signed-off-by: John Holland <john.holland at cellent-fs.de>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
---
---
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
Modified: dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-mpp.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-mpp.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-mpp.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: John Holland <john.holland at cellent-fs.de>
Date: Fri, 19 Feb 2010 22:11:04 +0000 (+0100)
Subject: [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d5b5746bed1023e4a55f96405422d3e51968fa43
-[ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP
+commit d5b5746bed1023e4a55f96405422d3e51968fa43 upstream.
Accept SD CD and SD WP in accordance to
http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf
@@ -11,7 +10,6 @@
Signed-off-by: John Holland <john.holland at cellent-fs.de>
Signed-off-by: Nicolas Pitre <nico at marvell.com>
---
---
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
Modified: dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-sata.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-sata.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/sheevaplug-esata-sata.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,9 +1,8 @@
From: John Holland <john.holland at cellent-fs.de>
Date: Fri, 19 Feb 2010 22:11:01 +0000 (+0100)
Subject: [ARM] eSATA SheevaPlug: configure SoC SATA interface
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d7b222d708e6eff0cf47928f439c8bcf49f10bb6
-[ARM] eSATA SheevaPlug: configure SoC SATA interface
+commit d7b222d708e6eff0cf47928f439c8bcf49f10bb6 upstream.
Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug.
Modified: dists/sid/linux-2.6/debian/patches/features/arm/ts-plus.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts-plus.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ts-plus.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,5 +1,9 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Mon, 6 Dec 2010 21:53:16 +0000
Subject: [PATCH] Kirkwood: Add support for 6282 based QNAP devices
+commit ce56d169976488e888878eed5f1bc304cf116c43 upstream.
+
Add support for the QNAP NAS devices based on Marvell's 6282 Kirkwood
chip (TS-119P+, TS-219P+ and TS-419P+). The differences to the 6281
based devices are:
@@ -7,7 +11,9 @@
- GPIOs used for buttons (TS-119P+/TS-219P+)
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Acked-by: Saeed Bishara <saeed.bishara at gmail.com>
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+---
--- a/arch/arm/mach-kirkwood/ts219-setup.c 2010-12-06 22:07:50.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts219-setup.c 2010-12-06 22:09:57.000000000 +0000
@@ -153,6 +153,8 @@
Modified: dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp36.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp36.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp36.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,10 +1,8 @@
From: Martin Michlmayr <tbm at cyrius.com>
Date: Thu, 5 Nov 2009 18:09:01 +0000 (+0000)
Subject: [ARM] Kirkwood: Add MPP36 for QNAP TS-11x/TS-21x
-X-Git-Tag: v2.6.33-rc1~12^2~4^2~7
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnico%2Forion.git;a=commitdiff_plain;h=b421950cdc7d0ac900414aa582c5e35aeab921c0
-[ARM] Kirkwood: Add MPP36 for QNAP TS-11x/TS-21x
+commit b421950cdc7d0ac900414aa582c5e35aeab921c0 upstream.
MPP36 is used on the QNAP TS-11x/TS-21x devices to indicate how
much RAM there is: it's high for 512 MB RAM (TS-x19) and low for
Modified: dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp44.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp44.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ts219-mpp44.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,4 +1,8 @@
-Subject: [PATCH] Kirkwood: Add MPP44 (board ID) for QNAP TS-11x/TS-21x
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Sun, 13 Jun 2010 19:37:18 +0100
+Subject: [PATCH] [ARM] Kirkwood: Add MPP44 (board ID) on TS-219
+
+commit 128190ebe92fee69f26d225036ba857e0fffb2e8 upstream.
MPP44 can be used to differentiate between one-bay (TS-11x) and
two-bay (TS-21x) devices.
@@ -8,7 +12,8 @@
that you could fake the MPP44 value by changing the boot loader.
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+---
--- a/arch/arm/mach-kirkwood/ts219-setup.c 2010-06-13 18:31:20.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts219-setup.c 2010-06-13 18:31:54.000000000 +0000
@@ -153,6 +153,7 @@
Modified: dists/sid/linux-2.6/debian/patches/features/arm/ts41x-export-jp1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts41x-export-jp1.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ts41x-export-jp1.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,11 +1,16 @@
-Kirkwood: Export GPIO indicating jumper setting of JP1
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Sat, 22 May 2010 02:23:10 +0100
+Subject: [PATCH] [ARM] Kirkwood: Export GPIO indicating jumper setting of JP1
+
+commit f9afdd376b297092fa58254309b9c3cb9dfac698 upstream.
Export GPIO 45 which is used to indicate the setting of the JP1
jumper. This is useful for userland tools, such as qcontrol, to
see whether the LCD or a serial console is connected.
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+---
--- a/arch/arm/mach-kirkwood/ts41x-setup.c 2010-05-21 19:27:57.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c 2010-05-21 19:28:34.000000000 +0000
@@ -21,6 +21,7 @@
Modified: dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,15 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Thu, 5 Nov 2009 17:45:32 +0000
+Subject: [PATCH] [ARM] Kirkwood: Add support for QNAP TS-41x Turbo NAS
+
+commit f3a131b90b8f9bbcf46edc3bdd5246a744ba0017 upstream.
+
+Add support for the QNAP TS-410, TS-410U, TS-419P and TS-419U
+Turbo NAS.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+---
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 0aca451..d58e8b0 100644
--- a/arch/arm/mach-kirkwood/Kconfig
Modified: dists/sid/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,12 @@
-Based on:
-
From: Kumar Gala <galak at kernel.crashing.org>
+Date: Sun, 18 Oct 2009 13:55:55 -0500
Subject: [PATCH] powerpc/fsl: Add PCI device ids for new QoirQ chips
+commit a3f62bd2b20c769ddc989b242ddd274179e19ee6 upstream.
+
+Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
+[bwh: Adjust for 2.6.32]
+---
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -392,8 +392,22 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);
Modified: dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/sparc/video-sunxvr500-intergraph.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,3 +1,17 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 26 Feb 2010 04:37:09 -0800
+Subject: [PATCH] sunxvr500: Additional PCI id for sunxvr500 driver
+
+commit 275143e9b237dd7e0b6d01660fd9b8acd9922fa7 upstream.
+
+Intergraph bought 3D Labs and some XVR-500 chips have Intergraph's
+vendor id.
+
+Reported-by: Jurij Smakov <jurij at wooyd.org>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: stable at kernel.org
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
diff -aur a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
--- a/drivers/video/sunxvr500.c 2008-11-20 18:02:37.000000000 -0500
+++ b/drivers/video/sunxvr500.c 2008-12-01 15:43:04.000000000 -0500
Modified: dists/sid/linux-2.6/debian/patches/features/x86/iTCO_wdt-Add-support-for-Intel-Ibex-Peak.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/x86/iTCO_wdt-Add-support-for-Intel-Ibex-Peak.patch Sun Jan 9 19:35:43 2011 (r16798)
+++ dists/sid/linux-2.6/debian/patches/features/x86/iTCO_wdt-Add-support-for-Intel-Ibex-Peak.patch Sun Jan 9 21:17:20 2011 (r16799)
@@ -1,8 +1,9 @@
-From 79e8941dda254505bb8af37b3a009165dfb7e98a Mon Sep 17 00:00:00 2001
From: Seth Heasley <seth.heasley at intel.com>
Date: Wed, 11 Nov 2009 02:24:01 +0100
Subject: [PATCH] [WATCHDOG] iTCO_wdt: Add support for Intel Ibex Peak
+commit 79e8941dda254505bb8af37b3a009165dfb7e98a upstream.
+
Add the Intel Ibex Peak (PCH) Device IDs to iTCO_wdt.c.
Signed-off-by: Seth Heasley <seth.heasley at intel.com>
More information about the Kernel-svn-changes
mailing list