From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>
Cc: Jonathan Corbet <corbet@lwn•net>,
Costa Shulyupin <costa.shul@redhat•com>,
linux-next@vger•kernel.org
Subject: Re: Upcoming merge conflict docs/powerpc
Date: Fri, 3 Nov 2023 10:59:18 +1100 [thread overview]
Message-ID: <20231103105918.42b71666@canb.auug.org.au> (raw)
In-Reply-To: <20231011144237.0224c928@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 916 bytes --]
Hi all,
On Wed, 11 Oct 2023 14:42:37 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Wed, 11 Oct 2023 07:39:07 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > On Tue, 10 Oct 2023 13:34:32 -0600 Jonathan Corbet <corbet@lwn•net> wrote:
> > >
> > > 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, will do.
>
> So git is quite clever. It recognized a file created in a directory
> that was moved and just moved it there. All I had to do was "git add
> -A ." and commit it. (now to see if I can automate that :-))
This is now a conflict between the kvm-ppc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-11-02 23:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 19:34 Upcoming merge conflict docs/powerpc Jonathan Corbet
2023-10-10 20:39 ` Stephen Rothwell
2023-10-11 3:42 ` Stephen Rothwell
2023-11-02 23:59 ` Stephen Rothwell [this message]
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=20231103105918.42b71666@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=costa.shul@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpe@ellerman$(echo .)id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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