linux-kernel - linux-next: manual merge of the mips tree with the arm and h8300 trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 2 Jun 2015 10:41:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ralf Baechle <ralf@...ux-mips.org>,
	Russell King <linux@....linux.org.uk>,
	Yoshinori Sato <ysato@...rs.sourceforge.jp>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Burton <paul.burton@...tec.com>,
	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>
Subject: linux-next: manual merge of the mips tree with the arm and h8300
 trees

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
drivers/irqchip/Makefile between commits 22b67acd99c0 ("ARM: 8368/1:
sa1100: move irq driver to drivers/irqchip/") from the arm tree and
eba5540f0103 ("h8300: IRQ chip driver") from the h8300 tree and commit
a7c64f0e29a6 ("MIPS/IRQCHIP: Move Ingenic SoC intc driver to
drivers/irqchip") from the mips tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/irqchip/Makefile
index ed9553322638,db014e8e12c9..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -47,6 -48,4 +48,7 @@@ obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keys
  obj-$(CONFIG_MIPS_GIC)			+= irq-mips-gic.o
  obj-$(CONFIG_ARCH_MEDIATEK)		+= irq-mtk-sysirq.o
  obj-$(CONFIG_ARCH_DIGICOLOR)		+= irq-digicolor.o
 +obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o
 +obj-$(CONFIG_RENESAS_H8300H_INTC)	+= irq-renesas-h8300h.o
 +obj-$(CONFIG_RENESAS_H8S_INTC)		+= irq-renesas-h8s.o
+ obj-$(CONFIG_INGENIC_IRQ)		+= irq-ingenic.o

Content of type "application/pgp-signature" skipped