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/riscv/include/asm/pgtable.h | 14 --------------
drivers/usb/gadget/function/f_fs.c | 10 ----------
2 files changed, 24 deletions(-)
--- a/arch/riscv/include/asm/pgtable.h~linux-next-git-rejects
+++ a/arch/riscv/include/asm/pgtable.h
@@ -436,24 +436,10 @@ extern void *dtb_early_va;
extern void setup_bootmem(void);
extern void paging_init(void);
-<<<<<<< HEAD
-#define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1)
-#define VMALLOC_END (PAGE_OFFSET - 1)
-#define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE)
-
-#define FIXADDR_TOP VMALLOC_START
-#ifdef CONFIG_64BIT
-#define FIXADDR_SIZE PMD_SIZE
-#else
-#define FIXADDR_SIZE PGDIR_SIZE
-#endif
-#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
-=======
static inline void pgtable_cache_init(void)
{
/* No page table caches to initialize */
}
->>>>>>> linux-next/akpm-base
/*
* Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
--- a/drivers/usb/gadget/function/f_fs.c~linux-next-git-rejects
+++ a/drivers/usb/gadget/function/f_fs.c
@@ -1589,7 +1589,6 @@ static int ffs_fs_get_tree(struct fs_con
static void ffs_fs_free_fc(struct fs_context *fc)
{
struct ffs_sb_fill_data *ctx = fc->fs_private;
-<<<<<<< HEAD
if (ctx) {
if (ctx->ffs_data) {
@@ -1597,15 +1596,6 @@ static void ffs_fs_free_fc(struct fs_con
ffs_data_put(ctx->ffs_data);
}
-=======
-
- if (ctx) {
- if (ctx->ffs_data) {
- ffs_release_dev(ctx->ffs_data);
- ffs_data_put(ctx->ffs_data);
- }
-
->>>>>>> linux-next/akpm-base
kfree(ctx);
}
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm.patch
mm-slb-guarantee-natural-alignment-for-kmallocpower-of-two-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
diff-sucks.patch
mm-introduce-madv_cold-fix.patch
mm-introduce-madv_pageout-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
