public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Mauro Carvalho Chehab" <mchehab@redhat.com>,
	"Bruno Prémont" <bonbons@linux-vserver.org>,
	linux-next@vger.kernel.org
Subject: expected linux-next conflicts from workqueue/for-3.7
Date: Mon, 20 Aug 2012 15:04:21 -0700	[thread overview]
Message-ID: <20120820220421.GY24861@google.com> (raw)

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

             reply	other threads:[~2012-08-20 22:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20 22:04 Tejun Heo [this message]
2012-08-20 22:48 ` expected linux-next conflicts from workqueue/for-3.7 Stephen Rothwell
2012-08-21  4:00 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120820220421.GY24861@google.com \
    --to=tj@kernel.org \
    --cc=bonbons@linux-vserver.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@redhat.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox