mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Georgi Djakov <georgi.djakov@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Arnd Bergmann <arnd@arndb.de>, Andy Gross <andy.gross@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	David Dai <daidavid1@codeaurora.org>,
	Taniya Das <tdas@codeaurora.org>,
	Rajendra Nayak <rnayak@codeaurora.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the qcom tree
Date: Tue, 29 Jan 2019 13:46:26 +0200	[thread overview]
Message-ID: <9e32a49c-fb78-c5f8-77cf-66b4b4a8b4a2@linaro.org> (raw)
In-Reply-To: <20190129140846.4dc4c158@canb.auug.org.au>

Hi Stephen,

On 1/29/19 05:08, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/sdm845.dtsi
> 
> between commits:
> 
>   05556681948b ("arm64: dts: sdm845: Add videocc node")
>   5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> 
> from the qcom tree and commit:
> 
>   ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> 
> from the char-misc 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 the fix! I have checked the tree and the merge is correct.

BR,
Georgi

  reply	other threads:[~2019-01-29 11:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-29  3:08 Stephen Rothwell
2019-01-29 11:46 ` Georgi Djakov [this message]
2019-01-29 20:30   ` Andy Gross
2019-01-29 21:07     ` Greg KH
2024-06-17 19:52 Mark Brown
2024-06-18  6:38 ` 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=9e32a49c-fb78-c5f8-77cf-66b4b4a8b4a2@linaro.org \
    --to=georgi.djakov@linaro.org \
    --cc=andy.gross@linaro.org \
    --cc=arnd@arndb.de \
    --cc=daidavid1@codeaurora.org \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rnayak@codeaurora.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tdas@codeaurora.org \
    /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

all inboxes | Powered by JetHome®