expected linux-next conflicts from workqueue/for-3.7
Hello, Stephen.
I just applied patch series to deprecate flush[_delayed]_work_sync(). All in-kernel users are converted to use flush[_delayed]_work() instead. It will cause conflicts in the following files on linux-next.
* drivers/media/video/omap24xxcam.c
* drivers/media/video/cx23885/cx23885-input.c
* drivers/media/video/cx18/cx18-driver.c
* drivers/hid/hid-picolcd.c
The first three files have been renamed and the last file has been split. Resolution should be simple and if not, for whatever reason, the changes can be safely skipped.
Thanks.
Signature · 1 line
tejun
Hi Tejun,
Quoted 6 lines · On Mon, 20 Aug 2012 15:04:21 -0700 Tejun Heo <[email protected]> wrote:
I just applied patch series to deprecate flush[_delayed]_work_sync(). All in-kernel users are converted to use flush[_delayed]_work() instead. It will cause conflicts in the following files on linux-next.
Quoted 8 lines
*
drivers/media/video/omap24xxcam.c
*drivers/media/video/cx23885/cx23885-input.c
*drivers/media/video/cx18/cx18-driver.c
*drivers/hid/hid-picolcd.cThe first three files have been renamed and the last file has been split. Resolution should be simple and if not, for whatever reason, the changes can be safely skipped.
Thanks for the heads up.
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]
Hi Tejun,
Quoted 9 lines · On Mon, 20 Aug 2012 15:04:21 -0700 Tejun Heo <[email protected]> wrote:
I just applied patch series to deprecate flush[_delayed]_work_sync(). All in-kernel users are converted to use flush[_delayed]_work() instead. It will cause conflicts in the following files on linux-next.
*
drivers/media/video/omap24xxcam.c
*drivers/media/video/cx23885/cx23885-input.c
*drivers/media/video/cx18/cx18-driver.c
git seems to have tracked and fixed these up
Quoted 1 line
*
drivers/hid/hid-picolcd.c
I fixed this (the call has been removed).
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]