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

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  7b637cd52f02 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")

from the net tree and commit:

  7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")

from the net-next 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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 9d7bc544a49d,41fcfdb24a81..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11339,7 -11341,13 +11353,13 @@@ W:	https://linuxtv.or
  T:	git git://linuxtv.org/media_tree.git
  F:	drivers/media/radio/radio-maxiradio*
  
+ MAXLINEAR ETHERNET PHY DRIVER
+ M:	Xu Liang <lxu@xxxxxxxxxxxxx>
+ L:	netdev@xxxxxxxxxxxxxxx
+ S:	Supported
+ F:	drivers/net/phy/mxl-gpy.c
+ 
 -MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
 +MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
  R:	Yasushi SHOJI <yashi@xxxxxxxxxxxxxxx>
  L:	linux-can@xxxxxxxxxxxxxxx
  S:	Maintained

Attachment: pgp8TxTwh98wE.pgp
Description: OpenPGP digital signature