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

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

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

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.11-rc1

FPGA unit test:

- Macro's change re-enables FPGA KUnit test suites been configured as
  loadable module.

Altera:

- David's change removes unused structure definition.

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.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: altera-fpga2sdram: remove unused struct 'prop_map'
  Revert "fpga: disable KUnit test suites when module support is enabled"
parents 19ed3bb5 3a0fa8e9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment