From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753824AbbDJDNI (ORCPT ); Thu, 9 Apr 2015 23:13:08 -0400 Received: from ozlabs.org ([103.22.144.67]:47667 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645AbbDJDNG (ORCPT ); Thu, 9 Apr 2015 23:13:06 -0400 Date: Fri, 10 Apr 2015 13:12:58 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Phil Reid , Dinh Nguyen Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20150410131258.04416c49@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/WFl1ec3WXBVP6_UB2LnHH8_"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/WFl1ec3WXBVP6_UB2LnHH8_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c between commit 27015f8c1757 ("stmmac: devm_reset_control_get can return PROBE_DEFER") from the net tree and commit cbe21d92e4d5 ("net: stmmac: make reset control an optional requirement") from the net-next tree. I fixed it up (I just used the net-next version) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/WFl1ec3WXBVP6_UB2LnHH8_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVJz++AAoJEMDTa8Ir7ZwVQEkP/3gtKck9Onw8JfxoxOLre7kX EaF+BnrzpREMZjS/cF2qr7Ey/XDCco3XI+z8xLeeL/vh91GGDWpPa025oR4a+g/7 wtkft8N2AieUjnjsP/VxiHRVatC8y7fbwFDpOp5mXHz1+xOis73YPCJoeAAzL4i/ MAZ87yaCVp3kbDFzCIYC9eGmIR7esC7KgdPi+8BDmWAZCBhRf3CGSiyYqg+J4ux7 k9AGIIwZjJYl1xb0vp7/Jv58+TUzNag4vh+OfCN3WmQttfyCPd2F9Dgr3dmAjLbS SBpUq2tt5phgnmDMnySX4GCjPLfP06YaJOLTz3ozolyxMcni11mB6rLYGf7kS8K1 JfqjDAkHHTLDIcm2ZSb7w6BbQLsKJ1UN6Ii9M1LUsQ9hUaoqAYyF+El77YptZbwP y4kScEHFZ44a2TK1T7K+81yzHMTY66y2dvcFASwmFjmCW0WHYdvLGIulzdzQ4M0t Jb+FMrpPzj0U3gCcd2DefTjRv+4yQS8JlxV7FBWGE8RvpCmTAXu1cKTwhjaKdBsr pUHm1bpRYHxjRMqbMxDGZjfqL0Z2IN3ojO3BVSmoWjjxslGyxpKgEzlF/uTTHa1Y puZtKmKjr4pZJUMwAxRB3vr+ZiCNPkeb6JAarhh31PZKnbJf1fi/8j9XV9J+WZ5o ajv2gHayp86ojeZe/jJP =NH44 -----END PGP SIGNATURE----- --Sig_/WFl1ec3WXBVP6_UB2LnHH8_-- 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: Fri, 10 Apr 2015 13:12:58 +1000 Message-ID: <20150410131258.04416c49@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/WFl1ec3WXBVP6_UB2LnHH8_"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Phil Reid , Dinh Nguyen List-Id: linux-next.vger.kernel.org --Sig_/WFl1ec3WXBVP6_UB2LnHH8_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c between commit 27015f8c1757 ("stmmac: devm_reset_control_get can return PROBE_DEFER") from the net tree and commit cbe21d92e4d5 ("net: stmmac: make reset control an optional requirement") from the net-next tree. I fixed it up (I just used the net-next version) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/WFl1ec3WXBVP6_UB2LnHH8_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVJz++AAoJEMDTa8Ir7ZwVQEkP/3gtKck9Onw8JfxoxOLre7kX EaF+BnrzpREMZjS/cF2qr7Ey/XDCco3XI+z8xLeeL/vh91GGDWpPa025oR4a+g/7 wtkft8N2AieUjnjsP/VxiHRVatC8y7fbwFDpOp5mXHz1+xOis73YPCJoeAAzL4i/ MAZ87yaCVp3kbDFzCIYC9eGmIR7esC7KgdPi+8BDmWAZCBhRf3CGSiyYqg+J4ux7 k9AGIIwZjJYl1xb0vp7/Jv58+TUzNag4vh+OfCN3WmQttfyCPd2F9Dgr3dmAjLbS SBpUq2tt5phgnmDMnySX4GCjPLfP06YaJOLTz3ozolyxMcni11mB6rLYGf7kS8K1 JfqjDAkHHTLDIcm2ZSb7w6BbQLsKJ1UN6Ii9M1LUsQ9hUaoqAYyF+El77YptZbwP y4kScEHFZ44a2TK1T7K+81yzHMTY66y2dvcFASwmFjmCW0WHYdvLGIulzdzQ4M0t Jb+FMrpPzj0U3gCcd2DefTjRv+4yQS8JlxV7FBWGE8RvpCmTAXu1cKTwhjaKdBsr pUHm1bpRYHxjRMqbMxDGZjfqL0Z2IN3ojO3BVSmoWjjxslGyxpKgEzlF/uTTHa1Y puZtKmKjr4pZJUMwAxRB3vr+ZiCNPkeb6JAarhh31PZKnbJf1fi/8j9XV9J+WZ5o ajv2gHayp86ojeZe/jJP =NH44 -----END PGP SIGNATURE----- --Sig_/WFl1ec3WXBVP6_UB2LnHH8_--