From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Waiman Long <longman@redhat.com>
Subject: Re: linux-next: manual merge of the cgroup tree with the workqueues tree
Date: Thu, 23 Nov 2023 08:23:25 -1000 [thread overview]
Message-ID: <ZV-YnVfdeU9NJWJw@slm.duckdns.org> (raw)
In-Reply-To: <20231123122644.34518972@canb.auug.org.au>
Hello, Stephen.
On Thu, Nov 23, 2023 at 12:26:44PM +1100, Stephen Rothwell wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Sorry about that. I resolved that in cgroup/for-6.8 yesterday but forgot
push it out. It's the same resolution and published through cgroup/for-next
now.
Thanks.
--
tejun
prev parent reply other threads:[~2023-11-23 18:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-23 1:26 linux-next: manual merge of the cgroup tree with the workqueues tree Stephen Rothwell
2023-11-23 18:23 ` Tejun Heo [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=ZV-YnVfdeU9NJWJw@slm.duckdns.org \
--to=tj@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=longman@redhat.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).