From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 A903EC83F37 for ; Thu, 31 Aug 2023 17:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232169AbjHaRua (ORCPT ); Thu, 31 Aug 2023 13:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236706AbjHaRua (ORCPT ); Thu, 31 Aug 2023 13:50:30 -0400 Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EA8DE5F for ; Thu, 31 Aug 2023 10:50:27 -0700 (PDT) Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-649a653479bso5991266d6.0 for ; Thu, 31 Aug 2023 10:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693504226; x=1694109026; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=xAaq4M/VDghokHx9XglV0KLWVzagv+CSyJGYQuIXX6U=; b=ZO/YeP8GsmZE8ghici5HE/xEqA3BQIHTF9BGg9LYwke4bYmCr0PTqacWmtFlU1dlWu jCK6FIhlh3ZN8JZ2j+a8PEH46m+8A5T8DZTpPQQw2H5BQCg38Ncnge46T7cyaDVk5ljJ 0CyzVzJ8mLdrOGmtHCgQ7lhF4p6u1pLYzGFYlnM9jPf6e6RcwsKq/CqPN0NHi6YIk4cM PrTkWRChTtpxZo+NPZaAk/l7EJ2R/zjmcHhR1NYxmZuxGUedKfFF65cMZ2K23+MvvC2D +4nBqjEDatz9IlZZToNQR3LgvYmHQVwCHJoudoUoNO6P6srgYrbi/VXyK2Ol2e9ck+Az b/rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693504226; x=1694109026; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xAaq4M/VDghokHx9XglV0KLWVzagv+CSyJGYQuIXX6U=; b=dtTw0dhaliq4VeZqBIOcQqvJbeK2u1V71u823z4J50BFAcqQ+vi2sDpp5voxD1aBvo z2gG8mzLlUsZeP9QZM9kVkKcPrbmZqZGK40LibLWdYE/mB8YOS5JMHwr6VilbBRMtyMc nblCMn6raz1v8m6a9ejxnTcuM7nqYws0OflpMsgqtkEYhCIL268DARjKPQbVnSYsiGhH /BeToWbyi9JRLiajFgwPZ7EutmbwZu4BFXkPeBpzDLSz/6Efii95sGDcFFGqM0QFuT8F QVcD2uYQQ3339J4ZeNvfHcqUCj182aI+wATgv06o2mmgzA1acmT5LDOpoGBhYnE2ANaX dQrg== X-Gm-Message-State: AOJu0YyKeztu/UIgVTMXKKqD7sTS7D5Ni8kYU0PwmvI/BCXg184o/EZm Tmvxt3iP7NdT2QlC1MXthFMseoV/OxsqPl3bqVfpZA== X-Google-Smtp-Source: AGHT+IERDqgHTy1OPBKV+u4pwMh3RA7LYDtELJWSEiaaVVYU4ZFq618KhLHw5ib8SvC8rKqISfLxCv1Xhc3isE/qA4Q= X-Received: by 2002:a05:6214:4119:b0:641:8d17:96fd with SMTP id kc25-20020a056214411900b006418d1796fdmr3965481qvb.41.1693504226415; Thu, 31 Aug 2023 10:50:26 -0700 (PDT) MIME-Version: 1.0 References: <20230831092914.4f91cd33@canb.auug.org.au> In-Reply-To: <20230831092914.4f91cd33@canb.auug.org.au> From: Nick Desaulniers Date: Thu, 31 Aug 2023 10:50:15 -0700 Message-ID: Subject: Re: linux-next: manual merge of the risc-v tree with Linus' tree To: Palmer Dabbelt , Stephen Rothwell Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Aug 30, 2023 at 4:29=E2=80=AFPM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the risc-v tree got a conflict in: > > arch/riscv/mm/kasan_init.c > > between commit: > > d2402048bc8a ("riscv: mm: fix 2 instances of -Wmissing-variable-declara= tions") > > from Linus' tree and commit: > > 56e1803d9de0 ("riscv: Mark KASAN tmp* page tables variables as static") > > from the risc-v 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. Fix LGTM; I guess Palmer you may need to rebase that branch on mainline? > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/riscv/mm/kasan_init.c > index a01bc15dce24,435e94a5b1bb..000000000000 > --- a/arch/riscv/mm/kasan_init.c > +++ b/arch/riscv/mm/kasan_init.c > @@@ -22,9 -22,10 +22,9 @@@ > * region is not and then we have to go down to the PUD level. > */ > > - pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > - p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss; > - pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss; > -extern pgd_t early_pg_dir[PTRS_PER_PGD]; > + static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > + static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss; > + static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss; > > static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, = unsigned long end) > { --=20 Thanks, ~Nick Desaulniers