diff for duplicates of <20170210131925.GA6905@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 8c43476..5cd933d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Fri, Feb 10, 2017 at 12:51:48PM +0000, Ben Hutchings wrote: > On Tue, 2017-01-31 at 06:37 +0100, Greg Kroah-Hartman wrote: -> > 4.4-stable review patch. If anyone has any objections, please let me know. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -24,17 +24,17 @@ On Fri, Feb 10, 2017 at 12:51:48PM +0000, Ben Hutchings wrote: > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > --- -> > arch/arc/kernel/unaligned.c | 3 ++- -> > 1 file changed, 2 insertions(+), 1 deletion(-) +> > �arch/arc/kernel/unaligned.c |����3 ++- +> > �1 file changed, 2 insertions(+), 1 deletion(-) > > > > --- a/arch/arc/kernel/unaligned.c > > +++ b/arch/arc/kernel/unaligned.c > > @@ -241,8 +241,9 @@ int misaligned_fixup(unsigned long addre -> > if (state.fault) -> > goto fault; -> > +> > � if (state.fault) +> > � goto fault; +> > � > > + /* clear any remanants of delay slot */ -> > if (delay_mode(regs)) { +> > � if (delay_mode(regs)) { > > - regs->ret = regs->bta; > > + regs->ret = regs->bta ~1U; > diff --git a/a/content_digest b/N1/content_digest index 1c848c8..416697b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,7 +12,7 @@ "b\0" "On Fri, Feb 10, 2017 at 12:51:48PM +0000, Ben Hutchings wrote:\n" "> On Tue, 2017-01-31 at 06:37 +0100, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > \n" "> > ------------------\n" "> > \n" @@ -36,17 +36,17 @@ "> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > \n" "> > ---\n" - "> > \302\240arch/arc/kernel/unaligned.c |\302\240\302\240\302\240\302\2403 ++-\n" - "> > \302\2401 file changed, 2 insertions(+), 1 deletion(-)\n" + "> > \303\257\302\277\302\275arch/arc/kernel/unaligned.c |\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\2753 ++-\n" + "> > \303\257\302\277\302\2751 file changed, 2 insertions(+), 1 deletion(-)\n" "> > \n" "> > --- a/arch/arc/kernel/unaligned.c\n" "> > +++ b/arch/arc/kernel/unaligned.c\n" "> > @@ -241,8 +241,9 @@ int misaligned_fixup(unsigned long addre\n" - "> > \302\240\tif (state.fault)\n" - "> > \302\240\t\tgoto fault;\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\tif (state.fault)\n" + "> > \303\257\302\277\302\275\t\tgoto fault;\n" + "> > \303\257\302\277\302\275\n" "> > +\t/* clear any remanants of delay slot */\n" - "> > \302\240\tif (delay_mode(regs)) {\n" + "> > \303\257\302\277\302\275\tif (delay_mode(regs)) {\n" "> > -\t\tregs->ret = regs->bta;\n" "> > +\t\tregs->ret = regs->bta ~1U;\n" "> \n" @@ -61,4 +61,4 @@ "\n" greg k-h -f0153820b0b9e9617d1d663885c06701a9a07f833b220f7b6c9336d6962051de +e74181bc952b3f14ddbcfcc8abf617fbfb329b5fc88b5634ca0dd55d28e72b78
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.