1
0
Fork 0
alistair23-linux/arch/metag/kernel
Linus Torvalds 5a0387a8a8 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.12:

  API:
   - Add batch registration for acomp/scomp
   - Change acomp testing to non-unique compressed result
   - Extend algorithm name limit to 128 bytes
   - Require setkey before accept(2) in algif_aead

  Algorithms:
   - Add support for deflate rfc1950 (zlib)

  Drivers:
   - Add accelerated crct10dif for powerpc
   - Add crc32 in stm32
   - Add sha384/sha512 in ccp
   - Add 3des/gcm(aes) for v5 devices in ccp
   - Add Queue Interface (QI) backend support in caam
   - Add new Exynos RNG driver
   - Add ThunderX ZIP driver
   - Add driver for hardware random generator on MT7623 SoC"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (101 commits)
  crypto: stm32 - Fix OF module alias information
  crypto: algif_aead - Require setkey before accept(2)
  crypto: scomp - add support for deflate rfc1950 (zlib)
  crypto: scomp - allow registration of multiple scomps
  crypto: ccp - Change ISR handler method for a v5 CCP
  crypto: ccp - Change ISR handler method for a v3 CCP
  crypto: crypto4xx - rename ce_ring_contol to ce_ring_control
  crypto: testmgr - Allow ecb(cipher_null) in FIPS mode
  Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"
  crypto: ccp - Disable interrupts early on unload
  crypto: ccp - Use only the relevant interrupt bits
  hwrng: mtk - Add driver for hardware random generator on MT7623 SoC
  dt-bindings: hwrng: Add Mediatek hardware random generator bindings
  crypto: crct10dif-vpmsum - Fix missing preempt_disable()
  crypto: testmgr - replace compression known answer test
  crypto: acomp - allow registration of multiple acomps
  hwrng: n2 - Use devm_kcalloc() in n2rng_probe()
  crypto: chcr - Fix error handling related to 'chcr_alloc_shash'
  padata: get_next is never NULL
  crypto: exynos - Add new Exynos RNG driver
  ...
2017-05-02 15:53:46 -07:00
..
perf cpu/hotplug: Cleanup state names 2016-12-25 10:47:44 +01:00
.gitignore metag: Build infrastructure 2013-03-02 20:09:54 +00:00
Makefile metag: Add JTAG Debug Adapter (DA) support 2013-03-02 20:09:56 +00:00
asm-offsets.c metag: Build infrastructure 2013-03-02 20:09:54 +00:00
cachepart.c metag: Fix typos 2016-07-15 09:55:49 +01:00
clock.c metag: log core and timer frequencies from arch code 2013-06-13 12:55:27 +01:00
core_reg.c metag: SMP support 2013-03-02 20:09:51 +00:00
da.c metag: export _metag_da_present and cpu_2_hwthread_id 2013-03-27 14:37:52 +00:00
devtree.c metag: use common of_flat_dt_match_machine 2013-10-09 20:03:57 -05:00
dma.c treewide: Constify most dma_map_ops structures 2017-01-24 12:23:35 -05:00
ftrace.c metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init 2016-04-29 22:37:51 +01:00
ftrace_stub.S metag: ftrace: Remove check of obsolete variable function_trace_stop 2014-07-18 13:58:09 -04:00
head.S metag: smp: copy cache partition and enable GCOn 2013-03-15 13:21:17 +00:00
irq.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
kick.c metag: kick: add missing irq_enter/exit to kick_handler() 2013-07-02 14:12:08 +01:00
machines.c
metag_ksyms.c metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c 2013-07-04 10:00:02 +01:00
module.c module: use a structure to encapsulate layout. 2015-12-04 22:46:25 +01:00
perf_callchain.c perf core: Add a 'nr' field to perf_event_callchain_context 2016-05-16 23:11:51 -03:00
process.c sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h> 2017-03-02 08:42:36 +01:00
ptrace.c Merge branch 'regset' (PTRACE_SETREGSET data leakage) 2017-03-29 08:55:25 -07:00
setup.c metag: Remove unnecessary of_platform_populate with default match table 2016-06-23 15:00:26 -05:00
signal.c sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h> 2017-03-02 08:42:36 +01:00
smp.c sched/headers: Move task->mm handling methods to <linux/sched/mm.h> 2017-03-03 01:43:28 +01:00
stacktrace.c linux/kernel.h: Add ALIGN_DOWN macro 2017-04-21 20:30:44 +08:00
sys_metag.c metag: System Calls 2013-03-02 20:09:49 +00:00
tbiunexp.S metag: Traps 2013-03-02 20:09:45 +00:00
tcm.c
time.c metag: init common clk and use "core" clk 2013-06-13 12:54:41 +01:00
topology.c metag: topology: export 'cpu_core_map' 2013-12-19 11:36:13 +00:00
traps.c sched/headers: Prepare for new header dependencies before moving code to <linux/sched/task_stack.h> 2017-03-02 08:42:36 +01:00
user_gateway.S metag: System Calls 2013-03-02 20:09:49 +00:00
vmlinux.lds.S nmi_backtrace: generate one-line reports for idle cpus 2016-10-07 18:46:30 -07:00