lkml.org 
[lkml]   [2022]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [GIT PULL] Bitmap patches for v6.0-rc1
    Date
    Hi Linus,

    This pull request has a conflict with the random tree in some powerpc
    code.

    The random tree removed CONFIG_ARCH_RANDOM and changed the arguments and
    names of the arch_get_random_xxx() calls, meanwhile the commit in the
    bitmap tree moved our arch_get_random_seed_long() into a C file.

    Yury Norov <yury.norov@gmail.com> writes:
    > The following changes since commit a111daf0c53ae91e71fd2bfe7497862d14132e3e:
    >
    > Linux 5.19-rc3 (2022-06-19 15:06:47 -0500)
    >
    > are available in the Git repository at:
    >
    > https://github.com/norov/linux.git/ tags/bitmap-6.0-rc1
    >
    > for you to fetch changes up to 36d4b36b69590fed99356a4426c940a253a93800:
    >
    > lib/nodemask: inline next_node_in() and node_random() (2022-08-01 08:13:21 -0700)
    ...
    > arch/powerpc/include/asm/archrandom.h | 9 +-
    > arch/powerpc/kernel/setup-common.c | 12 +

    There is a textual conflict in archrandom.h. But there's also a fixup
    needed in setup-common.c.

    Mark spotted it in linux-next but the resolution is not quite right, I
    describe the correct result here:

    https://lore.kernel.org/all/87h72q9bgg.fsf@mpe.ellerman.id.au/T/#m068009a89d2412dd4ca14ac598a7d6b8288d4568

    Or the end state is attached below.

    cheers


    ==== arch/powerpc/kernel/setup-common.c ====
    ...

    size_t __must_check arch_get_random_seed_longs(unsigned long *v, size_t max_longs)
    {
    if (max_longs && ppc_md.get_random_seed && ppc_md.get_random_seed(v))
    return 1;

    return 0;
    }
    EXPORT_SYMBOL(arch_get_random_seed_longs);

    ...

    ==== arch/powerpc/include/asm/archrandom.h ====
    /* SPDX-License-Identifier: GPL-2.0 */
    #ifndef _ASM_POWERPC_ARCHRANDOM_H
    #define _ASM_POWERPC_ARCHRANDOM_H

    static inline size_t __must_check arch_get_random_longs(unsigned long *v, size_t max_longs)
    {
    return 0;
    }

    size_t __must_check arch_get_random_seed_longs(unsigned long *v, size_t max_longs);

    #ifdef CONFIG_PPC_POWERNV
    int pnv_get_random_long(unsigned long *v);
    #endif

    #endif /* _ASM_POWERPC_ARCHRANDOM_H */

    \
     
     \ /
      Last update: 2022-08-06 08:11    [W:2.947 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site