Changes in Makefile

762f99f4f3cb41a775b5157dd761217beba65873 - Merge branch 'next' into for-linus

Sat, 15 Jan 2022 21:09:44 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.17 merge window. List of files: /linux/drivers/crypto/qce/Makefile

5d8dfaa71d87f742c53309b95cb6a8b274119027 - Merge tag 'v5.15' into next

Thu, 09 Dec 2021 08:43:50 +0100

Merge tag 'v5.15' into nextSync up with the mainline to get the latest APIs and DT bindings. List of files: /linux/drivers/crypto/qce/Makefile

46466ae3a105d9620e1355e33125a413b8c6ce18 - Merge branch 'perf/urgent' into perf/core, to pick up fixes

Thu, 26 Aug 2021 09:14:05 +0200

Merge branch 'perf/urgent' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/qce/Makefile

c87866ede44ad7da6b296d732221dc34ce1b154d - Merge tag 'v5.14-rc6' into locking/core, to pick up fixes

Tue, 17 Aug 2021 16:16:29 +0200

Merge tag 'v5.14-rc6' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/qce/Makefile

ca31fef11dc83e672415d5925a134749761329bd - Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Tue, 27 Jul 2021 12:48:17 +0200

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-nextRequired bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/crypto/qce/Makefile

611ac726f9ebbb12f2113e5345ef109660954eeb - Merge drm/drm-next into drm-intel-gt-next

Tue, 13 Jul 2021 21:52:51 +0200

Merge drm/drm-next into drm-intel-gt-nextCatching up with 5.14-rc1 and also preparing for aneeded common topic branch for the "Minor revid/steppingand workaround cleanup"Reference: https://patchwork.freedesktop.org/series/92299/Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/crypto/qce/Makefile

d5bfbad214369f543958a1c6c55fa805e3f14976 - Merge drm/drm-next into drm-intel-next

Tue, 13 Jul 2021 21:51:31 +0200

Merge drm/drm-next into drm-intel-nextCatching up with 5.14-rc1Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/crypto/qce/Makefile

353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 - Merge branch 'fixes-v5.14' into fixes

Tue, 27 Jul 2021 10:25:08 +0200

Merge branch 'fixes-v5.14' into fixes List of files: /linux/drivers/crypto/qce/Makefile

c503c193db7d7ccc0c58b1ef694eaef331318149 - Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next

Thu, 01 Jul 2021 04:02:37 +0200

Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next List of files: /linux/drivers/crypto/qce/Makefile

857286e4c5ae5d2e860fd15d4628e707b434d7e5 - Merge remote-tracking branch 'torvalds/master' into perf/core

Wed, 30 Jun 2021 20:27:32 +0200

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/crypto/qce/Makefile

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

Tue, 29 Jun 2021 01:04:56 +0200

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "Algorithms: - Fix rmmod crash with x86/curve25519 - Add ECDH NIST P384 - Generate assembly files at build-time with perl scripts on arm - Switch to HMAC SHA512 DRBG as default DRBG Drivers: - Add sl3516 crypto engine - Add ECDH NIST P384 support in hisilicon/hpre - Add {ofb,cfb,ctr} over {aes,sm4} in hisilicon/sec - Add {ccm,gcm} over {aes,sm4} in hisilicon/sec - Enable omap hwrng driver for TI K3 family - Add support for AEAD algorithms in qce"* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (142 commits) crypto: sl3516 - depends on HAS_IOMEM crypto: hisilicon/qm - implement for querying hardware tasks status. crypto: sl3516 - Fix build warning without CONFIG_PM MAINTAINERS: update caam crypto driver maintainers list crypto: nx - Fix numerous sparse byte-order warnings crypto: nx - Fix RCU warning in nx842_OF_upd_status crypto: api - Move crypto attr definitions out of crypto.h crypto: nx - Fix memcpy() over-reading in nonce crypto: hisilicon/sec - Fix spelling mistake "fallbcak" -> "fallback" crypto: sa2ul - Remove unused auth_len variable crypto: sl3516 - fix duplicated inclusion crypto: hisilicon/zip - adds the max shaper type rate crypto: hisilicon/hpre - adds the max shaper type rate crypto: hisilicon/sec - adds the max shaper type rate crypto: hisilicon/qm - supports to inquiry each function's QoS crypto: hisilicon/qm - add pf ping single vf function crypto: hisilicon/qm - merges the work initialization process into a single function crypto: hisilicon/qm - add the "alg_qos" file node crypto: hisilicon/qm - supports writing QoS int the host crypto: api - remove CRYPTOA_U32 and related functions ... List of files: /linux/drivers/crypto/qce/Makefile

9363efb4181c5e0fbf86bdfa759262aa29f0eb50 - crypto: qce - Add support for AEAD algorithms

Thu, 29 Apr 2021 17:07:04 +0200

crypto: qce - Add support for AEAD algorithmsIntroduce support to enable following algorithms in Qualcomm Crypto Engine.- authenc(hmac(sha1),cbc(des))- authenc(hmac(sha1),cbc(des3_ede))- authenc(hmac(sha256),cbc(des))- authenc(hmac(sha256),cbc(des3_ede))- authenc(hmac(sha256),cbc(aes))- ccm(aes)- rfc4309(ccm(aes))Signed-off-by: Thara Gopinath Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/qce/Makefile

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/qce/Makefile

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/qce/Makefile

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/qce/Makefile

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/qce/Makefile

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/qce/Makefile

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/qce/Makefile

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/qce/Makefile