From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
"Chen, Gong" <gong.chen@linux.intel.com>,
Tony Luck <tony.luck@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andreas Noever <andreas.noever@gmail.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the ia64 tree
Date: Tue, 15 Jul 2014 06:44:58 -0700 [thread overview]
Message-ID: <20140715134458.GB17795@kroah.com> (raw)
In-Reply-To: <20140715164349.5807b892@canb.auug.org.au>
On Tue, Jul 15, 2014 at 04:43:49PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in
> drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
> ("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
> 16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
> the char-misc 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-07-15 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 6:43 linux-next: manual merge of the char-misc tree with the ia64 tree Stephen Rothwell
2014-07-15 13:44 ` Greg KH [this message]
2014-07-15 13:49 ` Greg KH
2014-07-15 15:22 ` Luck, Tony
2014-07-15 15:36 ` Borislav Petkov
2014-07-15 15:57 ` Luck, Tony
2014-07-15 15:57 ` Luck, Tony
2014-07-15 16:18 ` Borislav Petkov
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=20140715134458.GB17795@kroah.com \
--to=greg@kroah.com \
--cc=andreas.noever@gmail.com \
--cc=arnd@arndb.de \
--cc=gong.chen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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.