diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | intel-pstate-backport.patch | 13 | ||||
| -rw-r--r-- | macbook-suspend.patch | 16 |
4 files changed, 28 insertions, 21 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-macbook - pkgver = 4.7.1 + pkgver = 4.7.2 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -14,8 +14,8 @@ pkgbase = linux-macbook options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.2.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.2.sign source = config source = config.x86_64 source = linux-macbook.preset @@ -27,14 +27,14 @@ pkgbase = linux-macbook validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 sha256sums = SKIP - sha256sums = 838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e + sha256sums = 031cb0e7b86f2ef2cc4d0dde9d73495f68e8d23e4c41f50f7f95b065ee33a71d sha256sums = SKIP sha256sums = ba61080d6ba852b3dc10ed056efbd80bdff6555a7ae4cf40373c7544d36ffcc9 sha256sums = 3b41dde76dd69ec6e088bd19e724f3eabd30eaf43727a1948c6603242dc08cd8 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42 - sha256sums = 103cac598bf92519d6c0b04ca729565bad75015daade422c81225e399c967b4c - sha256sums = c9873d1703881f35d25e553d2359a7e846916fab0e981579e1afdf6b034f3a0e + sha256sums = 4d4a622733c2ba742256f369c32a1e98fc216966589f260c7457d299dbb55971 + sha256sums = 7094cbcfd657dbc1c17721d4f248f9f98511d803bc4be6d66637388801afdebc sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 pkgname = linux-macbook @@ -5,7 +5,7 @@ pkgbase=linux-macbook # Build kernel with a different name _srcname=linux-4.7 -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -27,14 +27,14 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" sha256sums=('5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10' 'SKIP' - '838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e' + '031cb0e7b86f2ef2cc4d0dde9d73495f68e8d23e4c41f50f7f95b065ee33a71d' 'SKIP' 'ba61080d6ba852b3dc10ed056efbd80bdff6555a7ae4cf40373c7544d36ffcc9' '3b41dde76dd69ec6e088bd19e724f3eabd30eaf43727a1948c6603242dc08cd8' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42' - '103cac598bf92519d6c0b04ca729565bad75015daade422c81225e399c967b4c' - 'c9873d1703881f35d25e553d2359a7e846916fab0e981579e1afdf6b034f3a0e' + '4d4a622733c2ba742256f369c32a1e98fc216966589f260c7457d299dbb55971' + '7094cbcfd657dbc1c17721d4f248f9f98511d803bc4be6d66637388801afdebc' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds diff --git a/intel-pstate-backport.patch b/intel-pstate-backport.patch index 49e1ac003dfe..afa4a0d1ed9c 100644 --- a/intel-pstate-backport.patch +++ b/intel-pstate-backport.patch @@ -1,5 +1,5 @@ ---- linux-4.7/drivers/cpufreq/intel_pstate.c.dist 2016-07-24 15:23:50.000000000 -0400 -+++ linux-4.7/drivers/cpufreq/intel_pstate.c 2016-08-12 20:51:49.493249861 -0400 +--- linux-4.7/drivers/cpufreq/intel_pstate.c.orig 2016-08-23 02:59:25.787439771 +1000 ++++ linux-4.7/drivers/cpufreq/intel_pstate.c 2016-08-23 03:01:02.455753666 +1000 @@ -35,6 +35,7 @@ #include <asm/msr.h> #include <asm/cpu_device_id.h> @@ -47,15 +47,6 @@ wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1); } -@@ -944,7 +944,7 @@ - if (err) - goto skip_tar; - -- tdp_msr = MSR_CONFIG_TDP_NOMINAL + tdp_ctrl; -+ tdp_msr = MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl & 0x3); - err = rdmsrl_safe(tdp_msr, &tdp_ratio); - if (err) - goto skip_tar; @@ -972,7 +972,7 @@ u64 value; int nont, ret; diff --git a/macbook-suspend.patch b/macbook-suspend.patch index fc302c4b3a2e..0d9be4815124 100644 --- a/macbook-suspend.patch +++ b/macbook-suspend.patch @@ -105,3 +105,19 @@ /* Fall through */ default: pbus_size_io(bus, realloc_head ? 0 : additional_io_size, +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2775,6 +2775,13 @@ static void quirk_hotplug_bridge(struct pci_dev *dev) + + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge); + ++static void quirk_hotplug_bridge_skip(struct pci_dev *dev) ++{ ++ dev->is_hotplug_bridge = 0; ++} ++ ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_hotplug_bridge_skip); ++ + /* + * This is a quirk for the Ricoh MMC controller found as a part of + * some mulifunction chips. |