[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20120204.164435.967762795248861095.davem@davemloft.net>
Date: Sat, 04 Feb 2012 16:44:35 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: mkl@...gutronix.de
Cc: Netdev@...r.kernel.org, kernel@...gutronix.de, mkl@...ckshift.org,
linux-can@...r.kernel.org
Subject: Re: [PATCH 0/9] can: driver updates
From: Marc Kleine-Budde <mkl@...gutronix.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists