From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932938Ab3BLA5s (ORCPT ); Mon, 11 Feb 2013 19:57:48 -0500 Received: from haggis.pcug.org.au ([203.10.76.10]:48665 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932674Ab3BLA5r (ORCPT ); Mon, 11 Feb 2013 19:57:47 -0500 Date: Tue, 12 Feb 2013 11:57:33 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yuval Mintz , "Michael S. Tsirkin" , Eric Dumazet Subject: linux-next: manual merge of the net-next tree with the net tree Message-Id: <20130212115733.1205c57d893aa3f16fc83526@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__12_Feb_2013_11_57_33_+1100_BWEO+_NF9FRce+D8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Tue__12_Feb_2013_11_57_33_+1100_BWEO+_NF9FRce+D8 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 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c between commit 0aba93e2b9fb ("bnx2x: set gso_type") from the net tree and commit cbf1de72324a ("bnx2x: fix GRO parameters") from the net-next tree. I fixed it up (since the former commit says that the latter is the more complex fix, I just used that) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Tue__12_Feb_2013_11_57_33_+1100_BWEO+_NF9FRce+D8 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJRGZN9AAoJEECxmPOUX5FELpoQAKdiylGo4xgYSVFWa2aEi2mX MYFezta7OCJA1XGrbR3Wy/bH3QDI1k9bZVR10o9Hm9oNYj8x1ks3y8iGQNlQYiHw sQCPm/GVDEfy4pKHjoaNYZvGWBTUokj+ZME/0dXjlqcpav4Ew8O7E8B2bQIJiAL5 0B/jsk6DbQ5bKn9a6L2IZj2rV1g7V2UJX8TGISmzkm0XcbOqElgkfpzj4M3zE3rU 1OzK4HWe+PIQzfeCCNBkM1jRy8niZZTghSXFqJv3sOantR6xEBruifq+lfdDhEUa naNg6vSgDrjp8ovElOcI86jev/ba3WcjKWyOZSdcMzy7yPXGO+n3ucW0vnlhw/uX 4ZD3Wkeu0MyIeHijg7OgQ6+D7uiBYcoTo57jgdl48vXPbDSD5mxXJMKsvFsnhhZF 9SxtcLUyM+jiPTvuF4Bt5Nf/tKHz2MuyampR+36l/22My207l9BMnMc/+A7ttdPo H+bvmH1/kO7/OhNItiSNwft1z5aJODCCVDnrMb88qieu529Htc1z065lodo4g01g Fgjn3hWrKYJVmHgWnhT5lL8612cu9N7gIAXpwpJiSpWyXKEQHKmYMacJAboE9Jp/ zFXLuWt3Sq3cOzCkrbFkAUrNyoqkIuQTw3QmMT+mgeGlVLIt4fv7daBMWH222J6m Mf+7yeKbXwUfkegP5Nf+ =ODnF -----END PGP SIGNATURE----- --Signature=_Tue__12_Feb_2013_11_57_33_+1100_BWEO+_NF9FRce+D8--