Re: About peak_pci PATH v6.1

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 2174 bytes --]

On 02/20/2012 12:25 PM, Stephane Grosjean wrote:
> I found that the i2c_transfer() is able to sleep, which is generally
> *not* a good idea when in an interrupt context...

Not allowed :)

> So, I changed the delay management with a delayed work mechanism. I
> successfully tested the change on my testbed, but as you know, this is
> not the best place for testing...

> I hope you will be able to find some time to test that new patch.
> 
> @Marc: the peak_pci and peak_pcmcia patches bring modifications to the
> can/sja1000 dir Kconfig and Makefile, So the apply sequence order is
> critical (I mean, the peak_pci patch must be applied before the
> peak_pcmcia, because of lines numbers). How to fix that? I first
> proposed to use a serie of patches but this was not approved...

I think due to my too short answer there was a misunderstanding. IIRC in
one patch you 1. fixed a problem (which is already in mainline) and 2.
introduced a new feature. This is why I asked for separate patches. All
changes can still go into a series.

I already added your "add support for PEAK-System PCIe/PCIeC/miniPCI
cards" patch to can-next/master, but If you now have a better version,
I'll force update the branch.

I just updated can-next/master, so that it doesn't include your patch.
Now it get complicated :) In order to test the patches you need Olivers
unplug fix patch, I send it to David today, and it's not part of
can-next, yet. For easy testing, I merged linux-can into linux-can-next,
the branch is called "with-can-merge" in the linux-can-next repo. Please
make your patch series based on that branch, I'll apply it to
linux-can-next/master and ask David to merge net into net-next first, in
case he hasn't.

Back to your question. Yes, please give us a series of patches, even if
its PCI and USB drivers.

I hope you understand what I mean ;)

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]