diff for duplicates of <20161109153209.GK1382@soda.linbit> diff --git a/a/content_digest b/N1/content_digest index 64d2636..096f520 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,15 @@ "ref\0497abc52-093f-17ea-5fb5-645030a23a01@nod.at\0" "ref\020161108165204.GC2834@kernel.dk\0" "From\0Lars Ellenberg <lars.ellenberg@linbit.com>\0" - "Subject\0Re: [Drbd-dev] [PATCH] drbd: Fix kernel_sendmsg() usage\0" + "Subject\0Re: [PATCH] drbd: Fix kernel_sendmsg() usage\0" "Date\0Wed, 9 Nov 2016 16:32:09 +0100\0" "To\0Jens Axboe <axboe@kernel.dk>\0" - "Cc\0wolfgang.glas@iteg.at" - Richard Weinberger <richard@nod.at> + "Cc\0Richard Weinberger <richard@nod.at>" + wolfgang.glas@iteg.at christoph.lechleitner@iteg.at - linux-kernel@vger.kernel.org - stable@vger.kernel.org philipp.reisner@linbit.com + stable@vger.kernel.org + linux-kernel@vger.kernel.org viro@zeniv.linux.org.uk " drbd-dev@lists.linbit.com\0" "\00:1\0" @@ -62,4 +62,4 @@ "\n" "DRBD\302\256 and LINBIT\302\256 are registered trademarks of LINBIT" -c29be578df68aa8a1100da18d663d877cf7bce72551594bb659025252cf99120 +f610eec7f3787c737c10c5af787f666f7a6ea9712705036015b534c5e0d6968c
diff --git a/a/1.txt b/N2/1.txt index fa37dfa..5e82969 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -43,4 +43,4 @@ willing to resolve the trivial "missing comment block" conflict yourself? : DRBD -- Heartbeat -- Corosync -- Pacemaker : R&D, Integration, Ops, Consulting, Support -DRBD® and LINBIT® are registered trademarks of LINBIT +DRBD� and LINBIT� are registered trademarks of LINBIT diff --git a/a/content_digest b/N2/content_digest index 64d2636..4abffef 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,15 +2,15 @@ "ref\0497abc52-093f-17ea-5fb5-645030a23a01@nod.at\0" "ref\020161108165204.GC2834@kernel.dk\0" "From\0Lars Ellenberg <lars.ellenberg@linbit.com>\0" - "Subject\0Re: [Drbd-dev] [PATCH] drbd: Fix kernel_sendmsg() usage\0" + "Subject\0Re: [PATCH] drbd: Fix kernel_sendmsg() usage\0" "Date\0Wed, 9 Nov 2016 16:32:09 +0100\0" "To\0Jens Axboe <axboe@kernel.dk>\0" - "Cc\0wolfgang.glas@iteg.at" - Richard Weinberger <richard@nod.at> + "Cc\0Richard Weinberger <richard@nod.at>" + wolfgang.glas@iteg.at christoph.lechleitner@iteg.at - linux-kernel@vger.kernel.org - stable@vger.kernel.org philipp.reisner@linbit.com + stable@vger.kernel.org + linux-kernel@vger.kernel.org viro@zeniv.linux.org.uk " drbd-dev@lists.linbit.com\0" "\00:1\0" @@ -60,6 +60,6 @@ ": DRBD -- Heartbeat -- Corosync -- Pacemaker\n" ": R&D, Integration, Ops, Consulting, Support\n" "\n" - "DRBD\302\256 and LINBIT\302\256 are registered trademarks of LINBIT" + "DRBD\303\257\302\277\302\275 and LINBIT\303\257\302\277\302\275 are registered trademarks of LINBIT" -c29be578df68aa8a1100da18d663d877cf7bce72551594bb659025252cf99120 +2bee40c0f728fe121dee9d6828a8d58354a0e5ab944312a977a48e1a521f5bc7
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.