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

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

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

 into char-misc-linus

Xy writes:
   FPGA Manager changes for 6.2-final
   stratix10-soc:
     - Zheng's change fixes return value check
   Intel m10 bmc secure update:
     - Ilpo's change fixes probe rollback

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

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

* tag 'fpga-for-6.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: m10bmc-sec: Fix probe rollback
  fpga: stratix10-soc: Fix return value check in s10_ops_write_init()
parents 1ca7fca3 60ce26d1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment