Re: linux-next: manual merge of the trivial tree with the net tree

[Jiri Kosina]

On Thu, 4 Feb 2010, David Miller wrote:

> > Today's linux-next merge of the trivial tree got a conflict in 
> > drivers/net/sfc/mcdi_pcol.h between commit 
> > 5297a98d5dd6de86fe1e2ffc9ea60cdf59b71443 ("sfc: Update MCDI protocol 
> > definitions") from the net tree and commit 
> > 4887b438e6880c73c4b44d868211e70c1f3deaec ("Fix misspelling of 
> > "successful" and variants in comments") from the trivial tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Ugh, this is the second spelling fix that's hit a conflict
> in the same exact tree.
> 
> Please, submit these things to the subsystem maintainers instead
> of keeping them together in a totally seperate tree.  That way
> we won't have to keep fighting these things.

Well, no problem with that. 

Some maintainers just don't want to be buggered with such patches though, 
and I always take care of sending this queue to Linus only when all the 
trees which had conflict in linux-next are already in (and I do the 
conflict resolution myself), so this should be exactly zero additional 
work for subsystem maintainers.

But if you don't like this, I'll just start refusing all the trivial 
patches touching net/ and drivers/net/ and will redirect them your way.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/