[linux] 02/02: [arm64] Defer workaround for erratum #843419

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie
in repository linux.

commit 12bf8284838064622a1ab7c0aeab251c282a54b8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 5 19:46:16 2015 +0100

    [arm64] Defer workaround for erratum #843419
    
    (cherry picked from commit 04734fa3865b70f623f9d5d806f3b172afa46228)
    
    Conflicts:
    	debian/changelog
    	debian/config/arm64/config
---
 debian/changelog           | 2 +-
 debian/config/arm64/config | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfda561..4c02a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,7 +82,6 @@ linux (3.16.7-ckt20-1) UNRELEASED; urgency=medium
     - kvm: fix zero length mmio searching
     - [powerpc*] mm: Recompute hash value after a failed update
     - [x86] platform: Fix Geode LX timekeeping in the generic x86 build
-    - [arm64] errata: add module build workaround for erratum #843419
     - [arm64] KVM: Disable virtual timer even if the guest is not using it
     - [armhf] KVM: Disable virtual timer even if the guest is not using it
     - [x86] hp-wmi: Add missing __init annotations to initialization code
@@ -250,6 +249,7 @@ linux (3.16.7-ckt20-1) UNRELEASED; urgency=medium
   * [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949)
   * firmware_class: Fix condition in directory search loop (Closes: #804862)
   * ehci: Fix ABI change in 3.16.7-ckt19
+  * [arm64] Defer workaround for erratum #843419
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 03 Oct 2015 22:32:19 +0200
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 73d4b73..0d3d1b2 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -3,6 +3,8 @@
 ##
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
+#. Until we decide how/whether to handle this in userland as well
+# CONFIG_ARM64_ERRATUM_843419 is not set
 CONFIG_SMP=y
 CONFIG_XEN=y
 CONFIG_COMPAT=y
@@ -117,12 +119,12 @@ CONFIG_SERIAL_8250_DW=y
 ##
 ## file: drivers/usb/host/Kconfig
 ##
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PLATFORM=y
 
 ##
 ## file: drivers/virtio/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git