linux-kernel - linux-next: manual merge of the trivial tree with the fbdev 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:	Mon, 1 Jul 2013 14:38:24 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
	Florian Tobias Schandinat <FlorianSchandinat@....de>,
	Tomi Valkeinen <tomi.valkeinen@...com>,
	linux-fbdev@...r.kernel.org, Masanari Iida <standby24x7@...il.com>
Subject: linux-next: manual merge of the trivial tree with the fbdev tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/video/omap2/displays/panel-n8x0.c between commit ecc8b3708986
("OMAPDSS: Add panel dev pointer to dssdev") from the fbdev tree and
commit 8b513d0cf603 ("treewide: Fix typo in printk") from the trivial
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/video/omap2/displays/panel-n8x0.c
index d3860c5,860b180..0000000
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@@ -527,7 -527,7 +527,7 @@@ static int n8x0_panel_update(struct oma
  	dh = dssdev->panel.timings.y_res;
  
  	if (x != 0 || y != 0 || w != dw || h != dh) {
- 		dev_err(dssdev->dev, "invaid update region %d, %d, %d, %d\n",
 -		dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
++		dev_err(dssdev->dev, "invalid update region %d, %d, %d, %d\n",
  			x, y, w, h);
  		return -EINVAL;
  	}

Content of type "application/pgp-signature" skipped