diff for duplicates of <1507543253.16703.6.camel@neuling.org> diff --git a/a/1.txt b/N1/1.txt index 4253a9f..4769ea9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ -@ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated =3D { -> =C2=A0 WARN_EMULATED_SETUP(mfdscr), -> =C2=A0 WARN_EMULATED_SETUP(mtdscr), -> =C2=A0 WARN_EMULATED_SETUP(lq_stq), +@ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated = { +> WARN_EMULATED_SETUP(mfdscr), +> WARN_EMULATED_SETUP(mtdscr), +> WARN_EMULATED_SETUP(lq_stq), > + WARN_EMULATED_SETUP(paste), You'll need to rebase this on powerpc/next as this has changed upstream. diff --git a/a/content_digest b/N1/content_digest index 26a0f88..43e980a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,14 +12,14 @@ " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "@ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated =3D {\n" - "> =C2=A0\tWARN_EMULATED_SETUP(mfdscr),\n" - "> =C2=A0\tWARN_EMULATED_SETUP(mtdscr),\n" - "> =C2=A0\tWARN_EMULATED_SETUP(lq_stq),\n" + "@ -1924,6 +1987,7 @@ struct ppc_emulated ppc_emulated = {\n" + "> \302\240\tWARN_EMULATED_SETUP(mfdscr),\n" + "> \302\240\tWARN_EMULATED_SETUP(mtdscr),\n" + "> \302\240\tWARN_EMULATED_SETUP(lq_stq),\n" "> +\tWARN_EMULATED_SETUP(paste),\n" "\n" "You'll need to rebase this on powerpc/next as this has changed upstream.\n" "\n" Mikey -7a5bab73350e176a99a67cc9123bfdb2ba7c9d44c3c78a0118d01a5b87f2cee2 +545dbc41a4d18a863d034aacb26f6c6c482bfddab5d647563bf6961fcd9e51a5
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.