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 36AE9261594 for ; Mon, 12 May 2025 10:19:03 +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=1747045143; cv=none; b=hKCaPI4A6v9f224N4hQkNp5SGzsRAdrLOxzbyXMed09DRK2IqTA3WG5ZIcqRGqHYxyNvKJWIS5EIUz/npReOoSieIFL4fmDBj6tt6NaFUQUIAIm7xulybcTCRzxA18+2KWC96DDQMZmEQbveIfokcyWDR0nrO7Z4yegnG72lsmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747045143; c=relaxed/simple; bh=EmLmnDs1DpPJa9NB97I+oEmLa7YaHLr4FPZZjv1ycxc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=CFf+wmp92Neh1ptL4cEAJfJl3mNXp3C/nD/SG/fsmd+eIciPk4m2XI/DIiDOmRxbWiTnJnB6AcAzfL9curmiyGZmB0ZXVssCZwxS7Ywi5JkCtBMeyHwYHmun60a77E8okDCh02E/qBXQyYlrrz+ACPAfuM0n7n2BOf7gSp096VE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rKv2kFkM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rKv2kFkM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B21C4C4CEE7; Mon, 12 May 2025 10:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747045143; bh=EmLmnDs1DpPJa9NB97I+oEmLa7YaHLr4FPZZjv1ycxc=; h=Subject:To:Cc:From:Date:From; b=rKv2kFkMjELU3zBMMkMIWt+6hrMSCO6AFFAyST95uhWxmNMKBBfXGln5m4it0nBMp jlJhCcvawUj5l2JXjTgBvglamR/A/ob/slnLrKzhLfxXMPbmuRGWWe4Y96U0tABxBs vbvN7vTMucI/97BSuyvzvA+3so3Y030uSrKa2/WE= Subject: FAILED: patch "[PATCH] iio: chemical: pms7003: use aligned_s64 for timestamp" failed to apply to 6.6-stable tree To: dlechner@baylibre.com,Jonathan.Cameron@huawei.com,Stable@vger.kernel.org,nuno.sa@analog.com Cc: From: Date: Mon, 12 May 2025 12:18:49 +0200 Message-ID: <2025051249-bootleg-devious-fe49@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 6ffa698674053e82e811520642db2650d00d2c01 # git commit -s git send-email --to '' --in-reply-to '2025051249-bootleg-devious-fe49@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ffa698674053e82e811520642db2650d00d2c01 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Thu, 17 Apr 2025 11:52:36 -0500 Subject: [PATCH] iio: chemical: pms7003: use aligned_s64 for timestamp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow the pattern of other drivers and use aligned_s64 for the timestamp. This will ensure that the timestamp is correctly aligned on all architectures. Also move the unaligned.h header while touching this since it was the only one not in alphabetical order. Fixes: 13e945631c2f ("iio:chemical:pms7003: Fix timestamp alignment and prevent data leak.") Signed-off-by: David Lechner Reviewed-by: Nuno Sá Link: https://patch.msgid.link/20250417-iio-more-timestamp-alignment-v1-4-eafac1e22318@baylibre.com Cc: Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/chemical/pms7003.c b/drivers/iio/chemical/pms7003.c index d0bd94912e0a..e05ce1f12065 100644 --- a/drivers/iio/chemical/pms7003.c +++ b/drivers/iio/chemical/pms7003.c @@ -5,7 +5,6 @@ * Copyright (c) Tomasz Duszynski */ -#include #include #include #include @@ -19,6 +18,8 @@ #include #include #include +#include +#include #define PMS7003_DRIVER_NAME "pms7003" @@ -76,7 +77,7 @@ struct pms7003_state { /* Used to construct scan to push to the IIO buffer */ struct { u16 data[3]; /* PM1, PM2P5, PM10 */ - s64 ts; + aligned_s64 ts; } scan; };