archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <>
To: Greg KH <>,
	AKASHI Takahiro <>,
	Ard Biesheuvel <>
Subject: linux-next: manual merge of the driver-core tree with the tip tree
Date: Thu, 13 Mar 2014 00:07:50 +0000	[thread overview]
Message-ID: <> (raw)

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

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in arch/x86/Kconfig between commit b4df597ae51f ("audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL") from the tip tree and commit 2b9c1f03278 ("x86: align x86 arch with generic CPU modalias handling") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc arch/x86/Kconfig
index 81f8485bb6b7,7fab7e0b1a72..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -127,7 -127,7 +127,8 @@@ config X8
        select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
        def_bool y

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-03-13  0:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-13  0:07 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-07-31  7:07 linux-next: manual merge of the driver-core tree with the tip tree Stephen Rothwell
2014-08-01  0:20 ` Greg KH
2014-08-01 23:38   ` Kees Cook
2014-08-02  2:40     ` Greg KH
2014-08-04 18:27     ` John Stultz
2013-04-11  5:30 Stephen Rothwell
2013-04-11 13:26 ` Greg KH
2012-11-29  4:24 Stephen Rothwell
2012-11-29  5:19 ` Greg KH
2011-12-28  4:57 Stephen Rothwell
2012-01-04 22:52 ` Greg KH

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* 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;
as well as URLs for NNTP newsgroup(s).