From nobody Fri Sep 12 06:13:16 2025 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 57702C001B0 for ; Thu, 10 Aug 2023 02:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229924AbjHJC5U (ORCPT ); Wed, 9 Aug 2023 22:57:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229620AbjHJC5T (ORCPT ); Wed, 9 Aug 2023 22:57:19 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C7A91702 for ; Wed, 9 Aug 2023 19:57:18 -0700 (PDT) Received: from dggpemm100013.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RLs230VdCzNmdG; Thu, 10 Aug 2023 10:53:47 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm100013.china.huawei.com (7.185.36.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 10 Aug 2023 10:57:15 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 10 Aug 2023 10:57:15 +0800 From: Yang Yingliang To: CC: , , Subject: [PATCH -next] mfd: remove unexpected file drivers/mfd/rz-mtu3.c.rej Date: Thu, 10 Aug 2023 10:54:13 +0800 Message-ID: <20230810025413.3223814-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit bb60922c31d0 ("mfd: Explicitly include correct DT includes") added an unexpected file drivers/mfd/rz-mtu3.c.rej, remove the file. Fixes: bb60922c31d0 ("mfd: Explicitly include correct DT includes") Signed-off-by: Yang Yingliang --- drivers/mfd/rz-mtu3.c.rej | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 drivers/mfd/rz-mtu3.c.rej diff --git a/drivers/mfd/rz-mtu3.c.rej b/drivers/mfd/rz-mtu3.c.rej deleted file mode 100644 index 9654d98cfedf..000000000000 --- a/drivers/mfd/rz-mtu3.c.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/drivers/mfd/rz-mtu3.c b/drivers/mfd/rz-mtu3.c (rejected hunks) -@@ -11,7 +11,9 @@ - #include - #include - #include --#include -+#include -+#include -+#include - #include - #include -=20 --=20 2.25.1