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 909C5C433EF for ; Thu, 20 Jan 2022 21:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377917AbiATV3t (ORCPT ); Thu, 20 Jan 2022 16:29:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377916AbiATV3s (ORCPT ); Thu, 20 Jan 2022 16:29:48 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41573C061574 for ; Thu, 20 Jan 2022 13:29:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D7AD7617CF for ; Thu, 20 Jan 2022 21:29:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE751C340E0; Thu, 20 Jan 2022 21:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1642714187; bh=u6glEcyzV3vim/LFdxaTSt+EZFVXw2MntyToOJuiDFk=; h=Date:From:To:Subject:From; b=csYlYGD+uOminGEWujQwyK6x3iEUwXlgu8pglycY5Q21759W1YDFPHlQ6VqPUJQMs GOBIgwzTFCFqBJUh9My4uvCxzPV8wJ0rHHfjk2kw32xYQL2d/WCt0qLmTQ5cbb7Fsf 9BWm+dGzmeueJQVauX6THVIwl/arMokI9M7k/4Jk= Date: Thu, 20 Jan 2022 13:29:46 -0800 From: akpm@linux-foundation.org To: andriy.shevchenko@linux.intel.com, arend.vanspriel@broadcom.com, aspriel@gmail.com, chi-hsien.lin@infineon.com, chung-hsien.hsu@infineon.com, davem@davemloft.net, franky.lin@broadcom.com, hante.meuleman@broadcom.com, heikki.krogerus@linux.intel.com, kuba@kernel.org, kvalo@codeaurora.org, kvalo@kernel.org, mm-commits@vger.kernel.org, wright.feng@infineon.com Subject: [merged] include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions.patch removed from -mm tree Message-ID: <20220120212946.hed7x3cNl%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: include/linux/unaligned: replace kernel.h with the necessary inclusions has been removed from the -mm tree. Its filename was include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Andy Shevchenko Subject: include/linux/unaligned: replace kernel.h with the necessary inclusions When kernel.h is used in the headers it adds a lot into dependency hell, especially when there are circular dependencies are involved. Replace kernel.h inclusion with the list of what is really being used. The rest of the changes are induced by the above and may not be split. Link: https://lkml.kernel.org/r/20211209123823.20425-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko Acked-by: Arend van Spriel [brcmfmac] Acked-by: Kalle Valo Cc: Arend van Spriel Cc: Franky Lin Cc: Hante Meuleman Cc: Chi-hsien Lin Cc: Wright Feng Cc: Chung-hsien Hsu Cc: Kalle Valo Cc: David S. Miller Cc: Jakub Kicinski Cc: Heikki Krogerus Signed-off-by: Andrew Morton --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c | 2 ++ include/linux/unaligned/packed_struct.h | 2 +- lib/lz4/lz4defs.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions +++ a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c @@ -4,6 +4,8 @@ */ #include + +#include #include #include --- a/include/linux/unaligned/packed_struct.h~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions +++ a/include/linux/unaligned/packed_struct.h @@ -1,7 +1,7 @@ #ifndef _LINUX_UNALIGNED_PACKED_STRUCT_H #define _LINUX_UNALIGNED_PACKED_STRUCT_H -#include +#include struct __una_u16 { u16 x; } __packed; struct __una_u32 { u32 x; } __packed; --- a/lib/lz4/lz4defs.h~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions +++ a/lib/lz4/lz4defs.h @@ -36,6 +36,8 @@ */ #include + +#include #include /* memset, memcpy */ #define FORCE_INLINE __always_inline _ Patches currently in -mm which might be from andriy.shevchenko@linux.intel.com are