From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Thu, 25 May 2017 09:34:26 +1000 Message-ID: <20170525093426.621b757e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:39203 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932158AbdEXXe3 (ORCPT ); Wed, 24 May 2017 19:34:29 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Andrew Lunn Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/phy/marvell.c between commit: f2899788353c ("net: phy: marvell: Limit errata to 88m1101") from the net tree and commit: 0c3439bc7773 ("net: phy: Marvell: checkpatch - Comments") from the net-next tree. I fixed it up (I just used the former version) 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