* [PATCH] docs: nf_flowtable: fix typo.
@ 2020-10-18 15:30 Jeremy Sowden
2020-10-18 15:32 ` Jeremy Sowden
2020-10-20 15:19 ` Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Jeremy Sowden @ 2020-10-18 15:30 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Devel
"mailined" should be "mainlined."
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
Documentation/networking/nf_flowtable.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/networking/nf_flowtable.rst b/Documentation/networking/nf_flowtable.rst
index b6e1fa141aae..6cdf9a1724b6 100644
--- a/Documentation/networking/nf_flowtable.rst
+++ b/Documentation/networking/nf_flowtable.rst
@@ -109,7 +109,7 @@ More reading
This documentation is based on the LWN.net articles [1]_\ [2]_. Rafal Milecki
also made a very complete and comprehensive summary called "A state of network
acceleration" that describes how things were before this infrastructure was
-mailined [3]_ and it also makes a rough summary of this work [4]_.
+mainlined [3]_ and it also makes a rough summary of this work [4]_.
.. [1] https://lwn.net/Articles/738214/
.. [2] https://lwn.net/Articles/742164/
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: nf_flowtable: fix typo.
2020-10-18 15:30 [PATCH] docs: nf_flowtable: fix typo Jeremy Sowden
@ 2020-10-18 15:32 ` Jeremy Sowden
2020-10-20 15:19 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Jeremy Sowden @ 2020-10-18 15:32 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Devel
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
On 2020-10-18, at 16:30:19 +0100, Jeremy Sowden wrote:
> "mailined" should be "mainlined."
>
> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> ---
> Documentation/networking/nf_flowtable.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/networking/nf_flowtable.rst b/Documentation/networking/nf_flowtable.rst
> index b6e1fa141aae..6cdf9a1724b6 100644
> --- a/Documentation/networking/nf_flowtable.rst
> +++ b/Documentation/networking/nf_flowtable.rst
> @@ -109,7 +109,7 @@ More reading
> This documentation is based on the LWN.net articles [1]_\ [2]_. Rafal Milecki
> also made a very complete and comprehensive summary called "A state of network
> acceleration" that describes how things were before this infrastructure was
> -mailined [3]_ and it also makes a rough summary of this work [4]_.
> +mainlined [3]_ and it also makes a rough summary of this work [4]_.
>
> .. [1] https://lwn.net/Articles/738214/
> .. [2] https://lwn.net/Articles/742164/
Forgot to include the tree in the subject. The patch was intended for
nf-next.
J.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: nf_flowtable: fix typo.
2020-10-18 15:30 [PATCH] docs: nf_flowtable: fix typo Jeremy Sowden
2020-10-18 15:32 ` Jeremy Sowden
@ 2020-10-20 15:19 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2020-10-20 15:19 UTC (permalink / raw)
To: Jeremy Sowden; +Cc: Netfilter Devel
On Sun, Oct 18, 2020 at 04:30:19PM +0100, Jeremy Sowden wrote:
> "mailined" should be "mainlined."
Applied to nf.git, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-20 15:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-18 15:30 [PATCH] docs: nf_flowtable: fix typo Jeremy Sowden
2020-10-18 15:32 ` Jeremy Sowden
2020-10-20 15:19 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).