Merge remote-tracking branch 'upstream/main'

This implements RFC40 and RFC52.
https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/XR3VAUWC5LNMTVOCKFOHYYEGUQ4ZFCNG/

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = linux
 	pkgdesc = Linux
-	pkgver = 6.15.1.arch1
+	pkgver = 6.18.arch1
-	pkgrel = 2
+	pkgrel = 1
 	url = https://github.com/archlinux/linux
 	arch = x86_64
 	license = GPL-2.0-only
@@ -24,24 +24,24 @@ pkgbase = linux
 	makedepends = texlive-latexextra
 	options = !debug
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.1.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.1.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.tar.sign
-	source = https://github.com/archlinux/linux/releases/download/v6.15.1-arch1/linux-v6.15.1-arch1.patch.zst
+	source = https://github.com/archlinux/linux/releases/download/v6.18-arch1/linux-v6.18-arch1.patch.zst
-	source = https://github.com/archlinux/linux/releases/download/v6.15.1-arch1/linux-v6.15.1-arch1.patch.zst.sig
+	source = https://github.com/archlinux/linux/releases/download/v6.18-arch1/linux-v6.18-arch1.patch.zst.sig
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
-	sha256sums = 44f1bb84fe512e7bafe0e6dc85d38ec1c6c8fcbe97ccb51d8c19930b799f0d64
+	sha256sums = 9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b
 	sha256sums = SKIP
-	sha256sums = cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1
+	sha256sums = 1461db929834dad3b39595dcff5650afcb69465be1f3a11d6f63e89ed3904910
 	sha256sums = SKIP
-	sha256sums = 85c4e091c0c8a0f189c1c61603b774442b8b375f7232e2f779296bc4418c428f
+	sha256sums = 1c1568b06b57a1db79120b0430a8c88130702eab06507572dd18030d901adad2
-	b2sums = bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24
+	b2sums = b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f
 	b2sums = SKIP
-	b2sums = 2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5
+	b2sums = 38b85a7633fb194bd77786963d123c5439e0e8b73ba2beeb9f1c465daf9a9798014f3b342a90d2bfb3d31aed349114ab7245f1a3fbf864546a503199b2ac956b
 	b2sums = SKIP
-	b2sums = a2644043800a384d40677ed957c5c9cbd70600b20f700fa5c3e84684574da7496f8a17b10f2984a15a918ef60211db08996cb189daf3a98cbb8bb5cbad0a8512
+	b2sums = 067232df172dd8a2bbd0bfa40468ef97d0df736d07ee60b90ccaba4d2e360ec6e3639844a9185e54fbd0871afd35e3d4200c13b07a234045e35975ceb2722782
 
 pkgname = linux
 	pkgdesc = The Linux kernel and modules

.gitignore

@@ -1,4 +1,3 @@
-*.zst
+/*.old
-src
+/*.orig
-*.tar.*
+/*.rej
-*.sig

.nvchecker.toml

@@ -1,7 +1,6 @@
 [linux]
-source = "github"
+source = "git"
-github = "archlinux/linux"
+git = "https://github.com/archlinux/linux.git"
-use_max_tag = true
 include_regex = 'v\d+(\.\d+)*-arch\d+'
 from_pattern = '-([a-z])'
 to_pattern = '.\1'

LICENSE

@@ -0,0 +1,12 @@
+Copyright Arch Linux Contributors
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

LICENSES/0BSD.txt

@@ -0,0 +1 @@
+../LICENSE

PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux
-pkgver=6.15.1.arch1
+pkgver=6.18.arch1
-pkgrel=2
+pkgrel=1
 pkgdesc='Linux'
 url='https://github.com/archlinux/linux'
 arch=(x86_64)
@@ -45,16 +45,16 @@ validpgpkeys=(
   83BC8889351B5DEBBB68416EB8AC08600F108CDF  # Jan Alexander Steffens (heftig)
 )
 # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256sums=('44f1bb84fe512e7bafe0e6dc85d38ec1c6c8fcbe97ccb51d8c19930b799f0d64'
+sha256sums=('9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b'
             'SKIP'
-            'cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1'
+            '1461db929834dad3b39595dcff5650afcb69465be1f3a11d6f63e89ed3904910'
             'SKIP'
-            '85c4e091c0c8a0f189c1c61603b774442b8b375f7232e2f779296bc4418c428f')
+            '1c1568b06b57a1db79120b0430a8c88130702eab06507572dd18030d901adad2')
-b2sums=('bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24'
+b2sums=('b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f'
         'SKIP'
-        '2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5'
+        '38b85a7633fb194bd77786963d123c5439e0e8b73ba2beeb9f1c465daf9a9798014f3b342a90d2bfb3d31aed349114ab7245f1a3fbf864546a503199b2ac956b'
         'SKIP'
-        'a2644043800a384d40677ed957c5c9cbd70600b20f700fa5c3e84684574da7496f8a17b10f2984a15a918ef60211db08996cb189daf3a98cbb8bb5cbad0a8512')
+        '067232df172dd8a2bbd0bfa40468ef97d0df736d07ee60b90ccaba4d2e360ec6e3639844a9185e54fbd0871afd35e3d4200c13b07a234045e35975ceb2722782')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -90,7 +90,7 @@ build() {
   cd $_srcname
   make all
   make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
-  make htmldocs
+  make htmldocs SPHINXOPTS=-QT
 }
 
 _package() {
@@ -258,7 +258,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 source+=('bigscreenBeyond.patch')
-sha256sums+=('3a86f2b023e43e91a8cf6367ff8219f73b1ffc78737adef3a9a517b5a2598c96')
+sha256sums+=('346989a91c81f494bbef04b56b560a144d76a69c4ca0522dff91206481b664b4')
-b2sums+=(934a9ccf4f473e3c03d5be116cbae7355e7074313daa271b317869246fa6a20bd043701b92406bad82eec7e80d6a8b78b1c44ef1e79c1ba708b50d6c8c47c4e8)
+b2sums+=('9aa8682c769579d805a250622fd874f41970dadc25bcb304c4015a4468b8c6bbac1c0422ce242fabe098d5324bdae50565ed0073ba8d2402f8b7813bcea12ac3')
 
 # vim:set ts=8 sts=2 sw=2 et:

REUSE.toml

@@ -0,0 +1,24 @@
+version = 1
+
+[[annotations]]
+path = [
+    "PKGBUILD",
+    "README.md",
+    "keys/**",
+    ".SRCINFO",
+    ".nvchecker.toml",
+    "*.install",
+    "*.sysusers",
+    "*.tmpfiles",
+    "*.logrotate",
+    "*.pam",
+    "*.service",
+    "*.socket",
+    "*.timer",
+    "*.desktop",
+    "*.hook",
+    "config",
+    ".gitignore",
+]
+SPDX-FileCopyrightText = "Arch Linux contributors"
+SPDX-License-Identifier = "0BSD"

bigscreenBeyond.patch

@@ -173,13 +173,13 @@ diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers
 index 2c36f3d00ca2..322059dca3ae 100644
 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
 +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -122,6 +122,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
+@@ -138,6 +138,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
  
  	edid_caps->edid_hdmi = connector->display_info.is_hdmi;
  
 +	edid_caps->dsc_fixed_bits_per_pixel_x16 = connector->display_info.dp_dsc_bpp;
 +
- 	apply_edid_quirks(edid_buf, edid_caps);
+ 	apply_edid_quirks(dev, edid_buf, edid_caps);
  
  	sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads);