Changes in 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/rockchip/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/crypto/rockchip/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

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

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/drivers/crypto/rockchip/Makefile

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/crypto/rockchip/Makefile

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/drivers/crypto/rockchip/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/drivers/crypto/rockchip/Makefile

2ea352d5960ad469f5712cf3e293db97beac4e01 - Merge remote-tracking branch 'torvalds/master' into perf/core

Tue, 26 Nov 2019 15:06:19 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up BPF changes we'll need.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/crypto/rockchip/Makefile

642356cb5f4a8c82b5ca5ebac288c327d10df236 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Tue, 26 Nov 2019 04:49:58 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Add library interfaces of certain crypto algorithms for WireGuard - Remove the obsolete ablkcipher and blkcipher interfaces - Move add_early_randomness() out of rng_mutex Algorithms: - Add blake2b shash algorithm - Add blake2s shash algorithm - Add curve25519 kpp algorithm - Implement 4 way interleave in arm64/gcm-ce - Implement ciphertext stealing in powerpc/spe-xts - Add Eric Biggers's scalar accelerated ChaCha code for ARM - Add accelerated 32r2 code from Zinc for MIPS - Add OpenSSL/CRYPTOGRAMS poly1305 implementation for ARM and MIPS Drivers: - Fix entropy reading failures in ks-sa - Add support for sam9x60 in atmel - Add crypto accelerator for amlogic GXL - Add sun8i-ce Crypto Engine - Add sun8i-ss cryptographic offloader - Add a host of algorithms to inside-secure - Add NPCM RNG driver - add HiSilicon HPRE accelerator - Add HiSilicon TRNG driver"* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (285 commits) crypto: vmx - Avoid weird build failures crypto: lib/chacha20poly1305 - use chacha20_crypt() crypto: x86/chacha - only unregister algorithms if registered crypto: chacha_generic - remove unnecessary setkey() functions crypto: amlogic - enable working on big endian kernel crypto: sun8i-ce - enable working on big endian crypto: mips/chacha - select CRYPTO_SKCIPHER, not CRYPTO_BLKCIPHER hwrng: ks-sa - Enable COMPILE_TEST crypto: essiv - remove redundant null pointer check before kfree crypto: atmel-aes - Change data type for "lastc" buffer crypto: atmel-tdes - Set the IV after {en,de}crypt crypto: sun4i-ss - fix big endian issues crypto: sun4i-ss - hide the Invalid keylen message crypto: sun4i-ss - use crypto_ahash_digestsize crypto: sun4i-ss - remove dependency on not 64BIT crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c MAINTAINERS: Add maintainer for HiSilicon SEC V2 driver crypto: hisilicon - add DebugFS for HiSilicon SEC Documentation: add DebugFS doc for HiSilicon SEC crypto: hisilicon - add SRIOV for HiSilicon SEC ... List of files: /linux/drivers/crypto/rockchip/Makefile

ce0183cb6464bacc170ccfddb4d93bbe10d1045b - crypto: rockchip - switch to skcipher API

Sat, 09 Nov 2019 18:09:48 +0100

crypto: rockchip - switch to skcipher APICommit 7a7ffe65c8c5 ("crypto: skcipher - Add top-level skcipher interface")dated 20 august 2015 introduced the new skcipher API which is supposed toreplace both blkcipher and ablkcipher. While all consumers of the API havebeen converted long ago, some producers of the ablkcipher remain, forcingus to keep the ablkcipher support routines alive, along with the matchingcode to expose [a]blkciphers via the skcipher API.So switch this driver to the skcipher API, allowing us to finally drop theablkcipher code in the near future.Cc: Heiko Stuebner Signed-off-by: Ard Biesheuvel Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/rockchip/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/crypto/rockchip/Makefile

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 - Merge branch 'next' into for-linus

Sat, 20 Jul 2019 06:07:56 +0200

Merge branch 'next' into for-linusPrepare second round of input updates for 5.3 merge window. List of files: /linux/drivers/crypto/rockchip/Makefile

ecb41832bd2a7a3f8ac93527cec5e51e3827daed - Merge tag 'v5.2' into next

Mon, 15 Jul 2019 18:42:32 +0200

Merge tag 'v5.2' into nextSync up with mainline to resolve conflicts in iforce driver. List of files: /linux/drivers/crypto/rockchip/Makefile

74acee309fb2a434dce215d44014e6f8e06975ae - Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Wed, 10 Jul 2019 01:39:57 +0200

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus List of files: /linux/drivers/crypto/rockchip/Makefile

3c53c6255d598db7084c5c3d7553d7200e857818 - Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Mon, 08 Jul 2019 14:45:20 +0200

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.3This is a very big update, mainly thanks to Morimoto-san's refactoringwork and some fairly large new drivers. - Lots more work on moving towards a component based framework from Morimoto-san. - Support for force disconnecting muxes from Jerome Brunet. - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant CX2072X, Realtek RT1011 and RT1308.Signed-off-by: Takashi Iwai List of files: /linux/drivers/crypto/rockchip/Makefile

1d2af80d581d1bae81594e497cd57e345235b940 - Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

Sat, 06 Jul 2019 22:51:56 +0200

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/nextNAND core changes:- use longest matching pattern in ->exec_op() default parser- export NAND operation tracer- add flag to indicate panic_write in MTD- use kzalloc() instead of kmalloc() and memset()Raw NAND controller drivers changes:- brcmnand: * fix BCH ECC layout for large page NAND parts * fallback to detected ecc-strength, ecc-step-size * when oops in progress use pio and interrupt polling * code refactor code to introduce helper functions * add support for v7.3 controller- FSMC: * use nand_op_trace for operation tracing- GPMI: * move all driver code into single file * various cleanups (including dmaengine changes) * use runtime PM to manage clocks * implement exec_op- MTK: * correct low level time calculation of r/w cycle * improve data sampling timing for read cycle * add validity check for CE# pin setting * fix wrongly assigned OOB buffer pointer issue * re-license MTK NAND driver as Dual MIT/GPL- STM32: * manage the get_irq error case * increase DMA completion timeoutsRaw NAND chips drivers changes:- Macronix: add read-retry supportOnenand driver changes:- add support for 8Gb datasize chips- avoid fall-through warningsSPI-NAND changes:- define macros for page-read ops with three-byte addresses- add support for two-byte device IDs and then for GigaDevice GD5F1GQ4UFxxG- add initial support for Paragon PN26G0xA- handle the case where the last page read has bitflips List of files: /linux/drivers/crypto/rockchip/Makefile

371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 - Merge tag 'v5.2-rc6' into rdma.git for-next

Sat, 29 Jun 2019 02:18:23 +0200

Merge tag 'v5.2-rc6' into rdma.git for-nextFor dependencies in next patches.Resolve conflicts:- Use uverbs_get_cleared_udata() with new cq allocation flow- Continue to delete nes despite SPDX conflict- Resolve list appends in mlx5_command_str()- Use u16 for vport_rule stuff- Resolve list appends in struct ib_clientSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/crypto/rockchip/Makefile

53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 - Merge tag 'v5.2-rc6' into asoc-5.3

Wed, 26 Jun 2019 13:39:34 +0200

Merge tag 'v5.2-rc6' into asoc-5.3Linux 5.2-rc6 List of files: /linux/drivers/crypto/rockchip/Makefile

355a47ae7ebcf9d605aa809b259d380422e81b8d - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Wed, 26 Jun 2019 12:22:54 +0200

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixesSome fixes have been accidentally pushed to this, so I cannot fost-forward.Required to pull in the remove-fbcon-notifiers fixes.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/crypto/rockchip/Makefile

2ee692802b8f6c54bd6499addd3d07c2833d84d8 - Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-next

Wed, 19 Jun 2019 15:18:48 +0200

Merge tag 'topic/remove-fbcon-notifiers-2019-06-14-1' of git://anongit.freedesktop.org/drm/drm-misc into fbdev-for-nexttopic/remove-fbcon-notifiers:- remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking- assorted locking checks in vt/console code- assorted notifier and cleanups in fbdev and backlight codeOne trivial merge conflict fixed.Signed-off-by: Bartlomiej Zolnierkiewicz List of files: /linux/drivers/crypto/rockchip/Makefile