linux-kernel - RE: linux-next: manual merge of the akpm-current tree with the char-misc 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B1AF42F69@HASMSX106.ger.corp.intel.com>
Date:	Tue, 14 Jan 2014 08:31:26 +0000
From:	"Winkler, Tomas" <tomas.winkler@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Ian Munsie <imunsie@....ibm.com>
Subject: RE: linux-next: manual merge of the akpm-current tree with the
 char-misc tree



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Tuesday, January 14, 2014 06:51
> To: Andrew Morton; Greg KH; Arnd Bergmann
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Ian Munsie;
> Winkler, Tomas
> Subject: linux-next: manual merge of the akpm-current tree with the char-misc
> tree
> 
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> drivers/misc/mei/init.c between commit 33ec08263147 ("mei: revamp mei
> reset state machine") from the char-misc tree and commit dd045dab2999
> ("drivers/misc/mei: ratelimit several error messages") from the
> akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Can we just drop this rete limit stuff, I've never asked that. 
Tomas

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/