linux-kernel - linux-next: manual merge of the arm-soc tree with the input 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: <20120917180211.de28c6e4ad5ed73ae43c162e@canb.auug.org.au>
Date:	Mon, 17 Sep 2012 18:02:11 +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,
	Josh <joshua.taylor0@...il.com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the arm-soc tree with the input tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/omap-keypad.c between commit 9e14f36bb577 ("Input:
omap-keypad - fixed formatting") from the input tree and commit
f799a3d8fe17 ("Input: omap-keypad: Remove dependencies to mach includes")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  Please resist white space only patches :-(

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/input/keyboard/omap-keypad.c
index b03c5b9,2bda5f0b..0000000
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@@ -421,10 -346,9 +346,9 @@@ err4
  err3:
  	device_remove_file(&pdev->dev, &dev_attr_enable);
  err2:
 -	for (i = row_idx - 1; i >=0; i--)
 +	for (i = row_idx - 1; i >= 0; i--)
  		gpio_free(row_gpios[i]);
- err1:
 -	for (i = col_idx - 1; i >=0; i--)
 +	for (i = col_idx - 1; i >= 0; i--)
  		gpio_free(col_gpios[i]);
  
  	kfree(omap_kp);

Content of type "application/pgp-signature" skipped