Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the rpmsg tree with the devicetree tree
@ 2019-11-22  3:50 Stephen Rothwell
  2019-11-22  8:55 ` Arnaud POULIQUEN
  2019-11-30 19:17 ` Bjorn Andersson
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-22  3:50 UTC (permalink / raw)
  To: Bjorn Andersson, Rob Herring
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Arnaud Pouliquen, Fabien Dessenne

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

Hi all,

Today's linux-next merge of the rpmsg tree got a conflict in:

  Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt

between commit:

  34376eb1b084 ("dt-bindings: remoteproc: convert stm32-rproc to json-schema")

from the devicetree tree and commit:

  14ea1d04ed0f ("dt-bindings: remoteproc: stm32: add wakeup-source")

from the rpmsg tree.

I fixed it up (I just deleted the file - more updates may be required)
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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the rpmsg tree with the devicetree tree
  2019-11-22  3:50 linux-next: manual merge of the rpmsg tree with the devicetree tree Stephen Rothwell
@ 2019-11-22  8:55 ` Arnaud POULIQUEN
  2019-11-30 19:17 ` Bjorn Andersson
  1 sibling, 0 replies; 3+ messages in thread
From: Arnaud POULIQUEN @ 2019-11-22  8:55 UTC (permalink / raw)
  To: Stephen Rothwell, Bjorn Andersson, Rob Herring
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Fabien Dessenne

Hi Stephen,

Thanks for the information. So i need to send an extra patch to add the missing
property in the yaml file
Not critical as this new property is not in the DTS file for the time being,
dtbs_check does not fail  

Regards
Arnaud


On 11/22/19 4:50 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rpmsg tree got a conflict in:
> 
>   Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt
> 
> between commit:
> 
>   34376eb1b084 ("dt-bindings: remoteproc: convert stm32-rproc to json-schema")
> 
> from the devicetree tree and commit:
> 
>   14ea1d04ed0f ("dt-bindings: remoteproc: stm32: add wakeup-source")
> 
> from the rpmsg tree.
> 
> I fixed it up (I just deleted the file - more updates may be required)
> 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.
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the rpmsg tree with the devicetree tree
  2019-11-22  3:50 linux-next: manual merge of the rpmsg tree with the devicetree tree Stephen Rothwell
  2019-11-22  8:55 ` Arnaud POULIQUEN
@ 2019-11-30 19:17 ` Bjorn Andersson
  1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2019-11-30 19:17 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Rob Herring, Linux Next Mailing List, Linux Kernel Mailing List,
	Arnaud Pouliquen, Fabien Dessenne

On Thu 21 Nov 19:50 PST 2019, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the rpmsg tree got a conflict in:
> 
>   Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt
> 
> between commit:
> 
>   34376eb1b084 ("dt-bindings: remoteproc: convert stm32-rproc to json-schema")
> 
> from the devicetree tree and commit:
> 
>   14ea1d04ed0f ("dt-bindings: remoteproc: stm32: add wakeup-source")
> 
> from the rpmsg tree.
> 
> I fixed it up (I just deleted the file - more updates may be required)
> 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 for catching this Stephen!

Regards,
Bjorn

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-22  3:50 linux-next: manual merge of the rpmsg tree with the devicetree tree Stephen Rothwell
2019-11-22  8:55 ` Arnaud POULIQUEN
2019-11-30 19:17 ` Bjorn Andersson

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 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/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git