Re: [PATCH RFC 0/2] Begin reorganizing the arch documentation

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Dave Hansen <dave.hansen@intel.com>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arch@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
	Borislav Petkov <bp@alien8.de>
Subject: Re: [PATCH RFC 0/2] Begin reorganizing the arch documentation
Date: Fri, 31 Mar 2023 14:20:16 +1100	[thread overview]
Message-ID: <20230331142016.0a6f8f6b@canb.auug.org.au> (raw)
In-Reply-To: <87a5zuf4w7.fsf@meer.lwn.net>

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

Hi Jon,

On Thu, 30 Mar 2023 12:52:40 -0600 Jonathan Corbet <corbet@lwn.net> wrote:
>
> Jonathan Corbet <corbet@lwn.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

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