linux-kernel - linux-next: manual merge of the vfs tree with Linus' 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: <20151207124636.6ba25cdd@canb.auug.org.au>
Date:	Mon, 7 Dec 2015 12:46:36 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Miklos Szeredi <miklos@...redi.hu>
Subject: linux-next: manual merge of the vfs tree with Linus' tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

fs/overlayfs/inode.c

between commit:

  0f7ff2dabbc9 ("ovl: get rid of the dead code left from broken (and disabled) optimizations")

from Linus' tree and commit:

  58809fadd08b ("broken permission checks in overlayfs ->setattr()")

from the vfs tree.

I fixed it up (I used the name ovl_copy_up_truncate from Linus' tree instead of ovl_copy_up_last) and can carry the fix as necessary (no action is required).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/