Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/mm/pgtable.c between commit d6ccc3ec95251d8d327 ("x86/paravirt:
Remove paravirt ops pmd_update[_defer] and pte_update_defer") from the tip tree
and commit cc5bc0810343b ("x86, thp: remove infrastructure for han
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/swap.c between commit 97b713ba3eba ("fs: kill BDI_CAP_SWAP_BACKED")
from the block tree and commit f69ec11fad9f ("rmap: drop support of
non-linear mappings") from the akpm-current tree.
I fixed it up (see below) and
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/clk/rockchip/clk.h and drivers/clk/rockchip/clk.c between commits like
fe94f974e9c8b8 ("clk: rockchip: protect critical clocks from getting disabled")
from the clk tree and "clk: rockchip: add restart handler
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
scripts/checkpatch.pl between commit 8678fa326053d41 ("checkpatch: relax check
for length of git commit IDs") from Linus' tree and what looks like the same
commit from the akpm-current tree.
I fixed it up by taking
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/powerpc/include/asm/topology.h between commit 4750afa2c568
("powerpc: Fix comment around arch specific definition of
RECLAIM_DISTANCE") from the powerpc tree and commit ba5b7fb4aebd ("mm:
disable zone_reclaim_mode
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/btrfs/inode.cfs/btrfs/file.c between commit 55e301fd57a6 ("Btrfs: move
fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h") from the btrfs tree and
commit "aio: don't include aio.h in sched.h" from the akpm-current tree.
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/memcontrol.c between commit 2ef37d3fe474 ("memcg: Simplify
mem_cgroup_force_empty_list error handling") from the cgroup tree and
commit 4bfe8322f427 ("memcg: fix hotplugged memory zone oops") from the
akpm-current tr
7 matches
Mail list logo
