* linux-next: bkl-removal/arm merge conflict
@ 2008-05-22 5:21 Stephen Rothwell
2008-05-22 14:16 ` Jonathan Corbet
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-22 5:21 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Arnd Bergmann, Russell King
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
Hi Jon,
Today's linux-next merge of the bkl-removal tree got a conflict in
arch/arm/common/rtctime.c between commit
b204d462d7eae31413c5ac80ec3a32a89765fd46 ("[RTC] remove old ARM rtc
library code") from the arm tree and commit
f6f28a87d5f4ae2b101e64ab494267f6858631c4 ("arm-common-rtctime: BKL
pushdown") from the bkl-removal tree.
The former removed the file which is what I did in linux-next.
Jon, you may want to remove or revert that commit from your tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: bkl-removal/arm merge conflict
2008-05-22 5:21 linux-next: bkl-removal/arm merge conflict Stephen Rothwell
@ 2008-05-22 14:16 ` Jonathan Corbet
2008-05-22 23:35 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Corbet @ 2008-05-22 14:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Arnd Bergmann, Russell King
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the bkl-removal tree got a conflict in
> arch/arm/common/rtctime.c between commit
> b204d462d7eae31413c5ac80ec3a32a89765fd46 ("[RTC] remove old ARM rtc
> library code") from the arm tree and commit
> f6f28a87d5f4ae2b101e64ab494267f6858631c4 ("arm-common-rtctime: BKL
> pushdown") from the bkl-removal tree.
OK, that commit has been removed. Thanks, Stephen.
jon
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: bkl-removal/arm merge conflict
2008-05-22 14:16 ` Jonathan Corbet
@ 2008-05-22 23:35 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-05-22 23:35 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Arnd Bergmann, Russell King
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
Hi Jon,
On Thu, 22 May 2008 08:16:25 -0600 corbet@lwn.net (Jonathan Corbet) wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Today's linux-next merge of the bkl-removal tree got a conflict in
> > arch/arm/common/rtctime.c between commit
> > b204d462d7eae31413c5ac80ec3a32a89765fd46 ("[RTC] remove old ARM rtc
> > library code") from the arm tree and commit
> > f6f28a87d5f4ae2b101e64ab494267f6858631c4 ("arm-common-rtctime: BKL
> > pushdown") from the bkl-removal tree.
>
> OK, that commit has been removed. Thanks, Stephen.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-22 23:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-22 5:21 linux-next: bkl-removal/arm merge conflict Stephen Rothwell
2008-05-22 14:16 ` Jonathan Corbet
2008-05-22 23:35 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).