summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-07-06 12:16:14 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2015-07-13 10:42:32 +0200
commit3beaa23d4d33b51a392b56f110c8773151ac19cc (patch)
tree2f5789a584acdde540be3a7cebac59b88bfdfa12 /Makefile
parent49be1bd2f5f5c712e6828f659d4fbb9e27543391 (diff)
flowtop: Fix hanging while waiting for collector
Fixed issue when flowtop hangs be cause of wrong using pthread cond lockiing, so the lock should be locked first by calling thread before call to pthread_cond_wait. Fixes: 451275470106 ("flowtop: Don't init screen until collector is ready") Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
3e511193e7eb616710e838f5852e661d'>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/ipv6/ip6_icmp.c')