linux-next: manual merge of the staging tree with the staging.current tree
From: Stephen Rothwell
Date: Sun Jan 29 2017 - 23:00:56 EST
Today's linux-next merge of the staging tree got a conflict in:
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.