| Message ID | 20230810025413.3223814-1-yangyingliang@huawei.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp159268vqi;
Wed, 9 Aug 2023 20:34:06 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGqv7IyC3BFm5vnI8WeTPEZWyW29ztaN3wmvbTty82xpm4BHc02U2NvBEZhRzfgFXqw1oV7
X-Received: by 2002:a17:906:18b2:b0:991:f427:2fdf with SMTP id
c18-20020a17090618b200b00991f4272fdfmr843961ejf.76.1691638445969;
Wed, 09 Aug 2023 20:34:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1691638445; cv=none;
d=google.com; s=arc-20160816;
b=tdpleQxU05Kk/8SblZphbksoKbKTa8rPzw3heYGWC3M08NnYMRr1nXhdrs2UZcXvU2
zxtDVFwH6lEIpgjFd3XcQaQGT14oWYuq67p4vMtrGBeViC3Htw49DPYaGqymdJ5J+nob
D0C65bJhTQ2RI1h05QIuC6AUS8Ayk3DykgEmW79mCYDKnfZkEepKfNTMyiPChzICMOOx
2JiOcmo83UfJ4DcLnFdnWJrEoeDTe2puV1H39SKY2au4h2S6sEOyvggkVR3tJ2HNIIET
YqH1dC2S0XevHSm7NSNa3nast4L1dQ/dZDEYbkQ0QaAKuEKBQMYUZoA5zDyt+eLytJ11
EGhw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from;
bh=W+Zp6q1JkpnOPhsk/wNtrkPKC2WFDpvHRwqKGfS0WGs=;
fh=W9yzYfZ2kZ32FzZaE+quvD4Knl4SQPw0LCY3F0WqROg=;
b=wKp7E6PIry4kLit4ne68LSjUFQJyXuqAKzdb4nMjLWbQwGUpD688LQW1k41QFmN9A4
SN4Cvp+rImZiWLlvbUMUC6ShKWOQoAOHzEKILpNqfzxPEzqVWgaTDgkqAjHFbKm6ijWq
uC9JKIRVPs9ivGSKzrIeCEhf9vNKJV07z5KJ2cDcW54SJfZgLEu6tkhcmmSNAvDxc4D/
KgNMndYFtffWZwW7Fml2ROkOJ5KTCkcBI02O0Y+7sS4i1E7ohGzirEV+NZrZ9Rd0B8JO
A97WAuB6d7J5/cobpkn+1SrnrfsQlD4f7UyLwhmH22xcZcqibEVGiT4hodxd3+GHWbNE
b0+A==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
o27-20020a17090637db00b0099bd621989asi620128ejc.405.2023.08.09.20.33.42;
Wed, 09 Aug 2023 20:34:05 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231640AbjHJC5U (ORCPT <rfc822;craechal@gmail.com> + 99 others);
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
<rfc822;linux-kernel@vger.kernel.org>);
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 <linux-kernel@vger.kernel.org>;
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 <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>
CC: <robh@kernel.org>, <lee@kernel.org>, <yangyingliang@huawei.com>
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: 7BIT
Content-Type: text/plain; charset=US-ASCII
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
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,
RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,
SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1773811474961372680
X-GMAIL-MSGID: 1773811474961372680
|
| Series |
[-next] mfd: remove unexpected file drivers/mfd/rz-mtu3.c.rej
|
|
Commit Message
Yang Yingliang
Aug. 10, 2023, 2:54 a.m. UTC
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 <yangyingliang@huawei.com>
---
drivers/mfd/rz-mtu3.c.rej | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 drivers/mfd/rz-mtu3.c.rej
Comments
On Thu, 10 Aug 2023, Yang Yingliang wrote: > 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 <yangyingliang@huawei.com> > --- > drivers/mfd/rz-mtu3.c.rej | 12 ------------ > 1 file changed, 12 deletions(-) > delete mode 100644 drivers/mfd/rz-mtu3.c.rej Thanks for the report. I have squashed this into the original patch. > 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 <linux/irq.h> > - #include <linux/mfd/core.h> > - #include <linux/mfd/rz-mtu3.h> > --#include <linux/of_platform.h> > -+#include <linux/mod_devicetable.h> > -+#include <linux/module.h> > -+#include <linux/platform_device.h> > - #include <linux/reset.h> > - #include <linux/spinlock.h> > - > -- > 2.25.1 >
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 <linux/irq.h> - #include <linux/mfd/core.h> - #include <linux/mfd/rz-mtu3.h> --#include <linux/of_platform.h> -+#include <linux/mod_devicetable.h> -+#include <linux/module.h> -+#include <linux/platform_device.h> - #include <linux/reset.h> - #include <linux/spinlock.h> -