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 1A240C001B3 for ; Mon, 19 Jun 2023 20:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229838AbjFSUUW (ORCPT ); Mon, 19 Jun 2023 16:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbjFSUUU (ORCPT ); Mon, 19 Jun 2023 16:20:20 -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 3AAE2E68; Mon, 19 Jun 2023 13:20:13 -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 C680260EBA; Mon, 19 Jun 2023 20:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24E0EC433C8; Mon, 19 Jun 2023 20:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1687206012; bh=P0bGxem5483Qyc71JVvHxLawsj19LQKPB6MCO4onMO4=; h=Date:To:From:Subject:From; b=NuvWlJV7rok0v/nKEQDaqahjAsSP5QLj9N1xK4ZzwzXKVcF1exH9NAM8i8Wxa5mef VmfV3xb6XdvTGOAAEk3NtcEywIXqGhBEwJJSLkvCrGN7VjB8Irf+Nlzk48S61TV2ZQ HPMu7V5EU8DPDW+pVvwsmxI4B4+T7Ufah5Hwejwk= Date: Mon, 19 Jun 2023 13:20:11 -0700 To: mm-commits@vger.kernel.org, yury.norov@gmail.com, stable@vger.kernel.org, nicolas@fjasle.eu, ndesaulniers@google.com, nathan@kernel.org, mingo@kernel.org, masahiroy@kernel.org, david@redhat.com, prathubaronia2011@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] scripts-fix-the-gfp-flags-header-path-in-gfp-translate.patch removed from -mm tree Message-Id: <20230619202012.24E0EC433C8@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The quilt patch titled Subject: scripts: fix the gfp flags header path in gfp-translate has been removed from the -mm tree. Its filename was scripts-fix-the-gfp-flags-header-path-in-gfp-translate.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Prathu Baronia Subject: scripts: fix the gfp flags header path in gfp-translate Date: Thu, 8 Jun 2023 21:14:49 +0530 Since gfp flags have been shifted to gfp_types.h so update the path in the gfp-translate script. Link: https://lkml.kernel.org/r/20230608154450.21758-1-prathubaronia2011@gmail.com Fixes: cb5a065b4ea9c ("headers/deps: mm: Split out of ") Signed-off-by: Prathu Baronia Reviewed-by: David Hildenbrand Cc: Masahiro Yamada Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Nicolas Schier Cc: Ingo Molnar Cc: Yury Norov Cc: Signed-off-by: Andrew Morton --- scripts/gfp-translate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/scripts/gfp-translate~scripts-fix-the-gfp-flags-header-path-in-gfp-translate +++ a/scripts/gfp-translate @@ -63,11 +63,11 @@ fi # Extract GFP flags from the kernel source TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1 -grep -q ___GFP $SOURCE/include/linux/gfp.h +grep -q ___GFP $SOURCE/include/linux/gfp_types.h if [ $? -eq 0 ]; then - grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE + grep "^#define ___GFP" $SOURCE/include/linux/gfp_types.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE else - grep "^#define __GFP" $SOURCE/include/linux/gfp.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE + grep "^#define __GFP" $SOURCE/include/linux/gfp_types.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE fi # Parse the flags _ Patches currently in -mm which might be from prathubaronia2011@gmail.com are