Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <mhng-723be372-8df5-44b9-9e4f-def2eb929f8e@palmerdabbelt-glaptop>
In-Reply-To: <mhng-723be372-8df5-44b9-9e4f-def2eb929f8e@palmerdabbelt-glaptop>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu, 6 May 2021 09:26:06 -0700
Message-ID: <CAHk-=wjXY78yyGE4VEqiUix9NU0tZTBDO=DqEeSyJgBwVZ+Q=g@mail.gmail.com>
Subject: Re: [GIT PULL] RISC-V Patches for the 5.13 Merge Window, Part 1
To:     Palmer Dabbelt <palmer@dabbelt.com>
Cc:     linux-riscv@lists.infradead.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, May 5, 2021 at 10:51 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> Here are my conflict resolutions, if that helps:

I think you've unnecessarily done that "+1" twice:

>  +      /* + 1 as memblock_alloc() might increase memblock.reserved.cnt */
>  +      num_resources = memblock.memory.cnt + memblock.reserved.cnt + 1;
>  +      res_idx = num_resources - 1;
>
> -       mem_res_sz = num_resources * sizeof(*mem_res);
> +       /* + 1 as memblock_alloc() might increase memblock.reserved.cnt */
> +       mem_res_sz = (memblock.memory.cnt + memblock.reserved.cnt + 1) * sizeof(*mem_res);
>         mem_res = memblock_alloc(mem_res_sz, SMP_CACHE_BYTES);
>         if (!mem_res)
>                 panic("%s: Failed to allocate %zu bytes\n", __func__, mem_res_sz);

and I kept that as just the first one.

               Linus