From: Greg Kroah-Hartman Date: Fri, 20 Oct 2023 15:01:48 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.328~122 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15ebca14113fe0ea2e8850810fe7728235ef0509;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: documentation-sysctl-align-cells-in-second-content-column.patch --- diff --git a/queue-5.15/documentation-sysctl-align-cells-in-second-content-column.patch b/queue-5.15/documentation-sysctl-align-cells-in-second-content-column.patch new file mode 100644 index 00000000000..81d85b2c838 --- /dev/null +++ b/queue-5.15/documentation-sysctl-align-cells-in-second-content-column.patch @@ -0,0 +1,74 @@ +From 1faa34672f8a17a3e155e74bde9648564e9480d6 Mon Sep 17 00:00:00 2001 +From: Bagas Sanjaya +Date: Wed, 24 Aug 2022 10:58:04 +0700 +Subject: Documentation: sysctl: align cells in second content column + +From: Bagas Sanjaya + +commit 1faa34672f8a17a3e155e74bde9648564e9480d6 upstream. + +Stephen Rothwell reported htmldocs warning when merging net-next tree: + +Documentation/admin-guide/sysctl/net.rst:37: WARNING: Malformed table. +Text in column margin in table line 4. + +========= =================== = ========== ================== +Directory Content Directory Content +========= =================== = ========== ================== +802 E802 protocol mptcp Multipath TCP +appletalk Appletalk protocol netfilter Network Filter +ax25 AX25 netrom NET/ROM +bridge Bridging rose X.25 PLP layer +core General parameter tipc TIPC +ethernet Ethernet protocol unix Unix domain sockets +ipv4 IP version 4 x25 X.25 protocol +ipv6 IP version 6 +========= =================== = ========== ================== + +The warning above is caused by cells in second "Content" column of +/proc/sys/net subdirectory table which are in column margin. + +Align these cells against the column header to fix the warning. + +Link: https://lore.kernel.org/linux-next/20220823134905.57ed08d5@canb.auug.org.au/ +Fixes: 1202cdd665315c ("Remove DECnet support from kernel") +Reported-by: Stephen Rothwell +Signed-off-by: Bagas Sanjaya +Link: https://lore.kernel.org/r/20220824035804.204322-1-bagasdotme@gmail.com +Signed-off-by: Jakub Kicinski +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/admin-guide/sysctl/net.rst | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +--- a/Documentation/admin-guide/sysctl/net.rst ++++ b/Documentation/admin-guide/sysctl/net.rst +@@ -31,18 +31,18 @@ see only some of them, depending on your + + Table : Subdirectories in /proc/sys/net + +- ========= =================== = ========== ================== ++ ========= =================== = ========== =================== + Directory Content Directory Content +- ========= =================== = ========== ================== +- 802 E802 protocol mptcp Multipath TCP +- appletalk Appletalk protocol netfilter Network Filter ++ ========= =================== = ========== =================== ++ 802 E802 protocol mptcp Multipath TCP ++ appletalk Appletalk protocol netfilter Network Filter + ax25 AX25 netrom NET/ROM +- bridge Bridging rose X.25 PLP layer +- core General parameter tipc TIPC +- ethernet Ethernet protocol unix Unix domain sockets +- ipv4 IP version 4 x25 X.25 protocol ++ bridge Bridging rose X.25 PLP layer ++ core General parameter tipc TIPC ++ ethernet Ethernet protocol unix Unix domain sockets ++ ipv4 IP version 4 x25 X.25 protocol + ipv6 IP version 6 +- ========= =================== = ========== ================== ++ ========= =================== = ========== =================== + + 1. /proc/sys/net/core - Network core options + ============================================ diff --git a/queue-5.15/series b/queue-5.15/series index 3b34f9c4342..8d63cbd64cb 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1 +1,2 @@ lib-kconfig.debug-do-not-enable-debug_preempt-by-default.patch +documentation-sysctl-align-cells-in-second-content-column.patch