Hi all,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/r8188eu/include/rtw_android.h
drivers/staging/r8188eu/os_dep/rtw_android.c
between commit:
89939e890605 ("staging: rtlwifi: use siocdevprivate")
from the net-next tree and commit:
2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver")
from the staging tree.
I fixed it up using the net-next version 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.
