diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 11:43:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 11:43:32 -0700 |
commit | d8456eaf319a27d33186f1091bc1ff5c59cf0f0d (patch) | |
tree | 7c02bd661997630ec0275bd04a4f79876f5dea24 /drivers/watchdog/pcwd.c | |
parent | b8cac3cd24c19113982f929c65c50ce99d4cb83f (diff) | |
parent | cbbf4c0be8a725f08153949f45a85b2adafbbbd3 (diff) | |
download | linux-d8456eaf319a27d33186f1091bc1ff5c59cf0f0d.tar.bz2 |
Merge tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull iomap updates from Darrick Wong:
"Nothing particularly exciting here, just adding some callouts for gfs2
and cleaning a few things.
Summary:
- Add some extra hooks to the iomap buffered write path to enable
gfs2 journalled writes
- SPDX conversion
- Various refactoring"
* tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: move iomap_read_inline_data around
iomap: Add a page_prepare callback
iomap: Fix use-after-free error in page_done callback
fs: Turn __generic_write_end into a void function
iomap: Clean up __generic_write_end calling
iomap: convert to SPDX identifier
Diffstat (limited to 'drivers/watchdog/pcwd.c')
0 files changed, 0 insertions, 0 deletions