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
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/cpucaps.h
between commit:
20109a859a9b ("arm64: kernel: disable CNP on Carmel")
from Linus' tree and commit:
18107f8a2df6 ("arm64: Support execute-only permissions with Enhanced PAN")
from the
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/vdso/compat_gettimeofday.h
between commit:
97884ca8c292 ("arm64: Introduce a way to disable the 32bit vdso")
from Linus' tree and commit:
3503d56cc723 ("arm64/vdso: Add time namespace page")
fr
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
mm/vmalloc.c
between commit:
8e41f8726dcf ("mm/vmalloc: Fix calculation of direct map addr range")
from Linus' tree and commit:
4739d53fcd1d ("arm64/mm: wire up CONFIG_ARCH_HAS_SET_DIRECT_MAP")
from the arm64 tree.
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")
>
Hi all,
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")
from Linus' tree and commit:
a457b0f7f50d ("arm64: Add configuration/doc
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 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' tree and commit:
c9460dcb06ee ("arm64: capabilities: Merge entries for
ARM64_WORKAROUND
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 (
Hi all,
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 ("arm64: add endianness option to LDFLAGS instead of LD")
96f95a17c1cf ("Revert "arm64:
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/fpsimd.c
between commit:
a45448313706 ("arm64: fpsimd: Fix copying of FP state from signal frame into
task struct")
from Linus' tree and commit:
0abdeff598a6 ("arm64: fpsimd: Fix state leakage w
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/cpufeature.c
between commit:
3fab39997a98 ("arm64/sve: Report SVE to userspace via CPUID only if
supported")
from Linus' tree and commit:
64c02720ea35 ("arm64: cpufeature: Detect CPU RAS Extenti
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
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/cputype.h
between commit:
c622cc013cec ("arm64: Define cputype macros for Falkor CPU")
from Linus' tree and commit:
bb48711800e6 ("arm64: cpu_errata: Add Kryo to Falkor 1003 errata")
from t
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
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/cpufeature.c
between commit:
3fab39997a98 ("arm64/sve: Report SVE to userspace via CPUID only if
supported")
from Linus' tree and commits:
179a56f6f9fb ("arm64: Take into account ID_AA64PFR0_EL1
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
Hi Catalin,
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:
896dd2c32484 ("ACPI/IORT: Make platform devices initialization code SMMU
agnostic")
from
[+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 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:
896dd2c324842 ("ACPI/IORT: Make platform devices initialization code SMMU
agnostic")
fro
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 Catalin,
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 commit:
cb84d11e1625 ("arm64: neon: Remove support for nested or hardirq kernel
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
Hi Catalin,
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")
from Linus' tree and commits:
a4023f682739 ("arm64: Add hypervisor safe hel
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
drivers/perf/arm_pmu.c
between commit:
63fb0a9516b2 ("drivers/perf: arm_pmu: Fix NULL pointer dereference during
probe")
from Linus' tree and commit:
282b87963556 ("drivers/perf: arm_pmu: Always consider IRQ0 as
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/head.S
between commit:
fd363bd417dd ("arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE")
from Linus' tree and commit:
3c5e9f238bc4 ("arm64: head.S: move KASLR processing out of __enable_mmu()
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/mm/fault.c
between commit:
e19a6ee2460b ("arm64: kernel: Save and restore UAO and addr_limit on
exception entry")
from Linus' tree and commit:
541ec870ef31 ("arm64: kill ESR_LNX_EXEC")
from the arm64
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:
>
>
Hi Catalin,
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:
67f691976662 ("arm64: kvm: allows kvm cpu hotplug")
from the arm64 tree.
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:
>
>
Hi Catalin,
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:
f09f1bacfe2b ("arm64: Split pr_notice("Virtual kernel memory layout...") i
Hi Catalin,
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:
c031a4213c11 ("arm64: kaslr: randomize the linear region")
from the arm64
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
Hi Catalin,
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' tree and commit:
8e63d3887669 ("arm64: flush: use local TLB and I-ca
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
arch/arm64/mm/dump.c between commit 284be28565ef ("arm64: dump: Fix
implicit inclusion of definition for PCI_IOBASE") from Linus' tree and
commit 764011ca8247 ("arm64: mm: dump: add missing includes") from the
arm64 tree.
I
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
include/uapi/linux/kvm.h between commit 2a8fedd0c142 ("kvm: Add
definition of KVM_REG_MIPS") from Linus' tree and commit 7c8c5e6a9101
("arm64: KVM: system register handling") from the arm64 tree.
I fixed it up (see below) an
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
arch/arm64/include/asm/unistd32.h between commit 9d73fc2d641f ("open*(2)
compat fixes (s390, arm64)") from Linus' tree and commit 18a80376ddb0
("arm64: compat for clock_adjtime(2) is miswired") from the arm64 tree.
I fixed i
40 matches
Mail list logo
