Re: linux-next: manual merge of the usb tree with the usb-gadget-fixes tree

2017-03-23 Thread Greg KH
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 us

linux-next: manual merge of the usb tree with the usb-gadget-fixes tree

2017-03-22 Thread Stephen Rothwell
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