linux-kernel - linux-next: manual merge of the vfs tree with the ext3 tree

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150318113234.6e74c175@canb.auug.org.au>
Date:	Wed, 18 Mar 2015 11:32:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>, Jan Kara <jack@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fabian Frederick <fabf@...net.be>,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/udf/file.c between commit 13f0c2b0f67d ("udf: remove redundant
buffer_head.h includes") from the ext3 tree and commit 52858684778b
("fs: move struct kiocb to fs.h") from the vfs 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/udf/file.c
index dda8ea7012c6,7f885cc8b0b7..000000000000
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@@ -33,7 -33,8 +33,7 @@@
  #include <linux/capability.h>
  #include <linux/errno.h>
  #include <linux/pagemap.h>
- #include <linux/aio.h>
 -#include <linux/buffer_head.h>
+ #include <linux/uio.h>
  
  #include "udf_i.h"
  #include "udf_sb.h"

Content of type "application/pgp-signature" skipped