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
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-misc tree and commit:
3d86985f695b ("kexec: split kexec_load syscall from kexec core
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/misc/ti-st/st_core.c between commit 0ec0cf19201d
("drivers:misc:ti-st: protect against bad packets") from the char-misc
tree and commit 55ed078edf3f ("drivers/misc/ti-st/st_core.c: fix NULL
dereference on protoc
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
t: 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") fr
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 tr
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/misc/mei/hbm.c between commit 544f94601409 ("mei: do not run
reset flow from the interrupt thread") from the char-misc tree and commit
dd045dab2999 ("drivers/misc/mei: ratelimit several error messages") from
the
9 matches
Mail list logo
