Re: [GIT PATCH] kbuild updates

[Sam Ravnborg]

On Tue, Jan 29, 2008 at 09:04:38AM +1100, Linus Torvalds wrote:
> 
> 
> On Mon, 28 Jan 2008, Sam Ravnborg wrote:
> > 
> > Please pull following patches for kbuild/kconfig and a few other areas.
> > 
> > Pull from:
> > 	ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
> 
> This conflicts with the SH updates (sh is also integrating 32/64-bit into 
> one tree now).
> 
> Since I don't know the SH tree or your changes, the probably fairly 
> trivial manual merge isn't an option (especially as I'm not at home and 
> doing this on a laptop with a less than ideal keyboard and smaller screen 
> than I'm used to).
> 
> So I hope you and Paul can resolve the conflicts and re-send.

As expected the conflicts were trivial and I fixed it up.
It was:
- The edit of the vmlinux.lds files
- The removal of make dep

Please pull the updated tree.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/