From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Len Brown <lenb@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the acpi tree with Linus' tree
Date: Mon, 8 Oct 2012 10:49:48 +1100 [thread overview]
Message-ID: <20121008104948.6c0951fca954b44732f70bae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
include/acpi/acpixf.h between commit d8dc91b753b8 ("Merge branch
'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux")
from Linus' tree and commit 558dc6f9ee2a ("Merge branch 'upstream' into
next") from the acpi tree (which, as I pointed out, fixed the merge
conflict incorrectly).
I just used the version from Linus' tree. Len, please fix up your "next"
branch.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-07 23:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-07 23:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-04 1:40 linux-next: manual merge of the acpi tree with Linus' tree Stephen Rothwell
2012-03-30 0:46 Stephen Rothwell
2010-05-12 1:21 Stephen Rothwell
2010-01-18 2:56 Stephen Rothwell
2010-01-20 6:12 ` Len Brown
2010-01-20 6:29 ` Stephen Rothwell
2009-12-23 22:11 Stephen Rothwell
2009-12-23 22:39 ` Stephen Rothwell
2009-12-24 0:02 ` Stephen Rothwell
2009-12-24 5:02 ` Len Brown
2009-12-24 12:26 ` Stephen Rothwell
2009-12-24 20:05 ` Len Brown
2009-12-25 0:19 ` Stephen Rothwell
2009-12-16 2:00 Stephen Rothwell
2009-03-30 3:20 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=20121008104948.6c0951fca954b44732f70bae@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).