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
| ||
|
Date: Tue, 27 Mar 2012 00:33:58 -0700 From: Dmitry Torokhov <dmitry.torokhov@...il.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Jason Gerecke <killertofu@...il.com>, Chris Bagwell <chris@...bagwell.com> Subject: Re: linux-next: manual merge of the input tree with Linus' tree Hi Stephen, On Tue, Mar 27, 2012 at 12:16:10PM +1100, Stephen Rothwell wrote: > Hi Dmitry, > > Today's linux-next merge of the input tree got a conflict in > drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input: > wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus' > tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless > connect") from the input tree. > > The latter seems to incorporate the former, so I used that. Thank you. I merged the branches and resolved conflict so you should not see it anymore. Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists