All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Bjorn Andersson <quic_bjorande@quicinc.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jon Hunter <jonathanh@nvidia.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 qcom tree
Date: Tue, 21 Feb 2023 10:43:58 +0100	[thread overview]
Message-ID: <CAMuHMdXC2n9dg=D4QqJQzv6cnk-WpUUSZXby-umdtGkU8fmF_A@mail.gmail.com> (raw)
In-Reply-To: <20230214124001.5f5341b4@canb.auug.org.au>

Hi Stephen,

On Tue, Feb 14, 2023 at 2:47 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the usb tree got a conflict in:
>
>   arch/arm64/configs/defconfig
>
> between commit:
>
>   85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")
>
> from the qcom tree and commit:
>
>   1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")
>
> from the usb 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.

Thanks for your resolution!

> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
>   CONFIG_TYPEC_FUSB302=m
>   CONFIG_TYPEC_TPS6598X=m
>   CONFIG_TYPEC_HD3SS3220=m
>  +CONFIG_TYPEC_MUX_GPIO_SBU=m
> + CONFIG_TYPEC_UCSI=m
> + CONFIG_UCSI_CCG=m

CONFIG_TYPEC_MUX_GPIO_SBU=m should be last, cfr.
drivers/usb/typec/Kconfig:source "drivers/usb/typec/ucsi/Kconfig"
drivers/usb/typec/Kconfig:source "drivers/usb/typec/mux/Kconfig"

>   CONFIG_MMC=y
>   CONFIG_MMC_BLOCK_MINORS=32
>   CONFIG_MMC_ARMMMCI=y

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

  parent reply	other threads:[~2023-02-21  9:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-14  1:40 linux-next: manual merge of the usb tree with the qcom tree Stephen Rothwell
2023-02-14  6:46 ` Greg KH
2023-02-21  9:43 ` Geert Uytterhoeven [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-02-21 19:16 broonie
2022-02-22  7:44 ` Greg KH
2022-02-10  3:11 Stephen Rothwell
2022-02-10  8:02 ` Greg KH
2022-03-18  7:37   ` Stephen Rothwell
2022-03-18  7:37     ` Stephen Rothwell
2021-09-21  2:30 Stephen Rothwell
2021-09-21 13:12 ` Bjorn Andersson
2021-09-21 13:16   ` Greg KH
2021-09-21 13:28     ` Bjorn Andersson
2021-08-06 14:13 Mark Brown
2021-08-06 14:09 Mark Brown

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='CAMuHMdXC2n9dg=D4QqJQzv6cnk-WpUUSZXby-umdtGkU8fmF_A@mail.gmail.com' \
    --to=geert@linux-m68k.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jonathanh@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=quic_bjorande@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 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.