From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree
Date: Fri, 23 Jul 2010 13:05:54 +0100 [thread overview]
Message-ID: <19175.1279886754@redhat.com> (raw)
In-Reply-To: <20100723144600.dd4da992.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> 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
WARNING: multiple messages have this Message-ID (diff)
From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, Tejun Heo <tj@kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Steve French <smfrench@gmail.com>,
linux-cifs@vger.kernel.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree
Date: Fri, 23 Jul 2010 13:05:54 +0100 [thread overview]
Message-ID: <19175.1279886754@redhat.com> (raw)
In-Reply-To: <20100723144600.dd4da992.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-07-23 12:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 4:46 linux-next: manual merge of the workqueues tree with the Linus' tree Stephen Rothwell
2010-07-23 4:46 ` Stephen Rothwell
[not found] ` <20100723144600.dd4da992.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:28 ` Tejun Heo
2010-07-23 11:28 ` Tejun Heo
[not found] ` <4C497CD5.5010908-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2010-07-23 11:31 ` Stephen Rothwell
2010-07-23 11:31 ` Stephen Rothwell
[not found] ` <20100723213148.3d2193a3.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:34 ` Tejun Heo
2010-07-23 11:34 ` Tejun Heo
[not found] ` <4C497E5F.80301-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2010-07-23 11:42 ` Stephen Rothwell
2010-07-23 11:42 ` Stephen Rothwell
[not found] ` <20100723214233.7cb7de8d.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:45 ` Tejun Heo
2010-07-23 11:45 ` Tejun Heo
2010-08-05 3:04 ` Stephen Rothwell
2010-08-05 3:04 ` Stephen Rothwell
2010-08-05 3:45 ` Stephen Rothwell
2010-07-23 12:05 ` David Howells [this message]
2010-07-23 12:05 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19175.1279886754@redhat.com \
--to=dhowells-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.