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>
---
.mailmap | 5 ---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 --
drivers/gpu/drm/i915/display/intel_fbc.c | 6 ----
drivers/pinctrl/intel/pinctrl-baytrail.c | 13 --------
fs/io_uring.c | 3 --
fs/read_write.c | 31 ---------------------
include/linux/fs.h | 3 --
mm/filemap.c | 8 -----
8 files changed, 72 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1912,10 +1912,7 @@ static int psp_hw_fini(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct psp_context *psp = &adev->psp;
-<<<<<<< HEAD
-=======
int ret;
->>>>>>> linux-next/akpm-base
if (psp->adev->psp.ta_fw) {
psp_ras_terminate(psp);
--- a/drivers/gpu/drm/i915/display/intel_fbc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -714,8 +714,6 @@ static void intel_fbc_update_state_cache
cache->fb.format = fb->format;
cache->fb.modifier = fb->modifier;
-<<<<<<< HEAD
-=======
/* FIXME is this correct? */
cache->fb.stride = plane_state->color_plane[0].stride;
if (drm_rotation_90_or_270(plane_state->hw.rotation))
@@ -724,7 +722,6 @@ static void intel_fbc_update_state_cache
/* FBC1 compression interval: arbitrary choice of 1 second */
cache->interval = drm_mode_vrefresh(&crtc_state->hw.adjusted_mode);
->>>>>>> linux-next/akpm-base
cache->fence_y_offset = intel_plane_fence_y_offset(plane_state);
drm_WARN_ON(&dev_priv->drm, plane_state->flags & PLANE_HAS_FENCE &&
@@ -898,11 +895,8 @@ static void intel_fbc_get_reg_params(str
params->fence_id = cache->fence_id;
params->fence_y_offset = cache->fence_y_offset;
-<<<<<<< HEAD
-=======
params->interval = cache->interval;
->>>>>>> linux-next/akpm-base
params->crtc.pipe = crtc->pipe;
params->crtc.i9xx_plane = to_intel_plane(crtc->base.primary)->i9xx_plane;
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c~linux-next-git-rejects
+++ a/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -1206,7 +1206,6 @@ static int byt_gpio_direction_output(str
raw_spin_lock_irqsave(&byt_lock, flags);
byt_gpio_direct_irq_check(vg, offset);
-<<<<<<< HEAD
reg = readl(val_reg);
reg &= ~BYT_DIR_MASK;
@@ -1217,18 +1216,6 @@ static int byt_gpio_direction_output(str
writel(reg, val_reg);
-=======
-
- reg = readl(val_reg);
- reg &= ~BYT_DIR_MASK;
- if (value)
- reg |= BYT_LEVEL;
- else
- reg &= ~BYT_LEVEL;
-
- writel(reg, val_reg);
-
->>>>>>> linux-next/akpm-base
raw_spin_unlock_irqrestore(&byt_lock, flags);
return 0;
}
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -7674,11 +7674,8 @@ static void io_ring_ctx_free(struct io_r
io_mem_free(ctx->sq_sqes);
percpu_ref_exit(&ctx->refs);
-<<<<<<< HEAD
-=======
io_unaccount_mem(ctx, ring_pages(ctx->sq_entries, ctx->cq_entries),
ACCT_LOCKED);
->>>>>>> linux-next/akpm-base
free_uid(ctx->user);
put_cred(ctx->creds);
kfree(ctx->cancel_hash);
--- a/fs/read_write.c~linux-next-git-rejects
+++ a/fs/read_write.c
@@ -418,11 +418,6 @@ static ssize_t new_sync_read(struct file
return ret;
}
-<<<<<<< HEAD
-ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
-{
- mm_segment_t old_fs = get_fs();
-=======
static void warn_unsupported(struct file *file, const char *op)
{
pr_warn_ratelimited(
@@ -432,7 +427,6 @@ static void warn_unsupported(struct file
ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
{
->>>>>>> linux-next/akpm-base
ssize_t ret;
if (WARN_ON_ONCE(!(file->f_mode & FMODE_READ)))
@@ -442,16 +436,6 @@ ssize_t __kernel_read(struct file *file,
if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
-<<<<<<< HEAD
- set_fs(KERNEL_DS);
- if (file->f_op->read)
- ret = file->f_op->read(file, (void __user *)buf, count, pos);
- else if (file->f_op->read_iter)
- ret = new_sync_read(file, (void __user *)buf, count, pos);
- else
- ret = -EINVAL;
- set_fs(old_fs);
-=======
if (file->f_op->read_iter) {
struct kvec iov = { .iov_base = buf, .iov_len = count };
struct kiocb kiocb;
@@ -467,7 +451,6 @@ ssize_t __kernel_read(struct file *file,
warn_unsupported(file, "read");
ret = -EINVAL;
}
->>>>>>> linux-next/akpm-base
if (ret > 0) {
fsnotify_access(file);
add_rchar(current, ret);
@@ -537,12 +520,8 @@ static ssize_t new_sync_write(struct fil
}
/* caller is responsible for file_start_write/file_end_write */
-<<<<<<< HEAD
-ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
-=======
ssize_t __kernel_write(struct file *file, const void *buf, size_t count,
loff_t *pos)
->>>>>>> linux-next/akpm-base
{
ssize_t ret;
@@ -553,15 +532,6 @@ ssize_t __kernel_write(struct file *file
if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
-<<<<<<< HEAD
- if (file->f_op->write)
- ret = file->f_op->write(file, p, count, pos);
- else if (file->f_op->write_iter)
- ret = new_sync_write(file, p, count, pos);
- else
- ret = -EINVAL;
- set_fs(old_fs);
-=======
if (file->f_op->write_iter) {
struct kvec iov = { .iov_base = (void *)buf, .iov_len = count };
struct kiocb kiocb;
@@ -578,7 +548,6 @@ ssize_t __kernel_write(struct file *file
warn_unsupported(file, "write");
ret = -EINVAL;
}
->>>>>>> linux-next/akpm-base
if (ret > 0) {
fsnotify_modify(file);
add_wchar(current, ret);
--- a/include/linux/fs.h~linux-next-git-rejects
+++ a/include/linux/fs.h
@@ -320,11 +320,8 @@ enum rw_hint {
#define IOCB_SYNC (1 << 5)
#define IOCB_WRITE (1 << 6)
#define IOCB_NOWAIT (1 << 7)
-<<<<<<< HEAD
-=======
/* iocb->ki_waitq is valid */
#define IOCB_WAITQ (1 << 8)
->>>>>>> linux-next/akpm-base
#define IOCB_NOIO (1 << 9)
struct kiocb {
--- a/.mailmap~linux-next-git-rejects
+++ a/.mailmap
@@ -100,13 +100,8 @@ Greg Kroah-Hartman <gregkh@xxxxxxx>
Greg Kroah-Hartman <greg@xxxxxxxxx>
Gregory CLEMENT <gregory.clement@xxxxxxxxxxx> <gregory.clement@xxxxxxxxxxxxxxxxxx>
Hanjun Guo <guohanjun@xxxxxxxxxx> <hanjun.guo@xxxxxxxxxx>
-<<<<<<< HEAD
-Heiko Carstens <hca@xxxxxxxxxxxxx> <h.carstens@xxxxxxxxxx>
-Heiko Carstens <hca@xxxxxxxxxxxxx> <heiko.carstens@xxxxxxxxxx>
-=======
Heiko Carstens <hca@xxxxxxxxxxxxx>
Heiko Carstens <heiko.carstens@xxxxxxxxxx>
->>>>>>> linux-next/akpm-base
Henk Vergonet <Henk.Vergonet@xxxxxxxxx>
Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Henrik Rydberg <rydberg@xxxxxxxxxxx>
--- a/mm/filemap.c~linux-next-git-rejects
+++ a/mm/filemap.c
@@ -2053,11 +2053,7 @@ find_page:
page = find_get_page(mapping, index);
if (!page) {
-<<<<<<< HEAD
- if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO))
-=======
if (iocb->ki_flags & IOCB_NOIO)
->>>>>>> linux-next/akpm-base
goto would_block;
page_cache_sync_readahead(mapping,
ra, filp,
@@ -2204,11 +2200,7 @@ page_not_up_to_date_locked:
}
readpage:
-<<<<<<< HEAD
- if (iocb->ki_flags & IOCB_NOIO) {
-=======
if (iocb->ki_flags & (IOCB_NOWAIT |IOCB_NOIO)) {
->>>>>>> linux-next/akpm-base
unlock_page(page);
put_page(page);
goto would_block;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-close-race-between-munmap-and-expand_upwards-downwards-fix.patch
mm.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix.patch
mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
linux-next-rejects.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-2.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
