Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  NTB: correct ntb_spad_count comment typo
  misc: ibmasm: fix typo in error message
  Remove references to dead make variable LINUX_INCLUDE
  Remove last traces of ikconfig.h
  treewide: Fix printk() message errors
  Documentation/device-mapper: s/getsize/getsz/

diff --cc Documentation/device-mapper/dm-crypt.txt
index 6f15fcea9566f3fe09374e4413aeee9654f373c2,5e87b362ab0ecfd1abfe5729b583bcf5c2e40403..ff1f87bf26e8ad10e7327ecd74a87cb3a6e64058
--- 1/Documentation/device-mapper/dm-crypt.txt
--- 2/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
@@@ -102,15 -85,9 +102,15 @@@ https://gitlab.com/cryptsetup/cryptsetu
  [[
  #!/bin/sh
  # Create a crypt device using dmsetup
- dmsetup create crypt1 --table "0 `blockdev --getsize $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"
+ dmsetup create crypt1 --table "0 `blockdev --getsz $1` crypt aes-cbc-essiv:sha256 babebabebabebabebabebabebabebabe 0 $1 0"
  ]]
  
 +[[
 +#!/bin/sh
 +# Create a crypt device using dmsetup when encryption key is stored in keyring service
 +dmsetup create crypt2 --table "0 `blockdev --getsize $1` crypt aes-cbc-essiv:sha256 :32:logon:my_prefix:my_key 0 $1 0"
 +]]
 +
  [[
  #!/bin/sh
  # Create a crypt device using cryptsetup and LUKS header with default cipher

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/firmware/efi/libstub/Makefile
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_int.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
Simple merge

diff --cc drivers/net/wireless/ath/wil6210/txrx.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge