Changes in Makefile

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

Mon, 14 Jan 2019 06:35:32 +0000

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

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

Mon, 14 Jan 2019 23:33:23 +0000

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

aaccf3c97418f169afdbb5855e9cbcbda34e90fd - Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Wed, 26 Sep 2018 13:54:31 +0000

Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextSync with upstream (which now contains fbdev-v4.19 changes) toprepare a base for fbdev-v4.20 changes. List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

2863b00941bc3062ea3299ed4057acfd9e52c335 - Merge drm/drm-next into drm-intel-next-queued

Wed, 26 Sep 2018 08:24:04 +0000

Merge drm/drm-next into drm-intel-next-queuedCatch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENTspecifically.Signed-off-by: Jani Nikula List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

9ac669fc01dbfef707ecaa6b618c0d03294cca16 - Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/core

Sat, 15 Sep 2018 18:50:42 +0000

Merge tag 'y2038' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into timers/corePull more y2038 work from Arnd Bergman:y2038: convert more syscallsHere is another set of system call changes to prepare the change over to64-bit time_t. As before, the strategy is to change system calls thattake a 'struct timespec' argument over to 'struct __kernel_timespec',which for now is defined to be the same but will get redefined to use a64-bit time_t argument once we are ready to modify the system call tables.The major change from previous patches is that the plan is no longerto directly use the 'compat' system calls for providing compatibilitywith the existing 32-bit time_t based entry points. Instead, we renamethe compat code to something that makes more sense on 32-bit architectures,e.g. compat_timespec becomes old_timespec32.With the renamed types in place, change over the 'stat' and 'utimes'families of system calls, sched_rr_get_interval, recvmmsg andrt_sigtimedwait. Another series for poll, select and io_pgetevents iscurrently being tested. List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

e42f6f9be4f83c537aa81b4c6239ea94ff5b29ce - Merge tag 'v4.19-rc2' into next-general

Tue, 04 Sep 2018 18:35:54 +0000

Merge tag 'v4.19-rc2' into next-generalSync to Linux 4.19-rc2 for downstream developers. List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

6e2d6b2728fcb408eabd7991804f8cb33ff59f20 - Merge tag 'v4.19-rc1' into asoc-4.19

Tue, 28 Aug 2018 18:03:57 +0000

Merge tag 'v4.19-rc1' into asoc-4.19Linux 4.19-rc1 List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

ea4d65f14f6aaa53e379b93c5544245ef081b3e7 - Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

Tue, 28 Aug 2018 16:58:03 +0000

Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2 List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

bc537a9cc47eec7f4e32b8164c494ddc35dca8ac - Merge drm/drm-next into drm-misc-next

Mon, 27 Aug 2018 14:00:03 +0000

Merge drm/drm-next into drm-misc-nextNow that 4.19-rc1 is cut, backmerge it into -misc-next.Signed-off-by: Sean Paul List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

0a3173a5f09bc58a3638ecfd0a80bdbae55e123c - Merge branch 'linus/master' into rdma.git for-next

Thu, 16 Aug 2018 20:13:03 +0000

Merge branch 'linus/master' into rdma.git for-nextrdma.git merge resolution for the 4.19 merge windowConflicts: drivers/infiniband/core/rdma_core.c - Use the rdma code and revise with the new spelling for atomic_fetch_add_unless drivers/nvme/host/rdma.c - Replace max_sge with max_send_sge in new blk code drivers/nvme/target/rdma.c - Use the blk code and revise to use NULL for ib_post_recv when appropriate - Replace max_sge with max_recv_sge in new blk code net/rds/ib_send.c - Use the net code and revise to use NULL for ib_post_recv when appropriateSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

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

Wed, 15 Aug 2018 23:01:47 +0000

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Pull crypto updates from Herbert Xu: "API: - Fix dcache flushing crash in skcipher. - Add hash finup self-tests. - Reschedule during speed tests. Algorithms: - Remove insecure vmac and replace it with vmac64. - Add public key verification for DH/ECDH. Drivers: - Decrease priority of sha-mb on x86. - Improve NEON latency/throughput on ARM64. - Add md5/sha384/sha512/des/3des to inside-secure. - Support eip197d in inside-secure. - Only register algorithms supported by the host in virtio. - Add cts and remove incompatible cts1 from ccree. - Add hisilicon SEC security accelerator driver. - Replace msm hwrng driver with qcom pseudo rng driver. Misc: - Centralize CRC polynomials"* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (121 commits) crypto: arm64/ghash-ce - implement 4-way aggregation crypto: arm64/ghash-ce - replace NEON yield check with block limit crypto: hisilicon - sec_send_request() can be static lib/mpi: remove redundant variable esign crypto: arm64/aes-ce-gcm - don't reload key schedule if avoidable crypto: arm64/aes-ce-gcm - implement 2-way aggregation crypto: arm64/aes-ce-gcm - operate on two input blocks at a time crypto: dh - make crypto_dh_encode_key() make robust crypto: dh - fix calculating encoded key size crypto: ccp - Check for NULL PSP pointer at module unload crypto: arm/chacha20 - always use vrev for 16-bit rotates crypto: ccree - allow bigger than sector XTS op crypto: ccree - zero all of request ctx before use crypto: ccree - remove cipher ivgen left overs crypto: ccree - drop useless type flag during reg crypto: ablkcipher - fix crash flushing dcache in error path crypto: blkcipher - fix crash flushing dcache in error path crypto: skcipher - fix crash flushing dcache in error path crypto: skcipher - remove unnecessary setting of walk->nbytes crypto: scatterwalk - remove scatterwalk_samebuf() ... List of files: /linux/drivers/crypto/hisilicon/sec/Makefile

915e4e8413dacc086efcef4de04fdfdca57e8b1c - crypto: hisilicon - SEC security accelerator driver

Mon, 23 Jul 2018 15:49:54 +0000

crypto: hisilicon - SEC security accelerator driverThis accelerator is found inside hisilicon hip06 and hip07 SoCs.Each instance provides a number of queues which feed a different number ofbackend acceleration units.The queues are operating in an out of order mode in the interests ofthroughput. The silicon does not do tracking of dependencies betweenmultiple 'messages' or update of the IVs as appropriate for training.Hence where relevant we need to do this in software.Signed-off-by: Jonathan Cameron Signed-off-by: Herbert Xu List of files: /linux/drivers/crypto/hisilicon/sec/Makefile