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: attempted manual merge of the ubifs tree
Date: Wed, 23 Jul 2008 09:33:41 +0300 [thread overview]
Message-ID: <4886D0C5.2090009@nokia.com> (raw)
In-Reply-To: <20080723161109.a5e44c91.sfr@canb.auug.org.au>
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 (Артём Битюцкий)
next prev parent reply other threads:[~2008-07-23 6:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 6:11 linux-next: attempted manual merge of the ubifs tree Stephen Rothwell
2008-07-23 6:33 ` Artem Bityutskiy [this message]
2008-07-23 7:27 ` Stephen Rothwell
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=4886D0C5.2090009@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.