From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134Ab0CADUL (ORCPT ); Sun, 28 Feb 2010 22:20:11 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:50983 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751990Ab0CADUJ (ORCPT ); Sun, 28 Feb 2010 22:20:09 -0500 Date: Mon, 1 Mar 2010 14:20:02 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Joe Perches , hartleys Subject: linux-next: manual merge of the net tree with Linus' tree Message-Id: <20100301142002.ee497fd8.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.0 (GTK+ 2.18.7; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Mon__1_Mar_2010_14_20_02_+1100_t3pxvQsq53O9YEJC" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Mon__1_Mar_2010_14_20_02_+1100_t3pxvQsq53O9YEJC 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 tree got a conflict in drivers/firmware/iscsi_ibft.c between commit 00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit 2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c: use %pM to show MAC address") from the net tree. Just a trivial context change. I fixed it up and can carry the change as necessary. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Mon__1_Mar_2010_14_20_02_+1100_t3pxvQsq53O9YEJC Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkuLMmIACgkQjjKRsyhoI8xYNgCfWmPjw+Vr3aqcIKujWuxmhz+2 ZVsAoLDvoKmvCvsz8bgKwEmhvjpqzl/3 =dIjt -----END PGP SIGNATURE----- --Signature=_Mon__1_Mar_2010_14_20_02_+1100_t3pxvQsq53O9YEJC--