* linux-next: manual merge of the ubi tree
@ 2008-07-22 3:31 Stephen Rothwell
2008-07-22 5:26 ` Artem Bityutskiy
2008-07-22 6:25 ` Artem Bityutskiy
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2008-07-22 3:31 UTC (permalink / raw)
To: Artem Bityutskiy; +Cc: linux-next, Jonathan Corbet
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Hi Artem,
Today's linux-next merge of the ubi tree got a trivial conflict in
drivers/mtd/ubi/cdev.c between commit
72b67048f5dac18fd6494e3d3bff7e54840e8761 ("UBI: cdev lock_kernel()
pushdown") from Linus' tree and commit
9c0ec8fe1eed2106441e12ca2964f431df044f1d ("UBI: fix checkpatch.pl errors
and warnings") from the ubi tree.
Just overlapping additions of include files.
--
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] 5+ messages in thread* Re: linux-next: manual merge of the ubi tree
2008-07-22 3:31 linux-next: manual merge of the ubi tree Stephen Rothwell
@ 2008-07-22 5:26 ` Artem Bityutskiy
2008-07-22 8:20 ` Stephen Rothwell
2008-07-22 6:25 ` Artem Bityutskiy
1 sibling, 1 reply; 5+ messages in thread
From: Artem Bityutskiy @ 2008-07-22 5:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Jonathan Corbet
Hi,
Stephen Rothwell wrote:
> Today's linux-next merge of the ubi tree got a trivial conflict in
> drivers/mtd/ubi/cdev.c between commit
> 72b67048f5dac18fd6494e3d3bff7e54840e8761 ("UBI: cdev lock_kernel()
> pushdown") from Linus' tree and commit
> 9c0ec8fe1eed2106441e12ca2964f431df044f1d ("UBI: fix checkpatch.pl errors
> and warnings") from the ubi tree.
>
> Just overlapping additions of include files.
I'll amend UBI tree and fix this.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the ubi tree
2008-07-22 3:31 linux-next: manual merge of the ubi tree Stephen Rothwell
2008-07-22 5:26 ` Artem Bityutskiy
@ 2008-07-22 6:25 ` Artem Bityutskiy
2008-07-22 16:09 ` Stephen Rothwell
1 sibling, 1 reply; 5+ messages in thread
From: Artem Bityutskiy @ 2008-07-22 6:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton
Stephen,
Stephen Rothwell wrote:
> Today's linux-next merge of the ubi tree got a trivial conflict in
> drivers/mtd/ubi/cdev.c between commit
> 72b67048f5dac18fd6494e3d3bff7e54840e8761 ("UBI: cdev lock_kernel()
> pushdown") from Linus' tree and commit
> 9c0ec8fe1eed2106441e12ca2964f431df044f1d ("UBI: fix checkpatch.pl errors
> and warnings") from the ubi tree.
>
> Just overlapping additions of include files.
Could you please amend your scripts and use "linux-next" branch for both
UBI and UBIFS:
UBI: git://git.infradead.org/~dedekind/ubi-2.6.git linux-next
UBIFS: git://git.infradead.org/~dedekind/ubifs-2.6.git linux-next
Andrew, could you please tweak your scripts as well and use those
branches if you still have UBI/UBIFS in -mm. Thanks and apologies
for inconvenience.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-07-22 16:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-22 3:31 linux-next: manual merge of the ubi tree Stephen Rothwell
2008-07-22 5:26 ` Artem Bityutskiy
2008-07-22 8:20 ` Stephen Rothwell
2008-07-22 6:25 ` Artem Bityutskiy
2008-07-22 16:09 ` 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).