linux-kernel - linux-next: manual merge of the s390 tree with the s390-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190915174354.GB4352@sirena.co.uk>
Date:   Sun, 15 Sep 2019 18:43:54 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Heiko Carstens <heiko.carstens@...ibm.com>,
        Vasily Gorbik <gor@...ux.ibm.com>,
        Christian Borntraeger <borntraeger@...ibm.com>,
        Joerg Schmidbauer <jschmidb@...ibm.com>,
        Ingo Franzki <ifranzki@...ux.ibm.com>,
        Harald Freudenberger <freude@...ux.ibm.com>
Cc:     linux-s390@...r.kernel.org,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the s390 tree with the s390-fixes tree

Hi all,

Today's linux-next merge of the s390 tree got a conflict in:

  arch/s390/configs/debug_defconfig

between commit:

  3361f3193c747e8b ("s390: update configs")

from the s390-fixes tree and commit:

  3c2eb6b76cabb7d9 ("s390/crypto: Support for SHA3 via CPACF (MSA6)")

from the s390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/s390/configs/debug_defconfig
index 74e78ec5beb68,a08e3dcd3e9db..0000000000000
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@@ -638,99 -580,6 +638,101 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_NLS_ISO8859_15=m
  CONFIG_NLS_UTF8=m
  CONFIG_DLM=m
 +CONFIG_UNICODE=y
 +CONFIG_PERSISTENT_KEYRINGS=y
 +CONFIG_BIG_KEYS=y
 +CONFIG_ENCRYPTED_KEYS=m
 +CONFIG_SECURITY=y
 +CONFIG_SECURITY_NETWORK=y
 +CONFIG_FORTIFY_SOURCE=y
 +CONFIG_SECURITY_SELINUX=y
 +CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 +CONFIG_SECURITY_SELINUX_DISABLE=y
 +CONFIG_INTEGRITY_SIGNATURE=y
 +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 +CONFIG_IMA=y
 +CONFIG_IMA_DEFAULT_HASH_SHA256=y
 +CONFIG_IMA_WRITE_POLICY=y
 +CONFIG_IMA_APPRAISE=y
 +CONFIG_CRYPTO_USER=m
 +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 +CONFIG_CRYPTO_PCRYPT=m
 +CONFIG_CRYPTO_CRYPTD=m
 +CONFIG_CRYPTO_TEST=m
 +CONFIG_CRYPTO_DH=m
 +CONFIG_CRYPTO_ECDH=m
 +CONFIG_CRYPTO_ECRDSA=m
 +CONFIG_CRYPTO_CHACHA20POLY1305=m
 +CONFIG_CRYPTO_AEGIS128=m
 +CONFIG_CRYPTO_AEGIS128L=m
 +CONFIG_CRYPTO_AEGIS256=m
 +CONFIG_CRYPTO_MORUS640=m
 +CONFIG_CRYPTO_MORUS1280=m
 +CONFIG_CRYPTO_CFB=m
 +CONFIG_CRYPTO_LRW=m
 +CONFIG_CRYPTO_PCBC=m
 +CONFIG_CRYPTO_KEYWRAP=m
 +CONFIG_CRYPTO_ADIANTUM=m
 +CONFIG_CRYPTO_XCBC=m
 +CONFIG_CRYPTO_VMAC=m
 +CONFIG_CRYPTO_CRC32=m
 +CONFIG_CRYPTO_XXHASH=m
 +CONFIG_CRYPTO_MICHAEL_MIC=m
 +CONFIG_CRYPTO_RMD128=m
 +CONFIG_CRYPTO_RMD160=m
 +CONFIG_CRYPTO_RMD256=m
 +CONFIG_CRYPTO_RMD320=m
 +CONFIG_CRYPTO_SHA3=m
 +CONFIG_CRYPTO_SM3=m
 +CONFIG_CRYPTO_TGR192=m
 +CONFIG_CRYPTO_WP512=m
 +CONFIG_CRYPTO_AES_TI=m
 +CONFIG_CRYPTO_ANUBIS=m
 +CONFIG_CRYPTO_ARC4=m
 +CONFIG_CRYPTO_BLOWFISH=m
 +CONFIG_CRYPTO_CAMELLIA=m
 +CONFIG_CRYPTO_CAST5=m
 +CONFIG_CRYPTO_CAST6=m
 +CONFIG_CRYPTO_FCRYPT=m
 +CONFIG_CRYPTO_KHAZAD=m
 +CONFIG_CRYPTO_SALSA20=m
 +CONFIG_CRYPTO_SEED=m
 +CONFIG_CRYPTO_SERPENT=m
 +CONFIG_CRYPTO_SM4=m
 +CONFIG_CRYPTO_TEA=m
 +CONFIG_CRYPTO_TWOFISH=m
 +CONFIG_CRYPTO_842=m
 +CONFIG_CRYPTO_LZ4=m
 +CONFIG_CRYPTO_LZ4HC=m
 +CONFIG_CRYPTO_ZSTD=m
 +CONFIG_CRYPTO_ANSI_CPRNG=m
 +CONFIG_CRYPTO_USER_API_HASH=m
 +CONFIG_CRYPTO_USER_API_SKCIPHER=m
 +CONFIG_CRYPTO_USER_API_RNG=m
 +CONFIG_CRYPTO_USER_API_AEAD=m
 +CONFIG_CRYPTO_STATS=y
 +CONFIG_ZCRYPT=m
 +CONFIG_PKEY=m
 +CONFIG_CRYPTO_PAES_S390=m
 +CONFIG_CRYPTO_SHA1_S390=m
 +CONFIG_CRYPTO_SHA256_S390=m
 +CONFIG_CRYPTO_SHA512_S390=m
++CONFIG_CRYPTO_SHA3_256_S390=m
++CONFIG_CRYPTO_SHA3_512_S390=m
 +CONFIG_CRYPTO_DES_S390=m
 +CONFIG_CRYPTO_AES_S390=m
 +CONFIG_CRYPTO_GHASH_S390=m
 +CONFIG_CRYPTO_CRC32_S390=y
 +CONFIG_CORDIC=m
 +CONFIG_CRC32_SELFTEST=y
 +CONFIG_CRC4=m
 +CONFIG_CRC7=m
 +CONFIG_CRC8=m
 +CONFIG_RANDOM32_SELFTEST=y
 +CONFIG_DMA_CMA=y
 +CONFIG_CMA_SIZE_MBYTES=0
 +CONFIG_DMA_API_DEBUG=y
 +CONFIG_STRING_SELFTEST=y
  CONFIG_PRINTK_TIME=y
  CONFIG_DYNAMIC_DEBUG=y
  CONFIG_DEBUG_INFO=y


Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)