summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2023-03-11 00:10:02 +0300
committerYurii Kolesnykov2023-03-11 00:10:32 +0300
commitf898e2f5dd97805721ba1f98d3afb8af0fd46b23 (patch)
treeb1e3eff6df27697c555505d4531d4e16e4d0a942
parent96504d7729feda2a04f2a8275af12a3308b01bcd (diff)
downloadaur-f898e2f5dd97805721ba1f98d3afb8af0fd46b23.tar.gz
sync with testing/linux
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD6
-rw-r--r--config6
4 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 79a89c5e86bc..a8db216aafe2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-amd-staging-drm-next-git
pkgdesc = Linux kernel with WIP AMDGPU material
- pkgver = 6.0.r1126268.4a5e4cc8c651
+ pkgver = 6.0.r1126357.63481cd532e2
pkgrel = 1
url = https://gitlab.freedesktop.org/agd5f/linux
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-amd-staging-drm-next-git
source = linux-amd-staging-drm-next-git::git+https://gitlab.freedesktop.org/agd5f/linux.git#branch=amd-staging-drm-next
source = config
sha256sums = SKIP
- sha256sums = f35bb39db7324a45e78e6c75c1a60f117fea3f7d0df9f4a32bed411751d6ffea
+ sha256sums = c92207f87f806209da2bda0a2044872fdf22fce9a45cf31d3579fdfedde8c17c
pkgname = linux-amd-staging-drm-next-git
pkgdesc = The Linux kernel with WIP AMDGPU material kernel and modules
diff --git a/.gitignore b/.gitignore
index 4fd212aec298..16490db8e5cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-linux-agd5f
-linux-amd*
+linux-amd-staging-drm-next-git
src
-pkg
-*.pkg*
+*pkg*
diff --git a/PKGBUILD b/PKGBUILD
index 6f18b4b4d494..673b340c740b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Based on testing/linux by Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-amd-staging-drm-next-git
-pkgver=6.0.r1126268.4a5e4cc8c651
+pkgver=6.0.r1126357.63481cd532e2
pkgrel=1
pkgdesc='Linux kernel with WIP AMDGPU material'
_product="${pkgbase%-git}"
@@ -22,7 +22,7 @@ source=(
config # the main kernel config file
)
sha256sums=('SKIP'
- 'f35bb39db7324a45e78e6c75c1a60f117fea3f7d0df9f4a32bed411751d6ffea')
+ 'c92207f87f806209da2bda0a2044872fdf22fce9a45cf31d3579fdfedde8c17c')
pkgver() {
cd $_srcname
@@ -40,7 +40,7 @@ prepare() {
cd $_srcname
echo "Setting version..."
- scripts/setlocalversion --save-scmversion
+ KERNELVERSION="${pkgver}" scripts/setlocalversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "${pkgbase#linux}" > localversion.20-pkgname
diff --git a/config b/config
index 4d590515e099..7208e830d653 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.2.1-arch1 Kernel Configuration
+# Linux/x86 6.2.3-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
@@ -487,7 +487,7 @@ CONFIG_X86_INTEL_TSX_MODE_AUTO=y
CONFIG_X86_SGX=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
-# CONFIG_EFI_HANDOVER_PROTOCOL is not set
+CONFIG_EFI_HANDOVER_PROTOCOL=y
CONFIG_EFI_MIXED=y
# CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_MAP=y
@@ -3332,6 +3332,7 @@ CONFIG_MICROSOFT_MANA=m
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
CONFIG_NET_VENDOR_NI=y
CONFIG_NI_XGE_MANAGEMENT_ENET=m
CONFIG_NET_VENDOR_NATSEMI=y
@@ -7027,6 +7028,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
CONFIG_SND_HDA_GENERIC=m
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
# end of HD-Audio
CONFIG_SND_HDA_CORE=m