linux-next: manual merge of the staging tree with the staging.current tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the staging tree with the staging.current tree
Date	2017-01-30 05:10 +0100
Message-ID	<t5brX-7KX-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Greg,

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

  drivers/staging/greybus/timesync_platform.c

between commit:

  b17c1bba9cec ("staging: greybus: timesync: validate platform state callback")

from the staging.current tree and commit:

  bdfb95c4baab ("staging: greybus: remove timesync protocol support")

from the staging tree.

I fixed it up (I just removed the file) 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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the  staging.current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-30 05:10 +0100

csiph-web