From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Jun 2023 07:05:25 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.14.319~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7675518371ee8a28670ced3201a8db8d837d512;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	batman-adv-switch-to-kstrtox.h-for-kstrtou64.patch
---

diff --git a/queue-5.10/batman-adv-switch-to-kstrtox.h-for-kstrtou64.patch b/queue-5.10/batman-adv-switch-to-kstrtox.h-for-kstrtou64.patch
new file mode 100644
index 00000000000..b537e9737a2
--- /dev/null
+++ b/queue-5.10/batman-adv-switch-to-kstrtox.h-for-kstrtou64.patch
@@ -0,0 +1,31 @@
+From 55207227189a07513ba4107d72e256313a66a2f3 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven@narfation.org>
+Date: Fri, 23 Jul 2021 19:23:17 +0200
+Subject: batman-adv: Switch to kstrtox.h for kstrtou64
+
+From: Sven Eckelmann <sven@narfation.org>
+
+commit 55207227189a07513ba4107d72e256313a66a2f3 upstream.
+
+The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox()
+to a separate header") moved the kstrtou64 function to a new header called
+linux/kstrtox.h.
+
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/batman-adv/gateway_common.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/batman-adv/gateway_common.c
++++ b/net/batman-adv/gateway_common.c
+@@ -10,7 +10,7 @@
+ #include <linux/atomic.h>
+ #include <linux/byteorder/generic.h>
+ #include <linux/errno.h>
+-#include <linux/kernel.h>
++#include <linux/kstrtox.h>
+ #include <linux/limits.h>
+ #include <linux/math64.h>
+ #include <linux/netdevice.h>
diff --git a/queue-5.10/series b/queue-5.10/series
index 5c69f07d10a..fc079a20ee9 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -78,3 +78,4 @@ neighbour-remove-unused-inline-function-neigh_key_eq16.patch
 net-remove-unused-inline-function-dst_hold_and_use.patch
 net-remove-decnet-leftovers-from-flow.h.patch
 neighbour-delete-neigh_lookup_nodev-as-not-used.patch
+batman-adv-switch-to-kstrtox.h-for-kstrtou64.patch