changed branch, updated config

3 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bd6f348b07f..2b88cb902496 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ryzen-amd-staging-drm-next-git
 	pkgdesc = Linux kernel with AMDGPU DC patches
-	pkgver = 4.15.724894.d439339c4486
+	pkgver = 4.15.725892.9778e0d1a858
 	pkgrel = 1
 	url = https://cgit.freedesktop.org/~agd5f/linux/
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = linux-ryzen-amd-staging-drm-next-git
 	makedepends = libelf
 	makedepends = git
 	options = !strip
-	source = linux-ryzen-amd-staging-drm-next-git::git://people.freedesktop.org/~agd5f/linux#branch=amd-staging-drm-next
+	source = linux-ryzen-amd-staging-drm-next-git::git://people.freedesktop.org/~agd5f/linux#branch=drm-next-4.17-wip
 	source = config.x86_64
 	source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch
 	source = 90-linux.hook
diff --git a/PKGBUILD b/PKGBUILD
index aa353605dd88..179c8c6d84bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,10 @@ pkgbase=linux-ryzen-amd-staging-drm-next-git
 pkgdesc='Linux kernel with AMDGPU DC patches'
 _srcname=${pkgbase}
 _kernel_rel=4.15
-_branch=amd-staging-drm-next
+_branch=drm-next-4.17-wip
+# _branch=amd-staging-drm-next
 _kernelname=${pkgbase#linux}
-pkgver=4.15.724894.d439339c4486
+pkgver=4.15.725892.9778e0d1a858
 pkgrel=1
 arch=('x86_64')
 url='https://cgit.freedesktop.org/~agd5f/linux/'
diff --git a/config.x86_64 b/config.x86_64
index c53c79ca5c0f..9a5a8647f123 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.0-rc4 Kernel Configuration
+# Linux/x86 4.15.0-rc8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -237,6 +237,7 @@ CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_USERFAULTFD=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -455,6 +456,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+# CONFIG_RETPOLINE is not set
 # CONFIG_INTEL_RDT is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -1866,6 +1868,7 @@ CONFIG_DEV_COREDUMP=y
 CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
@@ -5085,7 +5088,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
@@ -5173,6 +5175,7 @@ CONFIG_HSA_AMD=m
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 # CONFIG_DRM_LIB_RANDOM is not set
 
 #
@@ -5483,7 +5486,6 @@ CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_DESIGNWARE_PCM=y
@@ -7872,6 +7874,7 @@ CONFIG_SECURITY=y
 # CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
+CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_PATH=y
 # CONFIG_INTEL_TXT is not set