Commit 88d47f62 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-6.13-20241115' of... 

Merge tag 'md-6.13-20241115' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux into for-6.13/block

Pull MD fixes from Song:

"This set contains a fix for a W=1 warning, by John Garry, and a
 MAINTAINERS update."

* tag 'md-6.13-20241115' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
  MAINTAINERS: Update git tree for mdraid subsystem
  md/raid5: Increase r5conf.cache_name size
parents 957860cb 886e4757

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -21307,7 +21307,7 @@ M: Yu Kuai <yukuai3@huawei.com> 
L:	linux-raid@vger.kernel.org

S:	Supported

Q:	https://patchwork.kernel.org/project/linux-raid/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux.git

F:	drivers/md/Kconfig

F:	drivers/md/Makefile

F:	drivers/md/md*

drivers/md/raid5.h

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ struct r5conf { 
	 * two caches.

	 */

	int			active_name;

	char			cache_name[2][32];

	char			cache_name[2][48];

	struct kmem_cache	*slab_cache; /* for allocating stripes */

	struct mutex		cache_size_mutex; /* Protect changes to cache size */