netdev - Re: linux-next: manual merge of the ftrace tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20150414.232440.5065499008228520.davem@davemloft.net>
Date:	Tue, 14 Apr 2015 23:24:40 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	rostedt@...dmis.org
Cc:	sfr@...b.auug.org.au, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	emmanuel.grumbach@...el.com
Subject: Re: linux-next: manual merge of the ftrace tree with the net-next
 tree

From: Steven Rostedt <rostedt@...dmis.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html