Changes in Kconfig

4b4193256c8d3bc3a5397b5cd9494c2ad386317d - Merge branch 'next' into for-linus

Tue, 15 Dec 2020 01:27:23 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.11 merge window. List of files: /linux/drivers/crypto/amlogic/Kconfig

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 03:13:23 +0100

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/drivers/crypto/amlogic/Kconfig

0ea8a56de21be24cb79abb03dee79aabcd60a316 - Merge drm/drm-next into drm-intel-next-queued

Sat, 12 Sep 2020 02:00:20 +0200

Merge drm/drm-next into drm-intel-next-queuedSync drm-intel-gt-next here so we can have an unified fixes flow.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/crypto/amlogic/Kconfig

9ddb236f13594b34a12dacf69a5adca7a1aef35e - Merge branch 'for-linus' into for-next

Wed, 09 Sep 2020 18:26:07 +0200

Merge branch 'for-linus' into for-nextBack-merge to apply the tasklet conversion patches that are basedon the already applied tasklet API changes on 5.9-rc4.Signed-off-by: Takashi Iwai List of files: /linux/drivers/crypto/amlogic/Kconfig

6bde8ef51c917a657476310728d6cb3de6bac9e4 - Merge branch 'topic/tasklet-convert' into for-linus

Wed, 02 Sep 2020 13:31:45 +0200

Merge branch 'topic/tasklet-convert' into for-linusPull tasklet API conversions.Signed-off-by: Takashi Iwai List of files: /linux/drivers/crypto/amlogic/Kconfig

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/drivers/crypto/amlogic/Kconfig

3bec5b6aae830355e786e204b20a7cea38c3a8ed - Merge tag 'v5.9-rc2' into regulator-5.9

Tue, 25 Aug 2020 12:01:46 +0200

Merge tag 'v5.9-rc2' into regulator-5.9Linux 5.9-rc2 List of files: /linux/drivers/crypto/amlogic/Kconfig

1959ba4e40ce40c380dbe868433f5c4b20bb1ba3 - Merge tag 'v5.9-rc2' into asoc-5.9

Tue, 25 Aug 2020 12:00:43 +0200

Merge tag 'v5.9-rc2' into asoc-5.9Linux 5.9-rc2 List of files: /linux/drivers/crypto/amlogic/Kconfig

2d9ad4cfaf4d32a64a4ed556e5bcab9121215026 - Merge tag 'v5.9-rc2' into drm-misc-fixes

Tue, 25 Aug 2020 11:00:02 +0200

Merge tag 'v5.9-rc2' into drm-misc-fixesBackmerge requested by Tomi for a fix to omap inconsistentlocking state issue, and because we need at least v5.9-rc2 now.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/crypto/amlogic/Kconfig

d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa - Merge v5.9-rc1 into drm-misc-next

Tue, 18 Aug 2020 14:14:25 +0200

Merge v5.9-rc1 into drm-misc-nextSam needs 5.9-rc1 to have dev_err_probe in to merge some patches.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/amlogic/Kconfig

94fb1afb14c4f0ceb8c5508ddddac6819f662e95 - Mgerge remote-tracking branch 'torvalds/master' into perf/core

Thu, 06 Aug 2020 13:15:47 +0200

Mgerge remote-tracking branch 'torvalds/master' into perf/coreTo sync headers, for instance, in this case tools/perf was ahead ofupstream till Linus merged tip/perf/core to get thePERF_RECORD_TEXT_POKE changes: Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h' diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.hSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/crypto/amlogic/Kconfig

ab5c60b79ab6cc50b39bbb21b2f9fb55af900b84 - Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Mon, 03 Aug 2020 19:40:14 +0200

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Add support for allocating transforms on a specific NUMA Node - Introduce the flag CRYPTO_ALG_ALLOCATES_MEMORY for storage users Algorithms: - Drop PMULL based ghash on arm64 - Fixes for building with clang on x86 - Add sha256 helper that does the digest in one go - Add SP800-56A rev 3 validation checks to dh Drivers: - Permit users to specify NUMA node in hisilicon/zip - Add support for i.MX6 in imx-rngc - Add sa2ul crypto driver - Add BA431 hwrng driver - Add Ingenic JZ4780 and X1000 hwrng driver - Spread IRQ affinity in inside-secure and marvell/cesa"* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (157 commits) crypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR hwrng: core - remove redundant initialization of variable ret crypto: x86/curve25519 - Remove unused carry variables crypto: ingenic - Add hardware RNG for Ingenic JZ4780 and X1000 dt-bindings: RNG: Add Ingenic RNG bindings. crypto: caam/qi2 - add module alias crypto: caam - add more RNG hw error codes crypto: caam/jr - remove incorrect reference to caam_jr_register() crypto: caam - silence .setkey in case of bad key length crypto: caam/qi2 - create ahash shared descriptors only once crypto: caam/qi2 - fix error reporting for caam_hash_alloc crypto: caam - remove deadcode on 32-bit platforms crypto: ccp - use generic power management crypto: xts - Replace memcpy() invocation with simple assignment crypto: marvell/cesa - irq balance crypto: inside-secure - irq balance crypto: ecc - SP800-56A rev 3 local public key validation crypto: dh - SP800-56A rev 3 local public key validation crypto: dh - check validity of Z before export lib/mpi: Add mpi_sub_ui() ... List of files: /linux/drivers/crypto/amlogic/Kconfig

3f368b886e95080daf811d228795c28716495279 - crypto: amlogic-gxl - default to build as module

Tue, 07 Jul 2020 08:31:51 +0200

crypto: amlogic-gxl - default to build as moduleThe AmLogic GXL crypto accelerator driver is built into the kernel ifARCH_MESON is set. However, given the single image policy of arm64, itsdefconfig enables all platforms by default, and so ARCH_MESON is usuallyenabled.This means that the AmLogic driver causes the arm64 defconfig build topull in a huge chunk of the crypto stack as a builtin as well, which isundesirable, so let's make the amlogic GXL driver default to 'm' instead.Signed-off-by: Ard Biesheuvel Tested-by: Corentin Labbe Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/amlogic/Kconfig

8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/drivers/crypto/amlogic/Kconfig

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/drivers/crypto/amlogic/Kconfig

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/drivers/crypto/amlogic/Kconfig

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/amlogic/Kconfig

ff36e78fdb251b9fa65028554689806961e011eb - Merge drm/drm-next into drm-intel-next-queued

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/amlogic/Kconfig

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/crypto/amlogic/Kconfig