summaryrefslogtreecommitdiff
path: root/mausezahn/.gitignore
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-06-15 19:35:07 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-06-15 19:35:07 +0200
commitf5e80759f23c602ddfca9af906f082499d49cb36 (patch)
treeb8769d03337027d74db371e4a36afe9fa4f2adda /mausezahn/.gitignore
parent2dbc1750eabb3781ec8181b5a73b54f6b8d64ef6 (diff)
curve: fix crypto_box_beforenmbytes length
This seems to have been corrupted. Must be crypto_box_beforenmbytes. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'mausezahn/.gitignore')
0 files changed, 0 insertions, 0 deletions
ec8&id2=3b4f18843e511193e7eb616710e838f5852e661d'>diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'net/hsr/hsr_slave.c')