Skip to content

Commit 88d47f6

Browse files
committed
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
2 parents 957860c + 886e475 commit 88d47f6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21307,7 +21307,7 @@ M: Yu Kuai <yukuai3@huawei.com>
2130721307
L: linux-raid@vger.kernel.org
2130821308
S: Supported
2130921309
Q: https://patchwork.kernel.org/project/linux-raid/list/
21310-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
21310+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux.git
2131121311
F: drivers/md/Kconfig
2131221312
F: drivers/md/Makefile
2131321313
F: drivers/md/md*

drivers/md/raid5.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ struct r5conf {
633633
* two caches.
634634
*/
635635
int active_name;
636-
char cache_name[2][32];
636+
char cache_name[2][48];
637637
struct kmem_cache *slab_cache; /* for allocating stripes */
638638
struct mutex cache_size_mutex; /* Protect changes to cache size */
639639

0 commit comments

Comments
 (0)