Linux MM tree latest commits
 help / color / mirror / Atom feed
From: "David Hildenbrand (Arm)" <david@kernel.org>
To: "akpm@linux-foundation.org" <akpm@linux-foundation.org>,
	Vlastimil Babka <vbabka@suse.cz>,
	Johannes Weiner <hannes@cmpxchg.org>
Cc: "mm-commits@vger.kernel.org" <mm-commits@vger.kernel.org>
Subject: mm-next: manual merge of the akpm/mm-unstable branch
Date: Fri, 20 Nov 2026 12:42:50 +0100	[thread overview]
Message-ID: <4e5b70ca-63b5-4e82-a327-58398c73ca05@kernel.org> (raw)

Hi,

today's mm-next merge of the akpm/mm-unstable branch tree got a conflict in:

  include/linux/alloc_tag.h

between the commit:

  cd890190497b alloc_tag: handle a NULL tag in alloc_tag_set_inaccurate()

from the page_alloc/page_alloc/for-next branch and the commit:

  5f15df08db91 alloc_tag: introduce IOCTLs to toggle allocation tracepoints

from the akpm/mm-unstable branch.

I resolved the conflicts manually:

    # Conflict resolution:
    #
    # diff --git a/include/linux/alloc_tag.h b/include/linux/alloc_tag.h
    # index ad968d79eb3a..d3317e197787 100644
    # --- a/include/linux/alloc_tag.h
    # +++ b/include/linux/alloc_tag.h
    # @@ -138,7 +138,8 @@ static inline bool mem_alloc_profiling_enabled(void)
    #
    #  static inline void alloc_tag_set_inaccurate(struct alloc_tag *tag)
    #  {
    # -     atomic_or(CODETAG_FLAG_INACCURATE, &tag->ct.flags);
    # +     if (tag)
    # +             atomic_or(CODETAG_FLAG_INACCURATE, &tag->ct.flags);
    #  }
    #
    #  static inline bool alloc_tag_is_inaccurate(struct alloc_tag *tag)
    # @@ -283,20 +284,6 @@ static inline void alloc_tag_sub(union codetag_ref *ref, size_t bytes, const voi
    #       ref->ct = NULL;
    #  }
    #
    # -<<<<<<< HEAD
    # -static inline void alloc_tag_set_inaccurate(struct alloc_tag *tag)
    # -{
    # -     if (tag)
    # -             tag->ct.flags |= CODETAG_FLAG_INACCURATE;
    # -}
    # -
    # -static inline bool alloc_tag_is_inaccurate(struct alloc_tag *tag)
    # -{
    # -     return !!(tag->ct.flags & CODETAG_FLAG_INACCURATE);
    # -}
    # -
    # -=======
    # ->>>>>>> akpm/mm-unstable
    #  #define alloc_tag_record(p)  ((p) = current->alloc_tag)
    #
    #  #else /* CONFIG_MEM_ALLOC_PROFILING */


-- 
Cheers,

David

             reply	other threads:[~2026-11-20 11:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 11:42 David Hildenbrand (Arm) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-10-14  9:16 mm-next: manual merge of the akpm/mm-unstable branch David Hildenbrand (Arm)
2026-10-02  6:22 David Hildenbrand (Arm)
2026-10-02  8:15 ` Lorenzo Stoakes (ARM)
2026-10-02 12:16   ` David Hildenbrand (Arm)
2026-10-02 12:24     ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton
2026-09-22 19:17 David Hildenbrand (Arm)
2026-09-22 19:48 ` Andrew Morton

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=4e5b70ca-63b5-4e82-a327-58398c73ca05@kernel.org \
    --to=david@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=mm-commits@vger.kernel.org \
    --cc=vbabka@suse.cz \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox