Changes in Makefile

1260ed77798502de9c98020040d2995008de10cc - Merge drm/drm-fixes into drm-misc-fixes

Tue, 08 Apr 2025 10:15:47 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get updates from v6.15-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

946661e3bef8efa11ba8079d4ebafe6fc3b0aaad - Merge branch 'next' into for-linus

Sat, 05 Apr 2025 08:04:35 +0200

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

0b119045b79a672bc6d8f18641c60fc8ce1b4585 - Merge tag 'v6.14-rc4' into next

Wed, 26 Feb 2025 01:03:25 +0100

Merge tag 'v6.14-rc4' into nextSync up with the mainline. List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

9e676a024fa1fa2bd8150c2d2ba85478280353bc - Merge tag 'v6.14-rc1' into perf-tools-next

Wed, 05 Feb 2025 23:57:18 +0100

Merge tag 'v6.14-rc1' into perf-tools-nextTo get the various fixes in the current master.Signed-off-by: Namhyung Kim List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

0410c6121529409b08e81a77ae3ee58c657e2243 - Merge drm/drm-next into drm-xe-next

Fri, 28 Feb 2025 15:54:14 +0100

Merge drm/drm-next into drm-xe-nextSync to fix conlicts between drm-xe-next and drm-intel-next.Signed-off-by: Lucas De Marchi List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

93c7dd1b39444ebd5a6a98e56a363d7a4e646775 - Merge drm/drm-next into drm-misc-next

Thu, 06 Feb 2025 13:47:32 +0100

Merge drm/drm-next into drm-misc-nextBring rc1 to start the new release dev.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

ea9f8f2b21795a5d80418a655bcb212d5b89e08f - Merge drm/drm-next into drm-intel-next

Wed, 05 Feb 2025 18:12:37 +0100

Merge drm/drm-next into drm-intel-nextSync with v6.14-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

b3cc7428a32202936904b5b07cf9f135025bafd6 - Merge branch 'for-6.15/amd_sfh' into for-linus

Wed, 26 Mar 2025 13:42:07 +0100

Merge branch 'for-6.15/amd_sfh' into for-linusFrom: Mario Limonciello Some platforms include a human presence detection (HPD) sensor. Whenenabled and a user is detected a wake event will be emitted from thesensor fusion hub that software can react to.Example use cases are "wake from suspend on approach" or to "lockwhen leaving".This is currently enabled by default on supported systems, but userscan't control it. This essentially means that wake on approach isenabled which is a really surprising behavior to users that don'texpect it.Instead of defaulting to enabled add a sysfs knob that users canuse to enable the feature if desirable and set it to disabled bydefault. List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

454cb97726fe62a04b187a0d631ec0a69f6b713a - Merge tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Fri, 24 Jan 2025 16:48:10 +0100

Merge tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Remove physical address skcipher walking - Fix boot-up self-test race Algorithms: - Optimisations for x86/aes-gcm - Optimisations for x86/aes-xts - Remove VMAC - Remove keywrap Drivers: - Remove n2 Others: - Fixes for padata UAF - Fix potential rhashtable deadlock by moving schedule_work outside lock"* tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (75 commits) rhashtable: Fix rhashtable_try_insert test dt-bindings: crypto: qcom,inline-crypto-engine: Document the SM8750 ICE dt-bindings: crypto: qcom,prng: Document SM8750 RNG dt-bindings: crypto: qcom-qce: Document the SM8750 crypto engine crypto: asymmetric_keys - Remove unused key_being_used_for[] padata: avoid UAF for reorder_work padata: fix UAF in padata_reorder padata: add pd get/put refcnt helper crypto: skcipher - call cond_resched() directly crypto: skcipher - optimize initializing skcipher_walk fields crypto: skcipher - clean up initialization of skcipher_walk::flags crypto: skcipher - fold skcipher_walk_skcipher() into skcipher_walk_virt() crypto: skcipher - remove redundant check for SKCIPHER_WALK_SLOW crypto: skcipher - remove redundant clamping to page size crypto: skcipher - remove unnecessary page alignment of bounce buffer crypto: skcipher - document skcipher_walk_done() and rename some vars crypto: omap - switch from scatter_walk to plain offset crypto: powerpc/p10-aes-gcm - simplify handling of linear associated data crypto: bcm - Drop unused setting of local 'ptr' variable crypto: hisilicon/qm - support new function communication ... List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

09463346b6c23672cdd451f500d2a23b792bd6f0 - crypto: hisilicon/zip - add data aggregation feature

Fri, 15 Nov 2024 12:26:50 +0100

crypto: hisilicon/zip - add data aggregation featureThe zip device adds data aggregation feature, data with thesame key can be combined.This patch enables the device data aggregation feature.New feature is called "hashagg" name and registered tothe uacce subsystem to allow applications to submit dataaggregation operations in user space.Signed-off-by: Weili Qian Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

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

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

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

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/hisilicon/zip/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/hisilicon/zip/Makefile