diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-09-14 18:11:40 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-09-14 18:11:40 +0200 |
| commit | 00af6729b52ede86a08173c8d5f2c8cd9fa3390d (patch) | |
| tree | 6a8cec3575d5cd49fffadb372b85da5475a266b0 /fs/jffs2/fs.c | |
| parent | da62cb7230f0871c30dc9789071f63229158d261 (diff) | |
| parent | 818280d5adf1d80e78f95821815148abe9407e14 (diff) | |
| download | linux-00af6729b52ede86a08173c8d5f2c8cd9fa3390d.tar.gz linux-00af6729b52ede86a08173c8d5f2c8cd9fa3390d.tar.bz2 linux-00af6729b52ede86a08173c8d5f2c8cd9fa3390d.zip | |
Merge drm/drm-next into drm-misc-next
Paul Cercueil needs some patches in -rc5 to apply new patches for ingenic
properly.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'fs/jffs2/fs.c')
| -rw-r--r-- | fs/jffs2/fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index ab8cdd9e9325..78858f6e9583 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -341,7 +341,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) rdev = old_decode_dev(je16_to_cpu(jdev.old_id)); else rdev = new_decode_dev(je32_to_cpu(jdev.new_id)); - /* fall through */ + fallthrough; case S_IFSOCK: case S_IFIFO: |