From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754265Ab0GWL2n (ORCPT ); Fri, 23 Jul 2010 07:28:43 -0400 Received: from hera.kernel.org ([140.211.167.34]:51607 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753055Ab0GWL2k (ORCPT ); Fri, 23 Jul 2010 07:28:40 -0400 Message-ID: <4C497CD5.5010908@kernel.org> Date: Fri, 23 Jul 2010 13:28:21 +0200 From: Tejun Heo User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.2.4) Gecko/20100608 Thunderbird/3.1 MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , Steve French , linux-cifs@vger.kernel.org Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree References: <20100723144600.dd4da992.sfr@canb.auug.org.au> In-Reply-To: <20100723144600.dd4da992.sfr@canb.auug.org.au> X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Fri, 23 Jul 2010 11:28:23 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, Stephen. On 07/23/2010 06:46 AM, Stephen Rothwell wrote: > 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. Yes, one failure case is removed, so that would be correct. Thank you very much for taking care of the conflict. -- tejun