The patch titled Subject: linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-rejects.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: linux-next-git-rejects Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm64/include/asm/asm-uaccess.h | 12 ------------ 1 file changed, 12 deletions(-) --- a/arch/arm64/include/asm/asm-uaccess.h~linux-next-git-rejects +++ a/arch/arm64/include/asm/asm-uaccess.h @@ -57,16 +57,4 @@ alternative_else_nop_endif .macro uaccess_ttbr0_enable, tmp1, tmp2, tmp3 .endm #endif -<<<<<<< HEAD - -/* - * Remove the address tag from a virtual address, if present. - */ - .macro untagged_addr, dst, addr - sbfx \dst, \addr, #0, #56 - and \dst, \dst, \addr - .endm - -======= ->>>>>>> linux-next/akpm-base #endif _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm.patch mm-swap-disallow-swapon-on-zoned-block-devices-fix.patch rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix.patch mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings-fix.patch mm-sparse-do-not-waste-pre-allocated-memmap-space-fix.patch mm-vmscan-simplify-lruvec_lru_size-fix-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch hugetlb-remove-duplicated-code-checkpatch-fixes.patch hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch mm-annotate-refault-stalls-from-swap_readpage-fix.patch lib-optimize-cpumask_local_spread-v3-fix.patch usb-kcov-collect-coverage-from-hub_event-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch diff-sucks.patch drivers-block-null_blk_mainc-fix-layout.patch drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch