tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Merge crypto tree to pick up scompress and caam fixes. The scompress
fix has a non-trivial resolution as the code in question has moved
over to acompress.

Herbert Xu 53225843 af7e23c6

+6 -3
+3
crypto/acompress.c
··· 483 483 void (*free_ctx)(void *); 484 484 int i; 485 485 486 + if (!streams) 487 + return; 488 + 486 489 cancel_work_sync(&s->stream_work); 487 490 free_ctx = s->free_ctx; 488 491
+3 -3
drivers/crypto/caam/qi.c
··· 122 122 qm_fd_addr_set64(&fd, addr); 123 123 124 124 do { 125 + refcount_inc(&req->drv_ctx->refcnt); 125 126 ret = qman_enqueue(req->drv_ctx->req_fq, &fd); 126 - if (likely(!ret)) { 127 - refcount_inc(&req->drv_ctx->refcnt); 127 + if (likely(!ret)) 128 128 return 0; 129 - } 130 129 130 + refcount_dec(&req->drv_ctx->refcnt); 131 131 if (ret != -EBUSY) 132 132 break; 133 133 num_retries++;