Changes in Makefile

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 08:24:10 +0200

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

2a267e7c41aa88215de2b542de797d03d16ecdfd - Merge tag 'v5.1' into next

Fri, 10 May 2019 20:43:46 +0200

Merge tag 'v5.1' into nextSync up with mainline to bring in the latest APIs. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

95d002e0a34cb0f238abb39987f9980f325d8332 - Merge tag 'drm-intel-next-2019-04-04' into gvt-next

Tue, 16 Apr 2019 10:50:34 +0200

Merge tag 'drm-intel-next-2019-04-04' into gvt-nextMerge back drm-intel-next for engine name definition refinementand 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than addresses")that would need gvt fixes to depend on.Signed-off-by: Zhenyu Wang List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

82ffd0454bd9bd57780966d47bfd56d579dd4fb3 - Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Thu, 07 Feb 2019 16:44:43 +0100

Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 5.0-rc5Sync with upstream (which now contains fbdev-v5.0-rc3 changes) toprepare a base for fbdev-v5.1 changes. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

3eb66e91a25497065c5322b1268cbc3953642227 - Merge tag 'v4.20' into for-linus

Tue, 15 Jan 2019 00:33:23 +0100

Merge tag 'v4.20' into for-linusSync with mainline to get linux/overflow.h among other things. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

4116941b7a703f8c770998bb3a59966608cb5bb2 - Merge tag 'v4.20' into next

Mon, 14 Jan 2019 07:35:32 +0100

Merge tag 'v4.20' into nextMerge with mainline to bring in the new APIs. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

23d19ba06b9c5614d6457f5fed349ec8f6d4dac9 - Merge drm/drm-next into drm-misc-next

Fri, 11 Jan 2019 16:32:10 +0100

Merge drm/drm-next into drm-misc-nextdrm-next has been forwarded to 5.0-rc1, and we need it to apply the damagehelper for dirtyfb series from Noralf Trønnes.Signed-off-by: Maxime Ripard List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

49e41801b335f64610bbfd23e8f2bbaf34d46276 - Merge tag 'v5.0-rc1' into next-general

Thu, 10 Jan 2019 20:41:59 +0100

Merge tag 'v5.0-rc1' into next-generalLinux 5.0-rc1Sync to pick up LSM stacking work (which is based on -rc1). List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

3eb0930a425b086bdab38156aa4708427479a201 - Merge drm/drm-next into drm-intel-next-queued

Tue, 08 Jan 2019 09:50:22 +0100

Merge drm/drm-next into drm-intel-next-queuedGenerally catch up with 5.0-rc1, and specifically get the changes:96d4f267e40f ("Remove 'type' argument from access_ok() function")0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")Signed-off-by: Jani Nikula List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

d538d94f0ca86cfedc892cc427169219acb3c2f7 - Merge branch 'master' into fixes

Fri, 04 Jan 2019 12:07:47 +0100

Merge branch 'master' into fixesWe have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'argument from access_ok() function"), so merge master to get it. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

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

Thu, 27 Dec 2018 22:53:32 +0100

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Add 1472-byte test to tcrypt for IPsec - Reintroduced crypto stats interface with numerous changes - Support incremental algorithm dumps Algorithms: - Add xchacha12/20 - Add nhpoly1305 - Add adiantum - Add streebog hash - Mark cts(cbc(aes)) as FIPS allowed Drivers: - Improve performance of arm64/chacha20 - Improve performance of x86/chacha20 - Add NEON-accelerated nhpoly1305 - Add SSE2 accelerated nhpoly1305 - Add AVX2 accelerated nhpoly1305 - Add support for 192/256-bit keys in gcmaes AVX - Add SG support in gcmaes AVX - ESN for inline IPsec tx in chcr - Add support for CryptoCell 703 in ccree - Add support for CryptoCell 713 in ccree - Add SM4 support in ccree - Add SM3 support in ccree - Add support for chacha20 in caam/qi2 - Add support for chacha20 + poly1305 in caam/jr - Add support for chacha20 + poly1305 in caam/qi2 - Add AEAD cipher support in cavium/nitrox"* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (130 commits) crypto: skcipher - remove remnants of internal IV generators crypto: cavium/nitrox - Fix build with !CONFIG_DEBUG_FS crypto: salsa20-generic - don't unnecessarily use atomic walk crypto: skcipher - add might_sleep() to skcipher_walk_virt() crypto: x86/chacha - avoid sleeping under kernel_fpu_begin() crypto: cavium/nitrox - Added AEAD cipher support crypto: mxc-scc - fix build warnings on ARM64 crypto: api - document missing stats member crypto: user - remove unused dump functions crypto: chelsio - Fix wrong error counter increments crypto: chelsio - Reset counters on cxgb4 Detach crypto: chelsio - Handle PCI shutdown event crypto: chelsio - cleanup:send addr as value in function argument crypto: chelsio - Use same value for both channel in single WR crypto: chelsio - Swap location of AAD and IV sent in WR crypto: chelsio - remove set but not used variable 'kctx_len' crypto: ux500 - Use proper enum in hash_set_dma_transfer crypto: ux500 - Use proper enum in cryp_set_dma_transfer crypto: aesni - Add scatter/gather avx stubs, and use them in C crypto: aesni - Introduce partial block macro .. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

c9613335bf4fe259a654aa0e9701f0c4cddc12ba - crypto: cavium/nitrox - Added AEAD cipher support

Fri, 14 Dec 2018 12:19:51 +0100

crypto: cavium/nitrox - Added AEAD cipher supportAdded support to offload AEAD ciphers to NITROX. Currently supportedAEAD cipher is 'gcm(aes)'.Signed-off-by: Nagadheeraj Rottela Reviewed-by: Srikanth Jampala Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

31d1b7710262fba12282b24083f20dc76e0efc93 - Merge tag 'v4.20-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Thu, 20 Dec 2018 15:35:07 +0100

Merge tag 'v4.20-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.20-rc7Sync with upstream (which now contains fbdev-v4.20 changes) toprepare a base for fbdev-v4.21 changes. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

cf718eaa8f9b2cb8a372dcfd5ef701188e233558 - crypto: cavium/nitrox - Enabled Mailbox support

Tue, 04 Dec 2018 13:55:54 +0100

crypto: cavium/nitrox - Enabled Mailbox supportEnabled the PF->VF Mailbox support. Mailbox message are interpretedas {type, opcode, data}. Supported message types are REQ, ACK and NACK.Signed-off-by: Srikanth Jampala Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

2ac5e38ea4203852d6e99edd3cf11f044b0a409f - Merge drm/drm-next into drm-intel-next-queued

Tue, 20 Nov 2018 12:14:08 +0100

Merge drm/drm-next into drm-intel-next-queuedPull in v4.20-rc3 via drm-next.Signed-off-by: Jani Nikula List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

0ea0397a3a12f9720d6acb78a48da796a54e81aa - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Tue, 13 Nov 2018 10:58:49 +0100

Merge remote-tracking branch 'drm/drm-next' into drm-misc-nextdrm-next is forwarded to v4.20-rc1, and we need this to makea patch series apply.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

26b76320a8a550472bbb8f42257df83fcb8d8df6 - Merge tag 'v4.20-rc2' into next-general

Mon, 12 Nov 2018 18:07:41 +0100

Merge tag 'v4.20-rc2' into next-generalSync to Linux 4.20-rc2 for downstream developers. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

07fa3fa2572f2dee85beb8137f90ccf33d7206af - Merge tag 'v4.20-rc1' into omap-for-v4.21/dt-ti-sysc

Thu, 08 Nov 2018 18:57:42 +0100

Merge tag 'v4.20-rc1' into omap-for-v4.21/dt-ti-syscLinux 4.20-rc1 List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

91e43395820baad80248987608216c35da9df65b - Merge branch 'fixes-dts' into omap-for-v4.20/fixes

Thu, 08 Nov 2018 18:32:24 +0100

Merge branch 'fixes-dts' into omap-for-v4.20/fixes List of files: /linux/drivers/crypto/cavium/nitrox/Makefile

0c7244209588630a9b45e52490ef1390e04499a6 - Merge branch 'master' into for-4.20/upstream-fixes

Tue, 06 Nov 2018 13:57:02 +0100

Merge branch 'master' into for-4.20/upstream-fixesPull in a merge commit that brought in 3b692c55e58d ("HID: asus: onlysupport backlight when it's not driven by WMI") so that fixup could beapplied on top of it. List of files: /linux/drivers/crypto/cavium/nitrox/Makefile