[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20230331142016.0a6f8f6b@canb.auug.org.au>
Date: Fri, 31 Mar 2023 14:20:16 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>
Cc: Dave Hansen <dave.hansen@...el.com>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
Dave Hansen <dave.hansen@...ux.intel.com>, x86@...nel.org,
Peter Zijlstra <peterz@...radead.org>,
Borislav Petkov <bp@...en8.de>
Subject: Re: [PATCH RFC 0/2] Begin reorganizing the arch documentation
Hi Jon,
On Thu, 30 Mar 2023 12:52:40 -0600 Jonathan Corbet <corbet@....net> wrote:
>
> Jonathan Corbet <corbet@....net> writes:
>
> > Now that I look...the only thing in linux-next currently that conflicts
> > is the shadow-stack series; if that continues, it might not be necessary
> > to do anything special.
>
> There's an FPU patch now too. Git seems to handle the conflicts *almost*
> seamlessly, though. So, FYI, I think I'll go ahead and drop this change
> into docs-next, which will probably get us a cheery note from Stephen in
> the near future.
>
> (Stephen: the change is simply:
>
> mv Documentation/x86 Documentation/arch/x86
>
> the only fix I had to do in my test merge was to add the new
> shadow-stack document in the new directory).
Thanks for the heads up. Git moved the file and I just had to "git add"
it in the new place.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists