summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch6
-rw-r--r--0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch10
-rw-r--r--0003-Partially-revert-swiotlb-remove-various-exports.patch12
-rw-r--r--0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch10
-rw-r--r--0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch95
-rw-r--r--0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch (renamed from 0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch)10
-rw-r--r--PKGBUILD21
-rw-r--r--config4
9 files changed, 41 insertions, 143 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5c44e1c504a4..1446c5e96961 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,27 +25,25 @@ pkgbase = linux-macbook
source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
source = 0003-Partially-revert-swiotlb-remove-various-exports.patch
source = 0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
- source = 0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
- source = 0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+ source = 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9
sha256sums = SKIP
sha256sums = 336252cb15f2f2574461c1d3daabf5dc207842526085802270e1e5223f645db3
sha256sums = SKIP
- sha256sums = 51f794dee6098b19b5f8ec2277f52a313584f2ff8b3abf111f2fd92a6ea118dd
+ sha256sums = 627aa44c65d7297b00a8a7045d606d33b6a0b982c02331a101b94d38d348082a
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b
sha256sums = 7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc
sha256sums = 09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff
- sha256sums = 6ad732db3f773de52ab544be83f22b04157a880742ab262202b01c32ee2d4995
- sha256sums = bc300c44023cdef225f5d18fe6054cd2886c4062410d2720b2b2fd82465184f3
- sha256sums = dcd819e630cfa7292aa38078ab16758338836ee917e82ce42c8a9aca08f2ecdb
- sha256sums = 9e93bc5bafeb978b1fb260d0cbfe15d8214ea0599dc6d771aae9ab652e223339
- sha256sums = 9fe8141703fd2b9eb8ea8f81a19a115c93684a87ee0895d042b48ce98d42c12a
- sha256sums = e59bba13edb36ff5639ed3fd6c541e2c3d378db71dca6ea01f0aede6ab1b5700
+ sha256sums = 113b1fe603f61b749c4cb3902a4f5d4fbec9d1e5081f008bac485cc345defa5f
+ sha256sums = 9db235c5edfc9a81a0f5866f9942e74d896243c37d50298288fbbe2f79169fd3
+ sha256sums = d57665a468f93c94b92924fdbdc72ea50def74d9c8999104c9594e64fb196328
+ sha256sums = 079180ceaae87a4851eb56e80f6e33b0199dad3343c73275ddb710e0824feb73
+ sha256sums = f1c751e29bc1bcfe634c49873eb34a5418db3dfbd1f6d789e738dee78071d3dd
pkgname = linux-macbook
pkgdesc = The Linux-macbook kernel and modules
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index b81c1ccac8ee..156d03e21671 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,8 @@
-From 3a7745f6fdd71aa34dae33c3edc586363d9ece9e Mon Sep 17 00:00:00 2001
-Message-Id: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From f7a249814be46cbcb7bad48e4b1910baaf7f8961 Mon Sep 17 00:00:00 2001
+Message-Id: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/7] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by
default
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 259f372513de..ad7ac0c34d53 100644
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
-From 1ab88f114ddb0f614118c330196af3024f88630c Mon Sep 17 00:00:00 2001
-Message-Id: <1ab88f114ddb0f614118c330196af3024f88630c.1523990130.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From 7f9a95491f506700d46db581ef3734ced7c9618b Mon Sep 17 00:00:00 2001
+Message-Id: <7f9a95491f506700d46db581ef3734ced7c9618b.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
From: Jim Bride <jim.bride@linux.intel.com>
Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/7] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/5] drm/i915/edp: Only use the alternate fixed mode if it's
asked for
In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch
index e80312963055..4669b03bd750 100644
--- a/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ b/0003-Partially-revert-swiotlb-remove-various-exports.patch
@@ -1,10 +1,10 @@
-From d1bc4bfbbc01a62a8b70f4018273d49b502c1511 Mon Sep 17 00:00:00 2001
-Message-Id: <d1bc4bfbbc01a62a8b70f4018273d49b502c1511.1523990130.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From be536681bd2439bf8e95df124fa282cf4a2e7846 Mon Sep 17 00:00:00 2001
+Message-Id: <be536681bd2439bf8e95df124fa282cf4a2e7846.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Fri, 6 Apr 2018 16:19:38 +0200
-Subject: [PATCH 3/7] Partially revert "swiotlb: remove various exports"
+Subject: [PATCH 3/5] Partially revert "swiotlb: remove various exports"
This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
The proprietary NVIDIA driver needs one of the exports.
@@ -13,7 +13,7 @@ The proprietary NVIDIA driver needs one of the exports.
1 file changed, 1 insertion(+)
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index c43ec2271469..77d699f14af7 100644
+index 44f7eb408fdb..0bb1bb65ad6b 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
diff --git a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
index 1ba2145c402f..ae5b8c9e4d5b 100644
--- a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+++ b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
@@ -1,10 +1,10 @@
-From 437fda0d08ba6f5c644dd7c13a249a779ff41abd Mon Sep 17 00:00:00 2001
-Message-Id: <437fda0d08ba6f5c644dd7c13a249a779ff41abd.1523990130.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From a117a2995f291e765c5de06f42f02a1687ecb55e Mon Sep 17 00:00:00 2001
+Message-Id: <a117a2995f291e765c5de06f42f02a1687ecb55e.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 11 Apr 2018 21:27:44 +0200
-Subject: [PATCH 4/7] Fix vboxguest on guests with more than 4G RAM
+Subject: [PATCH 4/5] Fix vboxguest on guests with more than 4G RAM
Squashed commit of the following:
diff --git a/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch b/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
deleted file mode 100644
index dd3b2bd55e6e..000000000000
--- a/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f144015c59359c918d30fd309ed368045b783d47 Mon Sep 17 00:00:00 2001
-Message-Id: <f144015c59359c918d30fd309ed368045b783d47.1523990130.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-From: Harry Wentland <harry.wentland@amd.com>
-Date: Thu, 12 Apr 2018 10:51:52 -0400
-Subject: [PATCH 5/7] Revert "drm/amd/display: disable CRTCs with NULL FB on
- their primary plane (V2)"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems to cause flickering and lock-ups for a wide range of users.
-Revert until we've found a proper fix for the flickering and lock-ups.
-
-This reverts commit 36cc549d59864b7161f0e23d710c1c4d1b9cf022.
-
-Cc: Shirish S <shirish.s@amd.com>
-Cc: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-Signed-off-by: Harry Wentland <harry.wentland@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 -------------------
- 1 file changed, 31 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 63c67346d316..8a6e6fbc78cd 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -4776,60 +4776,29 @@ static int dm_update_planes_state(struct dc *dc,
- return ret;
- }
-
--static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,
-- struct drm_crtc *crtc)
--{
-- struct drm_plane *plane;
-- struct drm_crtc_state *crtc_state;
--
-- WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
--
-- drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
-- struct drm_plane_state *plane_state =
-- drm_atomic_get_plane_state(state, plane);
--
-- if (IS_ERR(plane_state))
-- return -EDEADLK;
--
-- crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);
-- if (IS_ERR(crtc_state))
-- return PTR_ERR(crtc_state);
--
-- if (crtc->primary == plane && crtc_state->active) {
-- if (!plane_state->fb)
-- return -EINVAL;
-- }
-- }
-- return 0;
--}
--
- static int amdgpu_dm_atomic_check(struct drm_device *dev,
- struct drm_atomic_state *state)
- {
- struct amdgpu_device *adev = dev->dev_private;
- struct dc *dc = adev->dm.dc;
- struct dm_atomic_state *dm_state = to_dm_atomic_state(state);
- struct drm_connector *connector;
- struct drm_connector_state *old_con_state, *new_con_state;
- struct drm_crtc *crtc;
- struct drm_crtc_state *old_crtc_state, *new_crtc_state;
- int ret, i;
-
- /*
- * This bool will be set for true for any modeset/reset
- * or plane update which implies non fast surface update.
- */
- bool lock_and_validation_needed = false;
-
- ret = drm_atomic_helper_check_modeset(dev, state);
- if (ret)
- goto fail;
-
- for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
-- ret = dm_atomic_check_plane_state_fb(state, crtc);
-- if (ret)
-- goto fail;
--
- if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
- !new_crtc_state->color_mgmt_changed)
- continue;
---
-2.17.0
-
diff --git a/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
index cc56065404e0..d02da63cb3b1 100644
--- a/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+++ b/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
@@ -1,10 +1,10 @@
-From 33feec41e6d35bbc679befe5ec0fb12acef18c95 Mon Sep 17 00:00:00 2001
-Message-Id: <33feec41e6d35bbc679befe5ec0fb12acef18c95.1523990130.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+From 415d0ca52b88f7cf3300a54c337ca80ebeccce5c Mon Sep 17 00:00:00 2001
+Message-Id: <415d0ca52b88f7cf3300a54c337ca80ebeccce5c.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
From: Igor Russkikh <igor.russkikh@aquantia.com>
Date: Wed, 11 Apr 2018 15:23:24 +0300
-Subject: [PATCH 6/7] net: aquantia: Regression on reset with 1.x firmware
+Subject: [PATCH 5/5] net: aquantia: Regression on reset with 1.x firmware
On ASUS XG-C100C with 1.5.44 firmware a special mode called "dirty wake"
is active. With this mode when motherboard gets powered (but no poweron
diff --git a/PKGBUILD b/PKGBUILD
index 819461b6c242..e9850767c2ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,8 +27,7 @@ source=(
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
0003-Partially-revert-swiotlb-remove-various-exports.patch
0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
- 0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
- 0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+ 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -38,19 +37,18 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
'SKIP'
'336252cb15f2f2574461c1d3daabf5dc207842526085802270e1e5223f645db3'
'SKIP'
- '51f794dee6098b19b5f8ec2277f52a313584f2ff8b3abf111f2fd92a6ea118dd'
+ '627aa44c65d7297b00a8a7045d606d33b6a0b982c02331a101b94d38d348082a'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b'
'7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc'
'09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff'
- '6ad732db3f773de52ab544be83f22b04157a880742ab262202b01c32ee2d4995'
- 'bc300c44023cdef225f5d18fe6054cd2886c4062410d2720b2b2fd82465184f3'
- 'dcd819e630cfa7292aa38078ab16758338836ee917e82ce42c8a9aca08f2ecdb'
- '9e93bc5bafeb978b1fb260d0cbfe15d8214ea0599dc6d771aae9ab652e223339'
- '9fe8141703fd2b9eb8ea8f81a19a115c93684a87ee0895d042b48ce98d42c12a'
- 'e59bba13edb36ff5639ed3fd6c541e2c3d378db71dca6ea01f0aede6ab1b5700')
+ '113b1fe603f61b749c4cb3902a4f5d4fbec9d1e5081f008bac485cc345defa5f'
+ '9db235c5edfc9a81a0f5866f9942e74d896243c37d50298288fbbe2f79169fd3'
+ 'd57665a468f93c94b92924fdbdc72ea50def74d9c8999104c9594e64fb196328'
+ '079180ceaae87a4851eb56e80f6e33b0199dad3343c73275ddb710e0824feb73'
+ 'f1c751e29bc1bcfe634c49873eb34a5418db3dfbd1f6d789e738dee78071d3dd')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
@@ -86,11 +84,8 @@ prepare() {
# https://bugs.archlinux.org/task/58153
patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
- # https://bugs.archlinux.org/task/58158
- patch -Np1 -i ../0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
-
# https://bugs.archlinux.org/task/58174
- patch -Np1 -i ../0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+ patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
cat ../config - >.config <<END
CONFIG_LOCALVERSION="${_kernelname}"
diff --git a/config b/config
index c851fce8cc84..43c4221d247f 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.16.2-1 Kernel Configuration
+# Linux/x86 4.16.4-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -571,7 +571,7 @@ CONFIG_AMD_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
CONFIG_NODES_SPAN_OTHER_NODES=y
# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=2
+CONFIG_NODES_SHIFT=5
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y