linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Bjorn Andersson <quic_bjorande@quicinc.com>,
	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, 14 Feb 2023 07:46:18 +0100	[thread overview]
Message-ID: <Y+suOl05ZLc49lcu@kroah.com> (raw)
In-Reply-To: <20230214124001.5f5341b4@canb.auug.org.au>

On Tue, Feb 14, 2023 at 12:40:01PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> 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.

Merge looks good, thanks!

greg k-h

  reply	other threads:[~2023-02-14  6:46 UTC|newest]

Thread overview: 14+ 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 [this message]
2023-02-21  9:43 ` Geert Uytterhoeven
  -- 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
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=Y+suOl05ZLc49lcu@kroah.com \
    --to=greg@kroah.com \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.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 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).