On Tue, 19 Feb 2002, Jeff Garzik wrote:
> Rik van Riel wrote:
> > I've also pulled the thing up to
> > your latest changes from linux.bkbits.net so you should be
> > able to just pull it into your tree from:
>
> Note that with BK, unlike CVS, it is not required that you update to
> the latest Linus tree before he can pull.
>
> It is only desired that you do so if there is an actual conflict you
> need to resolve...
In this case there were 2 files with a potential conflict
(buffer.c and filemap.c).
No actual conflicts, but I thought it good manners to
pull the tree and resolve any potential conflicts myself,
instead of burdening Linus with the job.
regards,
Rik
-- "Linux holds advantages over the single-vendor commercial OS" -- Microsoft's "Competing with Linux" documenthttp://www.surriel.com/ http://distro.conectiva.com/
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Feb 23 2002 - 21:00:20 EST