Loading Documentation/device-mapper/dm-crypt.txt +16 −3 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ Device-Mapper's "crypt" target provides transparent encryption of block devices using the kernel crypto API. For a more detailed description of supported parameters see: http://code.google.com/p/cryptsetup/wiki/DMCrypt https://gitlab.com/cryptsetup/cryptsetup/wikis/DMCrypt Parameters: <cipher> <key> <iv_offset> <device path> \ <offset> [<#opt_params> <opt_params>] Loading Loading @@ -51,7 +51,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> \ Otherwise #opt_params is the number of following arguments. Example of optional parameters section: 1 allow_discards 3 allow_discards same_cpu_crypt submit_from_crypt_cpus allow_discards Block discard requests (a.k.a. TRIM) are passed through the crypt device. Loading @@ -63,11 +63,24 @@ allow_discards used space etc.) if the discarded blocks can be located easily on the device later. same_cpu_crypt Perform encryption using the same cpu that IO was submitted on. The default is to use an unbound workqueue so that encryption work is automatically balanced between available CPUs. submit_from_crypt_cpus Disable offloading writes to a separate thread after encryption. There are some situations where offloading write bios from the encryption threads to a single thread degrades performance significantly. The default is to offload write bios to the same thread because it benefits CFQ to have writes submitted using the same context. Example scripts =============== LUKS (Linux Unified Key Setup) is now the preferred way to set up disk encryption with dm-crypt using the 'cryptsetup' utility, see http://code.google.com/p/cryptsetup/ https://gitlab.com/cryptsetup/cryptsetup [[ #!/bin/sh Loading Documentation/device-mapper/verity.txt +2 −2 Original line number Diff line number Diff line Loading @@ -125,7 +125,7 @@ block boundary) are the hash blocks which are stored a depth at a time The full specification of kernel parameters and on-disk metadata format is available at the cryptsetup project's wiki page http://code.google.com/p/cryptsetup/wiki/DMVerity https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity Status ====== Loading @@ -142,7 +142,7 @@ Set up a device: A command line tool veritysetup is available to compute or verify the hash tree or activate the kernel device. This is available from the cryptsetup upstream repository http://code.google.com/p/cryptsetup/ the cryptsetup upstream repository https://gitlab.com/cryptsetup/cryptsetup/ (as a libcryptsetup extension). Create hash on the device: Loading Documentation/devicetree/bindings/spi/spi_pl022.txt +1 −1 Original line number Diff line number Diff line Loading @@ -4,9 +4,9 @@ Required properties: - compatible : "arm,pl022", "arm,primecell" - reg : Offset and length of the register set for the device - interrupts : Should contain SPI controller interrupt - num-cs : total number of chipselects Optional properties: - num-cs : total number of chipselects - cs-gpios : should specify GPIOs used for chipselects. The gpios will be referred to as reg = <index> in the SPI child nodes. If unspecified, a single SPI device without a chip select can be used. Loading Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 18 SUBLEVEL = 18 SUBLEVEL = 20 EXTRAVERSION = NAME = Shuffling Zombie Juror Loading android/configs/android-base.cfg +1 −1 Original line number Diff line number Diff line Loading @@ -149,6 +149,6 @@ CONFIG_SYSVIPC=y CONFIG_TUN=y CONFIG_UNIX=y CONFIG_USB_GADGET=y CONFIG_USB_G_ANDROID=y CONFIG_USB_CONFIGFS=y CONFIG_USB_OTG_WAKELOCK=y CONFIG_XFRM_USER=y Loading
Documentation/device-mapper/dm-crypt.txt +16 −3 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ Device-Mapper's "crypt" target provides transparent encryption of block devices using the kernel crypto API. For a more detailed description of supported parameters see: http://code.google.com/p/cryptsetup/wiki/DMCrypt https://gitlab.com/cryptsetup/cryptsetup/wikis/DMCrypt Parameters: <cipher> <key> <iv_offset> <device path> \ <offset> [<#opt_params> <opt_params>] Loading Loading @@ -51,7 +51,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> \ Otherwise #opt_params is the number of following arguments. Example of optional parameters section: 1 allow_discards 3 allow_discards same_cpu_crypt submit_from_crypt_cpus allow_discards Block discard requests (a.k.a. TRIM) are passed through the crypt device. Loading @@ -63,11 +63,24 @@ allow_discards used space etc.) if the discarded blocks can be located easily on the device later. same_cpu_crypt Perform encryption using the same cpu that IO was submitted on. The default is to use an unbound workqueue so that encryption work is automatically balanced between available CPUs. submit_from_crypt_cpus Disable offloading writes to a separate thread after encryption. There are some situations where offloading write bios from the encryption threads to a single thread degrades performance significantly. The default is to offload write bios to the same thread because it benefits CFQ to have writes submitted using the same context. Example scripts =============== LUKS (Linux Unified Key Setup) is now the preferred way to set up disk encryption with dm-crypt using the 'cryptsetup' utility, see http://code.google.com/p/cryptsetup/ https://gitlab.com/cryptsetup/cryptsetup [[ #!/bin/sh Loading
Documentation/device-mapper/verity.txt +2 −2 Original line number Diff line number Diff line Loading @@ -125,7 +125,7 @@ block boundary) are the hash blocks which are stored a depth at a time The full specification of kernel parameters and on-disk metadata format is available at the cryptsetup project's wiki page http://code.google.com/p/cryptsetup/wiki/DMVerity https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity Status ====== Loading @@ -142,7 +142,7 @@ Set up a device: A command line tool veritysetup is available to compute or verify the hash tree or activate the kernel device. This is available from the cryptsetup upstream repository http://code.google.com/p/cryptsetup/ the cryptsetup upstream repository https://gitlab.com/cryptsetup/cryptsetup/ (as a libcryptsetup extension). Create hash on the device: Loading
Documentation/devicetree/bindings/spi/spi_pl022.txt +1 −1 Original line number Diff line number Diff line Loading @@ -4,9 +4,9 @@ Required properties: - compatible : "arm,pl022", "arm,primecell" - reg : Offset and length of the register set for the device - interrupts : Should contain SPI controller interrupt - num-cs : total number of chipselects Optional properties: - num-cs : total number of chipselects - cs-gpios : should specify GPIOs used for chipselects. The gpios will be referred to as reg = <index> in the SPI child nodes. If unspecified, a single SPI device without a chip select can be used. Loading
Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 18 SUBLEVEL = 18 SUBLEVEL = 20 EXTRAVERSION = NAME = Shuffling Zombie Juror Loading
android/configs/android-base.cfg +1 −1 Original line number Diff line number Diff line Loading @@ -149,6 +149,6 @@ CONFIG_SYSVIPC=y CONFIG_TUN=y CONFIG_UNIX=y CONFIG_USB_GADGET=y CONFIG_USB_G_ANDROID=y CONFIG_USB_CONFIGFS=y CONFIG_USB_OTG_WAKELOCK=y CONFIG_XFRM_USER=y