lkml.org 
[lkml]   [2023]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the cgroup tree with the workqueues tree
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

\
 
 \ /
  Last update: 2023-11-23 19:24    [W:3.231 / U:0.384 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site