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

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the net-next tree with Linus' tree
Date	Thu, 30 Jun 2016 03:10:01 +0200
Message-ID	<rPyEp-32M-5@gated-at.bofh.it> (permalink)
X-Original-To	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1467248506; bh=VBIHjEGiaGEz+Tmp2zZRl2kM1aD7NgGRMw/7FPSYa0g=; h=Date:From:To:Cc:Subject:From; b=J+xEuZs/EkqQ6AOa89XpBkSgeKVnULbFb8Q2O8eneIL73BYy4UnnX42/kgFfInaBy VX6Ou8kTLgQjR7vvvDY2RITgtXUaeF0oPzHaBrFp5k6rtEKGnVVld9Tw6l5bQ69aGY LNhkmIG/YwbLmXDORLtRhxcjpCSRzYl5lMGlYuYI=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>, Russell King <rmk+kernel@arm.linux.org.uk>
X-Original-Date	Thu, 30 Jun 2016 11:01:46 +1000
X-Original-Message-ID	<20160630110146.6becc338@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1434137

Show key headers only | View raw

Hi all,

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

  drivers/net/phy/fixed_phy.c

between commit:

  69fc58a57e56 ("net: phy: Manage fixed PHY address space using IDA")

from Linus' tree and commit:

  bf7afb29d545 ("phy: improve safety of fixed-phy MII register reading")

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 drivers/net/phy/fixed_phy.c
index 9ec7f7353434,b376ada83598..000000000000
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@@ -23,9 -23,9 +23,10 @@@
  #include <linux/slab.h>
  #include <linux/of.h>
  #include <linux/gpio.h>
+ #include <linux/seqlock.h>
 +#include <linux/idr.h>
  
- #define MII_REGS_NUM 29
+ #include "swphy.h"
  
  struct fixed_mdio_bus {
  	struct mii_bus *mii_bus;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-30 03:10 +0200

csiph-web