From: Artem Bityutskiy <dedekind1@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Stefan Roese <sr@denx•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Al Viro <viro@zeniv•linux.org.uk>, Joe Perches <joe@perches•com>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the vfs tree
Date: Tue, 13 Mar 2012 16:40:33 +0200 [thread overview]
Message-ID: <1331649633.3595.70.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20120313141859.302878a8e2246979c288440d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
On Tue, 2012-03-13 at 14:18 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> fs/jffs2/fs.c between commit de071e1a7466 ("switch open-coded instances
> of d_make_root() to new helper") from the vfs tree and commit
> ab9b393d6ee8 ("jffs2: Convert most D1/D2 macros to jffs2_dbg") from the
> l2-mtd tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks. Although I do not see the latest l2-mtd.git tree in the master
branch of linux-next, I see some old version of it. E.g., the jffs2
changes are not there.
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-03-13 14:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 3:18 linux-next: manual merge of the l2-mtd tree with the vfs tree Stephen Rothwell
2012-03-13 14:40 ` Artem Bityutskiy [this message]
2012-03-13 15:13 ` Stephen Rothwell
2012-03-14 12:25 ` 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=1331649633.3595.70.camel@sauron.fi.intel.com \
--to=dedekind1@gmail$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sr@denx$(echo .)de \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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