From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932658AbdCWHla (ORCPT ); Thu, 23 Mar 2017 03:41:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:48464 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751789AbdCWHl3 (ORCPT ); Thu, 23 Mar 2017 03:41:29 -0400 X-ME-Sender: X-Sasl-enc: w5Jr5nOhOj9Hwfpe+ObsVGz43WNlSJrzefzSsuJlqpfs 1490251431 Date: Thu, 23 Mar 2017 07:43:37 +0100 From: Greg KH To: Stephen Rothwell Cc: Felipe Balbi , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , Romain Perier Subject: Re: linux-next: manual merge of the usb tree with the usb-gadget-fixes tree Message-ID: <20170323064337.GD22801@kroah.com> References: <20170323131633.44445bd0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170323131633.44445bd0@canb.auug.org.au> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 23, 2017 at 01:16:33PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/gadget/udc/pch_udc.c > > between commit: > > 1f459262b0e1 ("usb: gadget: udc: remove pointer dereference after free") > > from the usb-gadget-fixes tree and commit: > > d293408ef303 ("usb: gadget: pch_udc: Replace PCI pool old API") > > from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/usb/gadget/udc/pch_udc.c > index 8a365aad66fe,84dcbcd756f0..000000000000 > --- a/drivers/usb/gadget/udc/pch_udc.c > +++ b/drivers/usb/gadget/udc/pch_udc.c > @@@ -1522,7 -1522,8 +1522,7 @@@ static void pch_udc_free_dma_chain(stru > /* do not free first desc., will be done by free for request */ > td = phys_to_virt(addr); > addr2 = (dma_addr_t)td->next; > - pci_pool_free(dev->data_requests, td, addr); > + dma_pool_free(dev->data_requests, td, addr); > - td->next = 0x00; > addr = addr2; > } > req->chain_len = 1; Looks good to me, thanks! greg k-h