diff for duplicates of <20180501115538.GE20978@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 03463a4..d6800f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On Thu, Apr 26, 2018 at 07:49:24PM +0200, Greg KH 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 9db5d43..d6ccdd5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -22,7 +22,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" @@ -42,4 +42,4 @@ "\n" /Jarkko -c7c49d981800705db43e722e8519a5a72cf57fcb4a73107aaf98e2c9fbe8ae05 +442e339c4d9f3a0c6f39314ce1e6ddd41d281a05523ef6b0f9cbf8de8c0aa28a
diff --git a/a/1.txt b/N2/1.txt index 03463a4..ea7238e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,7 +5,7 @@ On Thu, Apr 26, 2018 at 07:49:24PM +0200, Greg KH 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 9db5d43..6d0b04a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -22,7 +22,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" @@ -42,4 +42,4 @@ "\n" /Jarkko -c7c49d981800705db43e722e8519a5a72cf57fcb4a73107aaf98e2c9fbe8ae05 +e0957959ecc8db2d3f6db91e2f16ffc7364e816611e4a337e4010af9aa72b817
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.