Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871AbbDGHBG (ORCPT ); Tue, 7 Apr 2015 03:01:06 -0400 Received: from ozlabs.org ([103.22.144.67]:39522 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513AbbDGHBE (ORCPT ); Tue, 7 Apr 2015 03:01:04 -0400 Date: Tue, 7 Apr 2015 17:00:56 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Borkmann , Alexei Starovoitov Subject: linux-next: manual merge of the tip tree with the net-next tree Message-ID: <20150407170056.2d89261e@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_/H773TF+Zhn8FqOzXUYuz1Yh"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1916 Lines: 48 --Sig_/H773TF+Zhn8FqOzXUYuz1Yh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in include/linux/bpf.h between commit 0fc174dea545 ("ebpf: make internal bpf API independent of CONFIG_BPF_SYSCALL ifdefs") from the net-next tree and commit 4e537f7fbdce ("bpf: Make internal bpf API independent of CONFIG_BPF_SYSCALL #ifdefs") from the tip tree. I fixed it up (they are the same patch and there are other changes in the net-next tree, so I just used that version) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/H773TF+Zhn8FqOzXUYuz1Yh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVI4CuAAoJEMDTa8Ir7ZwVKV8P/1GIN4F85xZTG2FO64xc0EOT f2TbldvAz4DMjY+3xHPbUWFuDU143HI1JzDahYYJYUf7EKS46VynoF5s/9mb1Svg RTNXHoZOkkVQ9R7USp/IFn5rtnoPN5uTy5HTo8HTUt1trrT02TlRPygaI+izx6Mv Gq/yRujhqBDnMpWQLdUJ+HIfmllNsHQYCnHrWX14pI7w7xJKJRwVqzojgL4ibbJz Ge91keuDmtPF6cfWpGKeYBiUUiNpaJEf+iz4kI8G/aOYVvJPRxtety0PX7/vWxst ba4H3DXTnEfIqn2E92EdpdRPVKlLH5wVQVeSxoTS0cpbhyesGM+YLsUdLGwjNGFu PiU5ERoaSbLB7JIuPsppMEZfubTyZw6Iawa0AJRHpm4O46ynGzjDJyS+uHxJukhe NDAuuskfk+IRSJ52BMVYXswhkByHFpjqYBDNvAQRJMy/djCRAKATeExhWiNF9gyQ e9fRbz9UklC6rhh1GvAHsr54/gRuYf48Chp/vLw5P0vuaZwME/SHK8qU36XxkZuB kcUvsilWo6OMtbU8TtU3x6RSpib3vWFvJmHKyqe9yQqSbPy0HUlNOxV30HdpNWHt +9UgdPRBW4vy8SjI10uvmgD9SY6vr0+FXc+cA7M0/VWSMETz3gM6rP38dBD2zf/w k2M+2PotczjqOSe9o0hV =HpWn -----END PGP SIGNATURE----- --Sig_/H773TF+Zhn8FqOzXUYuz1Yh-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/