linux-kernel - linux-next: manual merge of the akpm 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>] [day] [month] [year] [list]

Message-Id: <20130621173618.5e86932305b15b0fe4af6b8b@canb.auug.org.au>
Date:	Fri, 21 Jun 2013 17:36:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Lad, Prabhakar" <prabhakar.csengg@...il.com>,
	Sekhar Nori <nsekhar@...com>, Olof Johansson <olof@...om.net>,
	Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>, Robin Holt <holt@....com>
Subject: linux-next: manual merge of the akpm tree with the arm-soc tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm/mach-davinci/include/mach/tnetv107x.h between commit
b464e3cb2945 ("ARM: davinci: remove __init atrribute from function
declaration") from the arm-soc tree and commit "reboot: arm: change
reboot_mode to use enum reboot_mode" from the akpm 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-davinci/include/mach/tnetv107x.h
index 366e975,bc9479d..0000000
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@@ -51,10 -52,10 +52,10 @@@ struct tnetv107x_device_info 
  extern struct platform_device tnetv107x_wdt_device;
  extern struct platform_device tnetv107x_serial_device;
  
 -extern void __init tnetv107x_init(void);
 -extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);
 -extern void __init tnetv107x_irq_init(void);
 +extern void tnetv107x_init(void);
 +extern void tnetv107x_devices_init(struct tnetv107x_device_info *);
 +extern void tnetv107x_irq_init(void);
- void tnetv107x_restart(char mode, const char *cmd);
+ void tnetv107x_restart(enum reboot_mode mode, const char *cmd);
  
  #endif
  

Content of type "application/pgp-signature" skipped