From: Saravana Kannan <saravanak@google.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Rob Herring <robherring2@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the devicetree tree
Date: Tue, 6 Apr 2021 09:19:47 -0700 [thread overview]
Message-ID: <CAGETcx_JT+1_ZorCeF3CW2T1vGDM2p7uNm3drHeAMFLZTz0JCg@mail.gmail.com> (raw)
In-Reply-To: <YGwly0cRvxGpt26D@kroah.com>
On Tue, Apr 6, 2021 at 2:11 AM Greg KH <greg@kroah.com> wrote:
>
> On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in:
> >
> > drivers/of/property.c
> >
> > between commit:
> >
> > 3915fed92365 ("of: property: Provide missing member description and remove excess param")
> >
> > from the devicetree tree and commit:
> >
> > f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint")
> >
> > from the driver-core 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.
>
> Change looks good to me, thanks!
LGTM too.
-Saravana
next prev parent reply other threads:[~2021-04-06 16:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 8:19 linux-next: manual merge of the driver-core tree with the devicetree tree Stephen Rothwell
2021-04-06 9:11 ` Greg KH
2021-04-06 16:19 ` Saravana Kannan [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-06 3:23 Stephen Rothwell
2013-06-17 5:33 Stephen Rothwell
2013-06-17 19:58 ` 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=CAGETcx_JT+1_ZorCeF3CW2T1vGDM2p7uNm3drHeAMFLZTz0JCg@mail.gmail.com \
--to=saravanak@google.com \
--cc=greg@kroah.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=robherring2@gmail.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).