Messages in this thread | | | Subject | Re: [GIT PULL] block/IO bits for 2.6.36-rc1 | From | David Woodhouse <> | Date | Mon, 16 Aug 2010 21:48:30 +0100 |
| |
On Sat, 2010-08-07 at 14:15 -0700, Linus Torvalds wrote: > > It might well make sense to base linux-next itself on the > latest tagged release rather than on some random daily thing (and if > the things that get merged _into_ linux-next then are based on a > random daily thing and bring linux-next forward, then that's a problem > with the trees getting merged - they shouldn't be doing that either).
Hm? I do that whenever you pull from me -- I'll pull the merge commit into my own tree. So the mtd-2.6.git tree you pulled last night, for example, was based on some "random daily thing" half-way between 2.6.35 and 2.6.26-rc1, which happened to be entitled 'Merge git://...mtd-2.6'.
I try to avoid having to *merge* such a thing, but it certainly does end up in linux-next as the *base* for maintainers' tree. It's difficult to see how that could be avoided.
-- David Woodhouse Open Source Technology Centre David.Woodhouse@intel.com Intel Corporation
| |