From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
John Stultz <john.stultz@linaro•org>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the workqueues tree with the tip tree
Date: Mon, 27 Dec 2010 15:38:05 +1100 [thread overview]
Message-ID: <20101227153805.a5447f74.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
drivers/rtc/rtc-dev.c between commit
042620a018afcfba1d678062b62e463b9e43a68d ("RTC: Remove UIE emulation")
from the tree and commit 9db8995be5e1869b5effa117909bc285e06fc09b ("rtc:
don't use flush_scheduled_work()") from the workqueues tree.
The former removes the code that the latter modifies, so I used the
former.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-12-27 4:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-27 4:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-18 4:08 linux-next: manual merge of the workqueues tree with the tip tree Stephen Rothwell
2019-11-18 9:00 ` Sebastian Andrzej Siewior
2019-11-18 12:50 ` Ingo Molnar
2019-11-18 14:56 ` Paul E. McKenney
2019-11-18 15:09 ` Tejun Heo
2011-12-28 4:37 Stephen Rothwell
2010-08-02 3:26 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2010-07-20 4:46 Stephen Rothwell
2009-11-26 8:00 Stephen Rothwell
2009-11-26 8:12 ` Ingo Molnar
2009-11-26 9:15 ` Tejun Heo
2009-11-26 9:26 ` Ingo Molnar
2009-11-26 9:48 ` Tejun Heo
2009-11-26 9:51 ` Ingo Molnar
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=20101227153805.a5447f74.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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