linux-kernel - linux-next: manual merge of the usb 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120503144421.bce525fdec4a9b2d3b7557d5@canb.auug.org.au>
Date:	Thu, 3 May 2012 14:44:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Chris Bagwell <chris@...bagwell.com>
Subject: linux-next: manual merge of the usb tree with the input tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
from the usb tree.

I just used the input tree's version (which used "input->dev.parent"
instead of "&input->dev").
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped