On Thu, Aug 06, 2015 at 04:35:52PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/kexec.h
>
> between commit:
>
> 2b94ed245861 ("kexec: define kexec_in_progress in !CONFIG_KEXEC case")
>
> from the char
Excerpts from Winkler, Tomas's message of 2014-01-16 09:36:40 +1100:
> I think the issue was fixed and also then number of consecutive resets were
> limited to 3 so you should
> not see this issue anymore in the next release, your patch just conflicted
> with these fixes.
> Still need to provid
E: linux-next: manual merge of the akpm-current tree with the char-
> misc tree
>
> Excerpts from Winkler, Tomas's message of 2014-01-14 19:31:26 +1100:
> > > Today's linux-next merge of the akpm-current tree got a conflict in
> > > drivers/misc/mei/init.c betwe
Excerpts from Winkler, Tomas's message of 2014-01-14 19:31:26 +1100:
> > 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
> > ("driv
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Tuesday, January 14, 2014 06:51
> To: Andrew Morton; Greg KH; Arnd Bergmann
> Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Ian Munsie;
> Winkler, Tomas
> Subject: linux-next: manual merge
5 matches
Mail list logo
