linux-next: manual merge of the drm-msm tree with the drm tree

Hi all,

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

drivers/gpu/drm/msm/Kconfig

between commit:

1e0f66420b13 ("drm/display: Introduce a DRM display-helper module")

from the drm tree and commit:

f5d01644921b ("drm/msm: select DRM_DP_AUX_BUS for the AUX bus support")

from the drm-msm 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.