From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-next@vger.kernel.org, Cyrill Gorcunov <gorcunov@gmail.com>,
Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Subject: linux-next: manual merge of the tip-core tree with the x86 tree
Date: Mon, 9 Feb 2009 11:24:53 +1100 [thread overview]
Message-ID: <20090209112453.7bb773f5.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
Hi all,
Today's linux-next merge of the tip-core tree got a trivial conflict in
arch/x86/include/asm/setup.h between commit
dbca1df48e89d8aa59254fdc10ef16c16e73d94e ("x86: headers cleanup -
setup.h") from the x86 tree and commit
15c554439faedfa490389b31db893dc764245e88 ("headers_check fix: x86,
setup.h") from the tip-core tree.
I fixed it up as in tip/master.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-02-09 0:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-09 0:24 Stephen Rothwell [this message]
2009-02-09 6:00 ` linux-next: manual merge of the tip-core tree with the x86 tree Cyrill Gorcunov
-- strict thread matches above, loose matches on Subject: below --
2009-03-25 0:28 Stephen Rothwell
2009-01-23 0:54 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=20090209112453.7bb773f5.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=jaswinderrajput@gmail.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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