From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Costa Shulyupin <costa.shul@redhat.com>,
linux-next@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>
Subject: Upcoming merge conflict docs/powerpc
Date: Tue, 10 Oct 2023 13:34:32 -0600 [thread overview]
Message-ID: <87o7h65l13.fsf@meer.lwn.net> (raw)
Hi, Stephen,
Just a note to say that the move of the powerpc docs under
Documentation/arch showing up in in docs-next shortly adds a conflict
with the powerpc tree, which adds a new file (kvm-nested.rst) to the old
directory. The fix is just to add it in the new location.
Thanks,
jon
next reply other threads:[~2023-10-10 19:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 19:34 Jonathan Corbet [this message]
2023-10-10 20:39 ` Upcoming merge conflict docs/powerpc Stephen Rothwell
2023-10-11 3:42 ` Stephen Rothwell
2023-11-02 23:59 ` 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=87o7h65l13.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=costa.shul@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.