linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-next@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: bkl-removal/arm merge conflict
Date: Thu, 22 May 2008 15:21:57 +1000	[thread overview]
Message-ID: <20080522152157.57dac9f7.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

Hi Jon,

Today's linux-next merge of the bkl-removal tree got a conflict in
arch/arm/common/rtctime.c between commit
b204d462d7eae31413c5ac80ec3a32a89765fd46 ("[RTC] remove old ARM rtc
library code") from the arm tree and commit
f6f28a87d5f4ae2b101e64ab494267f6858631c4 ("arm-common-rtctime: BKL
pushdown") from the bkl-removal tree.

The former removed the file which is what I did in linux-next.

Jon, you may want to remove or revert that commit from your tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2008-05-22  5:22 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-22  5:21 Stephen Rothwell [this message]
2008-05-22 14:16 ` linux-next: bkl-removal/arm merge conflict Jonathan Corbet
2008-05-22 23:35   ` 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=20080522152157.57dac9f7.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=corbet@lwn.net \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    /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;
as well as URLs for NNTP newsgroup(s).