]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'powerpc-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2025 19:35:49 +0000 (12:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2025 19:35:49 +0000 (12:35 -0700)
Pull more powerpc updates from Michael Ellerman:

 - Remove the IBM CAPI (cxl) driver

Thanks to Andrew Donnellan.

* tag 'powerpc-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  docs: Fix references to IBM CAPI (cxl) removal version
  cxl: Remove driver

1  2 
Documentation/userspace-api/ioctl/ioctl-number.rst
MAINTAINERS

diff --cc MAINTAINERS
Simple merge