Messages in this thread | | | From | David Howells <> | Subject | Re: linux-next: manual merge of the workqueues tree with the Linus' tree | Date | Fri, 23 Jul 2010 13:05:54 +0100 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Looks right.
David
| |