linux-kernel - Re: linux-next: manual merge of the staging tree with Linus' 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: <20111128051339.GA9709@kroah.com>
Date:	Mon, 28 Nov 2011 14:13:39 +0900
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Whitcroft <apw@...onical.com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree

On Mon, Nov 28, 2011 at 03:18:57PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
> ("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
> commit f791cec85073 ("Subject: fix build breakage in
> drivers/staging/iio/industrialio-core.c") from the staging tree.
> 
> The former was a more extensive fix (and is upstream), so I used that.

Yes, that's fine, I'll handle the merge when 3.2-rc4 is out, 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/