From: David Miller <davem@davemloft.net>
To: mkl@pengutronix.de
Cc: Netdev@vger.kernel.org, kernel@pengutronix.de,
mkl@blackshift.org, linux-can@vger.kernel.org
Subject: Re: [PATCH 0/9] can: driver updates
Date: Sat, 04 Feb 2012 16:44:35 -0500 (EST) [thread overview]
Message-ID: <20120204.164435.967762795248861095.davem@davemloft.net> (raw)
In-Reply-To: <1328230318-8962-1-git-send-email-mkl@pengutronix.de>
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 3 Feb 2012 01:51:49 +0100
> this patch series targets net-next. It consists of various driver updates:
> - plx_pci: add IXXAT PCI card
> - flexcan: fixes CAN specific loopback handling
> - pch_can: updates to copyright and Kconfig desciption
> - ems_usb: improve memory handling
> - add missing do_get_berr_counter to drivers
> - replace the dev_dbg/info/err/... with the new netdev_xxx
>
> The last patch (replace the dev_dbg/info/err) depends on a patch I requested
> to go into 3.3 (f84cbda can: ems_usb: Removed double netif_device_detach).
> In order to avoid merge conflicts I added this patch to this series, too.
> If this is a bad idea we can postpone this pull request until you merged
> the net/master branch and I'll respin the pull request without that patch.
Pulled.
Next time I'd rather you simply tell me you have a dependency on some
'net' tree changes for some net-next stuff you'd like to submit, and
then you setup your tree and make your submission when I pull 'net'
into 'net-next' for you.
Putting the change into two trees looks like ass, and results in ugly
and totally unnecessary merges.
prev parent reply other threads:[~2012-02-04 21:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 0:51 [PATCH 0/9] can: driver updates Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 1/9] can: ems_usb: Removed double netif_device_detach Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 2/9] can: dev: let can_get_echo_skb() return dlc of CAN frame Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 3/9] can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 4/9] can: ems_usb: Improved memory handling on ems_usb_start Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 5/9] can: plx_pci: add support for IXXAT PCI cards Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 6/9] can: pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 7/9] can: Kconfig: add more information about Intel EG20T PCH CAN controller Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 8/9] can: bfin_can/ti_hecc/mscan: add missing do_get_berr_counter callback Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 9/9] can: replace the dev_dbg/info/err/... with the new netdev_xxx macros Marc Kleine-Budde
2012-02-04 21:44 ` David Miller [this message]
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=20120204.164435.967762795248861095.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=Netdev@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@blackshift.org \
--cc=mkl@pengutronix.de \
/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).