From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Kees Cook <keescook@google.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Len Brown <len.brown@intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the kspp tree
Date: Mon, 11 Jul 2016 09:13:07 +0200 [thread overview]
Message-ID: <20160711071307.GB6835@gmail.com> (raw)
In-Reply-To: <20160711151100.02c0b012@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/x86_init.c
>
> between commit:
>
> 255303026193 ("x86: apply more __ro_after_init and const")
>
> from the kspp tree and commit:
Kees, did you plan to submit this patch (and any other pending x86 patches) to the
x86 tree?
>
> 1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Looks good to me!
Thanks,
Ingo
next prev parent reply other threads:[~2016-07-11 7:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 5:11 linux-next: manual merge of the tip tree with the kspp tree Stephen Rothwell
2016-07-11 7:13 ` Ingo Molnar [this message]
2016-07-11 18:02 ` Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2017-02-17 1:51 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=20160711071307.GB6835@gmail.com \
--to=mingo@kernel.org \
--cc=hpa@zytor.com \
--cc=keescook@google.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--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