summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-11-08 15:30:23 -0800
committerAdam Williamson <awilliam@redhat.com>2014-11-08 15:30:23 -0800
commit54fd44e88b6ac3a9bf79ff07a96df87900b437bd (patch)
tree6867abf45fd75794660d6e2f0fb9187be39a96c9 /kernel.spec
parent89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (diff)
downloadkernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.tar.gz
kernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.tar.xz
kernel-54fd44e88b6ac3a9bf79ff07a96df87900b437bd.zip
adjust patch set for 3.18: rediffs and drops
Once again try a 'real' fix for ACPI _DEP (the one currently in upstream review). Re-diff the ath6kl SDIO ID patch. Drop the UEFI 'big arse revert', should be merged upstream now. For now do not apply the mic fix patch as I *think* a correct fix has gone upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2014-October/081780.html Update config-x86-generic with a bunch more ASoC drivers to disable.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec20
1 files changed, 7 insertions, 13 deletions
diff --git a/kernel.spec b/kernel.spec
index 7ad3bcbc4..ce6c3952d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -628,26 +628,21 @@ Patch30000: kernel-arm64.patch
# AWB PATCH DEFINITIONS (BAYTRAIL)
-# https://lkml.org/lkml/2014/4/16/418
+# https://patchwork.kernel.org/patch/5161621/(minor rediff required)
# https://bugzilla.kernel.org/show_bug.cgi?id=69011
-# The 'permanent' fix for this is under development but current patch doesn't
-# work, see #69011
-Patch31010: 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+# Fixes battery status
+Patch31010: RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
# Add SDIO ID for the V8P wireless adapter to ath6kl driver
Patch31011: support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
-# UEFI boot fixes from Matt Fleming, try to fix
-# https://bugzilla.kernel.org/show_bug.cgi?id=84241
-Patch31012: UEFI-big-arse-revert.patch
-
# Map 'Home' button on Venue 8 Pro to left meta key (i.e. "Start")
# from Jan-Michael Brummer
-Patch31013: soc_button_use_leftmeta.patch
+Patch31012: soc_button_use_leftmeta.patch
# Enable mic on RT5640 (i.e. lots of Baytrail hardware, we hope)
# from Jan-Michael Brummer
-Patch31014: rt5640_enable_mic.patch
+Patch31013: rt5640_enable_mic.patch
# END OF AWB PATCH DEFINITIONS
@@ -1387,10 +1382,9 @@ ApplyPatch kernel-arm64.patch -R
# END OF FEDORA PATCH APPLICATIONS
# AWB (BAYTRAIL) PATCH APPLICATIONS
-ApplyPatch 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+ApplyPatch RFC-V2-ACPI-Add-_DEP-Operation-Region-Dependencies-support-to-fix-battery-issue-on-the-Asus-T100TA.patch
ApplyPatch support-Dell-OEM-chipset-found-in-Venue-8-Pro-SDIO-I.patch
-ApplyPatch UEFI-big-arse-revert.patch
-ApplyPatch rt5640_enable_mic.patch
+#ApplyPatch rt5640_enable_mic.patch
ApplyPatch soc_button_use_leftmeta.patch
# END OF AWB (BAYTRAIL) PATCH APPLICATIONS