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
| ||
|
Date: Tue, 12 Oct 2010 13:53:28 +1100 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, Steven Whitehouse <swhiteho@...hat.com> Subject: linux-next: manual merge of the workqueues tree with the gfs2 tree Hi Tejun, Today's linux-next merge of the workqueues tree got a conflict in fs/gfs2/main.c between commit 9fa0ea9f26f64fbfc3dfd51d1dc2c230b65ffb19 ("GFS2: Use new workqueue scheme") from the gfs2 tree and commit 6370a6ad3b53df90b4700977f7718118a2cd524a ("workqueue: add and use WQ_MEM_RECLAIM flag") from the workqueues tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc fs/gfs2/main.c index d7eb1e2,1c5f460..0000000 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@@ -144,7 -140,7 +144,7 @@@ static int __init init_gfs2_fs(void error = -ENOMEM; gfs_recovery_wq = alloc_workqueue("gfs_recovery", - WQ_RESCUER | WQ_FREEZEABLE, 0); - WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0); ++ WQ_MEM_RECLAIM | WQ_FREEZEABLE, 0); if (!gfs_recovery_wq) goto fail_wq; -- 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/
Powered by blists - more mailing lists