From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Chunfeng Yun <chunfeng.yun@mediatek.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Thu, 17 May 2018 09:07:24 +0200 [thread overview]
Message-ID: <20180517070724.GD13919@kroah.com> (raw)
In-Reply-To: <20180517140318.5333cfee@canb.auug.org.au>
On Thu, May 17, 2018 at 02:03:18PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> drivers/usb/mtu3/Kconfig
>
> between commit:
>
> cd91a0e9d38f ("usb: Remove depends on HAS_DMA in case of platform dependency")
>
> from the usb tree and commit:
>
> f39846824cd6 ("usb: mtu3: make USB_MTU3_DUAL_ROLE depend on EXTCON but not USB_MTU3")
>
> from the usb-gadget tree.
>
> I fixed it up (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/mtu3/Kconfig
> index c0c0eb88e5ea,8daf27768888..000000000000
> --- a/drivers/usb/mtu3/Kconfig
> +++ b/drivers/usb/mtu3/Kconfig
> @@@ -2,7 -2,7 +2,7 @@@
>
> config USB_MTU3
> tristate "MediaTek USB3 Dual Role controller"
> - depends on EXTCON && (USB || USB_GADGET)
> - depends on (USB || USB_GADGET) && HAS_DMA
> ++ depends on (USB || USB_GADGET)
> depends on ARCH_MEDIATEK || COMPILE_TEST
> select USB_XHCI_MTK if USB_SUPPORT && USB_XHCI_HCD
> help
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2018-05-17 7:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 4:03 linux-next: manual merge of the usb-gadget tree with the usb tree Stephen Rothwell
2018-05-17 7:07 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-21 7:21 Stephen Rothwell
2020-03-16 3:23 Stephen Rothwell
2020-03-16 7:25 ` Greg KH
2020-03-16 8:18 ` Greg KH
2017-10-18 14:49 Mark Brown
[not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
2017-10-18 15:40 ` Kees Cook
2017-10-18 16:04 ` Mark Brown
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19 7:37 ` Felipe Balbi
2017-04-07 4:45 Stephen Rothwell
2017-04-07 4:41 Stephen Rothwell
2014-11-06 3:58 Stephen Rothwell
2014-11-06 4:59 ` Felipe Balbi
2014-04-28 5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2013-08-02 6:38 Stephen Rothwell
2013-08-02 7:23 ` Felipe Balbi
2013-04-04 4:18 Stephen Rothwell
2013-04-04 6:27 ` Thierry Reding
2013-04-04 7:08 ` 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=20180517070724.GD13919@kroah.com \
--to=greg@kroah.com \
--cc=balbi@kernel.org \
--cc=chunfeng.yun@mediatek.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).