summaryrefslogtreecommitdiff
path: root/net/Kconfig
diff options
context:
space:
mode:
authorHarsh Jain <harsh@chelsio.com>2017-01-24 10:34:32 +0530
committerHerbert Xu <herbert@gondor.apana.org.au>2017-02-03 17:45:44 +0800
commit94e1dab1c94715e18bb0bada503de3f3d7593076 (patch)
tree2bfaeb25c1875f4b26ccdfa7ae2666d875da1c0e /net/Kconfig
parent685ce0626840e2673fe64ea8807684f7324fec5f (diff)
crypto: chcr - Fix panic on dma_unmap_sg
Save DMA mapped sg list addresses to request context buffer. Signed-off-by: Atul Gupta <atul.gupta@chelsio.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'net/Kconfig')
0 files changed, 0 insertions, 0 deletions
it/net/bluetooth/Makefile?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/Makefile')