linux-next: manual merge of the drop-experimental tree with the net-next tree

[Stephen Rothwell]

Hi Kees,

Today's linux-next merge of the drop-experimental tree got a conflict in
net/dsa/Kconfig between commit b3422a314c27 ("dsa: Hide core config
options; make drivers select what they need") from the net-next tree and
commit b8e8d99e4ee8 ("net/dsa: remove depends on CONFIG_EXPERIMENTAL")
from the drop-experimental tree.

I fixed it up (using the net-next version as that removed
CONFIG_EXPERIMENTAL as well) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpkYtQXGi6rm.pgp
Description: PGP signature