From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbaHDD26 (ORCPT ); Sun, 3 Aug 2014 23:28:58 -0400 Received: from ozlabs.org ([103.22.144.67]:39028 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbaHDD24 (ORCPT ); Sun, 3 Aug 2014 23:28:56 -0400 Date: Mon, 4 Aug 2014 13:28:48 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hannes Frederic Sowa , Tom Herbert Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20140804132848.0f3f9c7a@canb.auug.org.au> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; i486-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/CWUoYgNsN+rUWiyV+lV49Tc"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/CWUoYgNsN+rUWiyV+lV49Tc 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 net/ipv6/sysctl_net_ipv6.c between commit 166bd890a3d8 ("ipv6: data of fwmark_reflect sysctl needs to be updated on netns construction") from the net tree and commit cb1ce2ef387b ("ipv6: Implement automatic flow label generation on transmit") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/ipv6/sysctl_net_ipv6.c index 818334619abb,5bf7b61f8ae8..000000000000 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@@ -74,7 -81,7 +81,8 @@@ static int __net_init ipv6_sysctl_net_i ipv6_table[0].data =3D &net->ipv6.sysctl.bindv6only; ipv6_table[1].data =3D &net->ipv6.sysctl.anycast_src_echo_reply; ipv6_table[2].data =3D &net->ipv6.sysctl.flowlabel_consistency; - ipv6_table[3].data =3D &net->ipv6.sysctl.fwmark_reflect; + ipv6_table[3].data =3D &net->ipv6.sysctl.auto_flowlabels; ++ ipv6_table[4].data =3D &net->ipv6.sysctl.fwmark_reflect; =20 ipv6_route_table =3D ipv6_route_sysctl_init(net); if (!ipv6_route_table) --Sig_/CWUoYgNsN+rUWiyV+lV49Tc Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJT3v30AAoJEMDTa8Ir7ZwVHVsP/3mXMQ/JDNVtssuT5cRvQwun HU0U9Drr38U/L0VU9smyoRGjLza971eC2gh7YQs51HmTKWguj9opjJReg0594f+h yO5j9b7KTq0lMNnOFjTWeTRoqk88uuATdCdUU5wfOD1BTPayuTlxbjOEBp2woHvV SnxV0m857mH47zE8v5wHR8XH9GgD+mneKvLbb3DAe7UWfC1JiV3WKz3OlNtG6Pbf ubfnwxVibJMw979rZTlQ2/PjkDHGYhhoJB/8wy1j+PmDJvuPCv7Ty3r2t+vUFfGp 3xXIOn+Cey6u54LBkyPeJ40UF62ymIa7QpQvJ8ahyAWBqhhSjaW3ax8f20Orgtpe LUD+jmquNw0FVEJc8gZST/RGxqVFNUs17cUXxZ6TSftKJv5N9jul0kAkHic5mrNb /4YPGj5PKSw78yhlpV7pvcifheoV2fJFhBGNWDoh9ElzKiaDbVgJdxn7cmzeeuXq 10Uyuo8+IS7RYNsHBcKmVfQC5A8ZpwCLN/HIB55VZIKYT59LVcfReL6KmtCMBoFv JARCgvQY2Jb1JbizCCgQ3XCEy/IWttju/69VK36+c9yQOm/trnqkCPyQ+e+BK0rD 9p5Zl4EN7jbnGQg/4Iljr9KJvjujrPlimbpQLoC92JWdO/JB8SCDaao1rKvlkmYM UxK0K+YtJWYWIzbRA99z =WrGb -----END PGP SIGNATURE----- --Sig_/CWUoYgNsN+rUWiyV+lV49Tc-- 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: Mon, 4 Aug 2014 13:28:48 +1000 Message-ID: <20140804132848.0f3f9c7a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/CWUoYgNsN+rUWiyV+lV49Tc"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:39028 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbaHDD24 (ORCPT ); Sun, 3 Aug 2014 23:28:56 -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, Hannes Frederic Sowa , Tom Herbert --Sig_/CWUoYgNsN+rUWiyV+lV49Tc 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 net/ipv6/sysctl_net_ipv6.c between commit 166bd890a3d8 ("ipv6: data of fwmark_reflect sysctl needs to be updated on netns construction") from the net tree and commit cb1ce2ef387b ("ipv6: Implement automatic flow label generation on transmit") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/ipv6/sysctl_net_ipv6.c index 818334619abb,5bf7b61f8ae8..000000000000 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@@ -74,7 -81,7 +81,8 @@@ static int __net_init ipv6_sysctl_net_i ipv6_table[0].data =3D &net->ipv6.sysctl.bindv6only; ipv6_table[1].data =3D &net->ipv6.sysctl.anycast_src_echo_reply; ipv6_table[2].data =3D &net->ipv6.sysctl.flowlabel_consistency; - ipv6_table[3].data =3D &net->ipv6.sysctl.fwmark_reflect; + ipv6_table[3].data =3D &net->ipv6.sysctl.auto_flowlabels; ++ ipv6_table[4].data =3D &net->ipv6.sysctl.fwmark_reflect; =20 ipv6_route_table =3D ipv6_route_sysctl_init(net); if (!ipv6_route_table) --Sig_/CWUoYgNsN+rUWiyV+lV49Tc Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJT3v30AAoJEMDTa8Ir7ZwVHVsP/3mXMQ/JDNVtssuT5cRvQwun HU0U9Drr38U/L0VU9smyoRGjLza971eC2gh7YQs51HmTKWguj9opjJReg0594f+h yO5j9b7KTq0lMNnOFjTWeTRoqk88uuATdCdUU5wfOD1BTPayuTlxbjOEBp2woHvV SnxV0m857mH47zE8v5wHR8XH9GgD+mneKvLbb3DAe7UWfC1JiV3WKz3OlNtG6Pbf ubfnwxVibJMw979rZTlQ2/PjkDHGYhhoJB/8wy1j+PmDJvuPCv7Ty3r2t+vUFfGp 3xXIOn+Cey6u54LBkyPeJ40UF62ymIa7QpQvJ8ahyAWBqhhSjaW3ax8f20Orgtpe LUD+jmquNw0FVEJc8gZST/RGxqVFNUs17cUXxZ6TSftKJv5N9jul0kAkHic5mrNb /4YPGj5PKSw78yhlpV7pvcifheoV2fJFhBGNWDoh9ElzKiaDbVgJdxn7cmzeeuXq 10Uyuo8+IS7RYNsHBcKmVfQC5A8ZpwCLN/HIB55VZIKYT59LVcfReL6KmtCMBoFv JARCgvQY2Jb1JbizCCgQ3XCEy/IWttju/69VK36+c9yQOm/trnqkCPyQ+e+BK0rD 9p5Zl4EN7jbnGQg/4Iljr9KJvjujrPlimbpQLoC92JWdO/JB8SCDaao1rKvlkmYM UxK0K+YtJWYWIzbRA99z =WrGb -----END PGP SIGNATURE----- --Sig_/CWUoYgNsN+rUWiyV+lV49Tc--