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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20101227153855.67152fd9.sfr@canb.auug.org.au>
Date:	Mon, 27 Dec 2010 15:38:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David HÃ¤rdeman <david@...deman.nu>,
	Mauro Carvalho Chehab <mchehab@...hat.com>
Subject: linux-next: manual merge of the workqueues tree with the v4l-dvb
 tree

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@...b.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));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/