linux-kernel - linux-next: merge fixups relative to 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>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 18 Jan 2010 18:28:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Jörn Engel" <joern@...fs.org>,
	Sage Weil <sage@...dream.net>
Cc:	Al Viro <viro@...IV.linux.org.uk>, Christoph Hellwig <hch@....de>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: merge fixups relative to the vfs tree

Hi Jörn, Sage,

Al has now created a "write_inode" branch in the vfs tree that just
contains the changes that your trees need to be fixed up for.  Al
promises that this branch will never be rebased.  So the best solution is
for you both to merge that branch into your respective trees ("git pull
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git
write_inode") and then apply the patches I sent (assuming that they are
correct).  If you rebase your trees, you will need to repull the above
branch, of course.

[Alternatively, you could create a remote in your trees for Al's
write_inode branch:

git remote add -f -t write_inode write_inode git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git

and then merge it using

git merge write_inode

That way if anything is added to that branch you can just refetch it and
merge it again if necessary.]

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped