> -----Original Message----- > From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] > Sent: Tuesday, January 14, 2014 06:51 > To: Andrew Morton; Greg KH; Arnd Bergmann > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
