From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>
Cc: linux-next@vger•kernel.org,
Suresh Siddha <suresh.b.siddha@intel•com>,
Austin Zhang <austin.zhang@intel•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the crypto tree
Date: Thu, 7 Aug 2008 13:35:25 +1000 [thread overview]
Message-ID: <20080807133525.8901e2ef.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
include/asm-x86/cpufeature.h between commit
32e1d0a0651004f5fe47f85a2a5c725ad579a90c ("x64, x2apic/intr-remap: cpuid
bits for x2apic feature") from the x86 tree and commit
1f4f8a5d7935c81b5b3c7601ec9ac021db30ba4f ("crypto: crc32c - Use Intel
CRC32 instruction") from the crypto tree.
Just simple overlapping additions. I added both of them and can carry
the fixup.
--
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-07 3:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-07 3:35 Stephen Rothwell [this message]
2008-08-07 3:43 ` linux-next: manual merge of the crypto tree Herbert Xu
2008-08-25 6:44 ` Stephen Rothwell
2008-08-25 6:53 ` Stephen Rothwell
2008-08-25 6:55 ` Herbert Xu
2008-08-25 7:39 ` Ingo Molnar
2008-08-25 8:05 ` Zhang, Austin
2008-08-27 23:47 ` H. Peter Anvin
2008-08-28 7:27 ` Ingo Molnar
2008-08-28 17:52 ` H. Peter Anvin
2008-08-28 7:28 ` Ingo Molnar
2008-08-28 7:33 ` Herbert Xu
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=20080807133525.8901e2ef.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=austin.zhang@intel$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=suresh.b.siddha@intel$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/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