linux-kernel - linux-next: manual merge of the gfs2 tree with the vfs 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20100127111708.ed39215c.sfr@canb.auug.org.au>
Date:	Wed, 27 Jan 2010 11:17:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Whitehouse <swhiteho@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the gfs2 tree with the vfs tree

Hi Steven,

Today's linux-next merge of the gfs2 tree got a conflict in
fs/gfs2/super.c between commit 716c28c0bc8bcbdd26e819f38dfc8fdfaafc0289
("pass writeback_control to ->write_inode") from the vfs tree and commit
56c79d55103b5d0943e063d036e7ebf8a7a1c21b ("GFS2: Wait for unlock
completion on umount") from the gfs2 tree.

Just simple overlapping additions.  I fixed up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/gfs2/super.c
index effa35a,e2bf19f..0000000
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@@ -21,7 -21,7 +21,8 @@@
  #include <linux/gfs2_ondisk.h>
  #include <linux/crc32.h>
  #include <linux/time.h>
 +#include <linux/writeback.h>
+ #include <linux/wait.h>
  
  #include "gfs2.h"
  #include "incore.h"

Content of type "application/pgp-signature" skipped