| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 13 Mar 2015 16:27:27 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
Al Viro <viro@...IV.linux.org.uk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Christoph Hellwig <hch@....de>,
Alexander Kuleshov <kuleshovmail@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/fat/inode.c between commit 3737c63e1fb0 ("fs: move struct kiocb to
fs.h") from the vfs tree and commit be33247df543 ("fs/fat: remove
unnecessary includes") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc fs/fat/inode.c
index 8521207de229,8ea7fec6716d..000000000000
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@@ -11,20 -11,12 +11,11 @@@
*/
#include <linux/module.h>
- #include <linux/init.h>
- #include <linux/time.h>
- #include <linux/slab.h>
- #include <linux/seq_file.h>
#include <linux/pagemap.h>
#include <linux/mpage.h>
- #include <linux/buffer_head.h>
- #include <linux/mount.h>
-#include <linux/aio.h>
#include <linux/vfs.h>
+ #include <linux/seq_file.h>
#include <linux/parser.h>
- #include <linux/uio.h>
- #include <linux/writeback.h>
- #include <linux/log2.h>
- #include <linux/hash.h>
#include <linux/blkdev.h>
#include <asm/unaligned.h>
#include "fat.h"
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists