From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbaCYB6t (ORCPT ); Mon, 24 Mar 2014 21:58:49 -0400 Received: from ozlabs.org ([203.10.76.45]:59558 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbaCYB6q (ORCPT ); Mon, 24 Mar 2014 21:58:46 -0400 Date: Tue, 25 Mar 2014 12:58:35 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nishanth Menon , Sergei Shtylyov Subject: linux-next: manual merge of the net-next tree with the net tree Message-Id: <20140325125835.f3dc8f542b4d11394373718b@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta7 (GTK+ 2.24.22; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in Documentation/devicetree/bindings/net/micrel-ks8851.txt between commit ebf4ad955d3e ("net: micrel : ks8851-ml: add vdd-supply support") from the tree and commit e8f08ee0ad86 ("DT: net: document Ethernet bindings in one place") from the net-next tree. I fixed it up (maybe - see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/devicetree/bindings/net/micrel-ks8851.txt index 4fc392763611,8e20c04a1da1..000000000000 --- a/Documentation/devicetree/bindings/net/micrel-ks8851.txt +++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt @@@ -4,7 -4,3 +4,6 @@@ Required properties - compatible =3D "micrel,ks8851-ml" of parallel interface - reg : 2 physical address and size of registers for data and command - interrupts : interrupt connection + +Optional properties: - - local-mac-address : Ethernet mac address to use +- vdd-supply: supply for Ethernet mac --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJTMOLUAAoJEMDTa8Ir7ZwVLkAP/jTGl+rW6nyN2FStqgtz2dIL ZriBGMK9ZRZoaDDpsP2dCXQH2XA7tmuYIoRH6aLOd1M/oEfvWTu9OXBkQW/ANLWj wCG/oveXB9jDtVGMjpCHIwS2zj54BMzrDeWrMNvc7JOiEdTMOFnQRhiIFjcA8BsL X8ByqQHHU5rKcuzg3Yd7wobi5l6K9u297bQ51yVF13h7nWoiYysOySY19vvrLN3+ K5yt4PI6blYpjs/M+L3z9Zrj3vFRtmfMvTY58rKEnb6EcV4mHUCmaUsW8w15TRuy puXJ4gvB41C+Uykcpcy4muQ/mt3q+WYmpbk6ws61P+XNSZL+F0zfJsTvSaFfgI3H YeGXF/VYYsDCduBYJ71O+NSBMYhFwTkWaUGzcb82DEb1XjbyTgAJR2HA9cfnRryN npOz+EKVdES3XNJ8F8Q2G8A1pR6TtaRUXnHE+zoKmAojRV+4Llftyp+N4hF1SI0H puSEo/tKnRYUzdOT4ENFd6VOVPNjhef6Cu91m73LgOy/U5njDazGGYFw1yjoYp86 VK8dG8LUDksoAn40a6sp8WZuHYEjCmf9ixEP9LLlsRtKt0qDrJGcsDscS2PSgIpl VgVydw4C+6T6uL1z4iM2+Sm1VQaSSOHUK1/nbxIJNsojvNsASaiGC6JIwmlRkjmw LTLpw2dlwckPmOCYROrq =L+Ts -----END PGP SIGNATURE----- --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO-- 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: Tue, 25 Mar 2014 12:58:35 +1100 Message-ID: <20140325125835.f3dc8f542b4d11394373718b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO" Return-path: Received: from ozlabs.org ([203.10.76.45]:59558 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbaCYB6q (ORCPT ); Mon, 24 Mar 2014 21:58:46 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nishanth Menon , Sergei Shtylyov --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in Documentation/devicetree/bindings/net/micrel-ks8851.txt between commit ebf4ad955d3e ("net: micrel : ks8851-ml: add vdd-supply support") from the tree and commit e8f08ee0ad86 ("DT: net: document Ethernet bindings in one place") from the net-next tree. I fixed it up (maybe - see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/devicetree/bindings/net/micrel-ks8851.txt index 4fc392763611,8e20c04a1da1..000000000000 --- a/Documentation/devicetree/bindings/net/micrel-ks8851.txt +++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt @@@ -4,7 -4,3 +4,6 @@@ Required properties - compatible =3D "micrel,ks8851-ml" of parallel interface - reg : 2 physical address and size of registers for data and command - interrupts : interrupt connection + +Optional properties: - - local-mac-address : Ethernet mac address to use +- vdd-supply: supply for Ethernet mac --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJTMOLUAAoJEMDTa8Ir7ZwVLkAP/jTGl+rW6nyN2FStqgtz2dIL ZriBGMK9ZRZoaDDpsP2dCXQH2XA7tmuYIoRH6aLOd1M/oEfvWTu9OXBkQW/ANLWj wCG/oveXB9jDtVGMjpCHIwS2zj54BMzrDeWrMNvc7JOiEdTMOFnQRhiIFjcA8BsL X8ByqQHHU5rKcuzg3Yd7wobi5l6K9u297bQ51yVF13h7nWoiYysOySY19vvrLN3+ K5yt4PI6blYpjs/M+L3z9Zrj3vFRtmfMvTY58rKEnb6EcV4mHUCmaUsW8w15TRuy puXJ4gvB41C+Uykcpcy4muQ/mt3q+WYmpbk6ws61P+XNSZL+F0zfJsTvSaFfgI3H YeGXF/VYYsDCduBYJ71O+NSBMYhFwTkWaUGzcb82DEb1XjbyTgAJR2HA9cfnRryN npOz+EKVdES3XNJ8F8Q2G8A1pR6TtaRUXnHE+zoKmAojRV+4Llftyp+N4hF1SI0H puSEo/tKnRYUzdOT4ENFd6VOVPNjhef6Cu91m73LgOy/U5njDazGGYFw1yjoYp86 VK8dG8LUDksoAn40a6sp8WZuHYEjCmf9ixEP9LLlsRtKt0qDrJGcsDscS2PSgIpl VgVydw4C+6T6uL1z4iM2+Sm1VQaSSOHUK1/nbxIJNsojvNsASaiGC6JIwmlRkjmw LTLpw2dlwckPmOCYROrq =L+Ts -----END PGP SIGNATURE----- --Signature=_Tue__25_Mar_2014_12_58_35_+1100_19fGEbkp3wXSpBUO--