diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-03 11:58:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-03 11:58:26 -0800 |
commit | fee5be18524f961de653fe6103f927c84ebbfd38 (patch) | |
tree | 8833d94d853a0f118cd2b166a80850af0e8a2054 /net/mac80211/driver-ops.h | |
parent | c82a505c007fb754af144d5157e05fa7fd858157 (diff) | |
parent | b1cae1f84a0f609a34ebcaa087fbecef32f69882 (diff) | |
download | linux-fee5be18524f961de653fe6103f927c84ebbfd38.tar.bz2 |
Merge tag 's390-5.10-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Heiko Carstens:
"One commit is fixing lockdep irq state tracing which broke with -rc6.
The other one fixes logical vs physical CPU address mixup in our PCI
code.
Summary:
- fix lockdep irq state tracing
- fix logical vs physical CPU address confusion in PCI code"
* tag 's390-5.10-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: fix irq state tracing
s390/pci: fix CPU address in MSI for directed IRQ
Diffstat (limited to 'net/mac80211/driver-ops.h')
0 files changed, 0 insertions, 0 deletions