linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Sudeep Holla <sudeep.holla@arm.com>,
	"Cristian Marussi" <cristian.marussi@arm.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 staging tree with the scmi tree
Date: Mon, 29 Mar 2021 10:25:34 +0100	[thread overview]
Message-ID: <20210329102534.00001a6a@Huawei.com> (raw)
In-Reply-To: <20210329163700.673b51e9@canb.auug.org.au>

On Mon, 29 Mar 2021 16:37:00 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/iio/common/scmi_sensors/scmi_iio.c
> 
> between commit:
> 
>   fc91d6b6f0ba ("iio/scmi: port driver to the new scmi_sensor_proto_ops interface")
> 
> from the scmi tree and commit:
> 
>   1b33dfa5d5f1 ("Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg")
> 
> from the staging 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 Stephen,

Looks right. I'll check the overall result once your tree is public.

Jonathan

  reply	other threads:[~2021-03-29  9:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-29  5:37 linux-next: manual merge of the staging tree with the scmi tree Stephen Rothwell
2021-03-29  9:25 ` Jonathan Cameron [this message]
2021-03-31  6:51 Stephen Rothwell

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=20210329102534.00001a6a@Huawei.com \
    --to=jonathan.cameron@huawei.com \
    --cc=cristian.marussi@arm.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=sudeep.holla@arm.com \
    /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).