On Tue, Jul 05, 2016 at 03:56:31PM +0200, Paolo Bonzini wrote:
> On 23/06/2016 18:34, James Hogan wrote:
> > diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
> > index ad718debc35a..4731893db3f7 100644
> > --- a/arch/mips/mm/uasm.c
> > +++ b/arch/mips/mm/uasm.c
> > @@ -49,18 +49,18 @@ enum opcode {
>
> This "enum opcode" looks like a pretty bad conflict magnet. Ralf, can
> you check if you have any patches affecting it too?
Nothing at this point.
Ralf
