lkml.org 
[lkml]   [2011]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: atomic_set_mask duplication
Hi Mike,

On Fri, 29 Jul 2011 21:19:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 29 Jul 2011 00:47:03 -0700 Mike Frysinger <vapier.adi@gmail.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 :-(

I have dropped that patch from my copy of Andrew's tree for tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-07-31 15:47    [W:0.076 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site