Hi Tejun, Today's linux-next merge of the workqueues tree got a conflict in drivers/isdn/mISDN/hwchannel.c between commit 4b921eda5336 ("mISDN: Fix wrong usage of flush_work_sync while holding locks") from the tree and commit 43829731dd37 ("workqueue: deprecate flush[_delayed]_work_sync()") from the workqueues tree.
The former supercedes the latter (I think) so I used that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpYpc2jorsFX.pgp
Description: PGP signature