From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Felipe Balbi <balbi@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Gustavo A. R. Silva" <garsilva@embeddedor•com>,
Romain Perier <romain.perier@collabora•com>
Subject: linux-next: manual merge of the usb tree with the usb-gadget-fixes tree
Date: Thu, 23 Mar 2017 13:16:33 +1100 [thread overview]
Message-ID: <20170323131633.44445bd0@canb.auug.org.au> (raw)
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;
next reply other threads:[~2017-03-23 2:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 2:16 Stephen Rothwell [this message]
2017-03-23 6:43 ` linux-next: manual merge of the usb tree with the usb-gadget-fixes tree Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170323131633.44445bd0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@kernel$(echo .)org \
--cc=garsilva@embeddedor$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=romain.perier@collabora$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox