From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the ubifs tree
Date: Thu, 24 Jul 2008 12:15:53 +0300 [thread overview]
Message-ID: <48884849.8050102@nokia.com> (raw)
In-Reply-To: <20080724152205.1bb53acb.sfr@canb.auug.org.au>
Stephen,
Stephen Rothwell wrote:
> Today's linux-next merge of the ubifs tree got conflicts in
> Documentation/filesystems/ubifs.txt, fs/ubifs/budget.c,
> fs/ubifs/commit.c, fs/ubifs/debug.c, fs/ubifs/dir.c, fs/ubifs/file.c,
> fs/ubifs/io.c, fs/ubifs/journal.c, fs/ubifs/log.c, fs/ubifs/misc.h,
> fs/ubifs/orphan.c, fs/ubifs/super.c and fs/ubifs/ubifs.h against Linus'
> tree.
>
> This has happened because of a partial merge of this tree into Linus'
> tree. I just took the ubifs tree's version of all those files.
I've re-based both UBI and UBIFS trees against todays Linus' tree,
i.e. commit 338b9bb3adac0d2c5a1e180491d9b001d624c402
I compile-tested that - looks fine. Internally I still keep working
with 2.6.26 release for several reasons, but UBI/UBIFS are so isolated
that I thing the re-based stuff is fine. At lease this has always
be the case in the past. Thanks.
Hopefully this time -next merge will go smoothly.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
next prev parent reply other threads:[~2008-07-24 9:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 5:22 linux-next: manual merge of the ubifs tree Stephen Rothwell
2008-07-24 7:42 ` Artem Bityutskiy
2008-07-24 8:59 ` Adrian Bunk
2008-07-24 9:01 ` Artem Bityutskiy
2008-07-24 9:15 ` Artem Bityutskiy [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-17 7:10 Stephen Rothwell
2008-07-17 7:23 ` Artem Bityutskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48884849.8050102@nokia.com \
--to=artem.bityutskiy@nokia.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.