diff for duplicates of <20230327173802.0ceb89df@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 864bae3..7e40b8a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,8 +10,3 @@ On Mon, 27 Mar 2023 09:53:22 +0800 Guo Samin wrote: If the conflict is just on MAINTAINERS it should be safe to ignore. Resend your patches on top of net-next as if their patches didn't exist. Stephen/Linus will have not trouble resolving the conflict. - -_______________________________________________ -linux-riscv mailing list -linux-riscv@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-riscv diff --git a/a/content_digest b/N1/content_digest index fc08e4a..a5cf753 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -40,11 +40,6 @@ "\n" "If the conflict is just on MAINTAINERS it should be safe to ignore.\n" "Resend your patches on top of net-next as if their patches didn't\n" - "exist. Stephen/Linus will have not trouble resolving the conflict.\n" - "\n" - "_______________________________________________\n" - "linux-riscv mailing list\n" - "linux-riscv@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-riscv + exist. Stephen/Linus will have not trouble resolving the conflict. -4191300f1d75f3179b3221a770ec3623c66e381f81c284cf3fb5a5733b25c5ef +f015fb953ab7d6d31999d4e2ea257a72d4a012102b1edcaa0a3fe8320641796b
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.