[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20230815170349.GC648357@google.com>
Date: Tue, 15 Aug 2023 18:03:49 +0100
From: Lee Jones <lee@...nel.org>
To: Yang Yingliang <yangyingliang@...wei.com>
Cc: linux-kernel@...r.kernel.org, robh@...nel.org
Subject: Re: [PATCH -next] mfd: remove unexpected file
drivers/mfd/rz-mtu3.c.rej
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@...wei.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 [李琼斯]
Powered by blists - more mailing lists