linux-kernel - linux-next: manual merge of the akpm-current 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: <1434511453.24642.8.camel@ellerman.id.au>
Date:	Wed, 17 Jun 2015 13:24:13 +1000
From:	Michael Ellerman <mpe@...erman.id.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,
	Fabian Frederick <fabf@...net.be>
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/ufs/namei.c

between commit:

  a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory access"

from the vfs tree and commit:

  2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"

from the akpm-current tree.

I fixed it up by taking the vfs version and can carry the fix as necessary (no
action is required).

cheers



--
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/