From: Akira Yokosawa <akiyks@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Akira Yokosawa <akiyks@gmail.com>
Subject: Re: linux-next: Tree for Sep 7
Date: Thu, 7 Sep 2023 12:00:39 +0900 [thread overview]
Message-ID: <e33882a1-f0e7-4bb1-04eb-332cadc8e2f6@gmail.com> (raw)
In-Reply-To: <20230907111112.02c64e37@canb.auug.org.au>
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
next prev parent reply other threads:[~2023-09-07 3:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 1:12 linux-next: Tree for Sep 7 Stephen Rothwell
2023-09-07 3:00 ` Akira Yokosawa [this message]
2023-09-07 22:26 ` Stephen Rothwell
2023-09-08 16:50 ` Palmer Dabbelt
2023-09-08 18:38 ` Palmer Dabbelt
-- strict thread matches above, loose matches on Subject: below --
2022-09-07 12:55 Stephen Rothwell
2021-09-07 5:07 Stephen Rothwell
2018-09-07 5:13 Stephen Rothwell
2017-09-07 6:24 Stephen Rothwell
2016-09-07 7:52 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e33882a1-f0e7-4bb1-04eb-332cadc8e2f6@gmail.com \
--to=akiyks@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).