From: Linus Torvalds Date: Thu, 22 Jan 2015 18:53:06 +0000 (+1200) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux X-Git-Tag: v3.19-rc6~19 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f8de05ca38b7bce4079b52002a6817e9582e3e01;p=~emulex%2Finfiniband.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fixes from Martin Schwidefsky: "Five more bug fixes from Michael for the s390 BPF jit" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/bpf: Zero extend parameters before calling C function s390/bpf: Fix sk_load_byte_msh() s390/bpf: Fix offset parameter for skb_copy_bits() s390/bpf: Fix skb_copy_bits() parameter passing s390/bpf: Fix JMP_JGE_K (A >= K) and JMP_JGT_K (A > K) --- f8de05ca38b7bce4079b52002a6817e9582e3e01