From: Greg KH <greg@kroah.com>
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>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kees Cook <keescook@chromium.org>,
David Riley <davidriley@chromium.org>,
John Stultz <john.stultz@linaro.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the tip tree
Date: Thu, 31 Jul 2014 17:20:17 -0700 [thread overview]
Message-ID: <20140801002017.GA2945@kroah.com> (raw)
In-Reply-To: <20140731170735.5cf2062b@canb.auug.org.au>
On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add
> udelay_test module to validate udelay") from the tip tree and commit
> 0a8adf584759 ("test: add firmware_class loader test") from the
> driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-08-01 0:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2014-08-01 23:38 ` Kees Cook
2014-08-02 2:40 ` Greg KH
2014-08-04 18:27 ` John Stultz
2014-08-04 18:35 ` [PATCH] time: Rename udelay_test.c to test_udelay.c John Stultz
2014-08-04 19:35 ` Kees Cook
2014-08-06 16:31 ` David Riley
-- strict thread matches above, loose matches on Subject: below --
2025-11-17 5:30 linux-next: manual merge of the driver-core tree with the tip tree Stephen Rothwell
2025-11-17 21:34 ` Boqun Feng
2025-11-17 5:21 Stephen Rothwell
2025-11-17 21:29 ` Boqun Feng
2014-03-13 0:07 Mark Brown
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:
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=20140801002017.GA2945@kroah.com \
--to=greg@kroah.com \
--cc=davidriley@chromium.org \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=keescook@chromium.org \
--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 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.