linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20160519101921.3a45e559@canb.auug.org.au>
Date:	Thu, 19 May 2016 10:19:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Mason <clm@...com>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	btrfs <linux-btrfs@...r.kernel.org>,
	David Sterba <dsterba@...e.com>,
	Filipe Manana <fdmanana@...e.com>
Subject: Re: incoming merge conflict to linux-next

Hi Chris,

On Wed, 18 May 2016 17:10:43 -0400 Chris Mason <clm@...com> wrote:
>
> 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.

A bit of a mess, but I sorted it out, thanks for the test merge.

-- 
Cheers,
Stephen Rothwell