From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Xi Wang <xi.wang@gmail.com>, Felipe Balbi <balbi@ti.com>
Subject: linux-next: manual merge of the akpm tree with the usb-gadget tree
Date: Tue, 19 Mar 2013 14:39:22 +1100 [thread overview]
Message-ID: <20130319143922.f60895f782e5c8e9824c447b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/usb/gadget/amd5536udc.c between commit 6c39d90393a2 ("usb:
gadget: amd5536udc: remove unnecessary initializations") from the tree
and commit "drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create()
with NULL dev" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/gadget/amd5536udc.c
index f52dcfe,142616a..0000000
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@@ -3232,6 -3235,12 +3232,10 @@@ static int udc_pci_probe
pci_set_master(pdev);
pci_try_set_mwi(pdev);
+ dev->phys_addr = resource;
+ dev->irq = pdev->irq;
+ dev->pdev = pdev;
- dev->gadget.dev.parent = &pdev->dev;
- dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
+
/* init dma pools */
if (use_dma) {
retval = init_dma_pools(dev);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-03-19 3:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 3:39 Stephen Rothwell [this message]
2013-03-19 6:33 ` linux-next: manual merge of the akpm tree with the usb-gadget tree Felipe Balbi
2013-03-19 7:39 ` Stephen Rothwell
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=20130319143922.f60895f782e5c8e9824c447b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xi.wang@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).