diff for duplicates of <20190228151105.11277-44-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 229c853..eb86a38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -From: Naresh Kamboju <naresh.kamboju at linaro.org> +From: Naresh Kamboju <naresh.kamboju@linaro.org> [ Upstream commit 952b72f89ae23b316da8c1021b18d0c388ad6cc4 ] diff --git a/a/content_digest b/N1/content_digest index c9eeda3..637a683 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,10 @@ "ref\020190228151105.11277-1-sashal@kernel.org\0" - "From\0sashal at kernel.org (Sasha Levin)\0" + "From\0sashal@kernel.org (Sasha Levin)\0" "Subject\0[PATCH AUTOSEL 4.19 44/64] selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET\0" "Date\0Thu, 28 Feb 2019 10:10:45 -0500\0" "\00:1\0" "b\0" - "From: Naresh Kamboju <naresh.kamboju at linaro.org>\n" + "From: Naresh Kamboju <naresh.kamboju@linaro.org>\n" "\n" "[ Upstream commit 952b72f89ae23b316da8c1021b18d0c388ad6cc4 ]\n" "\n" @@ -30,4 +30,4 @@ "-- \n" 2.19.1 -4055c67e050b59838d0b30789bd72cf29b6b6fa0b646d6b183a386e7036ccc59 +496c7546a67bbf2a7d478ad717524f3ca34009d7aeb3046a0b75d5c38b73cefd
diff --git a/a/1.txt b/N2/1.txt index 229c853..c90d0cc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,14 +1,14 @@ -From: Naresh Kamboju <naresh.kamboju at linaro.org> +From: Naresh Kamboju <naresh.kamboju@linaro.org> [ Upstream commit 952b72f89ae23b316da8c1021b18d0c388ad6cc4 ] In selftests the config fragment for netfilter was added as NF_TABLES_INET=y and this patch correct it as CONFIG_NF_TABLES_INET=y -Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org> -Acked-by: Florian Westphal <fw at strlen.de> -Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org> -Signed-off-by: Sasha Levin <sashal at kernel.org> +Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org> +Acked-by: Florian Westphal <fw@strlen.de> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +Signed-off-by: Sasha Levin <sashal@kernel.org> --- tools/testing/selftests/netfilter/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/a/content_digest b/N2/content_digest index c9eeda3..5d71a4a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,26 @@ "ref\020190228151105.11277-1-sashal@kernel.org\0" - "From\0sashal at kernel.org (Sasha Levin)\0" + "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.19 44/64] selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET\0" "Date\0Thu, 28 Feb 2019 10:10:45 -0500\0" + "To\0linux-kernel@vger.kernel.org" + " stable@vger.kernel.org\0" + "Cc\0Naresh Kamboju <naresh.kamboju@linaro.org>" + Pablo Neira Ayuso <pablo@netfilter.org> + Sasha Levin <sashal@kernel.org> + " linux-kselftest@vger.kernel.org\0" "\00:1\0" "b\0" - "From: Naresh Kamboju <naresh.kamboju at linaro.org>\n" + "From: Naresh Kamboju <naresh.kamboju@linaro.org>\n" "\n" "[ Upstream commit 952b72f89ae23b316da8c1021b18d0c388ad6cc4 ]\n" "\n" "In selftests the config fragment for netfilter was added as\n" "NF_TABLES_INET=y and this patch correct it as CONFIG_NF_TABLES_INET=y\n" "\n" - "Signed-off-by: Naresh Kamboju <naresh.kamboju at linaro.org>\n" - "Acked-by: Florian Westphal <fw at strlen.de>\n" - "Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>\n" - "Signed-off-by: Sasha Levin <sashal at kernel.org>\n" + "Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>\n" + "Acked-by: Florian Westphal <fw@strlen.de>\n" + "Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>\n" + "Signed-off-by: Sasha Levin <sashal@kernel.org>\n" "---\n" " tools/testing/selftests/netfilter/config | 2 +-\n" " 1 file changed, 1 insertion(+), 1 deletion(-)\n" @@ -30,4 +36,4 @@ "-- \n" 2.19.1 -4055c67e050b59838d0b30789bd72cf29b6b6fa0b646d6b183a386e7036ccc59 +7f12a0d143079466a03772433b955ae6cb97d38e2d70c8805b596441813c925d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.