linux-kernel - linux-next: manual merge of the kbuild tree with the arm-soc tree

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>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 7 Oct 2014 12:39:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michal Marek <mmarek@...e.cz>, Olof Johansson <olof@...om.net>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masahiro Yamada <yamada.m@...panasonic.com>,
	Boris BREZILLON <boris.brezillon@...e-electrons.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Subject: linux-next: manual merge of the kbuild tree with the arm-soc tree

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
arch/arm/mach-at91/Makefile between commit 91a55d4f6900 ("ARM: at91:
introduce OLD_IRQ_AT91 Kconfig option") from the arm-soc tree and
commit ac84eb47cc19 ("kbuild: remove unnecessary variable
initializaions") from the kbuild 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 arch/arm/mach-at91/Makefile
index ac99d87ffefe,75033839fc08..000000000000
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@@ -2,13 -2,12 +2,10 @@@
  # Makefile for the linux kernel.
  #
  
 -obj-y		:= irq.o gpio.o setup.o sysirq_mask.o
 +obj-y		:= gpio.o setup.o sysirq_mask.o
- obj-m		:=
- obj-n		:=
- obj-		:=
  
 +obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o
  obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o
 -obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
 -obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
 -obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o
  obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
  
  # CPU-specific support

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)