diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-06 10:16:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-06 10:16:16 -0700 |
| commit | 5c82ec00dd00c7a2b02d4b42cf59ae87592cb75f (patch) | |
| tree | e4bbe6a3b6b0a62ffcf3e00ded87f566cf33ec2e /tools/testing/selftests/bpf/prog_tests/skb_helpers.c | |
| parent | dcb7fd82c75ee2d6e6f9d8cc71c52519ed52e258 (diff) | |
| parent | 075ebfe19fa3fa8838d2afdde5e87c86b7953b1e (diff) | |
Merge tag 's390-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Heiko Carstens:
- Initialize jump labels before early command line parsing in order to
make init_on_alloc and init_on_free options work
- Fix vfio-ccw build error due to missing include
- Prevent callchain data collection with hardware sampling, since the
callchains simply do not exist
- Prevent multiple registrations of the same zPCI function
- Update defconfigs
* tag 's390-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
vfio-ccw: Fix a build error due to missing include of linux/slab.h
s390: update defconfigs
s390/cpum_sf: prohibit callchain data collection
s390/setup: init jump labels before command line parsing
s390/maccess: add no DAT mode to kernel_write
s390/pci: fix enabling a reserved PCI function
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/skb_helpers.c')
0 files changed, 0 insertions, 0 deletions