Re: [PATCH V2] Documentation/arm64: Add ptdump documentation

[Catalin Marinas]

On Fri, Jun 23, 2023 at 01:29:28PM -0600, Jonathan Corbet wrote:
> Catalin Marinas <catalin.marinas@xxxxxxx> writes:
> > On Wed, Jun 21, 2023 at 10:04:03AM -0600, Jonathan Corbet wrote:
> >> Catalin Marinas <catalin.marinas@xxxxxxx> writes:
> >> > On Mon, 19 Jun 2023 14:08:02 +0530, Chaitanya S Prakash wrote:
> >> >> ptdump is a debugfs interface used to dump the kernel page tables. It
> >> >> provides a comprehensive overview about the kernel's virtual memory
> >> >> layout, page table entries and associated page attributes. A document
> >> >> detailing how to enable ptdump in the kernel and analyse its output has
> >> >> been added.
> >> >> 
> >> >> Changes in V2:
> >> >> 
> >> >> [...]
> >> >
> >> > Applied to arm64 (for-next/doc), thanks! I did some tidying up, minor
> >> > fixes.
> >> >
> >> > [1/1] Documentation/arm64: Add ptdump documentation
> >> >       https://git.kernel.org/arm64/c/a0238ada560f
> >> 
> >> Note that this will generate a conflict with the arm64 documentation
> >> move, which I dropped into -next today.  It's easily enough fixed up
> >> top, but if you'd rather carry the directory move in your tree just say
> >> the word.
> >
> > Ah, I forgot about this move. Are you ok to pull the arm64 for-next/doc
> > into your tree to avoid the conflict? There's also the arm64
> > for-next/acpi-doc branch that you could also pull.
> 
> That sounds a bit like the sort of merge-to-avoid-a-conflict that Linus
> gets annoyed about.  There's nothing too serious here, I can just warn
> him in my pull request.

Yeah, this should work as well.

Thanks.

-- 
Catalin