From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the cgroup tree
Date: Thu, 19 Jan 2023 15:58:09 +1100 [thread overview]
Message-ID: <20230119155809.33625b3a@canb.auug.org.au> (raw)
In-Reply-To: <20230106125915.60c8b547@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Hi all,
On Fri, 6 Jan 2023 12:59:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> Documentation/admin-guide/cgroup-v1/memory.rst
>
> between commit:
>
> da3ad2e14f63 ("docs: cgroup-v1: add internal cross-references")
>
> from the cgroup tree and commits:
>
> 6cd7ad27c60f ("mm: memcontrol: deprecate charge moving")
> 9bf9f4ba8bd5 ("mm-memcontrol-deprecate-charge-moving-fix")
These have been combined into commit
da34a8484d16 ("mm: memcontrol: deprecate charge moving")
in the mm-stable tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-01-19 5:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 1:59 linux-next: manual merge of the mm tree with the cgroup tree Stephen Rothwell
2023-01-06 4:04 ` Bagas Sanjaya
2023-01-19 4:58 ` Stephen Rothwell [this message]
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=20230119155809.33625b3a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=bagasdotme@gmail.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tj@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox