Linux-Next Archive on
 help / color / Atom feed
From: Greg KH <>
To: Stephen Rothwell <>
Cc: Rob Herring <>,
	Lee Jones <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Rob Herring <>,
	Saravana Kannan <>
Subject: Re: linux-next: manual merge of the driver-core tree with the devicetree tree
Date: Tue, 6 Apr 2021 11:11:39 +0200
Message-ID: <> (raw)
In-Reply-To: <>

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

  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06  8:19 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 --
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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone