linux-kernel - incoming merge conflict to linux-next

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-next>] [day] [month] [year] [list]

Message-ID: <20160518211043.qqzesbrmbbr7xba2@floor.thefacebook.com>
Date:	Wed, 18 May 2016 17:10:43 -0400
From:	Chris Mason <clm@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	LKML <linux-kernel@...r.kernel.org>,
	btrfs <linux-btrfs@...r.kernel.org>
CC:	David Sterba <dsterba@...e.com>, Filipe Manana <fdmanana@...e.com>
Subject: incoming merge conflict to linux-next

Hi Stephen,

Dave Sterba's tree in linux-next has a few btrfs patches that we're not
sending yet into Linus.  We've got an update for Josef's enospc work
that'll get sent in next week.

So he prepped a pull for me that merged up a number of his branches but
didn't include Josef's new code.  It has all been in -next for some
time, and then I put some fixes from Filipe on top.

Long story short, you'll get a merge conflict from my next branch:

https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next

I've got the sample resolution in next-merge:

https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git next-merge

Please let us know if you have any problems.

-chris