From: Qian Cai <cai@lca.pw>
To: Thomas Hellstrom <thellstrom@vmware.com>
Cc: "Steven.Price@arm.com" <Steven.Price@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"peterz@infradead.org" <peterz@infradead.org>,
"ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"david@redhat.com" <david@redhat.com>,
"dave.hansen@linux.intel.com" <dave.hansen@linux.intel.com>,
"James.Morse@arm.com" <James.Morse@arm.com>,
"x86@kernel.org" <x86@kernel.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"Mark.Rutland@arm.com" <Mark.Rutland@arm.com>,
"jglisse@redhat.com" <jglisse@redhat.com>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"mingo@redhat.com" <mingo@redhat.com>,
"luto@kernel.org" <luto@kernel.org>,
"bp@alien8.de" <bp@alien8.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"hpa@zytor.com" <hpa@zytor.com>, "arnd@arndb.de" <arnd@arndb.de>,
"kan.liang@linux.intel.com" <kan.liang@linux.intel.com>,
"will@kernel.org" <will@kernel.org>
Subject: Re: [PATCH v15 00/23] Generic page walk and ptdump
Date: Thu, 5 Dec 2019 09:38:17 -0500 [thread overview]
Message-ID: <A1E27467-83D7-4D36-A029-31649417248E@lca.pw> (raw)
In-Reply-To: <e1f4ec12f9b3f92e481a42698cc1a5645e0e7c0f.camel@vmware.com>
> On Dec 5, 2019, at 9:32 AM, Thomas Hellstrom <thellstrom@vmware.com> wrote:
>
> On Thu, 2019-12-05 at 08:15 -0500, Qian Cai wrote:
>>> On Dec 4, 2019, at 11:32 AM, Steven Price <Steven.Price@arm.com>
>>> wrote:
>>>
>>> I've bisected this problem and it's a merge conflict with:
>>>
>>> ace88f1018b8 ("mm: pagewalk: Take the pagetable lock in
>>> walk_pte_range()")
>>
>> Sigh, how does that commit end up merging in the mainline without
>> going through Andrew’s tree and missed all the linux-next testing? It
>> was merged into the mainline Oct 4th?
>
> It was acked by Andrew to be merged through a drm tree, since it was
> part of a graphics driver functionality. It was preceded by a fairly
> lenghty discussion on linux-mm / linux-kernel.
>
> It was merged into drm-next on 19-11-28, I think that's when it
> normally is seen by linux-next. Merged into mainline 19-11-30. Andrew's
> tree got merged 19-12-05.
Ah, that was the problem. Merged into the mainline after only a day or two
showed up in the linux-next. There isn’t enough time for integration testing.
>
> linux-next signaled a merge conflict from one of the patches in this
> series (not this one) resolved manually with the akpm tree on 19-12-02.
>
> Thomas
>
>
>
>
>
>
WARNING: multiple messages have this Message-ID (diff)
From: Qian Cai <cai@lca.pw>
To: Thomas Hellstrom <thellstrom@vmware.com>
Cc: "Mark.Rutland@arm.com" <Mark.Rutland@arm.com>,
"david@redhat.com" <david@redhat.com>,
"peterz@infradead.org" <peterz@infradead.org>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"dave.hansen@linux.intel.com" <dave.hansen@linux.intel.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"hpa@zytor.com" <hpa@zytor.com>,
"will@kernel.org" <will@kernel.org>,
"kan.liang@linux.intel.com" <kan.liang@linux.intel.com>,
"x86@kernel.org" <x86@kernel.org>,
"Steven.Price@arm.com" <Steven.Price@arm.com>,
"mingo@redhat.com" <mingo@redhat.com>,
"arnd@arndb.de" <arnd@arndb.de>,
"jglisse@redhat.com" <jglisse@redhat.com>,
"bp@alien8.de" <bp@alien8.de>,
"luto@kernel.org" <luto@kernel.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"ard.biesheuvel@linaro.org" <ard.biesheuvel@linaro.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"James.Morse@arm.com" <James.Morse@arm.com>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>
Subject: Re: [PATCH v15 00/23] Generic page walk and ptdump
Date: Thu, 5 Dec 2019 09:38:17 -0500 [thread overview]
Message-ID: <A1E27467-83D7-4D36-A029-31649417248E@lca.pw> (raw)
In-Reply-To: <e1f4ec12f9b3f92e481a42698cc1a5645e0e7c0f.camel@vmware.com>
> On Dec 5, 2019, at 9:32 AM, Thomas Hellstrom <thellstrom@vmware.com> wrote:
>
> On Thu, 2019-12-05 at 08:15 -0500, Qian Cai wrote:
>>> On Dec 4, 2019, at 11:32 AM, Steven Price <Steven.Price@arm.com>
>>> wrote:
>>>
>>> I've bisected this problem and it's a merge conflict with:
>>>
>>> ace88f1018b8 ("mm: pagewalk: Take the pagetable lock in
>>> walk_pte_range()")
>>
>> Sigh, how does that commit end up merging in the mainline without
>> going through Andrew’s tree and missed all the linux-next testing? It
>> was merged into the mainline Oct 4th?
>
> It was acked by Andrew to be merged through a drm tree, since it was
> part of a graphics driver functionality. It was preceded by a fairly
> lenghty discussion on linux-mm / linux-kernel.
>
> It was merged into drm-next on 19-11-28, I think that's when it
> normally is seen by linux-next. Merged into mainline 19-11-30. Andrew's
> tree got merged 19-12-05.
Ah, that was the problem. Merged into the mainline after only a day or two
showed up in the linux-next. There isn’t enough time for integration testing.
>
> linux-next signaled a merge conflict from one of the patches in this
> series (not this one) resolved manually with the akpm tree on 19-12-02.
>
> Thomas
>
>
>
>
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-05 14:38 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 14:09 [PATCH v15 00/23] Generic page walk and ptdump Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 01/23] mm: Add generic p?d_leaf() macros Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 02/23] arc: mm: Add p?d_leaf() definitions Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 03/23] arm: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 04/23] arm64: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 05/23] mips: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 06/23] powerpc: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 07/23] riscv: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 08/23] s390: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 09/23] sparc: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 10/23] x86: " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 11/23] mm: pagewalk: Add p4d_entry() and pgd_entry() Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 12/23] mm: pagewalk: Allow walking without vma Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 13/23] mm: pagewalk: Add test_p?d callbacks Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 14/23] mm: pagewalk: Add 'depth' parameter to pte_hole Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 15/23] x86: mm: Point to struct seq_file from struct pg_state Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 16/23] x86: mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 17/23] x86: mm: Convert ptdump_walk_pgd_level_debugfs() to take an mm_struct Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 18/23] x86: mm: Convert ptdump_walk_pgd_level_core() " Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 19/23] mm: Add generic ptdump Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 20/23] x86: mm: Convert dump_pagetables to use walk_page_range Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 21/23] arm64: mm: Convert mm/dump.c to use walk_page_range() Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 22/23] arm64: mm: Display non-present entries in ptdump Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-01 14:09 ` [PATCH v15 23/23] mm: ptdump: Reduce level numbers by 1 in note_page() Steven Price
2019-11-01 14:09 ` Steven Price
2019-11-04 19:35 ` [PATCH v15 00/23] Generic page walk and ptdump Qian Cai
2019-11-04 19:35 ` Qian Cai
2019-11-06 13:31 ` Qian Cai
2019-11-06 13:31 ` Qian Cai
2019-11-06 15:05 ` Steven Price
2019-11-06 15:05 ` Steven Price
2019-12-03 11:02 ` David Hildenbrand
2019-12-03 11:02 ` David Hildenbrand
2019-12-04 14:54 ` Qian Cai
2019-12-04 14:54 ` Qian Cai
2019-12-04 14:56 ` David Hildenbrand
2019-12-04 14:56 ` David Hildenbrand
2019-12-04 16:32 ` Steven Price
2019-12-04 16:32 ` Steven Price
2019-12-04 17:51 ` Thomas Hellstrom
2019-12-04 17:51 ` Thomas Hellstrom
2019-12-05 13:15 ` Qian Cai
2019-12-05 13:15 ` Qian Cai
2019-12-05 14:32 ` Thomas Hellstrom
2019-12-05 14:32 ` Thomas Hellstrom
2019-12-05 14:32 ` Thomas Hellstrom
2019-12-05 14:38 ` Qian Cai [this message]
2019-12-05 14:38 ` Qian Cai
2019-12-05 14:38 ` Qian Cai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=A1E27467-83D7-4D36-A029-31649417248E@lca.pw \
--to=cai@lca.pw \
--cc=James.Morse@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Steven.Price@arm.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=hpa@zytor.com \
--cc=jglisse@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=thellstrom@vmware.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.