Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/Makefile
between commit:
d08b9f0ca660 ("scs: Add support for Clang's Shadow Call Stack (SCS)")
from the arm64 tree and commit:
dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
mm/kasan/Makefile
between commit:
e2092740b723 ("kasan: Makefile: Replace -pg with CC_FLAGS_FTRACE")
from the arm64 tree and commit:
57b78a62e7f2 ("x86/uaccess, kasan: Fix KASAN vs SMAP")
from the tip tree.
I fixed it
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/include/asm/Kbuild
between commit:
fdcd06a8ab77 ("arch: Use asm-generic header for asm/mmiowb.h")
from the arm64 tree and commit:
46ad0840b158 ("locking/rwsem: Remove arch specific rwsem files")
from the tip
Hi all,
On Wed, 1 Nov 2017 16:47:18 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/Kconfig
>
> between commit:
>
> 396a5d4a5c32 ("arm64: Unconditionally support
> {ARCH_}HAVE_NMI{_SAFE_CMPXCHG}")
>
> from the arm64 tree and c
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/Kconfig
between commit:
396a5d4a5c32 ("arm64: Unconditionally support {ARCH_}HAVE_NMI{_SAFE_CMPXCHG}")
from the arm64 tree and commit:
087133ac9076 ("locking/qrwlock, arm64: Move rwlock implementation over to
Hi all,
On Tue, 22 Aug 2017 13:38:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/firmware/efi/libstub/arm64-stub.c
>
> between commit:
>
> 170976bcab07 ("efi/arm64: add EFI_KIMG_ALIGN")
>
> from the arm64 tree and commit:
>
>
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/arm64-stub.c
between commit:
170976bcab07 ("efi/arm64: add EFI_KIMG_ALIGN")
from the arm64 tree and commit:
0426a4e68f18 ("efi/libstub/arm64: Force 'hidden' visibility for section
markers")
Hi all,
With the merge window opening, just a reminder that this conflict still exists.
On Fri, 16 Jun 2017 13:25:03 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/acpi/apei/ghes.c
>
> between commit:
>
> d0189b2eef2e ("acpi: ape
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/acpi/apei/ghes.c
between commit:
d0189b2eef2e ("acpi: apei: handle SEA notification type for ARMv8")
from the arm64 tree and commit:
7bf130e4a065 ("ACPI/APEI: Handle GSIV and GPIO notification types")
from the
Hi Arnd,
On Fri, 31 Mar 2017 11:32:54 +0200 Arnd Bergmann wrote:
>
> Mark Brown's build bot now reports this build failure:
>
> arm64-defconfig
> ../arch/arm64/include/asm/bug.h:62:29: error: implicit declaration of
> function '_BUG_FLAGS' [-Werror=implicit-function-declaration]
>
> I t
On Fri, Mar 31, 2017 at 5:02 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/include/asm/bug.h
>
> between commit:
>
> f13d52cb3fad ("arm64: define BUG() instruction without CONFIG_BUG")
>
> from the arm64 tree and commit:
>
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/include/asm/bug.h
between commit:
f13d52cb3fad ("arm64: define BUG() instruction without CONFIG_BUG")
from the arm64 tree and commit:
19d436268dde ("debug: Add _ONCE() logic to report_bug()")
from the tip tr
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/jump_label.h
between commit:
ef0da55a84a3 ("jump_labels: Allow array initialisers")
from the arm64 tree and commit:
b8fb03785d4d ("locking/static_keys: Provide DECLARE and well as DEFINE
macros")
from th
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/irqchip/irq-gic.c
between commit:
25fc11aead38 ("irqchip/gic: Restore CPU interface checking")
from the arm64 tree and commit:
dc9722cc57eb ("irqchip/gic: Return an error if GIC initialisation fails")
f673b9b5
On Fri, 29 Apr, at 01:56:45PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/firmware/efi/arm-init.c
>
> between commits:
>
> 500899c2cc3e ("efi: ARM/arm64: ignore DT memory nodes instead of removing
> them")
> 7464b6e3a5fb
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/arm-init.c
between commits:
500899c2cc3e ("efi: ARM/arm64: ignore DT memory nodes instead of removing
them")
7464b6e3a5fb ("efi: ARM: avoid warning about phys_addr_t cast")
from the arm64 tree and c
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/efistub.h
between commits:
e4fbf4767440 ("efi: stub: implement efi_get_random_bytes() based on
EFI_RNG_PROTOCOL")
2ddbfc81eac8 ("efi: stub: add implementation of efi_random_alloc()")
from th
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/arm64-stub.c
between commit:
2b5fe07a78a0 ("arm64: efi: invoke EFI_RNG_PROTOCOL to supply KASLR
randomness")
from the arm64 tree and commit:
42b55734030c ("efi/arm64: Check for h/w support
Hi Catalin,
On Thu, 22 Oct 2015 16:32:01 +0100 Catalin Marinas
wrote:
>
> On Thu, Oct 22, 2015 at 01:06:03PM +0100, Suzuki K. Poulose wrote:
> > On Thu, Oct 22, 2015 at 01:26:52PM +1100, Stephen Rothwell wrote:
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > ar
On Thu, Oct 22, 2015 at 01:06:03PM +0100, Suzuki K. Poulose wrote:
> On Thu, Oct 22, 2015 at 01:26:52PM +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/arm64/kernel/cpufeature.c
> >
> > between commit:
> >
> > da8d02d19ffd ("arm64/c
On Thu, Oct 22, 2015 at 01:26:52PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/kernel/cpufeature.c
>
> between commit:
>
> da8d02d19ffd ("arm64/capabilities: Make use of system wide safe value")
>
> from the arm64
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/kernel/cpufeature.c
between commit:
da8d02d19ffd ("arm64/capabilities: Make use of system wide safe value")
from the arm64 tree and commit:
963fcd409587 ("arm64: cpufeatures: Check ICC_EL1_SRE.SRE before enab
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Documentation/arm/uefi.txt
between commit:
d4dddfdbbc75 ("arm64/efi: remove /chosen/linux, uefi-stub-kern-ver DT
property")
from the arm64 tree and commit:
c9494dc81875 ("arm64: Use core efi=debug instead of uefi_debug
On Tue, Oct 13, 2015 at 01:10:48PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/include/asm/atomic.h
>
> between commit:
>
> 305d454aaa29 ("arm64: atomics: implement native {relaxed, acquire, release}
> atomics")
>
> from the a
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/include/asm/atomic.h
between commit:
305d454aaa29 ("arm64: atomics: implement native {relaxed, acquire, release}
atomics")
from the arm64 tree and commit:
62e8a3258bda ("atomic, arch: Audit atomic_{read,set}
On Fri, May 23, 2014 at 07:44:02AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in
> arch/arm64/mm/mmu.c between commit a501e32430d4 ("arm64: Clean up the
> default pgprot setting") and 206a2a73a62d ("arm64: mm: Create gigabyte
> kernel logical mappings w
On Fri, May 23, 2014 at 07:28:44AM +0100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/thread_info.h
> index 9c086c63f911,7b8e3a2a00fb..
> --- a/arch/arm64/include/asm/thread_info.h
> +++ b/arch/arm64/include/asm/thread_info.h
> @@@ -103,12 -99,7 +102,11 @@@ static inline
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm64/mm/mmu.c between commit a501e32430d4 ("arm64: Clean up the
default pgprot setting") and 206a2a73a62d ("arm64: mm: Create gigabyte
kernel logical mappings where possible") from the arm64 tree and commit
d7ecbddf4cae ("arm
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/arm64/include/asm/thread_info.h between commit 449f81a4da4d
("arm64: make a single hook to syscall_trace() for all syscall
features") from the arm64 tree and commit 842514849a61 ("arm64: Remove
TIF_POLLING_NRFLAG") from the ti
29 matches
Mail list logo