From patchwork Mon Feb 26 02:53:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 206180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1838003dyb; Sun, 25 Feb 2024 18:54:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVPJP4RZ21+W7TivqzZwv4eNBAM5M7n4h4Z/CL+aqi3Dvr1zyQB26Mjd8S0vqpxRMw3zx4PZSObawiYqYzjJQUrglrZjw== X-Google-Smtp-Source: AGHT+IFIbceIGhUaEHsAAUgKFmt1sa8T3mZqhvdNPA8HpBwBA/fcvD2Xp/8mjcCLrqNwwVe65ZiG X-Received: by 2002:a05:6214:c6d:b0:68f:6df2:3b60 with SMTP id t13-20020a0562140c6d00b0068f6df23b60mr7128998qvj.20.1708916059991; Sun, 25 Feb 2024 18:54:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708916059; cv=pass; d=google.com; s=arc-20160816; b=Tpxf+QrK6OmzwHnLz8c8rdr7Qos0afaVmvE7QVQzbLUy8CJYrPMa21CONSianNmzrN rWDsuANESF2KPaXOMd/0ylRBxsVd3hJxw+izn1tmcfWlMCO2JAh86myEIFnJq/FFyqQP OFAuOL4nGRPIY9pPM0XIbp/ydxUjXd7OLPtPHEwDwIIxytjcw2/f3jMfSvx2iy5+0+/9 G7D1PC45YFuma68nvyD40o39+N8dVhcHzGuqPfxQHB3y6UNOQFySyk/T3/jn/xdivgfT 85mwM+o/TM97Ay6sMdck4uiC2mNt6cPc26BHFL4qiJJPf2cdXHdFW+ZP8093u1Qg1tfq AixA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=tyx+IVS66RM0qtOBOj8rXQvkKnD2WQxqXMUHmV+Tkcw=; fh=mrzQ9iwzZtmxHW2UGG5U4NJotUwl0vDMjwzdfYYNlcA=; b=CTnkiY0F6OIRYivL5MsAENq5uHFVuXHl7hN7BomMWimcITIM/WrWC7WWoWHITkjn29 M0ncjDNeucEYfnHBr94z1ggqbZXDLNeZ4DZcoWpdsfEgobIchv/wRuxnws4RMtIkDuGL MPuLWsYbAtjpw4XsdyVhOvTdVEFMpy6X3M++6GuBn8Z8bTZ2kEzQ7oothve9LD+bLG6q pSPCFBVvAPm8lNyRqu+ia71GUhAzAqR9Wu1PwWAvxdbydwaqo75aZZIg7nCd6z+G6uCJ RZ92i46Hxj3ZESpi4iS9ufrYFGmuab292UlhzAzxMldKqECDq4SDLDI0sLX2cBN1LrS1 q+Yg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gnV1TqM1; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80428-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80428-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gv9-20020a056214262900b0068ffe94f96csi2034944qvb.603.2024.02.25.18.54.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 18:54:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80428-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=gnV1TqM1; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80428-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80428-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C425E1C2168B for ; Mon, 26 Feb 2024 02:54:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CEBEA14A98; Mon, 26 Feb 2024 02:54:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="gnV1TqM1" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D3BB4C84; Mon, 26 Feb 2024 02:54:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708916046; cv=none; b=JpdX+o5JAs+71P81XfXUnVhqXgvJPJPK8QmOqXRPIanDV6vcRVJ6vsF7Fzehr5iBBJIwb5U9s1u5aAyiLES5NBfVra6I0eDR06YK8KoY+srQvUuT+dPZLxqOwTlXZryzrTA9aPoUDcm2aoakjCcp8pQ0PH1H4PoDy7AGazNepyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708916046; c=relaxed/simple; bh=ziDPUZ9sKbOLhrgxQX1/6HtN48N+pARDVpqIFpsLSTs=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=tBrpoRrdRwXS4dlW83pdd7OMwMjdwDCMuIZcEtNHfz0Cym/7U1/Z2VPlIEwv9Ttl1gtbIX7/AWlr1U0payk0Ukm+ZM3hoeeG81R1IGrnlYJacFu3x/2TkEgFOE3ZOh50nTKrVnWQjCT+j/Rt+W/4xCAnq6zlVxU+tpOY/xkiSNc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=gnV1TqM1; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708916040; bh=tyx+IVS66RM0qtOBOj8rXQvkKnD2WQxqXMUHmV+Tkcw=; h=Date:From:To:Cc:Subject:From; b=gnV1TqM1rQwD1FWJt8+iyOz33OJ07fe9Hfz7FxchuYa4pkQAzS816i3E9Hg/89wVI A7A0KeDKCXiI6rY1PLflRRRtzIUbCGOhH285XdCcv/qDKZb2wfkTrTovUpDO01R5wW p/OzBps8zqbNSOJCOCmTXIwiEILvIgYjNj90G+oe0ov11n0LdxWyAaV26jYi+CxpOo fo86MiM9pAOwJ2U6VL2IyiDpSRemzyWKkOeJKruHv5qGC1Qweytg7Dn4izFIMAyl/9 Fw8f4PQMdGhtAJn+f+QhlVALQz4xHudObDzJfGw/1Tl6dPLIsCsIHEu402Vi5ZZc71 9jKZf6gPSlYLQ== 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 4TjlYz3kqZz4wc8; Mon, 26 Feb 2024 13:53:59 +1100 (AEDT) Date: Mon, 26 Feb 2024 13:53:57 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Tejun Heo Cc: Anna-Maria Behnsen , Leonardo Bras , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the workqueues tree Message-ID: <20240226135357.29ebadf0@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791928366659507481 X-GMAIL-MSGID: 1791928366659507481 Hi all, Today's linux-next merge of the tip tree got a conflict in: kernel/workqueue.c between commit: aae17ebb53cd ("workqueue: Avoid using isolated cpus' timers on queue_delayed_work") from the workqueues tree and commit: c0e8c5b59949 ("workqueue: Use global variant for add_timer()") from the tip 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 65a27be81452,78eaea2e5d72..000000000000 --- a/kernel/workqueue.c