From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2016 19:12:25 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a9042defa29a01cc538b742eab047848e9b5ae14;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-linus' of git://git./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/
---

a9042defa29a01cc538b742eab047848e9b5ae14
diff --cc Documentation/device-mapper/dm-crypt.txt
index 6f15fcea9566,5e87b362ab0e..ff1f87bf26e8
--- a/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