linux-next: manual merge of the drop-experimental tree with Linus' and the net-next trees

Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in drivers/net/ethernet/intel/Kconfig between commit c56283034ce2 ("pps, ptp: Remove dependencies on EXPERIMENTAL") from Linus' tree, commit 483f777266f5 ("drivers/net: remove orphaned references to micro channel")

linux-next: manual merge of the drop-experimental tree with Linus' and the net-next trees

Hi Kees, Today's linux-next merge of the drop-experimental tree got a conflict in drivers/net/ethernet/intel/Kconfig between commit c56283034ce2 (pps, ptp: Remove dependencies on EXPERIMENTAL) from Linus' tree, commit 483f777266f5 (drivers/net: remove orphaned references to micro channel) from