From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
Saravana Kannan <saravanak@google.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the devicetree tree
Date: Tue, 6 Apr 2021 11:11:39 +0200 [thread overview]
Message-ID: <YGwly0cRvxGpt26D@kroah.com> (raw)
In-Reply-To: <20210406181945.2ae6fed1@canb.auug.org.au>
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!
greg k-h
next prev parent reply other threads:[~2021-04-06 9:11 UTC|newest]
Thread overview: 8+ 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 [this message]
2021-04-06 16:19 ` Saravana Kannan
-- strict thread matches above, loose matches on Subject: below --
2026-03-17 16:19 Mark Brown
2026-03-18 7:37 ` Greg KH
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=YGwly0cRvxGpt26D@kroah.com \
--to=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=saravanak@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.