From: Daniel Borkmann <daniel@iogearbox.net>
Date: Mon, 14 May 2018 21:29:46 +0000 (+0200)
Subject: Merge branch 'bpf-stackmap-nmi'
X-Git-Tag: v4.18-rc1~114^2~223^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1772be37fc9d2775ae48c8b3bc34f1899effb7b3;p=linux.git

Merge branch 'bpf-stackmap-nmi'

Song Liu says:
====================
Changes v2 -> v3:
  Improve syntax based on suggestion by Tobin C. Harding.

Changes v1 -> v2:
  1. Rename some variables to (hopefully) reduce confusion;
  2. Check irq_work status with IRQ_WORK_BUSY (instead of work->sem);
  3. In Kconfig, let BPF_SYSCALL select IRQ_WORK;
  4. Add static to DEFINE_PER_CPU();
   5. Remove pr_info() in stack_map_init().
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---

1772be37fc9d2775ae48c8b3bc34f1899effb7b3