Conflict in irqs.h

Candelaria Villareal, Jorge
2009-12-12T01:09:07Z

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

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?

Thanks,
Jorge

[-- Attachment #2: 0001-OMAP4-IRQ-Add-McPDM-IRQ-definition.patch --]
[-- Type: application/octet-stream, Size: 945 bytes --]

From 8e356367cb480c95011c8c62bb05e968b93f89a2 Mon Sep 17 00:00:00 2001
From: Jorge Eduardo Candelaria <x0107209@ti.com>
Date: Tue, 8 Dec 2009 23:06:55 -0600
Subject: [PATCH] OMAP4: IRQ: Add McPDM IRQ definition.

Support for McPDM IRQs in OMAP4

Signed-off-by: Jorge Eduardo Candelaria <x0107209@ti.com>
---
arch/arm/plat-omap/include/mach/irqs.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h
index 28a1650..74cddc0 100644
--- a/arch/arm/plat-omap/include/mach/irqs.h
+++ b/arch/arm/plat-omap/include/mach/irqs.h
@@ -513,7 +513,7 @@
#define INT_44XX_PARTHASH_IRQ (79 + IRQ_GIC_START)
#define INT_44XX_MMC3_IRQ (94 + IRQ_GIC_START)
#define INT_44XX_MMC4_IRQ (96 + IRQ_GIC_START)
-
+#define INT_44XX_MCPDM_IRQ (112 + IRQ_GIC_START)

/* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and
* 16 MPUIO lines */
--
1.6.0.4