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

On Fri, 5 Feb 2010, Jiri Kosina 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.


Ayway, below is the hunk that I have already dropped from my tree (so that 
conflict in linux-next is gone), please feel free to apply it to your 
tree, and let me known whether you want me to reject all furutre patches 
touching net/ and driver/net/ to be refused on my side and redirected your 
way, or if you are fine with me handling the conflict resolution before I 
push them to Linus.

Thanks.



From: Adam Buchbinder <adam.buchbinder@gmail.com>
Subject: NET: Fix misspelling of "successful" and variants in comments.

Some comments misspell "successful" or variants of the word; this
fixes them. No code changes.

Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 5 Feb 2010 12:23:06 +0100 (CET)

> Ayway, below is the hunk that I have already dropped from my tree (so that 
> conflict in linux-next is gone), please feel free to apply it to your 
> tree, and let me known whether you want me to reject all furutre patches 

I can't apply it to my tree, that's why we had the conflict
in the first place.

Please submit this to me so that it applies cleanly to net-next-2.6

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html