On Tue, Apr 13, 2021 at 06:59:36PM +1000, Stephen Rothwell wrote:
> diff --cc lib/test_kasan.c
> index 785e724ce0d8,bf9225002a7e..
> --- a/lib/test_kasan.c
> +++ b/lib/test_kasan.c
> @@@ -78,33 -83,30 +83,35 @@@ static void kasan_test_exit(struct kuni
>* fields, it can reorder or
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/test_kasan.c
between commits:
2603f8a78dfb ("kasan: Add KASAN mode kernel parameter")
e80a76aa1a91 ("kasan, arm64: tests supports for HW_TAGS async mode")
from the arm64 tree and commit:
c616ba7e0d63
On Thu, Dec 03, 2020 at 07:06:01PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/uaccess.h
> index d841a560fae7,abb31aa1f8ca..
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@@ -186,64 -159,20 +159,43 @@@ static inline void
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/include/asm/uaccess.h
between commits:
923e1e7d8223 ("arm64: uaccess: rename privileged uaccess routines")
7cf283c7bd62 ("arm64: uaccess: remove redundant PAN toggling")
from the arm64 tree and
Hi all,
On Mon, 21 Sep 2020 18:03:53 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> 0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map")
>
> from the arm64
On Mon, Sep 21, 2020 at 06:03:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index 087a844b4d26,64211436629d..
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp
> #endif
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map")
from the arm64 tree and commit:
8e19cbb9528f ("arch, drivers: replace for_each_membock() with
On Thu, Jul 16, 2020 at 06:00:12PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/init.c
>
> between commit:
>
> abb7962adc80 ("arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K
> and 64K configs")
>
> from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/init.c
between commit:
abb7962adc80 ("arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K and
64K configs")
from the arm64 tree and commit:
10d44973d8ab ("mm/hugetlb: split hugetlb_cma in
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/Kconfig
between commit:
ab7876a98a21 ("arm64: elf: Enable BTI at exec based on ELF program
properties")
from the arm64 tree and commit:
03a534dd08f3 ("arm64: mm: use ARCH_HAS_DEBUG_WX instead of
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/include/asm/pgtable.h
between commit:
68ecabd0e680 ("arm64/mm: Use phys_to_page() to access pgtable memory")
from the arm64 tree and commit:
22998131ab33 ("arm64: add support for folded p4d page
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/include/asm/processor.h
between commit:
b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")
from the arm64 tree and commit:
cd6ee3f76f64 ("arm64, mm: move generic mmap layout functions to
On Thu, Dec 13, 2018 at 05:01:07PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/mmu.c
>
> between commit:
>
> 4ab215061554 ("arm64: Add memory hotplug support")
>
> from the arm64 tree and commit:
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
4ab215061554 ("arm64: Add memory hotplug support")
from the arm64 tree and commit:
232619fcc076 ("lib/ioremap: ensure break-before-make is used for huge p4d
mappings")
On Tue, Dec 11, 2018 at 05:12:30PM +1100, Stephen Rothwell wrote:
> On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > arch/arm64/mm/proc.S
> >
> > between commits:
> >
> > 67e7fdfcc682 ("arm64:
Hi all,
[Sent to early with people missing ...]
On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/arm64/mm/proc.S
>
> between commits:
>
> 67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/include/asm/memory.h
between commit:
6e8830674ea7 ("arm64: kasan: Increase stack size for KASAN_EXTRA")
from the arm64 tree and commit:
2a4689e7f69c ("kasan, arm64: adjust shadow size for tag-based
Hi Stephen,
On Mon, Sep 24, 2018 at 02:38:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/Kconfig
> index da5e6f085561,f8a618a292f4..
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -785,7 -786,8 +785,8 @@@ config ARCH_FLATMEM_ENABL
> def_bool !NUMA
>
>
Hi Stephen,
On Mon, Sep 24, 2018 at 02:38:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/Kconfig
> index da5e6f085561,f8a618a292f4..
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@@ -785,7 -786,8 +785,8 @@@ config ARCH_FLATMEM_ENABL
> def_bool !NUMA
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/Kconfig
between commit:
8a695a587333 ("arm64: Kconfig: Remove ARCH_HAS_HOLES_MEMORYMODEL")
from the arm64 tree and commit:
e1405baa7db1 ("arm: arm64: introduce CONFIG_HAVE_MEMBLOCK_PFN_VALID")
from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/Kconfig
between commit:
8a695a587333 ("arm64: Kconfig: Remove ARCH_HAS_HOLES_MEMORYMODEL")
from the arm64 tree and commit:
e1405baa7db1 ("arm: arm64: introduce CONFIG_HAVE_MEMBLOCK_PFN_VALID")
from
Hi all,
On Fri, 27 Jul 2018 20:55:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/firmware/efi/libstub/Makefile
>
> between commit:
>
> 0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin")
>
> from the arm64
Hi all,
On Fri, 27 Jul 2018 20:55:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/firmware/efi/libstub/Makefile
>
> between commit:
>
> 0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin")
>
> from the arm64
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/firmware/efi/libstub/Makefile
between commit:
0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin")
from the arm64 tree and commit:
08cc64a7109b ("module: allow symbol exports to be
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/firmware/efi/libstub/Makefile
between commit:
0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin")
from the arm64 tree and commit:
08cc64a7109b ("module: allow symbol exports to be
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/uapi/linux/prctl.h
between commit:
7582e22038a2 ("arm64/sve: Backend logic for setting the vector length")
2d2123bc7c7f ("arm64/sve: Add prctl controls for userspace vector length
management")
from
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/uapi/linux/prctl.h
between commit:
7582e22038a2 ("arm64/sve: Backend logic for setting the vector length")
2d2123bc7c7f ("arm64/sve: Add prctl controls for userspace vector length
management")
from
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso
suitability")
from the arm64 tree and commit:
7b4d24d8c01d ("atomic64: no need for
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso
suitability")
from the arm64 tree and commit:
7b4d24d8c01d ("atomic64: no need for
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/dma-mapping.c
between commit:
b67a8b29df7e ("arm64: mm: only initialize swiotlb when necessary")
from the arm64 tree and commit:
29af59a63ef1 ("arm64: dma-mapping: constify attrs passed to
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/dma-mapping.c
between commit:
b67a8b29df7e ("arm64: mm: only initialize swiotlb when necessary")
from the arm64 tree and commit:
29af59a63ef1 ("arm64: dma-mapping: constify attrs passed to
On Wed, Dec 16, 2015 at 04:01:43PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/memblock.h
>
> between commit:
>
> bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory
>
On Wed, Dec 16, 2015 at 04:01:43PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/memblock.h
>
> between commit:
>
> bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory
>
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/memblock.h
between commit:
bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory
table")
from the arm64 tree and commit:
f7e2bc7d46e9 ("mm/memblock.c:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/memblock.h
between commit:
bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory
table")
from the arm64 tree and commit:
f7e2bc7d46e9 ("mm/memblock.c:
On Tue, Sep 23, 2014 at 08:23:39AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in
> arch/arm64/mm/dma-mapping.c between commit 2189064795dc ("arm64:
> Implement set_arch_dma_coherent_ops() to replace bus notifiers") from
> the arm64 tree and
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/mm/dma-mapping.c between commit 2189064795dc ("arm64:
Implement set_arch_dma_coherent_ops() to replace bus notifiers") from
the arm64 tree and commit 50a477611cc9 ("arm64: add atomic pool for
non-coherent
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/mm/dma-mapping.c between commit 2189064795dc (arm64:
Implement set_arch_dma_coherent_ops() to replace bus notifiers) from
the arm64 tree and commit 50a477611cc9 (arm64: add atomic pool for
non-coherent and
On Tue, Sep 23, 2014 at 08:23:39AM +0100, Stephen Rothwell wrote:
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/mm/dma-mapping.c between commit 2189064795dc (arm64:
Implement set_arch_dma_coherent_ops() to replace bus notifiers) from
the arm64 tree and commit
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/Kconfig between commit affeafbb8477 ("arm64: Remove stray
ARCH_HAS_OPP reference") from the arm64 tree and commit 0941368c8dd9
("lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig") from the
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm64/Kconfig between commit affeafbb8477 (arm64: Remove stray
ARCH_HAS_OPP reference) from the arm64 tree and commit 0941368c8dd9
(lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig) from the
akpm-current
41 matches
Mail list logo
