From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: linux-next: manual merge of the usb tree with Linus' tree Date: Thu, 16 Dec 2010 10:05:27 +0200 Message-ID: <20101216080527.GA2601@legolas.emea.dhcp.ti.com> References: <20101216140122.ca745f1f.sfr@canb.auug.org.au> <20101216030857.GA12785@kroah.com> Reply-To: balbi@ti.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Return-path: Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:36235 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751753Ab0LPIFc (ORCPT ); Thu, 16 Dec 2010 03:05:32 -0500 Content-Disposition: inline In-Reply-To: <20101216030857.GA12785@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bob Liu , Mike Frysinger , Felipe Balbi On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote: >On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the usb tree got a conflict in >> drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c >> drivers/usb/musb/musb_core.h between commit >> 1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make >> it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb >> tree. >> >> It was not immediately obvious how to fix these up, so I just used the >> versions from the usb tree. This may not be correct and it would be good >> if this was fixed properly in the usb tree. > >Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense >to do so now, can you send me the patch that ends up being the correct >merge? Sure, I'll check it now and send in a patch in a few minutes. -- balbi