Rebased on latest mm-unstable. As we have a conflict now with a cleanup
from Chrostoph, temporarily revert that one, so we can apply the fix,
and reapply the adjusted cleanup on top. I squashed the fixups
sitting in Andrew's tree for that patch.

The fix should likely go in first via the hotfix route, that's why I'm
moving it to the front.

Tested with my reproducer.

v1 -> v2:
 * Rebased to latest mm-unstable
 * "x86/mm/pat: fix VM_PAT handling in COW mappings"
  -> Fix function parameter indentation
  -> Add Ingos Ack

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fei Li <fei1.li@intel.com>
Cc: Nathan Chancellor <nathan@kernel.org>

Christoph Hellwig (1):
  mm: move follow_phys to arch/x86/mm/pat/memtype.c

David Hildenbrand (2):
  [mm-unstable] Revert "mm: move follow_phys to
    arch/x86/mm/pat/memtype.c"
  x86/mm/pat: fix VM_PAT handling in COW mappings

 arch/x86/mm/pat/memtype.c | 56 +++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 14 deletions(-)

-- 
2.44.0

On Wed,  3 Apr 2024 23:21:28 +0200 David Hildenbrand <david@redhat.com> wrote:

> Rebased on latest mm-unstable. As we have a conflict now with a cleanup
> from Chrostoph, temporarily revert that one, so we can apply the fix,
> and reapply the adjusted cleanup on top. I squashed the fixups
> sitting in Andrew's tree for that patch.
> 
> The fix should likely go in first via the hotfix route, that's why I'm
> moving it to the front.

Well that was easy, thanks ;)  Perhaps hch can double-check [3/3] here.

On Wed, Apr 03, 2024 at 03:09:58PM -0700, Andrew Morton wrote:
> On Wed,  3 Apr 2024 23:21:28 +0200 David Hildenbrand <david@redhat.com> wrote:
> 
> > Rebased on latest mm-unstable. As we have a conflict now with a cleanup
> > from Chrostoph, temporarily revert that one, so we can apply the fix,
> > and reapply the adjusted cleanup on top. I squashed the fixups
> > sitting in Andrew's tree for that patch.
> > 
> > The fix should likely go in first via the hotfix route, that's why I'm
> > moving it to the front.
> 
> Well that was easy, thanks ;)  Perhaps hch can double-check [3/3] here.

Still looks good.