linux-next: manual merge of the l2-mtd tree with the vfs tree

linux-next: manual merge of the l2-mtd tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

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.

[Al, I suspect that your patch should have changed the debug print as
well ...]

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/jffs2/fs.c
index c0d5c9d,43052fa..0000000
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@@ -560,10 -572,10 +572,10 @@@ int jffs2_do_fill_super(struct super_bl
  
  	ret = -ENOMEM;
  
- 	D1(printk(KERN_DEBUG "jffs2_do_fill_super(): d_alloc_root()\n"));
+ 	jffs2_dbg(1, "%s(): d_alloc_root()\n", __func__);
 -	sb->s_root = d_alloc_root(root_i);
 +	sb->s_root = d_make_root(root_i);
  	if (!sb->s_root)
 -		goto out_root_i;
 +		goto out_root;
  
  	sb->s_maxbytes = 0xFFFFFFFF;
  	sb->s_blocksize = PAGE_CACHE_SIZE;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the l2-mtd tree with the vfs tree

[Artem Bityutskiy]

[-- 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 --]

Re: linux-next: manual merge of the l2-mtd tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

Hi Artem,

On Tue, 13 Mar 2012 16:40:33 +0200 Artem Bityutskiy <dedekind1@gmail.com> wrote:
>
> 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.

I just checked and the master branch on
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git is
8ca39b0 "Add linux-next specific files for 20120313" as I would expect it
to be and the top of the l2-mtd tree that was merged into that is
4331c79c6895 "mtd: do not use plain 0 as NULL".

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the l2-mtd tree with the vfs tree

[Artem Bityutskiy]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

On Wed, 2012-03-14 at 02:13 +1100, Stephen Rothwell wrote:
> I just checked and the master branch on
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git is
> 8ca39b0 "Add linux-next specific files for 20120313" as I would expect it
> to be and the top of the l2-mtd tree that was merged into that is
> 4331c79c6895 "mtd: do not use plain 0 as NULL".

Oh, yes, sorry, you are right - it is there.

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]