* expected linux-next conflicts from workqueue/for-3.7
@ 2012-08-20 22:04 Tejun Heo
2012-08-20 22:48 ` Stephen Rothwell
2012-08-21 4:00 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Tejun Heo @ 2012-08-20 22:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mauro Carvalho Chehab, Bruno Prémont, linux-next
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.
--
tejun
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: expected linux-next conflicts from workqueue/for-3.7
2012-08-20 22:04 expected linux-next conflicts from workqueue/for-3.7 Tejun Heo
@ 2012-08-20 22:48 ` Stephen Rothwell
2012-08-21 4:00 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-08-20 22:48 UTC (permalink / raw)
To: Tejun Heo; +Cc: Mauro Carvalho Chehab, Bruno Prémont, linux-next
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
Hi Tejun,
On Mon, 20 Aug 2012 15:04:21 -0700 Tejun Heo <tj@kernel.org> 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
> * 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 for the heads up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: expected linux-next conflicts from workqueue/for-3.7
2012-08-20 22:04 expected linux-next conflicts from workqueue/for-3.7 Tejun Heo
2012-08-20 22:48 ` Stephen Rothwell
@ 2012-08-21 4:00 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-08-21 4:00 UTC (permalink / raw)
To: Tejun Heo; +Cc: Mauro Carvalho Chehab, Bruno Prémont, linux-next
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Tejun,
On Mon, 20 Aug 2012 15:04:21 -0700 Tejun Heo <tj@kernel.org> 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
> * drivers/hid/hid-picolcd.c
I fixed this (the call has been removed).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-21 4:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 22:04 expected linux-next conflicts from workqueue/for-3.7 Tejun Heo
2012-08-20 22:48 ` Stephen Rothwell
2012-08-21 4:00 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox