[linux] 03/03: Merge remote-tracking branch 'alioth/sid' into sid

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 8423f81c55c24e6db30cb185a47ba1955be3ab92
Merge: adef82e 196596c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Dec 22 14:10:04 2017 +0000

    Merge remote-tracking branch 'alioth/sid' into sid

 debian/changelog                                   |   3 +
 ...-require-that-the-underlying-hash-algorit.patch | 151 +++++++++++++++++++++
 ...ypto-salsa20-fix-blkcipher_walk-API-usage.patch |  91 +++++++++++++
 debian/patches/series                              |   2 +
 4 files changed, 247 insertions(+)

diff --cc debian/patches/series
index 81b6e05,f38ac7f..de8d95f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -127,17 -127,8 +127,19 @@@ bugfix/all/media-dvb-usb-v2-lmedm04-mov
  bugfix/all/media-hdpvr-fix-an-error-handling-path-in-hdpvr_prob.patch
  bugfix/all/kvm-fix-stack-out-of-bounds-read-in-write_mmio.patch
  bugfix/all/bluetooth-prevent-stack-info-leak-from-the-efs-element.patch
+ bugfix/all/crypto-salsa20-fix-blkcipher_walk-API-usage.patch
+ bugfix/all/crypto-hmac-require-that-the-underlying-hash-algorit.patch
 +bugfix/all/bpf-encapsulate-verifier-log-state-into-a-structure.patch
 +bugfix/all/bpf-move-global-verifier-log-into-verifier-environme.patch
 +bugfix/all/bpf-fix-branch-pruning-logic.patch
 +bugfix/all/bpf-verifier-fix-bounds-calculation-on-bpf_rsh.patch
 +bugfix/all/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch
 +bugfix/all/bpf-fix-incorrect-tracking-of-register-size-truncati.patch
 +bugfix/all/bpf-fix-32-bit-alu-op-verification.patch
 +bugfix/all/bpf-fix-missing-error-return-in-check_stack_boundary.patch
 +bugfix/all/bpf-force-strict-alignment-checks-for-stack-pointers.patch
 +bugfix/all/bpf-don-t-prune-branches-when-a-scalar-is-replaced-w.patch
 +bugfix/all/bpf-fix-integer-overflows.patch
  
  # Fix exported symbol versions
  bugfix/all/module-disable-matching-missing-version-crc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git