linux-kernel - Re: linux-next: manual merge of the workqueues tree with the hid 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1210020021570.23544@pobox.suse.cz>
Date:	Tue, 2 Oct 2012 00:23:47 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bruno Prémont <bonbons@...ux-vserver.org>
Subject: Re: linux-next: manual merge of the workqueues tree with the hid
 tree

On Tue, 21 Aug 2012, Stephen Rothwell wrote:

> Hi Tejun,
> 
> Today's linux-next merge of the workqueues tree got a conflict in
> drivers/hid/hid-picolcd.c between commit fabdbf2fd22f ("HID: picoLCD:
> split driver code") from the hid tree and commit 43829731dd37
> ("workqueue: deprecate flush[_delayed]_work_sync()") from the workqueues
> tree.
> 
> The former commit moved the code changed by the latter into a new file
> (and removed the old file) and then a later commit removed the call to
> flush_work_sync().  I just removed the file.

The same here. My part is now in Linus' tree -- Tejun, could you please 
sort this out on your side?

Thanks a lot,

-- 
Jiri Kosina
SUSE Labs
--
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/