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, Mike Travis <travis@sgi•com>
Subject: linux-next: manual merge of the tip-core tree
Date: Mon, 4 Aug 2008 11:08:20 +1000 [thread overview]
Message-ID: <20080804110820.626f27df.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit
c6de002617c199f80f9a2a713dffc263bdc69b81 ("Missing symbol prefix on
vmlinux.lds.h") from Linus' tree and commit
d3794979a8a80c222ce9d016a6dfc4bed36965d0 ("Zero based percpu:
infrastructure to rebase the per cpu area to zero") from the tip-core
tree.
Just simple overlapping changes, I fixed it up.
--
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:[~2008-08-04 1:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-04 1:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 4:24 linux-next: manual merge of the tip-core tree Stephen Rothwell
2008-10-14 4:23 Stephen Rothwell
2008-07-08 0:16 Stephen Rothwell
2008-07-07 3:15 Stephen Rothwell
2008-07-07 6:12 ` Ingo Molnar
2008-07-07 6:39 ` Stephen Rothwell
2008-06-25 0:49 Stephen Rothwell
2008-06-25 3:51 ` Jeremy Fitzhardinge
2008-06-25 9:17 ` Ingo Molnar
2008-06-25 16:13 ` 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=20080804110820.626f27df.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
--cc=travis@sgi$(echo .)com \
/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