* linux-next: attempted manual merge of the ubifs tree
@ 2008-07-23 6:11 Stephen Rothwell
2008-07-23 6:33 ` Artem Bityutskiy
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-23 6:11 UTC (permalink / raw)
To: Artem Bityutskiy; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
Hi Artem,
Today's linux-next merge of the ubifs tree got a lot of conflicts against
the ubi tree. I can only assume that the ubifs tree was based on a
different version of the ubi tree than what I have in linux-next today.
I have dropped the ubifs tree for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: attempted manual merge of the ubifs tree
2008-07-23 6:11 linux-next: attempted manual merge of the ubifs tree Stephen Rothwell
@ 2008-07-23 6:33 ` Artem Bityutskiy
2008-07-23 7:27 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Artem Bityutskiy @ 2008-07-23 6:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen,
Stephen Rothwell wrote:
> Today's linux-next merge of the ubifs tree got a lot of conflicts against
> the ubi tree. I can only assume that the ubifs tree was based on a
> different version of the ubi tree than what I have in linux-next today.
>
> I have dropped the ubifs tree for today.
Apologies, my fault. Fixed.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: attempted manual merge of the ubifs tree
2008-07-23 6:33 ` Artem Bityutskiy
@ 2008-07-23 7:27 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-23 7:27 UTC (permalink / raw)
To: Artem.Bityutskiy; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
Hi Artem,
On Wed, 23 Jul 2008 09:33:41 +0300 Artem Bityutskiy <Artem.Bityutskiy@nokia•com> wrote:
>
> Stephen Rothwell wrote:
> > Today's linux-next merge of the ubifs tree got a lot of conflicts against
> > the ubi tree. I can only assume that the ubifs tree was based on a
> > different version of the ubi tree than what I have in linux-next today.
> >
> > I have dropped the ubifs tree for today.
>
> Apologies, my fault. Fixed.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-23 7:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-23 6:11 linux-next: attempted manual merge of the ubifs tree Stephen Rothwell
2008-07-23 6:33 ` Artem Bityutskiy
2008-07-23 7:27 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox