linux-kernel - linux-next: manual merge of the input tree with the rr 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: <20120106151051.451028e2a161f9b1b6d40535@canb.auug.org.au>
Date:	Fri, 6 Jan 2012 15:10:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>
Subject: linux-next: manual merge of the input tree with the rr tree

Hi Dmitry,

Today's linux-next merge of the input tree got a conflict in
drivers/input/touchscreen/ucb1400_ts.c between commit 8c2e30fe02e2
("module_param: make bool parameters really bool (drivers & misc)") from
the rr tree and commit c899afedf168 ("Input: ucb1400_ts - convert to
threaded IRQ") from the input 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 drivers/input/touchscreen/ucb1400_ts.c
index 056eea9,d2b5753..0000000
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@@ -25,12 -26,11 +26,11 @@@
  #include <linux/input.h>
  #include <linux/device.h>
  #include <linux/interrupt.h>
- #include <linux/suspend.h>
- #include <linux/kthread.h>
- #include <linux/freezer.h>
  #include <linux/ucb1400.h>
  
+ #define UCB1400_TS_POLL_PERIOD	10 /* ms */
+ 
 -static int adcsync;
 +static bool adcsync;
  static int ts_delay = 55; /* us */
  static int ts_delay_pressure;	/* us */
  

Content of type "application/pgp-signature" skipped