]> Git Repo - linux.git/commitdiff
Merge tag 'erofs-for-6.7-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Tue, 21 Nov 2023 19:45:48 +0000 (11:45 -0800)
committerLinus Torvalds <[email protected]>
Tue, 21 Nov 2023 19:45:48 +0000 (11:45 -0800)
Pull erofs fixes from Gao Xiang:

 - Tidy up erofs_read_inode() for simplicity

 - Fix broken fscache mode due to NULL dereference of dif->bdev_handle

 - Add the EROFS webpage to MAINTAINERS, documentation, and Kconfig

* tag 'erofs-for-6.7-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  MAINTAINERS: erofs: add EROFS webpage
  erofs: fix NULL dereference of dif->bdev_handle in fscache mode
  erofs: simplify erofs_read_inode()

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index ea790149af795155003eaacca87289e05d55454b,cf39d16ad22ad07657c0580b263a558b510ca597..6bb3293f3eb78baf3f2be3ae9cc6ce13d1754630
@@@ -7855,6 -7855,7 +7855,7 @@@ R:      Yue Hu <[email protected]
  R:    Jeffle Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
+ W:    https://erofs.docs.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
  F:    Documentation/ABI/testing/sysfs-fs-erofs
  F:    Documentation/filesystems/erofs.rst
@@@ -8950,6 -8951,7 +8951,6 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Bob Peterson <[email protected]>
  M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -21768,9 -21770,7 +21769,9 @@@ F:   Documentation/devicetree/bindings/co
  F:    drivers/counter/ti-eqep.c
  
  TI ETHERNET SWITCH DRIVER (CPSW)
 -R:    Grygorii Strashko <[email protected]>
 +R:    Siddharth Vadapalli <[email protected]>
 +R:    Ravi Gunasekaran <[email protected]>
 +R:    Roger Quadros <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -21794,15 -21794,6 +21795,15 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI ICSSG ETHERNET DRIVER (ICSSG)
 +R:    MD Danish Anwar <[email protected]>
 +R:    Roger Quadros <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/ti,icss*.yaml
 +F:    drivers/net/ethernet/ti/icssg/*
 +
  TI J721E CSI2RX DRIVER
  M:    Jai Luthra <[email protected]>
  L:    [email protected]
@@@ -23702,20 -23693,6 +23703,20 @@@ F: arch/x86/kernel/dumpstack.
  F:    arch/x86/kernel/stacktrace.c
  F:    arch/x86/kernel/unwind_*.c
  
 +X86 TRUST DOMAIN EXTENSIONS (TDX)
 +M:    Kirill A. Shutemov <[email protected]>
 +R:    Dave Hansen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx
 +F:    arch/x86/boot/compressed/tdx*
 +F:    arch/x86/coco/tdx/
 +F:    arch/x86/include/asm/shared/tdx.h
 +F:    arch/x86/include/asm/tdx.h
 +F:    arch/x86/virt/vmx/tdx/
 +F:    drivers/virt/coco/tdx-guest
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -23896,7 -23873,8 +23897,7 @@@ T:   git git://git.kernel.org/pub/scm/fs/
  P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
 -F:    Documentation/filesystems/xfs-delayed-logging-design.rst
 -F:    Documentation/filesystems/xfs-self-describing-metadata.rst
 +F:    Documentation/filesystems/xfs-*
  F:    fs/xfs/
  F:    include/uapi/linux/dqblk_xfs.h
  F:    include/uapi/linux/fsmap.h
This page took 0.133871 seconds and 4 git commands to generate.