Commit ff53c4f6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-maintainer-update' of...

Merge tag 'fpga-maintainer-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga

 into char-misc-linus

Moritz writes:

FPGA Manager changes for 5.16

The first patch adds Hao and Yilun as additional maintainers
for the FPGA Manager subsystem.

The second patch removes a now stale reference to a product specific
website that no longer reflects the FPGA Manager subsystem.

All patches have been reviewed on the mailing list, and have been in the
last few linux-next releases (as part of my for-next branch) without issues.

Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>

* tag 'fpga-maintainer-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  MAINTAINERS: Drop outdated FPGA Manager website
  MAINTAINERS: Add Hao and Yilun as maintainers
parents dfffaf02 57b44817
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -7338,10 +7338,11 @@ F: include/uapi/linux/fpga-dfl.h
FPGA MANAGER FRAMEWORK
M:	Moritz Fischer <mdf@kernel.org>
M:	Wu Hao <hao.wu@intel.com>
M:	Xu Yilun <yilun.xu@intel.com>
R:	Tom Rix <trix@redhat.com>
L:	linux-fpga@vger.kernel.org
S:	Maintained
W:	http://www.rocketboards.org
Q:	http://patchwork.kernel.org/project/linux-fpga/list/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
F:	Documentation/devicetree/bindings/fpga/