Re: atomic_set_mask duplication

[Stephen Rothwell]

Hi Mike,

On Fri, 29 Jul 2011 00:47:03 -0700 Mike Frysinger <vapier.adi@xxxxxxxxx> wrote:
>
> seems that my atomic_set_mask() patch for asm-generic/atomic.h has
> made it into linux-next but duplicated ?  any idea what's going on ?
> 
> commit 00b3c28bd753 is correct.  but then we also have 49472be55954
> which should not exist ...

Right.  The first one is in Linus' tree and the second is the one from
Andrew's tree and git was fine about reapplying it :-(

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature