diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
| commit | 644bca1d48139ad77570c24d22bafaf8e438cf03 (patch) | |
| tree | 37db3b2976c7d4f1c4541fe6946582d242a405a2 /fs/9p/vfs_inode.c | |
| parent | 93e0401e0fc0c54b0ac05b687cd135c2ac38187c (diff) | |
| parent | cb9e6e584d58420df182102674e636fb841dae4c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
There's a fix which landed in net-next, pull it in along
with the couple of minor cleanups.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 1d523bec0a94..502ac74e4959 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -15,7 +15,6 @@ #include <linux/pagemap.h> #include <linux/stat.h> #include <linux/string.h> -#include <linux/inet.h> #include <linux/namei.h> #include <linux/sched.h> #include <linux/slab.h> |