linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Upcoming merge conflict docs/powerpc
@ 2023-10-10 19:34 Jonathan Corbet
  2023-10-10 20:39 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Corbet @ 2023-10-10 19:34 UTC (permalink / raw)
  To: Stephen Rothwell, Costa Shulyupin, linux-next, Michael Ellerman

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: Upcoming merge conflict docs/powerpc
  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
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-10-10 20:39 UTC (permalink / raw)
  To: Jonathan Corbet; +Cc: Costa Shulyupin, linux-next, Michael Ellerman

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

Hi Jon,

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: Upcoming merge conflict docs/powerpc
  2023-10-10 20:39 ` Stephen Rothwell
@ 2023-10-11  3:42   ` Stephen Rothwell
  2023-11-02 23:59     ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-10-11  3:42 UTC (permalink / raw)
  To: Jonathan Corbet; +Cc: Costa Shulyupin, linux-next, Michael Ellerman

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

Hi all,

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 :-))

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: Upcoming merge conflict docs/powerpc
  2023-10-11  3:42   ` Stephen Rothwell
@ 2023-11-02 23:59     ` Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2023-11-02 23:59 UTC (permalink / raw)
  To: Michael Ellerman; +Cc: Jonathan Corbet, Costa Shulyupin, linux-next

[-- 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 --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-02 23:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).