Home » Mailing list archives » linux-kernel » 2010 » December » 27

linux-next: manual merge of the workqueues tree with the v4l-dvb tree

Previous thread: linux-next: manual merge of the workqueues tree with the tip tree by Stephen Rothwell on Sunday, December 26, 2010 - 9:38 pm. (1 message)

Next thread: linux-next: Tree for December 27 by Stephen Rothwell on Sunday, December 26, 2010 - 11:04 pm. (25 messages)
[view original message]
From: Stephen Rothwell
Subject: linux-next: manual merge of the workqueues tree with the v4l-dvb tree
Date: Sunday, December 26, 2010 - 9:38 pm

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
drivers/media/video/bt8xx/bttv-input.c between commit
ed6ff10ea4e8748adad312c758ff12099cec6930 ("[media] bttv: merge ir
decoding timers") from the v4l-dvb tree and commit
8c71778cbf2c8beaefaa2dee5478aa0622d96682 ("media/video: don't use
flush_scheduled_work()") from the workqueues tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/bt8xx/bttv-input.c
index 7f48306,1989f00..0000000
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@@ -327,8 -235,7 +325,7 @@@ static void bttv_ir_stop(struct bttv *b
  	if (btv->remote->rc5_gpio) {
  		u32 gpio;
  
 -		del_timer_sync(&btv->remote->timer_end);
 +		del_timer_sync(&btv->remote->timer);
- 		flush_scheduled_work();
  
  		gpio = bttv_gpio_read(&btv->c);
  		bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
--


[ message continues ]
Previous thread: linux-next: manual merge of the workqueues tree with the tip tree by Stephen Rothwell on Sunday, December 26, 2010 - 9:38 pm. (1 message)

Next thread: linux-next: Tree for December 27 by Stephen Rothwell on Sunday, December 26, 2010 - 11:04 pm. (25 messages)