linux-kernel - linux-next: manual merge of the workqueues tree with the Linus' 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: <20100723144600.dd4da992.sfr@canb.auug.org.au>
Date:	Fri, 23 Jul 2010 14:46:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Steve French <smfrench@...il.com>, <linux-cifs@...r.kernel.org>
Subject: linux-next: manual merge of the workqueues tree with the Linus'
 tree

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
fs/cifs/cifsfs.c between commit 4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7
("CIFS: Fix a malicious redirect problem in the DNS lookup code") from
Linus' tree and commit 9b646972467fb5fdc677f9e4251875db20bdbb64 ("cifs:
use workqueue instead of slow-work") from the workqueues tree.

I fixed it up (I think - I removed the call to cifs_exit_dns_resolver()
as there is no way to get to that code any more) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/