linux-kernel - Re: linux-next: manual merge of the bkl-vfs tree with the nilfs2 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100915.131628.69479307.ryusuke@osrg.net>
Date:	Wed, 15 Sep 2010 13:16:28 +0900 (JST)
From:	Ryusuke Konishi <konishi.ryusuke@....ntt.co.jp>
To:	sfr@...b.auug.org.au
Cc:	arnd@...db.de, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, jblunck@...radead.org,
	konishi.ryusuke@....ntt.co.jp
Subject: Re: linux-next: manual merge of the bkl-vfs tree with the nilfs2
 tree

On Wed, 15 Sep 2010 14:01:14 +1000, Stephen Rothwell wrote:
> Hi Arnd,
> 
> Today's linux-next merge of the bkl-vfs tree got a conflict in
> fs/nilfs2/super.c between commit 38999dca4fdc4a0d1b92a540bc0772a32b07388a
> ("nilfs2: do not allocate multiple super block instances for a device")
> from the nilfs2 tree and commit 3fec873dc6e9026d98e2359202fa50fd06ee7b64
> ("BKL: Remove BKL from NILFS2") from the bkl-vfs tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

The fix looks fine to me.

Thanks!

Ryusuke Konishi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/