From patchwork Thu Feb  3 03:52:29 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12733823
X-Patchwork-Delegate: bpf@iogearbox.net
Return-Path: <netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 4C008C433FE
	for <netdev@archiver.kernel.org>; Thu,  3 Feb 2022 03:52:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1349239AbiBCDwg (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Wed, 2 Feb 2022 22:52:36 -0500
Received: from gandalf.ozlabs.org ([150.107.74.76]:60491 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S238270AbiBCDwf (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 2 Feb 2022 22:52:35 -0500
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 4Jq4W24fQDz4xcl;
        Thu,  3 Feb 2022 14:52:30 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1643860352;
        bh=/Pfql7CY6zwkVLAHshlAFb3ts0aQsbL6x17I166/5KI=;
        h=Date:From:To:Cc:Subject:From;
        b=syW/ju1lzaswpGav7Z30yj30jeTyhgODBXeyOd4SIZRlCJiF8rgJ8fvUchci6dYMV
         Opbi2pZpD3QULnz172fsHcGBUGp7Phea45IJwzxoe4zUL2JuQy36TTUuzwUIMisAkP
         uKGMleQCRpIqtJuAJW9LFOVcPVqIoLLxrwujMXBR+igD9ZiBMIn1GN747ebCPUaEUa
         jVKHUvIXQLH9WLugcvFAiRy1akoesXBDuZ7E+En2qchsTt4Jxbt23W4UUyD7Tl+0Jy
         RflXRPUhD3q5qkevJ9x68hGYN/okt6108or/UDLu4PdNGZJbO0DGLv8NRaeRlzzDfH
         4e4r3CYCeZbqQ==
Date: Thu, 3 Feb 2022 14:52:29 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc: Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nathan Chancellor <nathan@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the akpm-current tree with the bpf-next
 tree
Message-ID: <20220203145229.13dd25e9@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/Kconfig.debug

between commit:

  42d9b379e3e1 ("lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+")

from the bpf-next tree and commit:

  e11ef20106b7 ("Kconfig.debug: make DEBUG_INFO selectable from a choice")

from the akpm-current 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 lib/Kconfig.debug
index f15dd96028b5,efc1a1908e04..000000000000
--- a/lib/Kconfig.debug