All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andy Lutomirski <luto@amacapital.net>,
	"Luck, Tony" <tony.luck@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Borislav Petkov <bp@suse.de>
Subject: linux-next: manual merge of the luto-misc tree with the tip tree
Date: Mon, 19 Jan 2015 17:08:39 +1100	[thread overview]
Message-ID: <20150119170839.2c6b4b78@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

Hi Andy,

Today's linux-next merge of the luto-misc tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce.c between commit 83737691e586 ("x86,
mce: Fix sparse errors") from the tip tree and commit d4812e169de4
("x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks") from
the luto-misc tree.

I fixed it up (the latter removed some of the code changed by the
former) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-01-19  6:08 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-19  6:08 Stephen Rothwell [this message]
2015-01-19  9:35 ` linux-next: manual merge of the luto-misc tree with the tip tree Borislav Petkov
2015-01-21  0:28   ` Fwd: " Andy Lutomirski
2015-01-21  5:34     ` Ingo Molnar
2015-01-21  5:48       ` Andy Lutomirski
2015-01-21  5:55         ` Andy Lutomirski
2015-01-21  5:55         ` Ingo Molnar
2015-01-21  6:01           ` Andy Lutomirski
2015-01-21  6:16             ` Ingo Molnar
2015-01-27 23:54               ` Andy Lutomirski

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=20150119170839.2c6b4b78@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bp@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=tony.luck@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.