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>,
Peter Zijlstra <peterz@infradead•org>,
Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Patrik Jakobsson <patrik.r.jakobsson@gmail•com>
Subject: linux-next: manual merge of the tip tree with the drm tree
Date: Mon, 24 Mar 2014 14:38:46 +1100 [thread overview]
Message-ID: <20140324143846.39a09ca7ed3de2b089eef1c7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 933 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/gpu/drm/gma500/mmu.c between commit b219372dff81 ("drm/gma500:
Make SGX MMU driver actually do something") from the drm tree and commit
840d2830e6e5 ("x86, cpufeature: Rename X86_FEATURE_CLFLSH to
X86_FEATURE_CLFLUSH") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpu/drm/gma500/mmu.c
index 3e14a9b35252,c3e67ba94446..000000000000
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@@ -478,8 -520,7 +478,8 @@@ struct psb_mmu_driver *psb_mmu_driver_i
driver->has_clflush = 0;
+#if defined(CONFIG_X86)
- if (boot_cpu_has(X86_FEATURE_CLFLSH)) {
+ if (boot_cpu_has(X86_FEATURE_CLFLUSH)) {
uint32_t tfms, misc, cap0, cap4, clflush_size;
/*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-24 3:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-24 3:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-13 3:12 linux-next: manual merge of the tip tree with the drm tree Stephen Rothwell
2025-03-26 5:02 ` Stephen Rothwell
2023-04-11 3:59 Stephen Rothwell
2019-11-27 0:18 Stephen Rothwell
2019-10-10 1:51 Stephen Rothwell
2019-11-27 23:36 ` Stephen Rothwell
2017-02-17 1:56 Stephen Rothwell
2017-02-01 3:38 Stephen Rothwell
2016-11-17 2:59 Stephen Rothwell
2016-03-17 2:00 Stephen Rothwell
2016-03-17 9:00 ` Arnd Bergmann
2016-03-17 9:39 ` Stephen Rothwell
2016-03-17 16:52 ` Dave Hansen
2012-03-13 5:11 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=20140324143846.39a09ca7ed3de2b089eef1c7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=patrik.r.jakobsson@gmail$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--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