[lkml]   [2018]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the tip tree with the arm-soc tree
Hi all,

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


between commits:

81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries")
677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver")

from the arm-soc tree and commit:

9d8d47ea6ec6 ("clocksource/drivers: Unify the names to timer-* format")

from the tip 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.

Stephen Rothwell

index c4d323faa764,2a83f2339651..000000000000
@@@ -1218,10 -1180,7 +1218,10 @@@ N: ow
F: arch/arm/mach-actions/
F: arch/arm/boot/dts/owl-*
F: arch/arm64/boot/dts/actions/
+F: drivers/clk/actions/
- F: drivers/clocksource/owl-*
+ F: drivers/clocksource/timer-owl*
+F: drivers/dma/owl-dma.c
+F: drivers/i2c/busses/i2c-owl.c
F: drivers/pinctrl/actions/*
F: drivers/soc/actions/
F: include/dt-bindings/power/owl-*
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-10-08 04:33    [W:0.025 / U:6.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site