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 2494A255E33 for ; Mon, 12 May 2025 10:17:47 +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=1747045067; cv=none; b=sli93gYzcdwHDiqxulNjweqzUGFfS25qESd3LRVv5iuWob/zehiWPc2N2PrO31WGxgrffcJTnIgnjcvcUNAjbYDjXx8TYXpo7TLg9Hme4hc3cFsBpWachwFobcexbU5gn0BVa6qxRg7JV5d7xYiW/1igo4O0rWo90E55zGlRr9g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747045067; c=relaxed/simple; bh=n8Suzsf/YpFLPwmIZVuG4vwrcnhraxirK4cgE1a+D3g=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=DhsSFF+gL6oB8XaAFyCoz31Ps3Kr9lvQ6s8lY/IzxjJsoewwVseS7JiAdvx+fbWu6rZopDWeFEt1lVvpI74SWxKO8PoR3cZnHwazY56kT0tdux/8uBgoGQV4d/H8TCg9FF2uIWKjX3pkh7x4AqIBzdFIsl9du0QlTrPmLNnh1U8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=um7wHABL; 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="um7wHABL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94653C4CEE7; Mon, 12 May 2025 10:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747045067; bh=n8Suzsf/YpFLPwmIZVuG4vwrcnhraxirK4cgE1a+D3g=; h=Subject:To:Cc:From:Date:From; b=um7wHABLzGy3SkoOL02/M2aXaQ6pwJTSeOmRFEYUUHywNCDHKF4FwEgU8KcIiKtl0 r61VtPbcE0n4vcWkqNAjpPUFmy8KbWeAMiwQgE/sTE1CkxxbtuM7JKZiSAbdyJBeaC zI5IWEKVIWUD+ZuxfgvNry1zmUqj8EXrMfOx02lI= Subject: FAILED: patch "[PATCH] iio: chemical: sps30: 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:17:33 +0200 Message-ID: <2025051233-captivity-mustard-1a5c@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 bb49d940344bcb8e2b19e69d7ac86f567887ea9a # git commit -s git send-email --to '' --in-reply-to '2025051233-captivity-mustard-1a5c@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bb49d940344bcb8e2b19e69d7ac86f567887ea9a Mon Sep 17 00:00:00 2001 From: David Lechner Date: Thu, 17 Apr 2025 11:52:37 -0500 Subject: [PATCH] iio: chemical: sps30: 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. Fixes: a5bf6fdd19c3 ("iio:chemical:sps30: Fix timestamp alignment") Signed-off-by: David Lechner Reviewed-by: Nuno Sá Link: https://patch.msgid.link/20250417-iio-more-timestamp-alignment-v1-5-eafac1e22318@baylibre.com Cc: Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/chemical/sps30.c b/drivers/iio/chemical/sps30.c index 6f4f2ba2c09d..a7888146188d 100644 --- a/drivers/iio/chemical/sps30.c +++ b/drivers/iio/chemical/sps30.c @@ -108,7 +108,7 @@ static irqreturn_t sps30_trigger_handler(int irq, void *p) int ret; struct { s32 data[4]; /* PM1, PM2P5, PM4, PM10 */ - s64 ts; + aligned_s64 ts; } scan; mutex_lock(&state->lock);