Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752949AbbKZAQZ (ORCPT ); Wed, 25 Nov 2015 19:16:25 -0500 Received: from www62.your-server.de ([213.133.104.62]:52752 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbbKZAQX (ORCPT ); Wed, 25 Nov 2015 19:16:23 -0500 Message-ID: <56564F4E.10509@iogearbox.net> Date: Thu, 26 Nov 2015 01:16:14 +0100 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Stephen Rothwell , David Miller , netdev@vger.kernel.org CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the net tree References: <20151126110105.60ec3ddc@canb.auug.org.au> In-Reply-To: <20151126110105.60ec3ddc@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 732 Lines: 26 On 11/26/2015 01:01 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/syscall.c > > between commit: > > c9da161c6517 ("bpf: fix clearing on persistent program array maps") > > from the net tree and commit: > > f99bf205dab0 ("bpf: add show_fdinfo handler for maps") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Seems fine, thanks! -- 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/