linux-next: manual merge of the akpm-current tree with the asm-generic tree

2018-12-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/sh/include/asm/Kbuild between commit: 2b3c5a99d5f3 ("sh: generate uapi header and syscall table header files") from the asm-generic tree and commit: 548211e87ba0 ("sh: include: convert to SPDX identifiers"

linux-next: manual merge of the akpm-current tree with the asm-generic tree

2018-03-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/tile/mm/mmap.c between commit: 0373506fe580 ("arch: remove tile port") from the asm-generic tree and commit: 69ab63fcaa9b ("exec: pass stack rlimit into mm layout functions") from the akpm-current tree.

linux-next: manual merge of the akpm-current tree with the asm-generic tree

2018-03-15 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/tile/kernel/pci_gx.c between commit: 0373506fe580 ("arch: remove tile port") from the asm-generic tree and commit: 4b36a05ab086 ("arch/tile/kernel/pci_gx.c: make setup_pcie_rc_delay() __init") from the ak

linux-next: manual merge of the akpm-current tree with the asm-generic tree

2018-03-15 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/score/mm/cache.c between commit: b8c9c8f0190f ("arch: remove score port") from the asm-generic tree and commit: 32a8c02959cd ("mm: fix races between swapoff and flush dcache") from the akpm-current tre

linux-next: manual merge of the akpm-current tree with the asm-generic tree

2018-03-15 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/sparse.c between commit: 123d3239fb65 ("mm: remove obsolete alloc_remap()") from the asm-generic tree and commit: 9c6a14b65e50 ("mm/sparse.c: optimize memmap allocation during sparse_init()") from the ak