From: Lee Jones <lee@kernel.org>
To: Yang Yingliang <yangyingliang@huawei.com>
Cc: linux-kernel@vger.kernel.org, robh@kernel.org
Subject: Re: [PATCH -next] mfd: remove unexpected file drivers/mfd/rz-mtu3.c.rej
Date: Tue, 15 Aug 2023 18:03:49 +0100 [thread overview]
Message-ID: <20230815170349.GC648357@google.com> (raw)
In-Reply-To: <20230810025413.3223814-1-yangyingliang@huawei.com>
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
>
--
Lee Jones [李琼斯]
prev parent reply other threads:[~2023-08-15 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 2:54 [PATCH -next] mfd: remove unexpected file drivers/mfd/rz-mtu3.c.rej Yang Yingliang
2023-08-15 17:03 ` Lee Jones [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230815170349.GC648357@google.com \
--to=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=yangyingliang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.