Messages in this thread | | | Date | Thu, 15 Mar 2018 18:36:33 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rpmsg tree with the asm-generic tree |
| |
Hi Bjorn,
Today's linux-next merge of the rpmsg tree got a conflict in:
samples/Makefile
between commit:
e7e57f690e38 ("arch: remove blackfin port")
from the asm-generic tree and commit:
842891be96bd ("samples: Introduce Qualcomm QMI sample client")
from the rpmsg 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.
-- Cheers, Stephen Rothwell
diff --cc samples/Makefile index 70cf3758dcf2,a30833a2a19e..000000000000 --- a/samples/Makefile +++ b/samples/Makefile @@@ -2,5 -2,5 +2,5 @@@ obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \ - configfs/ connector/ v4l/ trace_printk/ blackfin/ \ + configfs/ connector/ v4l/ trace_printk/ \ - vfio-mdev/ statx/ + vfio-mdev/ statx/ qmi/ [unhandled content-type:application/pgp-signature] | |