diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-14 08:45:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-14 08:45:30 +0100 |
| commit | 6f119e3da79ce5e586340059403ab77201c1bb45 (patch) | |
| tree | 81d90cd984ec652f2254f9843f7ed263b9d76e5b /MAINTAINERS | |
| parent | 124bb4e757990e809ec1870f64704ea0921dc418 (diff) | |
| parent | e19890a0088b5884cb9e6a6f5717dc56cc45fc31 (diff) | |
| download | ath-6f119e3da79ce5e586340059403ab77201c1bb45.tar.gz | |
Merge tag 'fpga-for-6.15-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.15-rc1
- Peter's change updates his email address.
- Kuhanh's change increases timeout for altera-cvp driver
- Arnd's change removes incorrect of_match_ptr
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: Xu Yilun <yilun.xu@intel.com>
* tag 'fpga-for-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: versal: remove incorrect of_match_ptr annotation
fpga: altera-cvp: Increase credit timeout
fpga: m10bmc-sec: update email address for Peter Colberg
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f936ccecb9732..57eaab00f6cb5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11871,7 +11871,7 @@ F: drivers/mfd/intel-m10-bmc* F: include/linux/mfd/intel-m10-bmc.h INTEL MAX10 BMC SECURE UPDATES -M: Peter Colberg <peter.colberg@intel.com> +M: Peter Colberg <peter.colberg@altera.com> L: linux-fpga@vger.kernel.org S: Maintained F: Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update |