From patchwork Thu Nov 23 01:26:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 168665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp156202vqx; Wed, 22 Nov 2023 17:27:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfR04a2c2Y/1O6igaDXu9HmyndZJLUO7ogqGTYDSCisvvx2qZA1qJsY+UwdWNQsBtodT+z X-Received: by 2002:a17:90b:384c:b0:27d:7887:ddc5 with SMTP id nl12-20020a17090b384c00b0027d7887ddc5mr5024742pjb.32.1700702878470; Wed, 22 Nov 2023 17:27:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700702878; cv=none; d=google.com; s=arc-20160816; b=QhuMsi95+zceWfPl3hjzYDaMD73RcTYz9FKbBaWheBGN6gYTInwQWHg6t0E1/Cnmbr XS6xD4u1aTu55889aXBZWmEqcTZB7TjVI/8jWdHpQC9L9BzbNM2NrRkAPO5SpTaW554m 7Y9C1k/iDyL/job42fdK79lGtDZXLvdiFfz8/RGNt5QxUoOvVr2Q9+fMs+TVSAM/5VZE 8Z+19EZ+xKe+DHGNjZs6cl2f4IIh8GRbpDyo6o6CRi9gsUOwa+sHV90SBKjFX5e+2aaZ GCn4xLxdqckYhGkAn9H7J/qflTC121hBALfudzSwKT0BLFYCI+hPE7hv43CkqriVV4B5 sZMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=IvHOIfA9qWAsQrGBj3amwIrNeIf7IUTRccGXal+xPcU=; fh=arBiSJYsiSShpyn8xnjsM4A4kKw2jEkK6nudllR19vQ=; b=ZWGM1vTLMjbXaacwCHpDUSTrdduzml07I4eXQcD07L6HnqAM9T/6GX2J2Es1LTxgiT W8jlIDxJ3AxBGTfb1L9INb0d9gUdlUz87SPHeKd3Y6R2cgximIeJ7Cyf1RFtzVABAYFb lHKWhELrszCPb4z3AbS3ZBkmGvUvtoPtRtEATqCkt50WKVqTiHQgn85vD687Qt4JRJif lUZpPzzp9JWYHRdbnNuQteg0zfc7jRex/Q7ESp/eEZTIfHke8rUxmAPmqCrZm0aLPr5F R2auY+hiYT50WIBBELj0ONmyjUz6da0BDMoI4rl/9gEtoDxJHlSDsOtJJKjNhSvYMYEh oJhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XQ4f6cQV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ci4-20020a17090afc8400b0028516cc3884si753862pjb.115.2023.11.22.17.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 17:27:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XQ4f6cQV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 01AC9801E957; Wed, 22 Nov 2023 17:26:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229789AbjKWB0q (ORCPT + 99 others); Wed, 22 Nov 2023 20:26:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjKWB0q (ORCPT ); Wed, 22 Nov 2023 20:26:46 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F040692; Wed, 22 Nov 2023 17:26:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700702805; bh=IvHOIfA9qWAsQrGBj3amwIrNeIf7IUTRccGXal+xPcU=; h=Date:From:To:Cc:Subject:From; b=XQ4f6cQVUu8tSG249lzsIhe6vh0FaOqRbogdowx0gLFZv6Pym6CsV4mV/HbJqXP7I QepilpT2t0ROYEcsAGeoQ5gOfx4AbMaIadYva821Ml5i3NvFPlZUoxE2Z7SeDLzgL9 l2FWnDpxwiTYLOQwq8ejPMyWDOSoyWWb/GfQ/cSkU2j68CDjJNaj1J+7DgpE8MGK30 mgtojoYtrNJBNWddpY75pbujszz4W4UmcuODb8g+rT4dexZyKI9mmmEcB48MsMMbPd tH+IG0pf9AAmJsh3TarBkQWmeJDpYSEh8j9FdYzBoUHDrQ6S6a/aXzHgS773ZHltgT dbeUUAjb5CYQA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SbL795Pwbz4x1R; Thu, 23 Nov 2023 12:26:45 +1100 (AEDT) Date: Thu, 23 Nov 2023 12:26:44 +1100 From: Stephen Rothwell To: Tejun Heo Cc: Linux Kernel Mailing List , Linux Next Mailing List , Waiman Long Subject: linux-next: manual merge of the cgroup tree with the workqueues tree Message-ID: <20231123122644.34518972@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 17:26:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783316221426570897 X-GMAIL-MSGID: 1783316221426570897 Hi all, Today's linux-next merge of the cgroup tree got a conflict in: kernel/workqueue.c between commit: 4a6c5607d450 ("workqueue: Make sure that wq_unbound_cpumask is never empty") from the workqueues tree and commit: fe28f631fa94 ("workqueue: Add workqueue_unbound_exclude_cpumask() to exclude CPUs from wq_unbound_cpumask") from the cgroup tree. 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. diff --cc kernel/workqueue.c index 2989b57e154a,2fc585d3d6ca..000000000000 --- a/kernel/workqueue.c