From patchwork Fri Aug 16 02:41:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1147909 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="scmB09uh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 468ndq6KT9z9sP8 for ; Fri, 16 Aug 2019 12:41:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726622AbfHPClt (ORCPT ); Thu, 15 Aug 2019 22:41:49 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:47013 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726364AbfHPCls (ORCPT ); Thu, 15 Aug 2019 22:41:48 -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 468ndh6G7Xz9sNF; Fri, 16 Aug 2019 12:41:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565923305; bh=PGta/xD1/egYgpO5T2Qp+49QWW5+LsXeaztt0jb76q0=; h=Date:From:To:Cc:Subject:From; b=scmB09uh8U3yDhc1BtrqCfGpfyfOreBDTtjbDZ/75ihvYPZn2LVD0q2kXAiSVWy34 No29rM5kU8OSAGulfbSliThEfRD50oxg1hKLRizdhnxIg3hFNYGy8djT7BhysgWq8E OqmeUqTH4jR7Gc2w1ytgJphzbR0VHiptHUXc2qo8lV1Hc4qYjGS9gFg5d7e5S45Zty nIzw/XZrGQ4u1U82eA0vkT7W1yovx58Ai9NqzuD1W50MVSP8eekDvEoD8pGCFfKIU5 4q6Z4D1C5lkkf/TgcG4PULbBn8+an/xom0Ns4FuMqNRnlZuhKs/5U5IcY5FCn9NBm+ dy0cRmeb9B2hg== Date: Fri, 16 Aug 2019 12:41:43 +1000 From: Stephen Rothwell To: David Miller , Networking , Masahiro Yamada Cc: Linux Next Mailing List , Linux Kernel Mailing List , Kees Cook , Andrii Nakryiko , Daniel Borkmann Subject: linux-next: manual merge of the net-next tree with the kbuild tree Message-ID: <20190816124143.2640218a@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 net-next tree got a conflict in: scripts/link-vmlinux.sh between commit: e167191e4a8a ("kbuild: Parameterize kallsyms generation and correct reporting") from the kbuild tree and commits: 341dfcf8d78e ("btf: expose BTF info through sysfs") 7fd785685e22 ("btf: rename /sys/kernel/btf/kernel into /sys/kernel/btf/vmlinux") from the net-next tree. I fixed it up (I think - 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 scripts/link-vmlinux.sh index 2438a9faf3f1,c31193340108..000000000000 --- a/scripts/link-vmlinux.sh