Re: linux-next: manual merge of the arm-current tree with Linus' tree

* Stephen Rothwell wrote: > Hi Russell, > > Today's linux-next merge of the arm-current tree got a conflict in > arch/arm/kernel/perf_event.c between commit b88a2595b6d8 ("perf/arm: Fix > armpmu_map_hw_event()") from Linus' tree and commit d9f966357b14 ("ARM: > 7810/1: perf: Fix array out of

linux-next: manual merge of the arm-current tree with Linus' tree

Hi Russell, Today's linux-next merge of the arm-current tree got a conflict in arch/arm/kernel/perf_event.c between commit b88a2595b6d8 ("perf/arm: Fix armpmu_map_hw_event()") from Linus' tree and commit d9f966357b14 ("ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()") fr

linux-next: manual merge of the arm-current tree with Linus' tree

Hi Russell, Today's linux-next merge of the arm-current tree got a conflict in arch/arm/mm/init.c between commit dbe67df4ba78 ("mm: enhance free_reserved_area() to support poisoning memory with zero") from Linus' tree and commit 319e0b4f02f7 ("ARM: mm: fix boot on SA1110 Assabet") from the arm-cur