linux-kernel - Re: linux-next: manual merge of the target-updates tree with the 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] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 01 Jun 2015 04:35:52 -0700
From:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>,
	Andy Grover <agrover@...hat.com>
Subject: Re: linux-next: manual merge of the target-updates tree with the 
 tree

On Mon, 2015-06-01 at 21:22 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> Today's linux-next merge of the target-updates tree got so many
> conflicts against Linus' tree that I just gave up and dropped it
> completely.  Please fix up this mess.
> 

Apologies for the conflicts vs. mainline in today's linux-next

The latest in target-pending/for-next from this morning should address
these conflicts vs. mainline.

Thank you,

--nab

--
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/