From: Greg Kroah-Hartman Date: Thu, 23 Apr 2020 14:11:29 +0000 (+0200) Subject: Merge tag 'fpga-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf... X-Git-Tag: v5.7-rc3~4^2~1 X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/2d3008f658d32d82324717f44432bd4e8dc14c15?hp=-c Merge tag 'fpga-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-linus Moritz writes: FPGA Manager fixes for 5.7-rc1 Here are two (late) fixes for 5.7-rc1 merge window. Xu's change addresses an issue with a wrong return value. Shubhrajyoti's change makes the Zynq FPGA driver return -EPROBE_DEFER on 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: Moritz Fischer * tag 'fpga-fixes-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: fpga: dfl: pci: fix return value of cci_pci_sriov_configure fpga: zynq: Remove clk_get error message for probe defer --- 2d3008f658d32d82324717f44432bd4e8dc14c15