linux-kernel - Re: linux-next: manual merge of the usb tree with the mfd 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: <Pine.LNX.4.44L0.1207101111040.1308-100000@iolanthe.rowland.org>
Date:	Tue, 10 Jul 2012 11:12:35 -0400 (EDT)
From:	Alan Stern <stern@...land.harvard.edu>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	Greg KH <greg@...ah.com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Russ Dill <Russ.Dill@...il.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the mfd tree

On Tue, 10 Jul 2012, Stephen Rothwell wrote:

> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix
> the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and
> commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from
> the usb tree.
> 
> I am not sure how to fix this up, I have just effectively reverted the
> effect of the former commit on this file.

That agrees with Greg's decision.  Russ's patch (commit 2761a6) should 
be rebased on top of 1a49e2.

Thanks,

Alan Stern

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