All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Fri, 22 Mar 2013 14:31:35 +1100	[thread overview]
Message-ID: <20130322143135.8f9c42c298fd86e4084ca397@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
net2280: remove leftover driver->unbind call in error pathway") from the
usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't 
touch gadget.dev.driver") from the usb-gadget 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/net2280.c
index 3bd0f99,691cc65..0000000
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
  err_func:
  	device_remove_file (&dev->pdev->dev, &dev_attr_function);
  err_unbind:
- 	dev->gadget.dev.driver = NULL;
 -	driver->unbind (&dev->gadget);
  	dev->driver = NULL;
  	return retval;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-03-22  3:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-22  3:31 Stephen Rothwell [this message]
2013-03-22  6:28 ` linux-next: manual merge of the usb-gadget tree with the usb.current tree Felipe Balbi
2013-03-22  6:28   ` Felipe Balbi
  -- strict thread matches above, loose matches on Subject: below --
2015-05-28  8:36 Stephen Rothwell
2015-01-16  6:23 Stephen Rothwell
2015-01-16  9:56 ` Kaukab, Yousaf
2015-01-13  4:06 Stephen Rothwell
2015-01-13  4:02 Stephen Rothwell
2014-09-08  7:09 Stephen Rothwell
2014-09-08  7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-09-08 13:27   ` Felipe Balbi
2014-07-04  4:51 Stephen Rothwell
2013-12-18  6:09 Stephen Rothwell
2013-07-30  4:08 Stephen Rothwell
2013-07-30  5:50 ` Felipe Balbi
2013-07-30  5:50   ` Felipe Balbi
2013-03-22  3:28 Stephen Rothwell
2013-03-22  6:28 ` Felipe Balbi
2013-03-22  6:28   ` Felipe Balbi

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=20130322143135.8f9c42c298fd86e4084ca397@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=balbi@ti.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=stern@rowland.harvard.edu \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.