diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-02 09:29:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-02 09:29:54 -0700 |
| commit | 66242ef25eedc5b48d46c4b60f5d453763adf2b8 (patch) | |
| tree | 20d8e8732c1d8f9c585d4a4314ec0bfc27377a13 /drivers | |
| parent | 29ccb40f2b543ccb1d143e54e8227b80d277bc2f (diff) | |
| parent | 33bd8d153c337ba9b30a2e5994437ca703ab4ed8 (diff) | |
| download | linux-stable-66242ef25eedc5b48d46c4b60f5d453763adf2b8.tar.gz linux-stable-66242ef25eedc5b48d46c4b60f5d453763adf2b8.tar.bz2 linux-stable-66242ef25eedc5b48d46c4b60f5d453763adf2b8.zip | |
Merge tag 's390-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- remove unused empty CPU alternatives header file
- fix recently and erroneously removed exception handling when loading
an invalid floating point register
- ptdump fixes to reflect the recent changes due to the uncoupling of
physical vs virtual kernel address spaces
- changes to avoid the unnecessary splitting of large pages in kernel
mappings
- add the missing MODULE_DESCRIPTION for the CIO modules
* tag 's390-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: Keep inittext section writable
s390/vmlinux.lds.S: Move ro_after_init section behind rodata section
s390/mm: Get rid of RELOC_HIDE()
s390/mm/ptdump: Improve sorting of markers
s390/mm/ptdump: Add support for relocated lowcore mapping
s390/mm/ptdump: Fix handling of identity mapping area
s390/cio: Add missing MODULE_DESCRIPTION() macros
s390/alternatives: Remove unused empty header file
s390/fpu: Re-add exception handling in load_fpu_state()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/ccwgroup.c | 1 | ||||
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_drv.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index b72f672a7720..66b1bdc63284 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c @@ -550,4 +550,5 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev) put_device(&gdev->dev); } EXPORT_SYMBOL(ccwgroup_remove_ccwdev); +MODULE_DESCRIPTION("ccwgroup bus driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index 8ad49030a7bf..914dde041675 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c @@ -488,4 +488,5 @@ static void __exit vfio_ccw_sch_exit(void) module_init(vfio_ccw_sch_init); module_exit(vfio_ccw_sch_exit); +MODULE_DESCRIPTION("VFIO based Subchannel device driver"); MODULE_LICENSE("GPL v2"); |