linux-next: manual merge of the xtensa tree with the arm64 and tip trees

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the xtensa tree got a conflict in:

  arch/xtensa/include/asm/atomic.h

between commit:

  2a3ed90f428c ("xtensa: Provide atomic_{or,xor,and}")

from the arm64 and tip trees and commit:

  38fef73c21d1 ("xtensa: implement fake NMI")

from the xtensa tree.

I fixed it up (I dropped the latter's definitions of
atomic_{set,clear}_mask) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/