- 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEECMNfWEw3SLnmiLkZIg7DeRspbsIFAl8DQcMACgkQIg7DeRsp
 bsKvuRAArbyG3KYcBCJ4GnNNXlXgji2MZyiHHvXgy2CwzttNVJpZUN1UHeSb6zC6
 PDp3K+bJwgH0UHSGi3cMEtPLD0ccEApXeYJ0f/dHrZ6e0YvnKR1KHy2o/givYBN0
 hvXpoSYlVZb8wtYV4Npr66NoT4Gp2RHC8ZJtouJVQ/9dIpIddI7ZmsEs4hUELgVz
 1VAknDL+FNfOrD39+psCEWyju8+W08IfVMtyGmRn5RfvLESqB7GgJtmLybng+BdJ
 3RTneFKDGogFpdgcVVDyND99+xh0zxDlXkzjVnS/lAHe9+M9X4/OAiQwctX4b5jA
 Ev0ZPX5CYcHKC9PAgW+C3/kCsP+V739ZeUwVnhPkJfsB2BkItIw3c0BXPiF/QCFq
 son5qWy4XOyWCxWAqKTrQku7W5+UDBvOmFaN3JxgIYZeM17BJsyaB6ORkVb5Jtt+
 OaFIY31apLaljt3gGBFsUgQPjrqxTsn2uHtN4JBxDss6H0zQWdJC2m+cIlZKp9s4
 Ix8QikqS08mJ9cL8RzF2lrjCdmg4cklWRKDI9EgrLAsx+fn5mWGcP7EQV3gtArm4
 3xxgGHSUUXUm//Uaqs6xI0mSOt29valljHSbdRAJfK9oaAnPDvL1RNvdBgAi73ES
 PMdnG2Tp/zYJbHjFs2bOBW3RnWpM9LrYYgTgl34D3d2J+c74z/I=
 =79cE
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-07-06 10:16:16 -07:00
commit 5c82ec00dd
8 changed files with 106 additions and 26 deletions