diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-03 13:55:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-03 13:55:01 -0800 |
| commit | 0771ad44a20bc512d1123bac728d3a89ea6febe6 (patch) | |
| tree | 4558154f11fed7663643f3740a861eb79cde61d4 | |
| parent | 23aedc4b9b39428c92b380b386bc97edecb3d4e7 (diff) | |
| parent | a99f41a1b4412a0f27cc0b287ea34b168da750f1 (diff) | |
Merge tag 'pstore-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore update from Kees Cook:
"Only a header cleanup this release; nice and quiet. :)
- clean up hardirq header usage (Yang Shi)"
* tag 'pstore-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
fs: pstore: remove unused hardirq.h
| -rw-r--r-- | fs/pstore/platform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 691032107f8c..c3129b131e4d 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -41,7 +41,6 @@ #include <linux/timer.h> #include <linux/slab.h> #include <linux/uaccess.h> -#include <linux/hardirq.h> #include <linux/jiffies.h> #include <linux/workqueue.h> |