Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan Corbet <corbet@lwn.net>
To:     Catalin Marinas <catalin.marinas@arm.com>
Cc:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Chaitanya S Prakash <chaitanyas.prakash@arm.com>,
        Will Deacon <will@kernel.org>, Anshuman.Khandual@arm.com,
        linux-doc@vger.kernel.org
Subject: Re: [PATCH V2] Documentation/arm64: Add ptdump documentation
In-Reply-To: <ZJP9joL+QZiVM9Tg@arm.com>
References: <20230619083802.76092-1-chaitanyas.prakash@arm.com>
 <168736253462.605140.8006082140297031307.b4-ty@arm.com>
 <87ttv0pzt8.fsf@meer.lwn.net> <ZJP9joL+QZiVM9Tg@arm.com>
Date:   Fri, 23 Jun 2023 13:29:28 -0600
Message-ID: <87352im0yv.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Catalin Marinas <catalin.marinas@arm.com> writes:

> Hi Jon,
>
> On Wed, Jun 21, 2023 at 10:04:03AM -0600, Jonathan Corbet wrote:
>> Catalin Marinas <catalin.marinas@arm.com> 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.

Thanks,

jon