]> www.infradead.org Git - users/jedix/linux-maple.git/commit
misc: delete Makefile.rej
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Jul 2024 14:41:47 +0000 (16:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Jul 2024 14:41:47 +0000 (16:41 +0200)
commitff14bfb7bc0480c343356b82c126290a4774bcbe
treee1f6b77c668fd261d2c51eee8634f5f7300c54e1
parent31643d84b8c3d9c846aa0e20bc033e46c68c7e7d
misc: delete Makefile.rej

I accidentally added drivers/misc/Makefile.rej when applying the
mrvl-cn10k-dpi by hand.  Remove it as it's not needed.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/Makefile.rej [deleted file]