From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the tip tree with the net tree Date: Fri, 7 Aug 2009 16:47:05 +1000 Message-ID: <20090807164705.725869c1.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__7_Aug_2009_16_47_05_+1000_gbXiJbopbeIYiJGx" Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:50497 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754811AbZHGGrR (ORCPT ); Fri, 7 Aug 2009 02:47:17 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Jan Engelhardt , "David S. Miller" --Signature=_Fri__7_Aug_2009_16_47_05_+1000_gbXiJbopbeIYiJGx Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in arch/x86/include/asm/socket.h between commits 49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net: implement a SO_DOMAIN getsockoption") from the net tree and commit 73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate header files") from the tip tree. The latter change supercedes the former ones, so I used the latter. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Fri__7_Aug_2009_16_47_05_+1000_gbXiJbopbeIYiJGx Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkp7zekACgkQjjKRsyhoI8yHwQCeI73rOR2k31OPIbpJ/L9ODabl tvkAoITX+nUI6Cfxs9QJf8/e4tXMcyeA =UJzM -----END PGP SIGNATURE----- --Signature=_Fri__7_Aug_2009_16_47_05_+1000_gbXiJbopbeIYiJGx--