From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
JiebingLi <jiebing.li@intel•com>, Joe Perches <joe@perches•com>,
Jiri Kosina <jkosina@suse•cz>
Subject: linux-next: manual merge of the usb tree with the trivial tree
Date: Thu, 2 Sep 2010 13:01:18 +1000 [thread overview]
Message-ID: <20100902130118.add62d4a.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/langwell_udc.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit 0f92bbacd2d1a26e8bf863d2cc05572df43bf7fb ("USB: langwell: USB
Client driver code cleanup") from the usb tree.
Just context changes. I fixed it up (see below) and can carry the fix
while necessary. Though, if that trivial tree commit was in the usb tree,
the conflict could be resolved there ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/usb/gadget/langwell_udc.c
index d41b69c,1ef17a6..0000000
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@@ -283,7 -253,8 +253,7 @@@ static void ep0_reset(struct langwell_u
ep_reset(&dev->ep[0], 0, i, USB_ENDPOINT_XFER_CONTROL);
}
- VDBG(dev, "<--- %s()\n", __func__);
+ dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
- return;
}
@@@ -1484,7 -1501,8 +1500,7 @@@ static void langwell_udc_start(struct l
usbcmd |= CMD_RUNSTOP;
writel(usbcmd, &dev->op_regs->usbcmd);
- DBG(dev, "<--- %s()\n", __func__);
+ dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
- return;
}
@@@ -1506,7 -1524,8 +1522,7 @@@ static void langwell_udc_stop(struct la
usbcmd &= ~CMD_RUNSTOP;
writel(usbcmd, &dev->op_regs->usbcmd);
- DBG(dev, "<--- %s()\n", __func__);
+ dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__);
- return;
}
next reply other threads:[~2010-09-02 3:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 3:01 Stephen Rothwell [this message]
2010-09-02 3:26 ` linux-next: manual merge of the usb tree with the trivial tree Greg KH
2010-09-02 14:34 ` Jiri Kosina
2010-09-02 20:06 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2010-09-14 2:28 Stephen Rothwell
2010-09-14 4:08 ` Greg KH
2010-10-06 3:14 Stephen Rothwell
2010-10-06 3:35 ` Greg KH
2010-10-06 6:19 ` Felipe Balbi
2010-10-06 14:05 ` Greg KH
2010-10-07 7:39 ` Felipe Balbi
2010-10-06 9:36 ` Jiri Kosina
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=20100902130118.add62d4a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=jiebing.li@intel$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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