From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Francesco Dolcini <francesco.dolcini@toradex.com>,
Krishna Kurapati <quic_kriskura@quicinc.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree
Date: Sun, 28 May 2023 15:28:14 +0100 [thread overview]
Message-ID: <2023052806-stout-revisable-311f@gregkh> (raw)
In-Reply-To: <20230515125023.639f3ca3@canb.auug.org.au>
On Mon, May 15, 2023 at 12:50:23PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/gadget/udc/core.c
>
> between commit:
>
> f22e9b67f19c ("Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started"")
>
> from the usb.current tree and commit:
>
> d34f9bafa78d ("usb: gadget: udc: Handle gadget_connect failure during bind operation")
>
> from the usb tree.
>
> I fixed it up (I think - 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/core.c
> index 52e6d2e84e35,69041cca5d24..000000000000
> --- a/drivers/usb/gadget/udc/core.c
> +++ b/drivers/usb/gadget/udc/core.c
> @@@ -1078,12 -1121,17 +1078,16 @@@ EXPORT_SYMBOL_GPL(usb_gadget_set_state)
>
> /* ------------------------------------------------------------------------- */
>
> - static void usb_udc_connect_control(struct usb_udc *udc)
> -/* Acquire connect_lock before calling this function. */
> -static int usb_udc_connect_control_locked(struct usb_udc *udc) __must_hold(&udc->connect_lock)
> ++static int usb_udc_connect_control(struct usb_udc *udc)
> {
> + int ret;
> +
> - if (udc->vbus && udc->started)
> - ret = usb_gadget_connect_locked(udc->gadget);
> + if (udc->vbus)
> - usb_gadget_connect(udc->gadget);
> ++ ret = usb_gadget_connect(udc->gadget);
> else
> - usb_gadget_disconnect(udc->gadget);
> - ret = usb_gadget_disconnect_locked(udc->gadget);
> ++ ret = usb_gadget_disconnect(udc->gadget);
> +
> + return ret;
> }
>
> /**
> @@@ -1523,15 -1580,28 +1527,23 @@@ static int gadget_bind_driver(struct de
> if (ret)
> goto err_bind;
>
> - mutex_lock(&udc->connect_lock);
> - ret = usb_gadget_udc_start_locked(udc);
> - if (ret) {
> - mutex_unlock(&udc->connect_lock);
> + ret = usb_gadget_udc_start(udc);
> + if (ret)
> goto err_start;
> - }
> usb_gadget_enable_async_callbacks(udc);
> - usb_udc_connect_control(udc);
> - ret = usb_udc_connect_control_locked(udc);
> ++ ret = usb_udc_connect_control(udc);
> + if (ret)
> + goto err_connect_control;
>
> - mutex_unlock(&udc->connect_lock);
> -
> kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
> return 0;
>
> + err_connect_control:
> + usb_gadget_disable_async_callbacks(udc);
> + if (gadget->irq)
> + synchronize_irq(gadget->irq);
> - usb_gadget_udc_stop_locked(udc);
> ++ usb_gadget_udc_stop(udc);
> +
> err_start:
> driver->unbind(udc->gadget);
>
Should now be resolved in my branch.
thanks,
greg k-h
next prev parent reply other threads:[~2023-05-28 14:28 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 2:50 linux-next: manual merge of the usb tree with the usb.current tree Stephen Rothwell
2023-05-28 14:28 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-26 4:48 Stephen Rothwell
2024-04-26 21:39 ` Thinh Nguyen
2024-04-12 4:25 Stephen Rothwell
2024-04-12 7:58 ` Greg KH
2024-04-24 6:12 ` Stephen Rothwell
2024-02-20 3:39 Stephen Rothwell
2024-02-20 8:18 ` Greg KH
2024-02-26 5:55 ` Greg KH
2023-05-15 2:35 Stephen Rothwell
2023-05-15 3:50 ` Greg KH
2023-05-15 5:22 ` Krishna Kurapati PSSNV
2023-05-15 11:01 ` Roger Quadros
2023-05-15 11:36 ` Stephen Rothwell
2023-05-28 14:28 ` Greg KH
2023-05-28 15:48 ` Roger Quadros
2023-05-28 16:07 ` Greg KH
2023-03-31 3:01 Stephen Rothwell
2023-03-31 7:52 ` Greg KH
2023-04-10 6:56 ` Greg KH
2023-01-19 3:48 Stephen Rothwell
2023-01-18 0:56 Stephen Rothwell
2023-01-18 7:48 ` Greg KH
2023-01-23 14:40 ` Greg KH
2022-09-01 3:52 Stephen Rothwell
2022-09-05 6:04 ` Greg KH
2022-04-26 5:08 Stephen Rothwell
2022-04-26 9:41 ` Greg KH
2022-05-03 14:36 ` Greg KH
2022-02-21 20:39 broonie
2022-02-22 7:44 ` Greg KH
2021-07-22 4:12 Stephen Rothwell
2021-07-23 12:29 ` Greg KH
2021-07-27 14:45 ` Greg KH
2021-01-20 2:06 Stephen Rothwell
2021-01-20 8:02 ` Greg KH
2021-01-06 0:50 Stephen Rothwell
2021-01-11 7:11 ` Greg KH
2020-06-26 3:29 Stephen Rothwell
2020-06-26 15:14 ` Greg KH
2020-06-29 6:23 ` Greg KH
2018-06-29 4:57 Stephen Rothwell
2018-07-01 8:43 ` Greg KH
2018-07-01 15:11 ` Randy Dunlap
2018-04-23 3:04 Stephen Rothwell
2018-04-23 8:30 ` Johan Hovold
2018-04-23 8:41 ` Greg KH
2018-04-30 1:34 ` Stephen Rothwell
2018-04-30 11:55 ` Sebastian Reichel
2018-04-30 12:16 ` Greg KH
2018-04-30 12:00 ` Greg KH
2017-12-20 2:09 Stephen Rothwell
2017-12-20 9:36 ` Greg KH
2018-01-03 0:56 ` Stephen Rothwell
2018-01-04 16:06 ` Greg KH
2014-11-05 4:18 Stephen Rothwell
2014-11-05 4:30 ` Greg KH
2014-11-05 8:33 ` Paul Bolle
2014-11-06 2:19 ` Greg KH
2014-11-06 5:02 ` Stephen Rothwell
2013-12-18 5:53 Stephen Rothwell
2013-03-21 4:24 Stephen Rothwell
2012-11-14 4:07 Stephen Rothwell
2012-11-16 2:14 ` Greg KH
2012-11-13 3:37 Stephen Rothwell
2012-11-13 18:49 ` Greg KH
2012-10-25 2:05 Stephen Rothwell
2012-10-25 2:17 ` Greg KH
2012-09-12 5:37 Stephen Rothwell
2012-09-12 16:14 ` Greg KH
2012-09-12 5:37 Stephen Rothwell
2012-05-03 4:44 Stephen Rothwell
2012-05-04 23:18 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-04-19 5:14 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-22 22:27 ` Greg KH
2012-03-05 6:00 Stephen Rothwell
2012-03-05 16:42 ` Greg KH
2011-08-25 4:52 Stephen Rothwell
2011-08-25 15:39 ` Greg KH
2011-08-29 15:52 ` Greg KH
2010-12-20 5:28 Stephen Rothwell
2010-12-20 18:30 ` 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=2023052806-stout-revisable-311f@gregkh \
--to=greg@kroah.com \
--cc=francesco.dolcini@toradex.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=quic_kriskura@quicinc.com \
--cc=sfr@canb.auug.org.au \
/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).