From: Felipe Balbi <balbi@ti•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Xi Wang <xi.wang@gmail•com>, Felipe Balbi <balbi@ti•com>
Subject: Re: linux-next: manual merge of the akpm tree with the usb-gadget tree
Date: Tue, 19 Mar 2013 08:33:34 +0200 [thread overview]
Message-ID: <20130319063334.GA16715@arwen.pp.htv.fi> (raw)
In-Reply-To: <20130319143922.f60895f782e5c8e9824c447b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
Hi,
On Tue, Mar 19, 2013 at 02:39:22PM +1100, Stephen Rothwell wrote:
> 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
Looks like there's a small bug in your scripts: "from the tree" misses
"usb-gadget".
> 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;
> +
fix looks alright, thank you
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-03-19 6:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 3:39 linux-next: manual merge of the akpm tree with the usb-gadget tree Stephen Rothwell
2013-03-19 6:33 ` Felipe Balbi [this message]
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=20130319063334.GA16715@arwen.pp.htv.fi \
--to=balbi@ti$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=xi.wang@gmail$(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