diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-12-13 10:45:48 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-12-13 20:55:07 +0100 |
| commit | bc16130af5a2f6ba75aa0cc8689b5d456bc465d8 (patch) | |
| tree | a22e2c314494c51e16c9b315a1c5af4ffbf22366 /fs/internal.h | |
| parent | cd5d7ba49df7918732915a31bfc0f72827bebc2c (diff) | |
| parent | 284bbc782445283e9a5124666dda8010f379f179 (diff) | |
Merge tag 'v4.9.67' into 4.9-1.0.x-imx-fixes-stable-merge
This is the 4.9.67 stable release
Resolved conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
drivers/dma/imx-sdma.c
drivers/mmc/core/host.c
drivers/usb/chipidea/otg.c
sound/soc/fsl/fsl_ssi.c
This merge also reverts commit 3a654a85932f ("dmaengine:
imx-sdma - correct the dma transfer residue calculation"). The
downstream kernel seems to use different structures and already
use buf_ptail in its calculation.
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/internal.h b/fs/internal.h index f4da3341b4a3..8b7143b0211c 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -136,7 +136,6 @@ extern bool atime_needs_update_rcu(const struct path *, struct inode *); extern void inode_io_list_del(struct inode *inode); extern long get_nr_dirty_inodes(void); -extern void evict_inodes(struct super_block *); extern int invalidate_inodes(struct super_block *, bool); /* |