linux-kernel - Re: linux-next: manual merge of the staging 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] [day] [month] [year] [list]

Message-ID: <20140312014914.GB10106@kroah.com>
Date:	Tue, 11 Mar 2014 18:49:14 -0700
From:	Greg KH <greg@...ah.com>
To:	Mark Brown <broonie@...nel.org>
Cc:	Salva Peiró <speiro@....upv.es>,
	Daeseok Youn <daeseok.youn@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the  tree

On Wed, Mar 12, 2014 at 01:32:59AM +0000, Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in drivers/staging/cxt1e1/linux.c between commit 084b6e7765b95 ("staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()") from Linus' tree and commit aa562fa70931d ("staging: cxt1e1: Fix no spaces at the start of a line in linux.c") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Known issue, was reported previously and fixed up in linux-next and I
will handle it when I merge my trees together...

thanks,

greg k-h
--
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/