From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Date: Mon, 5 Mar 2012 08:42:16 -0800 Message-ID: <20120305164216.GD2459@kroah.com> References: <20120305170004.9c81f2d148cc179f42a39ade@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pw0-f46.google.com ([209.85.160.46]:46907 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756940Ab2CEQxn (ORCPT ); Mon, 5 Mar 2012 11:53:43 -0500 Received: by mail-pw0-f46.google.com with SMTP id un15so2970293pbc.19 for ; Mon, 05 Mar 2012 08:53:43 -0800 (PST) Content-Disposition: inline In-Reply-To: <20120305170004.9c81f2d148cc179f42a39ade@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shengzhou Liu On Mon, Mar 05, 2012 at 05:00:04PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/ehci-fsl.h between commit 71919403dc86 ("Revert > "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"") from > the usb.current tree and commit 28c56ea14314 ("powerpc/usb: fix bug of > kernel hang when initializing usb") from the usb tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Looks good, thanks for this, I'll handle the merge when Linus takes my usb-linus tree in a few days. greg k-h