From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F4C0EB64DC for ; Mon, 19 Jun 2023 23:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbjFSXYc (ORCPT ); Mon, 19 Jun 2023 19:24:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230002AbjFSXW3 (ORCPT ); Mon, 19 Jun 2023 19:22:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA2FE55 for ; Mon, 19 Jun 2023 16:22:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3CA8160FEF for ; Mon, 19 Jun 2023 23:22:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92AEEC433C0; Mon, 19 Jun 2023 23:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1687216942; bh=B1Oh7wHFtTnJkMxYKdeTs8nrRYUuJSrkqJh1COft9O4=; h=Date:To:From:Subject:From; b=aQl9M0Xx1K1sPSz1Yk7w4K5JbLCtySkOO636uOVBujcmU/ZDE1MMzxfyPzX+S3NUd 3b8tCWW6kGx4+4tkQNOrI4TKUfLnHJficq2PWzQZnKIvlhwtHBWWaK91/HH6iZPmjt fucBsl9s3CoN8zx7UlKbf/WePU6yA63YylDlmb2Y= Date: Mon, 19 Jun 2023 16:22:22 -0700 To: mm-commits@vger.kernel.org, will@kernel.org, vbabka@suse.cz, snitzer@kernel.org, saravanak@google.com, robin.murphy@arm.com, rafael@kernel.org, maz@kernel.org, logang@deltatee.com, lars@metafoo.de, jsnitsel@redhat.com, joro@8bytes.org, Jonathan.Cameron@huawei.com, jic23@kernel.org, isaacmanjarres@google.com, herbert@gondor.apana.org.au, hch@lst.de, gregkh@linuxfoundation.org, daniel@ffwll.ch, broonie@kernel.org, arnd@arndb.de, ardb@kernel.org, agk@redhat.com, catalin.marinas@arm.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] drivers-spi-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch removed from -mm tree Message-Id: <20230619232222.92AEEC433C0@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: drivers/spi: use ARCH_DMA_MINALIGN instead of ARCH_KMALLOC_MINALIGN has been removed from the -mm tree. Its filename was drivers-spi-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Catalin Marinas Subject: drivers/spi: use ARCH_DMA_MINALIGN instead of ARCH_KMALLOC_MINALIGN Date: Mon, 12 Jun 2023 16:31:52 +0100 ARCH_DMA_MINALIGN represents the minimum (static) alignment for safe DMA operations while ARCH_KMALLOC_MINALIGN is the minimum kmalloc() objects alignment. Link: https://lkml.kernel.org/r/20230612153201.554742-9-catalin.marinas@arm.com Signed-off-by: Catalin Marinas Acked-by: Mark Brown Tested-by: Isaac J. Manjarres Cc: Alasdair Kergon Cc: Ard Biesheuvel Cc: Arnd Bergmann Cc: Christoph Hellwig Cc: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Herbert Xu Cc: Jerry Snitselaar Cc: Joerg Roedel Cc: Jonathan Cameron Cc: Jonathan Cameron Cc: Lars-Peter Clausen Cc: Logan Gunthorpe Cc: Marc Zyngier Cc: Mike Snitzer Cc: "Rafael J. Wysocki" Cc: Robin Murphy Cc: Saravana Kannan Cc: Vlastimil Babka Cc: Will Deacon Signed-off-by: Andrew Morton --- drivers/spi/spidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/spi/spidev.c~drivers-spi-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign +++ a/drivers/spi/spidev.c @@ -237,7 +237,7 @@ static int spidev_message(struct spidev_ /* Ensure that also following allocations from rx_buf/tx_buf will meet * DMA alignment requirements. */ - unsigned int len_aligned = ALIGN(u_tmp->len, ARCH_KMALLOC_MINALIGN); + unsigned int len_aligned = ALIGN(u_tmp->len, ARCH_DMA_MINALIGN); k_tmp->len = u_tmp->len; _ Patches currently in -mm which might be from catalin.marinas@arm.com are