linux-kernel - linux-next: manual merge of the arm-soc tree with the v4l-dvb 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]

Date:	Thu, 29 Aug 2013 17:47:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	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,
	Vladimir Barinov <vladimir.barinov@...entembedded.com>,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
	Mauro Carvalho Chehab <mchehab@...radead.org>,
	Simon Horman <horms@...ge.net.au>,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/include/mach/r8a7778.h between commit 803c2df21752
("[media] ARM: shmobile: r8a7778: add VIN support") from the v4l-dvb tree
and commits cfa66a81621d ("ARM: shmobile: bockw: add DT reference"),
a66c9744574c ("ARM: shmobile: r8a7778: cleanup registration of mmcif")
and 044e2121466a ("ARM: shmobile: r8a7778: cleanup registration of usb
phy") from the arm-soc 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-shmobile/include/mach/r8a7778.h
index a7c6d15,41fd6da..0000000
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@@ -18,21 -18,12 +18,15 @@@
  #ifndef __ASM_R8A7778_H__
  #define __ASM_R8A7778_H__
  
- #include <linux/mmc/sh_mmcif.h>
- #include <linux/mmc/sh_mobile_sdhi.h>
  #include <linux/sh_eth.h>
- #include <linux/platform_data/usb-rcar-phy.h>
 +#include <linux/platform_data/camera-rcar.h>
  
  extern void r8a7778_add_standard_devices(void);
  extern void r8a7778_add_standard_devices_dt(void);
  extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
- extern void r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata);
- extern void r8a7778_add_i2c_device(int id);
- extern void r8a7778_add_hspi_device(int id);
- extern void r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info);
 +extern void r8a7778_add_vin_device(int id,
 +				   struct rcar_vin_platform_data *pdata);
+ extern void r8a7778_add_dt_devices(void);
  
  extern void r8a7778_init_late(void);
  extern void r8a7778_init_delay(void);

Content of type "application/pgp-signature" skipped