linux-kernel - Re: linux-next: Tree for Sep 7

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <e33882a1-f0e7-4bb1-04eb-332cadc8e2f6@gmail.com>
Date:   Thu, 7 Sep 2023 12:00:39 +0900
From:   Akira Yokosawa <akiyks@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     linux-kernel@...r.kernel.org, linux-next@...r.kernel.org,
        Akira Yokosawa <akiyks@...il.com>
Subject: Re: linux-next: Tree for Sep 7

On Thu, 7 Sep 2023 11:12:01 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Please do *not* include material destined for v6.7 in your linux-next
> included branches until *after* v6.6-rc1 has been released.  Also,
> do *not* rebase your linu-next included branches onto v6.5.
> 
> Changes since 20230906:
> 
> Non-merge commits (relative to Linus' tree): 1537
>  1783 files changed, 276430 insertions(+), 25266 deletions(-)
>
> ----------------------------------------------------------------------------
[...]

Stephen, I have noticed quite a few redundant documentation files
reappeared in today's linux-next.  I didn't check linux-next earlier
this week.

Redundant dirs:

    Documentation/loongarch/
    Documentation/mips/
    Documentation/s390/
    Documentation/translations/zh_CN/loongarch/
    Documentation/translations/zh_CN/mips/

Bisection blames merge commit be2bf9967daa ("Merge branch 'for-next'
of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git").

I suspect the conflict in Documentation/bpf/linux-notes.rst caused
those files once moved to arch/ in upstream to be picked up again
during "git merge" ...

Best Regards,

    Akira