linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the FIXME tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150723093927.GA8686@quack.suse.cz>
Date:	Thu, 23 Jul 2015 11:39:27 +0200
From:	Jan Kara <jack@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>, Jan Kara <jack@...e.cz>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexey Dobriyan <adobriyan@...il.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the FIXME
 tree

On Thu 23-07-15 16:00:48, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got conflicts in:
> 
>   fs/ext3/super.c
> 
> between commit:
> 
>   106542e7987c ("fs: Remove ext3 filesystem driver")
> 
> from the FIXME tree and commit:
> 
>   d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4")
> 
> from the akpm-current tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).
> 
> Jan, I also removed the JBD section from the MAINTAINERS file ... your
> version has conflict markers left around it ...

Thanks Stephen. I have fixed up MAINTAINERS file in my tree (amended the
original commit).

								Honza
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/