From: Tony Lindgren <tony@atomide.com>
To: "Candelaria Villareal, Jorge" <x0107209@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: Conflict in irqs.h
Date: Fri, 11 Dec 2009 17:13:42 -0800 [thread overview]
Message-ID: <20091212011342.GK24013@atomide.com> (raw)
In-Reply-To: <2256F256009DAA4CBE661E9F41EAC84B88A174F9@dlee01.ent.ti.com>
* 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
prev parent reply other threads:[~2009-12-12 1:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-12 1:09 Conflict in irqs.h Candelaria Villareal, Jorge
2009-12-12 1:13 ` Tony Lindgren [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=20091212011342.GK24013@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap@vger.kernel.org \
--cc=x0107209@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.