linux-next: manual merge of the mhi tree with the net tree

[Mark Brown]

Hi all,

Today's linux-next merge of the mhi tree got conflicts in:

  drivers/bus/mhi/core/main.c

between commit:

  ce78ffa3ef16 ("net: really fix the build...")

from the net tree and commit:

  51caa4ed8542 ("bus: mhi: Add inbound buffers allocation flag")

from the mhi 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.

diff --cc drivers/bus/mhi/core/main.c
index 84448233f64c,c67fd001ded1..000000000000
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c

(the net tree added a blank line 1460 with a tab and the mhi tree adds
the same line with no tab)