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, 17 Jul 2008 10:23:21 +0300 [thread overview]
Message-ID: <487EF369.2080609@nokia.com> (raw)
In-Reply-To: <20080717171059.1bf8b572.sfr@canb.auug.org.au>
Hi Stephen
Stephen Rothwell wrote:
> Today's linux-next merge of the ubifs tree got conflicts in
> fs/ubifs/budget.c, fs/ubifs/debug.c, fs/ubifs/dir.c, fs/ubifs/file.c,
> fs/ubifs/io.c, fs/ubifs/journal.c, fs/ubifs/shrinker.c, fs/ubifs/tnc.c
> and fs/ubifs/xattr.c between commit
> 1e51764a3c2ac05a23a22b2a95ddee4d9bffb16d ("UBIFS: add new flash file
> system") from Linus' tree and various commits from the ubifs tree.
Yes, right. I guess I should have informed you about this, apologies.
UBIFS is rather non-typical things for -next I guess.
No one is interested in UBIFS history _before_ it got into mainline,
which is about several hundred commits. Thus, we folded these all
into few huge large commits, in order not to garbage the mainline
tree.
I have amended the 'for_andrew' branch of ubifs-2.6.git, and now it
has the same commits as in Linus's tree. But it is still based on
2.6.26 release.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
next prev parent reply other threads:[~2008-07-17 7:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-17 7:10 linux-next: manual merge of the ubifs tree Stephen Rothwell
2008-07-17 7:23 ` Artem Bityutskiy [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-24 5:22 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
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=487EF369.2080609@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 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).