From patchwork Tue Jul 21 02:16:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1332723 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=ZnMB6Iyl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B9hzp4lSWz9sTF for ; Tue, 21 Jul 2020 12:16:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728317AbgGUCQf (ORCPT ); Mon, 20 Jul 2020 22:16:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725774AbgGUCQd (ORCPT ); Mon, 20 Jul 2020 22:16:33 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7936DC061794; Mon, 20 Jul 2020 19:16:33 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4B9hzg5GdJz9sSy; Tue, 21 Jul 2020 12:16:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595297792; bh=MQhPK7Of38NS8E7kuszvHDn+nGkfoaSvpuI3ArH4y9Q=; h=Date:From:To:Cc:Subject:From; b=ZnMB6Iyl47yKHcqQyhqk+mGM2pbKzrlLhiY3PO3kKliNhBdpYK1vSMeakAvg7nQzJ SAuneqXJOdh+2rLEry9qVzYDn4u2qKozLhWyKPNZihA5zU4LAMDHBaCO63Lb9gsdOV z5G7dqOHOnnscCZUtxGvWsf1Z19En0UNVLEot9ovjg0FewfbTvmpvmd7WDPf8EiftG kmtVzv0RFHeCc1wajOH43vLfROKoMj2gHf9/V5M7ElmghWmyDZapBZo6Ry13LjVpc0 eTbg/k7ZQ4UNCyiQZUvLzcZ3yqOoTGw65L8ErAUEv6QjHZxzZ7Xce141GXR5dFLetN Y/37dN0uOLgbA== Date: Tue, 21 Jul 2020 12:16:30 +1000 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking , David Miller Cc: Linux Next Mailing List , Linux Kernel Mailing List , Lorenzo Bianconi , Jesper Dangaard Brouer Subject: linux-next: manual merge of the bpf-next tree with the net-next tree Message-ID: <20200721121630.5c06c492@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: include/net/xdp.h between commit: 2f0bc54ba9a8 ("xdp: introduce xdp_get_shared_info_from_{buff, frame} utility routines") from the net-next tree and commits: 9216477449f3 ("bpf: cpumap: Add the possibility to attach an eBPF program to cpumap") 28b1520ebf81 ("bpf: cpumap: Implement XDP_REDIRECT for eBPF programs attached to map entries") from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc include/net/xdp.h index d3005bef812f,5be0d4d65b94..000000000000 --- a/include/net/xdp.h