Messages in this thread |  | | | Date | Fri, 25 Mar 2011 15:45:44 +0100 | | From | Tejun Heo <> | | Subject | Re: linux-next: manual merge of the ext4 tree with Linus' tree |
| |
Hello, Stephen, Ted.
On Fri, Mar 25, 2011 at 12:56:43PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the ext4 tree got a conflict in > fs/ext4/super.c between commit fd89d5f2030a ("ext4: convert to > alloc_workqueue()") from Linus' tree and commit 198868f35de9 ("ext4: Use > single thread to perform DIO unwritten convertion") from the ext4 tree. > > I just used the ext4 tree version.
Both are about the same conversion but the one using alloc_workqueue() is better because 1. create_singlethread_workqueue() is going away and 2. it doesn't require strict ordering among queued works.
Ted, what do you think?
Thanks.
-- tejun
|  |