1 files changed, 55 insertions, 42 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 043cee18b..5d7c8a8ac 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre
-pkgver=5.10.6
+pkgver=5.11.2
 pkgrel=1
 pkgdesc='Linux-libre'
-rcnver=5.9.11
-rcnrel=armv7-x14
+rcnver=5.11
+rcnrel=armv7-x10
 url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
@@ -28,7 +28,7 @@ makedepends=(
 )
 makedepends_armv7h=(uboot-tools vboot-utils dtc) # required by linux-libre-chromebook
 options=('!strip')
-_srcname=linux-5.10
+_srcname=linux-5.11
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}
@@ -44,12 +44,14 @@ source=(
   # https://labs.parabola.nu/issues/877
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   0002-fix-Atmel-maXTouch-touchscreen-support.patch
-  # extracted patches from Arch Linux kernel sources
+  # Arch Linux patches
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
-  0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
-  0004-btrfs-fix-deadlock-when-cloning-inline-extent-and-lo.patch
-  0005-btrfs-shrink-delalloc-pages-instead-of-full-inodes.patch
+  0002-Revert-drm-amd-display-reuse-current-context-instead.patch
+  0003-drm-amdgpu-fix-shutdown-with-s0ix.patch
+  sphinx-workaround.patch  # Sphinx 3.5 broke the build again
+)
+source_i686=(
+  # avoid using zstd compression in ultra mode (exhausts virtual memory)
   no-ultra-zstd.patch
 )
 source_armv7h=(
@@ -72,9 +74,9 @@ validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('ccc52db049a66ff146d9fc84fb00e783f2d04211156233a382f87589fec7631b8fbb3e76bfd94279607b883d25f9745e6c7d2bd62b13311dc6b425002bd42ec0'
+sha512sums=('3a34006add9ea318b0c2863388925ba34d57d342535b00c9ebc61fbfc69ef206b64af21c35b101466508c4308b5da310743c8add74dd703e259612953104ae43'
             'SKIP'
-            'ed6459fdf1f93b82a5fd7679ab8bbef3c49b8647895a9192cd3c243e461b9abd7a39da982e0407aabb86cdd267a5c5ef869a5d2bc0ac60ad893a50f5e366a020'
+            '64c5a9076b502d3da538e781f3819af24ddb90316c2d181037c0f77e5204ec555aa0464d58fbd0025ee6c4f1b28db33d38ddc8de0bc2a83be9190c900fdf6a2c'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,32 +84,31 @@ sha512sums=('ccc52db049a66ff146d9fc84fb00e783f2d04211156233a382f87589fec7631b8fb
             'SKIP'
             '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
             'SKIP'
-            '2dc705d5cf5eb4f5b5ade2fc35d61d2f072b95d378720c827178248b41c5367b3051eba50ecc0c3c1a347228d81ba8ec46779f38c9604d067126485e2cc5f525'
-            '254607906b9310889eba5e2e60a660e3f79405aaabdaffeb05703a72abc2b90026448409fab0d3ac5ab9fea850a0da879889ca49f8c00b929230757cde438ce3'
-            '49f176a1e0201ad4d2ad9e35a01d67bc8a5082cd437c347cae97b78daa9c287e1acf724b5614f7088e262eb28ad0f6a7b192dfcbe3386abf77614d9fc63a543b'
+            '621284c7afe40d118ceb7595ae936527899547c4579aaa06a340db37569c3b0f3c5768e9feb285d3b3acbda28d4957aa3568f2fe698bc477c3d0e00227bb7278'
+            '3700586f61e511deb7247ca915ea13d83321b2143335019f48385363383e8a99b4ebef87ed961b5bf954a416a2b18b09744a5b6cc97503d6d663618f31951570'
+            '51e8b4da770067e8257d292622d865cb16ac57fdfd8967bdfb74efec197dae9eab958e5637a728640ae60885bdde41c06c8076227a4f83db0b752215f91f3a87'
             '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
             '167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b'
             'bb6718984a7357c9b00c37e4788480e5b8b75018c172ecc1441bc3fc5d2d42444eb5d8c7f9d2e3a7d6fed6d03acb565e3c0559486e494c40a7fe6bd0570c9ede'
             '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '3ab3b136aa2eba15b21112bc4978f214a4f9ad38bc6242d4917fbe44f68665bf52b81af1ca60c4b27492f15230a79d2d4e4c02ca06cd9ea55837fddca7cf176b'
-            '32a76d0774eb2a0de38452321da6d8402cea70425d83942f7eda53a47a8465e4890ae277275b166e621574e4892f5dac5a0c37263abc0ea300f0c9af639e0f84'
-            '127b2148feb60a64a3d98080625f8a6986033e6099f284f524697935af3c475e287dd69fde3840d7e62eb1d14d175becfe8d138894c8fb72acc1efeacbcc5fa3'
-            'b118bcf344d0fb6ef3d0b3d39c0d635bff69f5b6a70274db31ec8db89a88dab9aa70af3a511b63821b3d8715310ee81e1c1a88dc73d4852d07d5cc1da33204f1'
-            '5ff6bc9d6a77b939cc4b411cb43311ec2c2048ff7ceb115d588ac902abae1d55de34cb36706f20237306e9973b46f1b1b28b15a74aeb8ce52456ffc3047e4585'
-            '3a346ff5e0fdefafd28bc3dd0e4b6cd68e3f0014e59d1611d99f2edb8d074fd32649eeb0894a7e340e4f907b5cfc0e08e0753e0427a68dc113bb22835a892968')
-sha512sums_armv7h=('599a6af883044e98fd7e5a048274e130229626217102bd8b1789c0bba541ca7f0edc91861da7e7591ccce4092b14119f639223c3782fdb537c6e09d412e7d39a'
+            '748d98aef69e93959eab6a7f20a7972aff50c577a079bba807b10fe9b3b98799b47215d76797360d336ba4c3c656d7eafe3e81f2a59a2b6888d1884071db6e95'
+            '798b96e22ae79a62516e38194f4a377c8bed22c6fbf9f33fcdf205136bf1e5429c01a803c71f8eb412df2a5637eb6266fd4677618d64f64e9b53725371f574c6'
+            '6e0cdf8ae337245cb4df53496649905d4900dc0401b5fa7ebea70a46ed88f2f5759a1bfe571207975e1d92c734babdb8b3505cd432731d0713ce1339b6df71d4'
+            '93c03382b6678ce5e94a5d06e6737965629d7dc49d16e968d225e664d88f07a12abe0e04908f1cdaa75ff1cde88783cae9f0794d1075bc65bc7baeff392e0ae2')
+sha512sums_i686=('3a346ff5e0fdefafd28bc3dd0e4b6cd68e3f0014e59d1611d99f2edb8d074fd32649eeb0894a7e340e4f907b5cfc0e08e0753e0427a68dc113bb22835a892968')
+sha512sums_armv7h=('baf54a93781f5df415be494ebb10d2ef29da33807cf7bdf5ad84746c90b13f04c95a9d330faf1f11ef41b6fb1e09628455be686c3c9e6ea9ac028ee45f3b81bb'
                    'SKIP'
-                   'ac5a06427905c33b48817eef0c335d6787b6d1440751450977faf41c649677a7ccb9ec32d0e5bbefcc6cd0fab7ab5920d7dd4e5a29b96f8915e636aca1ec7efd'
-                   '7561561e6d1da2f383ac408384ffebe3490f14bcc8f797cf126d0bec5c6c774ebb6de7922c7538991ab70371aacc7fa65be647b17a691aba1a0eb604fdc7d1a7'
-                   '589e9d9331aa8417e607b73c5ff8f6a9396476076c649933b8a72c88acb8f53b425131b402600224fe4d8070d2ab80530627da404880ebbce42a89c37f94d8fc'
-                   '9f7f75d3ffdeff2f8af34105b3c3aed992086850e4d4e67e5c43f5a0d64181b6d28c5b170edac9b6c21c267e3326a5f1e9b4e00af2f2dbd238d0d1a883d10d48'
-                   'c05c4728c3927be64eb6d9a1122708c1007fc621723ac5092ab23535a687b18bf10c84d0a3286f69a19b5a5439d1b397d3b3a6b44fe3f77574b19e2a20bc087a'
-                   '92e6cc3f32efe5e6fc76f9ab67848ce85d4ba26fc6ee08d5248ad1aad6f796f120ec50058a98ad790787e7923ba1f125f293efe0d94d38e29c46143f766b832f'
-                   '0b94865faace5c3f83bc5fc9cc92d537de310873c1c842f4b29e13c7b3a5dbca0fb56c6b0e1aaa1d86a9a3f999a1cd50f8b419b7fa9046b91c390e5938e7b71e'
-                   '34a065eb8f95690c59c8669ed3d2676f3ab8a7c5af9c9bbfae38df1be1c870182050fb899f15edcca46a988795f0579ba9208a22de68bdb4cf6687635cb86526'
-                   '9c786e6b2d10960367f8f81c8a259f22311e6494d7ead5473398fdcec3e24ad3d68d28bb24d7a9f374ebe46f3760405d05a03f425bcadb9470cf4b54f13a5b4d'
+                   'b832287560c841e292d71be01c65045ee2ee6ac41f05176ebe349d730b5b79887bb629d176d5fd16a3e7ebb5e51de30b6d6fad6fad53821063188248bd1415bb'
+                   'f997a0afaaffb66533168f5d9cc341871eb54feb88d6ce578e816add82596bedf4dc242510e171e1e5b56464cf701384a32ed916176ea0c2db24209d754d3c58'
+                   '96b97f6e721d179d88e7b4084ebb62ce30ddd13cbbcb367147e6646c8487107af36b3610d10e53abffae3a83736cdd7734e5dbcadb1909ced278f40a20302861'
+                   '14f3ef9f2211e98198e96bd4f91978720acd703ee778698b85916cef73c1aea648d1d08a075f2ed334f5c27b9933274fa0651401e0baa3570f389a20aaec54e8'
+                   'b464e9af459c37c929ba30cdb7eb575038e970c9d91ff98fa37c0bc6161538b42a802dde34882772cf665130038158cb985fe06d65313f7c584c6c63045199d8'
+                   '9d8019b8f525d5614d476ac34a35a40e8e1994f444a686b561c57b8ae488fcc44ffca9d034cea7b2271a2b7a7fa3a2ba2fcaa452504c320eff0bc3fc4de64ed2'
+                   'b3cf13c44b8b35bb7610206161a251cbf90299b0533e8e23465b9ae566feed510c5722aceadb7e2097de439362d0689de5692a091cbe8bec2994ef5290622095'
+                   '463d68de99f434fd3409ee620eaa7b648d6627c5a04cfeab65b91053129e71bf906db817fd9770297ae1e38f8a5a84be4d20a1d1717e6821478f2c1bbc416cb2'
+                   '813fbfb17659e4e7512367f03b06f9bc54070886f5e7206548deced60032f92d3ca0beb78416706662bf713cb0f7a5d8d81f8f08b911ca8254b417e82306d829'
                    '7bda2ad7eb81af802873cb6764cb9c675ec50ceeb5adc487881ebc8c316cf55f836e56c2cc67494a2920e86494861db2eb924b7ff9b151ae3c5b0e493c373bf9')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
@@ -151,6 +152,17 @@ prepare() {
     done
   fi
 
+  if [ "$CARCH" = "i686" ]; then
+    local src_i686
+    for src_i686 in "${source_i686[@]}"; do
+      src_i686="${src_i686%%::*}"
+      src_i686="${src_i686##*/}"
+      [[ $src_i686 = *.patch ]] || continue
+      echo "Applying patch $src_i686..."
+      patch -Np1 < "../$src_i686"
+    done
+  fi
+
   local src
   for src in "${source[@]}"; do
     src="${src%%::*}"
@@ -217,6 +229,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  depends=(pahole)
   provides=("${_replacesarchkernel[@]/%/-headers=$pkgver}")
   conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
   replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
@@ -247,6 +260,18 @@ _package-headers() {
   cp -t "$builddir/arch/$KARCH" -a arch/$KARCH/include
   install -Dt "$builddir/arch/$KARCH/kernel" -m644 arch/$KARCH/kernel/asm-offsets.s
 
+  # from linux-armv7
+  if [ "$CARCH" = "armv7h" ]; then
+    for i in dove omap2; do
+      mkdir -p "$builddir/arch/$KARCH/mach-$i"
+      cp -t "$builddir/arch/$KARCH/mach-$i/" -a arch/$KARCH/mach-$i/include
+    done
+    for i in omap orion versatile; do
+      mkdir -p "$builddir/arch/$KARCH/plat-$i"
+      cp -t "$builddir/arch/$KARCH/plat-$i/" -a arch/$KARCH/plat-$i/include
+    done
+  fi
+
   install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
   install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
 
@@ -258,18 +283,6 @@ _package-headers() {
   install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
   install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
 
-  # from linux-armv7
-  if [ "$CARCH" = "armv7h" ]; then
-    for i in dove exynos omap2; do
-      mkdir -p "$builddir/arch/$KARCH/mach-$i"
-      cp -t "$builddir/arch/$KARCH/mach-$i/" -a arch/$KARCH/mach-$i/include
-    done
-    for i in omap orion samsung versatile; do
-      mkdir -p "$builddir/arch/$KARCH/plat-$i"
-      cp -t "$builddir/arch/$KARCH/plat-$i/" -a arch/$KARCH/plat-$i/include
-    done
-  fi
-
   echo "Installing KConfig files..."
   find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;