public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Will Deacon <will.deacon@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
	Andy Gross <andy.gross@linaro•org>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the arm64 tree with the qcom tree
Date: Mon, 6 Feb 2017 11:44:18 +0000	[thread overview]
Message-ID: <20170206114418.GB19939@arm.com> (raw)
In-Reply-To: <20170206102329.04879df9@canb.auug.org.au>

On Mon, Feb 06, 2017 at 10:23:29AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm64 tree got conflicts in:
> 
>   arch/arm/kernel/armksyms.c
>   arch/arm64/kernel/arm64ksyms.c
>   arch/arm64/kernel/smccc-call.S
>   include/linux/arm-smccc.h
> 
> between commits:
> 
>   0a0c5b832751 ("arm: kernel: Add SMC structure parameter")
>   9c96e7f72029 ("firmware: qcom: scm: Fix interrupted SCM calls")
> 
> from the qcom tree and commits:
> 
>   680a0873e193 ("arm: kernel: Add SMC structure parameter")
>   82bcd087029f ("firmware: qcom: scm: Fix interrupted SCM calls")
> 
> from the arm64 tree.
> 
> I fixed it up (please check the final resolution when it is released,
> or fix these up) 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 Stephen, although if looks like you've resolved the conflict to
be what is in the qcom tree, which is in fact an earlier version of this
patch series.

Andy, please can you drop your stuff from -next now that a newer version
is queued via arm64? (and also please check that you're happy with what
I've got queued).

Thanks,

Will

next prev parent reply	other threads:[~2017-02-06 11:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-05 23:23 linux-next: manual merge of the arm64 tree with the qcom tree Stephen Rothwell
2017-02-06 11:44 ` Will Deacon [this message]
2017-02-06 15:45   ` Andy Gross

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=20170206114418.GB19939@arm.com \
    --to=will.deacon@arm$(echo .)com \
    --cc=andy.gross@linaro$(echo .)org \
    --cc=catalin.marinas@arm$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox