diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-21 13:51:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-21 13:51:26 -0700 |
| commit | 3d5895cd351757f69c9a66fb5fc8cf19f454d773 (patch) | |
| tree | e6287d47be3368477286f9e476072c02ec291358 /drivers/mmc | |
| parent | 7b6ae471e5415bc2bf4384a83ccb4c21de7824c0 (diff) | |
| parent | 0cde560a8bfc3cb790715f39d4535129cca9e6ae (diff) | |
Merge tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Heiko Carstens:
- fix / add expoline usage in "DMA" code
- fix compat vdso Makefile to avoid permanent rebuild
- fix ftrace_update_ftrace_func to avoid NULL pointer dereference
- update defconfigs
- trivial coding style fix
* tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfigs
s390/cpumf: fix semicolon.cocci warnings
s390/boot: fix use of expolines in the DMA code
s390/ftrace: fix ftrace_update_ftrace_func implementation
s390/defconfig: allow early device mapper disks
s390/vdso32: add vdso32.lds to targets
Diffstat (limited to 'drivers/mmc')
0 files changed, 0 insertions, 0 deletions