diff for duplicates of <20180426174924.GD28091@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 41c3a94..989b2d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On Wed, Apr 25, 2018 at 10:53:32AM -0700, James Bottomley wrote: > > > "tpm: add retry logic" caused merge conflicts so I picked couple of > > > other fixes in order to get it apply cleanly. > > -> > Are these only needed in 4.16.y? Nothing earlier? +> > Are these only needed in 4.16.y? Nothing earlier? > > The retry one (tpm: add retry logic) could go back as far as you can, > but the bug it causes is rarely seen: mostly it's a failure of the diff --git a/a/content_digest b/N1/content_digest index afa4881..d40ff0d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,7 +20,7 @@ "> > > \"tpm: add retry logic\" caused merge conflicts so I picked couple of\n" "> > > other fixes in order to get it apply cleanly.\n" "> > \n" - "> > Are these only needed in 4.16.y? Nothing earlier?\n" + "> > Are these only needed in 4.16.y?\302\240\302\240Nothing earlier?\n" "> \n" "> The retry one (tpm: add retry logic) could go back as far as you can,\n" "> but the bug it causes is rarely seen: mostly it's a failure of the\n" @@ -36,4 +36,4 @@ "\n" greg k-h -5b53edb27739ad3993eec003d13a239c7d8e2bddf19f9f2e9ed90e81bf7df30a +d4bc010c3b91278bf784866cc2d7b99e758ee2587127e33b8c3075a52ef33e01
diff --git a/a/1.txt b/N2/1.txt index 41c3a94..7240a08 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,7 +4,7 @@ On Wed, Apr 25, 2018 at 10:53:32AM -0700, James Bottomley wrote: > > > "tpm: add retry logic" caused merge conflicts so I picked couple of > > > other fixes in order to get it apply cleanly. > > -> > Are these only needed in 4.16.y? Nothing earlier? +> > Are these only needed in 4.16.y?��Nothing earlier? > > The retry one (tpm: add retry logic) could go back as far as you can, > but the bug it causes is rarely seen: mostly it's a failure of the diff --git a/a/content_digest b/N2/content_digest index afa4881..95ea3c2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -20,7 +20,7 @@ "> > > \"tpm: add retry logic\" caused merge conflicts so I picked couple of\n" "> > > other fixes in order to get it apply cleanly.\n" "> > \n" - "> > Are these only needed in 4.16.y? Nothing earlier?\n" + "> > Are these only needed in 4.16.y?\303\257\302\277\302\275\303\257\302\277\302\275Nothing earlier?\n" "> \n" "> The retry one (tpm: add retry logic) could go back as far as you can,\n" "> but the bug it causes is rarely seen: mostly it's a failure of the\n" @@ -36,4 +36,4 @@ "\n" greg k-h -5b53edb27739ad3993eec003d13a239c7d8e2bddf19f9f2e9ed90e81bf7df30a +a1148e307ef632c908d033cd7bbec6f5eabb6ff95ae06604ae4aee800cab89f7
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.