From: David Miller <davem@davemloft.net>
To: rostedt@goodmis.org
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
emmanuel.grumbach@intel.com
Subject: Re: linux-next: manual merge of the ftrace tree with the net-next tree
Date: Tue, 14 Apr 2015 23:24:40 -0400 (EDT) [thread overview]
Message-ID: <20150414.232440.5065499008228520.davem@davemloft.net> (raw)
In-Reply-To: <20150414230629.78b83480@grimm.local.home>
From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 14 Apr 2015 23:06:29 -0400
> I also noted this coming conflict in my pull request. So Linus should
> be very well aware of it.
>
> https://lkml.org/lkml/2015/4/13/652
>
> "Also there's a conflict with commit 7e1223b50089 ("iwlwifi: mvm: new
> Alive / error table API") that Stephen found and he resolved it with
> cd98c1ef4ec1a4d08e920060b70e47a5a4e69377."
>
> That is, if that commit sha1 still exists.
I'll be sure to explain this to Linus.
next prev parent reply other threads:[~2015-04-15 3:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 7:52 linux-next: manual merge of the ftrace tree with the net-next tree Stephen Rothwell
2015-04-13 7:54 ` Grumbach, Emmanuel
2015-04-15 1:23 ` Stephen Rothwell
2015-04-15 2:39 ` David Miller
2015-04-15 3:06 ` Steven Rostedt
2015-04-15 3:24 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-14 5:16 Stephen Rothwell
2025-05-16 6:23 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=20150414.232440.5065499008228520.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).