From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Artem Bityutskiy <Artem.Bityutskiy@nokia•com>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the ubifs tree
Date: Thu, 24 Jul 2008 15:22:05 +1000 [thread overview]
Message-ID: <20080724152205.1bb53acb.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
Hi Artem,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-24 5:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 5:22 Stephen Rothwell [this message]
2008-07-24 7:42 ` linux-next: manual merge of the ubifs tree Artem Bityutskiy
2008-07-24 8:59 ` Adrian Bunk
2008-07-24 9:01 ` Artem Bityutskiy
2008-07-24 9:15 ` Artem Bityutskiy
-- 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=20080724152205.1bb53acb.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Artem.Bityutskiy@nokia$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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