From patchwork Mon Aug 3 03:05:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1340070 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=G4kNA36x; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BKjSK5HYJz9sTm for ; Mon, 3 Aug 2020 13:05:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726862AbgHCDFe (ORCPT ); Sun, 2 Aug 2020 23:05:34 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:58303 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725820AbgHCDFe (ORCPT ); Sun, 2 Aug 2020 23:05:34 -0400 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 4BKjS94QYcz9sTX; Mon, 3 Aug 2020 13:05:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1596423931; bh=McqvNsZTich5yNdwdrEuQyo7JQmSsgYuQqaKmpJV98E=; h=Date:From:To:Cc:Subject:From; b=G4kNA36xMUznfWAEg7LY4OKz2NiDDUDY594gOBQ7szFKt7+6ROUQzynEYtU/Cj3id iPVcxxlp7Ku1OFbTH9szVLt/iTDtQqm/wFGMONopArPjgZBTITW7O/PLHOsaLXr4VZ kgdjY7J1zVJrNomb464qfhxDd2+tO3kOxb+W8VL9LRDQ+WNxeYnM1oMhPpjr77d6Xj vn9/T2AD10d5MLZMBW0UMjmokzC2R2P///pHRPOQ4kG8cKBS7xZsZKw3HwLS7lkwDE 2k6M4CHBzl3pUn8uEzIz7iy8rZK1ErmQruuR8OrReUwco4DcnFdwlUODjKk9betQh3 Hu8WQnCb5sYEw== Date: Mon, 3 Aug 2020 13:05:26 +1000 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Roopa Prabhu , Andrii Nakryiko Subject: linux-next: manual merge of the bpf-next tree with the net-next tree Message-ID: <20200803130526.5a1519e2@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: net/core/dev.c between commit: 829eb208e80d ("rtnetlink: add support for protodown reason") from the net-next tree and commits: 7f0a838254bd ("bpf, xdp: Maintain info on attached XDP BPF programs in net_device") aa8d3a716b59 ("bpf, xdp: Add bpf_link-based XDP attachment API") 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 net/core/dev.c index f7ef0f5c5569,c8b911b10187..000000000000 --- a/net/core/dev.c