From 17658c6c53015cf594d32f2a767d2bc26b351040 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 14 Dec 2020 23:33:18 +0100
Subject: [PATCH] Switched meson64-dev to linux 5.10.y

---
 config/kernel/linux-meson64-dev.config             | 4 +++-
 config/sources/families/include/meson64_common.inc | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/kernel/linux-meson64-dev.config b/config/kernel/linux-meson64-dev.config
index 664e44275c..1b6ed2af8d 100644
--- a/config/kernel/linux-meson64-dev.config
+++ b/config/kernel/linux-meson64-dev.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.0-rc7 Kernel Configuration
+# Linux/arm64 5.10.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -3487,6 +3487,7 @@ CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_INPUT_JOYSTICK=y
 # CONFIG_JOYSTICK_ANALOG is not set
 # CONFIG_JOYSTICK_A3D is not set
+CONFIG_JOYSTICK_ADC=m
 # CONFIG_JOYSTICK_ADI is not set
 # CONFIG_JOYSTICK_COBRA is not set
 # CONFIG_JOYSTICK_GF2K is not set
@@ -8822,6 +8823,7 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index 6a364b691b..2d297a4b56 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -32,7 +32,7 @@ case $BRANCH in
         ;;
 
         dev)
-		KERNELBRANCH='tag:v5.10-rc7'
+		KERNELBRANCH='branch:linux-5.10.y'
 		KERNELPATCHDIR='meson64-dev'
         ;;