Re: expected linux-next conflicts from workqueue/for-3.7

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Tejun,

On Mon, 20 Aug 2012 15:04:21 -0700 Tejun Heo <tj@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgpqq4cXyaS8L.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux