Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index f1ed53c3aa44..71d9f81f6eed 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -66,8 +66,6 @@ config CRC16
 
 config CRC_T10DIF
         tristate "CRC calculation for the T10 Data Integrity Field"
-        select CRYPTO
-        select CRYPTO_CRCT10DIF
         help
           This option is only needed if a module that's not in the
           kernel tree needs to calculate CRC checks for use with the
@@ -194,6 +192,15 @@ config LZO_COMPRESS
 config LZO_DECOMPRESS
         tristate
 
+config LZ4_COMPRESS
+        tristate
+
+config LZ4HC_COMPRESS
+        tristate
+
+config LZ4_DECOMPRESS
+        tristate
+
 source "lib/xz/Kconfig"
 
 #
@@ -218,6 +225,10 @@ config DECOMPRESS_LZO
         select LZO_DECOMPRESS
         tristate
 
+config DECOMPRESS_LZ4
+        select LZ4_DECOMPRESS
+        tristate
+
 #
 # Generic allocator support is selected if needed
 #