Thread (25 messages) flat view 25 messages, 2 authors, 2011-02-22

Re: [PATCH 02/14] net/fec: release mem_region requested in probe in error path and remove

From: David Miller <davem@davemloft.net>
Date: 2011-02-14 19:05:13

From: Uwe Kleine-König <redacted>
Date: Mon, 14 Feb 2011 09:25:25 +0100
Hi David,

On Sun, Feb 13, 2011 at 01:15:31PM -0800, David Miller wrote:
quoted
From: Uwe Kleine-König <redacted>
Date: Sun, 13 Feb 2011 22:07:09 +0100
quoted
On Fri, Feb 11, 2011 at 09:25:32PM -0800, David Miller wrote:
quoted
I can't pull from that tree because it is _NOT_ based upon net-next-2.6
and therefore brings in all kinds of commits not related to your work.
Sorry, I'm not used to the customs on netdev.  I can rebase, but still I
wonder about the reason you cannot pull for.  The only reason I can
imagine is that you fear unrelated breakage when taking these patches
that are already in Linus' tree.  But if it's that, wouldn't it be great
the realize this breakage already now and not only during the next merge
window?
My trees only merge in Linus's tree when absolutely necessary,
to resolve conflicts or similar.
You don't merge Linus' tree, you merge mine that just happen to be based
on a newer version of Linus' tree. I'm sure Linus won't yell on you for
that. He only objects to merge directly from his tree, because the
result for him is an "empty" merge.
You don't get it.

These merge commits look ugly and Linus wants them minimized.

Either you follow the rules and my expectations, which is that when you
give me a GIT tree to pull from it's based upon one of my trees, or
I don't pull from you.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help