From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, shawn.guo@freescale.com, kernel@pengutronix.de
Subject: Re: [PATCH 02/14] net/fec: release mem_region requested in probe in error path and remove
Date: Tue, 15 Feb 2011 21:00:20 +0100 [thread overview]
Message-ID: <20110215200020.GS13279@pengutronix.de> (raw)
In-Reply-To: <20110215.103159.193730541.davem@davemloft.net>
On Tue, Feb 15, 2011 at 10:31:59AM -0800, David Miller wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Date: Tue, 15 Feb 2011 09:53:05 +0100
>
> > On Mon, Feb 14, 2011 at 11:05:49AM -0800, David Miller wrote:
> >> These merge commits look ugly and Linus wants them minimized.
> > Hmm, right, I don't get why this looks uglier for Linus than a merge of
> > a tree that bases on something you already have. I guess you're too
> > annoyed by now to explain why you think it does.
>
> What's so hard to understand about the fact that when I pull from
> someone I do not want any commits unrelated to the work that person
> is sending me?
Perfectly fine, I can live with this explanation. Next time say that at
once :-)
> >> 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.
> > So I rebased my tree on something older. It now starts at
> >
> > c69b909 (pch_can: fix module reload issue with MSI)
> >
> > which is already in net-next/master.
>
> You need to send a new pull request so that it gets properly tracked
> in patchwork.
Oh, I didn't know that patchwork tracks pull requests, too:
The following changes since commit c69b90920a36b88ab0d649963d81355d865eeb05:
pch_can: fix module reload issue with MSI (2011-02-08 16:37:20 -0800)
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git fec
Uwe Kleine-König (14):
net/fec: no need to cast arguments for memcpy
net/fec: release mem_region requested in probe in error path and remove
net/fec: don't free an irq that failed to be requested
net/fec: no need to check for validity of ndev in suspend and resume
net/fec: no need to memzero private data
net/fec: put the ioremap cookie immediately into a void __iomem pointer
net/fec: consolidate all i.MX options to CONFIG_ARM
net/fec: add phy_stop to fec_enet_close
net/fec: consistenly name struct net_device pointers "ndev"
net/fec: some whitespace cleanup
net/fec: reorder functions a bit allows removing forward declarations
net/fec: provide device for dma functions and matching sizes for map and unmap
net/fec: postpone unsetting driver data until the hardware is stopped
net/fec: enable flow control and length check on enet-mac
drivers/net/Kconfig | 3 +-
drivers/net/fec.c | 650 ++++++++++++++++++++++++++-------------------------
2 files changed, 328 insertions(+), 325 deletions(-)
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-02-15 20:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-11 10:32 [PATCH 01/14] net/fec: no need to cast arguments for memcpy Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 02/14] net/fec: release mem_region requested in probe in error path and remove Uwe Kleine-König
2011-02-11 11:03 ` Uwe Kleine-König
2011-02-12 5:25 ` David Miller
2011-02-13 21:07 ` Uwe Kleine-König
2011-02-13 21:15 ` David Miller
2011-02-14 8:25 ` Uwe Kleine-König
2011-02-14 19:05 ` David Miller
2011-02-15 8:53 ` Uwe Kleine-König
2011-02-15 18:31 ` David Miller
2011-02-15 20:00 ` Uwe Kleine-König [this message]
2011-02-11 10:32 ` [PATCH 03/14] net/fec: don't free an irq that failed to be requested Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 04/14] net/fec: no need to check for validity of ndev in suspend and resume Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 05/14] net/fec: no need to memzero private data Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 06/14] net/fec: put the ioremap cookie immediately into a void __iomem pointer Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 07/14] net/fec: consolidate all i.MX options to CONFIG_ARM Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 08/14] net/fec: add phy_stop to fec_enet_close Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 09/14] net/fec: consistenly name struct net_device pointers "ndev" Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 10/14] net/fec: some whitespace cleanup Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 11/14] net/fec: reorder functions a bit allows removing forward declarations Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 12/14] net/fec: provide device for dma functions and matching sizes for map and unmap Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 13/14] net/fec: postpone unsetting driver data until the hardware is stopped Uwe Kleine-König
2011-02-11 10:32 ` [PATCH 14/14] net/fec: enable flow control and length check on enet-mac Uwe Kleine-König
2011-02-17 22:32 ` [PATCH 15/14] net/fec: remove unused driver data Uwe Kleine-König
2011-02-22 18:16 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110215200020.GS13279@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=shawn.guo@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).