On Wed, 9 Mar 2016 14:28:14 +0100 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote: > Hi Antony, > > On Mon, Mar 07, 2016 at 04:30:16PM +0300, Antony Pavlov wrote: > > Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx> > > Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx> > > --- > > arch/mips/include/asm/cacheops.h | 7 ++++++ > > arch/mips/include/asm/io.h | 3 +++ > > arch/mips/lib/c-r4k.c | 48 ++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 58 insertions(+) > > > > index ff68677..4fe046a 100644 > > --- a/arch/mips/lib/c-r4k.c > > +++ b/arch/mips/lib/c-r4k.c > > @@ -10,10 +10,58 @@ > > #include <common.h> > > #include <asm/io.h> > > #include <asm/mipsregs.h> > > +#include <asm/cache.h> > > This breaks bisectibility. asm/cache.h is introduced with the next. > patch. I tried swapping the patches but got merge conflicts. Shall I > squash both patches or do you have another preferred solution? I'm so sorry! I'll fix it by myself and resend the series. -- Best regards, Antony Pavlov _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
