Skip to content
Commit e246e469 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-6.2-rc1' of...

Merge tag 'fpga-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.2-rc1

Zynq:

- Yang's change Switch to use dev_err_probe() helper

Lattice:

- Ivan's change add support for Lattice Sysconfig FPGA reprogrammer

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

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  dt-bindings: fpga: document Lattice sysCONFIG FPGA manager
  fpga: lattice-sysconfig-spi: add Lattice sysCONFIG FPGA manager
  fpga: zynq: Switch to use dev_err_probe() helper
parents 210a671c ee31d503
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment