On Mon, Mar 29, 2021 at 09:29:40AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/cpucaps.h
> index c40f2490cd7b,9e3ec4dd56d8..
> --- a/arch/arm64/include/asm/cpucaps.h
> +++ b/arch/arm64/include/asm/cpucaps.h
> @@@ -66,8 -66,8 +66,9 @@@
> #define ARM64_WORKAROUND_1
On Tue, Dec 11, 2018 at 08:52:57AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got conflicts in:
>
> Documentation/arm64/silicon-errata.txt
> arch/arm64/Kconfig
>
> between commit:
>
> ce8c80c536da ("arm64: Add workaround for Cortex-A76 erratum 1286807")
>
Will, Stephen
On 07/12/2018 12:16, Will Deacon wrote:
On Fri, Dec 07, 2018 at 09:18:47AM +1100, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/cpu_errata.c
between commit:
ce8c80c536da ("arm64: Add workaround for Cortex-
On Fri, Dec 07, 2018 at 09:18:47AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/kernel/cpu_errata.c
>
> between commit:
>
> ce8c80c536da ("arm64: Add workaround for Cortex-A76 erratum 1286807")
>
> from Linus' tre
Hi Stephen,
On Tue, Jul 24, 2018 at 08:50:15AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/Makefile
>
> between commits:
>
> 38fc42486775 ("arm64: Use aarch64elf and aarch64elfb emulation mode
> variants")
> 2893af07e507 (
On Mon, Jan 15, 2018 at 08:32:14AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/cputype.h
> index cbf08d7cbf30,2f8d39ed9c2e..
> --- a/arch/arm64/include/asm/cputype.h
> +++ b/arch/arm64/include/asm/cputype.h
> @@@ -91,7 -94,7 +94,8 @@@
> #define BRCM_CPU_PART_VULC
On Fri, Jan 12, 2018 at 08:23:59AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/kernel/cpufeature.c
> index a73a5928f09b,da6722db50b0..
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@@ -145,8 -146,9 +146,10 @@@ static const struct arm64_ftr_bi
On Mon, Nov 13, 2017 at 09:15:08AM +, Catalin Marinas wrote:
> Hi Stephen,
>
> On Mon, Nov 13, 2017 at 05:09:53PM +1100, Stephen Rothwell wrote:
> > On Wed, 1 Nov 2017 07:57:23 +1100 Stephen Rothwell
> > wrote:
> > > Today's linux-next merge of the arm64 tree got a conflict in:
> > >
> > >
Hi Stephen,
On Mon, Nov 13, 2017 at 05:09:53PM +1100, Stephen Rothwell wrote:
> On Wed, 1 Nov 2017 07:57:23 +1100 Stephen Rothwell
> wrote:
> > Today's linux-next merge of the arm64 tree got a conflict in:
> >
> > drivers/acpi/arm64/iort.c
> >
> > between commit:
> >
> > 37f6b42e9c29 ("AC
Hi all,
On Wed, 1 Nov 2017 07:57:23 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> drivers/acpi/arm64/iort.c
>
> between commit:
>
> 37f6b42e9c29 ("ACPI/IORT: Fix PCI ACS enablement")
>
> from Linus' tree and commit:
>
> 896dd2c324
[+Will]
On Thu, Oct 19, 2017 at 12:28:33PM +0100, Mark Brown wrote:
> Hi Catalin,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> drivers/acpi/arm64/iort.c
>
> between commit:
>
> 37f6b42e9c296 ("ACPI/IORT: Fix PCI ACS enablement")
>
> from Linus' tree and commit:
>
Hi all,
On Thu, 24 Aug 2017 09:22:46 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/kernel/fpsimd.c
>
> between commit:
>
> 096622104e14 ("arm64: fpsimd: Prevent registers leaking across exec")
>
> from Linus' tree and commi
Hi Stephen,
On Tue, Nov 22, 2016 at 10:34:58AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/include/asm/cpufeature.h
>
> between commit:
>
> 272d01bd790f ("arm64: Fix circular include of asm/lse.h through
> linux/jump_label.h
On Fri, Apr 29, 2016 at 09:59:58AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm/kvm/arm.c
>
> between commit:
>
> 06a71a24bae5 ("arm64: KVM: unregister notifiers in hyp mode teardown path")
>
> from Linus' tree and commit:
>
>
On Tue, Mar 22, 2016 at 10:15:49AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/mm/init.c
>
> between commit:
>
> dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region")
>
> from Linus' tree and commit:
>
>
On Sun, Nov 01, 2015 at 10:53:27AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/kernel/suspend.c
>
> between commit:
>
> e13d918a19a7 ("arm64: kernel: fix tcr_el1.t0sz restore on systems with
> extended idmap")
>
> from Linus
16 matches
Mail list logo
