diff for duplicates of <20170210132610.GA14908@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 0bcd3cb..618659a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Fri, Feb 10, 2017 at 02:19:25PM +0100, Greg Kroah-Hartman wrote: > 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. > > > > > > ------------------ > > > @@ -25,17 +25,17 @@ On Fri, Feb 10, 2017 at 02:19:25PM +0100, Greg Kroah-Hartman 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 964e2ae..0f29919 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,7 +14,7 @@ "On Fri, Feb 10, 2017 at 02:19:25PM +0100, Greg Kroah-Hartman wrote:\n" "> 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" @@ -38,17 +38,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" @@ -64,4 +64,4 @@ "\n" greg k-h -1e60f1b01221c24ed4490b35c6341138425d26b0697c399d635ca8c6be7ddfcc +e5fa5befc43ba68a5fa344b845249f247b017c34063042b2b101377bca4b579e
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.