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

Message-ID: <20120130023517.GA7937@kroah.com>
Date:	Sun, 29 Jan 2012 18:35:17 -0800
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,
	Andi Kleen <ak@...ux.intel.com>, Len Brown <lenb@...nel.org>,
	Thomas Renninger <trenn@...e.de>,
	Len Brown <len.brown@...el.com>
Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree

On Mon, Jan 30, 2012 at 01:24:51PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI
> processor hotplug: Split up acpi_processor_add") from Linus' tree and
> commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver
> automatically") from the driver-core tree.
> 
> I fixed it up (I think- see below) and can carry the fix as necessary.

Thanks, I'll merge the driver-core next tree when 3.3-rc2 is out to
resolve this problem.

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/