[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110729211906.a98b2965d30694df7e12191f@canb.auug.org.au>
Date: Fri, 29 Jul 2011 21:19:06 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mike Frysinger <vapier.adi@...il.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: atomic_set_mask duplication
Hi Mike,
On Fri, 29 Jul 2011 00:47:03 -0700 Mike Frysinger <vapier.adi@...il.com> 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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists