From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 1 Jun 2023 10:42:58 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v5.4.245~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b5798e4beaf8e746dc97122a19f1dd3a8b30daf;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	tools-headers-uapi-sync-the-linux-in.h-with-the-kernel-sources.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index 863168a2769..ca83f243445 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -39,3 +39,4 @@ block-fix-bio-cache-for-passthru-io.patch
 cpufreq-amd-pstate-update-policy-cur-in-amd_pstate_adjust_perf.patch
 cpufreq-amd-pstate-add-fast_switch-callback.patch
 netfilter-ctnetlink-support-offloaded-conntrack-entry-deletion.patch
+tools-headers-uapi-sync-the-linux-in.h-with-the-kernel-sources.patch
diff --git a/queue-6.1/tools-headers-uapi-sync-the-linux-in.h-with-the-kernel-sources.patch b/queue-6.1/tools-headers-uapi-sync-the-linux-in.h-with-the-kernel-sources.patch
new file mode 100644
index 00000000000..4e1d520a19e
--- /dev/null
+++ b/queue-6.1/tools-headers-uapi-sync-the-linux-in.h-with-the-kernel-sources.patch
@@ -0,0 +1,45 @@
+From 5d1ac59ff7445e51a0e4958fa39ac8aa23691698 Mon Sep 17 00:00:00 2001
+From: Yanteng Si <siyanteng@loongson.cn>
+Date: Wed, 10 May 2023 18:21:44 +0800
+Subject: tools headers UAPI: Sync the linux/in.h with the kernel sources
+
+From: Yanteng Si <siyanteng@loongson.cn>
+
+commit 5d1ac59ff7445e51a0e4958fa39ac8aa23691698 upstream.
+
+Picking the changes from:
+
+  91d0b78c5177f3e4 ("inet: Add IP_LOCAL_PORT_RANGE socket option")
+
+Silencing these perf build warnings:
+
+  Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs from latest version at 'include/uapi/linux/in.h'
+  diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h
+
+Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: loongson-kernel@lists.loongnix.cn
+Link: https://lore.kernel.org/r/23aabc69956ac94fbf388b05c8be08a64e8c7ccc.1683712945.git.siyanteng@loongson.cn
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/include/uapi/linux/in.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/include/uapi/linux/in.h
++++ b/tools/include/uapi/linux/in.h
+@@ -162,6 +162,7 @@ struct in_addr {
+ #define MCAST_MSFILTER			48
+ #define IP_MULTICAST_ALL		49
+ #define IP_UNICAST_IF			50
++#define IP_LOCAL_PORT_RANGE		51
+ 
+ #define MCAST_EXCLUDE	0
+ #define MCAST_INCLUDE	1