* atomic_set_mask duplication
@ 2011-07-29 7:47 Mike Frysinger
2011-07-29 11:19 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2011-07-29 7:47 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, LKML
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 ...
-mike
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: atomic_set_mask duplication
2011-07-29 7:47 atomic_set_mask duplication Mike Frysinger
@ 2011-07-29 11:19 ` Stephen Rothwell
2011-07-31 13:43 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-07-29 11:19 UTC (permalink / raw)
To: Mike Frysinger; +Cc: Andrew Morton, linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi Mike,
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 :-(
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: atomic_set_mask duplication
2011-07-29 11:19 ` Stephen Rothwell
@ 2011-07-31 13:43 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-07-31 13:43 UTC (permalink / raw)
To: Mike Frysinger; +Cc: Andrew Morton, linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-31 13:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-29 7:47 atomic_set_mask duplication Mike Frysinger
2011-07-29 11:19 ` Stephen Rothwell
2011-07-31 13:43 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox