[kernel] r19856 - in dists/trunk/linux: . debian debian/config debian/config/armel debian/config/armhf debian/config/kernelarch-x86 debian/config/powerpc debian/installer debian/installer/armhf debian/installer/armhf/modules/armhf-mx5 debian/installer/armhf/modules/armhf-vexpress debian/installer/modules debian/patches debian/patches/bugfix/all debian/patches/bugfix/x86 debian/patches/debian debian/patches/features/all/alx debian/templates
Ben Hutchings
benh at alioth.debian.org
Mon Feb 25 03:35:41 UTC 2013
Author: benh
Date: Mon Feb 25 03:35:39 2013
New Revision: 19856
Log:
Merge changes from sid up to 3.2.39-1
Drop most patches as they're already upstream in 3.8 or early.
Refresh some others for 3.8. In particular, remove use of __devinit from
debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
as this macro is no longer defined or needed.
Added:
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules
dists/trunk/linux/debian/installer/armhf/modules/armhf-vexpress/
- copied from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-vexpress/
dists/trunk/linux/debian/installer/modules/mtd-modules
- copied unchanged from r19855, dists/sid/linux/debian/installer/modules/mtd-modules
dists/trunk/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch
dists/trunk/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch
dists/trunk/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch
dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch
dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch
- copied unchanged from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch
dists/trunk/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch
- copied, changed from r19855, dists/sid/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch
dists/trunk/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
- copied, changed from r19855, dists/sid/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
dists/trunk/linux/debian/patches/features/all/alx/
- copied from r19855, dists/sid/linux/debian/patches/features/all/alx/
Deleted:
dists/trunk/linux/debian/installer/armhf/ignore-dups
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/nic-modules
dists/trunk/linux/debian/patches/debian/radeon-no-modeset-without-firmware.patch
Modified:
dists/trunk/linux/ (props changed)
dists/trunk/linux/debian/changelog
dists/trunk/linux/debian/config/armel/config.versatile
dists/trunk/linux/debian/config/armhf/config.mx5
dists/trunk/linux/debian/config/armhf/config.vexpress
dists/trunk/linux/debian/config/armhf/defines
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
dists/trunk/linux/debian/config/powerpc/config
dists/trunk/linux/debian/installer/armhf/kernel-versions
dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mmc-modules
dists/trunk/linux/debian/installer/armhf/package-list
dists/trunk/linux/debian/installer/modules/input-modules
dists/trunk/linux/debian/installer/modules/mmc-modules
dists/trunk/linux/debian/installer/modules/nic-extra-modules
dists/trunk/linux/debian/installer/modules/nic-wireless-modules
dists/trunk/linux/debian/installer/package-list
dists/trunk/linux/debian/patches/series
dists/trunk/linux/debian/rules.real
dists/trunk/linux/debian/templates/control.source.in
Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/changelog Mon Feb 25 03:35:39 2013 (r19856)
@@ -374,6 +374,209 @@
-- Ben Hutchings <ben at decadent.org.uk> Sun, 04 Mar 2012 20:27:42 +0000
+linux (3.2.39-1) unstable; urgency=high
+
+ * New upstream stable update:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.36
+ - freezer: PF_FREEZER_NOSIG should be cleared along with PF_NOFREEZE
+ (Closes: #697077)
+ - tmpfs: fix shared mempolicy leak
+ - virtio: 9p: correctly pass physical address to userspace for high pages
+ - virtio: force vring descriptors to be allocated from lowmem
+ - USB: EHCI: bugfix: urb->hcpriv should not be NULL
+ - rcu: Fix batch-limit size problem
+ - Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]
+ (Closes: #700550)
+ - mvsas: fix undefined bit shift
+ - ALSA: usb-audio: Avoid autopm calls after disconnection; Fix missing
+ autopm for MIDI input (Closes: #664068)
+ - target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
+ - SCSI: fix Null pointer dereference on disk error
+ - proc: pid/status: show all supplementary groups
+ - nfsd4: fix oops on unusual readlike compound
+ - ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
+ - sctp: fix memory leak in sctp_datamsg_from_user() when copy from user
+ space fails
+ - ne2000: add the right platform device
+ - irda: sir_dev: Fix copy/paste typo
+ - ipv4: ip_check_defrag must not modify skb before unsharing
+ - telephony: ijx: buffer overflow in ixj_write_cid()
+ - udf: fix memory leak while allocating blocks during write
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.37
+ - ext4: fix extent tree corruption caused by hole punch
+ - jbd2: fix assertion failure in jbd2_journal_flush()
+ - tmpfs mempolicy: fix /proc/mounts corrupting memory
+ - sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
+ - inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and
+ dccp_v4/6_request_recv_sock
+ - net: sched: integer overflow fix
+ - tcp: implement RFC 5961 3.2
+ - tcp: implement RFC 5961 4.2
+ - tcp: refine SYN handling in tcp_validate_incoming
+ - tcp: tcp_replace_ts_recent() should not be called from
+ tcp_validate_incoming()
+ - tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation
+ - RDMA/nes: Fix for crash when registering zero length MR for CQ
+ - ACPI : do not use Lid and Sleep button for S5 wakeup
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.38
+ - staging: comedi: comedi_test: fix race when cancelling command
+ - mm: use aligned zone start for pfn_to_bitidx calculation
+ - [s390] s390/time: fix sched_clock() overflow (Closes: #698382)
+ - [i386] xen: Fix stack corruption in xen_failsafe_callback for 32bit
+ PVOPS guests. (CVE-2013-0190)
+ - KVM: PPC: Emulate dcbf
+ - evm: checking if removexattr is not a NULL
+ - ath9k_htc: Fix memory leak
+ - ath9k: do not link receive buffers during flush
+ - ath9k: fix double-free bug on beacon generate failure
+ - x86/msr: Add capabilities check
+ - can: c_can: fix invalid error codes
+ - can: ti_hecc: fix invalid error codes
+ - can: pch_can: fix invalid error codes
+ - smp: Fix SMP function call empty cpu mask race
+ - xfs: Fix possible use-after-free with AIO
+ - EDAC: Test correct variable in ->store function
+ - samsung-laptop: Disable on EFI hardware, to avoid damaging it
+ - NFS: Don't silently fail setattr() requests on mountpoints
+ - intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
+ - ALSA: usb-audio: Fix regression by disconnection-race-fix patch
+ (Closes: #696321)
+ - printk: fix buffer overflow when calling log_prefix function from
+ call_console_drivers
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.39
+ - USB: XHCI: fix memory leak of URB-private data
+ - sched/rt: Use root_domain of rt_rq not current processor
+ - mwifiex: fix incomplete scan in case of IE parsing error
+ - x86-64: Replace left over sti/cli in ia32 audit exit code
+ - Bluetooth: Fix handling of unexpected SMP PDUs
+ - ptrace/x86: Partly fix set_task_blockstep()->update_debugctlmsr() logic
+ - Fix race condition with PTRACE_SETREGS and fatal signal (CVE-2013-0871)
+ + ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
+ + ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
+ + wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
+ task
+ - net: prevent setting ttl=0 via IP_TTL
+ - ipv6: fix header length calculation in ip6_append_data()
+ - netxen: fix off by one bug in netxen_release_tx_buffer()
+ - r8169: remove the obsolete and incorrect AMD workaround
+ - net: loopback: fix a dst refcounting issue
+ - packet: fix leakage of tx_ring memory
+ - net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
+ - net: sctp: sctp_endpoint_free: zero out secret key data
+ - xen/netback: shutdown the ring if it contains garbage. (CVE-2013-0216)
+ - xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
+ - xen/netback: free already allocated memory on failure in
+ xen_netbk_get_requests
+ - netback: correct netbk_tx_err to handle wrap around. (CVE-2013-0217)
+ - tcp: frto should not set snd_cwnd to 0
+ - tcp: fix for zero packets_in_flight was too broad
+ - tcp: fix MSG_SENDPAGE_NOTLAST logic
+ - bridge: Pull ip header into skb->data before looking into ip header.
+ (Closes: #697903)
+ - x86/xen: don't assume %ds is usable in xen_iret for 32-bit PVOPS.
+ (CVE-2013-0228)
+
+ [ Aurelien Jarno ]
+ * [armhf/vexpress] Add kernel udebs.
+
+ [ Julien Cristau ]
+ * Backport drm and agp subsystems from Linux 3.4.29 (closes: #687442)
+ - [x86] i915: Fixes freezes on Ivy Bridge (Closes: #689268)
+ - nouveau: Support for newer nvidia chipsets (Closes: #690284)
+ - radeon: Support for HD7000 'Southern Islands' chips
+ - [x86] drm/i915: add Ivy Bridge GT2 Server entries (Closes: #684767)
+ - [x86] drm/i915: Close race between processing unpin task and queueing
+ the flip
+
+ [ Ben Hutchings ]
+ * Input: wacom - fix touch support for Bamboo Fun CTH-461
+ * media/rc: Add iguanair driver from Linux 3.7 (Closes: #696925)
+ * rt2800: add chipset revision RT5390R support (Closes: #696592)
+ * [armhf/mx5] mtd: Enable MTD_BLOCK as module
+ * [armhf/mx5] udeb: Add missing storage drivers (Closes: #697128)
+ - Add ata-modules including libata, pata-modules including pata_imx,
+ sata-modules including ahci_platform
+ - Add sdhci-esdhc-imx to mmc-modules
+ - Add mtd-modules including mtd, mtdblock and m25p80
+ * [armhf] udeb: Fix network driver selection
+ - [armhf/mx5] Remove nic-modules
+ - [armhf/vexpress] Add usb-modules
+ - Add standard set of USB drivers to nic-usb-modules
+ - Add nic-wireless-modules
+ * be2net: Apply backported fixes requested by Emulex (Closes: #697479)
+ - be2net: do not modify PCI MaxReadReq size
+ - be2net: fix reporting number of actual rx queues
+ - be2net: do not use SCRATCHPAD register
+ - be2net: reduce gso_max_size setting to account for ethernet header.
+ - be2net: Increase statistics structure size for skyhawk.
+ - be2net: Explicitly clear the reserved field in the Tx Descriptor
+ - be2net: Regression bug wherein VFs creation broken for multiple cards.
+ - be2net: Fix to trim skb for padded vlan packets to workaround an ASIC Bug
+ - be2net: Fix Endian
+ - be2net: Enable RSS UDP hashing for Lancer and Skyhawk
+ - be2net: dont pull too much data in skb linear part
+ - be2net: Fix to parse RSS hash from Receive completions correctly.
+ - be2net: Avoid disabling BH in be_poll()
+ * udeb: Add specialised USB keyboard/mouse drivers to input-modules:
+ hid-a4tech, hid-cypress, hid-ezkey (Closes: #697035), hid-kensington,
+ hid-keytouch, hid-kye, hid-multitouch, hid-ortek, hid-primax,
+ hid-quanta, hid-samsung, hid-speedlink
+ * radeon: Firmware is required for DRM and KMS on R600 onward, but not
+ for KMS on earlier chips (Closes: #697229)
+ * [!powerpc] radeon: Reenable DRM_RADEON_KMS, as it apparently works on
+ most non-PowerMac systems
+ * fs: cachefiles: add support for large files in filesystem caching
+ (Closes: #698376)
+ * [rt] Update to 3.2.38-rt57:
+ - sched: Adjust sched_reset_on_fork when nothing else changes
+ - sched: Queue RT tasks to head when prio drops
+ - sched: Consider pi boosting in setscheduler
+ - sched: Init idle->on_rq in init_idle()
+ - sched: Check for idle task in might_sleep()
+ - mm: swap: Initialize local locks early
+ * [armel/versatile,armhf/vexpress] i2c: Enable I2C, I2C_VERSATILE as modules
+ (Closes: #696182)
+ * ext4: Fix corruption by hole punch in large files (Closes: #685726)
+ - rewrite punch hole to use ext4_ext_remove_space()
+ - fix hole punch failure when depth is greater than 0
+ - fix kernel BUG on large-scale rm -rf commands
+ * md: protect against crash upon fsync on ro array (Closes: #696650)
+ * net: Add alx driver for Atheros AR8161 and AR8162 (Closes: #699129)
+ - Mark as staging, since it has not been accepted upstream
+ * [armel/kirkwood] rtc-s35390a: add wakealarm support (Closes: #693997)
+ * [x86] i915: Invert backlight brightness control for various models
+ including Packard Bell NCL20 (Closes: #627372) and eMachines G725
+ (Closes: #680737)
+ - Also allow this behaviour to be enabled via module parameter
+ invert_brightness=1
+ * [amd64] edac: Enable EDAC_SBRIDGE as module (Closes: #699283)
+ * SCSI: Add virtio_scsi driver (Closes: #686636)
+ * [x86] sound: Enable LINE6_USB as module (Closes: #700211)
+ - Apply upstream changes up to Linux 3.8-rc1
+ * [armhf/mx5] Update description to mention i.MX53
+ * mm: Try harder to allocate vmemmap blocks (Closes: #699913)
+ * aufs: Update to aufs3.2-20130204:
+ - support for syncfs(2)
+ - possible bugfix, race in lookup
+ - bugfix, half refreshed iinfo
+ - possible bugfix, au_lkup_by_ino() returns ESTALE
+ * [x86] efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot
+ parameter
+ * [x86] efi: Make "noefi" really disable EFI runtime serivces
+ * drm, agp: Update to 3.4.32
+ - drm/radeon: add WAIT_UNTIL to the non-VM safe regs list for cayman/TN
+ - drm/radeon: prevent crash in the ring space allocation
+ * linux-image-dbg: Add symlinks to vmlinux from the locations expected by
+ kdump-tools (Closes: #700418), systemtap and others
+ * mm: fix pageblock bitmap allocation (fixes regression in 3.2.38)
+ * USB: usb-storage: unusual_devs update for Super TOP SATA bridge
+
+ [ Cyril Brulebois ]
+ * Bump python build-dep, needed since the switch from local SortedDict
+ to collections.OrderedDict (new in version 2.7). (Closes: #697740)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 25 Feb 2013 00:36:51 +0000
+
linux (3.2.35-2) unstable; urgency=low
* [ia64] Make IPV6 built-in (fixes FTBFS)
Modified: dists/trunk/linux/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.versatile Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/armel/config.versatile Mon Feb 25 03:35:39 2013 (r19856)
@@ -145,7 +145,16 @@
##
## file: drivers/i2c/Kconfig
##
-# CONFIG_I2C is not set
+CONFIG_I2C=m
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_VERSATILE=m
##
## file: drivers/input/keyboard/Kconfig
Modified: dists/trunk/linux/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.mx5 Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/armhf/config.mx5 Mon Feb 25 03:35:39 2013 (r19856)
@@ -79,19 +79,20 @@
##
## file: drivers/mmc/card/Kconfig
##
-CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK=m
##
## file: drivers/mmc/host/Kconfig
##
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_MXC=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_MXC=m
##
## file: drivers/mtd/Kconfig
##
#. Efika has SPI NOR MTD device
CONFIG_MTD=m
+CONFIG_MTD_BLOCK=m
##
## file: drivers/net/wireless/mwifiex/Kconfig
Modified: dists/trunk/linux/debian/config/armhf/config.vexpress
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.vexpress Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/armhf/config.vexpress Mon Feb 25 03:35:39 2013 (r19856)
@@ -29,6 +29,20 @@
CONFIG_PATA_PLATFORM=m
##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C=m
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_VERSATILE=m
+
+##
## file: drivers/input/serio/Kconfig
##
CONFIG_SERIO_AMBAKMI=y
Modified: dists/trunk/linux/debian/config/armhf/defines
==============================================================================
--- dists/trunk/linux/debian/config/armhf/defines Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/armhf/defines Mon Feb 25 03:35:39 2013 (r19856)
@@ -15,8 +15,8 @@
image-file: arch/arm/boot/zImage
[mx5_description]
-hardware: Freescale i.MX51
-hardware-long: Support for Freescale i.MX51 family of processors
+hardware: Freescale i.MX51/53
+hardware-long: Freescale i.MX51 or i.MX53 based systems
[omap_build]
image-file: arch/arm/boot/zImage
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/config Mon Feb 25 03:35:39 2013 (r19856)
@@ -418,7 +418,7 @@
##
## file: drivers/gpu/drm/radeon/Kconfig
##
-# CONFIG_DRM_RADEON_KMS is not set
+CONFIG_DRM_RADEON_KMS=y
##
## file: drivers/gpu/drm/udl/Kconfig
@@ -1899,6 +1899,7 @@
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
##
## file: drivers/net/ethernet/broadcom/Kconfig
@@ -4830,6 +4831,11 @@
CONFIG_UNIX_DIAG=m
##
+## file: net/wanrouter/Kconfig
+##
+# CONFIG_WAN_ROUTER is not set
+
+##
## file: net/wimax/Kconfig
##
CONFIG_WIMAX=m
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Mon Feb 25 03:35:39 2013 (r19856)
@@ -466,11 +466,6 @@
CONFIG_DRM_I2C_SIL164=m
##
-## file: drivers/gpu/drm/radeon/Kconfig
-##
-CONFIG_DRM_RADEON_KMS=y
-
-##
## file: drivers/gpu/drm/vmwgfx/Kconfig
##
CONFIG_DRM_VMWGFX=m
@@ -1338,6 +1333,13 @@
CONFIG_EASYCAP=m
##
+## file: drivers/staging/line6/Kconfig
+##
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_DUMP_PCM is not set
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+
+##
## file: drivers/staging/media/go7007/Kconfig
##
# CONFIG_VIDEO_GO7007 is not set
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64 Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-64 Mon Feb 25 03:35:39 2013 (r19856)
@@ -57,6 +57,11 @@
CONFIG_AGP_AMD64=y
##
+## file: drivers/edac/Kconfig
+##
+CONFIG_EDAC_SBRIDGE=m
+
+##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_I2C_STUB=m
Modified: dists/trunk/linux/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/powerpc/config Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/config/powerpc/config Mon Feb 25 03:35:39 2013 (r19856)
@@ -207,6 +207,11 @@
CONFIG_DRM_I2C_SIL164=m
##
+## file: drivers/gpu/drm/radeon/Kconfig
+##
+# CONFIG_DRM_RADEON_KMS is not set
+
+##
## file: drivers/hid/usbhid/Kconfig
##
CONFIG_USB_HID=m
Modified: dists/trunk/linux/debian/installer/armhf/kernel-versions
==============================================================================
--- dists/trunk/linux/debian/installer/armhf/kernel-versions Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/armhf/kernel-versions Mon Feb 25 03:35:39 2013 (r19856)
@@ -1,2 +1,3 @@
-# arch version flavour installedname suffix build-depends
-armhf - mx5 - y -
+# arch version flavour installedname suffix build-depends
+armhf - mx5 - y -
+armhf - vexpress - y -
Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules (from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/ata-modules)
@@ -0,0 +1 @@
+libata
Modified: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mmc-modules
==============================================================================
--- dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mmc-modules Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mmc-modules Mon Feb 25 03:35:39 2013 (r19856)
@@ -1,2 +1,2 @@
#include <mmc-modules>
-tifm_sd -
+sdhci-esdhc-imx
Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules (from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/mtd-modules)
@@ -0,0 +1,4 @@
+#include <mtd-modules>
+
+# SPI NOR flash for Efika
+m25p80
Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules (from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules)
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules (from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/pata-modules)
@@ -0,0 +1 @@
+pata_imx
Copied: dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules (from r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/armhf/modules/armhf-mx5/sata-modules)
@@ -0,0 +1 @@
+ahci_platform
Modified: dists/trunk/linux/debian/installer/armhf/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/armhf/package-list Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/armhf/package-list Mon Feb 25 03:35:39 2013 (r19856)
@@ -5,6 +5,7 @@
#
Package: kernel-image
Provides_mx5: rtc-modules
+Provides_vexpress: rtc-modules
Package: ext2-modules
Depends: kernel-image, core-modules
@@ -26,7 +27,6 @@
Priority: extra
Package: ext4-modules
-Priority_ixp4xx: extra
Package: nbd-modules
Depends: kernel-image
Modified: dists/trunk/linux/debian/installer/modules/input-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/input-modules Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/modules/input-modules Mon Feb 25 03:35:39 2013 (r19856)
@@ -1,12 +1,24 @@
hid
usbhid
+hid-a4tech ?
hid-apple ?
hid-belkin ?
-hid-microsoft ?
+hid-cherry ?
+hid-cypress ?
+hid-ezkey ?
+hid-kensington ?
+hid-keytouch ?
+hid-kye ?
hid-logitech ?
hid-logitech-dj
+hid-microsoft ?
hid-monterey ?
+hid-multitouch ?
+hid-ortek ?
+hid-primax ?
+hid-quanta ?
+hid-samsung ?
+hid-speedlink ?
hid-sunplus ?
-hid-cherry ?
synaptics_usb ?
wistron_btns ?
Modified: dists/trunk/linux/debian/installer/modules/mmc-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/mmc-modules Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/modules/mmc-modules Mon Feb 25 03:35:39 2013 (r19856)
@@ -2,4 +2,4 @@
sdhci
sdhci-pci ?
ricoh_mmc ?
-tifm_sd
+tifm_sd ?
Copied: dists/trunk/linux/debian/installer/modules/mtd-modules (from r19855, dists/sid/linux/debian/installer/modules/mtd-modules)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/installer/modules/mtd-modules Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/installer/modules/mtd-modules)
@@ -0,0 +1,2 @@
+mtd
+mtdblock
Modified: dists/trunk/linux/debian/installer/modules/nic-extra-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-extra-modules Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/modules/nic-extra-modules Mon Feb 25 03:35:39 2013 (r19856)
@@ -1,5 +1,6 @@
82596 ?
ac3200 ?
+alx ?
amd8111e ?
at1700 ?
cs89x0 ?
Modified: dists/trunk/linux/debian/installer/modules/nic-wireless-modules
==============================================================================
--- dists/trunk/linux/debian/installer/modules/nic-wireless-modules Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/modules/nic-wireless-modules Mon Feb 25 03:35:39 2013 (r19856)
@@ -3,13 +3,13 @@
hermes ?
ipw2100 ?
ipw2200 ?
-orinoco
-hostap_pci
-orinoco_plx
+orinoco ?
+hostap_pci ?
+orinoco_plx ?
orinoco_nortel ?
orinoco_tmd ?
prism54 ?
-p54pci
+p54pci ?
p54usb
wavelan ?
usb8xxx ?
Modified: dists/trunk/linux/debian/installer/package-list
==============================================================================
--- dists/trunk/linux/debian/installer/package-list Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/installer/package-list Mon Feb 25 03:35:39 2013 (r19856)
@@ -466,3 +466,9 @@
Priority: extra
Description: FUSE modules
This package contains the Filesystem in Userspace (FUSE) module.
+
+Package: mtd-modules
+Depends: kernel-image
+Priority: extra
+Description: MTD modules
+ This package contains MTD modules.
Copied: dists/trunk/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch (from r19855, dists/sid/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch)
@@ -0,0 +1,38 @@
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Thu, 14 Feb 2013 09:39:09 -0500
+Subject: USB: usb-storage: unusual_devs update for Super TOP SATA bridge
+
+commit 18e03310b5caa6d11c1a8c61b982c37047693fba upstream.
+
+The current entry in unusual_cypress.h for the Super TOP SATA bridge devices
+seems to be causing corruption on newer revisions of this device. This has
+been reported in Arch Linux and Fedora. The original patch was tested on
+devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice
+as 2.20. Limit the UNUSUAL_DEV entry to devices less than 2.20.
+
+This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591
+
+The Arch Forum post on this is here:
+ https://bbs.archlinux.org/viewtopic.php?id=152011
+
+Reported-by: Carsten S. <carsteniq at yahoo.com>
+Tested-by: Carsten S. <carsteniq at yahoo.com>
+Signed-off-by: Josh Boyer <jwboyer at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+---
+ drivers/usb/storage/unusual_cypress.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
+index 2c85530..65a6a75 100644
+--- a/drivers/usb/storage/unusual_cypress.h
++++ b/drivers/usb/storage/unusual_cypress.h
+@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999,
+ "Cypress ISD-300LP",
+ USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+
+-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
++UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219,
+ "Super Top",
+ "USB 2.0 SATA BRIDGE",
+ USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
Copied: dists/trunk/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch (from r19855, dists/sid/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch)
@@ -0,0 +1,41 @@
+From: Sebastian Riemer <sebastian.riemer at profitbricks.com>
+Date: Fri, 25 Jan 2013 12:46:59 +0100
+Subject: md: protect against crash upon fsync on ro array
+Bug-Debian: http://bugs.debian.org/696650
+
+commit 0ecfa11f08c79be05eb00bba537e764e6672774d upstream.
+
+If an fsync occurs on a read-only array, we need to send a
+completion for the IO and may not increment the active IO count.
+Otherwise, we hit a bug trace and can't stop the MD array anymore.
+
+By advice of Christoph Hellwig we return success upon a flush
+request but we return -EROFS for other writes.
+We detect flush requests by checking if the bio has zero sectors.
+
+Cc: Christoph Hellwig <hch at infradead.org>
+Cc: Ben Hutchings <ben at decadent.org.uk>
+Cc: NeilBrown <neilb at suse.de>
+Signed-off-by: Sebastian Riemer <sebastian.riemer at profitbricks.com>
+Reported-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Paul Menzel <paulepanter at users.sourceforge.net>
+Signed-off-by: NeilBrown <neilb at suse.de>
+---
+ drivers/md/md.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/md/md.c b/drivers/md/md.c
+index 3db3d1b..1e634a6 100644
+--- a/drivers/md/md.c
++++ b/drivers/md/md.c
+@@ -307,6 +307,10 @@ static void md_make_request(struct request_queue *q, struct bio *bio)
+ bio_io_error(bio);
+ return;
+ }
++ if (mddev->ro == 1 && unlikely(rw == WRITE)) {
++ bio_endio(bio, bio_sectors(bio) == 0 ? 0 : -EROFS);
++ return;
++ }
+ smp_rmb(); /* Ensure implications of 'active' are visible */
+ rcu_read_lock();
+ if (mddev->suspended) {
Copied: dists/trunk/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch (from r19855, dists/sid/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch)
@@ -0,0 +1,36 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 11 Feb 2013 00:56:24 +0000
+Subject: mm: Try harder to allocate vmemmap blocks
+Bug-Debian: http://bugs.debian.org/699913
+
+Hot-adding memory on x86_64 normally requires huge page allocation.
+When this is done to a VM guest, it's usually because the system is
+already tight on memory, so the request tends to fail. Try to avoid
+this by adding __GFP_REPEAT to the allocation flags.
+
+Reported-and-tested-by: Bernhard Schmidt <Bernhard.Schmidt at lrz.de>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ mm/sparse-vmemmap.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
+index 1b7e22a..22b7e18 100644
+--- a/mm/sparse-vmemmap.c
++++ b/mm/sparse-vmemmap.c
+@@ -53,10 +53,12 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
+ struct page *page;
+
+ if (node_state(node, N_HIGH_MEMORY))
+- page = alloc_pages_node(node,
+- GFP_KERNEL | __GFP_ZERO, get_order(size));
++ page = alloc_pages_node(
++ node, GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT,
++ get_order(size));
+ else
+- page = alloc_pages(GFP_KERNEL | __GFP_ZERO,
++ page = alloc_pages(
++ GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT,
+ get_order(size));
+ if (page)
+ return page_address(page);
Copied: dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch (from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch)
@@ -0,0 +1,26 @@
+From: Jani Nikula <jani.nikula at intel.com>
+Date: Tue, 22 Jan 2013 10:50:35 +0000
+Subject: drm/i915: add quirk to invert brightness on eMachines e725
+
+commit 01e3a8feb40e54b962a20fa7eb595c5efef5e109 upstream.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=31522#c35
+[Note: There are more than one broken setups in the bug. This fixes one.]
+Reported-by: Martins <andrissr at inbox.lv>
+Signed-off-by: Jani Nikula <jani.nikula at intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+---
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 44f9d8f..8575a62 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -8602,6 +8602,9 @@ static struct intel_quirk intel_quirks[] = {
+
+ /* Acer/eMachines G725 */
+ { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
++
++ /* Acer/eMachines e725 */
++ { 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
+ };
+
+ static void intel_init_quirks(struct drm_device *dev)
Copied: dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch (from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch)
@@ -0,0 +1,25 @@
+From: Jani Nikula <jani.nikula at intel.com>
+Date: Tue, 22 Jan 2013 10:50:34 +0000
+Subject: drm/i915: add quirk to invert brightness on eMachines G725
+
+commit 1ffff60320879830e469e26062c18f75236822ba upstream.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59628
+Reported-by: Roland Gruber <post at rolandgruber.de>
+Signed-off-by: Jani Nikula <jani.nikula at intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+---
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 7725446..44f9d8f 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -8599,6 +8599,9 @@ static struct intel_quirk intel_quirks[] = {
+
+ /* Acer Aspire 5734Z must invert backlight brightness */
+ { 0x2a42, 0x1025, 0x0459, quirk_invert_brightness },
++
++ /* Acer/eMachines G725 */
++ { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness },
+ };
+
+ static void intel_init_quirks(struct drm_device *dev)
Copied: dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch (from r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch Mon Feb 25 03:35:39 2013 (r19856, copy of r19855, dists/sid/linux/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch)
@@ -0,0 +1,25 @@
+From: Jani Nikula <jani.nikula at intel.com>
+Date: Tue, 22 Jan 2013 10:50:36 +0000
+Subject: drm/i915: add quirk to invert brightness on Packard Bell NCL20
+
+commit 5559ecadad5a73b27f863e92f4b4f369501dce6f upstream.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44156
+Reported-by: Alan Zimmerman <alan.zimm at gmail.com>
+Signed-off-by: Jani Nikula <jani.nikula at intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+---
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 8575a62..7262786 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -8605,6 +8605,9 @@ static struct intel_quirk intel_quirks[] = {
+
+ /* Acer/eMachines e725 */
+ { 0x2a42, 0x1025, 0x0212, quirk_invert_brightness },
++
++ /* Acer/Packard Bell NCL20 */
++ { 0x2a42, 0x1025, 0x034b, quirk_invert_brightness },
+ };
+
+ static void intel_init_quirks(struct drm_device *dev)
Copied and modified: dists/trunk/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch (from r19855, dists/sid/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch)
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch Mon Feb 25 02:08:55 2013 (r19855, copy source)
+++ dists/trunk/linux/debian/patches/bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch Mon Feb 25 03:35:39 2013 (r19856)
@@ -21,12 +21,15 @@
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
Link: http://lkml.kernel.org/r/1361392572-25657-1-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
-[bwh: Backported to 3.2: efi_runtime_init() is not a separate function,
- so put a whole set of statements in an if (!disable_runtime) block]
---
+ arch/x86/platform/efi/efi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 928bf83..e2cd38f 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
-@@ -83,9 +83,10 @@ int efi_enabled(int facility)
+@@ -85,9 +85,10 @@ int efi_enabled(int facility)
}
EXPORT_SYMBOL(efi_enabled);
@@ -38,68 +41,12 @@
return 0;
}
early_param("noefi", setup_noefi);
-@@ -549,35 +550,37 @@ void __init efi_init(void)
-
- set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
-
-- /*
-- * Check out the runtime services table. We need to map
-- * the runtime services table so that we can grab the physical
-- * address of several of the EFI runtime functions, needed to
-- * set the firmware into virtual mode.
-- */
-- runtime = early_ioremap((unsigned long)efi.systab->runtime,
-- sizeof(efi_runtime_services_t));
-- if (runtime != NULL) {
-- /*
-- * We will only need *early* access to the following
-- * two EFI runtime services before set_virtual_address_map
-- * is invoked.
-- */
-- efi_phys.get_time = (efi_get_time_t *)runtime->get_time;
-- efi_phys.set_virtual_address_map =
-- (efi_set_virtual_address_map_t *)
-- runtime->set_virtual_address_map;
-+ if (!disable_runtime) {
- /*
-- * Make efi_get_time can be called before entering
-- * virtual mode.
-+ * Check out the runtime services table. We need to map
-+ * the runtime services table so that we can grab the physical
-+ * address of several of the EFI runtime functions, needed to
-+ * set the firmware into virtual mode.
- */
-- efi.get_time = phys_efi_get_time;
--
-- set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
-- } else
-- printk(KERN_ERR "Could not map the EFI runtime service "
-- "table!\n");
-- early_iounmap(runtime, sizeof(efi_runtime_services_t));
-+ runtime = early_ioremap((unsigned long)efi.systab->runtime,
-+ sizeof(efi_runtime_services_t));
-+ if (runtime != NULL) {
-+ /*
-+ * We will only need *early* access to the following
-+ * two EFI runtime services before set_virtual_address_map
-+ * is invoked.
-+ */
-+ efi_phys.get_time = (efi_get_time_t *)runtime->get_time;
-+ efi_phys.set_virtual_address_map =
-+ (efi_set_virtual_address_map_t *)
-+ runtime->set_virtual_address_map;
-+ /*
-+ * Make efi_get_time can be called before entering
-+ * virtual mode.
-+ */
-+ efi.get_time = phys_efi_get_time;
-+
-+ set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
-+ } else
-+ printk(KERN_ERR "Could not map the EFI runtime service "
-+ "table!\n");
-+ early_iounmap(runtime, sizeof(efi_runtime_services_t));
-+ }
-
- /* Map the EFI memory map */
- memmap.map = early_ioremap((unsigned long)memmap.phys_map,
+@@ -734,7 +735,7 @@ void __init efi_init(void)
+ if (!efi_is_native())
+ pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
+ else {
+- if (efi_runtime_init())
++ if (disable_runtime || efi_runtime_init())
+ return;
+ set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
+ }
Copied and modified: dists/trunk/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch (from r19855, dists/sid/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch)
==============================================================================
--- dists/sid/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch Mon Feb 25 02:08:55 2013 (r19855, copy source)
+++ dists/trunk/linux/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch Mon Feb 25 03:35:39 2013 (r19856)
@@ -27,8 +27,8 @@
---
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -37,6 +37,8 @@
- #include "drm_pciids.h"
+@@ -36,6 +36,8 @@
+ #include <drm/drm_pciids.h>
#include <linux/console.h>
#include <linux/module.h>
+#include <linux/namei.h>
@@ -36,7 +36,7 @@
/*
-@@ -257,6 +259,35 @@ static struct drm_driver driver_old = {
+@@ -286,6 +288,35 @@ static struct drm_driver driver_old = {
static struct drm_driver kms_driver;
@@ -45,7 +45,7 @@
+ * assume people take the easy route and install
+ * firmware-linux-nonfree.
+ */
-+static bool __devinit radeon_firmware_installed(void)
++static bool radeon_firmware_installed(void)
+{
+ struct path path;
+
@@ -58,7 +58,7 @@
+ return false;
+}
+
-+static int __devinit
++static int
+radeon_ums_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+ if (!radeon_firmware_installed()) {
@@ -69,13 +69,13 @@
+ return 0;
+}
+
- static void radeon_kick_out_firmware_fb(struct pci_dev *pdev)
+ static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
{
struct apertures_struct *ap;
-@@ -276,6 +307,12 @@ static void radeon_kick_out_firmware_fb(
- static int __devinit
- radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -312,6 +343,12 @@ static int radeon_pci_probe(struct pci_d
{
+ int ret;
+
+ if ((ent->driver_data & RADEON_FAMILY_MASK) >= CHIP_R600 &&
+ !radeon_firmware_installed()) {
+ DRM_ERROR("radeon kernel modesetting for R600 or later requires firmware-linux-nonfree.\n");
@@ -83,9 +83,9 @@
+ }
+
/* Get rid of things like offb */
- radeon_kick_out_firmware_fb(pdev);
-
-@@ -367,6 +404,7 @@ static struct pci_driver *pdriver;
+ ret = radeon_kick_out_firmware_fb(pdev);
+ if (ret)
+@@ -414,6 +451,7 @@ static struct pci_driver *pdriver;
static struct pci_driver radeon_pci_driver = {
.name = DRIVER_NAME,
.id_table = pciidlist,
Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/patches/series Mon Feb 25 03:35:39 2013 (r19856)
@@ -37,7 +37,6 @@
debian/sched-autogroup-disabled.patch
features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
debian/cgroups-Document-the-Debian-memory-resource-controll.patch
-bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
bugfix/arm/ixp4xx_iobe.patch
debian/x86-memtest-WARN-if-bad-RAM-found.patch
@@ -50,7 +49,6 @@
bugfix/arm/omap-musb-choice.patch
features/all/xen/microcode.patch
-debian/radeon-no-modeset-without-firmware.patch
features/all/xen/microcode-amd-fam15plus.patch
features/all/xen/microcode-typo.patch
@@ -65,3 +63,20 @@
features/all/xen/microcode-api-update.patch
bugfix/all/sock_diag-Fix-out-of-bounds-access-to-sock_diag_hand.patch
+
+bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch
+
+# alx *still* isn't upstream
+features/all/alx/alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch
+features/all/alx/remove-atl1c-devices-from-alx.patch
+features/all/alx/mark-as-staging.patch
+
+bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
+debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
+bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch
+bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch
+bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch
+
+bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
+bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch
+bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch
Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/rules.real Mon Feb 25 03:35:39 2013 (r19856)
@@ -479,6 +479,11 @@
find $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/ -mindepth 1 -maxdepth 1 \! -name kernel -exec rm {} \+
rm $(DEBUG_DIR)/lib/firmware -rf
endif
+# Add symlinks to vmlinux from the locations expected by kdump-tools,
+# systemtap and others
+ ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
+ mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
+ ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
+$(MAKE_SELF) install-base
install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
Modified: dists/trunk/linux/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux/debian/templates/control.source.in Mon Feb 25 02:08:55 2013 (r19855)
+++ dists/trunk/linux/debian/templates/control.source.in Mon Feb 25 03:35:39 2013 (r19856)
@@ -3,7 +3,7 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.84), quilt, patchutils
+Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.7), lzma [armel], kernel-wedge (>= 2.84), quilt, patchutils
Build-Depends-Indep: bzip2, xmlto
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/
More information about the Kernel-svn-changes
mailing list