Re: Conflict in irqs.h

Tony Lindgren
2009-12-12T01:13:38Z

* Candelaria Villareal, Jorge <x0107209@ti.com> [091211 17:08]:
> Hi,
>
> I am trying to get some patches pushed upstream. These patches are for OMAP4 McPDM driver and concern both linux-omap and alsa trees IMO. One of the patches (attached) modifies irqs.h to add McPDM irq number. The problem is irqs.h file is in a different path and the patches apply differently in each tree.
>
> I was planning on sending the set to both alsa and linux-omap list, but there will be a conflict for your linux-omap tree. Is there a procedure to follow in these cases?
>
> I have also considered sending two different sets of patches individually: one to you and the other to Mark Brown.
>
> Can you advice?

Do all the patches against the current mainline kernel,
other trees will eventually sync against that. If it's
a patch against some code not yet in mainline, please
do it against current omap-for-linus branch in the
linux-omap tree.

Regards,

Tony