Messages in this thread | | | Date | Mon, 18 Jan 2010 18:28:52 +1100 | From | Stephen Rothwell <> | 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |