linux-kernel - linux-next: manual merge of the tip tree with the drm 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:	Tue, 13 Mar 2012 16:11:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
	Alan Cox <alan@...ux.intel.com>,
	Dave Airlie <airlied@...hat.com>,
	Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: linux-next: manual merge of the tip tree with the drm tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/platform/mrst/mrst.c between commit 026abc333205 ("gma500:
initial medfield merge") from the drm tree and commit ecfdb0ac15ba
("x86/mrst: Add msic_thermal platform support") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/platform/mrst/mrst.c
index b930cc4,721e652..0000000
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@@ -688,19 -670,11 +672,24 @@@ static void *msic_ocd_platform_data(voi
  	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);
  }
  
 +/* tc35876x DSI-LVDS bridge chip and panel platform data */
 +static void *tc35876x_platform_data(void *data)
 +{
 +       static struct tc35876x_platform_data pdata;
 +
 +       /* gpio pins set to -1 will not be used by the driver */
 +       pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN");
 +       pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN");
 +       pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3");
 +
 +       return &pdata;
 +}
 +
+ static void *msic_thermal_platform_data(void *info)
+ {
+ 	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
+ }
+ 
  static const struct devs_id __initconst device_ids[] = {
  	{"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
  	{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},

Content of type "application/pgp-signature" skipped