From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DD8212192E9 for ; Mon, 17 Mar 2025 05:32:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189558; cv=none; b=I6GAByPU2X/bxk2CUqd8DGHCHiMuMR6Ihbxj0cOsAgAtYCkUNf2mYWI/y51EQPgkqVIacVijT9JZwho44HTS7DRasRx+jzeWYYK/GWmbr13RTbZv5XVJd59wAiNuM3k1auhVqKJSRjh+6fZUdOaW772UroByf1cKyYCmuRQ4rdg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742189558; c=relaxed/simple; bh=Wp3mhLRGmbf3y40q7MLUVFxDp0ojIdKrsFZVX1iCNyk=; h=Date:To:From:Subject:Message-Id; b=iF7zbgpR/HxhbbwpcQXqvHkG4cNJNKNM3FxgTX663eSdwgwB+Ialv4QjZxGAMgvr07ZcNNAkT5HlnqIRV1U2dz8zc54XO5PxQ57Ki87cDTdeLc1T0C9e8LLGx9NhDWjBYWT30E6Ee1CBWk+v1jJXZkDH1FQum3AOwMmsz5u08TE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=hwN8Fb2u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="hwN8Fb2u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABAACC4CEEC; Mon, 17 Mar 2025 05:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1742189558; bh=Wp3mhLRGmbf3y40q7MLUVFxDp0ojIdKrsFZVX1iCNyk=; h=Date:To:From:Subject:From; b=hwN8Fb2ukWLsf27kp0gwYg8hRqZqWdupZTB6pNgDKTxyDmwDFFQUyC9WIeC4NV6/O kO1xQql7HqrZ87b8URNELumCriOMU5adeCUnS+n8Aq3RiP9CHjHPfMNQXjmiDDpzYv TD5jEQfC7UMQSHUnEcTVTb1N2tP57Xa7shbe+Uy4= Date: Sun, 16 Mar 2025 22:32:38 -0700 To: mm-commits@vger.kernel.org,xiubli@redhat.com,tiwai@suse.de,tiwai@suse.com,sre@kernel.org,Shyam-sundar.S-k@amd.com,shawnguo@kernel.org,s.hauer@pengutronix.de,selvin.xavier@broadcom.com,sagi@grimberg.me,perex@perex.cz,ogabbay@kernel.org,nicolas.palix@imag.fr,mkl@pengutronix.de,martin.petersen@oracle.com,leon@kernel.org,kbusch@kernel.org,kalesh-anakkur.purayil@broadcom.com,julia.lawall@inria.fr,josef@toxicpanda.com,jgg@ziepe.ca,james.smart@broadcom.com,james.bottomley@HansenPartnership.com,ilpo.jarvinen@linux.intel.com,idryomov@gmail.com,hmh@hmh.eng.br,hdegoede@redhat.com,hch@lst.de,frank.li@nxp.com,festevam@gmail.com,dsterba@suse.com,dongsheng.yang@easystack.cn,dlemoal@kernel.org,djwong@kernel.org,dick.kennedy@broadcom.com,cmaiolino@redhat.com,clm@fb.com,cem@kernel.org,cassel@kernel.org,broonie@kernel.org,axboe@kernel.dk,eahariha@linux.microsoft.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] nvme-convert-timeouts-to-secs_to_jiffies.patch removed from -mm tree Message-Id: <20250317053238.ABAACC4CEEC@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: nvme: convert timeouts to secs_to_jiffies() has been removed from the -mm tree. Its filename was nvme-convert-timeouts-to-secs_to_jiffies.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Easwar Hariharan Subject: nvme: convert timeouts to secs_to_jiffies() Date: Tue, 25 Feb 2025 20:17:25 +0000 Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies() to avoid the multiplication This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules: @depends on patch@ expression E; @@ -msecs_to_jiffies +secs_to_jiffies (E - * \( 1000 \| MSEC_PER_SEC \) ) Link: https://lkml.kernel.org/r/20250225-converge-secs-to-jiffies-part-two-v3-11-a43967e36c88@linux.microsoft.com Signed-off-by: Easwar Hariharan Acked-by: Keith Busch Cc: Carlos Maiolino Cc: Carlos Maiolino Cc: Chris Mason Cc: Christoph Hellwig Cc: Damien Le Maol Cc: "Darrick J. Wong" Cc: David Sterba Cc: Dick Kennedy Cc: Dongsheng Yang Cc: Fabio Estevam Cc: Frank Li Cc: Hans de Goede Cc: Henrique de Moraes Holschuh Cc: Ilpo Jarvinen Cc: Ilya Dryomov Cc: James Bottomley Cc: James Smart Cc: Jaroslav Kysela Cc: Jason Gunthorpe Cc: Jens Axboe Cc: Josef Bacik Cc: Julia Lawall Cc: Kalesh Anakkur Purayil Cc: Leon Romanovsky Cc: Marc Kleine-Budde Cc: Mark Brown Cc: "Martin K. Petersen" Cc: Nicolas Palix Cc: Niklas Cassel Cc: Oded Gabbay Cc: Sagi Grimberg Cc: Sascha Hauer Cc: Sebastian Reichel Cc: Selvin Thyparampil Xavier Cc: Shawn Guo Cc: Shyam-sundar S-k Cc: Takashi Iwai Cc: Takashi Iwai Cc: Xiubo Li Signed-off-by: Andrew Morton --- drivers/nvme/host/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/nvme/host/core.c~nvme-convert-timeouts-to-secs_to_jiffies +++ a/drivers/nvme/host/core.c @@ -4466,11 +4466,9 @@ static void nvme_fw_act_work(struct work nvme_auth_stop(ctrl); if (ctrl->mtfa) - fw_act_timeout = jiffies + - msecs_to_jiffies(ctrl->mtfa * 100); + fw_act_timeout = jiffies + msecs_to_jiffies(ctrl->mtfa * 100); else - fw_act_timeout = jiffies + - msecs_to_jiffies(admin_timeout * 1000); + fw_act_timeout = jiffies + secs_to_jiffies(admin_timeout); nvme_quiesce_io_queues(ctrl); while (nvme_ctrl_pp_status(ctrl)) { _ Patches currently in -mm which might be from eahariha@linux.microsoft.com are