From 9c0a3a8db1e203494b053f9548fc150d94b9765d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 13 Feb 2022 17:19:49 +0000
Subject: [PATCH] core/linux-armv7-rc to 5.17.rc3-1

---
 core/linux-armv7-rc/PKGBUILD | 77 +++---------------------------------
 core/linux-armv7-rc/config   | 17 ++++----
 2 files changed, 16 insertions(+), 78 deletions(-)

diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index 78169500f..9dd08bc71 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -4,8 +4,8 @@
 buildarch=4
 
 _rcver=5.17
-_rcrel=2
-_rcnrel=armv7-x2
+_rcrel=3
+_rcnrel=armv7-x3
 
 pkgbase=linux-armv7-rc
 _srcname=linux-${_rcver}-rc${_rcrel}
@@ -35,8 +35,8 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
         'kernel_data_key.vbprivk'
         'linux.preset'
         '99-linux.hook')
-md5sums=('7e2ce80f0c9fbca69685438010e1d4fd'
-         'c766b3feb01f77005141111562a36463'
+md5sums=('bca4b0deb992e7f42d1228dfdf7abc10'
+         '0b93d53210189fffda654e86715321b4'
          '87ea5f10af410a55adc001d2c54a9a02'
          '351f5057a0419674b8980eaecce50888'
          '4402c0561cba393589eb5c89e218dbd4'
@@ -46,7 +46,7 @@ md5sums=('7e2ce80f0c9fbca69685438010e1d4fd'
          '114aec2225b78a12853434d10797ace6'
          '2e3c34b04fa35e94deceae9d4d69a5d9'
          'd30ce6532c642318aecc393ec3205b96'
-         'ca03dbadde9bbedad050de88e5df773e'
+         'b374f71ceb9662fd0a37d1e4f4288d33'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -244,71 +244,6 @@ _package-headers() {
   done < <(find "${_builddir}/scripts" -type f -perm -u+w -print0 2>/dev/null)
 }
 
-_package-smileplug() {
-  pkgdesc="The Linux Kernel - ${_desc} - Marvell SMILE Plug"
-  depends=('linux-armv7-rc')
-  provides=('linux-armv7-rc-uimage')
-  conflicts=('linux-armv7-rc-uimage' 'linux-armv7-uimage')
-
-  cd "${srcdir}/${_srcname}"
-
-  mkdir -p "${pkgdir}/boot" 
-  cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/armada-370-smileplug.dtb > myimage
-  mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "${pkgname}" -d myimage "${pkgdir}/boot/uImage"
-}
-
-_package-mirabox() {
-  pkgdesc="The Linux Kernel - ${_desc} - Globalscale Mirabox"
-  depends=('linux-armv7-rc')
-  provides=('linux-armv7-rc-uimage')
-  conflicts=('linux-armv7-rc-uimage' 'linux-armv7-uimage')
-
-  cd "${srcdir}/${_srcname}"
-
-  mkdir -p "${pkgdir}/boot"
-  cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/armada-370-mirabox.dtb > myimage
-  mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "${pkgname}" -d myimage "${pkgdir}/boot/uImage"
-}
-
-_package-ax3() {
-  pkgdesc="The Linux Kernel - ${_desc} - OpenBlocks AX3-4"
-  depends=('linux-armv7-rc')
-  provides=('linux-armv7-rc-uimage')
-  conflicts=('linux-armv7-rc-uimage' 'linux-armv7-uimage')
-
-  cd "${srcdir}/${_srcname}"
-
-  mkdir -p "${pkgdir}/boot"
-  cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/armada-xp-openblocks-ax3-4.dtb > myimage
-  mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "${pkgname}" -d myimage "${pkgdir}/boot/uImage"
-}
-
-_package-d3plug() {
-  pkgdesc="The Linux Kernel - ${_desc} - Globalscale D3Plug"
-  depends=('linux-armv7-rc')
-  provides=('linux-armv7-rc-uimage')
-  conflicts=('linux-armv7-rc-uimage' 'linux-armv7-uimage')
-
-  cd "${srcdir}/${_srcname}"
-
-  mkdir -p "${pkgdir}/boot"
-  cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/dove-d3plug.dtb > myimage
-  mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "${pkgname}" -d myimage "${pkgdir}/boot/uImage"
-}
-
-_package-cubox() {
-  pkgdesc="The Linux Kernel - ${_desc} - SolidRun Cubox (Marvell)"
-  depends=('linux-armv7-rc')
-  provides=('linux-armv7-rc-uimage')
-  conflicts=('linux-armv7-rc-uimage' 'linux-armv7-uimage')
-
-  cd "${srcdir}/${_srcname}"
-
-  mkdir -p "${pkgdir}/boot"
-  cat arch/$KARCH/boot/zImage arch/$KARCH/boot/dts/dove-cubox.dtb > myimage
-  mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n "${pkgname}" -d myimage "${pkgdir}/boot/uImage"
-}
-
 _package-chromebook() {
   pkgdesc="The Linux Kernel - ${_desc} - Chromebooks"
   depends=('linux-armv7-rc')
@@ -347,7 +282,7 @@ _package-odroidc1() {
   mkimage -A arm -O linux -T kernel -C none -a 0x00208000 -e 0x00208000 -n "${pkgname}" -d arch/$KARCH/boot/zImage "${pkgdir}/boot/uImage"
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-smileplug" "${pkgbase}-mirabox" "${pkgbase}-ax3" "${pkgbase}-d3plug" "${pkgbase}-cubox" "${pkgbase}-chromebook" "${pkgbase}-odroidc1")
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-chromebook" "${pkgbase}-odroidc1")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
     _package${_p#${pkgbase}}
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index d2b16f4b2..74c30d2f1 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,19 +1,20 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.17.0-rc2-1 Kernel Configuration
+# Linux/arm 5.17.0-rc3-1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100200
+CONFIG_GCC_VERSION=110100
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23500
+CONFIG_AS_VERSION=23601
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23500
+CONFIG_LD_VERSION=23601
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
@@ -6642,6 +6643,7 @@ CONFIG_HDMI=y
 #
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -8391,7 +8393,6 @@ CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=y
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_MELLANOX_PLATFORM is not set
-# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -9927,7 +9928,6 @@ CONFIG_NLS_UTF8=y
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
 CONFIG_UNICODE=y
-CONFIG_UNICODE_UTF8_DATA=y
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_IO_WQ=y
 # end of File systems
@@ -9986,6 +9986,8 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+# CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
 # end of Kernel hardening options
 # end of Security options
@@ -10437,6 +10439,7 @@ CONFIG_KDB_DEFAULT_ENABLE=0x1
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 # CONFIG_UBSAN is not set
+CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
 CONFIG_DEBUG_KERNEL=y