mm-commits Archive on lore.kernel.org
 help / color / Atom feed
* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-07-27 18:15 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-07-27 18:15 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/btrfs/inode.c |    4 ----
 fs/io_uring.c    |   30 ------------------------------
 2 files changed, 34 deletions(-)

--- a/fs/btrfs/inode.c~linux-next-git-rejects
+++ a/fs/btrfs/inode.c
@@ -8176,11 +8176,7 @@ again:
 	 *    bit of its io_tree, and free the qgroup reserved data space.
 	 *    Since the IO will never happen for this page.
 	 */
-<<<<<<< HEAD
-	btrfs_qgroup_free_data(inode, NULL, page_start, PAGE_SIZE);
-=======
 	btrfs_qgroup_free_data(BTRFS_I(inode), NULL, page_start, PAGE_SIZE);
->>>>>>> linux-next/akpm-base
 	if (!inode_evicting) {
 		clear_extent_bit(tree, page_start, page_end, EXTENT_LOCKED |
 				 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -4644,31 +4644,6 @@ static void io_async_queue_proc(struct f
 	struct async_poll *apoll = pt->req->apoll;
 
 	__io_queue_proc(&apoll->poll, pt, head, &apoll->double_poll);
-<<<<<<< HEAD
-}
-
-static void io_sq_thread_drop_mm(struct io_ring_ctx *ctx)
-{
-	struct mm_struct *mm = current->mm;
-
-	if (mm) {
-		kthread_unuse_mm(mm);
-		mmput(mm);
-	}
-}
-
-static int io_sq_thread_acquire_mm(struct io_ring_ctx *ctx,
-				   struct io_kiocb *req)
-{
-	if (io_op_defs[req->opcode].needs_mm && !current->mm) {
-		if (unlikely(!mmget_not_zero(ctx->sqo_mm)))
-			return -EFAULT;
-		kthread_use_mm(ctx->sqo_mm);
-	}
-
-	return 0;
-=======
->>>>>>> linux-next/akpm-base
 }
 
 static void io_async_task_func(struct callback_head *cb)
@@ -4694,11 +4669,6 @@ static void io_async_task_func(struct ca
 	/* restore ->work in case we need to retry again */
 	if (req->flags & REQ_F_WORK_INITIALIZED)
 		memcpy(&req->work, &apoll->work, sizeof(req->work));
-<<<<<<< HEAD
-	kfree(apoll->double_poll);
-	kfree(apoll);
-=======
->>>>>>> linux-next/akpm-base
 
 	if (!READ_ONCE(apoll->poll.canceled))
 		__io_req_task_submit(req);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-fix-kthread_use_mm-vs-tlb-invalidate-fix.patch
mm.patch
mm-handle-page-mapping-better-in-dump_page-fix.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-thp-replace-http-links-with-https-ones-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mmhwpoison-rework-soft-offline-for-in-use-pages-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
linux-next-rejects.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.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


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-08-03 22:39 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-08-03 22:39 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/include/asm/percpu.h |    4 ----
 1 file changed, 4 deletions(-)

--- a/arch/arm/include/asm/percpu.h~linux-next-git-rejects
+++ a/arch/arm/include/asm/percpu.h
@@ -5,11 +5,7 @@
 #ifndef _ASM_ARM_PERCPU_H_
 #define _ASM_ARM_PERCPU_H_
 
-<<<<<<< HEAD
 #include <asm/thread_info.h>
-=======
-register unsigned long current_stack_pointer asm ("sp");
->>>>>>> linux-next/akpm-base
 
 /*
  * Same as asm-generic/percpu.h, except that we store the per cpu offset
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-fix-kthread_use_mm-vs-tlb-invalidate-fix.patch
mm.patch
mm-handle-page-mapping-better-in-dump_page-fix.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-thp-replace-http-links-with-https-ones-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
linux-next-rejects.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.patch
mm-migrate-make-a-standard-migration-target-allocation-function-fix.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-07-23 23:23 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-07-23 23:23 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/soc/codecs/rt5670.c               |   15 ---------------
 sound/soc/intel/boards/cht_bsw_rt5672.c |   10 ----------
 sound/soc/soc-topology.c                |    3 ---
 3 files changed, 28 deletions(-)

--- a/sound/soc/codecs/rt5670.c~linux-next-git-rejects
+++ a/sound/soc/codecs/rt5670.c
@@ -30,11 +30,8 @@
 #include "rt5670.h"
 #include "rt5670-dsp.h"
 
-<<<<<<< HEAD
 #define RT5670_DEV_GPIO			BIT(0)
-=======
 #define RT5670_GPIO1_IS_IRQ			BIT(0)
->>>>>>> linux-next/akpm-base
 #define RT5670_IN2_DIFF			BIT(1)
 #define RT5670_DMIC_EN			BIT(2)
 #define RT5670_DMIC1_IN2P		BIT(3)
@@ -1457,11 +1454,7 @@ static int rt5670_spk_event(struct snd_s
 	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
 	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
 
-<<<<<<< HEAD
-	if (!rt5670->pdata.gpio1_is_ext_spk_en)
-=======
 	if (!rt5670->gpio1_is_ext_spk_en)
->>>>>>> linux-next/akpm-base
 		return 0;
 
 	switch (event) {
@@ -3064,22 +3057,14 @@ static int rt5670_i2c_probe(struct i2c_c
 				   RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
 	}
 
-<<<<<<< HEAD
-	if (rt5670->pdata.gpio1_is_ext_spk_en) {
-=======
 	if (rt5670->gpio1_is_ext_spk_en) {
->>>>>>> linux-next/akpm-base
 		regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL1,
 				   RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_GPIO1);
 		regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL2,
 				   RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
 	}
 
-<<<<<<< HEAD
-	if (rt5670->pdata.jd_mode) {
-=======
 	if (rt5670->jd_mode) {
->>>>>>> linux-next/akpm-base
 		regmap_update_bits(rt5670->regmap, RT5670_GLB_CLK,
 				   RT5670_SCLK_SRC_MASK, RT5670_SCLK_SRC_RCCLK);
 		rt5670->sysclk = 0;
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c~linux-next-git-rejects
+++ a/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -253,15 +253,6 @@ static int cht_codec_fixup(struct snd_so
 	params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
 
 	/*
-<<<<<<< HEAD
-	 * Default mode for SSP configuration is TDM 4 slot. One board/design,
-	 * the Lenovo Miix 2 10 uses not 1 but 2 codecs connected to SSP2. The
-	 * second piggy-backed, output-only codec is inside the keyboard-dock
-	 * (which has extra speakers). Unlike the main rt5672 codec, we cannot
-	 * configure this codec, it is hard coded to use 2 channel 24 bit I2S.
-	 * Since we only support 2 channels anyways, there is no need for TDM
-	 * on any cht-bsw-rt5672 designs. So we simply use I2S 2ch everywhere.
-=======
 	 * The default mode for the cpu-dai is TDM 4 slot. The default mode
 	 * for the codec-dai is I2S. So we need to either set the cpu-dai to
 	 * I2S mode to match the codec-dai, or set the codec-dai to TDM 4 slot
@@ -273,7 +264,6 @@ static int cht_codec_fixup(struct snd_so
 	 * 2 channel 24 bit I2S. For this to work we must use I2S mode on this
 	 * board. Since we only support 2 channels anyways, there is no need
 	 * for TDM on any cht-bsw-rt5672 designs. So we use I2S 2ch everywhere.
->>>>>>> linux-next/akpm-base
 	 */
 	ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
 				  SND_SOC_DAIFMT_I2S     |
--- a/sound/soc/soc-topology.c~linux-next-git-rejects
+++ a/sound/soc/soc-topology.c
@@ -1263,10 +1263,7 @@ static int soc_tplg_dapm_graph_elems_loa
 
 		ret = soc_tplg_add_route(tplg, routes[i]);
 		if (ret < 0) {
-<<<<<<< HEAD
-=======
 			dev_err(tplg->dev, "ASoC: topology: add_route failed: %d\n", ret);
->>>>>>> linux-next/akpm-base
 			/*
 			 * this route was added to the list, it will
 			 * be freed in remove_route() so increment the
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-close-race-between-munmap-and-expand_upwards-downwards-fix.patch
mm-hugetlb-avoid-hardcoding-while-checking-if-cma-is-enabled-fix.patch
io-mapping-indicate-mapping-failure-fix.patch
mm-fix-kthread_use_mm-vs-tlb-invalidate-fix.patch
mm.patch
mm-handle-page-mapping-better-in-dump_page-fix.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-thp-replace-http-links-with-https-ones-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mmhwpoison-rework-soft-offline-for-in-use-pages-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
linux-next-rejects.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.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


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-07-20 20:42 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-07-20 20:42 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/spi/spi-sun6i.c |    3 ---
 fs/io_uring.c           |   16 ----------------
 2 files changed, 19 deletions(-)

--- a/drivers/spi/spi-sun6i.c~linux-next-git-rejects
+++ a/drivers/spi/spi-sun6i.c
@@ -282,10 +282,7 @@ static int sun6i_spi_transfer_one(struct
 	div_cdr2 = DIV_ROUND_UP(div_cdr1, 2);
 	if (div_cdr2 <= (SUN6I_CLK_CTL_CDR2_MASK + 1)) {
 		reg = SUN6I_CLK_CTL_CDR2(div_cdr2 - 1) | SUN6I_CLK_CTL_DRS;
-<<<<<<< HEAD
-=======
 		tfr->effective_speed_hz = mclk_rate / (2 * div_cdr2);
->>>>>>> linux-next/akpm-base
 	} else {
 		div = min(SUN6I_CLK_CTL_CDR1_MASK, order_base_2(div_cdr1));
 		reg = SUN6I_CLK_CTL_CDR1(div);
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -4190,28 +4190,12 @@ static int io_recvmsg(struct io_kiocb *r
 	else if (force_nonblock)
 		flags |= MSG_DONTWAIT;
 
-<<<<<<< HEAD
-		ret = __sys_recvmsg_sock(sock, &kmsg->msg, req->sr_msg.msg,
-						kmsg->uaddr, flags);
-		if (force_nonblock && ret == -EAGAIN) {
-			ret = io_setup_async_msg(req, kmsg);
-			if (ret != -EAGAIN)
-				kfree(kbuf);
-			return ret;
-		}
-		if (ret == -ERESTARTSYS)
-			ret = -EINTR;
-		if (kbuf)
-			kfree(kbuf);
-	}
-=======
 	ret = __sys_recvmsg_sock(sock, &kmsg->msg, req->sr_msg.umsg,
 					kmsg->uaddr, flags);
 	if (force_nonblock && ret == -EAGAIN)
 		return io_setup_async_msg(req, kmsg);
 	if (ret == -ERESTARTSYS)
 		ret = -EINTR;
->>>>>>> linux-next/akpm-base
 
 	if (req->flags & REQ_F_BUFFER_SELECTED)
 		cflags = io_put_recv_kbuf(req);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-close-race-between-munmap-and-expand_upwards-downwards-fix.patch
mm-hugetlb-avoid-hardcoding-while-checking-if-cma-is-enabled-fix.patch
mm.patch
mm-handle-page-mapping-better-in-dump_page-fix.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-thp-replace-http-links-with-https-ones-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mmhwpoison-rework-soft-offline-for-in-use-pages-fix.patch
linux-next-rejects.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.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


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-07-13 23:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-07-13 23:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 .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@suse.de>
 Greg Kroah-Hartman <greg@kroah.com>
 Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
 Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
-<<<<<<< HEAD
-Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
-Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
-=======
 Heiko Carstens <hca@linux.ibm.com>
 Heiko Carstens <heiko.carstens@de.ibm.com>
->>>>>>> linux-next/akpm-base
 Henk Vergonet <Henk.Vergonet@gmail.com>
 Henrik Kretzschmar <henne@nachtwindheim.de>
 Henrik Rydberg <rydberg@bitmath.org>
--- 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@linux-foundation.org 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


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-06-30 22:46 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-06-30 22:46 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/cpuidle/cpuidle.c              |    4 ----
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c |    5 -----
 net/xfrm/xfrm_device.c                 |    7 -------
 3 files changed, 16 deletions(-)

--- a/drivers/cpuidle/cpuidle.c~linux-next-git-rejects
+++ a/drivers/cpuidle/cpuidle.c
@@ -187,11 +187,7 @@ int cpuidle_enter_s2idle(struct cpuidle_
 	 * be frozen safely.
 	 */
 	index = find_deepest_state(drv, dev, U64_MAX, 0, true);
-<<<<<<< HEAD
-	if (index > 0) {
-=======
 	if (index > 0 && !current_clr_polling_and_test())
->>>>>>> linux-next/akpm-base
 		enter_s2idle_proper(drv, dev, index);
 		local_irq_enable();
 	}
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1300,13 +1300,8 @@ static int sdma_v5_0_sw_fini(void *handl
 	int i;
 
 	for (i = 0; i < adev->sdma.num_instances; i++) {
-<<<<<<< HEAD
-		if (adev->sdma.instance[i].fw != NULL)
-			release_firmware(adev->sdma.instance[i].fw);
-=======
 		release_firmware(adev->sdma.instance[i].fw);
 		adev->sdma.instance[i].fw = NULL;
->>>>>>> linux-next/akpm-base
 
 		amdgpu_ring_fini(&adev->sdma.instance[i].ring);
 	}
--- a/net/xfrm/xfrm_device.c~linux-next-git-rejects
+++ a/net/xfrm/xfrm_device.c
@@ -135,13 +135,6 @@ struct sk_buff *validate_xmit_xfrm(struc
 	}
 
 	xo->flags |= XFRM_XMIT;
-<<<<<<< HEAD
-
-	if (skb_is_gso(skb)) {
-		struct net_device *dev = skb->dev;
-=======
->>>>>>> linux-next/akpm-base

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-06-24 17:59 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-06-24 17:59 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/display/intel_ddi.c |    8 ------
 drivers/gpu/drm/i915/gt/selftest_lrc.c   |   26 -------------------
 fs/io_uring.c                            |   28 ---------------------
 3 files changed, 62 deletions(-)

--- a/drivers/gpu/drm/i915/display/intel_ddi.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2624,17 +2624,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct i
 	int rate = 0;
 
 	if (type == INTEL_OUTPUT_HDMI) {
-<<<<<<< HEAD
-		n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans);
-		ddi_translations = tgl_dkl_phy_hdmi_ddi_trans;
-	} else {
-		n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans);
-		ddi_translations = tgl_dkl_phy_dp_ddi_trans;
-=======
 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
 		rate = intel_dp->link_rate;
->>>>>>> linux-next/akpm-base
 	}
 
 	ddi_translations = tgl_get_dkl_buf_trans(dev_priv, encoder->type, rate,
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -1036,35 +1036,17 @@ static int live_timeslice_preempt(void *
 	if (err)
 		goto err_pin;
 
-<<<<<<< HEAD
-	for_each_prime_number_from(count, 1, 16) {
-		struct intel_engine_cs *engine;
-		enum intel_engine_id id;
-
-		for_each_engine(engine, gt, id) {
-			if (!intel_engine_has_preemption(engine))
-				continue;
-=======
 	for_each_engine(engine, gt, id) {
 		if (!intel_engine_has_preemption(engine))
 			continue;
->>>>>>> linux-next/akpm-base
 
 		memset(vaddr, 0, PAGE_SIZE);
 
-<<<<<<< HEAD
-			engine_heartbeat_disable(engine);
-			err = slice_semaphore_queue(engine, vma, count);
-			engine_heartbeat_enable(engine);
-			if (err)
-				goto err_pin;
-=======
 		engine_heartbeat_disable(engine);
 		err = slice_semaphore_queue(engine, vma, 5);
 		engine_heartbeat_enable(engine);
 		if (err)
 			goto err_pin;
->>>>>>> linux-next/akpm-base
 
 		if (igt_flush_test(gt->i915)) {
 			err = -EIO;
@@ -1506,11 +1488,7 @@ static int live_timeslice_nopreempt(void
 
 		ce = intel_context_create(engine);
 		if (IS_ERR(ce)) {
-<<<<<<< HEAD
-			err = PTR_ERR(rq);
-=======
 			err = PTR_ERR(ce);
->>>>>>> linux-next/akpm-base
 			goto out_spin;
 		}
 
@@ -1540,11 +1518,7 @@ static int live_timeslice_nopreempt(void
 		 * allow the maximum priority barrier through. Wait long
 		 * enough to see if it is timesliced in by mistake.
 		 */
-<<<<<<< HEAD
-		if (i915_request_wait(rq, 0, timeslice_threshold(engine)) >= 0) {
-=======
 		if (i915_request_wait(rq, 0, slice_timeout(engine)) >= 0) {
->>>>>>> linux-next/akpm-base
 			pr_err("%s: I915_PRIORITY_BARRIER request completed, bypassing no-preempt request\n",
 			       engine->name);
 			err = -EINVAL;
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -2930,13 +2930,7 @@ copy_iov:
 			return -EAGAIN;
 		}
 	}
-<<<<<<< HEAD
-out_free:
-	if (!(req->flags & REQ_F_NEED_CLEANUP))
-		kfree(iovec);
-=======
 out:
->>>>>>> linux-next/akpm-base
 	return ret;
 }
 
@@ -4528,28 +4522,6 @@ static void io_async_queue_proc(struct f
 	__io_queue_proc(&pt->req->apoll->poll, pt, head);
 }
 
-static void io_sq_thread_drop_mm(struct io_ring_ctx *ctx)
-{
-	struct mm_struct *mm = current->mm;
-
-	if (mm) {
-		kthread_unuse_mm(mm);
-		mmput(mm);
-	}
-}
-
-static int io_sq_thread_acquire_mm(struct io_ring_ctx *ctx,
-				   struct io_kiocb *req)
-{
-	if (io_op_defs[req->opcode].needs_mm && !current->mm) {
-		if (unlikely(!mmget_not_zero(ctx->sqo_mm)))
-			return -EFAULT;
-		kthread_use_mm(ctx->sqo_mm);
-	}
-
-	return 0;
-}

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-06-09 16:56 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-06-09 16:56 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/sparc/kernel/ptrace_32.c |   14 --------------
 security/apparmor/label.c     |    3 ---
 2 files changed, 17 deletions(-)

--- a/arch/sparc/kernel/ptrace_32.c~linux-next-git-rejects
+++ a/arch/sparc/kernel/ptrace_32.c
@@ -167,26 +167,12 @@ static int genregs32_set(struct task_str
 	if (ret || !count)
 		return ret;
 	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
-<<<<<<< HEAD
-				 &regs->npc,
-				 34 * sizeof(u32), 35 * sizeof(u32));
-	if (ret || !count)
-		return ret;
-	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
-				 &regs->y,
-				 35 * sizeof(u32), 36 * sizeof(u32));
-	if (ret || !count)
-		return ret;
-	return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-					 36 * sizeof(u32), 38 * sizeof(u32));
-=======
 				 &regs->y,
 				 34 * sizeof(u32), 35 * sizeof(u32));
 	if (ret || !count)
 		return ret;
 	return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
 					 35 * sizeof(u32), 38 * sizeof(u32));
->>>>>>> linux-next/akpm-base
 }
 
 static int fpregs32_get(struct task_struct *target,
--- a/security/apparmor/label.c~linux-next-git-rejects
+++ a/security/apparmor/label.c
@@ -333,10 +333,7 @@ void aa_label_destroy(struct aa_label *l
 	}
 	aa_free_secid(label->secid);
 
-<<<<<<< HEAD
-=======
 	aa_put_proxy(label->proxy);
->>>>>>> linux-next/akpm-base
 	label->proxy = (struct aa_proxy *) PROXY_POISON + 1;
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
lib-test-get_count_order-long-in-test_bitopsc-fix.patch
lib-test-get_count_order-long-in-test_bitopsc-fix-fix.patch
ipc-convert-ipcs_idr-to-xarray-update-fix.patch
linux-next-rejects.patch
mm-pass-task-and-mm-to-do_madvise.patch
mm-introduce-external-memory-hinting-api-fix-2-fix.patch
mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-06-04 17:15 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-06-04 17:15 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/filesystems/dax.txt |    9 ----
 block/blk-core.c                  |    8 ----
 drivers/block/loop.c              |    4 --
 drivers/md/dm-zoned-metadata.c    |   12 ------
 drivers/nvme/host/rdma.c          |    4 --
 drivers/scsi/scsi_lib.c           |   56 ----------------------------
 fs/btrfs/inode.c                  |    7 ---
 fs/io_uring.c                     |   27 -------------
 8 files changed, 127 deletions(-)

--- a/block/blk-core.c~linux-next-git-rejects
+++ a/block/blk-core.c
@@ -1471,19 +1471,11 @@ unsigned long disk_start_io_acct(struct
 	part_stat_add(part, sectors[sgrp], sectors);
 	part_stat_local_inc(part, in_flight[op_is_write(op)]);
 	part_stat_unlock();
-<<<<<<< HEAD
 
 	return now;
 }
 EXPORT_SYMBOL(disk_start_io_acct);
 
-=======
-
-	return now;
-}
-EXPORT_SYMBOL(disk_start_io_acct);
-
->>>>>>> linux-next/akpm-base
 void disk_end_io_acct(struct gendisk *disk, unsigned int op,
 		unsigned long start_time)
 {
--- a/Documentation/filesystems/dax.txt~linux-next-git-rejects
+++ a/Documentation/filesystems/dax.txt
@@ -25,11 +25,7 @@ size when creating the filesystem.
 Currently 3 filesystems support DAX: ext2, ext4 and xfs.  Enabling DAX on them
 is different.
 
-<<<<<<< HEAD
-Enabling DAX on ext4 and ext2
-=======
 Enabling DAX on ext2
->>>>>>> linux-next/akpm-base
 -----------------------------
 
 When mounting the filesystem, use the "-o dax" option on the command line or
@@ -37,13 +33,8 @@ add 'dax' to the options in /etc/fstab.
 within the filesystem.  It is equivalent to the '-o dax=always' behavior below.
 
 
-<<<<<<< HEAD
-Enabling DAX on xfs
--------------------
-=======
 Enabling DAX on xfs and ext4
 ----------------------------
->>>>>>> linux-next/akpm-base
 
 Summary
 -------
--- a/drivers/block/loop.c~linux-next-git-rejects
+++ a/drivers/block/loop.c
@@ -1149,12 +1149,8 @@ static int loop_configure(struct loop_de
 
 	if (config->block_size)
 		bsize = config->block_size;
-<<<<<<< HEAD
-	else if ((lo->lo_backing_file->f_flags & O_DIRECT) && inode->i_sb->s_bdev)
-=======
 	else if ((lo->lo_backing_file->f_flags & O_DIRECT) &&
 		 inode->i_sb->s_bdev)
->>>>>>> linux-next/akpm-base
 		/* In case of direct I/O, match underlying block size */
 		bsize = bdev_logical_block_size(inode->i_sb->s_bdev);
 	else
--- a/drivers/md/dm-zoned-metadata.c~linux-next-git-rejects
+++ a/drivers/md/dm-zoned-metadata.c
@@ -817,11 +817,7 @@ static int dmz_write_sb(struct dmz_metad
 	ret = dmz_rdwr_block(dev, REQ_OP_WRITE, zmd->sb[set].block,
 			     mblk->page);
 	if (ret == 0)
-<<<<<<< HEAD
-		ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
-=======
 		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
->>>>>>> linux-next/akpm-base
 
 	return ret;
 }
@@ -864,11 +860,7 @@ static int dmz_write_dirty_mblocks(struc
 
 	/* Flush drive cache (this will also sync data) */
 	if (ret == 0)
-<<<<<<< HEAD
-		ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
-=======
 		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
->>>>>>> linux-next/akpm-base
 
 	return ret;
 }
@@ -939,11 +931,7 @@ int dmz_flush_metadata(struct dmz_metada
 
 	/* If there are no dirty metadata blocks, just flush the device cache */
 	if (list_empty(&write_list)) {
-<<<<<<< HEAD
-		ret = blkdev_issue_flush(zmd->dev->bdev, GFP_NOIO);
-=======
 		ret = blkdev_issue_flush(dev->bdev, GFP_NOIO);
->>>>>>> linux-next/akpm-base
 		goto err;
 	}
 
--- a/drivers/nvme/host/rdma.c~linux-next-git-rejects
+++ a/drivers/nvme/host/rdma.c
@@ -522,11 +522,7 @@ static int nvme_rdma_create_queue_ib(str
 		if (ret) {
 			dev_err(queue->ctrl->ctrl.device,
 				"failed to initialize PI MR pool sized %d for QID %d\n",
-<<<<<<< HEAD
-				queue->queue_size, idx);
-=======
 				queue->queue_size, nvme_rdma_queue_idx(queue));
->>>>>>> linux-next/akpm-base
 			goto out_destroy_mr_pool;
 		}
 	}
--- a/drivers/scsi/scsi_lib.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_lib.c
@@ -960,61 +960,6 @@ static inline bool scsi_cmd_needs_dma_dr
 	       !op_is_write(req_op(rq)) &&
 	       sdev->host->hostt->dma_need_drain(rq);
 }
-<<<<<<< HEAD
-
-/*
- * Function:    scsi_init_io()
- *
- * Purpose:     SCSI I/O initialize function.
- *
- * Arguments:   cmd   - Command descriptor we wish to initialize
- *
- * Returns:     BLK_STS_OK on success
- *		BLK_STS_RESOURCE if the failure is retryable
- *		BLK_STS_IOERR if the failure is fatal
- */
-blk_status_t scsi_init_io(struct scsi_cmnd *cmd)
-{
-	struct scsi_device *sdev = cmd->device;
-	struct request *rq = cmd->request;
-	unsigned short nr_segs = blk_rq_nr_phys_segments(rq);
-	struct scatterlist *last_sg = NULL;
-	blk_status_t ret;
-	bool need_drain = scsi_cmd_needs_dma_drain(sdev, rq);
-	int count;
-
-	if (WARN_ON_ONCE(!nr_segs))
-		return BLK_STS_IOERR;
-
-	/*
-	 * Make sure there is space for the drain.  The driver must adjust
-	 * max_hw_segments to be prepared for this.
-	 */
-	if (need_drain)
-		nr_segs++;
-
-	/*
-	 * If sg table allocation fails, requeue request later.
-	 */
-	if (unlikely(sg_alloc_table_chained(&cmd->sdb.table, nr_segs,
-			cmd->sdb.table.sgl, SCSI_INLINE_SG_CNT)))
-		return BLK_STS_RESOURCE;
-
-	/*
-	 * Next, walk the list, and fill in the addresses and sizes of
-	 * each segment.
-	 */
-	count = __blk_rq_map_sg(rq->q, rq, cmd->sdb.table.sgl, &last_sg);
-
-	if (blk_rq_bytes(rq) & rq->q->dma_pad_mask) {
-		unsigned int pad_len =
-			(rq->q->dma_pad_mask & ~blk_rq_bytes(rq)) + 1;
-
-		last_sg->length += pad_len;
-		cmd->extra_len += pad_len;
-	}
-
-=======
 
 /**
  * scsi_init_io - SCSI I/O initialization function.
@@ -1066,7 +1011,6 @@ blk_status_t scsi_init_io(struct scsi_cm
 		cmd->extra_len += pad_len;
 	}
 
->>>>>>> linux-next/akpm-base
 	if (need_drain) {
 		sg_unmark_end(last_sg);
 		last_sg = sg_next(last_sg);
--- a/fs/btrfs/inode.c~linux-next-git-rejects
+++ a/fs/btrfs/inode.c
@@ -7823,13 +7823,6 @@ const struct iomap_ops btrfs_dio_iomap_o
 	.iomap_begin            = btrfs_dio_iomap_begin,
 	.iomap_end              = btrfs_dio_iomap_end,
 };
-<<<<<<< HEAD
-
-const struct iomap_dio_ops btrfs_dops = {
-	.submit_io		= btrfs_submit_direct,
-};
-=======
->>>>>>> linux-next/akpm-base
 
 const struct iomap_dio_ops btrfs_dops = {
 	.submit_io		= btrfs_submit_direct,
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -1114,7 +1114,6 @@ static void __io_queue_deferred(struct i
 	do {
 		struct io_kiocb *req = list_first_entry(&ctx->defer_list,
 							struct io_kiocb, list);
-<<<<<<< HEAD
 
 		if (req_need_defer(req))
 			break;
@@ -1135,28 +1134,6 @@ static void io_flush_timeouts(struct io_
 					- atomic_read(&ctx->cq_timeouts))
 			break;
 
-=======
-
-		if (req_need_defer(req))
-			break;
-		list_del_init(&req->list);
-		io_queue_async_work(req);
-	} while (!list_empty(&ctx->defer_list));
-}
-
-static void io_flush_timeouts(struct io_ring_ctx *ctx)
-{
-	while (!list_empty(&ctx->timeout_list)) {
-		struct io_kiocb *req = list_first_entry(&ctx->timeout_list,
-							struct io_kiocb, list);
-
-		if (req->flags & REQ_F_TIMEOUT_NOSEQ)
-			break;
-		if (req->timeout.target_seq != ctx->cached_cq_tail
-					- atomic_read(&ctx->cq_timeouts))
-			break;
-
->>>>>>> linux-next/akpm-base
 		list_del_init(&req->list);
 		io_kill_timeout(req);
 	}
@@ -6103,11 +6080,7 @@ static int io_submit_sqes(struct io_ring
 			break;
 		}
 
-<<<<<<< HEAD
-		err = io_init_req(ctx, req, sqe, statep);
-=======
 		err = io_init_req(ctx, req, sqe, &state);
->>>>>>> linux-next/akpm-base
 		io_consume_sqe(ctx);
 		/* will complete beyond this point, count as submitted */
 		submitted++;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix.patch
arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch
arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
lib-test-get_count_order-long-in-test_bitopsc-fix.patch
seq_file-introduce-define_seq_attribute-helper-macro-checkpatch-fixes.patch
ipc-convert-ipcs_idr-to-xarray-update-fix.patch
linux-next-pre.patch
linux-next-rejects.patch
linux-next-post.patch
kernel-add-panic_on_taint-fix.patch
mm-consolidate-pgd_index-and-pgd_offset_k-definitions-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix-fix.patch
mmap-locking-api-rename-mmap_sem-to-mmap_lock-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix-fix.patch
mm-pass-task-and-mm-to-do_madvise.patch
mm-introduce-external-memory-hinting-api-fix-2-fix.patch
mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch
maccess-unify-the-probe-kernel-arch-hooks-fix.patch
bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better.patch
maccess-always-use-strict-semantics-for-probe_kernel_read-fix.patch
x86-use-non-set_fs-based-maccess-routines-checkpatch-fixes.patch
doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix.patch
sh-convert-ins-outs-macros-to-inline-functions-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-06-02 18:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-06-02 18:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/boot/dts/mmp3.dtsi                     |    8 -
 arch/x86/kernel/fpu/xstate.c                    |    4 
 drivers/net/ethernet/mellanox/mlx5/core/Kconfig |    4 
 drivers/platform/chrome/chromeos_pstore.c       |    3 
 drivers/power/supply/bd70528-charger.c          |   64 --------------
 drivers/regulator/max8998.c                     |    5 -
 drivers/spi/spi-dw-core.c                       |   13 --
 drivers/spi/spi-dw-mmio.c                       |   10 --
 drivers/spi/spi-dw-pci.c                        |   12 --
 drivers/spi/spi-dw.h                            |   25 -----
 fs/ext4/super.c                                 |    4 
 fs/f2fs/f2fs.h                                  |    3 
 fs/pstore/blk.c                                 |   28 ------
 fs/pstore/inode.c                               |    4 
 include/linux/virtio_net.h                      |    7 -
 net/ipv4/nexthop.c                              |   25 -----
 net/xdp/xdp_umem.c                              |    4 
 sound/usb/quirks-table.h                        |   18 ---
 18 files changed, 241 deletions(-)

--- a/arch/arm/boot/dts/mmp3.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/mmp3.dtsi
@@ -201,11 +201,7 @@
 				status = "disabled";
 			};
 
-<<<<<<< HEAD
-			hsic_phy0: hsic-phy@f0001800 {
-=======
 			hsic_phy0: usb-phy@f0001800 {
->>>>>>> linux-next/akpm-base
 				compatible = "marvell,mmp3-hsic-phy";
 				reg = <0xf0001800 0x40>;
 				#phy-cells = <0>;
@@ -226,11 +222,7 @@
 				status = "disabled";
 			};
 
-<<<<<<< HEAD
-			hsic_phy1: hsic-phy@f0002800 {
-=======
 			hsic_phy1: usb-phy@f0002800 {
->>>>>>> linux-next/akpm-base
 				compatible = "marvell,mmp3-hsic-phy";
 				reg = <0xf0002800 0x40>;
 				#phy-cells = <0>;
--- a/arch/x86/kernel/fpu/xstate.c~linux-next-git-rejects
+++ a/arch/x86/kernel/fpu/xstate.c
@@ -1062,11 +1062,7 @@ int copy_xstate_to_kernel(void *kbuf, st
 	 */
 	memset(&header, 0, sizeof(header));
 	header.xfeatures = xsave->header.xfeatures;
-<<<<<<< HEAD
-	header.xfeatures &= ~XFEATURE_MASK_SUPERVISOR;
-=======
 	header.xfeatures &= xfeatures_mask_user();
->>>>>>> linux-next/akpm-base
 
 	if (header.xfeatures & XFEATURE_MASK_FP)
 		copy_part(0, off_mxcsr,
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -95,11 +95,7 @@ config MLX5_CLS_ACT
 
 config MLX5_TC_CT
 	bool "MLX5 TC connection tracking offload support"
-<<<<<<< HEAD
-	depends on MLX5_ESWITCH && NF_FLOW_TABLE && NET_ACT_CT && NET_TC_SKB_EXT
-=======
 	depends on MLX5_CLS_ACT && NF_FLOW_TABLE && NET_ACT_CT && NET_TC_SKB_EXT
->>>>>>> linux-next/akpm-base
 	default y
 	help
 	  Say Y here if you want to support offloading connection tracking rules
--- a/drivers/platform/chrome/chromeos_pstore.c~linux-next-git-rejects
+++ a/drivers/platform/chrome/chromeos_pstore.c
@@ -57,10 +57,7 @@ static struct ramoops_platform_data chro
 	.record_size	= 0x40000,
 	.console_size	= 0x20000,
 	.ftrace_size	= 0x20000,
-<<<<<<< HEAD
-=======
 	.pmsg_size	= 0x20000,
->>>>>>> linux-next/akpm-base
 	.max_reason	= KMSG_DUMP_OOPS,
 };
 
--- a/drivers/power/supply/bd70528-charger.c~linux-next-git-rejects
+++ a/drivers/power/supply/bd70528-charger.c
@@ -336,18 +336,7 @@ static int bd70528_get_present(struct bd
 	return 0;
 }
 
-<<<<<<< HEAD
-struct bd70528_linear_range {
-	int min;
-	int step;
-	int vals;
-	int low_sel;
-};
-
-static const struct bd70528_linear_range current_limit_ranges[] = {
-=======
 static const struct linear_range current_limit_ranges[] = {
->>>>>>> linux-next/akpm-base
 	{
 		.min = 5,
 		.step = 1,
@@ -409,59 +398,6 @@ static const struct bd70528_linear_range
 #define MAX_WARM_CHG_CURR_SEL 0x1f
 #define MIN_CHG_CURR_SEL 0x0
 
-<<<<<<< HEAD
-static int find_value_for_selector_low(const struct bd70528_linear_range *r,
-				       int selectors, unsigned int sel,
-				       unsigned int *val)
-{
-	int i;
-
-	for (i = 0; i < selectors; i++) {
-		if (r[i].low_sel <= sel && r[i].low_sel + r[i].vals >= sel) {
-			*val = r[i].min + (sel - r[i].low_sel) * r[i].step;
-			return 0;
-		}
-	}
-	return -EINVAL;
-}
-
-/*
- * For BD70528 voltage/current limits we happily accept any value which
- * belongs the range. We could check if value matching the selector is
- * desired by computing the range min + (sel - sel_low) * range step - but
- * I guess it is enough if we use voltage/current which is closest (below)
- * the requested?
- */
-static int find_selector_for_value_low(const struct bd70528_linear_range *r,
-				       int selectors, unsigned int val,
-				       unsigned int *sel, bool *found)
-{
-	int i;
-	int ret = -EINVAL;
-
-	*found = false;
-	for (i = 0; i < selectors; i++) {
-		if (r[i].min <= val) {
-			if (r[i].min + r[i].step * r[i].vals >= val) {
-				*found = true;
-				*sel = r[i].low_sel + (val - r[i].min) /
-				       r[i].step;
-				ret = 0;
-				break;
-			}
-			/*
-			 * If the range max is smaller than requested
-			 * we can set the max supported value from range
-			 */
-			*sel = r[i].low_sel + r[i].vals;
-			ret = 0;
-		}
-	}
-	return ret;
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static int get_charge_current(struct bd70528_psy *bdpsy, int *ma)
 {
 	unsigned int sel;
--- a/drivers/regulator/max8998.c~linux-next-git-rejects
+++ a/drivers/regulator/max8998.c
@@ -371,13 +371,8 @@ static int max8998_set_voltage_buck_time
 	return 0;
 }
 
-<<<<<<< HEAD
-static int max8998_set_current_limit(struct regulator_dev *rdev,
-				     int min_uA, int max_uA)
-=======
 int max8998_set_current_limit(struct regulator_dev *rdev,
 			      int min_uA, int max_uA)
->>>>>>> linux-next/akpm-base
 {
 	struct max8998_data *max8998 = rdev_get_drvdata(rdev);
 	struct i2c_client *i2c = max8998->iodev->i2c;
--- a/drivers/spi/spi-dw-core.c~linux-next-git-rejects
+++ a/drivers/spi/spi-dw-core.c
@@ -29,13 +29,6 @@ struct chip_data {
 };
 
 #ifdef CONFIG_DEBUG_FS
-<<<<<<< HEAD:drivers/spi/spi-dw-core.c
-
-#define DW_SPI_DBGFS_REG(_name, _off)	\
-{					\
-	.name = _name,			\
-	.offset = _off,			\
-=======
 #define SPI_REGS_BUFSIZE	1024
 static ssize_t dw_spi_show_regs(struct file *file, char __user *user_buf,
 		size_t count, loff_t *ppos)
@@ -89,7 +82,6 @@ static ssize_t dw_spi_show_regs(struct f
 	ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
 	kfree(buf);
 	return ret;
->>>>>>> linux-next/akpm-base:drivers/spi/spi-dw.c
 }
 
 static const struct debugfs_reg32 dw_spi_dbgfs_regs[] = {
@@ -411,16 +403,11 @@ static int dw_spi_transfer_one(struct sp
 
 	spi_enable_chip(dws, 1);
 
-<<<<<<< HEAD:drivers/spi/spi-dw-core.c
-	if (dws->dma_mapped)
-		return dws->dma_ops->dma_transfer(dws, transfer);
-=======
 	if (dws->dma_mapped) {
 		ret = dws->dma_ops->dma_transfer(dws, transfer);
 		if (ret < 0)
 			return ret;
 	}
->>>>>>> linux-next/akpm-base:drivers/spi/spi-dw.c
 
 	return 1;
 }
--- a/drivers/spi/spi-dw.h~linux-next-git-rejects
+++ a/drivers/spi/spi-dw.h
@@ -2,11 +2,6 @@
 #ifndef DW_SPI_HEADER_H
 #define DW_SPI_HEADER_H
 
-<<<<<<< HEAD
-#include <linux/completion.h>
-#include <linux/debugfs.h>
-=======
->>>>>>> linux-next/akpm-base
 #include <linux/irqreturn.h>
 #include <linux/io.h>
 #include <linux/scatterlist.h>
@@ -152,10 +147,6 @@ struct dw_spi {
 	unsigned long		dma_chan_busy;
 	dma_addr_t		dma_addr; /* phy address of the Data register */
 	const struct dw_spi_dma_ops *dma_ops;
-<<<<<<< HEAD
-	struct completion	dma_completion;
-=======
->>>>>>> linux-next/akpm-base
 
 #ifdef CONFIG_DEBUG_FS
 	struct dentry *debugfs;
@@ -264,25 +255,9 @@ extern u32 dw_spi_update_cr0(struct spi_
 extern u32 dw_spi_update_cr0_v1_01a(struct spi_controller *master,
 				    struct spi_device *spi,
 				    struct spi_transfer *transfer);
-<<<<<<< HEAD
-
-#ifdef CONFIG_SPI_DW_DMA
-
-extern void dw_spi_dma_setup_mfld(struct dw_spi *dws);
-extern void dw_spi_dma_setup_generic(struct dw_spi *dws);
-
-#else
-
-static inline void dw_spi_dma_setup_mfld(struct dw_spi *dws) {}
-static inline void dw_spi_dma_setup_generic(struct dw_spi *dws) {}
-
-#endif /* !CONFIG_SPI_DW_DMA */
-
-=======
 
 /* platform related setup */
 extern int dw_spi_mid_init_mfld(struct dw_spi *dws);
 extern int dw_spi_mid_init_generic(struct dw_spi *dws);
 
->>>>>>> linux-next/akpm-base
 #endif /* DW_SPI_HEADER_H */
--- a/drivers/spi/spi-dw-mmio.c~linux-next-git-rejects
+++ a/drivers/spi/spi-dw-mmio.c
@@ -151,11 +151,6 @@ static int dw_spi_dw_apb_init(struct pla
 	/* Register hook to configure CTRLR0 */
 	dwsmmio->dws.update_cr0 = dw_spi_update_cr0;
 
-<<<<<<< HEAD
-	dw_spi_dma_setup_generic(&dwsmmio->dws);
-
-=======
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
@@ -165,11 +160,6 @@ static int dw_spi_dwc_ssi_init(struct pl
 	/* Register hook to configure CTRLR0 */
 	dwsmmio->dws.update_cr0 = dw_spi_update_cr0_v1_01a;
 
-<<<<<<< HEAD
-	dw_spi_dma_setup_generic(&dwsmmio->dws);
-
-=======
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
--- a/drivers/spi/spi-dw-pci.c~linux-next-git-rejects
+++ a/drivers/spi/spi-dw-pci.c
@@ -67,31 +67,19 @@ static int spi_generic_init(struct dw_sp
 }
 
 static struct spi_pci_desc spi_pci_mid_desc_1 = {
-<<<<<<< HEAD
-	.setup = spi_mid_init,
-=======
 	.setup = dw_spi_mid_init_mfld,
->>>>>>> linux-next/akpm-base
 	.num_cs = 5,
 	.bus_num = 0,
 };
 
 static struct spi_pci_desc spi_pci_mid_desc_2 = {
-<<<<<<< HEAD
-	.setup = spi_mid_init,
-=======
 	.setup = dw_spi_mid_init_mfld,
->>>>>>> linux-next/akpm-base
 	.num_cs = 2,
 	.bus_num = 1,
 };
 
 static struct spi_pci_desc spi_pci_ehl_desc = {
-<<<<<<< HEAD
-	.setup = spi_generic_init,
-=======
 	.setup = dw_spi_mid_init_generic,
->>>>>>> linux-next/akpm-base
 	.num_cs = 2,
 	.bus_num = -1,
 	.max_freq = 100000000,
--- a/fs/ext4/super.c~linux-next-git-rejects
+++ a/fs/ext4/super.c
@@ -1824,11 +1824,7 @@ static const struct mount_opts {
 	{Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT},
 	{Opt_max_dir_size_kb, 0, MOPT_GTE0},
 	{Opt_test_dummy_encryption, 0, MOPT_STRING},
-<<<<<<< HEAD
-	{Opt_nombcache, EXT4_MOUNT_NO_MBCACHE, MOPT_SET},
-=======
 	{Opt_nombcache, EXT4_MOUNT_NO_MBCACHE, MOPT_SET | MOPT_NO_REMOUNT},
->>>>>>> linux-next/akpm-base
 	{Opt_err, 0, 0}
 };
 
--- a/fs/f2fs/f2fs.h~linux-next-git-rejects
+++ a/fs/f2fs/f2fs.h
@@ -139,10 +139,7 @@ struct f2fs_mount_info {
 	int fs_mode;			/* fs mode: LFS or ADAPTIVE */
 	int bggc_mode;			/* bggc mode: off, on or sync */
 	struct fscrypt_dummy_context dummy_enc_ctx; /* test dummy encryption */
-<<<<<<< HEAD
-=======
 	block_t unusable_cap_perc;	/* percentage for cap */
->>>>>>> linux-next/akpm-base
 	block_t unusable_cap;		/* Amount of space allowed to be
 					 * unusable when disabling checkpoint
 					 */
--- a/fs/pstore/blk.c~linux-next-git-rejects
+++ a/fs/pstore/blk.c
@@ -113,12 +113,8 @@ static int __register_pstore_device(stru
 {
 	int ret;
 
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-=======
 	if (WARN_ON(!mutex_is_locked(&pstore_blk_lock)))
 		return -EINVAL;
->>>>>>> linux-next/akpm-base
 
 	if (!dev || !dev->total_size || !dev->read || !dev->write)
 		return -EINVAL;
@@ -190,11 +186,7 @@ EXPORT_SYMBOL_GPL(register_pstore_device
 
 static void __unregister_pstore_device(struct pstore_device_info *dev)
 {
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-=======
 	WARN_ON(!mutex_is_locked(&pstore_blk_lock));
->>>>>>> linux-next/akpm-base
 	if (pstore_zone_info && pstore_zone_info->read == dev->read) {
 		unregister_pstore_zone(pstore_zone_info);
 		kfree(pstore_zone_info);
@@ -232,12 +224,8 @@ static struct block_device *psblk_get_bd
 	fmode_t mode = FMODE_READ | FMODE_WRITE;
 	sector_t nr_sects;
 
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-=======
 	if (WARN_ON(!mutex_is_locked(&pstore_blk_lock)))
 		return ERR_PTR(-EINVAL);
->>>>>>> linux-next/akpm-base
 
 	if (pstore_zone_info)
 		return ERR_PTR(-EBUSY);
@@ -279,20 +267,12 @@ static void psblk_put_bdev(struct block_
 {
 	fmode_t mode = FMODE_READ | FMODE_WRITE;
 
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-
-	if (!bdev)
-		return;
-
-=======
 	if (!bdev)
 		return;
 
 	if (WARN_ON(!mutex_is_locked(&pstore_blk_lock)))
 		return;
 
->>>>>>> linux-next/akpm-base
 	if (holder)
 		mode |= FMODE_EXCL;
 	blkdev_put(bdev, mode);
@@ -390,12 +370,8 @@ static int __register_pstore_blk(struct
 	void *holder = blkdev;
 	int ret = -ENODEV;
 
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-=======
 	if (WARN_ON(!mutex_is_locked(&pstore_blk_lock)))
 		return -EINVAL;
->>>>>>> linux-next/akpm-base
 
 	/* hold bdev exclusively */
 	memset(&binfo, 0, sizeof(binfo));
@@ -473,11 +449,7 @@ static void __unregister_pstore_blk(unsi
 	struct pstore_device_info dev = { .read = psblk_generic_blk_read };
 	void *holder = blkdev;
 
-<<<<<<< HEAD
-	lockdep_assert_held(&pstore_blk_lock);
-=======
 	WARN_ON(!mutex_is_locked(&pstore_blk_lock));
->>>>>>> linux-next/akpm-base
 	if (psblk_bdev && MAJOR(psblk_bdev->bd_dev) == major) {
 		__unregister_pstore_device(&dev);
 		psblk_put_bdev(psblk_bdev, holder);
--- a/fs/pstore/inode.c~linux-next-git-rejects
+++ a/fs/pstore/inode.c
@@ -287,11 +287,7 @@ static const struct super_operations pst
 	.show_options	= pstore_show_options,
 };
 
-<<<<<<< HEAD
-static struct dentry *psinfo_lock_root(void)
-=======
 struct dentry *psinfo_lock_root(void)
->>>>>>> linux-next/akpm-base
 {
 	struct dentry *root;
 
--- a/include/linux/virtio_net.h~linux-next-git-rejects
+++ a/include/linux/virtio_net.h
@@ -111,18 +111,11 @@ retry:
 		u16 gso_size = __virtio16_to_cpu(little_endian, hdr->gso_size);
 		struct skb_shared_info *shinfo = skb_shinfo(skb);
 
-<<<<<<< HEAD
-		/* Too small packets are not really GSO ones. */
-		if (skb->len - p_off > gso_size) {
-			shinfo->gso_size = gso_size;
-			shinfo->gso_type = gso_type;
-=======
 		if (skb->len - p_off <= gso_size)
 			return -EINVAL;
 
 		skb_shinfo(skb)->gso_size = gso_size;
 		skb_shinfo(skb)->gso_type = gso_type;
->>>>>>> linux-next/akpm-base
 
 			/* Header must be checked, and gso_segs computed. */
 			shinfo->gso_type |= SKB_GSO_DODGY;
--- a/net/ipv4/nexthop.c~linux-next-git-rejects
+++ a/net/ipv4/nexthop.c
@@ -788,7 +788,6 @@ static void remove_nh_grp_entry(struct n
 	newg->has_v4 = nhg->has_v4;
 	newg->mpath = nhg->mpath;
 	newg->num_nh = nhg->num_nh;
-<<<<<<< HEAD
 
 	/* copy old entries to new except the one getting removed */
 	nhges = nhg->nh_entries;
@@ -811,30 +810,6 @@ static void remove_nh_grp_entry(struct n
 	nh_group_rebalance(newg);
 	rcu_assign_pointer(nhp->nh_grp, newg);
 
-=======
-
-	/* copy old entries to new except the one getting removed */
-	nhges = nhg->nh_entries;
-	new_nhges = newg->nh_entries;
-	for (i = 0, j = 0; i < nhg->num_nh; ++i) {
-		/* current nexthop getting removed */
-		if (nhg->nh_entries[i].nh == nh) {
-			newg->num_nh--;
-			continue;
-		}
-
-		list_del(&nhges[i].nh_list);
-		new_nhges[j].nh_parent = nhges[i].nh_parent;
-		new_nhges[j].nh = nhges[i].nh;
-		new_nhges[j].weight = nhges[i].weight;
-		list_add(&new_nhges[j].nh_list, &new_nhges[j].nh->grp_list);
-		j++;
-	}
-
-	nh_group_rebalance(newg);
-	rcu_assign_pointer(nhp->nh_grp, newg);
-
->>>>>>> linux-next/akpm-base
 	list_del(&nhge->nh_list);
 	nexthop_put(nhge->nh);
 
--- a/net/xdp/xdp_umem.c~linux-next-git-rejects
+++ a/net/xdp/xdp_umem.c
@@ -355,11 +355,7 @@ static int xdp_umem_reg(struct xdp_umem
 
 	umem->size = size;
 	umem->headroom = headroom;
-<<<<<<< HEAD
-	umem->chunk_size_nohr = chunk_size - headroom;
-=======
 	umem->chunk_size = chunk_size;
->>>>>>> linux-next/akpm-base
 	umem->npgs = (u32)npgs;
 	umem->pgs = NULL;
 	umem->user = NULL;
--- a/sound/usb/quirks-table.h~linux-next-git-rejects
+++ a/sound/usb/quirks-table.h
@@ -3549,23 +3549,6 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A
  */
 {
 	USB_DEVICE(0x0414, 0xa000),
-<<<<<<< HEAD
-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-		.vendor_name = "Gigabyte",
-		.product_name = "Aorus Master Front Headphone",
-		.profile_name = "Gigabyte-Aorus-Master-Front-Headphone",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
-},
-{
-	USB_DEVICE(0x0414, 0xa001),
-	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-		.vendor_name = "Gigabyte",
-		.product_name = "Aorus Master Main Audio",
-		.profile_name = "Gigabyte-Aorus-Master-Main-Audio",
-		.ifnum = QUIRK_NO_INTERFACE
-	}
-=======
 	QUIRK_DEVICE_PROFILE("Gigabyte", "Aorus Master Front Headphone",
 			     "Gigabyte-Aorus-Master-Front-Headphone")
 },
@@ -3573,7 +3556,6 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A
 	USB_DEVICE(0x0414, 0xa001),
 	QUIRK_DEVICE_PROFILE("Gigabyte", "Aorus Master Main Audio",
 			     "Gigabyte-Aorus-Master-Main-Audio")
->>>>>>> linux-next/akpm-base
 },
 
 #undef USB_DEVICE_VENDOR_SPEC
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-parisc-include-asm-pgtableh-remove-unused-old_pte.patch
mm-slub-add-panic_on_error-to-the-debug-facilities-fix.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix-2-fix.patch
mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix.patch
arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch
arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch
mm-add-debug_wx-support-fix.patch
riscv-support-debug_wx-fix.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
lib-make-a-test-module-with-get_count_order-long-fix.patch
seq_file-introduce-define_seq_attribute-helper-macro-checkpatch-fixes.patch
ipc-convert-ipcs_idr-to-xarray-update-fix.patch
linux-next-pre.patch
linux-next-rejects.patch
linux-next-post.patch
kernel-add-panic_on_taint-fix.patch
mm-consolidate-pgd_index-and-pgd_offset_k-definitions-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix-fix.patch
mmap-locking-api-rename-mmap_sem-to-mmap_lock-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix-fix.patch
mm-pass-task-and-mm-to-do_madvise.patch
mm-introduce-external-memory-hinting-api-fix-2-fix.patch
mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch
maccess-unify-the-probe-kernel-arch-hooks-fix.patch
bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better.patch
bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better-fix.patch
maccess-always-use-strict-semantics-for-probe_kernel_read-fix.patch
x86-use-non-set_fs-based-maccess-routines-checkpatch-fixes.patch
doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix.patch
sh-convert-ins-outs-macros-to-inline-functions-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-05-25 17:57 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-05-25 17:57 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c    |    3 
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c    |    3 
 drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c    |    8 --
 drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h |   15 ----
 drivers/net/phy/mscc/mscc.h                          |    3 
 drivers/net/phy/mscc/mscc_main.c                     |   35 ----------
 net/core/flow_dissector.c                            |    9 --
 net/mptcp/options.c                                  |    8 --
 8 files changed, 84 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
@@ -73,12 +73,9 @@ static const struct hw_sequencer_funcs d
 	.get_clock = dcn10_get_clock,
 	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
 	.calc_vupdate_position = dcn10_calc_vupdate_position,
-<<<<<<< HEAD
-=======
 	.set_backlight_level = dce110_set_backlight_level,
 	.set_abm_immediate_disable = dce110_set_abm_immediate_disable,
 	.set_pipe = dce110_set_pipe,
->>>>>>> linux-next/akpm-base
 };
 
 static const struct hwseq_private_funcs dcn10_private_funcs = {
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c
@@ -84,12 +84,9 @@ static const struct hw_sequencer_funcs d
 	.set_flip_control_gsl = dcn20_set_flip_control_gsl,
 	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
 	.calc_vupdate_position = dcn10_calc_vupdate_position,
-<<<<<<< HEAD
-=======
 	.set_backlight_level = dce110_set_backlight_level,
 	.set_abm_immediate_disable = dce110_set_abm_immediate_disable,
 	.set_pipe = dce110_set_pipe,
->>>>>>> linux-next/akpm-base
 };
 
 static const struct hwseq_private_funcs dcn20_private_funcs = {
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c
@@ -87,18 +87,10 @@ static const struct hw_sequencer_funcs d
 	.exit_optimized_pwr_state = dcn21_exit_optimized_pwr_state,
 	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
 	.calc_vupdate_position = dcn10_calc_vupdate_position,
-<<<<<<< HEAD
-	.set_cursor_position = dcn10_set_cursor_position,
-	.set_cursor_attribute = dcn10_set_cursor_attribute,
-	.set_cursor_sdr_white_level = dcn10_set_cursor_sdr_white_level,
-	.optimize_pwr_state = dcn21_optimize_pwr_state,
-	.exit_optimized_pwr_state = dcn21_exit_optimized_pwr_state,
-=======
 	.power_down = dce110_power_down,
 	.set_backlight_level = dcn21_set_backlight_level,
 	.set_abm_immediate_disable = dcn21_set_abm_immediate_disable,
 	.set_pipe = dcn21_set_pipe,
->>>>>>> linux-next/akpm-base
 };
 
 static const struct hwseq_private_funcs dcn21_private_funcs = {
--- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
@@ -75,21 +75,6 @@ static inline double dml_floor(double a,
 }
 
 static inline double dml_round(double a)
-<<<<<<< HEAD
-{
-	double round_pt = 0.5;
-	double ceil = dml_ceil(a, 1);
-	double floor = dml_floor(a, 1);
-
-	if (a - floor >= round_pt)
-		return ceil;
-	else
-		return floor;
-}
-
-static inline int dml_log2(double x)
-=======
->>>>>>> linux-next/akpm-base
 {
 	double round_pt = 0.5;
 	double ceil = dml_ceil(a, 1);
--- a/drivers/net/phy/mscc/mscc.h~linux-next-git-rejects
+++ a/drivers/net/phy/mscc/mscc.h
@@ -353,12 +353,9 @@ struct vsc8531_private {
 	const struct vsc85xx_hw_stat *hw_stats;
 	u64 *stats;
 	int nstats;
-<<<<<<< HEAD
 	bool pkg_init;
 	/* PHY address within the package. */
 	u8 addr;
-=======
->>>>>>> linux-next/akpm-base
 	/* For multiple port PHYs; the MDIO address of the base PHY in the
 	 * package.
 	 */
--- a/drivers/net/phy/mscc/mscc_main.c~linux-next-git-rejects
+++ a/drivers/net/phy/mscc/mscc_main.c
@@ -1315,24 +1315,6 @@ static int vsc8584_config_init(struct ph
 
 	mutex_lock(&phydev->mdio.bus->mdio_lock);
 
-<<<<<<< HEAD
-	__mdiobus_write(phydev->mdio.bus, phydev->mdio.addr,
-			MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);
-	addr = __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr,
-			      MSCC_PHY_EXT_PHY_CNTL_4);
-	addr >>= PHY_CNTL_4_ADDR_POS;
-
-	val = __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr,
-			     MSCC_PHY_ACTIPHY_CNTL);
-	if (val & PHY_ADDR_REVERSED)
-		vsc8531->base_addr = phydev->mdio.addr + addr;
-	else
-		vsc8531->base_addr = phydev->mdio.addr - addr;
-
-	vsc8531->addr = addr;
-
-=======
->>>>>>> linux-next/akpm-base
 	/* Some parts of the init sequence are identical for every PHY in the
 	 * package. Some parts are modifying the GPIO register bank which is a
 	 * set of registers that are affecting all PHYs, a few resetting the
@@ -1745,23 +1727,6 @@ static int vsc8514_config_init(struct ph
 
 	mutex_lock(&phydev->mdio.bus->mdio_lock);
 
-<<<<<<< HEAD
-	__phy_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);
-
-	addr = __phy_read(phydev, MSCC_PHY_EXT_PHY_CNTL_4);
-	addr >>= PHY_CNTL_4_ADDR_POS;
-
-	val = __phy_read(phydev, MSCC_PHY_ACTIPHY_CNTL);
-
-	if (val & PHY_ADDR_REVERSED)
-		vsc8531->base_addr = phydev->mdio.addr + addr;
-	else
-		vsc8531->base_addr = phydev->mdio.addr - addr;
-
-	vsc8531->addr = addr;
-
-=======
->>>>>>> linux-next/akpm-base
 	/* Some parts of the init sequence are identical for every PHY in the
 	 * package. Some parts are modifying the GPIO register bank which is a
 	 * set of registers that are affecting all PHYs, a few resetting the
--- a/net/core/flow_dissector.c~linux-next-git-rejects
+++ a/net/core/flow_dissector.c
@@ -1854,15 +1854,6 @@ static int __init init_default_flow_diss
 	skb_flow_dissector_init(&flow_keys_basic_dissector,
 				flow_keys_basic_dissector_keys,
 				ARRAY_SIZE(flow_keys_basic_dissector_keys));
-<<<<<<< HEAD
-=======
-
-	err = register_pernet_subsys(&flow_dissector_pernet_ops);
-
-	WARN_ON(err);
-	return err;
-}
->>>>>>> linux-next/akpm-base
 
 	return register_pernet_subsys(&flow_dissector_pernet_ops);
 }
--- a/net/mptcp/options.c~linux-next-git-rejects
+++ a/net/mptcp/options.c
@@ -551,11 +551,7 @@ static u64 add_addr_generate_hmac(u64 ke
 
 	mptcp_crypto_hmac_sha(key1, key2, msg, 7, hmac);
 
-<<<<<<< HEAD
 	return get_unaligned_be64(&hmac[SHA256_DIGEST_SIZE - sizeof(u64)]);
-=======
-	return get_unaligned_be64(&hmac[MPTCP_ADDR_HMAC_LEN - sizeof(u64)]);
->>>>>>> linux-next/akpm-base
 }
 
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
@@ -572,11 +568,7 @@ static u64 add_addr6_generate_hmac(u64 k
 
 	mptcp_crypto_hmac_sha(key1, key2, msg, 19, hmac);
 
-<<<<<<< HEAD
 	return get_unaligned_be64(&hmac[SHA256_DIGEST_SIZE - sizeof(u64)]);
-=======
-	return get_unaligned_be64(&hmac[MPTCP_ADDR_HMAC_LEN - sizeof(u64)]);
->>>>>>> linux-next/akpm-base
 }
 #endif
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch
arch-parisc-include-asm-pgtableh-remove-unused-old_pte.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch
mm-slub-add-panic_on_error-to-the-debug-facilities-fix.patch
mm-migratec-call-detach_page_private-to-cleanup-code-fix.patch
mm-migratec-call-detach_page_private-to-cleanup-code-fix-fix.patch
mm-gupc-updating-the-documentation-fix.patch
mm-swapfilec-classify-swap_map_xxx-to-make-it-more-readable-fix.patch
mm-remove-__vmalloc_node_flags_caller-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix-fix.patch
mm-remove-vmalloc_user_node_flags-fix.patch
mm-vmalloc-track-which-page-table-levels-were-modified-fix.patch
mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix-2-fix.patch
mm-page_alloc-skip-waternark_boost-for-atomic-order-0-allocations-fix.patch
padata-initialize-earlier-fix.patch
arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch
arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch
mm-add-debug_wx-support-fix.patch
riscv-support-debug_wx-fix.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
seq_file-introduce-define_seq_attribute-helper-macro-checkpatch-fixes.patch
ipc-convert-ipcs_idr-to-xarray-update-fix.patch
linux-next-pre.patch
linux-next-rejects.patch
linux-next-post.patch
kernel-add-panic_on_taint-fix.patch
mm-consolidate-pgd_index-and-pgd_offset_k-definitions-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix.patch
mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix.patch
mmap-locking-api-convert-mmap_sem-comments-fix-fix-fix.patch
mm-pass-task-and-mm-to-do_madvise.patch
mm-introduce-external-memory-hinting-api-fix-2-fix.patch
mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch
doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mmap-locking-api-rename-mmap_sem-to-mmap_lock-fix.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-05-11 18:44 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-05-11 18:44 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/base/dd.c |    8 --------
 fs/splice.c       |    9 ---------
 2 files changed, 17 deletions(-)

--- a/drivers/base/dd.c~linux-next-git-rejects
+++ a/drivers/base/dd.c
@@ -259,11 +259,7 @@ int driver_deferred_probe_check_state(st
 	}
 
 	if (!driver_deferred_probe_timeout && initcalls_done) {
-<<<<<<< HEAD
-		dev_warn(dev, "deferred probe timeout, ignoring dependency");
-=======
 		dev_warn(dev, "deferred probe timeout, ignoring dependency\n");
->>>>>>> linux-next/akpm-base
 		return -ETIMEDOUT;
 	}
 
@@ -279,11 +275,7 @@ static void deferred_probe_timeout_work_
 	flush_work(&deferred_probe_work);
 
 	list_for_each_entry_safe(private, p, &deferred_probe_pending_list, deferred_probe)
-<<<<<<< HEAD
-		dev_info(private->device, "deferred probe pending");
-=======
 		dev_info(private->device, "deferred probe pending\n");
->>>>>>> linux-next/akpm-base
 	wake_up(&probe_timeout_waitqueue);
 }
 static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func);
--- a/fs/splice.c~linux-next-git-rejects
+++ a/fs/splice.c
@@ -1118,17 +1118,8 @@ long do_splice(struct file *in, loff_t _
 	loff_t offset;
 	long ret;
 
-<<<<<<< HEAD
-	if (unlikely(!(in->f_mode & FMODE_READ) ||
-		     !(out->f_mode & FMODE_WRITE)))
-		return -EBADF;
-
-	ipipe = get_pipe_info(in);
-	opipe = get_pipe_info(out);
-=======
 	ipipe = get_pipe_info(in, true);
 	opipe = get_pipe_info(out, true);
->>>>>>> linux-next/akpm-base
 
 	if (ipipe && opipe) {
 		if (off_in || off_out)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

ipc-utilc-sysvipc_find_ipc-incorrectly-updates-position-index-fix.patch
squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch
mm-slub-add-panic_on_error-to-the-debug-facilities-fix.patch
mm-gupc-updating-the-documentation-fix.patch
mm-swapfilec-classify-swap_map_xxx-to-make-it-more-readable-fix.patch
mm-remove-__vmalloc_node_flags_caller-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix-fix.patch
mm-remove-vmalloc_user_node_flags-fix.patch
arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch
arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch
kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch
mm-add-debug_wx-support-fixpatch-added-to-mm-tree.patch
riscv-support-debug_wx-fix.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
mm-memory_hotplug-allow-arch-override-of-non-boot-memory-resource-names-fix.patch
linux-next-rejects.patch
arch-x86-makefile-use-config_shell.patch
doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-28 21:27 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-28 21:27 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects-2

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |    3 -
 drivers/gpu/drm/i915/display/intel_display_power.c |   24 -----------
 drivers/gpu/drm/tidss/tidss_encoder.c              |   14 ------
 drivers/staging/vt6656/main_usb.c                  |    6 --
 include/linux/vermagic.h                           |    3 -
 sound/soc/soc-dapm.c                               |    8 ---
 6 files changed, 58 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4748,8 +4748,6 @@ amdgpu_dm_connector_late_register(struct
 	struct amdgpu_dm_connector *amdgpu_dm_connector =
 		to_amdgpu_dm_connector(connector);
 	int r;
-<<<<<<< HEAD
-=======
 
 	if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
 	    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
@@ -4758,7 +4756,6 @@ amdgpu_dm_connector_late_register(struct
 		if (r)
 			return r;
 	}
->>>>>>> linux-next/akpm-base
 
 	if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
 	    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
--- a/drivers/gpu/drm/i915/display/intel_display_power.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -4188,11 +4188,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX D TBT1",
 		.domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
@@ -4203,11 +4199,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX E TBT2",
 		.domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
@@ -4218,11 +4210,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX F TBT3",
 		.domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
@@ -4233,11 +4221,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX G TBT4",
 		.domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
@@ -4248,11 +4232,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX H TBT5",
 		.domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
@@ -4263,11 +4243,7 @@ static const struct i915_power_well_desc
 	{
 		.name = "AUX I TBT6",
 		.domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS,
-<<<<<<< HEAD
-		.ops = &icl_tc_phy_aux_power_well_ops,
-=======
 		.ops = &icl_aux_power_well_ops,
->>>>>>> linux-next/akpm-base
 		.id = DISP_PW_ID_NONE,
 		{
 			.hsw.regs = &icl_aux_power_well_regs,
--- a/drivers/gpu/drm/tidss/tidss_encoder.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/tidss/tidss_encoder.c
@@ -66,13 +66,6 @@ static const struct drm_encoder_helper_f
 	.atomic_check = tidss_encoder_atomic_check,
 };
 
-<<<<<<< HEAD
-static const struct drm_encoder_funcs encoder_funcs = {
-	.destroy = tidss_encoder_destroy,
-};
-
-=======
->>>>>>> linux-next/akpm-base
 struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss,
 					 u32 encoder_type, u32 possible_crtcs)
 {
@@ -85,15 +78,8 @@ struct drm_encoder *tidss_encoder_create
 
 	enc->possible_crtcs = possible_crtcs;
 
-<<<<<<< HEAD
-	ret = drm_encoder_init(&tidss->ddev, enc, &encoder_funcs,
-			       encoder_type, NULL);
-	if (ret < 0) {
-		kfree(enc);
-=======
 	ret = drm_simple_encoder_init(&tidss->ddev, enc, encoder_type);
 	if (ret < 0)
->>>>>>> linux-next/akpm-base
 		return ERR_PTR(ret);
 	}
 
--- a/drivers/staging/vt6656/main_usb.c~linux-next-git-rejects
+++ a/drivers/staging/vt6656/main_usb.c
@@ -740,14 +740,8 @@ static void vnt_bss_info_changed(struct
 		       BSS_CHANGED_ERP_SLOT))
 		vnt_set_bss_mode(priv);
 
-<<<<<<< HEAD
-	if (changed & BSS_CHANGED_TXPOWER)
-		vnt_rf_setpower(priv, priv->current_rate,
-				conf->chandef.chan->hw_value);
-=======
 	if (changed & (BSS_CHANGED_TXPOWER | BSS_CHANGED_BANDWIDTH))
 		vnt_rf_setpower(priv, conf->chandef.chan);
->>>>>>> linux-next/akpm-base
 
 	if (changed & BSS_CHANGED_BEACON_ENABLED) {
 		dev_dbg(&priv->usb->dev,
--- a/include/linux/vermagic.h~linux-next-git-rejects
+++ a/include/linux/vermagic.h
@@ -2,13 +2,10 @@
 #ifndef _LINUX_VERMAGIC_H
 #define _LINUX_VERMAGIC_H
 
-<<<<<<< HEAD
-=======
 #ifndef INCLUDE_VERMAGIC
 #error "This header can be included from kernel/module.c or *.mod.c only"
 #endif
 
->>>>>>> linux-next/akpm-base
 #include <generated/utsrelease.h>
 #include <asm/vermagic.h>
 
--- a/sound/soc/soc-dapm.c~linux-next-git-rejects
+++ a/sound/soc/soc-dapm.c
@@ -4427,19 +4427,11 @@ void snd_soc_dapm_connect_dai_link_widge
 		if (rtd->num_cpus == 1) {
 			for_each_rtd_codec_dais(rtd, i, codec_dai)
 				dapm_connect_dai_pair(card, rtd, codec_dai,
-<<<<<<< HEAD
-						      rtd->cpu_dais[0]);
-		} else if (rtd->num_codecs == rtd->num_cpus) {
-			for_each_rtd_codec_dais(rtd, i, codec_dai)
-				dapm_connect_dai_pair(card, rtd, codec_dai,
-						      rtd->cpu_dais[i]);
-=======
 						      asoc_rtd_to_cpu(rtd, 0));
 		} else if (rtd->num_codecs == rtd->num_cpus) {
 			for_each_rtd_codec_dais(rtd, i, codec_dai)
 				dapm_connect_dai_pair(card, rtd, codec_dai,
 						      asoc_rtd_to_cpu(rtd, i));
->>>>>>> linux-next/akpm-base
 		} else {
 			dev_err(card->dev,
 				"N cpus to M codecs link is not supported yet\n");
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-memcg-fix-error-return-value-of-mem_cgroup_css_alloc-fix.patch
squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch
mm-gupc-updating-the-documentation-fix.patch
mm-remove-__vmalloc_node_flags_caller-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix-fix.patch
mm-remove-vmalloc_user_node_flags-fix.patch
mm-add-debug_wx-support-fixpatch-added-to-mm-tree.patch
riscv-support-debug_wx-fix.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
linux-next-git-rejects-fix.patch
mm-pass-task-and-mm-to-do_madvise-fix-fix.patch
mm-pass-task-and-mm-to-do_madvise-fix-fix-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-23  0:31 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-23  0:31 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kvm/svm/svm.c    |    3 ---
 arch/x86/kvm/vmx/nested.c |   25 -------------------------
 2 files changed, 28 deletions(-)

--- a/arch/x86/kvm/svm/svm.c~linux-next-git-rejects
+++ a/arch/x86/kvm/svm/svm.c
@@ -3299,8 +3299,6 @@ static void svm_cancel_injection(struct
 	svm_complete_interrupts(svm);
 }
 
-<<<<<<< HEAD
-=======
 static enum exit_fastpath_completion svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)
 {
 	if (!is_guest_mode(vcpu) &&
@@ -3311,7 +3309,6 @@ static enum exit_fastpath_completion svm
 	return EXIT_FASTPATH_NONE;
 }
 
->>>>>>> linux-next/akpm-base
 void __svm_vcpu_run(unsigned long vmcb_pa, unsigned long *regs);
 
 static enum exit_fastpath_completion svm_vcpu_run(struct kvm_vcpu *vcpu)
--- a/arch/x86/kvm/vmx/nested.c~linux-next-git-rejects
+++ a/arch/x86/kvm/vmx/nested.c
@@ -5609,31 +5609,6 @@ static bool nested_vmx_exit_handled_vmcs
 }
 
 static bool nested_vmx_exit_handled_mtf(struct vmcs12 *vmcs12)
-<<<<<<< HEAD
-{
-	u32 entry_intr_info = vmcs12->vm_entry_intr_info_field;
-
-	if (nested_cpu_has_mtf(vmcs12))
-		return true;
-
-	/*
-	 * An MTF VM-exit may be injected into the guest by setting the
-	 * interruption-type to 7 (other event) and the vector field to 0. Such
-	 * is the case regardless of the 'monitor trap flag' VM-execution
-	 * control.
-	 */
-	return entry_intr_info == (INTR_INFO_VALID_MASK
-				   | INTR_TYPE_OTHER_EVENT);
-}
-
-/*
- * Return true if we should exit from L2 to L1 to handle an exit, or false if we
- * should handle it ourselves in L0 (and then continue L2). Only call this
- * when in is_guest_mode (L2).
- */
-bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason)
-=======
->>>>>>> linux-next/akpm-base
 {
 	u32 entry_intr_info = vmcs12->vm_entry_intr_info_field;
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-memcg-fix-error-return-value-of-mem_cgroup_css_alloc-fix.patch
squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-remove-__vmalloc_node_flags_caller-fix.patch
mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch
mm-remove-vmalloc_user_node_flags-fix.patch
mm-replace-zero-length-array-with-flexible-array-member-fix.patch
mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch
initrdmem=-option-to-specify-initrd-physical-address-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-10 18:19 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-10 18:19 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/filesystems/9p.rst |    4 ----
 drivers/block/rbd.c              |    9 ---------
 drivers/vdpa/Kconfig             |    6 ------
 drivers/vdpa/ifcvf/ifcvf_base.c  |    8 --------
 drivers/vdpa/ifcvf/ifcvf_main.c  |    8 --------
 drivers/vdpa/vdpa_sim/vdpa_sim.c |    4 ----
 drivers/vhost/Kconfig            |    7 -------
 drivers/vhost/vdpa.c             |   14 --------------
 drivers/vhost/vhost.h            |    7 -------
 drivers/vhost/vringh.c           |   12 ------------
 include/linux/vringh.h           |   11 -----------
 tools/virtio/Makefile            |    4 ----
 12 files changed, 94 deletions(-)

--- a/Documentation/filesystems/9p.rst~linux-next-git-rejects
+++ a/Documentation/filesystems/9p.rst
@@ -158,13 +158,9 @@ Options
 		/sys/fs/9p/caches. (applies only to cache=fscache)
   ============= ===============================================================
 
-<<<<<<< HEAD
-Behavior
-========
 =======
 Behaviour
 =========
->>>>>>> linux-next/akpm-base
 
 This section aims at describing 9p 'quirks' that can be different
 from a local filesystem behaviors.
--- a/drivers/block/rbd.c~linux-next-git-rejects
+++ a/drivers/block/rbd.c
@@ -1626,21 +1626,12 @@ static void rbd_img_capture_header(struc
 	struct rbd_device *rbd_dev = img_req->rbd_dev;
 
 	lockdep_assert_held(&rbd_dev->header_rwsem);
-<<<<<<< HEAD
 
 	if (rbd_img_is_write(img_req))
 		img_req->snapc = ceph_get_snap_context(rbd_dev->header.snapc);
 	else
 		img_req->snap_id = rbd_dev->spec->snap_id;
 
-=======
-
-	if (rbd_img_is_write(img_req))
-		img_req->snapc = ceph_get_snap_context(rbd_dev->header.snapc);
-	else
-		img_req->snap_id = rbd_dev->spec->snap_id;
-
->>>>>>> linux-next/akpm-base
 	if (rbd_dev_parent_get(rbd_dev))
 		img_request_layered_set(img_req);
 }
--- a/drivers/vdpa/ifcvf/ifcvf_base.c~linux-next-git-rejects
+++ a/drivers/vdpa/ifcvf/ifcvf_base.c
@@ -301,18 +301,10 @@ int ifcvf_set_vq_state(struct ifcvf_hw *
 
 static int ifcvf_hw_enable(struct ifcvf_hw *hw)
 {
-<<<<<<< HEAD
-	struct ifcvf_lm_cfg __iomem *ifcvf_lm;
-=======
->>>>>>> linux-next/akpm-base
 	struct virtio_pci_common_cfg __iomem *cfg;
 	struct ifcvf_adapter *ifcvf;
 	u32 i;
 
-<<<<<<< HEAD
-	ifcvf_lm = (struct ifcvf_lm_cfg __iomem *)hw->lm_cfg;
-=======
->>>>>>> linux-next/akpm-base
 	ifcvf = vf_to_adapter(hw);
 	cfg = hw->common_cfg;
 	ifc_iowrite16(IFCVF_MSI_CONFIG_OFF, &cfg->msix_config);
--- a/drivers/vdpa/ifcvf/ifcvf_main.c~linux-next-git-rejects
+++ a/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -31,17 +31,9 @@ static irqreturn_t ifcvf_intr_handler(in
 static int ifcvf_start_datapath(void *private)
 {
 	struct ifcvf_hw *vf = ifcvf_private_to_vf(private);
-<<<<<<< HEAD
-	struct ifcvf_adapter *ifcvf;
 	u8 status;
 	int ret;
 
-	ifcvf = vf_to_adapter(vf);
-=======
-	u8 status;
-	int ret;
-
->>>>>>> linux-next/akpm-base
 	vf->nr_vring = IFCVF_MAX_QUEUE_PAIRS * 2;
 	ret = ifcvf_start_hw(vf);
 	if (ret < 0) {
--- a/drivers/vdpa/Kconfig~linux-next-git-rejects
+++ a/drivers/vdpa/Kconfig
@@ -14,16 +14,10 @@ if VDPA_MENU
 
 config VDPA_SIM
 	tristate "vDPA device simulator"
-<<<<<<< HEAD
-	depends on RUNTIME_TESTING_MENU
-	select VDPA
-	select VHOST_RING
-=======
 	depends on RUNTIME_TESTING_MENU && HAS_DMA
 	select VDPA
 	select VHOST_RING
 	select VHOST_IOTLB
->>>>>>> linux-next/akpm-base
 	default n
 	help
 	  vDPA networking device simulator which loop TX traffic back
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c~linux-next-git-rejects
+++ a/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -488,11 +488,7 @@ static u8 vdpasim_get_status(struct vdpa
 	status = vdpasim->status;
 	spin_unlock(&vdpasim->lock);
 
-<<<<<<< HEAD
-	return vdpasim->status;
-=======
 	return status;
->>>>>>> linux-next/akpm-base
 }
 
 static void vdpasim_set_status(struct vdpa_device *vdpa, u8 status)
--- a/drivers/vhost/Kconfig~linux-next-git-rejects
+++ a/drivers/vhost/Kconfig
@@ -3,18 +3,11 @@ config VHOST_IOTLB
 	tristate
 	help
 	  Generic IOTLB implementation for vhost and vringh.
-<<<<<<< HEAD
-
-config VHOST_RING
-	tristate
-	select VHOST_IOTLB
-=======
 	  This option is selected by any driver which needs to support
 	  an IOMMU in software.
 
 config VHOST_RING
 	tristate
->>>>>>> linux-next/akpm-base
 	help
 	  This option is selected by any driver which needs to access
 	  the host side of a virtio ring.
--- a/drivers/vhost/vdpa.c~linux-next-git-rejects
+++ a/drivers/vhost/vdpa.c
@@ -296,10 +296,6 @@ static long vhost_vdpa_vring_ioctl(struc
 	struct vdpa_callback cb;
 	struct vhost_virtqueue *vq;
 	struct vhost_vring_state s;
-<<<<<<< HEAD
-	u8 status;
-=======
->>>>>>> linux-next/akpm-base
 	u32 idx;
 	long r;
 
@@ -313,11 +309,6 @@ static long vhost_vdpa_vring_ioctl(struc
 	idx = array_index_nospec(idx, v->nvqs);
 	vq = &v->vqs[idx];
 
-<<<<<<< HEAD
-	status = ops->get_status(vdpa);
-
-=======
->>>>>>> linux-next/akpm-base
 	if (cmd == VHOST_VDPA_SET_VRING_ENABLE) {
 		if (copy_from_user(&s, argp, sizeof(s)))
 			return -EFAULT;
@@ -684,11 +675,6 @@ static int vhost_vdpa_open(struct inode
 	int nvqs, i, r, opened;
 
 	v = container_of(inode->i_cdev, struct vhost_vdpa, cdev);
-<<<<<<< HEAD
-	if (!v)
-		return -ENODEV;
-=======
->>>>>>> linux-next/akpm-base
 
 	opened = atomic_cmpxchg(&v->opened, 0, 1);
 	if (opened)
--- a/drivers/vhost/vhost.h~linux-next-git-rejects
+++ a/drivers/vhost/vhost.h
@@ -74,12 +74,6 @@ struct vhost_virtqueue {
 	/* The actual ring of buffers. */
 	struct mutex mutex;
 	unsigned int num;
-<<<<<<< HEAD
-	struct vring_desc __user *desc;
-	struct vring_avail __user *avail;
-	struct vring_used __user *used;
-	const struct vhost_iotlb_map *meta_iotlb[VHOST_NUM_ADDRS];
-=======
 	vring_desc_t __user *desc;
 	vring_avail_t __user *avail;
 	vring_used_t __user *used;
@@ -90,7 +84,6 @@ struct vhost_virtqueue {
 	int first_desc;
 	int max_descs;
 
->>>>>>> linux-next/akpm-base
 	struct file *kick;
 	struct eventfd_ctx *call_ctx;
 	struct eventfd_ctx *error_ctx;
--- a/drivers/vhost/vringh.c~linux-next-git-rejects
+++ a/drivers/vhost/vringh.c
@@ -13,17 +13,11 @@
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/export.h>
-<<<<<<< HEAD
-#include <linux/bvec.h>
-#include <linux/highmem.h>
-#include <linux/vhost_iotlb.h>
-=======
 #if IS_REACHABLE(CONFIG_VHOST_IOTLB)
 #include <linux/bvec.h>
 #include <linux/highmem.h>
 #include <linux/vhost_iotlb.h>
 #endif
->>>>>>> linux-next/akpm-base
 #include <uapi/linux/virtio_config.h>
 
 static __printf(1,2) __cold void vringh_bad(const char *fmt, ...)
@@ -1067,11 +1061,8 @@ int vringh_need_notify_kern(struct vring
 }
 EXPORT_SYMBOL(vringh_need_notify_kern);
 
-<<<<<<< HEAD
-=======
 #if IS_REACHABLE(CONFIG_VHOST_IOTLB)
 
->>>>>>> linux-next/akpm-base
 static int iotlb_translate(const struct vringh *vrh,
 			   u64 addr, u64 len, struct bio_vec iov[],
 			   int iov_size, u32 perm)
@@ -1429,9 +1420,6 @@ int vringh_need_notify_iotlb(struct vrin
 }
 EXPORT_SYMBOL(vringh_need_notify_iotlb);
 
-<<<<<<< HEAD
-=======
 #endif
->>>>>>> linux-next/akpm-base
 
 MODULE_LICENSE("GPL");
--- a/include/linux/vringh.h~linux-next-git-rejects
+++ a/include/linux/vringh.h
@@ -15,15 +15,10 @@
 #include <linux/virtio_byteorder.h>
 #include <linux/uio.h>
 #include <linux/slab.h>
-<<<<<<< HEAD
-#include <linux/dma-direction.h>
-#include <linux/vhost_iotlb.h>
-=======
 #if IS_REACHABLE(CONFIG_VHOST_IOTLB)
 #include <linux/dma-direction.h>
 #include <linux/vhost_iotlb.h>
 #endif
->>>>>>> linux-next/akpm-base
 #include <asm/barrier.h>
 
 /* virtio_ring with information needed for host access. */
@@ -262,11 +257,8 @@ static inline __virtio64 cpu_to_vringh64
 	return __cpu_to_virtio64(vringh_is_little_endian(vrh), val);
 }
 
-<<<<<<< HEAD
-=======
 #if IS_REACHABLE(CONFIG_VHOST_IOTLB)
 
->>>>>>> linux-next/akpm-base
 void vringh_set_iotlb(struct vringh *vrh, struct vhost_iotlb *iotlb);
 
 int vringh_init_iotlb(struct vringh *vrh, u64 features,
@@ -297,9 +289,6 @@ void vringh_notify_disable_iotlb(struct
 
 int vringh_need_notify_iotlb(struct vringh *vrh);
 
-<<<<<<< HEAD
-=======
 #endif /* CONFIG_VHOST_IOTLB */
 
->>>>>>> linux-next/akpm-base
 #endif /* _LINUX_VRINGH_H */
--- a/tools/virtio/Makefile~linux-next-git-rejects
+++ a/tools/virtio/Makefile
@@ -22,12 +22,8 @@ OOT_CONFIGS=\
 	CONFIG_VHOST=m \
 	CONFIG_VHOST_NET=n \
 	CONFIG_VHOST_SCSI=n \
-<<<<<<< HEAD
-	CONFIG_VHOST_VSOCK=n
-=======
 	CONFIG_VHOST_VSOCK=n \
 	CONFIG_VHOST_RING=n
->>>>>>> linux-next/akpm-base
 OOT_BUILD=KCFLAGS="-I "${OOT_VHOST} ${MAKE} -C ${OOT_KSRC} V=${V}
 oot-build:
 	echo "UNSUPPORTED! Don't use the resulting modules in production!"
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-clarify-__gfp_memalloc-usage-update-checkpatch-fixes.patch
mm-cma-numa-node-interface-fix.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-08  1:55 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-08  1:55 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/csky/include/asm/thread_info.h |    7 -------
 1 file changed, 7 deletions(-)

--- a/arch/csky/include/asm/thread_info.h~linux-next-git-rejects
+++ a/arch/csky/include/asm/thread_info.h
@@ -54,17 +54,10 @@ static inline struct thread_info *curren
 #define TIF_SIGPENDING		0	/* signal pending */
 #define TIF_NOTIFY_RESUME	1       /* callback before returning to user */
 #define TIF_NEED_RESCHED	2	/* rescheduling necessary */
-<<<<<<< HEAD
-#define TIF_SYSCALL_TRACE	3	/* syscall trace active */
-#define TIF_SYSCALL_TRACEPOINT	4       /* syscall tracepoint instrumentation */
-#define TIF_SYSCALL_AUDIT	5	/* syscall auditing */
-#define TIF_UPROBE		6	/* uprobe breakpoint or singlestep */
-=======
 #define TIF_UPROBE		3	/* uprobe breakpoint or singlestep */
 #define TIF_SYSCALL_TRACE	4	/* syscall trace active */
 #define TIF_SYSCALL_TRACEPOINT	5       /* syscall tracepoint instrumentation */
 #define TIF_SYSCALL_AUDIT	6	/* syscall auditing */
->>>>>>> linux-next/akpm-base
 #define TIF_POLLING_NRFLAG	16	/* poll_idle() is TIF_NEED_RESCHED */
 #define TIF_MEMDIE		18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK	20	/* restore signal mask in do_signal() */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-mempolicy-allow-lookup_node-to-handle-fatal-signal-fix.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-clarify-__gfp_memalloc-usage-checkpatch-fixes.patch
mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-05 21:16 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-05 21:16 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/configs/bcm2835_defconfig       |    3 ---
 arch/arm/configs/omap2plus_defconfig     |   10 ----------
 include/dt-bindings/clock/imx8mn-clock.h |    5 -----
 3 files changed, 18 deletions(-)

--- a/arch/arm/configs/bcm2835_defconfig~linux-next-git-rejects
+++ a/arch/arm/configs/bcm2835_defconfig
@@ -103,10 +103,7 @@ CONFIG_WATCHDOG=y
 CONFIG_BCM2835_WDT=y
 CONFIG_MFD_SYSCON=y
 CONFIG_REGULATOR=y
-<<<<<<< HEAD
-=======
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
->>>>>>> linux-next/akpm-base
 CONFIG_REGULATOR_GPIO=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
--- a/arch/arm/configs/omap2plus_defconfig~linux-next-git-rejects
+++ a/arch/arm/configs/omap2plus_defconfig
@@ -360,26 +360,16 @@ CONFIG_OMAP2_DSS_DSI=y
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_PANEL_SIMPLE=m
-<<<<<<< HEAD
-=======
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_TI_TPD12S015=m
->>>>>>> linux-next/akpm-base
 CONFIG_DRM_PANEL_LG_LB035Q02=m
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
-<<<<<<< HEAD
-CONFIG_DRM_DISPLAY_CONNECTOR=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_TI_TFP410=m
-CONFIG_DRM_TI_TPD12S015=m
-=======
 CONFIG_DRM_TI_TFP410=m
->>>>>>> linux-next/akpm-base
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
--- a/include/dt-bindings/clock/imx8mn-clock.h~linux-next-git-rejects
+++ a/include/dt-bindings/clock/imx8mn-clock.h
@@ -229,16 +229,11 @@
 #define IMX8MN_SYS_PLL2_500M_CG			210
 
 #define IMX8MN_CLK_SNVS_ROOT			211
-<<<<<<< HEAD
-
-#define IMX8MN_CLK_END				212
-=======
 #define IMX8MN_CLK_GPU_CORE			212
 #define IMX8MN_CLK_GPU_SHADER			213
 
 #define IMX8MN_CLK_A53_CORE			214
 
 #define IMX8MN_CLK_END				215
->>>>>>> linux-next/akpm-base
 
 #endif
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-clarify-__gfp_memalloc-usage-checkpatch-fixes.patch
mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
hv_balloon-dont-check-for-memhp_auto_online-manually-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-04-01  1:01 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-04-01  1:01 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/kbuild/index.rst |    3 ---
 fs/io_uring.c                  |    4 ----
 include/linux/genhd.h          |    4 ----
 3 files changed, 11 deletions(-)

--- a/Documentation/kbuild/index.rst~linux-next-git-rejects
+++ a/Documentation/kbuild/index.rst
@@ -19,10 +19,7 @@ Kernel Build System
 
     issues
     reproducible-builds
-<<<<<<< HEAD
-=======
     llvm
->>>>>>> linux-next/akpm-base
     gcc-plugins
 
 .. only::  subproject and html
--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -2743,11 +2743,7 @@ static int io_splice_prep(struct io_kioc
 
 static bool io_splice_punt(struct file *file)
 {
-<<<<<<< HEAD
-	if (get_pipe_info(file))
-=======
 	if (get_pipe_info(file, true))
->>>>>>> linux-next/akpm-base
 		return false;
 	if (!io_file_supports_async(file))
 		return true;
--- a/include/linux/genhd.h~linux-next-git-rejects
+++ a/include/linux/genhd.h
@@ -284,12 +284,8 @@ extern void disk_part_iter_init(struct d
 				 struct gendisk *disk, unsigned int flags);
 extern struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter);
 extern void disk_part_iter_exit(struct disk_part_iter *piter);
-<<<<<<< HEAD
-extern bool disk_has_partitions(struct gendisk *disk);
-=======
 
 bool disk_has_partitions(struct gendisk *disk);
->>>>>>> linux-next/akpm-base
 
 /* block/genhd.c */
 extern void device_add_disk(struct device *parent, struct gendisk *disk,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-gup-track-foll_pin-pages-fix-2-fix.patch
mm-swap-make-page_evictable-inline-fix.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
mm-mmap-add-trace-point-of-vm_unmapped_area-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
hv_balloon-dont-check-for-memhp_auto_online-manually-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
drivers-net-ethernet-mellanox-mlx4-crdumpc-fix-build-with-gcc-720.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-03-23 19:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-03-23 19:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |    4 
 sound/core/oss/pcm_plugin.c                       |   61 ------------
 2 files changed, 65 deletions(-)

--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -524,11 +524,7 @@ static void dm_dcn_crtc_high_irq(void *i
 
 	acrtc_state = to_dm_crtc_state(acrtc->base.state);
 
-<<<<<<< HEAD
-	DRM_DEBUG_DRIVER("crtc:%d, vupdate-vrr:%d, planes:%d\n", acrtc->crtc_id,
-=======
 	DRM_DEBUG_VBL("crtc:%d, vupdate-vrr:%d, planes:%d\n", acrtc->crtc_id,
->>>>>>> linux-next/akpm-base
 			 amdgpu_dm_vrr_active(acrtc_state),
 			 acrtc_state->active_planes);
 
--- a/sound/core/oss/pcm_plugin.c~linux-next-git-rejects
+++ a/sound/core/oss/pcm_plugin.c
@@ -201,32 +201,6 @@ static snd_pcm_sframes_t calc_dst_frames
 {
 	struct snd_pcm_plugin *plugin, *plugin_next;
 
-<<<<<<< HEAD
-	if (snd_BUG_ON(!plug))
-		return -ENXIO;
-	if (drv_frames == 0)
-		return 0;
-	stream = snd_pcm_plug_stream(plug);
-	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		plugin = snd_pcm_plug_last(plug);
-		while (plugin && drv_frames > 0) {
-			if (drv_frames > plugin->buf_frames)
-				drv_frames = plugin->buf_frames;
-			plugin_prev = plugin->prev;
-			if (plugin->src_frames)
-				drv_frames = plugin->src_frames(plugin, drv_frames);
-			plugin = plugin_prev;
-		}
-	} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {
-		plugin = snd_pcm_plug_first(plug);
-		while (plugin && drv_frames > 0) {
-			plugin_next = plugin->next;
-			if (plugin->dst_frames)
-				drv_frames = plugin->dst_frames(plugin, drv_frames);
-			if (drv_frames > plugin->buf_frames)
-				drv_frames = plugin->buf_frames;
-			plugin = plugin_next;
-=======
 	plugin = snd_pcm_plug_first(plug);
 	while (plugin && frames > 0) {
 		plugin_next = plugin->next;
@@ -256,7 +230,6 @@ static snd_pcm_sframes_t calc_src_frames
 			frames = plugin->src_frames(plugin, frames);
 			if (frames < 0)
 				return frames;
->>>>>>> linux-next/akpm-base
 		}
 		plugin = plugin_prev;
 	}
@@ -282,46 +255,12 @@ snd_pcm_sframes_t snd_pcm_plug_slave_siz
 {
 	if (snd_BUG_ON(!plug))
 		return -ENXIO;
-<<<<<<< HEAD
-	if (clt_frames == 0)
-		return 0;
-	frames = clt_frames;
-	stream = snd_pcm_plug_stream(plug);
-	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		plugin = snd_pcm_plug_first(plug);
-		while (plugin && frames > 0) {
-			plugin_next = plugin->next;
-			if (plugin->dst_frames) {
-				frames = plugin->dst_frames(plugin, frames);
-				if (frames < 0)
-					return frames;
-			}
-			if (frames > plugin->buf_frames)
-				frames = plugin->buf_frames;
-			plugin = plugin_next;
-		}
-	} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {
-		plugin = snd_pcm_plug_last(plug);
-		while (plugin) {
-			if (frames > plugin->buf_frames)
-				frames = plugin->buf_frames;
-			plugin_prev = plugin->prev;
-			if (plugin->src_frames) {
-				frames = plugin->src_frames(plugin, frames);
-				if (frames < 0)
-					return frames;
-			}
-			plugin = plugin_prev;
-		}
-	} else
-=======
 	switch (snd_pcm_plug_stream(plug)) {
 	case SNDRV_PCM_STREAM_PLAYBACK:
 		return calc_dst_frames(plug, clt_frames);
 	case SNDRV_PCM_STREAM_CAPTURE:
 		return calc_src_frames(plug, clt_frames);
 	default:
->>>>>>> linux-next/akpm-base
 		snd_BUG();
 		return -EINVAL;
 	}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

drivers-infiniband-sw-siw-siw_qp_rxc-suppress-uninitialized-var-warning.patch
drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch
mm.patch
mm-gup-track-foll_pin-pages-fix-2-fix.patch
mm-swap-make-page_evictable-inline-fix.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-hugetlbc-fix-printk-format-warning-for-32-bit-phys_addr_t-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
hv_balloon-dont-check-for-memhp_auto_online-manually-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-03-18  2:28 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-03-18  2:28 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/gt/intel_lrc.c       |    5 -----
 drivers/gpu/drm/i915/gvt/display.c        |    5 -----
 drivers/gpu/drm/i915/gvt/vgpu.c           |   13 -------------
 drivers/mmc/host/sdhci-tegra.c            |    5 -----
 drivers/net/ethernet/mscc/ocelot.c        |   13 -------------
 net/ipv4/inet_diag.c                      |    3 ---
 tools/testing/selftests/tc-testing/config |    4 ----
 7 files changed, 48 deletions(-)

--- a/drivers/gpu/drm/i915/gt/intel_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1799,16 +1799,11 @@ static void set_timeslice(struct intel_e
 static void start_timeslice(struct intel_engine_cs *engine)
 {
 	struct intel_engine_execlists *execlists = &engine->execlists;
-<<<<<<< HEAD
-
-	execlists->switch_priority_hint = execlists->queue_priority_hint;
-=======
 	int prio = queue_prio(execlists);
 
 	WRITE_ONCE(execlists->switch_priority_hint, prio);
 	if (prio == INT_MIN)
 		return;
->>>>>>> linux-next/akpm-base
 
 	if (timer_pending(&execlists->timer))
 		return;
--- a/drivers/gpu/drm/i915/gvt/display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gvt/display.c
@@ -459,13 +459,8 @@ void intel_vgpu_emulate_hotplug(struct i
 	struct drm_i915_private *i915 = vgpu->gvt->gt->i915;
 
 	/* TODO: add more platforms support */
-<<<<<<< HEAD
-	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv) ||
-		IS_COFFEELAKE(dev_priv)) {
-=======
 	if (IS_SKYLAKE(i915) || IS_KABYLAKE(i915) ||
 	    IS_COFFEELAKE(i915)) {
->>>>>>> linux-next/akpm-base
 		if (connected) {
 			vgpu_vreg_t(vgpu, SFUSE_STRAP) |=
 				SFUSE_STRAP_DDID_DETECTED;
--- a/drivers/gpu/drm/i915/gvt/vgpu.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -274,18 +274,6 @@ void intel_gvt_destroy_vgpu(struct intel
 	struct intel_gvt *gvt = vgpu->gvt;
 	struct drm_i915_private *i915 = gvt->gt->i915;
 
-<<<<<<< HEAD
-	WARN(vgpu->active, "vGPU is still active!\n");
-
-	/*
-	 * remove idr first so later clean can judge if need to stop
-	 * service if no active vgpu.
-	 */
-	mutex_lock(&gvt->lock);
-	idr_remove(&gvt->vgpu_idr, vgpu->id);
-	mutex_unlock(&gvt->lock);
-
-=======
 	drm_WARN(&i915->drm, vgpu->active, "vGPU is still active!\n");
 
 	/*
@@ -296,7 +284,6 @@ void intel_gvt_destroy_vgpu(struct intel
 	idr_remove(&gvt->vgpu_idr, vgpu->id);
 	mutex_unlock(&gvt->lock);
 
->>>>>>> linux-next/akpm-base
 	mutex_lock(&vgpu->vgpu_lock);
 	intel_gvt_debugfs_remove_vgpu(vgpu);
 	intel_vgpu_clean_sched_policy(vgpu);
--- a/drivers/mmc/host/sdhci-tegra.c~linux-next-git-rejects
+++ a/drivers/mmc/host/sdhci-tegra.c
@@ -1583,13 +1583,8 @@ static int sdhci_tegra_probe(struct plat
 	if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50)
 		host->mmc->caps |= MMC_CAP_1_8V_DDR;
 
-<<<<<<< HEAD
-	/* R1B responses is required to properly manage HW busy detection. */
-	host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
-=======
 	/* HW busy detection is supported, but R1B responses are required. */
 	host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_NEED_RSP_BUSY;
->>>>>>> linux-next/akpm-base
 
 	tegra_sdhci_parse_dt(host);
 
--- a/drivers/net/ethernet/mscc/ocelot.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mscc/ocelot.c
@@ -2329,16 +2329,7 @@ void ocelot_configure_cpu(struct ocelot
 			 ANA_PORT_PORT_CFG_PORTID_VAL(cpu),
 			 ANA_PORT_PORT_CFG, cpu);
 
-<<<<<<< HEAD
-	/* If the CPU port is a physical port, set up the port in Node
-	 * Processor Interface (NPI) mode. This is the mode through which
-	 * frames can be injected from and extracted to an external CPU.
-	 * Only one port can be an NPI at the same time.
-	 */
-	if (cpu < ocelot->num_phys_ports) {
-=======
 	if (npi >= 0 && npi < ocelot->num_phys_ports) {
->>>>>>> linux-next/akpm-base
 		int sdu = ETH_DATA_LEN + OCELOT_TAG_LEN;
 
 		ocelot_write(ocelot, QSYS_EXT_CPU_CFG_EXT_CPUQ_MSK_M |
@@ -2350,9 +2341,6 @@ void ocelot_configure_cpu(struct ocelot
 		else if (injection == OCELOT_TAG_PREFIX_LONG)
 			sdu += OCELOT_LONG_PREFIX_LEN;
 
-<<<<<<< HEAD
-		ocelot_port_set_maxlen(ocelot, cpu, sdu);
-=======
 		ocelot_port_set_maxlen(ocelot, npi, sdu);
 
 		/* Enable NPI port */
@@ -2366,7 +2354,6 @@ void ocelot_configure_cpu(struct ocelot
 				 SYS_PORT_MODE_INCL_XTR_HDR(extraction) |
 				 SYS_PORT_MODE_INCL_INJ_HDR(injection),
 				 SYS_PORT_MODE, npi);
->>>>>>> linux-next/akpm-base
 	}
 
 	/* Enable CPU port module */
--- a/net/ipv4/inet_diag.c~linux-next-git-rejects
+++ a/net/ipv4/inet_diag.c
@@ -303,8 +303,6 @@ int inet_sk_diag_fill(struct sock *sk, s
 			goto errout;
 	}
 
-<<<<<<< HEAD
-=======
 	/* Keep it at the end for potential retry with a larger skb,
 	 * or else do best-effort fitting, which is only done for the
 	 * first_nlmsg.
@@ -347,7 +345,6 @@ int inet_sk_diag_fill(struct sock *sk, s
 		 */
 	}
 
->>>>>>> linux-next/akpm-base
 out:
 	nlmsg_end(skb, nlh);
 	return 0;
--- a/tools/testing/selftests/tc-testing/config~linux-next-git-rejects
+++ a/tools/testing/selftests/tc-testing/config
@@ -58,12 +58,8 @@ CONFIG_NET_IFE_SKBMARK=m
 CONFIG_NET_IFE_SKBPRIO=m
 CONFIG_NET_IFE_SKBTCINDEX=m
 CONFIG_NET_SCH_FIFO=y
-<<<<<<< HEAD
-CONFIG_NET_SCH_ETS=m
-=======
 
 #
 ## Network testing
 #
 CONFIG_CAN=m
->>>>>>> linux-next/akpm-base
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix.patch
mm-hotplug-fix-hot-remove-failure-in-sparsememvmemmap-case-fix.patch
mm.patch
mm-gup-track-foll_pin-pages-fix-2-fix.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-03-12 19:17 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-03-12 19:17 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/cgroup/cgroup.c |   39 ---------------------------------------
 1 file changed, 39 deletions(-)

--- a/kernel/cgroup/cgroup.c~linux-next-git-rejects
+++ a/kernel/cgroup/cgroup.c
@@ -4412,31 +4412,12 @@ static void css_task_iter_advance_css_se
 			it->cur_tasks_head = &cset->dying_tasks;
 			break;
 		}
-<<<<<<< HEAD
-	} while (!css_set_populated(cset) && list_empty(&cset->dying_tasks));
-
-	if (!list_empty(&cset->tasks)) {
-		it->task_pos = cset->tasks.next;
-		it->cur_tasks_head = &cset->tasks;
-	} else if (!list_empty(&cset->mg_tasks)) {
-		it->task_pos = cset->mg_tasks.next;
-		it->cur_tasks_head = &cset->mg_tasks;
-	} else {
-		it->task_pos = cset->dying_tasks.next;
-		it->cur_tasks_head = &cset->dying_tasks;
-	}
-
-	it->tasks_head = &cset->tasks;
-	it->mg_tasks_head = &cset->mg_tasks;
-	it->dying_tasks_head = &cset->dying_tasks;
-=======
 	}
 	if (!cset) {
 		it->task_pos = NULL;
 		return;
 	}
 	it->task_pos = it->cur_tasks_head->next;
->>>>>>> linux-next/akpm-base
 
 	/*
 	 * We don't keep css_sets locked across iteration steps and thus
@@ -4490,17 +4471,6 @@ repeat:
 		else
 			it->task_pos = it->task_pos->next;
 
-<<<<<<< HEAD
-		if (it->task_pos == it->tasks_head) {
-			it->task_pos = it->mg_tasks_head->next;
-			it->cur_tasks_head = it->mg_tasks_head;
-		}
-		if (it->task_pos == it->mg_tasks_head) {
-			it->task_pos = it->dying_tasks_head->next;
-			it->cur_tasks_head = it->dying_tasks_head;
-		}
-		if (it->task_pos == it->dying_tasks_head)
-=======
 		if (it->task_pos == &it->cur_cset->tasks) {
 			it->cur_tasks_head = &it->cur_cset->mg_tasks;
 			it->task_pos = it->cur_tasks_head->next;
@@ -4510,7 +4480,6 @@ repeat:
 			it->task_pos = it->cur_tasks_head->next;
 		}
 		if (it->task_pos == &it->cur_cset->dying_tasks)
->>>>>>> linux-next/akpm-base
 			css_task_iter_advance_css_set(it);
 	} else {
 		/* called from start, proceed to the first cset */
@@ -4528,20 +4497,12 @@ repeat:
 			goto repeat;
 
 		/* and dying leaders w/o live member threads */
-<<<<<<< HEAD
-		if (it->cur_tasks_head == it->dying_tasks_head &&
-=======
 		if (it->cur_tasks_head == &it->cur_cset->dying_tasks &&
->>>>>>> linux-next/akpm-base
 		    !atomic_read(&task->signal->live))
 			goto repeat;
 	} else {
 		/* skip all dying ones */
-<<<<<<< HEAD
-		if (it->cur_tasks_head == it->dying_tasks_head)
-=======
 		if (it->cur_tasks_head == &it->cur_cset->dying_tasks)
->>>>>>> linux-next/akpm-base
 			goto repeat;
 	}
 }
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

memcg-fix-null-pointer-dereference-in-__mem_cgroup_usage_unregister_event-fix.patch
mm-hotplug-fix-hot-remove-failure-in-sparsememvmemmap-case-fix.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-03-10 17:37 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-03-10 17:37 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/devicetree/bindings/arm/psci.yaml    |    8 
 arch/arm64/mm/context.c                            |    6 
 drivers/bus/ti-sysc.c                              |    4 
 drivers/gpu/drm/i915/display/intel_display_power.c |   29 --
 drivers/gpu/drm/i915/gt/intel_workarounds.c        |    7 
 drivers/gpu/drm/i915/i915_drv.h                    |    4 
 drivers/gpu/drm/virtio/virtgpu_object.c            |    4 
 drivers/hwmon/pmbus/xdpe12284.c                    |    8 
 fs/io-wq.c                                         |   68 -----
 fs/io-wq.h                                         |    4 
 include/sound/soc.h                                |    3 
 sound/soc/soc-pcm.c                                |  142 -----------
 sound/soc/stm/stm32_sai_sub.c                      |    4 
 13 files changed, 291 deletions(-)

--- a/arch/arm64/mm/context.c~linux-next-git-rejects
+++ a/arch/arm64/mm/context.c
@@ -263,11 +263,6 @@ asmlinkage void post_ttbr_update_workaro
 			ARM64_WORKAROUND_CAVIUM_27456));
 }
 
-<<<<<<< HEAD
-static int asids_update_limit(void)
-{
-=======
-void cpu_do_switch_mm(phys_addr_t pgd_phys, struct mm_struct *mm)
 {
 	unsigned long ttbr1 = read_sysreg(ttbr1_el1);
 	unsigned long asid = ASID(mm);
@@ -294,7 +289,6 @@ void cpu_do_switch_mm(phys_addr_t pgd_ph
 
 static int asids_update_limit(void)
 {
->>>>>>> linux-next/akpm-base
 	unsigned long num_available_asids = NUM_USER_ASIDS;
 
 	if (arm64_kernel_unmapped_at_el0())
--- a/Documentation/devicetree/bindings/arm/psci.yaml~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/arm/psci.yaml
@@ -101,14 +101,11 @@ properties:
 
       [1] Kernel documentation - ARM idle states bindings
         Documentation/devicetree/bindings/arm/idle-states.yaml
-<<<<<<< HEAD
-=======
 
   "#power-domain-cells":
     description:
       The number of cells in a PM domain specifier as per binding in [3].
       Must be 0 as to represent a single PM domain.
->>>>>>> linux-next/akpm-base
 
 patternProperties:
   "^power-domain-":
@@ -131,10 +128,6 @@ patternProperties:
       helps to implement support for OSI mode and OS implementations may choose
       to mandate it.
 
-<<<<<<< HEAD
-      [3] Documentation/devicetree/bindings/power/power-domain.yaml
-      [4] Documentation/devicetree/bindings/power/domain-idle-state.yaml
-=======
       [3] Documentation/devicetree/bindings/power/power_domain.txt
       [4] Documentation/devicetree/bindings/power/domain-idle-state.yaml
 
@@ -143,7 +136,6 @@ patternProperties:
     description:
       List of phandles and PM domain specifiers, as defined by bindings of the
       PM domain provider.
->>>>>>> linux-next/akpm-base
 
 required:
   - compatible
--- a/drivers/bus/ti-sysc.c~linux-next-git-rejects
+++ a/drivers/bus/ti-sysc.c
@@ -1731,11 +1731,7 @@ static void sysc_init_module_quirks(stru
 		return;
 
 	if (ddata->cfg.quirks & SYSC_MODULE_QUIRK_HDQ1W) {
-<<<<<<< HEAD
-		ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w;
-=======
 		ddata->pre_reset_quirk = sysc_pre_reset_quirk_hdq1w;
->>>>>>> linux-next/akpm-base
 
 		return;
 	}
--- a/drivers/gpu/drm/i915/display/intel_display_power.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -4526,16 +4526,6 @@ static void icl_mbus_init(struct drm_i91
 		MBUS_ABOX_BT_CREDIT_POOL2_MASK |
 		MBUS_ABOX_B_CREDIT_MASK |
 		MBUS_ABOX_BW_CREDIT_MASK;
-<<<<<<< HEAD
-
-	val = I915_READ(MBUS_ABOX_CTL);
-	val &= ~mask;
-	val |= MBUS_ABOX_BT_CREDIT_POOL1(16) |
-		MBUS_ABOX_BT_CREDIT_POOL2(16) |
-		MBUS_ABOX_B_CREDIT(1) |
-		MBUS_ABOX_BW_CREDIT(1);
-	I915_WRITE(MBUS_ABOX_CTL, val);
-=======
 	val = MBUS_ABOX_BT_CREDIT_POOL1(16) |
 		MBUS_ABOX_BT_CREDIT_POOL2(16) |
 		MBUS_ABOX_B_CREDIT(1) |
@@ -4546,7 +4536,6 @@ static void icl_mbus_init(struct drm_i91
 		intel_de_rmw(dev_priv, MBUS_ABOX1_CTL, mask, val);
 		intel_de_rmw(dev_priv, MBUS_ABOX2_CTL, mask, val);
 	}
->>>>>>> linux-next/akpm-base
 }
 
 static void hsw_assert_cdclk(struct drm_i915_private *dev_priv)
@@ -5044,23 +5033,6 @@ static void tgl_bw_buddy_init(struct drm
 		intel_de_write(dev_priv, BW_BUDDY1_CTL, BW_BUDDY_DISABLE);
 		intel_de_write(dev_priv, BW_BUDDY2_CTL, BW_BUDDY_DISABLE);
 	} else {
-<<<<<<< HEAD
-		u32 val;
-
-		I915_WRITE(BW_BUDDY1_PAGE_MASK, table[i].page_mask);
-		I915_WRITE(BW_BUDDY2_PAGE_MASK, table[i].page_mask);
-
-		/* Wa_22010178259:tgl */
-		val = I915_READ(BW_BUDDY1_CTL);
-		val &= ~BW_BUDDY_TLB_REQ_TIMER_MASK;
-		val |= REG_FIELD_PREP(BW_BUDDY_TLB_REQ_TIMER_MASK, 0x8);
-		I915_WRITE(BW_BUDDY1_CTL, val);
-
-		val = I915_READ(BW_BUDDY2_CTL);
-		val &= ~BW_BUDDY_TLB_REQ_TIMER_MASK;
-		val |= REG_FIELD_PREP(BW_BUDDY_TLB_REQ_TIMER_MASK, 0x8);
-		I915_WRITE(BW_BUDDY2_CTL, val);
-=======
 		intel_de_write(dev_priv, BW_BUDDY1_PAGE_MASK,
 			       table[i].page_mask);
 		intel_de_write(dev_priv, BW_BUDDY2_PAGE_MASK,
@@ -5073,7 +5045,6 @@ static void tgl_bw_buddy_init(struct drm
 		intel_de_rmw(dev_priv, BW_BUDDY2_CTL,
 			     BW_BUDDY_TLB_REQ_TIMER_MASK,
 			     REG_FIELD_PREP(BW_BUDDY_TLB_REQ_TIMER_MASK, 0x8));
->>>>>>> linux-next/akpm-base
 	}
 }
 
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -580,9 +580,6 @@ static void icl_ctx_workarounds_init(str
 static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
 				     struct i915_wa_list *wal)
 {
-<<<<<<< HEAD
-	/* Wa_1409142259:tgl */
-=======
 	/*
 	 * Wa_1409142259:tgl
 	 * Wa_1409347922:tgl
@@ -592,7 +589,6 @@ static void tgl_ctx_workarounds_init(str
 	 * Wa_1409178076:tgl
 	 * Wa_1408979724:tgl
 	 */
->>>>>>> linux-next/akpm-base
 	WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3,
 			  GEN12_DISABLE_CPS_AWARE_COLOR_PIPE);
 
@@ -605,14 +601,11 @@ static void tgl_ctx_workarounds_init(str
 	 */
 	wa_add(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK,
 	       FF_MODE2_TDS_TIMER_128, 0);
-<<<<<<< HEAD
-=======
 
 	/* WaDisableGPGPUMidThreadPreemption:tgl */
 	WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1,
 			    GEN9_PREEMPT_GPGPU_LEVEL_MASK,
 			    GEN9_PREEMPT_GPGPU_THREAD_GROUP_LEVEL);
->>>>>>> linux-next/akpm-base
 }
 
 static void
--- a/drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.h
@@ -501,11 +501,7 @@ struct i915_psr {
 	u16 su_x_granularity;
 	bool dc3co_enabled;
 	u32 dc3co_exit_delay;
-<<<<<<< HEAD
-	struct delayed_work idle_work;
-=======
 	struct delayed_work dc3co_work;
->>>>>>> linux-next/akpm-base
 	bool force_mode_changed;
 };
 
--- a/drivers/gpu/drm/virtio/virtgpu_object.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -123,11 +123,7 @@ struct drm_gem_object *virtio_gpu_create
 	if (!bo)
 		return NULL;
 
-<<<<<<< HEAD
-	bo->base.base.funcs = &virtio_gpu_gem_funcs;
-=======
 	bo->base.base.funcs = &virtio_gpu_shmem_funcs;
->>>>>>> linux-next/akpm-base
 	bo->base.map_cached = true;
 	return &bo->base.base;
 }
--- a/drivers/hwmon/pmbus/xdpe12284.c~linux-next-git-rejects
+++ a/drivers/hwmon/pmbus/xdpe12284.c
@@ -18,12 +18,8 @@
 #define XDPE122_AMD_625MV		0x10 /* AMD mode 6.25mV */
 #define XDPE122_PAGE_NUM		2
 
-<<<<<<< HEAD
-static int xdpe122_read_word_data(struct i2c_client *client, int page, int reg)
-=======
 static int xdpe122_read_word_data(struct i2c_client *client, int page,
 				  int phase, int reg)
->>>>>>> linux-next/akpm-base
 {
 	const struct pmbus_driver_info *info = pmbus_get_driver_info(client);
 	long val;
@@ -34,11 +30,7 @@ static int xdpe122_read_word_data(struct
 	switch (reg) {
 	case PMBUS_VOUT_OV_FAULT_LIMIT:
 	case PMBUS_VOUT_UV_FAULT_LIMIT:
-<<<<<<< HEAD
-		ret = pmbus_read_word_data(client, page, reg);
-=======
 		ret = pmbus_read_word_data(client, page, phase, reg);
->>>>>>> linux-next/akpm-base
 		if (ret < 0)
 			return ret;
 
--- a/fs/io-wq.c~linux-next-git-rejects
+++ a/fs/io-wq.c
@@ -510,53 +510,6 @@ get_next:
 
 			old_work = work;
 			work->func(&work);
-<<<<<<< HEAD
-
-		if (work->files && current->files != work->files) {
-			task_lock(current);
-			current->files = work->files;
-			task_unlock(current);
-		}
-		if (work->fs && current->fs != work->fs)
-			current->fs = work->fs;
-		if (work->mm != worker->mm)
-			io_wq_switch_mm(worker, work);
-		if (worker->cur_creds != work->creds)
-			io_wq_switch_creds(worker, work);
-		/*
-		 * OK to set IO_WQ_WORK_CANCEL even for uncancellable work,
-		 * the worker function will do the right thing.
-		 */
-		if (test_bit(IO_WQ_BIT_CANCEL, &wq->state))
-			work->flags |= IO_WQ_WORK_CANCEL;
-		if (worker->mm)
-			work->flags |= IO_WQ_WORK_HAS_MM;
-
-		if (wq->get_work) {
-			put_work = work;
-			wq->get_work(work);
-		}
-
-		old_work = work;
-		work->func(&work);
-
-		spin_lock_irq(&worker->lock);
-		worker->cur_work = NULL;
-		spin_unlock_irq(&worker->lock);
-
-		spin_lock_irq(&wqe->lock);
-
-		if (hash != -1U) {
-			wqe->hash_map &= ~BIT_ULL(hash);
-			wqe->flags &= ~IO_WQE_FLAG_STALLED;
-		}
-		if (work && work != old_work) {
-			spin_unlock_irq(&wqe->lock);
-
-			if (put_work && wq->put_work) {
-				wq->put_work(put_work);
-				put_work = NULL;
-=======
 			work = (old_work == work) ? NULL : work;
 			io_assign_current_work(worker, work);
 			wq->free_work(old_work);
@@ -571,7 +524,6 @@ get_next:
 				if (!work)
 					goto get_next;
 				spin_unlock_irq(&wqe->lock);
->>>>>>> linux-next/akpm-base
 			}
 		} while (work);
 
@@ -791,25 +743,17 @@ static bool io_wq_can_queue(struct io_wq
 	return true;
 }
 
-<<<<<<< HEAD
-static void io_run_cancel(struct io_wq_work *work)
-{
-=======
 static void io_run_cancel(struct io_wq_work *work, struct io_wqe *wqe)
 {
 	struct io_wq *wq = wqe->wq;
 
->>>>>>> linux-next/akpm-base
 	do {
 		struct io_wq_work *old_work = work;
 
 		work->flags |= IO_WQ_WORK_CANCEL;
 		work->func(&work);
 		work = (work == old_work) ? NULL : work;
-<<<<<<< HEAD
-=======
 		wq->free_work(old_work);
->>>>>>> linux-next/akpm-base
 	} while (work);
 }
 
@@ -826,11 +770,7 @@ static void io_wqe_enqueue(struct io_wqe
 	 * It's close enough to not be an issue, fork() has the same delay.
 	 */
 	if (unlikely(!io_wq_can_queue(wqe, acct, work))) {
-<<<<<<< HEAD
-		io_run_cancel(work);
-=======
 		io_run_cancel(work, wqe);
->>>>>>> linux-next/akpm-base
 		return;
 	}
 
@@ -969,11 +909,7 @@ static enum io_wq_cancel io_wqe_cancel_c
 	spin_unlock_irqrestore(&wqe->lock, flags);
 
 	if (found) {
-<<<<<<< HEAD
-		io_run_cancel(work);
-=======
 		io_run_cancel(work, wqe);
->>>>>>> linux-next/akpm-base
 		return IO_WQ_CANCEL_OK;
 	}
 
@@ -1048,11 +984,7 @@ static enum io_wq_cancel io_wqe_cancel_w
 	spin_unlock_irqrestore(&wqe->lock, flags);
 
 	if (found) {
-<<<<<<< HEAD
-		io_run_cancel(work);
-=======
 		io_run_cancel(work, wqe);
->>>>>>> linux-next/akpm-base
 		return IO_WQ_CANCEL_OK;
 	}
 
--- a/fs/io-wq.h~linux-next-git-rejects
+++ a/fs/io-wq.h
@@ -7,10 +7,6 @@ enum {
 	IO_WQ_WORK_CANCEL	= 1,
 	IO_WQ_WORK_HASHED	= 4,
 	IO_WQ_WORK_UNBOUND	= 32,
-<<<<<<< HEAD
-	IO_WQ_WORK_CB		= 128,
-=======
->>>>>>> linux-next/akpm-base
 	IO_WQ_WORK_NO_CANCEL	= 256,
 	IO_WQ_WORK_CONCURRENT	= 512,
 
--- a/include/sound/soc.h~linux-next-git-rejects
+++ a/include/sound/soc.h
@@ -1166,8 +1166,6 @@ struct snd_soc_pcm_runtime {
 	     (i)++)
 #define for_each_rtd_codec_dai_rollback(rtd, i, dai)		\
 	for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)
-<<<<<<< HEAD
-=======
 
 #define for_each_rtd_cpu_dai(rtd, i, dai)\
 	for ((i) = 0;						       \
@@ -1175,7 +1173,6 @@ struct snd_soc_pcm_runtime {
 	     (i)++)
 #define for_each_rtd_cpu_dai_rollback(rtd, i, dai)		\
 	for (; (--(i) >= 0) && ((dai) = rtd->cpu_dais[i]);)
->>>>>>> linux-next/akpm-base
 
 void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);
 
--- a/sound/soc/soc-pcm.c~linux-next-git-rejects
+++ a/sound/soc/soc-pcm.c
@@ -3288,145 +3288,3 @@ int snd_soc_dpcm_can_be_params(struct sn
 	return snd_soc_dpcm_check_state(fe, be, stream, state, ARRAY_SIZE(state));
 }
 EXPORT_SYMBOL_GPL(snd_soc_dpcm_can_be_params);
-<<<<<<< HEAD
-
-#ifdef CONFIG_DEBUG_FS
-static const char *dpcm_state_string(enum snd_soc_dpcm_state state)
-{
-	switch (state) {
-	case SND_SOC_DPCM_STATE_NEW:
-		return "new";
-	case SND_SOC_DPCM_STATE_OPEN:
-		return "open";
-	case SND_SOC_DPCM_STATE_HW_PARAMS:
-		return "hw_params";
-	case SND_SOC_DPCM_STATE_PREPARE:
-		return "prepare";
-	case SND_SOC_DPCM_STATE_START:
-		return "start";
-	case SND_SOC_DPCM_STATE_STOP:
-		return "stop";
-	case SND_SOC_DPCM_STATE_SUSPEND:
-		return "suspend";
-	case SND_SOC_DPCM_STATE_PAUSED:
-		return "paused";
-	case SND_SOC_DPCM_STATE_HW_FREE:
-		return "hw_free";
-	case SND_SOC_DPCM_STATE_CLOSE:
-		return "close";
-	}
-
-	return "unknown";
-}
-
-static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe,
-				int stream, char *buf, size_t size)
-{
-	struct snd_pcm_hw_params *params = &fe->dpcm[stream].hw_params;
-	struct snd_soc_dpcm *dpcm;
-	ssize_t offset = 0;
-	unsigned long flags;
-
-	/* FE state */
-	offset += scnprintf(buf + offset, size - offset,
-			"[%s - %s]\n", fe->dai_link->name,
-			stream ? "Capture" : "Playback");
-
-	offset += scnprintf(buf + offset, size - offset, "State: %s\n",
-	                dpcm_state_string(fe->dpcm[stream].state));
-
-	if ((fe->dpcm[stream].state >= SND_SOC_DPCM_STATE_HW_PARAMS) &&
-	    (fe->dpcm[stream].state <= SND_SOC_DPCM_STATE_STOP))
-		offset += scnprintf(buf + offset, size - offset,
-				"Hardware Params: "
-				"Format = %s, Channels = %d, Rate = %d\n",
-				snd_pcm_format_name(params_format(params)),
-				params_channels(params),
-				params_rate(params));
-
-	/* BEs state */
-	offset += scnprintf(buf + offset, size - offset, "Backends:\n");
-
-	if (list_empty(&fe->dpcm[stream].be_clients)) {
-		offset += scnprintf(buf + offset, size - offset,
-				" No active DSP links\n");
-		goto out;
-	}
-
-	spin_lock_irqsave(&fe->card->dpcm_lock, flags);
-	for_each_dpcm_be(fe, stream, dpcm) {
-		struct snd_soc_pcm_runtime *be = dpcm->be;
-		params = &dpcm->hw_params;
-
-		offset += scnprintf(buf + offset, size - offset,
-				"- %s\n", be->dai_link->name);
-
-		offset += scnprintf(buf + offset, size - offset,
-				"   State: %s\n",
-				dpcm_state_string(be->dpcm[stream].state));
-
-		if ((be->dpcm[stream].state >= SND_SOC_DPCM_STATE_HW_PARAMS) &&
-		    (be->dpcm[stream].state <= SND_SOC_DPCM_STATE_STOP))
-			offset += scnprintf(buf + offset, size - offset,
-				"   Hardware Params: "
-				"Format = %s, Channels = %d, Rate = %d\n",
-				snd_pcm_format_name(params_format(params)),
-				params_channels(params),
-				params_rate(params));
-	}
-	spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);
-out:
-	return offset;
-}
-
-static ssize_t dpcm_state_read_file(struct file *file, char __user *user_buf,
-				size_t count, loff_t *ppos)
-{
-	struct snd_soc_pcm_runtime *fe = file->private_data;
-	ssize_t out_count = PAGE_SIZE, offset = 0, ret = 0;
-	char *buf;
-
-	buf = kmalloc(out_count, GFP_KERNEL);
-	if (!buf)
-		return -ENOMEM;
-
-	if (snd_soc_dai_stream_valid(fe->cpu_dai, SNDRV_PCM_STREAM_PLAYBACK))
-		offset += dpcm_show_state(fe, SNDRV_PCM_STREAM_PLAYBACK,
-					buf + offset, out_count - offset);
-
-	if (snd_soc_dai_stream_valid(fe->cpu_dai, SNDRV_PCM_STREAM_CAPTURE))
-		offset += dpcm_show_state(fe, SNDRV_PCM_STREAM_CAPTURE,
-					buf + offset, out_count - offset);
-
-	ret = simple_read_from_buffer(user_buf, count, ppos, buf, offset);
-
-	kfree(buf);
-	return ret;
-}
-
-static const struct file_operations dpcm_state_fops = {
-	.open = simple_open,
-	.read = dpcm_state_read_file,
-	.llseek = default_llseek,
-};
-
-void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
-{
-	if (!rtd->dai_link)
-		return;
-
-	if (!rtd->dai_link->dynamic)
-		return;
-
-	if (!rtd->card->debugfs_card_root)
-		return;
-
-	rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,
-			rtd->card->debugfs_card_root);
-
-	debugfs_create_file("state", 0444, rtd->debugfs_dpcm_root,
-			    rtd, &dpcm_state_fops);
-}
-#endif
-=======
->>>>>>> linux-next/akpm-base
--- a/sound/soc/stm/stm32_sai_sub.c~linux-next-git-rejects
+++ a/sound/soc/stm/stm32_sai_sub.c
@@ -1549,12 +1549,8 @@ static int stm32_sai_sub_probe(struct pl
 
 	ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0);
 	if (ret) {
-<<<<<<< HEAD
-		dev_err(&pdev->dev, "Could not register pcm dma\n");
-=======
 		if (ret != -EPROBE_DEFER)
 			dev_err(&pdev->dev, "Could not register pcm dma\n");
->>>>>>> linux-next/akpm-base
 		return ret;
 	}
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-hotplug-fix-hot-remove-failure-in-sparsememvmemmap-case-fix.patch
mm.patch
memcg-optimize-memorynuma_stat-like-memorystat-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
seq_read-info-message-about-buggy-next-functions-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-03-02 18:59 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-03-02 18:59 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/mptcp/protocol.c   |    3 ---
 net/smc/smc_core.h     |    4 ----
 net/wireless/nl80211.c |    3 ---
 3 files changed, 10 deletions(-)

--- a/net/mptcp/protocol.c~linux-next-git-rejects
+++ a/net/mptcp/protocol.c
@@ -671,8 +671,6 @@ static unsigned int mptcp_sync_mss(struc
 	return 0;
 }
 
-<<<<<<< HEAD
-=======
 static void mptcp_worker(struct work_struct *work)
 {
 	struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
@@ -684,7 +682,6 @@ static void mptcp_worker(struct work_str
 	sock_put(sk);
 }
 
->>>>>>> linux-next/akpm-base
 static int __mptcp_init_sock(struct sock *sk)
 {
 	struct mptcp_sock *msk = mptcp_sk(sk);
--- a/net/smc/smc_core.h~linux-next-git-rejects
+++ a/net/smc/smc_core.h
@@ -291,11 +291,7 @@ struct smc_clc_msg_local;
 
 void smc_lgr_forget(struct smc_link_group *lgr);
 void smc_lgr_cleanup_early(struct smc_connection *conn);
-<<<<<<< HEAD
-void smc_lgr_terminate(struct smc_link_group *lgr, bool soft);
-=======
 void smc_lgr_terminate_sched(struct smc_link_group *lgr);
->>>>>>> linux-next/akpm-base
 void smc_port_terminate(struct smc_ib_device *smcibdev, u8 ibport);
 void smc_smcd_terminate(struct smcd_dev *dev, u64 peer_gid,
 			unsigned short vlan);
--- a/net/wireless/nl80211.c~linux-next-git-rejects
+++ a/net/wireless/nl80211.c
@@ -4988,8 +4988,6 @@ static int nl80211_start_ap(struct sk_bu
 					info->attrs[NL80211_ATTR_HE_OBSS_PD],
 					&params.he_obss_pd);
 		goto out;
-<<<<<<< HEAD
-=======
 	}
 
 	if (info->attrs[NL80211_ATTR_HE_BSS_COLOR]) {
@@ -4998,7 +4996,6 @@ static int nl80211_start_ap(struct sk_bu
 					&params.he_bss_color);
 		if (err)
 			return err;
->>>>>>> linux-next/akpm-base
 	}
 
 	nl80211_calculate_ap_params(&params);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-numa-fix-bad-pmd-by-atomically-check-for-pmd_trans_huge-when-marking-page-tables-prot_numa-fix.patch
mm.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
selftest-add-mremap_dontunmap-selftest-v7-checkpatch-fixes.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
proc-faster-open-read-close-with-permanent-files-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-fix.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-02-21  0:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-02-21  0:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/pipe.c                     |    6 ------
 sound/soc/sof/intel/hda-dsp.c |   13 -------------
 2 files changed, 19 deletions(-)

--- a/fs/pipe.c~linux-next-git-rejects
+++ a/fs/pipe.c
@@ -1315,11 +1315,6 @@ int pipe_resize_ring(struct pipe_inode_i
 		pipe->max_usage = nr_slots;
 	pipe->tail = tail;
 	pipe->head = head;
-<<<<<<< HEAD
-
-	/* This might have made more room for writers */
-	wake_up_interruptible(&pipe->wr_wait);
-=======
 	wake_up_interruptible_all(&pipe->rd_wait);
 	wake_up_interruptible_all(&pipe->wr_wait);
 	return 0;
@@ -1373,7 +1368,6 @@ static long pipe_set_size(struct pipe_in
 
 	pipe->max_usage = nr_slots;
 	pipe->nr_accounted = nr_slots;
->>>>>>> linux-next/akpm-base
 	return pipe->max_usage * PAGE_SIZE;
 
 out_revert_acct:
--- a/sound/soc/sof/intel/hda-dsp.c~linux-next-git-rejects
+++ a/sound/soc/sof/intel/hda-dsp.c
@@ -669,12 +669,6 @@ int hda_dsp_resume(struct snd_sof_dev *s
 			return ret;
 		}
 
-<<<<<<< HEAD
-	if (sdev->s0_suspend) {
-		hda_codec_i915_display_power(sdev, true);
-
-=======
->>>>>>> linux-next/akpm-base
 		/* restore L1SEN bit */
 		if (hda->l1_support_changed)
 			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
@@ -751,12 +745,6 @@ int hda_dsp_suspend(struct snd_sof_dev *
 	};
 	int ret;
 
-<<<<<<< HEAD
-	if (sdev->s0_suspend) {
-		/* we can't keep a wakeref to display driver at suspend */
-		hda_codec_i915_display_power(sdev, false);
-
-=======
 	/* cancel any attempt for DSP D0I3 */
 	cancel_delayed_work_sync(&hda->d0i3_work);
 
@@ -773,7 +761,6 @@ int hda_dsp_suspend(struct snd_sof_dev *
 			return ret;
 		}
 
->>>>>>> linux-next/akpm-base
 		/* enable L1SEN to make sure the system can enter S0Ix */
 		hda->l1_support_changed =
 			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-numa-fix-bad-pmd-by-atomically-check-for-pmd_trans_huge-when-marking-page-tables-prot_numa-fix.patch
mm.patch
mm-add-vm_insert_pages-fix.patch
net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix.patch
selftest-add-mremap_dontunmap-selftest-fix.patch
hugetlb_cgroup-add-reservation-accounting-for-private-mappings-fix.patch
hugetlb_cgroup-add-accounting-for-shared-mappings-fix.patch
mm-migratec-migrate-pg_readahead-flag-fix.patch
linux-next-rejects.patch
linux-next-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-02-11 21:12 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-02-11 21:12 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/irqchip/irq-gic-v3-its.c |   69 -----------------------------
 1 file changed, 69 deletions(-)

--- a/drivers/irqchip/irq-gic-v3-its.c~linux-next-git-rejects
+++ a/drivers/irqchip/irq-gic-v3-its.c
@@ -2443,75 +2443,6 @@ static u64 inherit_vpe_l1_table_from_rd(
 	return 0;
 }
 
-<<<<<<< HEAD
-static bool allocate_vpe_l2_table(int cpu, u32 id)
-{
-	void __iomem *base = gic_data_rdist_cpu(cpu)->rd_base;
-	unsigned int psz, esz, idx, npg, gpsz;
-	u64 val;
-	struct page *page;
-	__le64 *table;
-
-	if (!gic_rdists->has_rvpeid)
-		return true;
-
-	val  = gicr_read_vpropbaser(base + SZ_128K + GICR_VPROPBASER);
-
-	esz  = FIELD_GET(GICR_VPROPBASER_4_1_ENTRY_SIZE, val) + 1;
-	gpsz = FIELD_GET(GICR_VPROPBASER_4_1_PAGE_SIZE, val);
-	npg  = FIELD_GET(GICR_VPROPBASER_4_1_SIZE, val) + 1;
-
-	switch (gpsz) {
-	default:
-		WARN_ON(1);
-		/* fall through */
-	case GIC_PAGE_SIZE_4K:
-		psz = SZ_4K;
-		break;
-	case GIC_PAGE_SIZE_16K:
-		psz = SZ_16K;
-		break;
-	case GIC_PAGE_SIZE_64K:
-		psz = SZ_64K;
-		break;
-	}
-
-	/* Don't allow vpe_id that exceeds single, flat table limit */
-	if (!(val & GICR_VPROPBASER_4_1_INDIRECT))
-		return (id < (npg * psz / (esz * SZ_8)));
-
-	/* Compute 1st level table index & check if that exceeds table limit */
-	idx = id >> ilog2(psz / (esz * SZ_8));
-	if (idx >= (npg * psz / GITS_LVL1_ENTRY_SIZE))
-		return false;
-
-	table = gic_data_rdist_cpu(cpu)->vpe_l1_base;
-
-	/* Allocate memory for 2nd level table */
-	if (!table[idx]) {
-		page = alloc_pages(GFP_KERNEL | __GFP_ZERO, get_order(psz));
-		if (!page)
-			return false;
-
-		/* Flush Lvl2 table to PoC if hw doesn't support coherency */
-		if (!(val & GICR_VPROPBASER_SHAREABILITY_MASK))
-			gic_flush_dcache_to_poc(page_address(page), psz);
-
-		table[idx] = cpu_to_le64(page_to_phys(page) | GITS_BASER_VALID);
-
-		/* Flush Lvl1 entry to PoC if hw doesn't support coherency */
-		if (!(val & GICR_VPROPBASER_SHAREABILITY_MASK))
-			gic_flush_dcache_to_poc(table + idx, GITS_LVL1_ENTRY_SIZE);
-
-		/* Ensure updated table contents are visible to RD hardware */
-		dsb(sy);
-	}
-
-	return true;
-}

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
  2020-02-04  1:33 incoming Andrew Morton
@ 2020-02-04  1:49 ` Andrew Morton
  0 siblings, 0 replies; 330+ messages in thread
From: Andrew Morton @ 2020-02-04  1:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/f2fs/data.c                  |   13 -------------
 fs/jbd2/journal.c               |    3 ---
 fs/xfs/libxfs/xfs_attr_remote.c |   15 ---------------
 init/main.c                     |   10 ----------
 4 files changed, 41 deletions(-)

--- a/fs/f2fs/data.c~linux-next-git-rejects
+++ a/fs/f2fs/data.c
@@ -2815,7 +2815,6 @@ readd:
 					done = 1;
 					break;
 				}
-<<<<<<< HEAD
 
 				if (!f2fs_cluster_can_merge_page(&cc,
 								page->index)) {
@@ -2826,18 +2825,6 @@ readd:
 					goto result;
 				}
 
-=======
-
-				if (!f2fs_cluster_can_merge_page(&cc,
-								page->index)) {
-					ret = f2fs_write_multi_pages(&cc,
-						&submitted, wbc, io_type);
-					if (!ret)
-						need_readd = true;
-					goto result;
-				}
-
->>>>>>> linux-next/akpm-base
 				if (unlikely(f2fs_cp_error(sbi)))
 					goto lock_page;
 
--- a/fs/jbd2/journal.c~linux-next-git-rejects
+++ a/fs/jbd2/journal.c
@@ -806,12 +806,9 @@ int jbd2_journal_bmap(journal_t *journal
 			       __func__, blocknr, journal->j_devname);
 			err = -EIO;
 			jbd2_journal_abort(journal, err);
-<<<<<<< HEAD
-=======
 
 		} else {
 			*retp = block;
->>>>>>> linux-next/akpm-base
 		}
 
 	} else {
--- a/fs/xfs/libxfs/xfs_attr_remote.c~linux-next-git-rejects
+++ a/fs/xfs/libxfs/xfs_attr_remote.c
@@ -418,24 +418,9 @@ xfs_attr_rmtval_get(
 			       (map[i].br_startblock != HOLESTARTBLOCK));
 			dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock);
 			dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount);
-<<<<<<< HEAD
-			bp = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt, 0,
-					&xfs_attr3_rmt_buf_ops);
-			if (!bp)
-				return -ENOMEM;
-			error = bp->b_error;
-			if (error) {
-				xfs_buf_ioerror_alert(bp, __func__);
-				xfs_buf_relse(bp);
-
-				/* bad CRC means corrupted metadata */
-				if (error == -EFSBADCRC)
-					error = -EFSCORRUPTED;
-=======
 			error = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt,
 					0, &bp, &xfs_attr3_rmt_buf_ops);
 			if (error)
->>>>>>> linux-next/akpm-base
 				return error;
 			}
 
--- a/init/main.c~linux-next-git-rejects
+++ a/init/main.c
@@ -1161,17 +1161,7 @@ static const char *initcall_level_names[
 	"late",
 };
 
-<<<<<<< HEAD
-static int __init ignore_unknown_bootoption(char *param, char *val,
-			       const char *unused, void *arg)
-{
-	return 0;
-}

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-01-29 23:43 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-01-29 23:43 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/Kconfig                       |    6 
 arch/x86/include/asm/vmx.h             |    9 
 drivers/gpu/drm/i915/i915_gem_gtt.c    | 2907 -----------------------
 drivers/net/ethernet/sfc/efx.c         |  629 ----
 drivers/soc/tegra/fuse/tegra-apbmisc.c |    8 
 include/linux/lsm_audit.h              |    4 
 kernel/rcu/tree_exp.h                  |    4 
 7 files changed, 3567 deletions(-)

--- a/arch/x86/include/asm/vmx.h~linux-next-git-rejects
+++ a/arch/x86/include/asm/vmx.h
@@ -22,13 +22,8 @@
 /*
  * Definitions of Primary Processor-Based VM-Execution Controls.
  */
-<<<<<<< HEAD
-#define CPU_BASED_VIRTUAL_INTR_PENDING          VMCS_CONTROL_BIT(VIRTUAL_INTR_PENDING)
-#define CPU_BASED_USE_TSC_OFFSETING             VMCS_CONTROL_BIT(TSC_OFFSETTING)
-=======
 #define CPU_BASED_INTR_WINDOW_EXITING           VMCS_CONTROL_BIT(VIRTUAL_INTR_PENDING)
 #define CPU_BASED_USE_TSC_OFFSETTING            VMCS_CONTROL_BIT(TSC_OFFSETTING)
->>>>>>> linux-next/akpm-base
 #define CPU_BASED_HLT_EXITING                   VMCS_CONTROL_BIT(HLT_EXITING)
 #define CPU_BASED_INVLPG_EXITING                VMCS_CONTROL_BIT(INVLPG_EXITING)
 #define CPU_BASED_MWAIT_EXITING                 VMCS_CONTROL_BIT(MWAIT_EXITING)
@@ -39,11 +34,7 @@
 #define CPU_BASED_CR8_LOAD_EXITING              VMCS_CONTROL_BIT(CR8_LOAD_EXITING)
 #define CPU_BASED_CR8_STORE_EXITING             VMCS_CONTROL_BIT(CR8_STORE_EXITING)
 #define CPU_BASED_TPR_SHADOW                    VMCS_CONTROL_BIT(VIRTUAL_TPR)
-<<<<<<< HEAD
-#define CPU_BASED_VIRTUAL_NMI_PENDING		VMCS_CONTROL_BIT(VIRTUAL_NMI_PENDING)
-=======
 #define CPU_BASED_NMI_WINDOW_EXITING		VMCS_CONTROL_BIT(VIRTUAL_NMI_PENDING)
->>>>>>> linux-next/akpm-base
 #define CPU_BASED_MOV_DR_EXITING                VMCS_CONTROL_BIT(MOV_DR_EXITING)
 #define CPU_BASED_UNCOND_IO_EXITING             VMCS_CONTROL_BIT(UNCOND_IO_EXITING)
 #define CPU_BASED_USE_IO_BITMAPS                VMCS_CONTROL_BIT(USE_IO_BITMAPS)
--- a/arch/x86/Kconfig~linux-next-git-rejects
+++ a/arch/x86/Kconfig
@@ -1995,15 +1995,9 @@ config EFI
 	  platforms.
 
 config EFI_STUB
-<<<<<<< HEAD
-	bool "EFI stub support"
-	depends on EFI && !X86_USE_3DNOW
-	depends on $(cc-option,-mabi=ms) || X86_32
-=======
 	depends on $(cc-option,-mabi=ms) || X86_32
 	bool "EFI stub support"
 	depends on EFI && !X86_USE_3DNOW
->>>>>>> linux-next/akpm-base
 	select RELOCATABLE
 	---help---
 	  This kernel feature allows a bzImage to be loaded directly
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -69,2914 +69,7 @@ void i915_gem_gtt_finish_pages(struct dr
 		}
 	}
 
-<<<<<<< HEAD
-	if (!px_dma(&vm->scratch[0])) /* set to 0 on clones */
-		return;
-
-	for (i = 1; i <= vm->top; i++) {
-		if (!px_dma(&vm->scratch[i]))
-			break;
-		cleanup_page_dma(vm, px_base(&vm->scratch[i]));
-	}
-
-	cleanup_scratch_page(vm);
-}
-
-static struct i915_page_table *alloc_pt(struct i915_address_space *vm)
-{
-	struct i915_page_table *pt;
-
-	pt = kmalloc(sizeof(*pt), I915_GFP_ALLOW_FAIL);
-	if (unlikely(!pt))
-		return ERR_PTR(-ENOMEM);
-
-	if (unlikely(setup_page_dma(vm, &pt->base))) {
-		kfree(pt);
-		return ERR_PTR(-ENOMEM);
-	}
-
-	atomic_set(&pt->used, 0);
-	return pt;
-}
-
-static struct i915_page_directory *__alloc_pd(size_t sz)
-{
-	struct i915_page_directory *pd;
-
-	pd = kzalloc(sz, I915_GFP_ALLOW_FAIL);
-	if (unlikely(!pd))
-		return NULL;
-
-	spin_lock_init(&pd->lock);
-	return pd;
-}
-
-static struct i915_page_directory *alloc_pd(struct i915_address_space *vm)
-{
-	struct i915_page_directory *pd;
-
-	pd = __alloc_pd(sizeof(*pd));
-	if (unlikely(!pd))
-		return ERR_PTR(-ENOMEM);
-
-	if (unlikely(setup_page_dma(vm, px_base(pd)))) {
-		kfree(pd);
-		return ERR_PTR(-ENOMEM);
-	}
-
-	return pd;
-}
-
-static void free_pd(struct i915_address_space *vm, struct i915_page_dma *pd)
-{
-	cleanup_page_dma(vm, pd);
-	kfree(pd);
-}
-
-#define free_px(vm, px) free_pd(vm, px_base(px))
-
-static inline void
-write_dma_entry(struct i915_page_dma * const pdma,
-		const unsigned short idx,
-		const u64 encoded_entry)
-{
-	u64 * const vaddr = kmap_atomic(pdma->page);
-
-	vaddr[idx] = encoded_entry;
-	kunmap_atomic(vaddr);
-}
-
-static inline void
-__set_pd_entry(struct i915_page_directory * const pd,
-	       const unsigned short idx,
-	       struct i915_page_dma * const to,
-	       u64 (*encode)(const dma_addr_t, const enum i915_cache_level))
-{
-	/* Each thread pre-pins the pd, and we may have a thread per pde. */
-	GEM_BUG_ON(atomic_read(px_used(pd)) > 2 * ARRAY_SIZE(pd->entry));
-
-	atomic_inc(px_used(pd));
-	pd->entry[idx] = to;
-	write_dma_entry(px_base(pd), idx, encode(to->daddr, I915_CACHE_LLC));
-}
-
-#define set_pd_entry(pd, idx, to) \
-	__set_pd_entry((pd), (idx), px_base(to), gen8_pde_encode)
-
-static inline void
-clear_pd_entry(struct i915_page_directory * const pd,
-	       const unsigned short idx,
-	       const struct i915_page_scratch * const scratch)
-{
-	GEM_BUG_ON(atomic_read(px_used(pd)) == 0);
-
-	write_dma_entry(px_base(pd), idx, scratch->encode);
-	pd->entry[idx] = NULL;
-	atomic_dec(px_used(pd));
-}
-
-static bool
-release_pd_entry(struct i915_page_directory * const pd,
-		 const unsigned short idx,
-		 struct i915_page_table * const pt,
-		 const struct i915_page_scratch * const scratch)
-{
-	bool free = false;
-
-	if (atomic_add_unless(&pt->used, -1, 1))
-		return false;
-
-	spin_lock(&pd->lock);
-	if (atomic_dec_and_test(&pt->used)) {
-		clear_pd_entry(pd, idx, scratch);
-		free = true;
-	}
-	spin_unlock(&pd->lock);
-
-	return free;
-}
-
-static void gen8_ppgtt_notify_vgt(struct i915_ppgtt *ppgtt, bool create)
-{
-	struct drm_i915_private *dev_priv = ppgtt->vm.i915;
-	enum vgt_g2v_type msg;
-	int i;
-
-	if (create)
-		atomic_inc(px_used(ppgtt->pd)); /* never remove */
-	else
-		atomic_dec(px_used(ppgtt->pd));
-
-	mutex_lock(&dev_priv->vgpu.lock);
-
-	if (i915_vm_is_4lvl(&ppgtt->vm)) {
-		const u64 daddr = px_dma(ppgtt->pd);
-
-		I915_WRITE(vgtif_reg(pdp[0].lo), lower_32_bits(daddr));
-		I915_WRITE(vgtif_reg(pdp[0].hi), upper_32_bits(daddr));
-
-		msg = (create ? VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE :
-				VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY);
-	} else {
-		for (i = 0; i < GEN8_3LVL_PDPES; i++) {
-			const u64 daddr = i915_page_dir_dma_addr(ppgtt, i);
-
-			I915_WRITE(vgtif_reg(pdp[i].lo), lower_32_bits(daddr));
-			I915_WRITE(vgtif_reg(pdp[i].hi), upper_32_bits(daddr));
-		}
-
-		msg = (create ? VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE :
-				VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY);
-	}
-
-	/* g2v_notify atomically (via hv trap) consumes the message packet. */
-	I915_WRITE(vgtif_reg(g2v_notify), msg);
-
-	mutex_unlock(&dev_priv->vgpu.lock);
-}
-
-/* Index shifts into the pagetable are offset by GEN8_PTE_SHIFT [12] */
-#define GEN8_PAGE_SIZE (SZ_4K) /* page and page-directory sizes are the same */
-#define GEN8_PTE_SHIFT (ilog2(GEN8_PAGE_SIZE))
-#define GEN8_PDES (GEN8_PAGE_SIZE / sizeof(u64))
-#define gen8_pd_shift(lvl) ((lvl) * ilog2(GEN8_PDES))
-#define gen8_pd_index(i, lvl) i915_pde_index((i), gen8_pd_shift(lvl))
-#define __gen8_pte_shift(lvl) (GEN8_PTE_SHIFT + gen8_pd_shift(lvl))
-#define __gen8_pte_index(a, lvl) i915_pde_index((a), __gen8_pte_shift(lvl))
-
-static inline unsigned int
-gen8_pd_range(u64 start, u64 end, int lvl, unsigned int *idx)
-{
-	const int shift = gen8_pd_shift(lvl);
-	const u64 mask = ~0ull << gen8_pd_shift(lvl + 1);
-
-	GEM_BUG_ON(start >= end);
-	end += ~mask >> gen8_pd_shift(1);
-
-	*idx = i915_pde_index(start, shift);
-	if ((start ^ end) & mask)
-		return GEN8_PDES - *idx;
-	else
-		return i915_pde_index(end, shift) - *idx;
-}
-
-static inline bool gen8_pd_contains(u64 start, u64 end, int lvl)
-{
-	const u64 mask = ~0ull << gen8_pd_shift(lvl + 1);
-
-	GEM_BUG_ON(start >= end);
-	return (start ^ end) & mask && (start & ~mask) == 0;
-}
-
-static inline unsigned int gen8_pt_count(u64 start, u64 end)
-{
-	GEM_BUG_ON(start >= end);
-	if ((start ^ end) >> gen8_pd_shift(1))
-		return GEN8_PDES - (start & (GEN8_PDES - 1));
-	else
-		return end - start;
-}
-
-static inline unsigned int gen8_pd_top_count(const struct i915_address_space *vm)
-{
-	unsigned int shift = __gen8_pte_shift(vm->top);
-	return (vm->total + (1ull << shift) - 1) >> shift;
-}
-
-static inline struct i915_page_directory *
-gen8_pdp_for_page_index(struct i915_address_space * const vm, const u64 idx)
-{
-	struct i915_ppgtt * const ppgtt = i915_vm_to_ppgtt(vm);
-
-	if (vm->top == 2)
-		return ppgtt->pd;
-	else
-		return i915_pd_entry(ppgtt->pd, gen8_pd_index(idx, vm->top));
-}
-
-static inline struct i915_page_directory *
-gen8_pdp_for_page_address(struct i915_address_space * const vm, const u64 addr)
-{
-	return gen8_pdp_for_page_index(vm, addr >> GEN8_PTE_SHIFT);
-}
-
-static void __gen8_ppgtt_cleanup(struct i915_address_space *vm,
-				 struct i915_page_directory *pd,
-				 int count, int lvl)
-{
-	if (lvl) {
-		void **pde = pd->entry;
-
-		do {
-			if (!*pde)
-				continue;
-
-			__gen8_ppgtt_cleanup(vm, *pde, GEN8_PDES, lvl - 1);
-		} while (pde++, --count);
-	}
-
-	free_px(vm, pd);
-}
-
-static void gen8_ppgtt_cleanup(struct i915_address_space *vm)
-{
-	struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
-
-	if (intel_vgpu_active(vm->i915))
-		gen8_ppgtt_notify_vgt(ppgtt, false);
-
-	__gen8_ppgtt_cleanup(vm, ppgtt->pd, gen8_pd_top_count(vm), vm->top);
-	free_scratch(vm);
-}
-
-static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm,
-			      struct i915_page_directory * const pd,
-			      u64 start, const u64 end, int lvl)
-{
-	const struct i915_page_scratch * const scratch = &vm->scratch[lvl];
-	unsigned int idx, len;
-
-	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);
-
-	len = gen8_pd_range(start, end, lvl--, &idx);
-	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",
-	    __func__, vm, lvl + 1, start, end,
-	    idx, len, atomic_read(px_used(pd)));
-	GEM_BUG_ON(!len || len >= atomic_read(px_used(pd)));
-
-	do {
-		struct i915_page_table *pt = pd->entry[idx];
-
-		if (atomic_fetch_inc(&pt->used) >> gen8_pd_shift(1) &&
-		    gen8_pd_contains(start, end, lvl)) {
-			DBG("%s(%p):{ lvl:%d, idx:%d, start:%llx, end:%llx } removing pd\n",
-			    __func__, vm, lvl + 1, idx, start, end);
-			clear_pd_entry(pd, idx, scratch);
-			__gen8_ppgtt_cleanup(vm, as_pd(pt), I915_PDES, lvl);
-			start += (u64)I915_PDES << gen8_pd_shift(lvl);
-			continue;
-		}
-
-		if (lvl) {
-			start = __gen8_ppgtt_clear(vm, as_pd(pt),
-						   start, end, lvl);
-		} else {
-			unsigned int count;
-			u64 *vaddr;
-
-			count = gen8_pt_count(start, end);
-			DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } removing pte\n",
-			    __func__, vm, lvl, start, end,
-			    gen8_pd_index(start, 0), count,
-			    atomic_read(&pt->used));
-			GEM_BUG_ON(!count || count >= atomic_read(&pt->used));
-
-			vaddr = kmap_atomic_px(pt);
-			memset64(vaddr + gen8_pd_index(start, 0),
-				 vm->scratch[0].encode,
-				 count);
-			kunmap_atomic(vaddr);
-
-			atomic_sub(count, &pt->used);
-			start += count;
-		}
-
-		if (release_pd_entry(pd, idx, pt, scratch))
-			free_px(vm, pt);
-	} while (idx++, --len);
-
-	return start;
-}
-
-static void gen8_ppgtt_clear(struct i915_address_space *vm,
-			     u64 start, u64 length)
-{
-	GEM_BUG_ON(!IS_ALIGNED(start, BIT_ULL(GEN8_PTE_SHIFT)));
-	GEM_BUG_ON(!IS_ALIGNED(length, BIT_ULL(GEN8_PTE_SHIFT)));
-	GEM_BUG_ON(range_overflows(start, length, vm->total));
-
-	start >>= GEN8_PTE_SHIFT;
-	length >>= GEN8_PTE_SHIFT;
-	GEM_BUG_ON(length == 0);
-
-	__gen8_ppgtt_clear(vm, i915_vm_to_ppgtt(vm)->pd,
-			   start, start + length, vm->top);
-}
-
-static int __gen8_ppgtt_alloc(struct i915_address_space * const vm,
-			      struct i915_page_directory * const pd,
-			      u64 * const start, const u64 end, int lvl)
-{
-	const struct i915_page_scratch * const scratch = &vm->scratch[lvl];
-	struct i915_page_table *alloc = NULL;
-	unsigned int idx, len;
-	int ret = 0;
-
-	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);
-
-	len = gen8_pd_range(*start, end, lvl--, &idx);
-	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",
-	    __func__, vm, lvl + 1, *start, end,
-	    idx, len, atomic_read(px_used(pd)));
-	GEM_BUG_ON(!len || (idx + len - 1) >> gen8_pd_shift(1));
-
-	spin_lock(&pd->lock);
-	GEM_BUG_ON(!atomic_read(px_used(pd))); /* Must be pinned! */
-	do {
-		struct i915_page_table *pt = pd->entry[idx];
-
-		if (!pt) {
-			spin_unlock(&pd->lock);
-
-			DBG("%s(%p):{ lvl:%d, idx:%d } allocating new tree\n",
-			    __func__, vm, lvl + 1, idx);
-
-			pt = fetch_and_zero(&alloc);
-			if (lvl) {
-				if (!pt) {
-					pt = &alloc_pd(vm)->pt;
-					if (IS_ERR(pt)) {
-						ret = PTR_ERR(pt);
-						goto out;
-					}
-				}
-
-				fill_px(pt, vm->scratch[lvl].encode);
-			} else {
-				if (!pt) {
-					pt = alloc_pt(vm);
-					if (IS_ERR(pt)) {
-						ret = PTR_ERR(pt);
-						goto out;
-					}
-				}
-
-				if (intel_vgpu_active(vm->i915) ||
-				    gen8_pt_count(*start, end) < I915_PDES)
-					fill_px(pt, vm->scratch[lvl].encode);
-			}
-
-			spin_lock(&pd->lock);
-			if (likely(!pd->entry[idx]))
-				set_pd_entry(pd, idx, pt);
-			else
-				alloc = pt, pt = pd->entry[idx];
-		}
-
-		if (lvl) {
-			atomic_inc(&pt->used);
-			spin_unlock(&pd->lock);
-
-			ret = __gen8_ppgtt_alloc(vm, as_pd(pt),
-						 start, end, lvl);
-			if (unlikely(ret)) {
-				if (release_pd_entry(pd, idx, pt, scratch))
-					free_px(vm, pt);
-				goto out;
-			}
-
-			spin_lock(&pd->lock);
-			atomic_dec(&pt->used);
-			GEM_BUG_ON(!atomic_read(&pt->used));
-		} else {
-			unsigned int count = gen8_pt_count(*start, end);
-
-			DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d } inserting pte\n",
-			    __func__, vm, lvl, *start, end,
-			    gen8_pd_index(*start, 0), count,
-			    atomic_read(&pt->used));
-
-			atomic_add(count, &pt->used);
-			/* All other pdes may be simultaneously removed */
-			GEM_BUG_ON(atomic_read(&pt->used) > 2 * I915_PDES);
-			*start += count;
-		}
-	} while (idx++, --len);
-	spin_unlock(&pd->lock);
-out:
-	if (alloc)
-		free_px(vm, alloc);
-	return ret;
-}
-
-static int gen8_ppgtt_alloc(struct i915_address_space *vm,
-			    u64 start, u64 length)
-{
-	u64 from;
-	int err;
-
-	GEM_BUG_ON(!IS_ALIGNED(start, BIT_ULL(GEN8_PTE_SHIFT)));
-	GEM_BUG_ON(!IS_ALIGNED(length, BIT_ULL(GEN8_PTE_SHIFT)));
-	GEM_BUG_ON(range_overflows(start, length, vm->total));
-
-	start >>= GEN8_PTE_SHIFT;
-	length >>= GEN8_PTE_SHIFT;
-	GEM_BUG_ON(length == 0);
-	from = start;
-
-	err = __gen8_ppgtt_alloc(vm, i915_vm_to_ppgtt(vm)->pd,
-				 &start, start + length, vm->top);
-	if (unlikely(err && from != start))
-		__gen8_ppgtt_clear(vm, i915_vm_to_ppgtt(vm)->pd,
-				   from, start, vm->top);
-
-	return err;
-}
-
-static inline struct sgt_dma {
-	struct scatterlist *sg;
-	dma_addr_t dma, max;
-} sgt_dma(struct i915_vma *vma) {
-	struct scatterlist *sg = vma->pages->sgl;
-	dma_addr_t addr = sg_dma_address(sg);
-	return (struct sgt_dma) { sg, addr, addr + sg->length };
-}
-
-static __always_inline u64
-gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt,
-		      struct i915_page_directory *pdp,
-		      struct sgt_dma *iter,
-		      u64 idx,
-		      enum i915_cache_level cache_level,
-		      u32 flags)
-{
-	struct i915_page_directory *pd;
-	const gen8_pte_t pte_encode = gen8_pte_encode(0, cache_level, flags);
-	gen8_pte_t *vaddr;
-
-	pd = i915_pd_entry(pdp, gen8_pd_index(idx, 2));
-	vaddr = kmap_atomic_px(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
-	do {
-		GEM_BUG_ON(iter->sg->length < I915_GTT_PAGE_SIZE);
-		vaddr[gen8_pd_index(idx, 0)] = pte_encode | iter->dma;
-
-		iter->dma += I915_GTT_PAGE_SIZE;
-		if (iter->dma >= iter->max) {
-			iter->sg = __sg_next(iter->sg);
-			if (!iter->sg) {
-				idx = 0;
-				break;
-			}
-
-			iter->dma = sg_dma_address(iter->sg);
-			iter->max = iter->dma + iter->sg->length;
-		}
-
-		if (gen8_pd_index(++idx, 0) == 0) {
-			if (gen8_pd_index(idx, 1) == 0) {
-				/* Limited by sg length for 3lvl */
-				if (gen8_pd_index(idx, 2) == 0)
-					break;
-
-				pd = pdp->entry[gen8_pd_index(idx, 2)];
-			}
-
-			kunmap_atomic(vaddr);
-			vaddr = kmap_atomic_px(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
-		}
-	} while (1);
-	kunmap_atomic(vaddr);
-
-	return idx;
-}
-
-static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
-				   struct sgt_dma *iter,
-				   enum i915_cache_level cache_level,
-				   u32 flags)
-{
-	const gen8_pte_t pte_encode = gen8_pte_encode(0, cache_level, flags);
-	u64 start = vma->node.start;
-	dma_addr_t rem = iter->sg->length;
-
-	GEM_BUG_ON(!i915_vm_is_4lvl(vma->vm));
-
-	do {
-		struct i915_page_directory * const pdp =
-			gen8_pdp_for_page_address(vma->vm, start);
-		struct i915_page_directory * const pd =
-			i915_pd_entry(pdp, __gen8_pte_index(start, 2));
-		gen8_pte_t encode = pte_encode;
-		unsigned int maybe_64K = -1;
-		unsigned int page_size;
-		gen8_pte_t *vaddr;
-		u16 index;
-
-		if (vma->page_sizes.sg & I915_GTT_PAGE_SIZE_2M &&
-		    IS_ALIGNED(iter->dma, I915_GTT_PAGE_SIZE_2M) &&
-		    rem >= I915_GTT_PAGE_SIZE_2M &&
-		    !__gen8_pte_index(start, 0)) {
-			index = __gen8_pte_index(start, 1);
-			encode |= GEN8_PDE_PS_2M;
-			page_size = I915_GTT_PAGE_SIZE_2M;
-
-			vaddr = kmap_atomic_px(pd);
-		} else {
-			struct i915_page_table *pt =
-				i915_pt_entry(pd, __gen8_pte_index(start, 1));
-
-			index = __gen8_pte_index(start, 0);
-			page_size = I915_GTT_PAGE_SIZE;
-
-			if (!index &&
-			    vma->page_sizes.sg & I915_GTT_PAGE_SIZE_64K &&
-			    IS_ALIGNED(iter->dma, I915_GTT_PAGE_SIZE_64K) &&
-			    (IS_ALIGNED(rem, I915_GTT_PAGE_SIZE_64K) ||
-			     rem >= (I915_PDES - index) * I915_GTT_PAGE_SIZE))
-				maybe_64K = __gen8_pte_index(start, 1);
-
-			vaddr = kmap_atomic_px(pt);
-		}
-
-		do {
-			GEM_BUG_ON(iter->sg->length < page_size);
-			vaddr[index++] = encode | iter->dma;
-
-			start += page_size;
-			iter->dma += page_size;
-			rem -= page_size;
-			if (iter->dma >= iter->max) {
-				iter->sg = __sg_next(iter->sg);
-				if (!iter->sg)
-					break;
-
-				rem = iter->sg->length;
-				iter->dma = sg_dma_address(iter->sg);
-				iter->max = iter->dma + rem;
-
-				if (maybe_64K != -1 && index < I915_PDES &&
-				    !(IS_ALIGNED(iter->dma, I915_GTT_PAGE_SIZE_64K) &&
-				      (IS_ALIGNED(rem, I915_GTT_PAGE_SIZE_64K) ||
-				       rem >= (I915_PDES - index) * I915_GTT_PAGE_SIZE)))
-					maybe_64K = -1;
-
-				if (unlikely(!IS_ALIGNED(iter->dma, page_size)))
-					break;
-			}
-		} while (rem >= page_size && index < I915_PDES);
-
-		kunmap_atomic(vaddr);
-
-		/*
-		 * Is it safe to mark the 2M block as 64K? -- Either we have
-		 * filled whole page-table with 64K entries, or filled part of
-		 * it and have reached the end of the sg table and we have
-		 * enough padding.
-		 */
-		if (maybe_64K != -1 &&
-		    (index == I915_PDES ||
-		     (i915_vm_has_scratch_64K(vma->vm) &&
-		      !iter->sg && IS_ALIGNED(vma->node.start +
-					      vma->node.size,
-					      I915_GTT_PAGE_SIZE_2M)))) {
-			vaddr = kmap_atomic_px(pd);
-			vaddr[maybe_64K] |= GEN8_PDE_IPS_64K;
-			kunmap_atomic(vaddr);
-			page_size = I915_GTT_PAGE_SIZE_64K;
-
-			/*
-			 * We write all 4K page entries, even when using 64K
-			 * pages. In order to verify that the HW isn't cheating
-			 * by using the 4K PTE instead of the 64K PTE, we want
-			 * to remove all the surplus entries. If the HW skipped
-			 * the 64K PTE, it will read/write into the scratch page
-			 * instead - which we detect as missing results during
-			 * selftests.
-			 */
-			if (I915_SELFTEST_ONLY(vma->vm->scrub_64K)) {
-				u16 i;
-
-				encode = vma->vm->scratch[0].encode;
-				vaddr = kmap_atomic_px(i915_pt_entry(pd, maybe_64K));
-
-				for (i = 1; i < index; i += 16)
-					memset64(vaddr + i, encode, 15);
-
-				kunmap_atomic(vaddr);
-			}
-		}
-
-		vma->page_sizes.gtt |= page_size;
-	} while (iter->sg);
-}
-
-static void gen8_ppgtt_insert(struct i915_address_space *vm,
-			      struct i915_vma *vma,
-			      enum i915_cache_level cache_level,
-			      u32 flags)
-{
-	struct i915_ppgtt * const ppgtt = i915_vm_to_ppgtt(vm);
-	struct sgt_dma iter = sgt_dma(vma);
-
-	if (vma->page_sizes.sg > I915_GTT_PAGE_SIZE) {
-		gen8_ppgtt_insert_huge(vma, &iter, cache_level, flags);
-	} else  {
-		u64 idx = vma->node.start >> GEN8_PTE_SHIFT;
-
-		do {
-			struct i915_page_directory * const pdp =
-				gen8_pdp_for_page_index(vm, idx);
-
-			idx = gen8_ppgtt_insert_pte(ppgtt, pdp, &iter, idx,
-						    cache_level, flags);
-		} while (idx);
-
-		vma->page_sizes.gtt = I915_GTT_PAGE_SIZE;
-	}
-}
-
-static int gen8_init_scratch(struct i915_address_space *vm)
-{
-	int ret;
-	int i;
-
-	/*
-	 * If everybody agrees to not to write into the scratch page,
-	 * we can reuse it for all vm, keeping contexts and processes separate.
-	 */
-	if (vm->has_read_only &&
-	    vm->i915->kernel_context &&
-	    vm->i915->kernel_context->vm) {
-		struct i915_address_space *clone =
-			rcu_dereference_protected(vm->i915->kernel_context->vm,
-						  true); /* static */
-
-		GEM_BUG_ON(!clone->has_read_only);
-
-		vm->scratch_order = clone->scratch_order;
-		memcpy(vm->scratch, clone->scratch, sizeof(vm->scratch));
-		px_dma(&vm->scratch[0]) = 0; /* no xfer of ownership */
-		return 0;
-	}
-
-	ret = setup_scratch_page(vm, __GFP_HIGHMEM);
-	if (ret)
-		return ret;
-
-	vm->scratch[0].encode =
-		gen8_pte_encode(px_dma(&vm->scratch[0]),
-				I915_CACHE_LLC, vm->has_read_only);
-
-	for (i = 1; i <= vm->top; i++) {
-		if (unlikely(setup_page_dma(vm, px_base(&vm->scratch[i]))))
-			goto free_scratch;
-
-		fill_px(&vm->scratch[i], vm->scratch[i - 1].encode);
-		vm->scratch[i].encode =
-			gen8_pde_encode(px_dma(&vm->scratch[i]),
-					I915_CACHE_LLC);
-	}
-
-	return 0;
-
-free_scratch:
-	free_scratch(vm);
-	return -ENOMEM;
-}
-
-static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)
-{
-	struct i915_address_space *vm = &ppgtt->vm;
-	struct i915_page_directory *pd = ppgtt->pd;
-	unsigned int idx;
-
-	GEM_BUG_ON(vm->top != 2);
-	GEM_BUG_ON(gen8_pd_top_count(vm) != GEN8_3LVL_PDPES);
-
-	for (idx = 0; idx < GEN8_3LVL_PDPES; idx++) {
-		struct i915_page_directory *pde;
-
-		pde = alloc_pd(vm);
-		if (IS_ERR(pde))
-			return PTR_ERR(pde);
-
-		fill_px(pde, vm->scratch[1].encode);
-		set_pd_entry(pd, idx, pde);
-		atomic_inc(px_used(pde)); /* keep pinned */
-	}
-	wmb();
-
-	return 0;
-}
-
-static void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt)
-{
-	struct drm_i915_private *i915 = gt->i915;
-
-	ppgtt->vm.gt = gt;
-	ppgtt->vm.i915 = i915;
-	ppgtt->vm.dma = &i915->drm.pdev->dev;
-	ppgtt->vm.total = BIT_ULL(INTEL_INFO(i915)->ppgtt_size);
-
-	i915_address_space_init(&ppgtt->vm, VM_CLASS_PPGTT);
-
-	ppgtt->vm.vma_ops.bind_vma    = ppgtt_bind_vma;
-	ppgtt->vm.vma_ops.unbind_vma  = ppgtt_unbind_vma;
-	ppgtt->vm.vma_ops.set_pages   = ppgtt_set_pages;
-	ppgtt->vm.vma_ops.clear_pages = clear_pages;
-}
-
-static struct i915_page_directory *
-gen8_alloc_top_pd(struct i915_address_space *vm)
-{
-	const unsigned int count = gen8_pd_top_count(vm);
-	struct i915_page_directory *pd;
-
-	GEM_BUG_ON(count > ARRAY_SIZE(pd->entry));
-
-	pd = __alloc_pd(offsetof(typeof(*pd), entry[count]));
-	if (unlikely(!pd))
-		return ERR_PTR(-ENOMEM);
-
-	if (unlikely(setup_page_dma(vm, px_base(pd)))) {
-		kfree(pd);
-		return ERR_PTR(-ENOMEM);
-	}
-
-	fill_page_dma(px_base(pd), vm->scratch[vm->top].encode, count);
-	atomic_inc(px_used(pd)); /* mark as pinned */
-	return pd;
-}
-
-/*
- * GEN8 legacy ppgtt programming is accomplished through a max 4 PDP registers
- * with a net effect resembling a 2-level page table in normal x86 terms. Each
- * PDP represents 1GB of memory 4 * 512 * 512 * 4096 = 4GB legacy 32b address
- * space.
- *
- */
-static struct i915_ppgtt *gen8_ppgtt_create(struct drm_i915_private *i915)
-{
-	struct i915_ppgtt *ppgtt;
-	int err;
-
-	ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
-	if (!ppgtt)
-		return ERR_PTR(-ENOMEM);
-
-	ppgtt_init(ppgtt, &i915->gt);
-	ppgtt->vm.top = i915_vm_is_4lvl(&ppgtt->vm) ? 3 : 2;
-
-	/*
-	 * From bdw, there is hw support for read-only pages in the PPGTT.
-	 *
-	 * Gen11 has HSDES#:1807136187 unresolved. Disable ro support
-	 * for now.
-	 *
-	 * Gen12 has inherited the same read-only fault issue from gen11.
-	 */
-	ppgtt->vm.has_read_only = !IS_GEN_RANGE(i915, 11, 12);
-
-	/* There are only few exceptions for gen >=6. chv and bxt.
-	 * And we are not sure about the latter so play safe for now.
-	 */
-	if (IS_CHERRYVIEW(i915) || IS_BROXTON(i915))
-		ppgtt->vm.pt_kmap_wc = true;
-
-	err = gen8_init_scratch(&ppgtt->vm);
-	if (err)
-		goto err_free;
-
-	ppgtt->pd = gen8_alloc_top_pd(&ppgtt->vm);
-	if (IS_ERR(ppgtt->pd)) {
-		err = PTR_ERR(ppgtt->pd);
-		goto err_free_scratch;
-	}
-
-	if (!i915_vm_is_4lvl(&ppgtt->vm)) {
-		err = gen8_preallocate_top_level_pdp(ppgtt);
-		if (err)
-			goto err_free_pd;
-	}
-
-	ppgtt->vm.bind_async_flags = I915_VMA_LOCAL_BIND;
-	ppgtt->vm.insert_entries = gen8_ppgtt_insert;
-	ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc;
-	ppgtt->vm.clear_range = gen8_ppgtt_clear;
-
-	if (intel_vgpu_active(i915))
-		gen8_ppgtt_notify_vgt(ppgtt, true);
-
-	ppgtt->vm.cleanup = gen8_ppgtt_cleanup;
-
-	return ppgtt;
-
-err_free_pd:
-	__gen8_ppgtt_cleanup(&ppgtt->vm, ppgtt->pd,
-			     gen8_pd_top_count(&ppgtt->vm), ppgtt->vm.top);
-err_free_scratch:
-	free_scratch(&ppgtt->vm);
-err_free:
-	kfree(ppgtt);
-	return ERR_PTR(err);
-}
-
-/* Write pde (index) from the page directory @pd to the page table @pt */
-static inline void gen6_write_pde(const struct gen6_ppgtt *ppgtt,
-				  const unsigned int pde,
-				  const struct i915_page_table *pt)
-{
-	/* Caller needs to make sure the write completes if necessary */
-	iowrite32(GEN6_PDE_ADDR_ENCODE(px_dma(pt)) | GEN6_PDE_VALID,
-		  ppgtt->pd_addr + pde);
-}
-
-static void gen7_ppgtt_enable(struct intel_gt *gt)
-{
-	struct drm_i915_private *i915 = gt->i915;
-	struct intel_uncore *uncore = gt->uncore;
-	struct intel_engine_cs *engine;
-	enum intel_engine_id id;
-	u32 ecochk;
-
-	intel_uncore_rmw(uncore, GAC_ECO_BITS, 0, ECOBITS_PPGTT_CACHE64B);
-
-	ecochk = intel_uncore_read(uncore, GAM_ECOCHK);
-	if (IS_HASWELL(i915)) {
-		ecochk |= ECOCHK_PPGTT_WB_HSW;
-	} else {
-		ecochk |= ECOCHK_PPGTT_LLC_IVB;
-		ecochk &= ~ECOCHK_PPGTT_GFDT_IVB;
-	}
-	intel_uncore_write(uncore, GAM_ECOCHK, ecochk);
-
-	for_each_engine(engine, gt, id) {
-		/* GFX_MODE is per-ring on gen7+ */
-		ENGINE_WRITE(engine,
-			     RING_MODE_GEN7,
-			     _MASKED_BIT_ENABLE(GFX_PPGTT_ENABLE));
-	}
-}
-
-static void gen6_ppgtt_enable(struct intel_gt *gt)
-{
-	struct intel_uncore *uncore = gt->uncore;
-
-	intel_uncore_rmw(uncore,
-			 GAC_ECO_BITS,
-			 0,
-			 ECOBITS_SNB_BIT | ECOBITS_PPGTT_CACHE64B);
-
-	intel_uncore_rmw(uncore,
-			 GAB_CTL,
-			 0,
-			 GAB_CTL_CONT_AFTER_PAGEFAULT);
-
-	intel_uncore_rmw(uncore,
-			 GAM_ECOCHK,
-			 0,
-			 ECOCHK_SNB_BIT | ECOCHK_PPGTT_CACHE64B);
-
-	if (HAS_PPGTT(uncore->i915)) /* may be disabled for VT-d */
-		intel_uncore_write(uncore,
-				   GFX_MODE,
-				   _MASKED_BIT_ENABLE(GFX_PPGTT_ENABLE));
-}
-
-/* PPGTT support for Sandybdrige/Gen6 and later */
-static void gen6_ppgtt_clear_range(struct i915_address_space *vm,
-				   u64 start, u64 length)
-{
-	struct gen6_ppgtt * const ppgtt = to_gen6_ppgtt(i915_vm_to_ppgtt(vm));
-	const unsigned int first_entry = start / I915_GTT_PAGE_SIZE;
-	const gen6_pte_t scratch_pte = vm->scratch[0].encode;
-	unsigned int pde = first_entry / GEN6_PTES;
-	unsigned int pte = first_entry % GEN6_PTES;
-	unsigned int num_entries = length / I915_GTT_PAGE_SIZE;
-
-	while (num_entries) {
-		struct i915_page_table * const pt =
-			i915_pt_entry(ppgtt->base.pd, pde++);
-		const unsigned int count = min(num_entries, GEN6_PTES - pte);
-		gen6_pte_t *vaddr;
-
-		GEM_BUG_ON(px_base(pt) == px_base(&vm->scratch[1]));
-
-		num_entries -= count;
-
-		GEM_BUG_ON(count > atomic_read(&pt->used));
-		if (!atomic_sub_return(count, &pt->used))
-			ppgtt->scan_for_unused_pt = true;
-
-		/*
-		 * Note that the hw doesn't support removing PDE on the fly
-		 * (they are cached inside the context with no means to
-		 * invalidate the cache), so we can only reset the PTE
-		 * entries back to scratch.
-		 */
-
-		vaddr = kmap_atomic_px(pt);
-		memset32(vaddr + pte, scratch_pte, count);
-		kunmap_atomic(vaddr);
-
-		pte = 0;
-	}
-}
-
-static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
-				      struct i915_vma *vma,
-				      enum i915_cache_level cache_level,
-				      u32 flags)
-{
-	struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
-	struct i915_page_directory * const pd = ppgtt->pd;
-	unsigned first_entry = vma->node.start / I915_GTT_PAGE_SIZE;
-	unsigned act_pt = first_entry / GEN6_PTES;
-	unsigned act_pte = first_entry % GEN6_PTES;
-	const u32 pte_encode = vm->pte_encode(0, cache_level, flags);
-	struct sgt_dma iter = sgt_dma(vma);
-	gen6_pte_t *vaddr;
-
-	GEM_BUG_ON(pd->entry[act_pt] == &vm->scratch[1]);
-
-	vaddr = kmap_atomic_px(i915_pt_entry(pd, act_pt));
-	do {
-		GEM_BUG_ON(iter.sg->length < I915_GTT_PAGE_SIZE);
-		vaddr[act_pte] = pte_encode | GEN6_PTE_ADDR_ENCODE(iter.dma);
-
-		iter.dma += I915_GTT_PAGE_SIZE;
-		if (iter.dma == iter.max) {
-			iter.sg = __sg_next(iter.sg);
-			if (!iter.sg)
-				break;
-
-			iter.dma = sg_dma_address(iter.sg);
-			iter.max = iter.dma + iter.sg->length;
-		}
-
-		if (++act_pte == GEN6_PTES) {
-			kunmap_atomic(vaddr);
-			vaddr = kmap_atomic_px(i915_pt_entry(pd, ++act_pt));
-			act_pte = 0;
-		}
-	} while (1);
-	kunmap_atomic(vaddr);
-
-	vma->page_sizes.gtt = I915_GTT_PAGE_SIZE;
-}
-
-static int gen6_alloc_va_range(struct i915_address_space *vm,
-			       u64 start, u64 length)
-{
-	struct gen6_ppgtt *ppgtt = to_gen6_ppgtt(i915_vm_to_ppgtt(vm));
-	struct i915_page_directory * const pd = ppgtt->base.pd;
-	struct i915_page_table *pt, *alloc = NULL;
-	intel_wakeref_t wakeref;
-	u64 from = start;
-	unsigned int pde;
-	bool flush = false;
-	int ret = 0;
-
-	wakeref = intel_runtime_pm_get(&vm->i915->runtime_pm);
-
-	spin_lock(&pd->lock);
-	gen6_for_each_pde(pt, pd, start, length, pde) {
-		const unsigned int count = gen6_pte_count(start, length);
-
-		if (px_base(pt) == px_base(&vm->scratch[1])) {
-			spin_unlock(&pd->lock);
-
-			pt = fetch_and_zero(&alloc);
-			if (!pt)
-				pt = alloc_pt(vm);
-			if (IS_ERR(pt)) {
-				ret = PTR_ERR(pt);
-				goto unwind_out;
-			}
-
-			fill32_px(pt, vm->scratch[0].encode);
-
-			spin_lock(&pd->lock);
-			if (pd->entry[pde] == &vm->scratch[1]) {
-				pd->entry[pde] = pt;
-				if (i915_vma_is_bound(ppgtt->vma,
-						      I915_VMA_GLOBAL_BIND)) {
-					gen6_write_pde(ppgtt, pde, pt);
-					flush = true;
-				}
-			} else {
-				alloc = pt;
-				pt = pd->entry[pde];
-			}
-		}
-
-		atomic_add(count, &pt->used);
-	}
-	spin_unlock(&pd->lock);
-
-	if (flush)
-		gen6_ggtt_invalidate(vm->gt->ggtt);
-
-	goto out;
-
-unwind_out:
-	gen6_ppgtt_clear_range(vm, from, start - from);
-out:
-	if (alloc)
-		free_px(vm, alloc);
-	intel_runtime_pm_put(&vm->i915->runtime_pm, wakeref);
-	return ret;
-}
-
-static int gen6_ppgtt_init_scratch(struct gen6_ppgtt *ppgtt)
-{
-	struct i915_address_space * const vm = &ppgtt->base.vm;
-	struct i915_page_directory * const pd = ppgtt->base.pd;
-	int ret;
-
-	ret = setup_scratch_page(vm, __GFP_HIGHMEM);
-	if (ret)
-		return ret;
-
-	vm->scratch[0].encode =
-		vm->pte_encode(px_dma(&vm->scratch[0]),
-			       I915_CACHE_NONE, PTE_READ_ONLY);
-
-	if (unlikely(setup_page_dma(vm, px_base(&vm->scratch[1])))) {
-		cleanup_scratch_page(vm);
-		return -ENOMEM;
-	}
-
-	fill32_px(&vm->scratch[1], vm->scratch[0].encode);
-	memset_p(pd->entry, &vm->scratch[1], I915_PDES);
-
-	return 0;
-}
-
-static void gen6_ppgtt_free_pd(struct gen6_ppgtt *ppgtt)
-{
-	struct i915_page_directory * const pd = ppgtt->base.pd;
-	struct i915_page_dma * const scratch =
-		px_base(&ppgtt->base.vm.scratch[1]);
-	struct i915_page_table *pt;
-	u32 pde;
-
-	gen6_for_all_pdes(pt, pd, pde)
-		if (px_base(pt) != scratch)
-			free_px(&ppgtt->base.vm, pt);
-}
-
-static void gen6_ppgtt_cleanup(struct i915_address_space *vm)
-{
-	struct gen6_ppgtt *ppgtt = to_gen6_ppgtt(i915_vm_to_ppgtt(vm));
-
-	i915_vma_destroy(ppgtt->vma);
-
-	gen6_ppgtt_free_pd(ppgtt);
-	free_scratch(vm);
-
-	mutex_destroy(&ppgtt->pin_mutex);
-	kfree(ppgtt->base.pd);
-}
-
-static int pd_vma_set_pages(struct i915_vma *vma)
-{
-	vma->pages = ERR_PTR(-ENODEV);
-	return 0;
-}
-
-static void pd_vma_clear_pages(struct i915_vma *vma)
-{
-	GEM_BUG_ON(!vma->pages);
-
-	vma->pages = NULL;
-}
-
-static int pd_vma_bind(struct i915_vma *vma,
-		       enum i915_cache_level cache_level,
-		       u32 unused)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vma->vm);
-	struct gen6_ppgtt *ppgtt = vma->private;
-	u32 ggtt_offset = i915_ggtt_offset(vma) / I915_GTT_PAGE_SIZE;
-	struct i915_page_table *pt;
-	unsigned int pde;
-
-	px_base(ppgtt->base.pd)->ggtt_offset = ggtt_offset * sizeof(gen6_pte_t);
-	ppgtt->pd_addr = (gen6_pte_t __iomem *)ggtt->gsm + ggtt_offset;
-
-	gen6_for_all_pdes(pt, ppgtt->base.pd, pde)
-		gen6_write_pde(ppgtt, pde, pt);
-
-	gen6_ggtt_invalidate(ggtt);
-
-	return 0;
-}
-
-static void pd_vma_unbind(struct i915_vma *vma)
-{
-	struct gen6_ppgtt *ppgtt = vma->private;
-	struct i915_page_directory * const pd = ppgtt->base.pd;
-	struct i915_page_dma * const scratch =
-		px_base(&ppgtt->base.vm.scratch[1]);
-	struct i915_page_table *pt;
-	unsigned int pde;
-
-	if (!ppgtt->scan_for_unused_pt)
-		return;
-
-	/* Free all no longer used page tables */
-	gen6_for_all_pdes(pt, ppgtt->base.pd, pde) {
-		if (px_base(pt) == scratch || atomic_read(&pt->used))
-			continue;
-
-		free_px(&ppgtt->base.vm, pt);
-		pd->entry[pde] = scratch;
-	}
-
-	ppgtt->scan_for_unused_pt = false;
-}
-
-static const struct i915_vma_ops pd_vma_ops = {
-	.set_pages = pd_vma_set_pages,
-	.clear_pages = pd_vma_clear_pages,
-	.bind_vma = pd_vma_bind,
-	.unbind_vma = pd_vma_unbind,
-};
-
-static struct i915_vma *pd_vma_create(struct gen6_ppgtt *ppgtt, int size)
-{
-	struct i915_ggtt *ggtt = ppgtt->base.vm.gt->ggtt;
-	struct i915_vma *vma;
-
-	GEM_BUG_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE));
-	GEM_BUG_ON(size > ggtt->vm.total);
-
-	vma = i915_vma_alloc();
-	if (!vma)
-		return ERR_PTR(-ENOMEM);
-
-	i915_active_init(&vma->active, NULL, NULL);
-
-	mutex_init(&vma->pages_mutex);
-	vma->vm = i915_vm_get(&ggtt->vm);
-	vma->ops = &pd_vma_ops;
-	vma->private = ppgtt;
-
-	vma->size = size;
-	vma->fence_size = size;
-	atomic_set(&vma->flags, I915_VMA_GGTT);
-	vma->ggtt_view.type = I915_GGTT_VIEW_ROTATED; /* prevent fencing */
-
-	INIT_LIST_HEAD(&vma->obj_link);
-	INIT_LIST_HEAD(&vma->closed_link);
-
-	return vma;
-}
-
-int gen6_ppgtt_pin(struct i915_ppgtt *base)
-{
-	struct gen6_ppgtt *ppgtt = to_gen6_ppgtt(base);
-	int err = 0;
-
-	GEM_BUG_ON(!atomic_read(&ppgtt->base.vm.open));
-
-	/*
-	 * Workaround the limited maximum vma->pin_count and the aliasing_ppgtt
-	 * which will be pinned into every active context.
-	 * (When vma->pin_count becomes atomic, I expect we will naturally
-	 * need a larger, unpacked, type and kill this redundancy.)
-	 */
-	if (atomic_add_unless(&ppgtt->pin_count, 1, 0))
-		return 0;
-
-	if (mutex_lock_interruptible(&ppgtt->pin_mutex))
-		return -EINTR;
-
-	/*
-	 * PPGTT PDEs reside in the GGTT and consists of 512 entries. The
-	 * allocator works in address space sizes, so it's multiplied by page
-	 * size. We allocate at the top of the GTT to avoid fragmentation.
-	 */
-	if (!atomic_read(&ppgtt->pin_count)) {
-		err = i915_vma_pin(ppgtt->vma,
-				   0, GEN6_PD_ALIGN,
-				   PIN_GLOBAL | PIN_HIGH);
-	}
-	if (!err)
-		atomic_inc(&ppgtt->pin_count);
-	mutex_unlock(&ppgtt->pin_mutex);
-
-	return err;
-}
-
-void gen6_ppgtt_unpin(struct i915_ppgtt *base)
-{
-	struct gen6_ppgtt *ppgtt = to_gen6_ppgtt(base);
-
-	GEM_BUG_ON(!atomic_read(&ppgtt->pin_count));
-	if (atomic_dec_and_test(&ppgtt->pin_count))
-		i915_vma_unpin(ppgtt->vma);
-}
-
-void gen6_ppgtt_unpin_all(struct i915_ppgtt *base)
-{
-	struct gen6_ppgtt *ppgtt = to_gen6_ppgtt(base);
-
-	if (!atomic_read(&ppgtt->pin_count))
-		return;
-
-	i915_vma_unpin(ppgtt->vma);
-	atomic_set(&ppgtt->pin_count, 0);
-}
-
-static struct i915_ppgtt *gen6_ppgtt_create(struct drm_i915_private *i915)
-{
-	struct i915_ggtt * const ggtt = &i915->ggtt;
-	struct gen6_ppgtt *ppgtt;
-	int err;
-
-	ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
-	if (!ppgtt)
-		return ERR_PTR(-ENOMEM);
-
-	mutex_init(&ppgtt->pin_mutex);
-
-	ppgtt_init(&ppgtt->base, &i915->gt);
-	ppgtt->base.vm.top = 1;
-
-	ppgtt->base.vm.bind_async_flags = I915_VMA_LOCAL_BIND;
-	ppgtt->base.vm.allocate_va_range = gen6_alloc_va_range;
-	ppgtt->base.vm.clear_range = gen6_ppgtt_clear_range;
-	ppgtt->base.vm.insert_entries = gen6_ppgtt_insert_entries;
-	ppgtt->base.vm.cleanup = gen6_ppgtt_cleanup;
-
-	ppgtt->base.vm.pte_encode = ggtt->vm.pte_encode;
-
-	ppgtt->base.pd = __alloc_pd(sizeof(*ppgtt->base.pd));
-	if (!ppgtt->base.pd) {
-		err = -ENOMEM;
-		goto err_free;
-	}
-
-	err = gen6_ppgtt_init_scratch(ppgtt);
-	if (err)
-		goto err_pd;
-
-	ppgtt->vma = pd_vma_create(ppgtt, GEN6_PD_SIZE);
-	if (IS_ERR(ppgtt->vma)) {
-		err = PTR_ERR(ppgtt->vma);
-		goto err_scratch;
-	}
-
-	return &ppgtt->base;
-
-err_scratch:
-	free_scratch(&ppgtt->base.vm);
-err_pd:
-	kfree(ppgtt->base.pd);
-err_free:
-	kfree(ppgtt);
-	return ERR_PTR(err);
-}
-
-static void gtt_write_workarounds(struct intel_gt *gt)
-{
-	struct drm_i915_private *i915 = gt->i915;
-	struct intel_uncore *uncore = gt->uncore;
-
-	/* This function is for gtt related workarounds. This function is
-	 * called on driver load and after a GPU reset, so you can place
-	 * workarounds here even if they get overwritten by GPU reset.
-	 */
-	/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt,kbl,glk,cfl,cnl,icl */
-	if (IS_BROADWELL(i915))
-		intel_uncore_write(uncore,
-				   GEN8_L3_LRA_1_GPGPU,
-				   GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW);
-	else if (IS_CHERRYVIEW(i915))
-		intel_uncore_write(uncore,
-				   GEN8_L3_LRA_1_GPGPU,
-				   GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV);
-	else if (IS_GEN9_LP(i915))
-		intel_uncore_write(uncore,
-				   GEN8_L3_LRA_1_GPGPU,
-				   GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);
-	else if (INTEL_GEN(i915) >= 9 && INTEL_GEN(i915) <= 11)
-		intel_uncore_write(uncore,
-				   GEN8_L3_LRA_1_GPGPU,
-				   GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL);
-
-	/*
-	 * To support 64K PTEs we need to first enable the use of the
-	 * Intermediate-Page-Size(IPS) bit of the PDE field via some magical
-	 * mmio, otherwise the page-walker will simply ignore the IPS bit. This
-	 * shouldn't be needed after GEN10.
-	 *
-	 * 64K pages were first introduced from BDW+, although technically they
-	 * only *work* from gen9+. For pre-BDW we instead have the option for
-	 * 32K pages, but we don't currently have any support for it in our
-	 * driver.
-	 */
-	if (HAS_PAGE_SIZES(i915, I915_GTT_PAGE_SIZE_64K) &&
-	    INTEL_GEN(i915) <= 10)
-		intel_uncore_rmw(uncore,
-				 GEN8_GAMW_ECO_DEV_RW_IA,
-				 0,
-				 GAMW_ECO_ENABLE_64K_IPS_FIELD);
-
-	if (IS_GEN_RANGE(i915, 8, 11)) {
-		bool can_use_gtt_cache = true;
-
-		/*
-		 * According to the BSpec if we use 2M/1G pages then we also
-		 * need to disable the GTT cache. At least on BDW we can see
-		 * visual corruption when using 2M pages, and not disabling the
-		 * GTT cache.
-		 */
-		if (HAS_PAGE_SIZES(i915, I915_GTT_PAGE_SIZE_2M))
-			can_use_gtt_cache = false;
-
-		/* WaGttCachingOffByDefault */
-		intel_uncore_write(uncore,
-				   HSW_GTT_CACHE_EN,
-				   can_use_gtt_cache ? GTT_CACHE_EN_ALL : 0);
-		WARN_ON_ONCE(can_use_gtt_cache &&
-			     intel_uncore_read(uncore,
-					       HSW_GTT_CACHE_EN) == 0);
-	}
-}
-
-int i915_ppgtt_init_hw(struct intel_gt *gt)
-{
-	struct drm_i915_private *i915 = gt->i915;
-
-	gtt_write_workarounds(gt);
-
-	if (IS_GEN(i915, 6))
-		gen6_ppgtt_enable(gt);
-	else if (IS_GEN(i915, 7))
-		gen7_ppgtt_enable(gt);
-
-	return 0;
-}
-
-static struct i915_ppgtt *
-__ppgtt_create(struct drm_i915_private *i915)
-{
-	if (INTEL_GEN(i915) < 8)
-		return gen6_ppgtt_create(i915);
-	else
-		return gen8_ppgtt_create(i915);
-}
-
-struct i915_ppgtt *
-i915_ppgtt_create(struct drm_i915_private *i915)
-{
-	struct i915_ppgtt *ppgtt;
-
-	ppgtt = __ppgtt_create(i915);
-	if (IS_ERR(ppgtt))
-		return ppgtt;
-
-	trace_i915_ppgtt_create(&ppgtt->vm);
-
-	return ppgtt;
-}
-
-/* Certain Gen5 chipsets require require idling the GPU before
- * unmapping anything from the GTT when VT-d is enabled.
- */
-static bool needs_idle_maps(struct drm_i915_private *dev_priv)
-{
-	/* Query intel_iommu to see if we need the workaround. Presumably that
-	 * was loaded first.
-	 */
-	return IS_GEN(dev_priv, 5) && IS_MOBILE(dev_priv) && intel_vtd_active();
-}
-
-static void ggtt_suspend_mappings(struct i915_ggtt *ggtt)
-{
-	struct drm_i915_private *i915 = ggtt->vm.i915;
-
-	/* Don't bother messing with faults pre GEN6 as we have little
-	 * documentation supporting that it's a good idea.
-	 */
-	if (INTEL_GEN(i915) < 6)
-		return;
-
-	intel_gt_check_and_clear_faults(ggtt->vm.gt);
-
-	ggtt->vm.clear_range(&ggtt->vm, 0, ggtt->vm.total);
-
-	ggtt->invalidate(ggtt);
-}
-
-void i915_gem_suspend_gtt_mappings(struct drm_i915_private *i915)
-{
-	ggtt_suspend_mappings(&i915->ggtt);
-}
-
-int i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
-			       struct sg_table *pages)
-{
-	do {
-		if (dma_map_sg_attrs(&obj->base.dev->pdev->dev,
-				     pages->sgl, pages->nents,
-				     PCI_DMA_BIDIRECTIONAL,
-				     DMA_ATTR_NO_WARN))
-			return 0;
-
-		/*
-		 * If the DMA remap fails, one cause can be that we have
-		 * too many objects pinned in a small remapping table,
-		 * such as swiotlb. Incrementally purge all other objects and
-		 * try again - if there are no more pages to remove from
-		 * the DMA remapper, i915_gem_shrink will return 0.
-		 */
-		GEM_BUG_ON(obj->mm.pages == pages);
-	} while (i915_gem_shrink(to_i915(obj->base.dev),
-				 obj->base.size >> PAGE_SHIFT, NULL,
-				 I915_SHRINK_BOUND |
-				 I915_SHRINK_UNBOUND));
-
-	return -ENOSPC;
-}
-
-static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)
-{
-	writeq(pte, addr);
-}
-
-static void gen8_ggtt_insert_page(struct i915_address_space *vm,
-				  dma_addr_t addr,
-				  u64 offset,
-				  enum i915_cache_level level,
-				  u32 unused)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	gen8_pte_t __iomem *pte =
-		(gen8_pte_t __iomem *)ggtt->gsm + offset / I915_GTT_PAGE_SIZE;
-
-	gen8_set_pte(pte, gen8_pte_encode(addr, level, 0));
-
-	ggtt->invalidate(ggtt);
-}
-
-static void gen8_ggtt_insert_entries(struct i915_address_space *vm,
-				     struct i915_vma *vma,
-				     enum i915_cache_level level,
-				     u32 flags)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	struct sgt_iter sgt_iter;
-	gen8_pte_t __iomem *gtt_entries;
-	const gen8_pte_t pte_encode = gen8_pte_encode(0, level, 0);
-	dma_addr_t addr;
-
-	/*
-	 * Note that we ignore PTE_READ_ONLY here. The caller must be careful
-	 * not to allow the user to override access to a read only page.
-	 */
-
-	gtt_entries = (gen8_pte_t __iomem *)ggtt->gsm;
-	gtt_entries += vma->node.start / I915_GTT_PAGE_SIZE;
-	for_each_sgt_daddr(addr, sgt_iter, vma->pages)
-		gen8_set_pte(gtt_entries++, pte_encode | addr);
-
-	/*
-	 * We want to flush the TLBs only after we're certain all the PTE
-	 * updates have finished.
-	 */
-	ggtt->invalidate(ggtt);
-}
-
-static void gen6_ggtt_insert_page(struct i915_address_space *vm,
-				  dma_addr_t addr,
-				  u64 offset,
-				  enum i915_cache_level level,
-				  u32 flags)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	gen6_pte_t __iomem *pte =
-		(gen6_pte_t __iomem *)ggtt->gsm + offset / I915_GTT_PAGE_SIZE;
-
-	iowrite32(vm->pte_encode(addr, level, flags), pte);
-
-	ggtt->invalidate(ggtt);
-}
-
-/*
- * Binds an object into the global gtt with the specified cache level. The object
- * will be accessible to the GPU via commands whose operands reference offsets
- * within the global GTT as well as accessible by the GPU through the GMADR
- * mapped BAR (dev_priv->mm.gtt->gtt).
- */
-static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
-				     struct i915_vma *vma,
-				     enum i915_cache_level level,
-				     u32 flags)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	gen6_pte_t __iomem *entries = (gen6_pte_t __iomem *)ggtt->gsm;
-	unsigned int i = vma->node.start / I915_GTT_PAGE_SIZE;
-	struct sgt_iter iter;
-	dma_addr_t addr;
-	for_each_sgt_daddr(addr, iter, vma->pages)
-		iowrite32(vm->pte_encode(addr, level, flags), &entries[i++]);
-
-	/*
-	 * We want to flush the TLBs only after we're certain all the PTE
-	 * updates have finished.
-	 */
-	ggtt->invalidate(ggtt);
-}
-
-static void nop_clear_range(struct i915_address_space *vm,
-			    u64 start, u64 length)
-{
-}
-
-static void gen8_ggtt_clear_range(struct i915_address_space *vm,
-				  u64 start, u64 length)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	unsigned first_entry = start / I915_GTT_PAGE_SIZE;
-	unsigned num_entries = length / I915_GTT_PAGE_SIZE;
-	const gen8_pte_t scratch_pte = vm->scratch[0].encode;
-	gen8_pte_t __iomem *gtt_base =
-		(gen8_pte_t __iomem *)ggtt->gsm + first_entry;
-	const int max_entries = ggtt_total_entries(ggtt) - first_entry;
-	int i;
-
-	if (WARN(num_entries > max_entries,
-		 "First entry = %d; Num entries = %d (max=%d)\n",
-		 first_entry, num_entries, max_entries))
-		num_entries = max_entries;
-
-	for (i = 0; i < num_entries; i++)
-		gen8_set_pte(&gtt_base[i], scratch_pte);
-}
-
-static void bxt_vtd_ggtt_wa(struct i915_address_space *vm)
-{
-	struct drm_i915_private *dev_priv = vm->i915;
-
-	/*
-	 * Make sure the internal GAM fifo has been cleared of all GTT
-	 * writes before exiting stop_machine(). This guarantees that
-	 * any aperture accesses waiting to start in another process
-	 * cannot back up behind the GTT writes causing a hang.
-	 * The register can be any arbitrary GAM register.
-	 */
-	POSTING_READ(GFX_FLSH_CNTL_GEN6);
-}
-
-struct insert_page {
-	struct i915_address_space *vm;
-	dma_addr_t addr;
-	u64 offset;
-	enum i915_cache_level level;
-};
-
-static int bxt_vtd_ggtt_insert_page__cb(void *_arg)
-{
-	struct insert_page *arg = _arg;
-
-	gen8_ggtt_insert_page(arg->vm, arg->addr, arg->offset, arg->level, 0);
-	bxt_vtd_ggtt_wa(arg->vm);
-
-	return 0;
-}
-
-static void bxt_vtd_ggtt_insert_page__BKL(struct i915_address_space *vm,
-					  dma_addr_t addr,
-					  u64 offset,
-					  enum i915_cache_level level,
-					  u32 unused)
-{
-	struct insert_page arg = { vm, addr, offset, level };
-
-	stop_machine(bxt_vtd_ggtt_insert_page__cb, &arg, NULL);
-}
-
-struct insert_entries {
-	struct i915_address_space *vm;
-	struct i915_vma *vma;
-	enum i915_cache_level level;
-	u32 flags;
-};
-
-static int bxt_vtd_ggtt_insert_entries__cb(void *_arg)
-{
-	struct insert_entries *arg = _arg;
-
-	gen8_ggtt_insert_entries(arg->vm, arg->vma, arg->level, arg->flags);
-	bxt_vtd_ggtt_wa(arg->vm);
-
-	return 0;
-}
-
-static void bxt_vtd_ggtt_insert_entries__BKL(struct i915_address_space *vm,
-					     struct i915_vma *vma,
-					     enum i915_cache_level level,
-					     u32 flags)
-{
-	struct insert_entries arg = { vm, vma, level, flags };
-
-	stop_machine(bxt_vtd_ggtt_insert_entries__cb, &arg, NULL);
-}
-
-struct clear_range {
-	struct i915_address_space *vm;
-	u64 start;
-	u64 length;
-};
-
-static int bxt_vtd_ggtt_clear_range__cb(void *_arg)
-{
-	struct clear_range *arg = _arg;
-
-	gen8_ggtt_clear_range(arg->vm, arg->start, arg->length);
-	bxt_vtd_ggtt_wa(arg->vm);
-
-	return 0;
-}
-
-static void bxt_vtd_ggtt_clear_range__BKL(struct i915_address_space *vm,
-					  u64 start,
-					  u64 length)
-{
-	struct clear_range arg = { vm, start, length };
-
-	stop_machine(bxt_vtd_ggtt_clear_range__cb, &arg, NULL);
-}
-
-static void gen6_ggtt_clear_range(struct i915_address_space *vm,
-				  u64 start, u64 length)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-	unsigned first_entry = start / I915_GTT_PAGE_SIZE;
-	unsigned num_entries = length / I915_GTT_PAGE_SIZE;
-	gen6_pte_t scratch_pte, __iomem *gtt_base =
-		(gen6_pte_t __iomem *)ggtt->gsm + first_entry;
-	const int max_entries = ggtt_total_entries(ggtt) - first_entry;
-	int i;
-
-	if (WARN(num_entries > max_entries,
-		 "First entry = %d; Num entries = %d (max=%d)\n",
-		 first_entry, num_entries, max_entries))
-		num_entries = max_entries;
-
-	scratch_pte = vm->scratch[0].encode;
-	for (i = 0; i < num_entries; i++)
-		iowrite32(scratch_pte, &gtt_base[i]);
-}
-
-static void i915_ggtt_insert_page(struct i915_address_space *vm,
-				  dma_addr_t addr,
-				  u64 offset,
-				  enum i915_cache_level cache_level,
-				  u32 unused)
-{
-	unsigned int flags = (cache_level == I915_CACHE_NONE) ?
-		AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
-
-	intel_gtt_insert_page(addr, offset >> PAGE_SHIFT, flags);
-}
-
-static void i915_ggtt_insert_entries(struct i915_address_space *vm,
-				     struct i915_vma *vma,
-				     enum i915_cache_level cache_level,
-				     u32 unused)
-{
-	unsigned int flags = (cache_level == I915_CACHE_NONE) ?
-		AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
-
-	intel_gtt_insert_sg_entries(vma->pages, vma->node.start >> PAGE_SHIFT,
-				    flags);
-}
-
-static void i915_ggtt_clear_range(struct i915_address_space *vm,
-				  u64 start, u64 length)
-{
-	intel_gtt_clear_range(start >> PAGE_SHIFT, length >> PAGE_SHIFT);
-}
-
-static int ggtt_bind_vma(struct i915_vma *vma,
-			 enum i915_cache_level cache_level,
-			 u32 flags)
-{
-	struct drm_i915_private *i915 = vma->vm->i915;
-	struct drm_i915_gem_object *obj = vma->obj;
-	intel_wakeref_t wakeref;
-	u32 pte_flags;
-
-	/* Applicable to VLV (gen8+ do not support RO in the GGTT) */
-	pte_flags = 0;
-	if (i915_gem_object_is_readonly(obj))
-		pte_flags |= PTE_READ_ONLY;
-
-	with_intel_runtime_pm(&i915->runtime_pm, wakeref)
-		vma->vm->insert_entries(vma->vm, vma, cache_level, pte_flags);
-
-	vma->page_sizes.gtt = I915_GTT_PAGE_SIZE;
-
-	/*
-	 * Without aliasing PPGTT there's no difference between
-	 * GLOBAL/LOCAL_BIND, it's all the same ptes. Hence unconditionally
-	 * upgrade to both bound if we bind either to avoid double-binding.
-	 */
-	atomic_or(I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND, &vma->flags);
-
-	return 0;
-}
-
-static void ggtt_unbind_vma(struct i915_vma *vma)
-{
-	struct drm_i915_private *i915 = vma->vm->i915;
-	intel_wakeref_t wakeref;
-
-	with_intel_runtime_pm(&i915->runtime_pm, wakeref)
-		vma->vm->clear_range(vma->vm, vma->node.start, vma->size);
-}
-
-static int aliasing_gtt_bind_vma(struct i915_vma *vma,
-				 enum i915_cache_level cache_level,
-				 u32 flags)
-{
-	struct drm_i915_private *i915 = vma->vm->i915;
-	u32 pte_flags;
-	int ret;
-
-	/* Currently applicable only to VLV */
-	pte_flags = 0;
-	if (i915_gem_object_is_readonly(vma->obj))
-		pte_flags |= PTE_READ_ONLY;
-
-	if (flags & I915_VMA_LOCAL_BIND) {
-		struct i915_ppgtt *alias = i915_vm_to_ggtt(vma->vm)->alias;
-
-		if (flags & I915_VMA_ALLOC) {
-			ret = alias->vm.allocate_va_range(&alias->vm,
-							  vma->node.start,
-							  vma->size);
-			if (ret)
-				return ret;
-
-			set_bit(I915_VMA_ALLOC_BIT, __i915_vma_flags(vma));
-		}
-
-		GEM_BUG_ON(!test_bit(I915_VMA_ALLOC_BIT,
-				     __i915_vma_flags(vma)));
-		alias->vm.insert_entries(&alias->vm, vma,
-					 cache_level, pte_flags);
-	}
-
-	if (flags & I915_VMA_GLOBAL_BIND) {
-		intel_wakeref_t wakeref;
-
-		with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
-			vma->vm->insert_entries(vma->vm, vma,
-						cache_level, pte_flags);
-		}
-	}
-
-	return 0;
-}
-
-static void aliasing_gtt_unbind_vma(struct i915_vma *vma)
-{
-	struct drm_i915_private *i915 = vma->vm->i915;
-
-	if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND)) {
-		struct i915_address_space *vm = vma->vm;
-		intel_wakeref_t wakeref;
-
-		with_intel_runtime_pm(&i915->runtime_pm, wakeref)
-			vm->clear_range(vm, vma->node.start, vma->size);
-	}
-
-	if (test_and_clear_bit(I915_VMA_ALLOC_BIT, __i915_vma_flags(vma))) {
-		struct i915_address_space *vm =
-			&i915_vm_to_ggtt(vma->vm)->alias->vm;
-
-		vm->clear_range(vm, vma->node.start, vma->size);
-	}
-}
-
-void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
-			       struct sg_table *pages)
-{
-	struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
-	struct device *kdev = &dev_priv->drm.pdev->dev;
-	struct i915_ggtt *ggtt = &dev_priv->ggtt;
-
-	if (unlikely(ggtt->do_idle_maps)) {
-		/* XXX This does not prevent more requests being submitted! */
-		if (intel_gt_retire_requests_timeout(ggtt->vm.gt,
-						     -MAX_SCHEDULE_TIMEOUT)) {
-			DRM_ERROR("Failed to wait for idle; VT'd may hang.\n");
-			/* Wait a bit, in hopes it avoids the hang */
-			udelay(10);
-		}
-	}
-
-	dma_unmap_sg(kdev, pages->sgl, pages->nents, PCI_DMA_BIDIRECTIONAL);
-}
-
-static int ggtt_set_pages(struct i915_vma *vma)
-{
-	int ret;
-
-	GEM_BUG_ON(vma->pages);
-
-	ret = i915_get_ggtt_vma_pages(vma);
-	if (ret)
-		return ret;
-
-	vma->page_sizes = vma->obj->mm.page_sizes;
-
-	return 0;
-}
-
-static void i915_ggtt_color_adjust(const struct drm_mm_node *node,
-				   unsigned long color,
-				   u64 *start,
-				   u64 *end)
-{
-	if (i915_node_color_differs(node, color))
-		*start += I915_GTT_PAGE_SIZE;
-
-	/* Also leave a space between the unallocated reserved node after the
-	 * GTT and any objects within the GTT, i.e. we use the color adjustment
-	 * to insert a guard page to prevent prefetches crossing over the
-	 * GTT boundary.
-	 */
-	node = list_next_entry(node, node_list);
-	if (node->color != color)
-		*end -= I915_GTT_PAGE_SIZE;
-}
-
-static int init_aliasing_ppgtt(struct i915_ggtt *ggtt)
-{
-	struct i915_ppgtt *ppgtt;
-	int err;
-
-	ppgtt = i915_ppgtt_create(ggtt->vm.i915);
-	if (IS_ERR(ppgtt))
-		return PTR_ERR(ppgtt);
-
-	if (GEM_WARN_ON(ppgtt->vm.total < ggtt->vm.total)) {
-		err = -ENODEV;
-		goto err_ppgtt;
-	}
-
-	/*
-	 * Note we only pre-allocate as far as the end of the global
-	 * GTT. On 48b / 4-level page-tables, the difference is very,
-	 * very significant! We have to preallocate as GVT/vgpu does
-	 * not like the page directory disappearing.
-	 */
-	err = ppgtt->vm.allocate_va_range(&ppgtt->vm, 0, ggtt->vm.total);
-	if (err)
-		goto err_ppgtt;
-
-	ggtt->alias = ppgtt;
-	ggtt->vm.bind_async_flags |= ppgtt->vm.bind_async_flags;
-
-	GEM_BUG_ON(ggtt->vm.vma_ops.bind_vma != ggtt_bind_vma);
-	ggtt->vm.vma_ops.bind_vma = aliasing_gtt_bind_vma;
-
-	GEM_BUG_ON(ggtt->vm.vma_ops.unbind_vma != ggtt_unbind_vma);
-	ggtt->vm.vma_ops.unbind_vma = aliasing_gtt_unbind_vma;
-
-	return 0;
-
-err_ppgtt:
-	i915_vm_put(&ppgtt->vm);
-	return err;
-}
-
-static void fini_aliasing_ppgtt(struct i915_ggtt *ggtt)
-{
-	struct i915_ppgtt *ppgtt;
-
-	ppgtt = fetch_and_zero(&ggtt->alias);
-	if (!ppgtt)
-		return;
-
-	i915_vm_put(&ppgtt->vm);
-
-	ggtt->vm.vma_ops.bind_vma   = ggtt_bind_vma;
-	ggtt->vm.vma_ops.unbind_vma = ggtt_unbind_vma;
-}
-
-static int ggtt_reserve_guc_top(struct i915_ggtt *ggtt)
-{
-	u64 size;
-	int ret;
-
-	if (!USES_GUC(ggtt->vm.i915))
-		return 0;
-
-	GEM_BUG_ON(ggtt->vm.total <= GUC_GGTT_TOP);
-	size = ggtt->vm.total - GUC_GGTT_TOP;
-
-	ret = i915_gem_gtt_reserve(&ggtt->vm, &ggtt->uc_fw, size,
-				   GUC_GGTT_TOP, I915_COLOR_UNEVICTABLE,
-				   PIN_NOEVICT);
-	if (ret)
-		DRM_DEBUG_DRIVER("Failed to reserve top of GGTT for GuC\n");
-
-	return ret;
-}
-
-static void ggtt_release_guc_top(struct i915_ggtt *ggtt)
-{
-	if (drm_mm_node_allocated(&ggtt->uc_fw))
-		drm_mm_remove_node(&ggtt->uc_fw);
-}
-
-static void cleanup_init_ggtt(struct i915_ggtt *ggtt)
-{
-	ggtt_release_guc_top(ggtt);
-	if (drm_mm_node_allocated(&ggtt->error_capture))
-		drm_mm_remove_node(&ggtt->error_capture);
-}
-
-static int init_ggtt(struct i915_ggtt *ggtt)
-{
-	/* Let GEM Manage all of the aperture.
-	 *
-	 * However, leave one page at the end still bound to the scratch page.
-	 * There are a number of places where the hardware apparently prefetches
-	 * past the end of the object, and we've seen multiple hangs with the
-	 * GPU head pointer stuck in a batchbuffer bound at the last page of the
-	 * aperture.  One page should be enough to keep any prefetching inside
-	 * of the aperture.
-	 */
-	unsigned long hole_start, hole_end;
-	struct drm_mm_node *entry;
-	int ret;
-
-	/*
-	 * GuC requires all resources that we're sharing with it to be placed in
-	 * non-WOPCM memory. If GuC is not present or not in use we still need a
-	 * small bias as ring wraparound at offset 0 sometimes hangs. No idea
-	 * why.
-	 */
-	ggtt->pin_bias = max_t(u32, I915_GTT_PAGE_SIZE,
-			       intel_wopcm_guc_size(&ggtt->vm.i915->wopcm));
-
-	ret = intel_vgt_balloon(ggtt);
-	if (ret)
-		return ret;
-
-	if (ggtt->mappable_end) {
-		/* Reserve a mappable slot for our lockless error capture */
-		ret = drm_mm_insert_node_in_range(&ggtt->vm.mm, &ggtt->error_capture,
-						  PAGE_SIZE, 0, I915_COLOR_UNEVICTABLE,
-						  0, ggtt->mappable_end,
-						  DRM_MM_INSERT_LOW);
-		if (ret)
-			return ret;
-	}
-
-	/*
-	 * The upper portion of the GuC address space has a sizeable hole
-	 * (several MB) that is inaccessible by GuC. Reserve this range within
-	 * GGTT as it can comfortably hold GuC/HuC firmware images.
-	 */
-	ret = ggtt_reserve_guc_top(ggtt);
-	if (ret)
-		goto err;
-
-	/* Clear any non-preallocated blocks */
-	drm_mm_for_each_hole(entry, &ggtt->vm.mm, hole_start, hole_end) {
-		DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n",
-			      hole_start, hole_end);
-		ggtt->vm.clear_range(&ggtt->vm, hole_start,
-				     hole_end - hole_start);
-	}
-
-	/* And finally clear the reserved guard page */
-	ggtt->vm.clear_range(&ggtt->vm, ggtt->vm.total - PAGE_SIZE, PAGE_SIZE);
-
-	return 0;
-
-err:
-	cleanup_init_ggtt(ggtt);
-	return ret;
-}
-
-int i915_init_ggtt(struct drm_i915_private *i915)
-{
-	int ret;
-
-	ret = init_ggtt(&i915->ggtt);
-	if (ret)
-		return ret;
-
-	if (INTEL_PPGTT(i915) == INTEL_PPGTT_ALIASING) {
-		ret = init_aliasing_ppgtt(&i915->ggtt);
-		if (ret)
-			cleanup_init_ggtt(&i915->ggtt);
-	}
-
-	return 0;
-}
-
-static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)
-{
-	struct i915_vma *vma, *vn;
-
-	atomic_set(&ggtt->vm.open, 0);
-
-	rcu_barrier(); /* flush the RCU'ed__i915_vm_release */
-	flush_workqueue(ggtt->vm.i915->wq);
-
-	mutex_lock(&ggtt->vm.mutex);
-
-	list_for_each_entry_safe(vma, vn, &ggtt->vm.bound_list, vm_link)
-		WARN_ON(__i915_vma_unbind(vma));
-
-	if (drm_mm_node_allocated(&ggtt->error_capture))
-		drm_mm_remove_node(&ggtt->error_capture);
-
-	ggtt_release_guc_top(ggtt);
-	intel_vgt_deballoon(ggtt);
-
-	ggtt->vm.cleanup(&ggtt->vm);
-
-	mutex_unlock(&ggtt->vm.mutex);
-	i915_address_space_fini(&ggtt->vm);
-
-	arch_phys_wc_del(ggtt->mtrr);
-
-	if (ggtt->iomap.size)
-		io_mapping_fini(&ggtt->iomap);
-}
-
-/**
- * i915_ggtt_driver_release - Clean up GGTT hardware initialization
- * @i915: i915 device
- */
-void i915_ggtt_driver_release(struct drm_i915_private *i915)
-{
-	struct pagevec *pvec;
-
-	fini_aliasing_ppgtt(&i915->ggtt);
-
-	ggtt_cleanup_hw(&i915->ggtt);
-
-	pvec = &i915->mm.wc_stash.pvec;
-	if (pvec->nr) {
-		set_pages_array_wb(pvec->pages, pvec->nr);
-		__pagevec_release(pvec);
-	}
-}
-
-static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
-{
-	snb_gmch_ctl >>= SNB_GMCH_GGMS_SHIFT;
-	snb_gmch_ctl &= SNB_GMCH_GGMS_MASK;
-	return snb_gmch_ctl << 20;
-}
-
-static unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl)
-{
-	bdw_gmch_ctl >>= BDW_GMCH_GGMS_SHIFT;
-	bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK;
-	if (bdw_gmch_ctl)
-		bdw_gmch_ctl = 1 << bdw_gmch_ctl;
-
-#ifdef CONFIG_X86_32
-	/* Limit 32b platforms to a 2GB GGTT: 4 << 20 / pte size * I915_GTT_PAGE_SIZE */
-	if (bdw_gmch_ctl > 4)
-		bdw_gmch_ctl = 4;
-#endif
-
-	return bdw_gmch_ctl << 20;
-}
-
-static unsigned int chv_get_total_gtt_size(u16 gmch_ctrl)
-{
-	gmch_ctrl >>= SNB_GMCH_GGMS_SHIFT;
-	gmch_ctrl &= SNB_GMCH_GGMS_MASK;
-
-	if (gmch_ctrl)
-		return 1 << (20 + gmch_ctrl);
-
-	return 0;
-}
-
-static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
-{
-	struct drm_i915_private *dev_priv = ggtt->vm.i915;
-	struct pci_dev *pdev = dev_priv->drm.pdev;
-	phys_addr_t phys_addr;
-	int ret;
-
-	/* For Modern GENs the PTEs and register space are split in the BAR */
-	phys_addr = pci_resource_start(pdev, 0) + pci_resource_len(pdev, 0) / 2;
-
-	/*
-	 * On BXT+/CNL+ writes larger than 64 bit to the GTT pagetable range
-	 * will be dropped. For WC mappings in general we have 64 byte burst
-	 * writes when the WC buffer is flushed, so we can't use it, but have to
-	 * resort to an uncached mapping. The WC issue is easily caught by the
-	 * readback check when writing GTT PTE entries.
-	 */
-	if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10)
-		ggtt->gsm = ioremap(phys_addr, size);
-	else
-		ggtt->gsm = ioremap_wc(phys_addr, size);
-	if (!ggtt->gsm) {
-		DRM_ERROR("Failed to map the ggtt page table\n");
-		return -ENOMEM;
-	}
-
-	ret = setup_scratch_page(&ggtt->vm, GFP_DMA32);
-	if (ret) {
-		DRM_ERROR("Scratch setup failed\n");
-		/* iounmap will also get called at remove, but meh */
-		iounmap(ggtt->gsm);
-		return ret;
-	}
-
-	ggtt->vm.scratch[0].encode =
-		ggtt->vm.pte_encode(px_dma(&ggtt->vm.scratch[0]),
-				    I915_CACHE_NONE, 0);
-
-	return 0;
-}
-
-static void tgl_setup_private_ppat(struct intel_uncore *uncore)
-{
-	/* TGL doesn't support LLC or AGE settings */
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(0), GEN8_PPAT_WB);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(1), GEN8_PPAT_WC);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(2), GEN8_PPAT_WT);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(3), GEN8_PPAT_UC);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(4), GEN8_PPAT_WB);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(5), GEN8_PPAT_WB);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(6), GEN8_PPAT_WB);
-	intel_uncore_write(uncore, GEN12_PAT_INDEX(7), GEN8_PPAT_WB);
-}
-
-static void cnl_setup_private_ppat(struct intel_uncore *uncore)
-{
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(0),
-			   GEN8_PPAT_WB | GEN8_PPAT_LLC);
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(1),
-			   GEN8_PPAT_WC | GEN8_PPAT_LLCELLC);
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(2),
-			   GEN8_PPAT_WT | GEN8_PPAT_LLCELLC);
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(3),
-			   GEN8_PPAT_UC);
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(4),
-			   GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(0));
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(5),
-			   GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(1));
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(6),
-			   GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(2));
-	intel_uncore_write(uncore,
-			   GEN10_PAT_INDEX(7),
-			   GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(3));
-}
-
-/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability
- * bits. When using advanced contexts each context stores its own PAT, but
- * writing this data shouldn't be harmful even in those cases. */
-static void bdw_setup_private_ppat(struct intel_uncore *uncore)
-{
-	u64 pat;
-
-	pat = GEN8_PPAT(0, GEN8_PPAT_WB | GEN8_PPAT_LLC) |	/* for normal objects, no eLLC */
-	      GEN8_PPAT(1, GEN8_PPAT_WC | GEN8_PPAT_LLCELLC) |	/* for something pointing to ptes? */
-	      GEN8_PPAT(2, GEN8_PPAT_WT | GEN8_PPAT_LLCELLC) |	/* for scanout with eLLC */
-	      GEN8_PPAT(3, GEN8_PPAT_UC) |			/* Uncached objects, mostly for scanout */
-	      GEN8_PPAT(4, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(0)) |
-	      GEN8_PPAT(5, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(1)) |
-	      GEN8_PPAT(6, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(2)) |
-	      GEN8_PPAT(7, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(3));
-
-	intel_uncore_write(uncore, GEN8_PRIVATE_PAT_LO, lower_32_bits(pat));
-	intel_uncore_write(uncore, GEN8_PRIVATE_PAT_HI, upper_32_bits(pat));
-}
-
-static void chv_setup_private_ppat(struct intel_uncore *uncore)
-{
-	u64 pat;
-
-	/*
-	 * Map WB on BDW to snooped on CHV.
-	 *
-	 * Only the snoop bit has meaning for CHV, the rest is
-	 * ignored.
-	 *
-	 * The hardware will never snoop for certain types of accesses:
-	 * - CPU GTT (GMADR->GGTT->no snoop->memory)
-	 * - PPGTT page tables
-	 * - some other special cycles
-	 *
-	 * As with BDW, we also need to consider the following for GT accesses:
-	 * "For GGTT, there is NO pat_sel[2:0] from the entry,
-	 * so RTL will always use the value corresponding to
-	 * pat_sel = 000".
-	 * Which means we must set the snoop bit in PAT entry 0
-	 * in order to keep the global status page working.
-	 */
-
-	pat = GEN8_PPAT(0, CHV_PPAT_SNOOP) |
-	      GEN8_PPAT(1, 0) |
-	      GEN8_PPAT(2, 0) |
-	      GEN8_PPAT(3, 0) |
-	      GEN8_PPAT(4, CHV_PPAT_SNOOP) |
-	      GEN8_PPAT(5, CHV_PPAT_SNOOP) |
-	      GEN8_PPAT(6, CHV_PPAT_SNOOP) |
-	      GEN8_PPAT(7, CHV_PPAT_SNOOP);
-
-	intel_uncore_write(uncore, GEN8_PRIVATE_PAT_LO, lower_32_bits(pat));
-	intel_uncore_write(uncore, GEN8_PRIVATE_PAT_HI, upper_32_bits(pat));
-}
-
-static void gen6_gmch_remove(struct i915_address_space *vm)
-{
-	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm);
-
-	iounmap(ggtt->gsm);
-	cleanup_scratch_page(vm);
-}
-
-static void setup_private_pat(struct intel_uncore *uncore)
-{
-	struct drm_i915_private *i915 = uncore->i915;
-
-	GEM_BUG_ON(INTEL_GEN(i915) < 8);
-
-	if (INTEL_GEN(i915) >= 12)
-		tgl_setup_private_ppat(uncore);
-	else if (INTEL_GEN(i915) >= 10)
-		cnl_setup_private_ppat(uncore);
-	else if (IS_CHERRYVIEW(i915) || IS_GEN9_LP(i915))
-		chv_setup_private_ppat(uncore);
-	else
-		bdw_setup_private_ppat(uncore);
-}
-
-static struct resource pci_resource(struct pci_dev *pdev, int bar)
-{
-	return (struct resource)DEFINE_RES_MEM(pci_resource_start(pdev, bar),
-					       pci_resource_len(pdev, bar));
-}
-
-static int gen8_gmch_probe(struct i915_ggtt *ggtt)
-{
-	struct drm_i915_private *dev_priv = ggtt->vm.i915;
-	struct pci_dev *pdev = dev_priv->drm.pdev;
-	unsigned int size;
-	u16 snb_gmch_ctl;
-	int err;
-
-	/* TODO: We're not aware of mappable constraints on gen8 yet */
-	if (!IS_DGFX(dev_priv)) {
-		ggtt->gmadr = pci_resource(pdev, 2);
-		ggtt->mappable_end = resource_size(&ggtt->gmadr);
-	}
-
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
-	if (!err)
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(39));
-	if (err)
-		DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);
-
-	pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
-	if (IS_CHERRYVIEW(dev_priv))
-		size = chv_get_total_gtt_size(snb_gmch_ctl);
-	else
-		size = gen8_get_total_gtt_size(snb_gmch_ctl);
-
-	ggtt->vm.total = (size / sizeof(gen8_pte_t)) * I915_GTT_PAGE_SIZE;
-	ggtt->vm.cleanup = gen6_gmch_remove;
-	ggtt->vm.insert_page = gen8_ggtt_insert_page;
-	ggtt->vm.clear_range = nop_clear_range;
-	if (intel_scanout_needs_vtd_wa(dev_priv))
-		ggtt->vm.clear_range = gen8_ggtt_clear_range;
-
-	ggtt->vm.insert_entries = gen8_ggtt_insert_entries;
-
-	/* Serialize GTT updates with aperture access on BXT if VT-d is on. */
-	if (intel_ggtt_update_needs_vtd_wa(dev_priv) ||
-	    IS_CHERRYVIEW(dev_priv) /* fails with concurrent use/update */) {
-		ggtt->vm.insert_entries = bxt_vtd_ggtt_insert_entries__BKL;
-		ggtt->vm.insert_page    = bxt_vtd_ggtt_insert_page__BKL;
-		if (ggtt->vm.clear_range != nop_clear_range)
-			ggtt->vm.clear_range = bxt_vtd_ggtt_clear_range__BKL;
-	}
-
-	ggtt->invalidate = gen6_ggtt_invalidate;
-
-	ggtt->vm.vma_ops.bind_vma    = ggtt_bind_vma;
-	ggtt->vm.vma_ops.unbind_vma  = ggtt_unbind_vma;
-	ggtt->vm.vma_ops.set_pages   = ggtt_set_pages;
-	ggtt->vm.vma_ops.clear_pages = clear_pages;
-
-	ggtt->vm.pte_encode = gen8_pte_encode;
-
-	setup_private_pat(ggtt->vm.gt->uncore);
-
-	return ggtt_probe_common(ggtt, size);
-}
-
-static int gen6_gmch_probe(struct i915_ggtt *ggtt)
-{
-	struct drm_i915_private *dev_priv = ggtt->vm.i915;
-	struct pci_dev *pdev = dev_priv->drm.pdev;
-	unsigned int size;
-	u16 snb_gmch_ctl;
-	int err;
-
-	ggtt->gmadr =
-		(struct resource) DEFINE_RES_MEM(pci_resource_start(pdev, 2),
-						 pci_resource_len(pdev, 2));
-	ggtt->mappable_end = resource_size(&ggtt->gmadr);
-
-	/* 64/512MB is the current min/max we actually know of, but this is just
-	 * a coarse sanity check.
-	 */
-	if (ggtt->mappable_end < (64<<20) || ggtt->mappable_end > (512<<20)) {
-		DRM_ERROR("Unknown GMADR size (%pa)\n", &ggtt->mappable_end);
-		return -ENXIO;
-	}
-
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
-	if (!err)
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-	if (err)
-		DRM_ERROR("Can't set DMA mask/consistent mask (%d)\n", err);
-	pci_read_config_word(pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);
-
-	size = gen6_get_total_gtt_size(snb_gmch_ctl);
-	ggtt->vm.total = (size / sizeof(gen6_pte_t)) * I915_GTT_PAGE_SIZE;
-
-	ggtt->vm.clear_range = nop_clear_range;
-	if (!HAS_FULL_PPGTT(dev_priv) || intel_scanout_needs_vtd_wa(dev_priv))
-		ggtt->vm.clear_range = gen6_ggtt_clear_range;
-	ggtt->vm.insert_page = gen6_ggtt_insert_page;
-	ggtt->vm.insert_entries = gen6_ggtt_insert_entries;
-	ggtt->vm.cleanup = gen6_gmch_remove;
-
-	ggtt->invalidate = gen6_ggtt_invalidate;
-
-	if (HAS_EDRAM(dev_priv))
-		ggtt->vm.pte_encode = iris_pte_encode;
-	else if (IS_HASWELL(dev_priv))
-		ggtt->vm.pte_encode = hsw_pte_encode;
-	else if (IS_VALLEYVIEW(dev_priv))
-		ggtt->vm.pte_encode = byt_pte_encode;
-	else if (INTEL_GEN(dev_priv) >= 7)
-		ggtt->vm.pte_encode = ivb_pte_encode;
-	else
-		ggtt->vm.pte_encode = snb_pte_encode;
-
-	ggtt->vm.vma_ops.bind_vma    = ggtt_bind_vma;
-	ggtt->vm.vma_ops.unbind_vma  = ggtt_unbind_vma;
-	ggtt->vm.vma_ops.set_pages   = ggtt_set_pages;
-	ggtt->vm.vma_ops.clear_pages = clear_pages;
-
-	return ggtt_probe_common(ggtt, size);
-}
-
-static void i915_gmch_remove(struct i915_address_space *vm)
-{
-	intel_gmch_remove();
-}
-
-static int i915_gmch_probe(struct i915_ggtt *ggtt)
-{
-	struct drm_i915_private *dev_priv = ggtt->vm.i915;
-	phys_addr_t gmadr_base;
-	int ret;
-
-	ret = intel_gmch_probe(dev_priv->bridge_dev, dev_priv->drm.pdev, NULL);
-	if (!ret) {
-		DRM_ERROR("failed to set up gmch\n");
-		return -EIO;
-	}
-
-	intel_gtt_get(&ggtt->vm.total, &gmadr_base, &ggtt->mappable_end);
-
-	ggtt->gmadr =
-		(struct resource) DEFINE_RES_MEM(gmadr_base,
-						 ggtt->mappable_end);
-
-	ggtt->do_idle_maps = needs_idle_maps(dev_priv);
-	ggtt->vm.insert_page = i915_ggtt_insert_page;
-	ggtt->vm.insert_entries = i915_ggtt_insert_entries;
-	ggtt->vm.clear_range = i915_ggtt_clear_range;
-	ggtt->vm.cleanup = i915_gmch_remove;
-
-	ggtt->invalidate = gmch_ggtt_invalidate;
-
-	ggtt->vm.vma_ops.bind_vma    = ggtt_bind_vma;
-	ggtt->vm.vma_ops.unbind_vma  = ggtt_unbind_vma;
-	ggtt->vm.vma_ops.set_pages   = ggtt_set_pages;
-	ggtt->vm.vma_ops.clear_pages = clear_pages;
-
-	if (unlikely(ggtt->do_idle_maps))
-		dev_notice(dev_priv->drm.dev,
-			   "Applying Ironlake quirks for intel_iommu\n");
-
-	return 0;
-}
-
-static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt)
-{
-	struct drm_i915_private *i915 = gt->i915;
-	int ret;
-
-	ggtt->vm.gt = gt;
-	ggtt->vm.i915 = i915;
-	ggtt->vm.dma = &i915->drm.pdev->dev;
-
-	if (INTEL_GEN(i915) <= 5)
-		ret = i915_gmch_probe(ggtt);
-	else if (INTEL_GEN(i915) < 8)
-		ret = gen6_gmch_probe(ggtt);
-	else
-		ret = gen8_gmch_probe(ggtt);
-	if (ret)
-		return ret;
-
-	if ((ggtt->vm.total - 1) >> 32) {
-		DRM_ERROR("We never expected a Global GTT with more than 32bits"
-			  " of address space! Found %lldM!\n",
-			  ggtt->vm.total >> 20);
-		ggtt->vm.total = 1ULL << 32;
-		ggtt->mappable_end =
-			min_t(u64, ggtt->mappable_end, ggtt->vm.total);
-	}
-
-	if (ggtt->mappable_end > ggtt->vm.total) {
-		DRM_ERROR("mappable aperture extends past end of GGTT,"
-			  " aperture=%pa, total=%llx\n",
-			  &ggtt->mappable_end, ggtt->vm.total);
-		ggtt->mappable_end = ggtt->vm.total;
-	}
-
-	/* GMADR is the PCI mmio aperture into the global GTT. */
-	DRM_DEBUG_DRIVER("GGTT size = %lluM\n", ggtt->vm.total >> 20);
-	DRM_DEBUG_DRIVER("GMADR size = %lluM\n", (u64)ggtt->mappable_end >> 20);
-	DRM_DEBUG_DRIVER("DSM size = %lluM\n",
-			 (u64)resource_size(&intel_graphics_stolen_res) >> 20);
-
-	return 0;
-}
-
-/**
- * i915_ggtt_probe_hw - Probe GGTT hardware location
- * @i915: i915 device
- */
-int i915_ggtt_probe_hw(struct drm_i915_private *i915)
-{
-	int ret;
-
-	ret = ggtt_probe_hw(&i915->ggtt, &i915->gt);
-	if (ret)
-		return ret;
-
-	if (intel_vtd_active())
-		dev_info(i915->drm.dev, "VT-d active for gfx access\n");
-
-	return 0;
-}
-
-static int ggtt_init_hw(struct i915_ggtt *ggtt)
-{
-	struct drm_i915_private *i915 = ggtt->vm.i915;
-
-	i915_address_space_init(&ggtt->vm, VM_CLASS_GGTT);
-
-	ggtt->vm.is_ggtt = true;
-
-	/* Only VLV supports read-only GGTT mappings */
-	ggtt->vm.has_read_only = IS_VALLEYVIEW(i915);
-
-	if (!HAS_LLC(i915) && !HAS_PPGTT(i915))
-		ggtt->vm.mm.color_adjust = i915_ggtt_color_adjust;
-
-	if (ggtt->mappable_end) {
-		if (!io_mapping_init_wc(&ggtt->iomap,
-					ggtt->gmadr.start,
-					ggtt->mappable_end)) {
-			ggtt->vm.cleanup(&ggtt->vm);
-			return -EIO;
-		}
-
-		ggtt->mtrr = arch_phys_wc_add(ggtt->gmadr.start,
-					      ggtt->mappable_end);
-	}
-
-	i915_ggtt_init_fences(ggtt);
-
-	return 0;
-}
-
-/**
- * i915_ggtt_init_hw - Initialize GGTT hardware
- * @dev_priv: i915 device
- */
-int i915_ggtt_init_hw(struct drm_i915_private *dev_priv)
-{
-	int ret;
-
-	stash_init(&dev_priv->mm.wc_stash);
-
-	/* Note that we use page colouring to enforce a guard page at the
-	 * end of the address space. This is required as the CS may prefetch
-	 * beyond the end of the batch buffer, across the page boundary,
-	 * and beyond the end of the GTT if we do not provide a guard.
-	 */
-	ret = ggtt_init_hw(&dev_priv->ggtt);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
-{
-	if (INTEL_GEN(dev_priv) < 6 && !intel_enable_gtt())
-		return -EIO;
-
-	return 0;
-}
-
-void i915_ggtt_enable_guc(struct i915_ggtt *ggtt)
-{
-	GEM_BUG_ON(ggtt->invalidate != gen6_ggtt_invalidate);
-
-	ggtt->invalidate = guc_ggtt_invalidate;
-
-	ggtt->invalidate(ggtt);
-}
-
-void i915_ggtt_disable_guc(struct i915_ggtt *ggtt)
-{
-	/* XXX Temporary pardon for error unload */
-	if (ggtt->invalidate == gen6_ggtt_invalidate)
-		return;
-
-	/* We should only be called after i915_ggtt_enable_guc() */
-	GEM_BUG_ON(ggtt->invalidate != guc_ggtt_invalidate);
-
-	ggtt->invalidate = gen6_ggtt_invalidate;
-
-	ggtt->invalidate(ggtt);
-}
-
-static void ggtt_restore_mappings(struct i915_ggtt *ggtt)
-{
-	struct i915_vma *vma;
-	bool flush = false;
-	int open;
-
-	intel_gt_check_and_clear_faults(ggtt->vm.gt);
-
-	mutex_lock(&ggtt->vm.mutex);
-
-	/* First fill our portion of the GTT with scratch pages */
-	ggtt->vm.clear_range(&ggtt->vm, 0, ggtt->vm.total);
-
-	/* Skip rewriting PTE on VMA unbind. */
-	open = atomic_xchg(&ggtt->vm.open, 0);
-
-	/* clflush objects bound into the GGTT and rebind them. */
-	list_for_each_entry(vma, &ggtt->vm.bound_list, vm_link) {
-		struct drm_i915_gem_object *obj = vma->obj;
-
-		if (!i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND))
-			continue;
-
-		clear_bit(I915_VMA_GLOBAL_BIND_BIT, __i915_vma_flags(vma));
-		WARN_ON(i915_vma_bind(vma,
-				      obj ? obj->cache_level : 0,
-				      PIN_GLOBAL, NULL));
-		if (obj) { /* only used during resume => exclusive access */
-			flush |= fetch_and_zero(&obj->write_domain);
-			obj->read_domains |= I915_GEM_DOMAIN_GTT;
-		}
-	}
-
-	atomic_set(&ggtt->vm.open, open);
-	ggtt->invalidate(ggtt);
-
-	mutex_unlock(&ggtt->vm.mutex);
-
-	if (flush)
-		wbinvd_on_all_cpus();
-}
-
-void i915_gem_restore_gtt_mappings(struct drm_i915_private *i915)
-{
-	struct i915_ggtt *ggtt = &i915->ggtt;
-
-	ggtt_restore_mappings(ggtt);
-
-	if (INTEL_GEN(i915) >= 8)
-		setup_private_pat(ggtt->vm.gt->uncore);
-}
-
-static struct scatterlist *
-rotate_pages(struct drm_i915_gem_object *obj, unsigned int offset,
-	     unsigned int width, unsigned int height,
-	     unsigned int stride,
-	     struct sg_table *st, struct scatterlist *sg)
-{
-	unsigned int column, row;
-	unsigned int src_idx;
-
-	for (column = 0; column < width; column++) {
-		src_idx = stride * (height - 1) + column + offset;
-		for (row = 0; row < height; row++) {
-			st->nents++;
-			/* We don't need the pages, but need to initialize
-			 * the entries so the sg list can be happily traversed.
-			 * The only thing we need are DMA addresses.
-			 */
-			sg_set_page(sg, NULL, I915_GTT_PAGE_SIZE, 0);
-			sg_dma_address(sg) =
-				i915_gem_object_get_dma_address(obj, src_idx);
-			sg_dma_len(sg) = I915_GTT_PAGE_SIZE;
-			sg = sg_next(sg);
-			src_idx -= stride;
-		}
-	}
-
-	return sg;
-}
-
-static noinline struct sg_table *
-intel_rotate_pages(struct intel_rotation_info *rot_info,
-		   struct drm_i915_gem_object *obj)
-{
-	unsigned int size = intel_rotation_info_size(rot_info);
-	struct sg_table *st;
-	struct scatterlist *sg;
-	int ret = -ENOMEM;
-	int i;
-
-	/* Allocate target SG list. */
-	st = kmalloc(sizeof(*st), GFP_KERNEL);
-	if (!st)
-		goto err_st_alloc;
-
-	ret = sg_alloc_table(st, size, GFP_KERNEL);
-	if (ret)
-		goto err_sg_alloc;
-
-	st->nents = 0;
-	sg = st->sgl;
-
-	for (i = 0 ; i < ARRAY_SIZE(rot_info->plane); i++) {
-		sg = rotate_pages(obj, rot_info->plane[i].offset,
-				  rot_info->plane[i].width, rot_info->plane[i].height,
-				  rot_info->plane[i].stride, st, sg);
-	}
-
-	return st;
-
-err_sg_alloc:
-	kfree(st);
-err_st_alloc:
-
-	DRM_DEBUG_DRIVER("Failed to create rotated mapping for object size %zu! (%ux%u tiles, %u pages)\n",
-			 obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
-
-	return ERR_PTR(ret);
-}
-
-static struct scatterlist *
-remap_pages(struct drm_i915_gem_object *obj, unsigned int offset,
-	    unsigned int width, unsigned int height,
-	    unsigned int stride,
-	    struct sg_table *st, struct scatterlist *sg)
-{
-	unsigned int row;
-
-	for (row = 0; row < height; row++) {
-		unsigned int left = width * I915_GTT_PAGE_SIZE;
-
-		while (left) {
-			dma_addr_t addr;
-			unsigned int length;
-
-			/* We don't need the pages, but need to initialize
-			 * the entries so the sg list can be happily traversed.
-			 * The only thing we need are DMA addresses.
-			 */
-
-			addr = i915_gem_object_get_dma_address_len(obj, offset, &length);
-
-			length = min(left, length);
-
-			st->nents++;
-
-			sg_set_page(sg, NULL, length, 0);
-			sg_dma_address(sg) = addr;
-			sg_dma_len(sg) = length;
-			sg = sg_next(sg);
-
-			offset += length / I915_GTT_PAGE_SIZE;
-			left -= length;
-		}
-
-		offset += stride - width;
-	}
-
-	return sg;
-}
-
-static noinline struct sg_table *
-intel_remap_pages(struct intel_remapped_info *rem_info,
-		  struct drm_i915_gem_object *obj)
-{
-	unsigned int size = intel_remapped_info_size(rem_info);
-	struct sg_table *st;
-	struct scatterlist *sg;
-	int ret = -ENOMEM;
-	int i;
-
-	/* Allocate target SG list. */
-	st = kmalloc(sizeof(*st), GFP_KERNEL);
-	if (!st)
-		goto err_st_alloc;
-
-	ret = sg_alloc_table(st, size, GFP_KERNEL);
-	if (ret)
-		goto err_sg_alloc;
-
-	st->nents = 0;
-	sg = st->sgl;
-
-	for (i = 0 ; i < ARRAY_SIZE(rem_info->plane); i++) {
-		sg = remap_pages(obj, rem_info->plane[i].offset,
-				 rem_info->plane[i].width, rem_info->plane[i].height,
-				 rem_info->plane[i].stride, st, sg);
-	}
-
-	i915_sg_trim(st);
-
-	return st;
-
-err_sg_alloc:
-	kfree(st);
-err_st_alloc:
-
-	DRM_DEBUG_DRIVER("Failed to create remapped mapping for object size %zu! (%ux%u tiles, %u pages)\n",
-			 obj->base.size, rem_info->plane[0].width, rem_info->plane[0].height, size);
-
-	return ERR_PTR(ret);
-}
-
-static noinline struct sg_table *
-intel_partial_pages(const struct i915_ggtt_view *view,
-		    struct drm_i915_gem_object *obj)
-{
-	struct sg_table *st;
-	struct scatterlist *sg, *iter;
-	unsigned int count = view->partial.size;
-	unsigned int offset;
-	int ret = -ENOMEM;
-
-	st = kmalloc(sizeof(*st), GFP_KERNEL);
-	if (!st)
-		goto err_st_alloc;
-
-	ret = sg_alloc_table(st, count, GFP_KERNEL);
-	if (ret)
-		goto err_sg_alloc;
-
-	iter = i915_gem_object_get_sg(obj, view->partial.offset, &offset);
-	GEM_BUG_ON(!iter);
-
-	sg = st->sgl;
-	st->nents = 0;
-	do {
-		unsigned int len;
-
-		len = min(iter->length - (offset << PAGE_SHIFT),
-			  count << PAGE_SHIFT);
-		sg_set_page(sg, NULL, len, 0);
-		sg_dma_address(sg) =
-			sg_dma_address(iter) + (offset << PAGE_SHIFT);
-		sg_dma_len(sg) = len;
-
-		st->nents++;
-		count -= len >> PAGE_SHIFT;
-		if (count == 0) {
-			sg_mark_end(sg);
-			i915_sg_trim(st); /* Drop any unused tail entries. */
-
-			return st;
-		}
-
-		sg = __sg_next(sg);
-		iter = __sg_next(iter);
-		offset = 0;
-	} while (1);
-
-err_sg_alloc:
-	kfree(st);
-err_st_alloc:
-	return ERR_PTR(ret);
-}
-
-static int
-i915_get_ggtt_vma_pages(struct i915_vma *vma)
-{
-	int ret;
-
-	/* The vma->pages are only valid within the lifespan of the borrowed
-	 * obj->mm.pages. When the obj->mm.pages sg_table is regenerated, so
-	 * must be the vma->pages. A simple rule is that vma->pages must only
-	 * be accessed when the obj->mm.pages are pinned.
-	 */
-	GEM_BUG_ON(!i915_gem_object_has_pinned_pages(vma->obj));
-
-	switch (vma->ggtt_view.type) {
-	default:
-		GEM_BUG_ON(vma->ggtt_view.type);
-		/* fall through */
-	case I915_GGTT_VIEW_NORMAL:
-		vma->pages = vma->obj->mm.pages;
-		return 0;
-
-	case I915_GGTT_VIEW_ROTATED:
-		vma->pages =
-			intel_rotate_pages(&vma->ggtt_view.rotated, vma->obj);
-		break;
-
-	case I915_GGTT_VIEW_REMAPPED:
-		vma->pages =
-			intel_remap_pages(&vma->ggtt_view.remapped, vma->obj);
-		break;
-
-	case I915_GGTT_VIEW_PARTIAL:
-		vma->pages = intel_partial_pages(&vma->ggtt_view, vma->obj);
-		break;
-	}
-
-	ret = 0;
-	if (IS_ERR(vma->pages)) {
-		ret = PTR_ERR(vma->pages);
-		vma->pages = NULL;
-		DRM_ERROR("Failed to get pages for VMA view type %u (%d)!\n",
-			  vma->ggtt_view.type, ret);
-	}
-	return ret;
-=======
 	dma_unmap_sg(kdev, pages->sgl, pages->nents, PCI_DMA_BIDIRECTIONAL);
->>>>>>> linux-next/akpm-base
 }
 
 /**
--- a/drivers/net/ethernet/sfc/efx.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/sfc/efx.c
@@ -173,635 +173,6 @@ static int efx_probe_port(struct efx_nic
 	rc = efx->type->probe_port(efx);
 	if (rc)
 		return rc;
-<<<<<<< HEAD
-
-	/* Initialise MAC address to permanent address */
-	ether_addr_copy(efx->net_dev->dev_addr, efx->net_dev->perm_addr);
-
-	return 0;
-}
-
-static int efx_init_port(struct efx_nic *efx)
-{
-	int rc;
-
-	netif_dbg(efx, drv, efx->net_dev, "init port\n");
-
-	mutex_lock(&efx->mac_lock);
-
-	rc = efx->phy_op->init(efx);
-	if (rc)
-		goto fail1;
-
-	efx->port_initialized = true;
-
-	/* Reconfigure the MAC before creating dma queues (required for
-	 * Falcon/A1 where RX_INGR_EN/TX_DRAIN_EN isn't supported) */
-	efx_mac_reconfigure(efx);
-
-	/* Ensure the PHY advertises the correct flow control settings */
-	rc = efx->phy_op->reconfigure(efx);
-	if (rc && rc != -EPERM)
-		goto fail2;
-
-	mutex_unlock(&efx->mac_lock);
-	return 0;
-
-fail2:
-	efx->phy_op->fini(efx);
-fail1:
-	mutex_unlock(&efx->mac_lock);
-	return rc;
-}
-
-static void efx_start_port(struct efx_nic *efx)
-{
-	netif_dbg(efx, ifup, efx->net_dev, "start port\n");
-	BUG_ON(efx->port_enabled);
-
-	mutex_lock(&efx->mac_lock);
-	efx->port_enabled = true;
-
-	/* Ensure MAC ingress/egress is enabled */
-	efx_mac_reconfigure(efx);
-
-	mutex_unlock(&efx->mac_lock);
-}
-
-/* Cancel work for MAC reconfiguration, periodic hardware monitoring
- * and the async self-test, wait for them to finish and prevent them
- * being scheduled again.  This doesn't cover online resets, which
- * should only be cancelled when removing the device.
- */
-static void efx_stop_port(struct efx_nic *efx)
-{
-	netif_dbg(efx, ifdown, efx->net_dev, "stop port\n");
-
-	EFX_ASSERT_RESET_SERIALISED(efx);
-
-	mutex_lock(&efx->mac_lock);
-	efx->port_enabled = false;
-	mutex_unlock(&efx->mac_lock);
-
-	/* Serialise against efx_set_multicast_list() */
-	netif_addr_lock_bh(efx->net_dev);
-	netif_addr_unlock_bh(efx->net_dev);
-
-	cancel_delayed_work_sync(&efx->monitor_work);
-	efx_selftest_async_cancel(efx);
-	cancel_work_sync(&efx->mac_work);
-}
-
-static void efx_fini_port(struct efx_nic *efx)
-{
-	netif_dbg(efx, drv, efx->net_dev, "shut down port\n");
-
-	if (!efx->port_initialized)
-		return;
-
-	efx->phy_op->fini(efx);
-	efx->port_initialized = false;
-
-	efx->link_state.up = false;
-	efx_link_status_changed(efx);
-}
-
-static void efx_remove_port(struct efx_nic *efx)
-{
-	netif_dbg(efx, drv, efx->net_dev, "destroying port\n");
-
-	efx->type->remove_port(efx);
-}
-
-/**************************************************************************
- *
- * NIC handling
- *
- **************************************************************************/
-
-static LIST_HEAD(efx_primary_list);
-static LIST_HEAD(efx_unassociated_list);
-
-static bool efx_same_controller(struct efx_nic *left, struct efx_nic *right)
-{
-	return left->type == right->type &&
-		left->vpd_sn && right->vpd_sn &&
-		!strcmp(left->vpd_sn, right->vpd_sn);
-}
-
-static void efx_associate(struct efx_nic *efx)
-{
-	struct efx_nic *other, *next;
-
-	if (efx->primary == efx) {
-		/* Adding primary function; look for secondaries */
-
-		netif_dbg(efx, probe, efx->net_dev, "adding to primary list\n");
-		list_add_tail(&efx->node, &efx_primary_list);
-
-		list_for_each_entry_safe(other, next, &efx_unassociated_list,
-					 node) {
-			if (efx_same_controller(efx, other)) {
-				list_del(&other->node);
-				netif_dbg(other, probe, other->net_dev,
-					  "moving to secondary list of %s %s\n",
-					  pci_name(efx->pci_dev),
-					  efx->net_dev->name);
-				list_add_tail(&other->node,
-					      &efx->secondary_list);
-				other->primary = efx;
-			}
-		}
-	} else {
-		/* Adding secondary function; look for primary */
-
-		list_for_each_entry(other, &efx_primary_list, node) {
-			if (efx_same_controller(efx, other)) {
-				netif_dbg(efx, probe, efx->net_dev,
-					  "adding to secondary list of %s %s\n",
-					  pci_name(other->pci_dev),
-					  other->net_dev->name);
-				list_add_tail(&efx->node,
-					      &other->secondary_list);
-				efx->primary = other;
-				return;
-			}
-		}
-
-		netif_dbg(efx, probe, efx->net_dev,
-			  "adding to unassociated list\n");
-		list_add_tail(&efx->node, &efx_unassociated_list);
-	}
-}
-
-static void efx_dissociate(struct efx_nic *efx)
-{
-	struct efx_nic *other, *next;
-
-	list_del(&efx->node);
-	efx->primary = NULL;
-
-	list_for_each_entry_safe(other, next, &efx->secondary_list, node) {
-		list_del(&other->node);
-		netif_dbg(other, probe, other->net_dev,
-			  "moving to unassociated list\n");
-		list_add_tail(&other->node, &efx_unassociated_list);
-		other->primary = NULL;
-	}
-}
-
-/* This configures the PCI device to enable I/O and DMA. */
-static int efx_init_io(struct efx_nic *efx)
-{
-	struct pci_dev *pci_dev = efx->pci_dev;
-	dma_addr_t dma_mask = efx->type->max_dma_mask;
-	unsigned int mem_map_size = efx->type->mem_map_size(efx);
-	int rc, bar;
-
-	netif_dbg(efx, probe, efx->net_dev, "initialising I/O\n");
-
-	bar = efx->type->mem_bar(efx);
-
-	rc = pci_enable_device(pci_dev);
-	if (rc) {
-		netif_err(efx, probe, efx->net_dev,
-			  "failed to enable PCI device\n");
-		goto fail1;
-	}
-
-	pci_set_master(pci_dev);
-
-	/* Set the PCI DMA mask.  Try all possibilities from our genuine mask
-	 * down to 32 bits, because some architectures will allow 40 bit
-	 * masks event though they reject 46 bit masks.
-	 */
-	while (dma_mask > 0x7fffffffUL) {
-		rc = dma_set_mask_and_coherent(&pci_dev->dev, dma_mask);
-		if (rc == 0)
-			break;
-		dma_mask >>= 1;
-	}
-	if (rc) {
-		netif_err(efx, probe, efx->net_dev,
-			  "could not find a suitable DMA mask\n");
-		goto fail2;
-	}
-	netif_dbg(efx, probe, efx->net_dev,
-		  "using DMA mask %llx\n", (unsigned long long) dma_mask);
-
-	efx->membase_phys = pci_resource_start(efx->pci_dev, bar);
-	rc = pci_request_region(pci_dev, bar, "sfc");
-	if (rc) {
-		netif_err(efx, probe, efx->net_dev,
-			  "request for memory BAR failed\n");
-		rc = -EIO;
-		goto fail3;
-	}
-	efx->membase = ioremap(efx->membase_phys, mem_map_size);
-	if (!efx->membase) {
-		netif_err(efx, probe, efx->net_dev,
-			  "could not map memory BAR at %llx+%x\n",
-			  (unsigned long long)efx->membase_phys, mem_map_size);
-		rc = -ENOMEM;
-		goto fail4;
-	}
-	netif_dbg(efx, probe, efx->net_dev,
-		  "memory BAR at %llx+%x (virtual %p)\n",
-		  (unsigned long long)efx->membase_phys, mem_map_size,
-		  efx->membase);
-
-	return 0;
-
- fail4:
-	pci_release_region(efx->pci_dev, bar);
- fail3:
-	efx->membase_phys = 0;
- fail2:
-	pci_disable_device(efx->pci_dev);
- fail1:
-	return rc;
-}
-
-static void efx_fini_io(struct efx_nic *efx)
-{
-	int bar;
-
-	netif_dbg(efx, drv, efx->net_dev, "shutting down I/O\n");
-
-	if (efx->membase) {
-		iounmap(efx->membase);
-		efx->membase = NULL;
-	}
-
-	if (efx->membase_phys) {
-		bar = efx->type->mem_bar(efx);
-		pci_release_region(efx->pci_dev, bar);
-		efx->membase_phys = 0;
-	}
-
-	/* Don't disable bus-mastering if VFs are assigned */
-	if (!pci_vfs_assigned(efx->pci_dev))
-		pci_disable_device(efx->pci_dev);
-}
-
-void efx_set_default_rx_indir_table(struct efx_nic *efx,
-				    struct efx_rss_context *ctx)
-{
-	size_t i;
-
-	for (i = 0; i < ARRAY_SIZE(ctx->rx_indir_table); i++)
-		ctx->rx_indir_table[i] =
-			ethtool_rxfh_indir_default(i, efx->rss_spread);
-}
-
-static unsigned int efx_wanted_parallelism(struct efx_nic *efx)
-{
-	cpumask_var_t thread_mask;
-	unsigned int count;
-	int cpu;
-
-	if (rss_cpus) {
-		count = rss_cpus;
-	} else {
-		if (unlikely(!zalloc_cpumask_var(&thread_mask, GFP_KERNEL))) {
-			netif_warn(efx, probe, efx->net_dev,
-				   "RSS disabled due to allocation failure\n");
-			return 1;
-		}
-
-		count = 0;
-		for_each_online_cpu(cpu) {
-			if (!cpumask_test_cpu(cpu, thread_mask)) {
-				++count;
-				cpumask_or(thread_mask, thread_mask,
-					   topology_sibling_cpumask(cpu));
-			}
-		}
-
-		free_cpumask_var(thread_mask);
-	}
-
-	if (count > EFX_MAX_RX_QUEUES) {
-		netif_cond_dbg(efx, probe, efx->net_dev, !rss_cpus, warn,
-			       "Reducing number of rx queues from %u to %u.\n",
-			       count, EFX_MAX_RX_QUEUES);
-		count = EFX_MAX_RX_QUEUES;
-	}
-
-	/* If RSS is requested for the PF *and* VFs then we can't write RSS
-	 * table entries that are inaccessible to VFs
-	 */
-#ifdef CONFIG_SFC_SRIOV
-	if (efx->type->sriov_wanted) {
-		if (efx->type->sriov_wanted(efx) && efx_vf_size(efx) > 1 &&
-		    count > efx_vf_size(efx)) {
-			netif_warn(efx, probe, efx->net_dev,
-				   "Reducing number of RSS channels from %u to %u for "
-				   "VF support. Increase vf-msix-limit to use more "
-				   "channels on the PF.\n",
-				   count, efx_vf_size(efx));
-			count = efx_vf_size(efx);
-		}
-	}
-#endif
-
-	return count;
-}
-
-static int efx_allocate_msix_channels(struct efx_nic *efx,
-				      unsigned int max_channels,
-				      unsigned int extra_channels,
-				      unsigned int parallelism)
-{
-	unsigned int n_channels = parallelism;
-	int vec_count;
-	int n_xdp_tx;
-	int n_xdp_ev;
-
-	if (efx_separate_tx_channels)
-		n_channels *= 2;
-	n_channels += extra_channels;
-
-	/* To allow XDP transmit to happen from arbitrary NAPI contexts
-	 * we allocate a TX queue per CPU. We share event queues across
-	 * multiple tx queues, assuming tx and ev queues are both
-	 * maximum size.
-	 */
-
-	n_xdp_tx = num_possible_cpus();
-	n_xdp_ev = DIV_ROUND_UP(n_xdp_tx, EFX_TXQ_TYPES);
-
-	vec_count = pci_msix_vec_count(efx->pci_dev);
-	if (vec_count < 0)
-		return vec_count;
-
-	max_channels = min_t(unsigned int, vec_count, max_channels);
-
-	/* Check resources.
-	 * We need a channel per event queue, plus a VI per tx queue.
-	 * This may be more pessimistic than it needs to be.
-	 */
-	if (n_channels + n_xdp_ev > max_channels) {
-		netif_err(efx, drv, efx->net_dev,
-			  "Insufficient resources for %d XDP event queues (%d other channels, max %d)\n",
-			  n_xdp_ev, n_channels, max_channels);
-		efx->n_xdp_channels = 0;
-		efx->xdp_tx_per_channel = 0;
-		efx->xdp_tx_queue_count = 0;
-	} else {
-		efx->n_xdp_channels = n_xdp_ev;
-		efx->xdp_tx_per_channel = EFX_TXQ_TYPES;
-		efx->xdp_tx_queue_count = n_xdp_tx;
-		n_channels += n_xdp_ev;
-		netif_dbg(efx, drv, efx->net_dev,
-			  "Allocating %d TX and %d event queues for XDP\n",
-			  n_xdp_tx, n_xdp_ev);
-	}
-
-	if (vec_count < n_channels) {
-		netif_err(efx, drv, efx->net_dev,
-			  "WARNING: Insufficient MSI-X vectors available (%d < %u).\n",
-			  vec_count, n_channels);
-		netif_err(efx, drv, efx->net_dev,
-			  "WARNING: Performance may be reduced.\n");
-		n_channels = vec_count;
-	}
-
-	n_channels = min(n_channels, max_channels);
-
-	efx->n_channels = n_channels;
-
-	/* Ignore XDP tx channels when creating rx channels. */
-	n_channels -= efx->n_xdp_channels;
-
-	if (efx_separate_tx_channels) {
-		efx->n_tx_channels =
-			min(max(n_channels / 2, 1U),
-			    efx->max_tx_channels);
-		efx->tx_channel_offset =
-			n_channels - efx->n_tx_channels;
-		efx->n_rx_channels =
-			max(n_channels -
-			    efx->n_tx_channels, 1U);
-	} else {
-		efx->n_tx_channels = min(n_channels, efx->max_tx_channels);
-		efx->tx_channel_offset = 0;
-		efx->n_rx_channels = n_channels;
-	}
-
-	efx->n_rx_channels = min(efx->n_rx_channels, parallelism);
-	efx->n_tx_channels = min(efx->n_tx_channels, parallelism);
-
-	efx->xdp_channel_offset = n_channels;
-
-	netif_dbg(efx, drv, efx->net_dev,
-		  "Allocating %u RX channels\n",
-		  efx->n_rx_channels);
-
-	return efx->n_channels;
-}
-
-/* Probe the number and type of interrupts we are able to obtain, and
- * the resulting numbers of channels and RX queues.
- */
-static int efx_probe_interrupts(struct efx_nic *efx)
-{
-	unsigned int extra_channels = 0;
-	unsigned int rss_spread;
-	unsigned int i, j;
-	int rc;
-
-	for (i = 0; i < EFX_MAX_EXTRA_CHANNELS; i++)
-		if (efx->extra_channel_type[i])
-			++extra_channels;
-
-	if (efx->interrupt_mode == EFX_INT_MODE_MSIX) {
-		unsigned int parallelism = efx_wanted_parallelism(efx);
-		struct msix_entry xentries[EFX_MAX_CHANNELS];
-		unsigned int n_channels;
-
-		rc = efx_allocate_msix_channels(efx, efx->max_channels,
-						extra_channels, parallelism);
-		if (rc >= 0) {
-			n_channels = rc;
-			for (i = 0; i < n_channels; i++)
-				xentries[i].entry = i;
-			rc = pci_enable_msix_range(efx->pci_dev, xentries, 1,
-						   n_channels);
-		}
-		if (rc < 0) {
-			/* Fall back to single channel MSI */
-			netif_err(efx, drv, efx->net_dev,
-				  "could not enable MSI-X\n");
-			if (efx->type->min_interrupt_mode >= EFX_INT_MODE_MSI)
-				efx->interrupt_mode = EFX_INT_MODE_MSI;
-			else
-				return rc;
-		} else if (rc < n_channels) {
-			netif_err(efx, drv, efx->net_dev,
-				  "WARNING: Insufficient MSI-X vectors"
-				  " available (%d < %u).\n", rc, n_channels);
-			netif_err(efx, drv, efx->net_dev,
-				  "WARNING: Performance may be reduced.\n");
-			n_channels = rc;
-		}
-
-		if (rc > 0) {
-			for (i = 0; i < efx->n_channels; i++)
-				efx_get_channel(efx, i)->irq =
-					xentries[i].vector;
-		}
-	}
-
-	/* Try single interrupt MSI */
-	if (efx->interrupt_mode == EFX_INT_MODE_MSI) {
-		efx->n_channels = 1;
-		efx->n_rx_channels = 1;
-		efx->n_tx_channels = 1;
-		efx->n_xdp_channels = 0;
-		efx->xdp_channel_offset = efx->n_channels;
-		rc = pci_enable_msi(efx->pci_dev);
-		if (rc == 0) {
-			efx_get_channel(efx, 0)->irq = efx->pci_dev->irq;
-		} else {
-			netif_err(efx, drv, efx->net_dev,
-				  "could not enable MSI\n");
-			if (efx->type->min_interrupt_mode >= EFX_INT_MODE_LEGACY)
-				efx->interrupt_mode = EFX_INT_MODE_LEGACY;
-			else
-				return rc;
-		}
-	}
-
-	/* Assume legacy interrupts */
-	if (efx->interrupt_mode == EFX_INT_MODE_LEGACY) {
-		efx->n_channels = 1 + (efx_separate_tx_channels ? 1 : 0);
-		efx->n_rx_channels = 1;
-		efx->n_tx_channels = 1;
-		efx->n_xdp_channels = 0;
-		efx->xdp_channel_offset = efx->n_channels;
-		efx->legacy_irq = efx->pci_dev->irq;
-	}
-
-	/* Assign extra channels if possible, before XDP channels */
-	efx->n_extra_tx_channels = 0;
-	j = efx->xdp_channel_offset;
-	for (i = 0; i < EFX_MAX_EXTRA_CHANNELS; i++) {
-		if (!efx->extra_channel_type[i])
-			continue;
-		if (j <= efx->tx_channel_offset + efx->n_tx_channels) {
-			efx->extra_channel_type[i]->handle_no_channel(efx);
-		} else {
-			--j;
-			efx_get_channel(efx, j)->type =
-				efx->extra_channel_type[i];
-			if (efx_channel_has_tx_queues(efx_get_channel(efx, j)))
-				efx->n_extra_tx_channels++;
-		}
-	}
-
-	rss_spread = efx->n_rx_channels;
-	/* RSS might be usable on VFs even if it is disabled on the PF */
-#ifdef CONFIG_SFC_SRIOV
-	if (efx->type->sriov_wanted) {
-		efx->rss_spread = ((rss_spread > 1 ||
-				    !efx->type->sriov_wanted(efx)) ?
-				   rss_spread : efx_vf_size(efx));
-		return 0;
-	}
-#endif
-	efx->rss_spread = rss_spread;
-
-	return 0;
-}
-
-#if defined(CONFIG_SMP)
-static void efx_set_interrupt_affinity(struct efx_nic *efx)
-{
-	struct efx_channel *channel;
-	unsigned int cpu;
-
-	efx_for_each_channel(channel, efx) {
-		cpu = cpumask_local_spread(channel->channel,
-					   pcibus_to_node(efx->pci_dev->bus));
-		irq_set_affinity_hint(channel->irq, cpumask_of(cpu));
-	}
-}
-
-static void efx_clear_interrupt_affinity(struct efx_nic *efx)
-{
-	struct efx_channel *channel;
-
-	efx_for_each_channel(channel, efx)
-		irq_set_affinity_hint(channel->irq, NULL);
-}
-#else
-static void
-efx_set_interrupt_affinity(struct efx_nic *efx __attribute__ ((unused)))
-{
-}
-
-static void
-efx_clear_interrupt_affinity(struct efx_nic *efx __attribute__ ((unused)))
-{
-}
-#endif /* CONFIG_SMP */
-
-static int efx_soft_enable_interrupts(struct efx_nic *efx)
-{
-	struct efx_channel *channel, *end_channel;
-	int rc;
-
-	BUG_ON(efx->state == STATE_DISABLED);
-
-	efx->irq_soft_enabled = true;
-	smp_wmb();
-
-	efx_for_each_channel(channel, efx) {
-		if (!channel->type->keep_eventq) {
-			rc = efx_init_eventq(channel);
-			if (rc)
-				goto fail;
-		}
-		efx_start_eventq(channel);
-	}
-
-	efx_mcdi_mode_event(efx);
-
-	return 0;
-fail:
-	end_channel = channel;
-	efx_for_each_channel(channel, efx) {
-		if (channel == end_channel)
-			break;
-		efx_stop_eventq(channel);
-		if (!channel->type->keep_eventq)
-			efx_fini_eventq(channel);
-	}
-
-	return rc;
-}
-
-static void efx_soft_disable_interrupts(struct efx_nic *efx)
-{
-	struct efx_channel *channel;
-
-	if (efx->state == STATE_DISABLED)
-		return;
-
-	efx_mcdi_mode_poll(efx);
-
-	efx->irq_soft_enabled = false;
-	smp_wmb();
-
-	if (efx->legacy_irq)
-		synchronize_irq(efx->legacy_irq);
-
-	efx_for_each_channel(channel, efx) {
-		if (channel->irq)
-			synchronize_irq(channel->irq);
-=======
->>>>>>> linux-next/akpm-base
 
 	/* Initialise MAC address to permanent address */
 	ether_addr_copy(efx->net_dev->dev_addr, efx->net_dev->perm_addr);
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c~linux-next-git-rejects
+++ a/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@ -158,11 +158,7 @@ void __init tegra_init_apbmisc(void)
 	}
 
 	apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
-<<<<<<< HEAD
-	if (!apbmisc_base)
-=======
 	if (!apbmisc_base) {
->>>>>>> linux-next/akpm-base
 		pr_err("failed to map APBMISC registers\n");
 	} else {
 		chipid = readl_relaxed(apbmisc_base + 4);
@@ -170,11 +166,7 @@ void __init tegra_init_apbmisc(void)
 	}
 
 	strapping_base = ioremap(straps.start, resource_size(&straps));
-<<<<<<< HEAD
-	if (!strapping_base)
-=======
 	if (!strapping_base) {
->>>>>>> linux-next/akpm-base
 		pr_err("failed to map strapping options registers\n");
 	} else {
 		strapping = readl_relaxed(strapping_base);
--- a/include/linux/lsm_audit.h~linux-next-git-rejects
+++ a/include/linux/lsm_audit.h
@@ -74,12 +74,8 @@ struct common_audit_data {
 #define LSM_AUDIT_DATA_FILE	12
 #define LSM_AUDIT_DATA_IBPKEY	13
 #define LSM_AUDIT_DATA_IBENDPORT 14
-<<<<<<< HEAD
-#define LSM_AUDIT_DATA_LOCKDOWN 15
-=======
 #define LSM_AUDIT_DATA_NOTIFICATION 15
 #define LSM_AUDIT_DATA_LOCKDOWN 16
->>>>>>> linux-next/akpm-base
 	union 	{
 		struct path path;
 		struct dentry *dentry;
--- a/kernel/rcu/tree_exp.h~linux-next-git-rejects
+++ a/kernel/rcu/tree_exp.h
@@ -508,10 +508,6 @@ static void synchronize_rcu_expedited_wa
 				tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP);
 			}
 		}
-<<<<<<< HEAD
-		WARN_ON_ONCE(1);
-=======
->>>>>>> linux-next/akpm-base
 	}
 
 	for (;;) {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-vmscan-remove-unused-reclaim_off-reclaim_zone-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-01-23 22:17 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-01-23 22:17 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/io_uring.c                 |   16 ----------------
 include/uapi/linux/io_uring.h |    3 ---
 2 files changed, 19 deletions(-)

--- a/fs/io_uring.c~linux-next-git-rejects
+++ a/fs/io_uring.c
@@ -5568,29 +5568,13 @@ static int __io_sqe_files_update(struct
 	int fd, i, err;
 	__u32 done;
 
-<<<<<<< HEAD
-	if (!ctx->file_table)
-		return -ENXIO;
-	if (!nr_args)
-		return -EINVAL;
-	if (copy_from_user(&up, arg, sizeof(up)))
-		return -EFAULT;
-	if (up.resv)
-		return -EINVAL;
-	if (check_add_overflow(up.offset, nr_args, &done))
-=======
 	if (check_add_overflow(up->offset, nr_args, &done))
->>>>>>> linux-next/akpm-base
 		return -EOVERFLOW;
 	if (done > ctx->nr_user_files)
 		return -EINVAL;
 
 	done = 0;
-<<<<<<< HEAD
-	fds = u64_to_user_ptr(up.fds);
-=======
 	fds = u64_to_user_ptr(up->fds);
->>>>>>> linux-next/akpm-base
 	while (nr_args) {
 		struct fixed_file_table *table;
 		unsigned index;
--- a/include/uapi/linux/io_uring.h~linux-next-git-rejects
+++ a/include/uapi/linux/io_uring.h
@@ -213,8 +213,6 @@ struct io_uring_files_update {
 	__u32 offset;
 	__u32 resv;
 	__aligned_u64 /* __s32 * */ fds;
-<<<<<<< HEAD
-=======
 };
 
 #define IO_URING_OP_SUPPORTED	(1U << 0)
@@ -232,7 +230,6 @@ struct io_uring_probe {
 	__u16 resv;
 	__u32 resv2[3];
 	struct io_uring_probe_op ops[0];
->>>>>>> linux-next/akpm-base
 };
 
 #endif
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-vmscan-remove-unused-reclaim_off-reclaim_zone-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-01-16  1:29 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-01-16  1:29 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/parisc/kernel/drivers.c |    4 ----
 1 file changed, 4 deletions(-)

--- a/arch/parisc/kernel/drivers.c~linux-next-git-rejects
+++ a/arch/parisc/kernel/drivers.c
@@ -889,11 +889,7 @@ static void print_parisc_device(struct p
 	static int count;
 
 	print_pa_hwpath(dev, hw_path);
-<<<<<<< HEAD
-	pr_info("%d. %s at %pap [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
-=======
 	pr_info("%d. %s at %pa[p] [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
->>>>>>> linux-next/akpm-base
 		++count, dev->name, &(dev->hpa.start), hw_path, dev->id.hw_type,
 		dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-vmscan-remove-unused-reclaim_off-reclaim_zone-fix.patch
mm-mempolicy-skip-walking-hugetlb-vma-if-mpol_mf_strict-is-specified-alone-checkpatch-fixes.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-01-13 21:44 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-01-13 21:44 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/display/intel_display.c    |   17 ----------
 drivers/gpu/drm/i915/gt/intel_ring_submission.c |   22 --------------
 sound/soc/soc-topology.c                        |    4 --
 sound/usb/quirks.c                              |    6 ---
 4 files changed, 49 deletions(-)

--- a/drivers/gpu/drm/i915/display/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/display/intel_display.c
@@ -4963,23 +4963,6 @@ static void icl_enable_trans_port_sync(c
 		   trans_ddi_func_ctl2_val);
 }
 
-<<<<<<< HEAD
-static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_crtc_state)
-{
-	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-
-	if (old_crtc_state->master_transcoder == INVALID_TRANSCODER)
-		return;
-
-	DRM_DEBUG_KMS("Disabling Transcoder Port Sync on Slave Transcoder %s\n",
-		      transcoder_name(old_crtc_state->cpu_transcoder));
-
-	I915_WRITE(TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder), 0);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static void intel_fdi_normal_train(struct intel_crtc *crtc)
 {
 	struct drm_device *dev = crtc->base.dev;
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1559,10 +1559,6 @@ static int switch_mm(struct i915_request
 	if (ret)
 		return ret;
 
-<<<<<<< HEAD
-	if (ce->state) {
-		u32 flags;
-=======
 	/*
 	 * Not only do we need a full barrier (post-sync write) after
 	 * invalidating the TLBs, but we need to wait a little bit
@@ -1574,34 +1570,16 @@ static int switch_mm(struct i915_request
 	ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm), PP_DIR_DCLV_2G);
 	if (ret)
 		return ret;
->>>>>>> linux-next/akpm-base
 
 	return rq->engine->emit_flush(rq, EMIT_INVALIDATE);
 }
 
-<<<<<<< HEAD
-		/* For resource streamer on HSW+ and power context elsewhere */
-		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
-		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
-
-		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
-		if (!i915_gem_context_is_kernel(rq->gem_context))
-			flags |= MI_RESTORE_EXT_STATE_EN;
-		else
-			flags |= MI_RESTORE_INHIBIT;
-
-		ret = mi_set_context(rq, flags);
-		if (ret)
-			return ret;
-	}
-=======
 static int switch_context(struct i915_request *rq)
 {
 	struct intel_context *ce = rq->context;
 	int ret;
 
 	GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
->>>>>>> linux-next/akpm-base
 
 	ret = switch_mm(rq, vm_alias(ce));
 	if (ret)
--- a/sound/soc/soc-topology.c~linux-next-git-rejects
+++ a/sound/soc/soc-topology.c
@@ -549,12 +549,8 @@ static void remove_link(struct snd_soc_c
 		dobj->ops->link_unload(comp, dobj);
 
 	list_del(&dobj->list);
-<<<<<<< HEAD
-	snd_soc_remove_dai_link(comp->card, link);
-=======
 	snd_soc_remove_pcm_runtime(comp->card,
 			snd_soc_get_pcm_runtime(comp->card, link));
->>>>>>> linux-next/akpm-base
 
 	kfree(link->name);
 	kfree(link->stream_name);
--- a/sound/usb/quirks.c~linux-next-git-rejects
+++ a/sound/usb/quirks.c
@@ -1396,15 +1396,9 @@ bool snd_usb_get_sample_rate_quirk(struc
 	case USB_ID(0x041e, 0x4080): /* Creative Live Cam VF0610 */
 	case USB_ID(0x04d8, 0xfeea): /* Benchmark DAC1 Pre */
 	case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
-<<<<<<< HEAD
-	case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
-	case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */
-	case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
-=======
 	case USB_ID(0x05a3, 0x9420): /* ELP HD USB Camera */
 	case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */
 	case USB_ID(0x074d, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
->>>>>>> linux-next/akpm-base
 	case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */
 	case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */
 	case USB_ID(0x21b4, 0x0081): /* AudioQuest DragonFly */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-rejects.patch
linux-next-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2020-01-09 19:21 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2020-01-09 19:21 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/spi/spi-dw.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/drivers/spi/spi-dw.c~linux-next-git-rejects
+++ a/drivers/spi/spi-dw.c
@@ -296,12 +296,9 @@ static int dw_spi_transfer_one(struct sp
 	dws->rx_end = dws->rx + transfer->len;
 	dws->len = transfer->len;
 	spin_unlock_irqrestore(&dws->buf_lock, flags);
-<<<<<<< HEAD
-=======
 
 	/* Ensure dw->rx and dw->rx_end are visible */
 	smp_mb();
->>>>>>> linux-next/akpm-base
 
 	spi_enable_chip(dws, 0);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
bitops-more-bits_to_-macros-fix.patch
bitops-more-bits_to_-macros-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-02-09 20:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-02-09 20:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm64/include/asm/pgtable-prot.h |    5 -----
 1 file changed, 5 deletions(-)

diff -puN arch/arm64/include/asm/pgtable-prot.h~linux-next-git-rejects arch/arm64/include/asm/pgtable-prot.h
--- a/arch/arm64/include/asm/pgtable-prot.h~linux-next-git-rejects
+++ a/arch/arm64/include/asm/pgtable-prot.h
@@ -67,13 +67,8 @@
 #define PAGE_HYP_RO		__pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN)
 #define PAGE_HYP_DEVICE		__pgprot(PROT_DEVICE_nGnRE | PTE_HYP)
 
-<<<<<<< HEAD
-#define PAGE_S2			__pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY)
-#define PAGE_S2_DEVICE		__pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN)
-=======
 #define PAGE_S2			__pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY | PTE_S2_XN)
 #define PAGE_S2_DEVICE		__pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_S2_XN)
->>>>>>> linux-next/akpm-base
 
 #define PAGE_NONE		__pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN)
 #define PAGE_SHARED		__pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN | PTE_WRITE)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
include-linux-sched-mmh-re-inline-mmdrop.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-02-06 19:46 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-02-06 19:46 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/overlayfs/export.c |    6 ------
 fs/overlayfs/namei.c  |    5 -----
 2 files changed, 11 deletions(-)

diff -puN fs/overlayfs/export.c~linux-next-git-rejects fs/overlayfs/export.c
--- a/fs/overlayfs/export.c~linux-next-git-rejects
+++ a/fs/overlayfs/export.c
@@ -108,12 +108,6 @@ static int ovl_d_to_fh(struct dentry *de
 
 	/* Encode an upper or origin file handle */
 	fh = ovl_encode_fh(origin ?: ovl_dentry_upper(dentry), !origin);
-<<<<<<< HEAD
-	err = PTR_ERR(fh);
-	if (IS_ERR(fh))
-		goto fail;
-=======
->>>>>>> linux-next/akpm-base
 
 	err = -EOVERFLOW;
 	if (fh->len > buflen)
diff -puN fs/overlayfs/namei.c~linux-next-git-rejects fs/overlayfs/namei.c
--- a/fs/overlayfs/namei.c~linux-next-git-rejects
+++ a/fs/overlayfs/namei.c
@@ -976,11 +976,6 @@ struct dentry *ovl_lookup(struct inode *
 		upperdentry = dget(index);
 
 	if (upperdentry || ctr) {
-<<<<<<< HEAD
-		if (ctr)
-			origin = stack[0].dentry;
-=======
->>>>>>> linux-next/akpm-base
 		inode = ovl_get_inode(dentry->d_sb, upperdentry, origin, index,
 				      ctr);
 		err = PTR_ERR(inode);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
include-linux-sched-mmh-re-inline-mmdrop.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
kasan-clean-up-kasan_shadow_scale_shift-usage-checkpatch-fixes.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
maintainers-update-arm-oxnas-platform-support-patterns-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-02-02 20:45 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-02-02 20:45 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/core-api/printk-formats.rst  |   36 -------------------
 drivers/Kconfig                            |    6 ---
 drivers/Makefile                           |    6 ---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h |    8 ----
 drivers/net/wireless/mac80211_hwsim.c      |    8 ----
 drivers/net/wireless/mac80211_hwsim.h      |    6 ---
 drivers/pinctrl/Kconfig                    |    3 -
 drivers/pinctrl/pinctrl-axp209.c           |    6 ---
 8 files changed, 79 deletions(-)

diff -puN Documentation/core-api/printk-formats.rst~linux-next-git-rejects Documentation/core-api/printk-formats.rst
--- a/Documentation/core-api/printk-formats.rst~linux-next-git-rejects
+++ a/Documentation/core-api/printk-formats.rst
@@ -68,28 +68,6 @@ Symbols/Function Pointers
 
 ::
 
-<<<<<<< HEAD
-	%pF	versatile_init+0x0/0x110
-	%pf	versatile_init
-	%pS	versatile_init+0x0/0x110
-	%pSR	versatile_init+0x9/0x110
-		(with __builtin_extract_return_addr() translation)
-	%ps	versatile_init
-	%pB	prev_fn_of_versatile_init+0x88/0x88
-
-
-The ``F`` and ``f`` specifiers are for printing function pointers,
-for example, f->func, &gettimeofday. They have the same result as
-``S`` and ``s`` specifiers. But they do an extra conversion on
-ia64, ppc64 and parisc64 architectures where the function pointers
-are actually function descriptors.
-
-The ``S`` and ``s`` specifiers can be used for printing symbols
-from direct addresses, for example, __builtin_return_address(0),
-(void *)regs->ip. They result in the symbol name with (S) or
-without (s) offsets. If KALLSYMS are disabled then the symbol
-address is printed instead.
-=======
 	%pS	versatile_init+0x0/0x110
 	%ps	versatile_init
 	%pF	versatile_init+0x0/0x110
@@ -109,26 +87,12 @@ descriptors, which require additional de
 the symbol. As of now, ``S`` and ``s`` perform dereferencing on those
 platforms (when needed), so ``F`` and ``f`` exist for compatibility
 reasons only.
->>>>>>> linux-next/akpm-base
 
 The ``B`` specifier results in the symbol name with offsets and should be
 used when printing stack backtraces. The specifier takes into
 consideration the effect of compiler optimisations which may occur
 when tail-calls are used and marked with the noreturn GCC attribute.
 
-<<<<<<< HEAD
-Examples::
-
-	printk("Going to call: %pF\n", gettimeofday);
-	printk("Going to call: %pF\n", p->func);
-	printk("%s: called from %pS\n", __func__, (void *)_RET_IP_);
-	printk("%s: called from %pS\n", __func__,
-				(void *)__builtin_return_address(0));
-	printk("Faulted at %pS\n", (void *)regs->ip);
-	printk(" %s%pB\n", (reliable ? "" : "? "), (void *)*stack);
-
-=======
->>>>>>> linux-next/akpm-base
 Kernel Pointers
 ---------------
 
diff -puN drivers/Kconfig~linux-next-git-rejects drivers/Kconfig
--- a/drivers/Kconfig~linux-next-git-rejects
+++ a/drivers/Kconfig
@@ -213,18 +213,12 @@ source "drivers/mux/Kconfig"
 
 source "drivers/opp/Kconfig"
 
-<<<<<<< HEAD
 source "drivers/visorbus/Kconfig"
 
-=======
->>>>>>> linux-next/akpm-base
 source "drivers/siox/Kconfig"
 
 source "drivers/slimbus/Kconfig"
 
-<<<<<<< HEAD
-=======
 source "drivers/visorbus/Kconfig"
 
->>>>>>> linux-next/akpm-base
 endmenu
diff -puN drivers/Makefile~linux-next-git-rejects drivers/Makefile
--- a/drivers/Makefile~linux-next-git-rejects
+++ a/drivers/Makefile
@@ -186,10 +186,4 @@ obj-$(CONFIG_FPGA)		+= fpga/
 obj-$(CONFIG_FSI)		+= fsi/
 obj-$(CONFIG_TEE)		+= tee/
 obj-$(CONFIG_MULTIPLEXER)	+= mux/
-<<<<<<< HEAD
 obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus/
-obj-$(CONFIG_SIOX)		+= siox/
-=======
-obj-$(CONFIG_SIOX)		+= siox/
-obj-$(CONFIG_UNISYS_VISORBUS)	+= visorbus/
->>>>>>> linux-next/akpm-base
diff -puN drivers/net/ethernet/chelsio/cxgb4/cxgb4.h~linux-next-git-rejects drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h~linux-next-git-rejects
+++ a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1752,11 +1752,8 @@ void free_rspq_fl(struct adapter *adap,
 void free_tx_desc(struct adapter *adap, struct sge_txq *q,
 		  unsigned int n, bool unmap);
 void free_txq(struct adapter *adap, struct sge_txq *q);
-<<<<<<< HEAD
-=======
 int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,
 		    u16 vlan);
->>>>>>> linux-next/akpm-base
 void cxgb4_reclaim_completed_tx(struct adapter *adap,
 				struct sge_txq *q, bool unmap);
 int cxgb4_map_skb(struct device *dev, const struct sk_buff *skb,
@@ -1767,9 +1764,4 @@ void cxgb4_write_sgl(const struct sk_buf
 		     struct ulptx_sgl *sgl, u64 *end, unsigned int start,
 		     const dma_addr_t *addr);
 void cxgb4_ring_tx_db(struct adapter *adap, struct sge_txq *q, int n);
-<<<<<<< HEAD
-int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,
-		    u16 vlan);
-=======
->>>>>>> linux-next/akpm-base
 #endif /* __CXGB4_H__ */
diff -puN drivers/net/wireless/mac80211_hwsim.c~linux-next-git-rejects drivers/net/wireless/mac80211_hwsim.c
--- a/drivers/net/wireless/mac80211_hwsim.c~linux-next-git-rejects
+++ a/drivers/net/wireless/mac80211_hwsim.c
@@ -2798,16 +2798,11 @@ static int mac80211_hwsim_new_radio(stru
 	err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht,
 				     hwsim_rht_params);
 	if (err < 0) {
-<<<<<<< HEAD
-		pr_debug("mac80211_hwsim: radio index %d already present\n",
-			 idx);
-=======
 		if (info) {
 			GENL_SET_ERR_MSG(info, "perm addr already present");
 			NL_SET_BAD_ATTR(info->extack,
 					info->attrs[HWSIM_ATTR_PERM_ADDR]);
 		}
->>>>>>> linux-next/akpm-base
 		spin_unlock_bh(&hwsim_radio_lock);
 		goto failed_final_insert;
 	}
@@ -3284,10 +3279,7 @@ static int hwsim_del_radio_nl(struct sk_
 		list_del(&data->list);
 		rhashtable_remove_fast(&hwsim_radios_rht, &data->rht,
 				       hwsim_rht_params);
-<<<<<<< HEAD
-=======
 		hwsim_radios_generation++;
->>>>>>> linux-next/akpm-base
 		spin_unlock_bh(&hwsim_radio_lock);
 		mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy),
 					 info);
diff -puN drivers/net/wireless/mac80211_hwsim.h~linux-next-git-rejects drivers/net/wireless/mac80211_hwsim.h
--- a/drivers/net/wireless/mac80211_hwsim.h~linux-next-git-rejects
+++ a/drivers/net/wireless/mac80211_hwsim.h
@@ -131,10 +131,7 @@ enum {
  * @HWSIM_ATTR_FREQ: Frequency at which packet is transmitted or received.
  * @HWSIM_ATTR_TX_INFO_FLAGS: additional flags for corresponding
  *	rates of %HWSIM_ATTR_TX_INFO
-<<<<<<< HEAD
-=======
  * @HWSIM_ATTR_PERM_ADDR: permanent mac address of new radio
->>>>>>> linux-next/akpm-base
  * @__HWSIM_ATTR_MAX: enum limit
  */
 
@@ -162,10 +159,7 @@ enum {
 	HWSIM_ATTR_FREQ,
 	HWSIM_ATTR_PAD,
 	HWSIM_ATTR_TX_INFO_FLAGS,
-<<<<<<< HEAD
-=======
 	HWSIM_ATTR_PERM_ADDR,
->>>>>>> linux-next/akpm-base
 	__HWSIM_ATTR_MAX,
 };
 #define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)
diff -puN drivers/pinctrl/Kconfig~linux-next-git-rejects drivers/pinctrl/Kconfig
--- a/drivers/pinctrl/Kconfig~linux-next-git-rejects
+++ a/drivers/pinctrl/Kconfig
@@ -66,13 +66,10 @@ config PINCTRL_AS3722
 config PINCTRL_AXP209
 	tristate "X-Powers AXP209 PMIC pinctrl and GPIO Support"
 	depends on MFD_AXP20X
-<<<<<<< HEAD
-=======
 	depends on OF
 	select PINMUX
 	select GENERIC_PINCONF
 	select GPIOLIB
->>>>>>> linux-next/akpm-base
 	help
 	  AXP PMICs provides multiple GPIOs that can be muxed for different
 	  functions. This driver bundles a pinctrl driver to select the function
diff -puN drivers/pinctrl/pinctrl-axp209.c~linux-next-git-rejects drivers/pinctrl/pinctrl-axp209.c
--- a/drivers/pinctrl/pinctrl-axp209.c~linux-next-git-rejects
+++ a/drivers/pinctrl/pinctrl-axp209.c
@@ -413,17 +413,11 @@ static int axp20x_pctl_probe(struct plat
 	pctl->chip.set			= axp20x_gpio_set;
 	pctl->chip.direction_input	= axp20x_gpio_input;
 	pctl->chip.direction_output	= axp20x_gpio_output;
-<<<<<<< HEAD
-	pctl->chip.ngpio		= pctl->desc->npins;
-
-	pctl->desc = (struct axp20x_pctrl_desc *)of_device_get_match_data(dev);
-=======
 
 	pctl->desc = of_device_get_match_data(dev);
 
 	pctl->chip.ngpio		= pctl->desc->npins;
 
->>>>>>> linux-next/akpm-base
 	pctl->regmap = axp20x->regmap;
 	pctl->dev = &pdev->dev;
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
include-linux-sched-mmh-re-inline-mmdrop.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
kasan-clean-up-kasan_shadow_scale_shift-usage-checkpatch-fixes.patch
lib-ubsanc-s-missaligned-misaligned.patch
fs-crypto-hooksc-fix-build-with-gcc-444.patch
maintainers-update-arm-oxnas-platform-support-patterns-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-01-26 20:06 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-01-26 20:06 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/virtual/kvm/api.txt    |   97 -------------------------
 arch/powerpc/kernel/setup-common.c   |    4 -
 drivers/gpu/drm/i915/intel_display.c |   58 --------------
 drivers/i2c/i2c-core-smbus.c         |    3 
 drivers/net/tun.c                    |   14 +--
 net/ipv4/esp4_offload.c              |    9 --
 net/ipv6/esp6_offload.c              |    9 --
 7 files changed, 5 insertions(+), 189 deletions(-)

diff -puN arch/powerpc/kernel/setup-common.c~linux-next-git-rejects arch/powerpc/kernel/setup-common.c
--- a/arch/powerpc/kernel/setup-common.c~linux-next-git-rejects
+++ a/arch/powerpc/kernel/setup-common.c
@@ -347,10 +347,6 @@ static int show_cpuinfo(struct seq_file
 		   (loops_per_jiffy / (5000/HZ)) % 100);
 #endif
 	seq_printf(m, "\n");
-<<<<<<< HEAD
-#endif
-=======
->>>>>>> linux-next/akpm-base
 	/* If this is the last cpu, print the summary */
 	if (cpumask_next(cpu_id, cpu_online_mask) >= nr_cpu_ids)
 		show_cpuinfo_summary(m);
diff -puN Documentation/virtual/kvm/api.txt~linux-next-git-rejects Documentation/virtual/kvm/api.txt
--- a/Documentation/virtual/kvm/api.txt~linux-next-git-rejects
+++ a/Documentation/virtual/kvm/api.txt
@@ -3404,103 +3404,6 @@ invalid, if invalid pages are written to
 or if no page table is present for the addresses (e.g. when using
 hugepages).
 
-<<<<<<< HEAD
-4.108 KVM_PPC_GET_CPU_CHAR
-
-Capability: KVM_CAP_PPC_GET_CPU_CHAR
-Architectures: powerpc
-Type: vm ioctl
-Parameters: struct kvm_ppc_cpu_char (out)
-Returns: 0 on successful completion
-	 -EFAULT if struct kvm_ppc_cpu_char cannot be written
-
-This ioctl gives userspace information about certain characteristics
-of the CPU relating to speculative execution of instructions and
-possible information leakage resulting from speculative execution (see
-CVE-2017-5715, CVE-2017-5753 and CVE-2017-5754).  The information is
-returned in struct kvm_ppc_cpu_char, which looks like this:
-
-struct kvm_ppc_cpu_char {
-	__u64	character;		/* characteristics of the CPU */
-	__u64	behaviour;		/* recommended software behaviour */
-	__u64	character_mask;		/* valid bits in character */
-	__u64	behaviour_mask;		/* valid bits in behaviour */
-};
-
-For extensibility, the character_mask and behaviour_mask fields
-indicate which bits of character and behaviour have been filled in by
-the kernel.  If the set of defined bits is extended in future then
-userspace will be able to tell whether it is running on a kernel that
-knows about the new bits.
-
-The character field describes attributes of the CPU which can help
-with preventing inadvertent information disclosure - specifically,
-whether there is an instruction to flash-invalidate the L1 data cache
-(ori 30,30,0 or mtspr SPRN_TRIG2,rN), whether the L1 data cache is set
-to a mode where entries can only be used by the thread that created
-them, whether the bcctr[l] instruction prevents speculation, and
-whether a speculation barrier instruction (ori 31,31,0) is provided.
-
-The behaviour field describes actions that software should take to
-prevent inadvertent information disclosure, and thus describes which
-vulnerabilities the hardware is subject to; specifically whether the
-L1 data cache should be flushed when returning to user mode from the
-kernel, and whether a speculation barrier should be placed between an
-array bounds check and the array access.
-
-These fields use the same bit definitions as the new
-H_GET_CPU_CHARACTERISTICS hypercall.
-=======
-4.109 KVM_MEMORY_ENCRYPT_OP
-
-Capability: basic
-Architectures: x86
-Type: system
-Parameters: an opaque platform specific structure (in/out)
-Returns: 0 on success; -1 on error
-
-If the platform supports creating encrypted VMs then this ioctl can be used
-for issuing platform-specific memory encryption commands to manage those
-encrypted VMs.
-
-Currently, this ioctl is used for issuing Secure Encrypted Virtualization
-(SEV) commands on AMD Processors. The SEV commands are defined in
-Documentation/virtual/kvm/amd-memory-encryption.txt.
-
-4.110 KVM_MEMORY_ENCRYPT_REG_REGION
-
-Capability: basic
-Architectures: x86
-Type: system
-Parameters: struct kvm_enc_region (in)
-Returns: 0 on success; -1 on error
-
-This ioctl can be used to register a guest memory region which may
-contain encrypted data (e.g. guest RAM, SMRAM etc).
-
-It is used in the SEV-enabled guest. When encryption is enabled, a guest
-memory region may contain encrypted data. The SEV memory encryption
-engine uses a tweak such that two identical plaintext pages, each at
-different locations will have differing ciphertexts. So swapping or
-moving ciphertext of those pages will not result in plaintext being
-swapped. So relocating (or migrating) physical backing pages for the SEV
-guest will require some additional steps.
-
-Note: The current SEV key management spec does not provide commands to
-swap or migrate (move) ciphertext pages. Hence, for now we pin the guest
-memory region registered with the ioctl.
-
-4.111 KVM_MEMORY_ENCRYPT_UNREG_REGION
-
-Capability: basic
-Architectures: x86
-Type: system
-Parameters: struct kvm_enc_region (in)
-Returns: 0 on success; -1 on error
-
-This ioctl can be used to unregister the guest memory region registered
-with KVM_MEMORY_ENCRYPT_REG_REGION ioctl above.
->>>>>>> linux-next/akpm-base
 
 5. The kvm_run structure
 ------------------------
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -3296,22 +3296,12 @@ static void i9xx_disable_plane(struct in
 	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
 }
 
-<<<<<<< HEAD
-static bool i9xx_plane_get_hw_state(struct intel_plane *primary)
-{
-
-	struct drm_i915_private *dev_priv = to_i915(primary->base.dev);
-	enum intel_display_power_domain power_domain;
-	enum plane plane = primary->plane;
-	enum pipe pipe = primary->pipe;
-=======
 static bool i9xx_plane_get_hw_state(struct intel_plane *plane)
 {
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 	enum intel_display_power_domain power_domain;
 	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
 	enum pipe pipe = plane->pipe;
->>>>>>> linux-next/akpm-base
 	bool ret;
 
 	/*
@@ -3323,11 +3313,7 @@ static bool i9xx_plane_get_hw_state(stru
 	if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
 		return false;
 
-<<<<<<< HEAD
-	ret = I915_READ(DSPCNTR(plane)) & DISPLAY_PLANE_ENABLE;
-=======
 	ret = I915_READ(DSPCNTR(i9xx_plane)) & DISPLAY_PLANE_ENABLE;
->>>>>>> linux-next/akpm-base
 
 	intel_display_power_put(dev_priv, power_domain);
 
@@ -4869,11 +4855,6 @@ void hsw_enable_ips(const struct intel_c
 	 */
 	WARN_ON(!(crtc_state->active_planes & ~BIT(PLANE_CURSOR)));
 
-<<<<<<< HEAD
-	assert_plane_enabled(to_intel_plane(crtc->base.primary));
-
-=======
->>>>>>> linux-next/akpm-base
 	if (IS_BROADWELL(dev_priv)) {
 		mutex_lock(&dev_priv->pcu_lock);
 		WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL,
@@ -4907,11 +4888,6 @@ void hsw_disable_ips(const struct intel_
 	if (!crtc_state->ips_enabled)
 		return;
 
-<<<<<<< HEAD
-	assert_plane_enabled(to_intel_plane(crtc->base.primary));
-
-=======
->>>>>>> linux-next/akpm-base
 	if (IS_BROADWELL(dev_priv)) {
 		mutex_lock(&dev_priv->pcu_lock);
 		WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, 0));
@@ -13204,26 +13180,16 @@ intel_primary_plane_create(struct drm_i9
 		num_formats = ARRAY_SIZE(i965_primary_formats);
 		modifiers = i9xx_format_modifiers;
 
-<<<<<<< HEAD
-		primary->update_plane = i9xx_update_primary_plane;
-		primary->disable_plane = i9xx_disable_primary_plane;
-=======
 		primary->update_plane = i9xx_update_plane;
 		primary->disable_plane = i9xx_disable_plane;
->>>>>>> linux-next/akpm-base
 		primary->get_hw_state = i9xx_plane_get_hw_state;
 	} else {
 		intel_primary_formats = i8xx_primary_formats;
 		num_formats = ARRAY_SIZE(i8xx_primary_formats);
 		modifiers = i9xx_format_modifiers;
 
-<<<<<<< HEAD
-		primary->update_plane = i9xx_update_primary_plane;
-		primary->disable_plane = i9xx_disable_primary_plane;
-=======
 		primary->update_plane = i9xx_update_plane;
 		primary->disable_plane = i9xx_disable_plane;
->>>>>>> linux-next/akpm-base
 		primary->get_hw_state = i9xx_plane_get_hw_state;
 	}
 
@@ -14713,38 +14679,15 @@ void i830_disable_pipe(struct drm_i915_p
 }
 
 static bool intel_plane_mapping_ok(struct intel_crtc *crtc,
-<<<<<<< HEAD
-				   struct intel_plane *primary)
-{
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	enum plane plane = primary->plane;
-	u32 val = I915_READ(DSPCNTR(plane));
-=======
 				   struct intel_plane *plane)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
 	u32 val = I915_READ(DSPCNTR(i9xx_plane));
->>>>>>> linux-next/akpm-base
 
 	return (val & DISPLAY_PLANE_ENABLE) == 0 ||
 		(val & DISPPLANE_SEL_PIPE_MASK) == DISPPLANE_SEL_PIPE(crtc->pipe);
 }
-<<<<<<< HEAD
-
-static void
-intel_sanitize_plane_mapping(struct drm_i915_private *dev_priv)
-{
-	struct intel_crtc *crtc;
-
-	if (INTEL_GEN(dev_priv) >= 4)
-		return;
-
-	for_each_intel_crtc(&dev_priv->drm, crtc) {
-		struct intel_plane *plane =
-			to_intel_plane(crtc->base.primary);
-
-=======
 
 static void
 intel_sanitize_plane_mapping(struct drm_i915_private *dev_priv)
@@ -14758,7 +14701,6 @@ intel_sanitize_plane_mapping(struct drm_
 		struct intel_plane *plane =
 			to_intel_plane(crtc->base.primary);
 
->>>>>>> linux-next/akpm-base
 		if (intel_plane_mapping_ok(crtc, plane))
 			continue;
 
diff -puN drivers/i2c/i2c-core-smbus.c~linux-next-git-rejects drivers/i2c/i2c-core-smbus.c
--- a/drivers/i2c/i2c-core-smbus.c~linux-next-git-rejects
+++ a/drivers/i2c/i2c-core-smbus.c
@@ -433,10 +433,7 @@ static s32 i2c_smbus_xfer_emulated(struc
 			i2c_smbus_try_get_dmabuf(&msg[1], 0);
 		} else {
 			msg[0].len = data->block[0] + 1;
-<<<<<<< HEAD
-=======
 			i2c_smbus_try_get_dmabuf(&msg[0], command);
->>>>>>> linux-next/akpm-base
 			for (i = 1; i <= data->block[0]; i++)
 				msg[0].buf[i] = data->block[i];
 		}
diff -puN drivers/net/tun.c~linux-next-git-rejects drivers/net/tun.c
--- a/drivers/net/tun.c~linux-next-git-rejects
+++ a/drivers/net/tun.c
@@ -681,10 +681,10 @@ static void tun_queue_purge(struct tun_f
 
 static void tun_cleanup_tx_array(struct tun_file *tfile)
 {
-	if (tfile->tx_array.ring.queue) {
-		skb_array_cleanup(&tfile->tx_array);
-		memset(&tfile->tx_array, 0, sizeof(tfile->tx_array));
-	}
+//	if (tfile->tx_ring.queue) {
+//		skb_array_cleanup(&tfile->tx_ring);
+//		memset(&tfile->tx_ring, 0, sizeof(tfile->tx_ring));
+//	}
 }
 
 static void __tun_detach(struct tun_file *tfile, bool clean)
@@ -733,14 +733,10 @@ static void __tun_detach(struct tun_file
 			    tun->dev->reg_state == NETREG_REGISTERED)
 				unregister_netdevice(tun->dev);
 		}
-<<<<<<< HEAD
-		tun_cleanup_tx_array(tfile);
-=======
 		if (tun) {
 			ptr_ring_cleanup(&tfile->tx_ring, tun_ptr_free);
 			xdp_rxq_info_unreg(&tfile->xdp_rxq);
 		}
->>>>>>> linux-next/akpm-base
 		sock_put(&tfile->sk);
 	}
 }
@@ -3159,7 +3155,7 @@ static int tun_chr_open(struct inode *in
 
 	sock_set_flag(&tfile->sk, SOCK_ZEROCOPY);
 
-	memset(&tfile->tx_array, 0, sizeof(tfile->tx_array));
+	memset(&tfile->tx_ring, 0, sizeof(tfile->tx_ring));
 
 	return 0;
 }
diff -puN net/ipv4/esp4_offload.c~linux-next-git-rejects net/ipv4/esp4_offload.c
--- a/net/ipv4/esp4_offload.c~linux-next-git-rejects
+++ a/net/ipv4/esp4_offload.c
@@ -116,16 +116,7 @@ static struct sk_buff *esp4_gso_segment(
 	struct xfrm_offload *xo = xfrm_offload(skb);
 
 	if (!xo)
-<<<<<<< HEAD
-		goto out;
-
-	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
-		goto out;
-
-	seq = xo->seq.low;
-=======
 		return ERR_PTR(-EINVAL);
->>>>>>> linux-next/akpm-base
 
 	x = skb->sp->xvec[skb->sp->len - 1];
 	aead = x->data;
diff -puN net/ipv6/esp6_offload.c~linux-next-git-rejects net/ipv6/esp6_offload.c
--- a/net/ipv6/esp6_offload.c~linux-next-git-rejects
+++ a/net/ipv6/esp6_offload.c
@@ -143,16 +143,7 @@ static struct sk_buff *esp6_gso_segment(
 	struct xfrm_offload *xo = xfrm_offload(skb);
 
 	if (!xo)
-<<<<<<< HEAD
-		goto out;
-
-	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_ESP))
-		goto out;
-
-	seq = xo->seq.low;
-=======
 		return ERR_PTR(-EINVAL);
->>>>>>> linux-next/akpm-base
 
 	x = skb->sp->xvec[skb->sp->len - 1];
 	aead = x->data;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
mm-zsmalloc-simplify-shrinker-init-destroy-fix.patch
mm-fadvise-discard-partial-page-if-endbyte-is-also-eof-fix.patch
mm-page_owner-clean-up-init_pages_in_zone-v3-fix.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
kasan-clean-up-kasan_shadow_scale_shift-usage-checkpatch-fixes.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
fs-crypto-hooksc-fix-build-with-gcc-444.patch
include-linux-mtd-rawnandh-fix-build-with-gcc-444.patch
net-sched-sch_prioc-work-around-gcc-444-union-initializer-issues.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-01-16 19:29 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-01-16 19:29 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/bpf/arraymap.c |   13 -------------
 kernel/bpf/verifier.c |    4 ----
 net/sctp/socket.c     |    4 ----
 3 files changed, 21 deletions(-)

diff -puN kernel/bpf/arraymap.c~linux-next-git-rejects kernel/bpf/arraymap.c
--- a/kernel/bpf/arraymap.c~linux-next-git-rejects
+++ a/kernel/bpf/arraymap.c
@@ -56,11 +56,7 @@ static struct bpf_map *array_map_alloc(u
 	u32 elem_size, index_mask, max_entries;
 	bool unpriv = !capable(CAP_SYS_ADMIN);
 	struct bpf_array *array;
-<<<<<<< HEAD
-	u64 array_size;
-=======
 	u64 array_size, mask64;
->>>>>>> linux-next/akpm-base
 
 	/* check sanity of attributes */
 	if (attr->max_entries == 0 || attr->key_size != 4 ||
@@ -78,11 +74,6 @@ static struct bpf_map *array_map_alloc(u
 	elem_size = round_up(attr->value_size, 8);
 
 	max_entries = attr->max_entries;
-<<<<<<< HEAD
-	index_mask = roundup_pow_of_two(max_entries) - 1;
-
-	if (unpriv)
-=======
 
 	/* On 32 bit archs roundup_pow_of_two() with max_entries that has
 	 * upper most bit set in u32 space is undefined behavior due to
@@ -94,18 +85,14 @@ static struct bpf_map *array_map_alloc(u
 
 	index_mask = mask64;
 	if (unpriv) {
->>>>>>> linux-next/akpm-base
 		/* round up array size to nearest power of 2,
 		 * since cpu will speculate within index_mask limits
 		 */
 		max_entries = index_mask + 1;
-<<<<<<< HEAD
-=======
 		/* Check for overflows. */
 		if (max_entries < attr->max_entries)
 			return ERR_PTR(-E2BIG);
 	}
->>>>>>> linux-next/akpm-base
 
 	array_size = sizeof(*array);
 	if (percpu)
diff -puN kernel/bpf/verifier.c~linux-next-git-rejects kernel/bpf/verifier.c
--- a/kernel/bpf/verifier.c~linux-next-git-rejects
+++ a/kernel/bpf/verifier.c
@@ -5349,11 +5349,7 @@ static int fixup_bpf_calls(struct bpf_ve
 			 */
 			map_ptr = env->insn_aux_data[i + delta].map_ptr;
 			if (map_ptr == BPF_MAP_PTR_POISON) {
-<<<<<<< HEAD
-				verbose(env, "tail_call obusing map_ptr\n");
-=======
 				verbose(env, "tail_call abusing map_ptr\n");
->>>>>>> linux-next/akpm-base
 				return -EINVAL;
 			}
 			if (!map_ptr->unpriv_array)
diff -puN net/sctp/socket.c~linux-next-git-rejects net/sctp/socket.c
--- a/net/sctp/socket.c~linux-next-git-rejects
+++ a/net/sctp/socket.c
@@ -5085,11 +5085,7 @@ static int sctp_getsockopt_autoclose(str
 	len = sizeof(int);
 	if (put_user(len, optlen))
 		return -EFAULT;
-<<<<<<< HEAD
-	if (copy_to_user(optval, &sctp_sk(sk)->autoclose, len))
-=======
 	if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval))
->>>>>>> linux-next/akpm-base
 		return -EFAULT;
 	return 0;
 }
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
mm-zsmalloc-simplify-shrinker-init-destroy-fix.patch
mm-fadvise-discard-partial-page-if-endbyte-is-also-eof-fix.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
net-ipv6-routec-work-around-gcc-444-anon-union-initializer-issue.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-01-10 19:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-01-10 19:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN drivers/infiniband/ulp/srpt/ib_srpt.c~linux-next-git-rejects drivers/infiniband/ulp/srpt/ib_srpt.c
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c~linux-next-git-rejects
+++ a/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2126,15 +2126,8 @@ static int srpt_cm_req_recv(struct ib_cm
 		goto destroy_ib;
 	}
 
-<<<<<<< HEAD
-	guid = (__be16 *)&param->primary_path->dgid.global.interface_id;
-	snprintf(ch->ini_guid, sizeof(ch->ini_guid), "%04x:%04x:%04x:%04x",
-		 be16_to_cpu(guid[0]), be16_to_cpu(guid[1]),
-		 be16_to_cpu(guid[2]), be16_to_cpu(guid[3]));
-=======
 	srpt_format_guid(ch->ini_guid, sizeof(ch->ini_guid),
 			 &param->primary_path->dgid.global.interface_id);
->>>>>>> linux-next/akpm-base
 	snprintf(ch->sess_name, sizeof(ch->sess_name), "0x%016llx%016llx",
 			be64_to_cpu(*(__be64 *)ch->i_port_id),
 			be64_to_cpu(*(__be64 *)(ch->i_port_id + 8)));
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
mm-zsmalloc-simplify-shrinker-init-destroy-fix.patch
mm-fadvise-discard-partial-page-if-endbyte-is-also-eof-fix.patch
mm-migrate-remove-reason-argument-from-new_page_t-fix-fix.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-01-05 20:16 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-01-05 20:16 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/boot/dts/aspeed-g4.dtsi |    4 ----
 1 file changed, 4 deletions(-)

diff -puN arch/arm/boot/dts/aspeed-g4.dtsi~linux-next-git-rejects arch/arm/boot/dts/aspeed-g4.dtsi
--- a/arch/arm/boot/dts/aspeed-g4.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -203,11 +203,7 @@
 				reg = <0x1e787000 0x40>;
 				reg-shift = <2>;
 				interrupts = <8>;
-<<<<<<< HEAD
-				clocks = <&clk_uart>;
-=======
 				clocks = <&syscon ASPEED_CLK_APB>;
->>>>>>> linux-next/akpm-base
 				no-loopback-test;
 				status = "disabled";
 			};
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
kernel-exitc-export-abort-to-modules.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
mm-zsmalloc-simplify-shrinker-init-destroy-fix.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2018-01-02 19:51 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2018-01-02 19:51 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/clk/clk.c                                           |    3 
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c |   36 
 drivers/gpu/drm/drm_syncobj.c                               |    3 
 drivers/gpu/drm/i915/intel_ddi.c                            |    4 
 drivers/gpu/drm/i915/intel_display.c                        |   28 
 drivers/net/ethernet/netronome/nfp/bpf/main.c               |   56 -
 drivers/net/phy/marvell.c                                   |    4 
 kernel/bpf/verifier.c                                       |    3 
 net/ipv6/route.c                                            |    6 
 tools/testing/selftests/bpf/test_verifier.c                 |  553 ----------
 10 files changed, 696 deletions(-)

diff -puN drivers/clk/clk.c~linux-next-git-rejects drivers/clk/clk.c
--- a/drivers/clk/clk.c~linux-next-git-rejects
+++ a/drivers/clk/clk.c
@@ -1821,8 +1821,6 @@ static void clk_change_rate(struct clk_c
 		clk_change_rate(core->new_child);
 
 	clk_pm_runtime_put(core);
-<<<<<<< HEAD
-=======
 }
 
 static unsigned long clk_core_req_round_rate_nolock(struct clk_core *core,
@@ -1850,7 +1848,6 @@ static unsigned long clk_core_req_round_
 	clk_core_rate_restore_protect(core, cnt);
 
 	return ret ? 0 : req.rate;
->>>>>>> linux-next/akpm-base
 }
 
 static int clk_core_set_rate_nolock(struct clk_core *core,
diff -puN drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c~linux-next-git-rejects drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -216,42 +216,6 @@ void dm_dp_mst_dc_sink_create(struct drm
 					&aconnector->base, aconnector->edid);
 }
 
-void dm_dp_mst_dc_sink_create(struct drm_connector *connector)
-{
-	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
-	struct edid *edid;
-	struct dc_sink *dc_sink;
-	struct dc_sink_init_data init_params = {
-			.link = aconnector->dc_link,
-			.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };
-
-	edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
-
-	if (!edid) {
-		drm_mode_connector_update_edid_property(
-			&aconnector->base,
-			NULL);
-		return;
-	}
-
-	aconnector->edid = edid;
-
-	dc_sink = dc_link_add_remote_sink(
-		aconnector->dc_link,
-		(uint8_t *)aconnector->edid,
-		(aconnector->edid->extensions + 1) * EDID_LENGTH,
-		&init_params);
-
-	dc_sink->priv = aconnector;
-	aconnector->dc_sink = dc_sink;
-
-	amdgpu_dm_add_sink_to_freesync_module(
-			connector, aconnector->edid);
-
-	drm_mode_connector_update_edid_property(
-					&aconnector->base, aconnector->edid);
-}
-
 static int dm_dp_mst_get_modes(struct drm_connector *connector)
 {
 	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
diff -puN drivers/gpu/drm/drm_syncobj.c~linux-next-git-rejects drivers/gpu/drm/drm_syncobj.c
--- a/drivers/gpu/drm/drm_syncobj.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/drm_syncobj.c
@@ -399,8 +399,6 @@ static const struct file_operations drm_
 	.release = drm_syncobj_file_release,
 };
 
-<<<<<<< HEAD
-=======
 static int drm_syncobj_alloc_file(struct drm_syncobj *syncobj)
 {
 	struct file *file = anon_inode_getfile("syncobj_file",
@@ -427,7 +425,6 @@ static int drm_syncobj_alloc_file(struct
  *
  * Returns 0 on success or a negative error value on failure.
  */
->>>>>>> linux-next/akpm-base
 int drm_syncobj_get_fd(struct drm_syncobj *syncobj, int *p_fd)
 {
 	struct file *file;
diff -puN drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_ddi.c
--- a/drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ddi.c
@@ -2095,11 +2095,7 @@ static void intel_ddi_clk_select(struct
 	if (WARN_ON(!pll))
 		return;
 
-<<<<<<< HEAD
-	 mutex_lock(&dev_priv->dpll_lock);
-=======
 	mutex_lock(&dev_priv->dpll_lock);
->>>>>>> linux-next/akpm-base
 
 	if (IS_CANNONLAKE(dev_priv)) {
 		/* Configure DPCLKA_CFGCR0 to map the DPLL to the DDI. */
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -9855,39 +9855,11 @@ found:
 	if (!mode)
 		mode = &load_detect_mode;
 
-<<<<<<< HEAD
-	/* We need a framebuffer large enough to accommodate all accesses
-	 * that the plane may generate whilst we perform load detection.
-	 * We can not rely on the fbcon either being present (we get called
-	 * during its initialisation to detect all boot displays, or it may
-	 * not even exist) or that it is large enough to satisfy the
-	 * requested mode.
-	 */
-	fb = mode_fits_in_fbdev(dev, mode);
-	if (fb == NULL) {
-		DRM_DEBUG_KMS("creating tmp fb for load-detection\n");
-		fb = intel_framebuffer_create_for_mode(dev, mode, 24, 32);
-	} else
-		DRM_DEBUG_KMS("reusing fbdev for load-detection framebuffer\n");
-	if (IS_ERR(fb)) {
-		DRM_DEBUG_KMS("failed to allocate framebuffer for load-detection\n");
-		ret = PTR_ERR(fb);
-		goto fail;
-	}
-
-	ret = intel_modeset_setup_plane_state(state, crtc, mode, fb, 0, 0);
-	drm_framebuffer_put(fb);
-	if (ret)
-		goto fail;
-
-	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
-=======
 	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
 	if (ret)
 		goto fail;
 
 	ret = intel_modeset_disable_planes(state, crtc);
->>>>>>> linux-next/akpm-base
 	if (ret)
 		goto fail;
 
diff -puN drivers/net/ethernet/netronome/nfp/bpf/main.c~linux-next-git-rejects drivers/net/ethernet/netronome/nfp/bpf/main.c
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -84,38 +84,6 @@ static const char *nfp_bpf_extra_cap(str
 	return nfp_net_ebpf_capable(nn) ? "BPF" : "";
 }
 
-<<<<<<< HEAD
-static int
-nfp_bpf_vnic_alloc(struct nfp_app *app, struct nfp_net *nn, unsigned int id)
-{
-	int err;
-
-	nn->app_priv = kzalloc(sizeof(struct nfp_bpf_vnic), GFP_KERNEL);
-	if (!nn->app_priv)
-		return -ENOMEM;
-
-	err = nfp_app_nic_vnic_alloc(app, nn, id);
-	if (err)
-		goto err_free_priv;
-
-	return 0;
-err_free_priv:
-	kfree(nn->app_priv);
-	return err;
-}
-
-static void nfp_bpf_vnic_free(struct nfp_app *app, struct nfp_net *nn)
-{
-	struct nfp_bpf_vnic *bv = nn->app_priv;
-
-	if (nn->dp.bpf_offload_xdp)
-		nfp_bpf_xdp_offload(app, nn, NULL);
-	WARN_ON(bv->tc_prog);
-	kfree(bv);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,
 				     void *type_data, void *cb_priv)
 {
@@ -142,26 +110,7 @@ static int nfp_bpf_setup_tc_block_cb(enu
 	if (cls_bpf->command != TC_CLSBPF_OFFLOAD)
 		return -EOPNOTSUPP;
 
-<<<<<<< HEAD
-	bv = nn->app_priv;
-	oldprog = cls_bpf->oldprog;
-
-	/* Don't remove if oldprog doesn't match driver's state */
-	if (bv->tc_prog != oldprog) {
-		oldprog = NULL;
-		if (!cls_bpf->prog)
-			return 0;
-	}
-
-	err = nfp_net_bpf_offload(nn, cls_bpf->prog, oldprog);
-	if (err)
-		return err;
-
-	bv->tc_prog = cls_bpf->prog;
-	return 0;
-=======
 	return nfp_net_bpf_offload(nn, cls_bpf->prog, cls_bpf->oldprog);
->>>>>>> linux-next/akpm-base
 }
 
 static int nfp_bpf_setup_tc_block(struct net_device *netdev,
@@ -322,12 +271,7 @@ const struct nfp_app_type app_bpf = {
 
 	.extra_cap	= nfp_bpf_extra_cap,
 
-<<<<<<< HEAD
-	.vnic_alloc	= nfp_bpf_vnic_alloc,
-	.vnic_free	= nfp_bpf_vnic_free,
-=======
 	.vnic_alloc	= nfp_app_nic_vnic_alloc,
->>>>>>> linux-next/akpm-base
 
 	.setup_tc	= nfp_bpf_setup_tc,
 	.tc_busy	= nfp_bpf_tc_busy,
diff -puN drivers/net/phy/marvell.c~linux-next-git-rejects drivers/net/phy/marvell.c
--- a/drivers/net/phy/marvell.c~linux-next-git-rejects
+++ a/drivers/net/phy/marvell.c
@@ -2083,10 +2083,6 @@ static struct phy_driver marvell_drivers
 		.probe = marvell_probe,
 		.config_init = &m88e1145_config_init,
 		.config_aneg = &m88e1101_config_aneg,
-<<<<<<< HEAD
-		.read_status = &genphy_read_status,
-=======
->>>>>>> linux-next/akpm-base
 		.ack_interrupt = &marvell_ack_interrupt,
 		.config_intr = &marvell_config_intr,
 		.resume = &genphy_resume,
diff -puN kernel/bpf/verifier.c~linux-next-git-rejects kernel/bpf/verifier.c
--- a/kernel/bpf/verifier.c~linux-next-git-rejects
+++ a/kernel/bpf/verifier.c
@@ -1454,8 +1454,6 @@ static void coerce_reg_to_size(struct bp
 	reg->smax_value = reg->umax_value;
 }
 
-<<<<<<< HEAD
-=======
 static int update_stack_depth(struct bpf_verifier_env *env,
 			      const struct bpf_func_state *func,
 			      int off)
@@ -1504,7 +1502,6 @@ static int get_callee_stack_depth(struct
 	return env->subprog_stack_depth[subprog];
 }
 
->>>>>>> linux-next/akpm-base
 /* check whether memory at (regno + off) is accessible for t = (read | write)
  * if t==write, value_regno is a register which value is stored into memory
  * if t==read, value_regno is a register which will receive the value from memory
diff -puN net/ipv6/route.c~linux-next-git-rejects net/ipv6/route.c
--- a/net/ipv6/route.c~linux-next-git-rejects
+++ a/net/ipv6/route.c
@@ -4321,14 +4321,8 @@ static int inet6_rtm_getroute(struct sk_
 		goto errout;
 	}
 
-<<<<<<< HEAD
-	if (fibmatch && rt->dst.from) {
-		struct rt6_info *ort = container_of(rt->dst.from,
-						    struct rt6_info, dst);
-=======
 	if (fibmatch && rt->from) {
 		struct rt6_info *ort = rt->from;
->>>>>>> linux-next/akpm-base
 
 		dst_hold(&ort->dst);
 		ip6_rt_put(rt);
diff -puN tools/testing/selftests/bpf/test_verifier.c~linux-next-git-rejects tools/testing/selftests/bpf/test_verifier.c
--- a/tools/testing/selftests/bpf/test_verifier.c~linux-next-git-rejects
+++ a/tools/testing/selftests/bpf/test_verifier.c
@@ -6753,7 +6753,6 @@ static struct bpf_test tests[] = {
 	},
 	{
 		"bounds check based on zero-extended MOV",
-<<<<<<< HEAD
 		.insns = {
 			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
 			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
@@ -7210,533 +7209,6 @@ static struct bpf_test tests[] = {
 	},
 	{
 		"variable-offset ctx access",
-=======
->>>>>>> linux-next/akpm-base
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-			/* r2 = 0x0000'0000'ffff'ffff */
-			BPF_MOV32_IMM(BPF_REG_2, 0xffffffff),
-			/* r2 = 0 */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_2, 32),
-			/* no-op */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_2),
-			/* access at offset 0 */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.result = ACCEPT
-	},
-	{
-		"bounds check based on sign-extended MOV. test1",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-			/* r2 = 0xffff'ffff'ffff'ffff */
-			BPF_MOV64_IMM(BPF_REG_2, 0xffffffff),
-			/* r2 = 0xffff'ffff */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_2, 32),
-			/* r0 = <oob pointer> */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_2),
-			/* access to OOB pointer */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "map_value pointer and 4294967295",
-		.result = REJECT
-	},
-	{
-<<<<<<< HEAD
-		"indirect variable-offset stack access",
-		.insns = {
-			/* Fill the top 8 bytes of the stack */
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			/* Get an unknown value */
-			BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 0),
-			/* Make it small and 4-byte aligned */
-			BPF_ALU64_IMM(BPF_AND, BPF_REG_2, 4),
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_2, 8),
-			/* add it to fp.  We now have either fp-4 or fp-8, but
-			 * we don't know which
-			 */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_10),
-			/* dereference it indirectly */
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 5 },
-		.errstr = "variable stack read R2",
-		.result = REJECT,
-		.prog_type = BPF_PROG_TYPE_LWT_IN,
-	},
-	{
-		"direct stack access with 32-bit wraparound. test1",
-		.insns = {
-			BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x7fffffff),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x7fffffff),
-			BPF_MOV32_IMM(BPF_REG_0, 0),
-			BPF_STX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_EXIT_INSN()
-		},
-		.errstr = "fp pointer and 2147483647",
-		.result = REJECT
-	},
-	{
-		"direct stack access with 32-bit wraparound. test2",
-		.insns = {
-			BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x3fffffff),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x3fffffff),
-			BPF_MOV32_IMM(BPF_REG_0, 0),
-			BPF_STX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_EXIT_INSN()
-		},
-		.errstr = "fp pointer and 1073741823",
-		.result = REJECT
-	},
-	{
-		"direct stack access with 32-bit wraparound. test3",
-		.insns = {
-			BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x1fffffff),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x1fffffff),
-			BPF_MOV32_IMM(BPF_REG_0, 0),
-			BPF_STX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_EXIT_INSN()
-		},
-		.errstr = "fp pointer offset 1073741822",
-		.result = REJECT
-	},
-	{
-		"liveness pruning and write screening",
-=======
-		"bounds check based on sign-extended MOV. test2",
->>>>>>> linux-next/akpm-base
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-			/* r2 = 0xffff'ffff'ffff'ffff */
-			BPF_MOV64_IMM(BPF_REG_2, 0xffffffff),
-			/* r2 = 0xfff'ffff */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_2, 36),
-			/* r0 = <oob pointer> */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_2),
-			/* access to OOB pointer */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "R0 min value is outside of the array range",
-		.result = REJECT
-	},
-	{
-		"bounds check based on reg_off + var_off + insn_off. test1",
-		.insns = {
-			BPF_LDX_MEM(BPF_W, BPF_REG_6, BPF_REG_1,
-				    offsetof(struct __sk_buff, mark)),
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-			BPF_ALU64_IMM(BPF_AND, BPF_REG_6, 1),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, (1 << 29) - 1),
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_6),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, (1 << 29) - 1),
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 3),
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 4 },
-		.errstr = "value_size=8 off=1073741825",
-		.result = REJECT,
-		.prog_type = BPF_PROG_TYPE_SCHED_CLS,
-	},
-	{
-		"bounds check based on reg_off + var_off + insn_off. test2",
-		.insns = {
-			BPF_LDX_MEM(BPF_W, BPF_REG_6, BPF_REG_1,
-				    offsetof(struct __sk_buff, mark)),
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-			BPF_ALU64_IMM(BPF_AND, BPF_REG_6, 1),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, (1 << 30) - 1),
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_6),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, (1 << 29) - 1),
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 3),
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 4 },
-		.errstr = "value 1073741823",
-		.result = REJECT,
-		.prog_type = BPF_PROG_TYPE_SCHED_CLS,
-	},
-	{
-		"bounds check after truncation of non-boundary-crossing range",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 9),
-			/* r1 = [0x00, 0xff] */
-			BPF_LDX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_MOV64_IMM(BPF_REG_2, 1),
-			/* r2 = 0x10'0000'0000 */
-			BPF_ALU64_IMM(BPF_LSH, BPF_REG_2, 36),
-			/* r1 = [0x10'0000'0000, 0x10'0000'00ff] */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_1, BPF_REG_2),
-			/* r1 = [0x10'7fff'ffff, 0x10'8000'00fe] */
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x7fffffff),
-			/* r1 = [0x00, 0xff] */
-			BPF_ALU32_IMM(BPF_SUB, BPF_REG_1, 0x7fffffff),
-			/* r1 = 0 */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 8),
-			/* no-op */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* access at offset 0 */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.result = ACCEPT
-	},
-	{
-		"bounds check after truncation of boundary-crossing range (1)",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 9),
-			/* r1 = [0x00, 0xff] */
-			BPF_LDX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0xffff'ff80, 0x1'0000'007f] */
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0xffff'ff80, 0xffff'ffff] or
-			 *      [0x0000'0000, 0x0000'007f]
-			 */
-			BPF_ALU32_IMM(BPF_ADD, BPF_REG_1, 0),
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0x00, 0xff] or
-			 *      [0xffff'ffff'0000'0080, 0xffff'ffff'ffff'ffff]
-			 */
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = 0 or
-			 *      [0x00ff'ffff'ff00'0000, 0x00ff'ffff'ffff'ffff]
-			 */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 8),
-			/* no-op or OOB pointer computation */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* potentially OOB access */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		/* not actually fully unbounded, but the bound is very high */
-		.errstr = "R0 unbounded memory access",
-		.result = REJECT
-	},
-	{
-		"bounds check after truncation of boundary-crossing range (2)",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 9),
-			/* r1 = [0x00, 0xff] */
-			BPF_LDX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0xffff'ff80, 0x1'0000'007f] */
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0xffff'ff80, 0xffff'ffff] or
-			 *      [0x0000'0000, 0x0000'007f]
-			 * difference to previous test: truncation via MOV32
-			 * instead of ALU32.
-			 */
-			BPF_MOV32_REG(BPF_REG_1, BPF_REG_1),
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = [0x00, 0xff] or
-			 *      [0xffff'ffff'0000'0080, 0xffff'ffff'ffff'ffff]
-			 */
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 0xffffff80 >> 1),
-			/* r1 = 0 or
-			 *      [0x00ff'ffff'ff00'0000, 0x00ff'ffff'ffff'ffff]
-			 */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 8),
-			/* no-op or OOB pointer computation */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* potentially OOB access */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		/* not actually fully unbounded, but the bound is very high */
-		.errstr = "R0 unbounded memory access",
-		.result = REJECT
-	},
-	{
-		"bounds check after wrapping 32-bit addition",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 5),
-			/* r1 = 0x7fff'ffff */
-			BPF_MOV64_IMM(BPF_REG_1, 0x7fffffff),
-			/* r1 = 0xffff'fffe */
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 0x7fffffff),
-			/* r1 = 0 */
-			BPF_ALU32_IMM(BPF_ADD, BPF_REG_1, 2),
-			/* no-op */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* access at offset 0 */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.result = ACCEPT
-	},
-	{
-		"bounds check after shift with oversized count operand",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 6),
-			BPF_MOV64_IMM(BPF_REG_2, 32),
-			BPF_MOV64_IMM(BPF_REG_1, 1),
-			/* r1 = (u32)1 << (u32)32 = ? */
-			BPF_ALU32_REG(BPF_LSH, BPF_REG_1, BPF_REG_2),
-			/* r1 = [0x0000, 0xffff] */
-			BPF_ALU64_IMM(BPF_AND, BPF_REG_1, 0xffff),
-			/* computes unknown pointer, potentially OOB */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* potentially OOB access */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "R0 max value is outside of the array range",
-		.result = REJECT
-	},
-	{
-		"bounds check after right shift of maybe-negative number",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 6),
-			/* r1 = [0x00, 0xff] */
-			BPF_LDX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-			/* r1 = [-0x01, 0xfe] */
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 1),
-			/* r1 = 0 or 0xff'ffff'ffff'ffff */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 8),
-			/* r1 = 0 or 0xffff'ffff'ffff */
-			BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 8),
-			/* computes unknown pointer, potentially OOB */
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			/* potentially OOB access */
-			BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_0, 0),
-			/* exit */
-			BPF_MOV64_IMM(BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "R0 unbounded memory access",
-		.result = REJECT
-	},
-	{
-		"bounds check map access with off+size signed 32bit overflow. test1",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
-			BPF_EXIT_INSN(),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 0x7ffffffe),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),
-			BPF_JMP_A(0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "map_value pointer and 2147483646",
-		.result = REJECT
-	},
-	{
-		"bounds check map access with off+size signed 32bit overflow. test2",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
-			BPF_EXIT_INSN(),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 0x1fffffff),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 0x1fffffff),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 0x1fffffff),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),
-			BPF_JMP_A(0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "pointer offset 1073741822",
-		.result = REJECT
-	},
-	{
-		"bounds check map access with off+size signed 32bit overflow. test3",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
-			BPF_EXIT_INSN(),
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_0, 0x1fffffff),
-			BPF_ALU64_IMM(BPF_SUB, BPF_REG_0, 0x1fffffff),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 2),
-			BPF_JMP_A(0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "pointer offset -1073741822",
-		.result = REJECT
-	},
-	{
-		"bounds check map access with off+size signed 32bit overflow. test4",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
-			BPF_EXIT_INSN(),
-			BPF_MOV64_IMM(BPF_REG_1, 1000000),
-			BPF_ALU64_IMM(BPF_MUL, BPF_REG_1, 1000000),
-			BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 2),
-			BPF_JMP_A(0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.errstr = "map_value pointer and 1000000000000",
-		.result = REJECT
-	},
-	{
-		"pointer/scalar confusion in state equality check (way 1)",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),
-			BPF_JMP_A(1),
-			BPF_MOV64_REG(BPF_REG_0, BPF_REG_10),
-			BPF_JMP_A(0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.result = ACCEPT,
-		.result_unpriv = REJECT,
-		.errstr_unpriv = "R0 leaks addr as return value"
-	},
-	{
-		"pointer/scalar confusion in state equality check (way 2)",
-		.insns = {
-			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-			BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-			BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-			BPF_LD_MAP_FD(BPF_REG_1, 0),
-			BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
-				     BPF_FUNC_map_lookup_elem),
-			BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 2),
-			BPF_MOV64_REG(BPF_REG_0, BPF_REG_10),
-			BPF_JMP_A(1),
-			BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),
-			BPF_EXIT_INSN(),
-		},
-		.fixup_map1 = { 3 },
-		.result = ACCEPT,
-		.result_unpriv = REJECT,
-		.errstr_unpriv = "R0 leaks addr as return value"
-	},
-	{
-		"variable-offset ctx access",
 		.insns = {
 			/* Get an unknown value */
 			BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 0),
@@ -7755,24 +7227,7 @@ static struct bpf_test tests[] = {
 		.prog_type = BPF_PROG_TYPE_LWT_IN,
 	},
 	{
-<<<<<<< HEAD
-		"pkt_end - pkt_start is allowed",
-		.insns = {
-			BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
-				    offsetof(struct __sk_buff, data_end)),
-			BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
-				    offsetof(struct __sk_buff, data)),
-			BPF_ALU64_REG(BPF_SUB, BPF_REG_0, BPF_REG_2),
-			BPF_EXIT_INSN(),
-		},
-		.result = ACCEPT,
-		.prog_type = BPF_PROG_TYPE_SCHED_CLS,
-	},
-	{
-		"XDP pkt read, pkt_end mangling, bad access 1",
-=======
 		"variable-offset stack access",
->>>>>>> linux-next/akpm-base
 		.insns = {
 			/* Fill the top 8 bytes of the stack */
 			BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
@@ -7789,11 +7244,7 @@ static struct bpf_test tests[] = {
 			BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_2, 0),
 			BPF_EXIT_INSN(),
 		},
-<<<<<<< HEAD
-		.errstr = "R3 pointer arithmetic on PTR_TO_PACKET_END",
-=======
 		.errstr = "variable stack access var_off=(0xfffffffffffffff8; 0x4)",
->>>>>>> linux-next/akpm-base
 		.result = REJECT,
 		.prog_type = BPF_PROG_TYPE_LWT_IN,
 	},
@@ -7818,12 +7269,8 @@ static struct bpf_test tests[] = {
 			BPF_MOV64_IMM(BPF_REG_0, 0),
 			BPF_EXIT_INSN(),
 		},
-<<<<<<< HEAD
-		.errstr = "R3 pointer arithmetic on PTR_TO_PACKET_END",
-=======
 		.fixup_map1 = { 5 },
 		.errstr = "variable stack read R2",
->>>>>>> linux-next/akpm-base
 		.result = REJECT,
 		.prog_type = BPF_PROG_TYPE_LWT_IN,
 	},
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
kernel-exitc-export-abort-to-modules.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-fall-back-to-buffer-io-when-append-dio-is-disabled-with-file-hole-existing-fix.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
mm-zsmalloc-simplify-shrinker-init-destroy-fix.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-12-18 19:58 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-12-18 19:58 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/base/power/main.c |    3 ---
 include/linux/pm.h        |    3 ---
 2 files changed, 6 deletions(-)

diff -puN drivers/base/power/main.c~linux-next-git-rejects drivers/base/power/main.c
--- a/drivers/base/power/main.c~linux-next-git-rejects
+++ a/drivers/base/power/main.c
@@ -541,8 +541,6 @@ void dev_pm_skip_next_resume_phases(stru
 }
 
 /**
-<<<<<<< HEAD
-=======
  * dev_pm_may_skip_resume - System-wide device resume optimization check.
  * @dev: Target device.
  *
@@ -555,7 +553,6 @@ bool dev_pm_may_skip_resume(struct devic
 }
 
 /**
->>>>>>> linux-next/akpm-base
  * device_resume_noirq - Execute a "noirq resume" callback for given device.
  * @dev: Device to handle.
  * @state: PM transition of the system being carried out.
diff -puN include/linux/pm.h~linux-next-git-rejects include/linux/pm.h
--- a/include/linux/pm.h~linux-next-git-rejects
+++ a/include/linux/pm.h
@@ -773,10 +773,7 @@ extern int pm_generic_poweroff(struct de
 extern void pm_generic_complete(struct device *dev);
 
 extern void dev_pm_skip_next_resume_phases(struct device *dev);
-<<<<<<< HEAD
-=======
 extern bool dev_pm_may_skip_resume(struct device *dev);
->>>>>>> linux-next/akpm-base
 extern bool dev_pm_smart_suspend_and_suspended(struct device *dev);
 
 #else /* !CONFIG_PM_SLEEP */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix.patch
mm-thp-use-down_read_trylock-in-khugepaged-to-avoid-long-block-fix-checkpatch-fixes.patch
mm-mmu_notifier-annotate-mmu-notifiers-with-blockable-invalidate-callbacks-fix.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-12-14 19:34 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-12-14 19:34 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/platform/x86/dell-laptop.c |    9 ---------
 1 file changed, 9 deletions(-)

diff -puN drivers/platform/x86/dell-laptop.c~linux-next-git-rejects drivers/platform/x86/dell-laptop.c
--- a/drivers/platform/x86/dell-laptop.c~linux-next-git-rejects
+++ a/drivers/platform/x86/dell-laptop.c
@@ -36,13 +36,8 @@
 #include "dell-smbios.h"
 
 struct quirk_entry {
-<<<<<<< HEAD
-	u8 touchpad_led;
-	u8 kbd_led_levels_off_1;
-=======
 	bool touchpad_led;
 	bool kbd_led_levels_off_1;
->>>>>>> linux-next/akpm-base
 
 	bool needs_kbd_timeouts;
 	/*
@@ -74,11 +69,7 @@ static struct quirk_entry quirk_dell_xps
 };
 
 static struct quirk_entry quirk_dell_latitude_e6410 = {
-<<<<<<< HEAD
-	.kbd_led_levels_off_1 = 1,
-=======
 	.kbd_led_levels_off_1 = true,
->>>>>>> linux-next/akpm-base
 };
 
 static struct platform_driver platform_driver = {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-kmemleakc-make-cond_resched-rate-limiting-more-efficient.patch
stringh-work-around-for-increased-stack-usage-fix.patch
mm-memoryc-mark-wp_huge_pmd-inline-to-prevent-build-failure-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-terminate-shrink_slab-loop-if-signal-is-pending-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
sparc64-update-pmdp_invalidate-to-return-old-pmd-value-fix.patch
x86-mm-provide-pmdp_establish-helper-fix.patch
fs-elf-drop-map_fixed-usage-from-elf_map-checkpatch-fixes.patch
lib-ubsanc-s-missaligned-misaligned.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-12-06 21:50 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-12-06 21:50 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/iio/adc/meson_saradc.c |   10 ----------
 1 file changed, 10 deletions(-)

diff -puN drivers/iio/adc/meson_saradc.c~linux-next-git-rejects drivers/iio/adc/meson_saradc.c
--- a/drivers/iio/adc/meson_saradc.c~linux-next-git-rejects
+++ a/drivers/iio/adc/meson_saradc.c
@@ -756,11 +756,6 @@ err_adc_clk:
 	regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3,
 			   MESON_SAR_ADC_REG3_ADC_EN, 0);
 	meson_sar_adc_set_bandgap(indio_dev, false);
-<<<<<<< HEAD
-	clk_disable_unprepare(priv->sana_clk);
-err_sana_clk:
-=======
->>>>>>> linux-next/akpm-base
 	clk_disable_unprepare(priv->core_clk);
 err_core_clk:
 	regulator_disable(priv->vref);
@@ -783,11 +778,6 @@ static int meson_sar_adc_hw_disable(stru
 
 	regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3,
 			   MESON_SAR_ADC_REG3_ADC_EN, 0);
-<<<<<<< HEAD
-
-	meson_sar_adc_set_bandgap(indio_dev, false);
-=======
->>>>>>> linux-next/akpm-base
 
 	meson_sar_adc_set_bandgap(indio_dev, false);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-kmemleakc-make-cond_resched-rate-limiting-more-efficient.patch
stringh-work-around-for-increased-stack-usage-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-split-deferred_init_range-into-initializing-and-freeing-parts-fix.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-11-29 20:32 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-11-29 20:32 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/btrfs/super.c   |   38 --------------------------------------
 fs/cifs/cifsglob.h |    5 -----
 fs/jffs2/super.c   |    4 ----
 fs/nfs/internal.h  |    4 ----
 4 files changed, 51 deletions(-)

diff -puN fs/btrfs/super.c~linux-next-git-rejects fs/btrfs/super.c
--- a/fs/btrfs/super.c~linux-next-git-rejects
+++ a/fs/btrfs/super.c
@@ -1415,44 +1415,6 @@ static struct dentry *mount_subvol(const
 	struct dentry *root;
 	int ret;
 
-<<<<<<< HEAD
-	newargs = setup_root_args(data);
-	if (!newargs) {
-		root = ERR_PTR(-ENOMEM);
-		goto out;
-	}
-
-	mnt = vfs_kern_mount(&btrfs_fs_type, flags, device_name, newargs);
-	if (PTR_ERR_OR_ZERO(mnt) == -EBUSY) {
-		if (flags & SB_RDONLY) {
-			mnt = vfs_kern_mount(&btrfs_fs_type, flags & ~SB_RDONLY,
-					     device_name, newargs);
-		} else {
-			mnt = vfs_kern_mount(&btrfs_fs_type, flags | SB_RDONLY,
-					     device_name, newargs);
-			if (IS_ERR(mnt)) {
-				root = ERR_CAST(mnt);
-				mnt = NULL;
-				goto out;
-			}
-
-			down_write(&mnt->mnt_sb->s_umount);
-			ret = btrfs_remount(mnt->mnt_sb, &flags, NULL);
-			up_write(&mnt->mnt_sb->s_umount);
-			if (ret < 0) {
-				root = ERR_PTR(ret);
-				goto out;
-			}
-		}
-	}
-	if (IS_ERR(mnt)) {
-		root = ERR_CAST(mnt);
-		mnt = NULL;
-		goto out;
-	}
-
-=======
->>>>>>> linux-next/akpm-base
 	if (!subvol_name) {
 		if (!subvol_objectid) {
 			ret = get_default_subvol_objectid(btrfs_sb(mnt->mnt_sb),
diff -puN fs/cifs/cifsglob.h~linux-next-git-rejects fs/cifs/cifsglob.h
--- a/fs/cifs/cifsglob.h~linux-next-git-rejects
+++ a/fs/cifs/cifsglob.h
@@ -559,13 +559,8 @@ struct smb_vol {
 			 CIFS_MOUNT_MULTIUSER | CIFS_MOUNT_STRICT_IO | \
 			 CIFS_MOUNT_CIFS_BACKUPUID | CIFS_MOUNT_CIFS_BACKUPGID)
 
-<<<<<<< HEAD
-#define CIFS_MS_MASK (SB_RDONLY | SB_MANDLOCK | SB_NOEXEC | SB_NOSUID | \
-		      SB_NODEV | SB_SYNCHRONOUS)
-=======
 #define CIFS_MS_MASK (SB_RDONLY | SB_MANDLOCK | SB_SYNCHRONOUS | \
 		      SB_NOEXEC | SB_NOSUID | SB_NODEV)
->>>>>>> linux-next/akpm-base
 
 struct cifs_mnt_data {
 	struct cifs_sb_info *cifs_sb;
diff -puN fs/jffs2/super.c~linux-next-git-rejects fs/jffs2/super.c
--- a/fs/jffs2/super.c~linux-next-git-rejects
+++ a/fs/jffs2/super.c
@@ -301,11 +301,7 @@ static int jffs2_fill_super(struct super
 
 	sb->s_op = &jffs2_super_operations;
 	sb->s_export_op = &jffs2_export_ops;
-<<<<<<< HEAD
-	sb->s_flags = sb->s_flags | SB_NOATIME;
-=======
 	sb->s_flags |= SB_NOATIME;
->>>>>>> linux-next/akpm-base
 	sb->s_xattr = jffs2_xattr_handlers;
 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
 	sb->s_flags |= SB_POSIXACL;
diff -puN fs/nfs/internal.h~linux-next-git-rejects fs/nfs/internal.h
--- a/fs/nfs/internal.h~linux-next-git-rejects
+++ a/fs/nfs/internal.h
@@ -10,11 +10,7 @@
 #include <linux/nfs_page.h>
 #include <linux/wait_bit.h>
 
-<<<<<<< HEAD
-#define NFS_MS_MASK (SB_RDONLY|SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)
-=======
 #define NFS_SB_MASK (SB_RDONLY|SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)
->>>>>>> linux-next/akpm-base
 
 extern const struct export_operations nfs_export_ops;
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-introduce-get_user_pages_longterm-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-do-not-stall-register_shrinker-fix.patch
selftest-vm-move-128tb-mmap-boundary-test-to-generic-directory-fix.patch
linux-next-rejects.patch
tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-11-20 21:22 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-11-20 21:22 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt |    3 
 arch/parisc/include/uapi/asm/mman.h                     |    4 -
 drivers/firmware/qcom_scm.c                             |    3 
 drivers/soc/amlogic/meson-gx-pwrc-vpu.c                 |   40 ----------
 include/linux/iomap.h                                   |    4 -
 include/linux/platform_data/mtd-nand-omap2.h            |   20 -----
 6 files changed, 74 deletions(-)

diff -puN arch/parisc/include/uapi/asm/mman.h~linux-next-git-rejects arch/parisc/include/uapi/asm/mman.h
--- a/arch/parisc/include/uapi/asm/mman.h~linux-next-git-rejects
+++ a/arch/parisc/include/uapi/asm/mman.h
@@ -13,11 +13,7 @@
 #define MAP_SHARED	0x01		/* Share changes */
 #define MAP_PRIVATE	0x02		/* Changes are private */
 #define MAP_SHARED_VALIDATE 0x03	/* share + validate extension flags */
-<<<<<<< HEAD
-#define MAP_TYPE	0x03		/* Mask for type of mapping */
-=======
 #define MAP_TYPE	(MAP_SHARED|MAP_PRIVATE|MAP_RESRVD1|MAP_RESRVD2) /* Mask for type of mapping */
->>>>>>> linux-next/akpm-base
 #define MAP_FIXED	0x04		/* Interpret addr exactly */
 #define MAP_RESRVD1	0x08		/* reserved for 3rd bit of MAP_TYPE */
 #define MAP_ANONYMOUS	0x10		/* don't use a file */
diff -puN Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt~linux-next-git-rejects Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
--- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@ -14,10 +14,7 @@ Required properties:
                  at25df641
                  at26df081a
                  en25s64
-<<<<<<< HEAD
-=======
                  mr25h128
->>>>>>> linux-next/akpm-base
                  mr25h256
                  mr25h10
                  mr25h40
diff -puN drivers/firmware/qcom_scm.c~linux-next-git-rejects drivers/firmware/qcom_scm.c
--- a/drivers/firmware/qcom_scm.c~linux-next-git-rejects
+++ a/drivers/firmware/qcom_scm.c
@@ -45,8 +45,6 @@ struct qcom_scm {
 	struct reset_controller_dev reset;
 
 	u64 dload_mode_addr;
-<<<<<<< HEAD
-=======
 };
 
 struct qcom_scm_current_perm_info {
@@ -60,7 +58,6 @@ struct qcom_scm_current_perm_info {
 struct qcom_scm_mem_map_info {
 	__le64 mem_addr;
 	__le64 mem_size;
->>>>>>> linux-next/akpm-base
 };
 
 static struct qcom_scm *__scm;
diff -puN drivers/soc/amlogic/meson-gx-pwrc-vpu.c~linux-next-git-rejects drivers/soc/amlogic/meson-gx-pwrc-vpu.c
--- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c~linux-next-git-rejects
+++ a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c
@@ -34,10 +34,7 @@ struct meson_gx_pwrc_vpu {
 	struct reset_control *rstc;
 	struct clk *vpu_clk;
 	struct clk *vapb_clk;
-<<<<<<< HEAD
-=======
 	bool powered;
->>>>>>> linux-next/akpm-base
 };
 
 static inline
@@ -81,11 +78,8 @@ static int meson_gx_pwrc_vpu_power_off(s
 	clk_disable_unprepare(pd->vpu_clk);
 	clk_disable_unprepare(pd->vapb_clk);
 
-<<<<<<< HEAD
-=======
 	pd->powered = false;
 
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
@@ -97,15 +91,7 @@ static int meson_gx_pwrc_vpu_setup_clk(s
 	if (ret)
 		return ret;
 
-<<<<<<< HEAD
-	ret = clk_prepare_enable(pd->vapb_clk);
-	if (ret)
-		clk_disable_unprepare(pd->vpu_clk);
-
-	return ret;
-=======
 	return clk_prepare_enable(pd->vapb_clk);
->>>>>>> linux-next/akpm-base
 }
 
 static int meson_gx_pwrc_vpu_power_on(struct generic_pm_domain *genpd)
@@ -153,11 +139,8 @@ static int meson_gx_pwrc_vpu_power_on(st
 	if (ret)
 		return ret;
 
-<<<<<<< HEAD
-=======
 	pd->powered = true;
 
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
@@ -184,11 +167,6 @@ static int meson_gx_pwrc_vpu_probe(struc
 	struct reset_control *rstc;
 	struct clk *vpu_clk;
 	struct clk *vapb_clk;
-<<<<<<< HEAD
-	bool powered_off;
-	int ret;
-=======
->>>>>>> linux-next/akpm-base
 
 	regmap_ao = syscon_node_to_regmap(of_get_parent(pdev->dev.of_node));
 	if (IS_ERR(regmap_ao)) {
@@ -227,22 +205,8 @@ static int meson_gx_pwrc_vpu_probe(struc
 	vpu_hdmi_pd.vpu_clk = vpu_clk;
 	vpu_hdmi_pd.vapb_clk = vapb_clk;
 
-<<<<<<< HEAD
-	powered_off = meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd);
-
-	/* If already powered, sync the clock states */
-	if (!powered_off) {
-		ret = meson_gx_pwrc_vpu_setup_clk(&vpu_hdmi_pd);
-		if (ret)
-			return ret;
-	}
-
-	pm_genpd_init(&vpu_hdmi_pd.genpd, &pm_domain_always_on_gov,
-		      powered_off);
-=======
 	pm_genpd_init(&vpu_hdmi_pd.genpd, &simple_qos_governor,
 		      meson_gx_pwrc_vpu_get_power(&vpu_hdmi_pd));
->>>>>>> linux-next/akpm-base
 
 	return of_genpd_add_provider_simple(pdev->dev.of_node,
 					    &vpu_hdmi_pd.genpd);
@@ -250,12 +214,8 @@ static int meson_gx_pwrc_vpu_probe(struc
 
 static void meson_gx_pwrc_vpu_shutdown(struct platform_device *pdev)
 {
-<<<<<<< HEAD
-	meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
-=======
 	if (vpu_hdmi_pd.powered)
 		meson_gx_pwrc_vpu_power_off(&vpu_hdmi_pd.genpd);
->>>>>>> linux-next/akpm-base
 }
 
 static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = {
diff -puN include/linux/iomap.h~linux-next-git-rejects include/linux/iomap.h
--- a/include/linux/iomap.h~linux-next-git-rejects
+++ a/include/linux/iomap.h
@@ -27,15 +27,11 @@ struct vm_fault;
  */
 #define IOMAP_F_NEW		0x01	/* blocks have been newly allocated */
 #define IOMAP_F_BOUNDARY	0x02	/* mapping ends at metadata boundary */
-<<<<<<< HEAD
-#define IOMAP_F_DIRTY		0x04	/* uncommitted metadata */
-=======
 /*
  * IOMAP_F_DIRTY indicates the inode has uncommitted metadata needed to access
  * written data and requires fdatasync to commit them to persistent storage.
  */
 #define IOMAP_F_DIRTY		0x04
->>>>>>> linux-next/akpm-base
 
 /*
  * Flags that only need to be reported for IOMAP_REPORT requests:
diff -puN include/linux/platform_data/mtd-nand-omap2.h~linux-next-git-rejects include/linux/platform_data/mtd-nand-omap2.h
--- a/include/linux/platform_data/mtd-nand-omap2.h~linux-next-git-rejects
+++ a/include/linux/platform_data/mtd-nand-omap2.h
@@ -63,25 +63,5 @@ struct gpmc_nand_regs {
 	void __iomem	*gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];
 	void __iomem	*gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
 	void __iomem	*gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
-<<<<<<< HEAD
-};
-
-struct omap_nand_platform_data {
-	int			cs;
-	struct mtd_partition	*parts;
-	int			nr_parts;
-	bool			flash_bbt;
-	enum nand_io		xfer_type;
-	int			devsize;
-	enum omap_ecc           ecc_opt;
-
-	struct device_node	*elm_of_node;

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-11-07 19:33 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-11-07 19:33 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/idle/intel_idle.c |   11 -----------
 1 file changed, 11 deletions(-)

diff -puN drivers/idle/intel_idle.c~linux-next-git-rejects drivers/idle/intel_idle.c
--- a/drivers/idle/intel_idle.c~linux-next-git-rejects
+++ a/drivers/idle/intel_idle.c
@@ -913,14 +913,8 @@ static __cpuidle int intel_idle(struct c
 	struct cpuidle_state *state = &drv->states[index];
 	unsigned long eax = flg2MWAIT(state->flags);
 	unsigned int cstate;
-<<<<<<< HEAD
-	int cpu = smp_processor_id();
-
-	cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
-=======
 	bool uninitialized_var(tick);
 	int cpu = smp_processor_id();
->>>>>>> linux-next/akpm-base
 
 	/*
 	 * leave_mm() to avoid costly and often unnecessary wakeups
@@ -929,10 +923,6 @@ static __cpuidle int intel_idle(struct c
 	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED)
 		leave_mm(cpu);
 
-<<<<<<< HEAD
-	if (!(lapic_timer_reliable_states & (1 << (cstate))))
-		tick_broadcast_enter();
-=======
 	if (!static_cpu_has(X86_FEATURE_ARAT)) {
 		cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) &
 				MWAIT_CSTATE_MASK) + 1;
@@ -942,7 +932,6 @@ static __cpuidle int intel_idle(struct c
 			tick_broadcast_enter();
 		}
 	}
->>>>>>> linux-next/akpm-base
 
 	mwait_idle_with_hints(eax, ecx);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
slab-slub-slob-convert-slab_flags_t-to-32-bit-fix.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-swap-skip-swapcache-only-if-swapped-page-has-no-other-reference-checkpatch-fixes.patch
mm-drop-migrate-type-checks-from-has_unmovable_pages-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
f2fs-simplify-page-iteration-loops-fix.patch
mm-consolidate-page-table-accounting-fix-fix.patch
mm-stop-zeroing-memory-during-allocation-in-vmemmap-fix.patch
mm-batch-radix-tree-operations-when-truncating-pages-fix-fix.patch
support-resetting-warn_once-checkpatch-fixes.patch
support-resetting-warn_once-for-all-architectures-v2-fix.patch
support-resetting-warn_once-for-all-architectures-v2-fix-fix.patch
support-resetting-warn_once-for-all-architectures-v2-fix-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
watchdog-core-make-use-of-devm_register_reboot_notifier-fix.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-11-02 19:42 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-11-02 19:42 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/process/index.rst               |    3 ---
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c |    4 ----
 drivers/gpu/drm/i915/i915_gem_evict.c         |   13 -------------
 3 files changed, 20 deletions(-)

diff -puN Documentation/process/index.rst~linux-next-git-rejects Documentation/process/index.rst
--- a/Documentation/process/index.rst~linux-next-git-rejects
+++ a/Documentation/process/index.rst
@@ -25,11 +25,8 @@ Below are the essential guides that ever
    submitting-patches
    coding-style
    email-clients
-<<<<<<< HEAD
    kernel-enforcement-statement
-=======
    kernel-driver-statement
->>>>>>> linux-next/akpm-base
 
 Other guides to the community that are of interest to most developers are: 
 
diff -puN drivers/gpu/drm/amd/scheduler/gpu_scheduler.c~linux-next-git-rejects drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -215,9 +215,6 @@ void amd_sched_entity_fini(struct amd_gp
 	*/
 	wait_event(sched->job_scheduled, amd_sched_entity_is_idle(entity));
 
-<<<<<<< HEAD
-	amd_sched_rq_remove_entity(rq, entity);
-=======
 		/* Park the kernel for a moment to make sure it isn't processing
 		 * our enity.
 		 */
@@ -233,7 +230,6 @@ void amd_sched_entity_fini(struct amd_gp
 		}
 
 	}
->>>>>>> linux-next/akpm-base
 	kfifo_free(&entity->job_queue);
 }
 
diff -puN drivers/gpu/drm/i915/i915_gem_evict.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem_evict.c
--- a/drivers/gpu/drm/i915/i915_gem_evict.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -33,13 +33,10 @@
 #include "intel_drv.h"
 #include "i915_trace.h"
 
-<<<<<<< HEAD
-=======
 I915_SELFTEST_DECLARE(static struct igt_evict_ctl {
 	bool fail_if_busy:1;
 } igt_evict_ctl;)
 
->>>>>>> linux-next/akpm-base
 static bool ggtt_is_idle(struct drm_i915_private *i915)
 {
        struct intel_engine_cs *engine;
@@ -212,15 +209,6 @@ search_again:
 	 * the kernel's there is no more we can evict.
 	 */
 	if (!ggtt_is_idle(dev_priv)) {
-<<<<<<< HEAD
-		ret = ggtt_flush(dev_priv);
-		if (ret)
-			return ret;
-
-		goto search_again;
-	}
-
-=======
 		if (I915_SELFTEST_ONLY(igt_evict_ctl.fail_if_busy))
 			return -EBUSY;
 
@@ -231,7 +219,6 @@ search_again:
 		goto search_again;
 	}
 
->>>>>>> linux-next/akpm-base
 	/*
 	 * If we still have pending pageflip completions, drop
 	 * back to userspace to give our workqueues time to
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-swap-skip-swapcache-only-if-swapped-page-has-no-other-reference-checkpatch-fixes.patch
mm-drop-migrate-type-checks-from-has_unmovable_pages-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
f2fs-simplify-page-iteration-loops-fix.patch
mm-deferred_init_memmap-improvements-fix.patch
mm-stop-zeroing-memory-during-allocation-in-vmemmap-fix.patch
mm-batch-radix-tree-operations-when-truncating-pages-fix-fix.patch
support-resetting-warn_once-checkpatch-fixes.patch
support-resetting-warn_once-for-all-architectures-v2-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
watchdog-core-make-use-of-devm_register_reboot_notifier-fix.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-10-17 21:39 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-10-17 21:39 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/usb/quirks.c |   15 ---------------
 1 file changed, 15 deletions(-)

diff -puN sound/usb/quirks.c~linux-next-git-rejects sound/usb/quirks.c
--- a/sound/usb/quirks.c~linux-next-git-rejects
+++ a/sound/usb/quirks.c
@@ -1128,21 +1128,6 @@ bool snd_usb_get_sample_rate_quirk(struc
 	/* devices which do not support reading the sample rate. */
 	switch (chip->usb_id) {
 	case USB_ID(0x041E, 0x4080): /* Creative Live Cam VF0610 */
-<<<<<<< HEAD
-	case USB_ID(0x045E, 0x075D): /* MS Lifecam Cinema  */
-	case USB_ID(0x045E, 0x076D): /* MS Lifecam HD-5000 */
-	case USB_ID(0x045E, 0x076E): /* MS Lifecam HD-5001 */
-	case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */
-	case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */
-	case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */
-	case USB_ID(0x047F, 0x02F7): /* Plantronics BT-600 */
-	case USB_ID(0x047F, 0x0415): /* Plantronics BT-300 */
-	case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */
-	case USB_ID(0x047F, 0xC022): /* Plantronics C310 */
-	case USB_ID(0x047F, 0xC02F): /* Plantronics P610 */
-	case USB_ID(0x047F, 0xC036): /* Plantronics C520-M */
-=======
->>>>>>> linux-next/akpm-base
 	case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
 	case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
 	case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-swap-skip-swapcache-only-if-swapped-page-has-no-other-reference-checkpatch-fixes.patch
mm-sysctl-make-numa-stats-configurable-fix.patch
mm-sysctl-make-numa-stats-configurable-fix-fix.patch
mm-mmu_notifier-avoid-double-notification-when-it-is-useless-checkpatch-fixes.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-10-16 19:52 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-10-16 19:52 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN sound/usb/quirks.c~linux-next-git-rejects sound/usb/quirks.c
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-swap-skip-swapcache-only-if-swapped-page-has-no-other-reference-checkpatch-fixes.patch
mm-sysctl-make-numa-stats-configurable-fix.patch
mm-sysctl-make-numa-stats-configurable-fix-fix.patch
mm-mmu_notifier-avoid-double-notification-when-it-is-useless-checkpatch-fixes.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-10-10 19:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-10-10 19:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arc/boot/dts/hsdk.dts      |    9 --
 arch/powerpc/kernel/mce_power.c |    8 --
 arch/powerpc/kernel/watchdog.c  |   18 ----
 arch/x86/kvm/vmx.c              |    5 -
 drivers/mmc/core/block.c        |    3 
 drivers/mmc/core/queue.c        |   19 ----
 drivers/mmc/core/queue.h        |    5 -
 drivers/tty/serial/fsl_lpuart.c |    3 
 fs/btrfs/extent_io.c            |    4 -
 include/linux/nmi.h             |    6 -
 kernel/smpboot.c                |    7 -
 kernel/watchdog.c               |  119 ------------------------------
 lib/kobject_uevent.c            |    3 
 net/dsa/slave.c                 |    4 -
 tools/include/uapi/linux/bpf.h  |    3 
 15 files changed, 216 deletions(-)

diff -puN arch/arc/boot/dts/hsdk.dts~linux-next-git-rejects arch/arc/boot/dts/hsdk.dts
--- a/arch/arc/boot/dts/hsdk.dts~linux-next-git-rejects
+++ a/arch/arc/boot/dts/hsdk.dts
@@ -103,15 +103,6 @@
 
 		ranges = <0x00000000 0xf0000000 0x10000000>;
 
-<<<<<<< HEAD
-		cgu_rst: reset-controller@8a0 {
-			compatible = "snps,hsdk-reset";
-			#reset-cells = <1>;
-			reg = <0x8A0 0x4>, <0xFF0 0x4>;
-		};
-
-=======
->>>>>>> linux-next/akpm-base
 		core_clk: core-clk@0 {
 			compatible = "snps,hsdk-core-pll-clock";
 			reg = <0x00 0x10>, <0x14B8 0x4>;
diff -puN arch/powerpc/kernel/mce_power.c~linux-next-git-rejects arch/powerpc/kernel/mce_power.c
--- a/arch/powerpc/kernel/mce_power.c~linux-next-git-rejects
+++ a/arch/powerpc/kernel/mce_power.c
@@ -626,11 +626,7 @@ long __machine_check_early_realmode_p9(s
 {
 	/*
 	 * On POWER9 DD2.1 and below, it's possible to get a machine check
-<<<<<<< HEAD
-	 * caused by a paste instruction where only DSISR bit 25 is set. This
-=======
 	 * caused by a paste instruction where only DSISR bit 30 is set. This
->>>>>>> linux-next/akpm-base
 	 * will result in the MCE handler seeing an unknown event and the kernel
 	 * crashing. An MCE that occurs like this is spurious, so we don't need
 	 * to do anything in terms of servicing it. If there is something that
@@ -638,11 +634,7 @@ long __machine_check_early_realmode_p9(s
 	 * correct DSISR so that it can be serviced properly. So detect this
 	 * case and mark it as handled.
 	 */
-<<<<<<< HEAD
-	if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x02000000)
-=======
 	if (SRR1_MC_LOADSTORE(regs->msr) && regs->dsisr == 0x40000000)
->>>>>>> linux-next/akpm-base
 		return 1;
 
 	return mce_handle_error(regs, mce_p9_derror_table, mce_p9_ierror_table);
diff -puN arch/powerpc/kernel/watchdog.c~linux-next-git-rejects arch/powerpc/kernel/watchdog.c
--- a/arch/powerpc/kernel/watchdog.c~linux-next-git-rejects
+++ a/arch/powerpc/kernel/watchdog.c
@@ -355,23 +355,6 @@ static void watchdog_calc_timeouts(void)
 	wd_timer_period_ms = watchdog_thresh * 1000 * 2 / 5;
 }
 
-<<<<<<< HEAD
-void watchdog_nmi_stop(void)
-{
-	int cpu;
-
-	for_each_cpu(cpu, &wd_cpus_enabled)
-		stop_wd_on_cpu(cpu);
-}
-
-void watchdog_nmi_start(void)
-{
-	int cpu;
-
-	watchdog_calc_timeouts();
-	for_each_cpu_and(cpu, cpu_online_mask, &watchdog_cpumask)
-		start_wd_on_cpu(cpu);
-=======
 void watchdog_nmi_reconfigure(bool run)
 {
 	int cpu;
@@ -386,7 +369,6 @@ void watchdog_nmi_reconfigure(bool run)
 			start_wd_on_cpu(cpu);
 	}
 	cpus_read_unlock();
->>>>>>> linux-next/akpm-base
 }
 
 /*
diff -puN arch/x86/kvm/vmx.c~linux-next-git-rejects arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/vmx.c~linux-next-git-rejects
+++ a/arch/x86/kvm/vmx.c
@@ -11730,13 +11730,8 @@ static void __pi_post_block(struct kvm_v
 
 		/* set 'NV' to 'notification vector' */
 		new.nv = POSTED_INTR_VECTOR;
-<<<<<<< HEAD
-	} while (cmpxchg64(&pi_desc->control, old.control,
-			   new.control) != old.control);
-=======
 	} while (cmpxchg(&pi_desc->control, old.control,
 			new.control) != old.control);
->>>>>>> linux-next/akpm-base
 
 	if (!WARN_ON_ONCE(vcpu->pre_pcpu == -1)) {
 		spin_lock(&per_cpu(blocked_vcpu_on_cpu_lock, vcpu->pre_pcpu));
diff -puN drivers/mmc/core/block.c~linux-next-git-rejects drivers/mmc/core/block.c
--- a/drivers/mmc/core/block.c~linux-next-git-rejects
+++ a/drivers/mmc/core/block.c
@@ -1690,15 +1690,12 @@ static void mmc_blk_data_prep(struct mmc
 	}
 
 	mqrq->areq.mrq = &brq->mrq;
-<<<<<<< HEAD
-=======
 
 	if (do_rel_wr_p)
 		*do_rel_wr_p = do_rel_wr;
 
 	if (do_data_tag_p)
 		*do_data_tag_p = do_data_tag;
->>>>>>> linux-next/akpm-base
 }
 
 static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
diff -puN drivers/mmc/core/queue.c~linux-next-git-rejects drivers/mmc/core/queue.c
--- a/drivers/mmc/core/queue.c~linux-next-git-rejects
+++ a/drivers/mmc/core/queue.c
@@ -215,12 +215,6 @@ int mmc_init_queue(struct mmc_queue *mq,
 	struct mmc_host *host = card->host;
 	int ret = -ENOMEM;
 
-<<<<<<< HEAD
-	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
-		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
-
-=======
->>>>>>> linux-next/akpm-base
 	mq->card = card;
 	mq->queue = blk_alloc_queue(GFP_KERNEL);
 	if (!mq->queue)
@@ -239,19 +233,6 @@ int mmc_init_queue(struct mmc_queue *mq,
 	}
 
 	blk_queue_prep_rq(mq->queue, mmc_prep_request);
-<<<<<<< HEAD
-	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);
-	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);
-	if (mmc_can_erase(card))
-		mmc_queue_setup_discard(mq->queue, card);
-
-	blk_queue_bounce_limit(mq->queue, limit);
-	blk_queue_max_hw_sectors(mq->queue,
-		min(host->max_blk_count, host->max_req_size / 512));
-	blk_queue_max_segments(mq->queue, host->max_segs);
-	blk_queue_max_segment_size(mq->queue, host->max_seg_size);
-=======
->>>>>>> linux-next/akpm-base
 
 	mmc_setup_queue(mq, card);
 
diff -puN drivers/mmc/core/queue.h~linux-next-git-rejects drivers/mmc/core/queue.h
--- a/drivers/mmc/core/queue.h~linux-next-git-rejects
+++ a/drivers/mmc/core/queue.h
@@ -82,10 +82,5 @@ extern void mmc_queue_suspend(struct mmc
 extern void mmc_queue_resume(struct mmc_queue *);
 extern unsigned int mmc_queue_map_sg(struct mmc_queue *,
 				     struct mmc_queue_req *);
-<<<<<<< HEAD
-
-extern int mmc_access_rpmb(struct mmc_queue *);
-=======
->>>>>>> linux-next/akpm-base
 
 #endif
diff -puN drivers/tty/serial/fsl_lpuart.c~linux-next-git-rejects drivers/tty/serial/fsl_lpuart.c
--- a/drivers/tty/serial/fsl_lpuart.c~linux-next-git-rejects
+++ a/drivers/tty/serial/fsl_lpuart.c
@@ -2210,8 +2210,6 @@ static int lpuart_probe(struct platform_
 	ret = uart_add_one_port(&lpuart_reg, &sport->port);
 	if (ret)
 		goto failed_attach_port;
-<<<<<<< HEAD
-=======
 
 	of_get_rs485_mode(np, &sport->port.rs485);
 
@@ -2230,7 +2228,6 @@ static int lpuart_probe(struct platform_
 		sport->port.rs485.flags |= SER_RS485_RTS_ON_SEND;
 		writeb(UARTMODEM_TXRTSE, sport->port.membase + UARTMODEM);
 	}
->>>>>>> linux-next/akpm-base
 
 	sport->dma_tx_chan = dma_request_slave_channel(sport->port.dev, "tx");
 	if (!sport->dma_tx_chan)
diff -puN fs/btrfs/extent_io.c~linux-next-git-rejects fs/btrfs/extent_io.c
--- a/fs/btrfs/extent_io.c~linux-next-git-rejects
+++ a/fs/btrfs/extent_io.c
@@ -4056,11 +4056,7 @@ static void flush_epd_write_bio(struct e
 	if (epd->bio) {
 		int ret;
 
-<<<<<<< HEAD
-		ret = submit_one_bio(epd->bio, 0, epd->bio_flags);
-=======
 		ret = submit_one_bio(epd->bio, 0, 0);
->>>>>>> linux-next/akpm-base
 		BUG_ON(ret < 0); /* -ENOMEM */
 		epd->bio = NULL;
 	}
diff -puN include/linux/nmi.h~linux-next-git-rejects include/linux/nmi.h
--- a/include/linux/nmi.h~linux-next-git-rejects
+++ a/include/linux/nmi.h
@@ -109,13 +109,7 @@ static inline int hardlockup_detector_pe
 # endif
 #endif
 
-<<<<<<< HEAD
-void watchdog_nmi_stop(void);
-void watchdog_nmi_start(void);
-int watchdog_nmi_probe(void);
-=======
 void watchdog_nmi_reconfigure(bool run);
->>>>>>> linux-next/akpm-base
 
 /**
  * touch_nmi_watchdog - restart NMI watchdog timeout.
diff -puN kernel/smpboot.c~linux-next-git-rejects kernel/smpboot.c
--- a/kernel/smpboot.c~linux-next-git-rejects
+++ a/kernel/smpboot.c
@@ -351,11 +351,7 @@ void smpboot_update_cpumask_percpu_threa
 	static struct cpumask tmp;
 	unsigned int cpu;
 
-<<<<<<< HEAD
-	lockdep_assert_cpus_held();
-=======
 	get_online_cpus();
->>>>>>> linux-next/akpm-base
 	mutex_lock(&smpboot_threads_lock);
 
 	/* Park threads that were exclusively enabled on the old mask. */
@@ -371,10 +367,7 @@ void smpboot_update_cpumask_percpu_threa
 	cpumask_copy(old, new);
 
 	mutex_unlock(&smpboot_threads_lock);
-<<<<<<< HEAD
-=======
 	put_online_cpus();
->>>>>>> linux-next/akpm-base
 }
 
 static DEFINE_PER_CPU(atomic_t, cpu_hotplug_state) = ATOMIC_INIT(CPU_POST_DEAD);
diff -puN kernel/watchdog.c~linux-next-git-rejects kernel/watchdog.c
--- a/kernel/watchdog.c~linux-next-git-rejects
+++ a/kernel/watchdog.c
@@ -47,10 +47,7 @@ int __read_mostly watchdog_thresh = 10;
 int __read_mostly nmi_watchdog_available;
 
 struct cpumask watchdog_allowed_mask __read_mostly;
-<<<<<<< HEAD
-=======
 static bool softlockup_threads_initialized __read_mostly;
->>>>>>> linux-next/akpm-base
 
 struct cpumask watchdog_cpumask __read_mostly;
 unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
@@ -126,29 +123,6 @@ int __weak __init watchdog_nmi_probe(voi
 }
 
 /**
-<<<<<<< HEAD
- * watchdog_nmi_stop - Stop the watchdog for reconfiguration
- *
- * The reconfiguration steps are:
- * watchdog_nmi_stop();
- * update_variables();
- * watchdog_nmi_start();
- */
-void __weak watchdog_nmi_stop(void) { }
-
-/**
- * watchdog_nmi_start - Start the watchdog after reconfiguration
- *
- * Counterpart to watchdog_nmi_stop().
- *
- * The following variables have been updated in update_variables() and
- * contain the currently valid configuration:
- * - watchdog_enabled
- * - watchdog_thresh
- * - watchdog_cpumask
- */
-void __weak watchdog_nmi_start(void) { }
-=======
  * watchdog_nmi_reconfigure - Optional function to reconfigure NMI watchdogs
  * @run:	If false stop the watchdogs on all enabled CPUs
  *		If true start the watchdogs on all enabled CPUs
@@ -167,7 +141,6 @@ void __weak watchdog_nmi_start(void) { }
  * After the call the variables can be changed again.
  */
 void __weak watchdog_nmi_reconfigure(bool run) { }
->>>>>>> linux-next/akpm-base
 
 /**
  * lockup_detector_update_enable - Update the sysctl enable bit
@@ -554,14 +527,6 @@ static struct smp_hotplug_thread watchdo
 static void softlockup_update_smpboot_threads(void)
 {
 	lockdep_assert_held(&watchdog_mutex);
-<<<<<<< HEAD
-
-	if (!softlockup_threads_initialized)
-		return;
-
-	smpboot_update_cpumask_percpu_thread(&watchdog_threads,
-					     &watchdog_allowed_mask);
-=======
 
 	if (!softlockup_threads_initialized)
 		return;
@@ -569,7 +534,6 @@ static void softlockup_update_smpboot_th
 	smpboot_update_cpumask_percpu_thread(&watchdog_threads,
 					     &watchdog_allowed_mask);
 	__lockup_detector_cleanup();
->>>>>>> linux-next/akpm-base
 }
 
 /* Temporarily park all watchdog threads */
@@ -586,82 +550,14 @@ static void softlockup_unpark_threads(vo
 	softlockup_update_smpboot_threads();
 }
 
-<<<<<<< HEAD
-static void lockup_detector_reconfigure(void)
-{
-	cpus_read_lock();
-	watchdog_nmi_stop();
-=======
 static void softlockup_reconfigure_threads(void)
 {
 	watchdog_nmi_reconfigure(false);
->>>>>>> linux-next/akpm-base
 	softlockup_park_all_threads();
 	set_sample_period();
 	lockup_detector_update_enable();
 	if (watchdog_enabled && watchdog_thresh)
 		softlockup_unpark_threads();
-<<<<<<< HEAD
-	watchdog_nmi_start();
-	cpus_read_unlock();
-	/*
-	 * Must be called outside the cpus locked section to prevent
-	 * recursive locking in the perf code.
-	 */
-	__lockup_detector_cleanup();
-}
-
-/*
- * Create the watchdog thread infrastructure and configure the detector(s).
- *
- * The threads are not unparked as watchdog_allowed_mask is empty.  When
- * the threads are sucessfully initialized, take the proper locks and
- * unpark the threads in the watchdog_cpumask if the watchdog is enabled.
- */
-static __init void lockup_detector_setup(void)
-{
-	int ret;
-
-	/*
-	 * If sysctl is off and watchdog got disabled on the command line,
-	 * nothing to do here.
-	 */
-	lockup_detector_update_enable();
-
-	if (!IS_ENABLED(CONFIG_SYSCTL) &&
-	    !(watchdog_enabled && watchdog_thresh))
-		return;
-
-	ret = smpboot_register_percpu_thread_cpumask(&watchdog_threads,
-						     &watchdog_allowed_mask);
-	if (ret) {
-		pr_err("Failed to initialize soft lockup detector threads\n");
-		return;
-	}
-
-	mutex_lock(&watchdog_mutex);
-	softlockup_threads_initialized = true;
-	lockup_detector_reconfigure();
-	mutex_unlock(&watchdog_mutex);
-}
-
-#else /* CONFIG_SOFTLOCKUP_DETECTOR */
-static inline int watchdog_park_threads(void) { return 0; }
-static inline void watchdog_unpark_threads(void) { }
-static inline int watchdog_enable_all_cpus(void) { return 0; }
-static inline void watchdog_disable_all_cpus(void) { }
-static void lockup_detector_reconfigure(void)
-{
-	cpus_read_lock();
-	watchdog_nmi_stop();
-	lockup_detector_update_enable();
-	watchdog_nmi_start();
-	cpus_read_unlock();
-}
-static inline void lockup_detector_setup(void)
-{
-	lockup_detector_reconfigure();
-=======
 	watchdog_nmi_reconfigure(true);
 }
 
@@ -710,7 +606,6 @@ static void softlockup_reconfigure_threa
 	watchdog_nmi_reconfigure(false);
 	lockup_detector_update_enable();
 	watchdog_nmi_reconfigure(true);
->>>>>>> linux-next/akpm-base
 }
 #endif /* !CONFIG_SOFTLOCKUP_DETECTOR */
 
@@ -750,11 +645,7 @@ static void proc_watchdog_update(void)
 {
 	/* Remove impossible cpus to keep sysctl output clean. */
 	cpumask_and(&watchdog_cpumask, &watchdog_cpumask, cpu_possible_mask);
-<<<<<<< HEAD
-	lockup_detector_reconfigure();
-=======
 	softlockup_reconfigure_threads();
->>>>>>> linux-next/akpm-base
 }
 
 /*
@@ -773,15 +664,9 @@ static int proc_watchdog_common(int whic
 				void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	int err, old, *param = table->data;
-<<<<<<< HEAD
-
-	mutex_lock(&watchdog_mutex);
-
-=======
 
 	mutex_lock(&watchdog_mutex);
 
->>>>>>> linux-next/akpm-base
 	if (!write) {
 		/*
 		 * On read synchronize the userspace interface. This is a
@@ -887,9 +772,5 @@ void __init lockup_detector_init(void)
 
 	if (!watchdog_nmi_probe())
 		nmi_watchdog_available = true;
-<<<<<<< HEAD
-	lockup_detector_setup();
-=======
 	softlockup_init_threads();
->>>>>>> linux-next/akpm-base
 }
diff -puN lib/kobject_uevent.c~linux-next-git-rejects lib/kobject_uevent.c
--- a/lib/kobject_uevent.c~linux-next-git-rejects
+++ a/lib/kobject_uevent.c
@@ -314,8 +314,6 @@ static void zap_modalias_env(struct kobj
 	}
 }
 
-<<<<<<< HEAD
-=======
 static int kobject_uevent_net_broadcast(struct kobject *kobj,
 					struct kobj_uevent_env *env,
 					const char *action_string,
@@ -365,7 +363,6 @@ static int kobject_uevent_net_broadcast(
 	return retval;
 }
 
->>>>>>> linux-next/akpm-base
 /**
  * kobject_uevent_env - send an uevent with environmental data
  *
diff -puN net/dsa/slave.c~linux-next-git-rejects net/dsa/slave.c
--- a/net/dsa/slave.c~linux-next-git-rejects
+++ a/net/dsa/slave.c
@@ -1188,11 +1188,7 @@ int dsa_slave_create(struct dsa_port *po
 	return 0;
 
 out_phy:
-<<<<<<< HEAD
-	phy_disconnect(p->phy);
-=======
 	phy_disconnect(slave_dev->phydev);
->>>>>>> linux-next/akpm-base
 	if (of_phy_is_fixed_link(p->dp->dn))
 		of_phy_deregister_fixed_link(p->dp->dn);
 out_free:
diff -puN tools/include/uapi/linux/bpf.h~linux-next-git-rejects tools/include/uapi/linux/bpf.h
--- a/tools/include/uapi/linux/bpf.h~linux-next-git-rejects
+++ a/tools/include/uapi/linux/bpf.h
@@ -644,10 +644,7 @@ union bpf_attr {
 	FN(redirect_map),		\
 	FN(sk_redirect_map),		\
 	FN(sock_map_update),		\
-<<<<<<< HEAD
-=======
 	FN(xdp_adjust_meta),
->>>>>>> linux-next/akpm-base
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
of-provide-of_n_addrsize_cells-wrappers-for-config_of-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
mm-sysctl-make-numa-stats-configurable-fix.patch
mm-sysctl-make-numa-stats-configurable-fix-fix.patch
mm-mmu_notifier-avoid-double-notification-when-it-is-useless-checkpatch-fixes.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch
mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch
pid-replace-pid-bitmap-implementation-with-idr-api-checkpatch-fixes.patch
pid-remove-pidhash-checkpatch-fixes.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-09-25 20:56 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-09-25 20:56 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/staging/lustre/lustre/llite/llite_lib.c |    5 -----
 fs/affs/super.c                                 |    4 ----
 fs/btrfs/root-tree.c                            |    7 -------
 fs/btrfs/super.c                                |   10 ----------
 fs/ecryptfs/main.c                              |    4 ----
 fs/ext2/super.c                                 |    8 --------
 fs/ext4/super.c                                 |    8 --------
 fs/fat/inode.c                                  |    4 ----
 fs/fat/misc.c                                   |    4 ----
 fs/hfs/super.c                                  |    5 -----
 fs/hfsplus/super.c                              |    4 ----
 fs/jfs/super.c                                  |    8 --------
 fs/minix/inode.c                                |    4 ----
 fs/nfs/super.c                                  |    6 ------
 fs/nilfs2/super.c                               |    4 ----
 fs/ntfs/super.c                                 |    8 --------
 fs/ocfs2/super.c                                |    4 ----
 fs/reiserfs/super.c                             |    4 ----
 fs/ubifs/super.c                                |    5 -----
 fs/udf/super.c                                  |    4 ----
 fs/ufs/super.c                                  |    4 ----
 include/linux/fs.h                              |    4 ----
 22 files changed, 118 deletions(-)

diff -puN drivers/staging/lustre/lustre/llite/llite_lib.c~linux-next-git-rejects drivers/staging/lustre/lustre/llite/llite_lib.c
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c~linux-next-git-rejects
+++ a/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -2031,13 +2031,8 @@ int ll_remount_fs(struct super_block *sb
 	int err;
 	__u32 read_only;
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
-		read_only = *flags & MS_RDONLY;
-=======
 	if ((bool)(*flags & SB_RDONLY) != sb_rdonly(sb)) {
 		read_only = *flags & SB_RDONLY;
->>>>>>> linux-next/akpm-base
 		err = obd_set_info_async(NULL, sbi->ll_md_exp,
 					 sizeof(KEY_READ_ONLY),
 					 KEY_READ_ONLY, sizeof(read_only),
diff -puN fs/affs/super.c~linux-next-git-rejects fs/affs/super.c
--- a/fs/affs/super.c~linux-next-git-rejects
+++ a/fs/affs/super.c
@@ -596,11 +596,7 @@ affs_remount(struct super_block *sb, int
 	memcpy(sbi->s_volume, volume, 32);
 	spin_unlock(&sbi->symlink_lock);
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		return 0;
 
 	if (*flags & SB_RDONLY)
diff -puN fs/btrfs/root-tree.c~linux-next-git-rejects fs/btrfs/root-tree.c
--- a/fs/btrfs/root-tree.c~linux-next-git-rejects
+++ a/fs/btrfs/root-tree.c
@@ -226,13 +226,6 @@ int btrfs_find_orphan_roots(struct btrfs
 	struct btrfs_root *root;
 	int err = 0;
 	int ret;
-<<<<<<< HEAD
-	bool can_recover = true;
-
-	if (sb_rdonly(fs_info->sb))
-		can_recover = false;
-=======
->>>>>>> linux-next/akpm-base
 
 	path = btrfs_alloc_path();
 	if (!path)
diff -puN fs/btrfs/super.c~linux-next-git-rejects fs/btrfs/super.c
--- a/fs/btrfs/super.c~linux-next-git-rejects
+++ a/fs/btrfs/super.c
@@ -1748,11 +1748,7 @@ static int btrfs_remount(struct super_bl
 	btrfs_resize_thread_pool(fs_info,
 		fs_info->thread_pool_size, old_thread_pool_size);
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		goto out;
 
 	if (*flags & SB_RDONLY) {
@@ -1852,15 +1848,9 @@ out:
 	return 0;
 
 restore:
-<<<<<<< HEAD
-	/* We've hit an error - don't reset MS_RDONLY */
-	if (sb_rdonly(sb))
-		old_flags |= MS_RDONLY;
-=======
 	/* We've hit an error - don't reset SB_RDONLY */
 	if (sb_rdonly(sb))
 		old_flags |= SB_RDONLY;
->>>>>>> linux-next/akpm-base
 	sb->s_flags = old_flags;
 	fs_info->mount_opt = old_opts;
 	fs_info->compress_type = old_compress_type;
diff -puN fs/ecryptfs/main.c~linux-next-git-rejects fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c~linux-next-git-rejects
+++ a/fs/ecryptfs/main.c
@@ -569,11 +569,7 @@ static struct dentry *ecryptfs_mount(str
 	 *   2) The ecryptfs_encrypted_view mount option is specified
 	 */
 	if (sb_rdonly(path.dentry->d_sb) || mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
-<<<<<<< HEAD
-		s->s_flags |= MS_RDONLY;
-=======
 		s->s_flags |= SB_RDONLY;
->>>>>>> linux-next/akpm-base
 
 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
diff -puN fs/ext2/super.c~linux-next-git-rejects fs/ext2/super.c
--- a/fs/ext2/super.c~linux-next-git-rejects
+++ a/fs/ext2/super.c
@@ -1173,11 +1173,7 @@ static int ext2_fill_super(struct super_
 		ext2_msg(sb, KERN_WARNING,
 			"warning: mounting ext3 filesystem as ext2");
 	if (ext2_setup_super (sb, es, sb_rdonly(sb)))
-<<<<<<< HEAD
-		sb->s_flags |= MS_RDONLY;
-=======
 		sb->s_flags |= SB_RDONLY;
->>>>>>> linux-next/akpm-base
 	ext2_write_super(sb);
 	return 0;
 
@@ -1346,11 +1342,7 @@ static int ext2_remount (struct super_bl
 			 "dax flag with busy inodes while remounting");
 		sbi->s_mount_opt ^= EXT2_MOUNT_DAX;
 	}
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb)) {
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb)) {
->>>>>>> linux-next/akpm-base
 		spin_unlock(&sbi->s_lock);
 		return 0;
 	}
diff -puN fs/ext4/super.c~linux-next-git-rejects fs/ext4/super.c
--- a/fs/ext4/super.c~linux-next-git-rejects
+++ a/fs/ext4/super.c
@@ -4196,11 +4196,7 @@ no_journal:
 	}
 
 	if (ext4_setup_super(sb, es, sb_rdonly(sb)))
-<<<<<<< HEAD
-		sb->s_flags |= MS_RDONLY;
-=======
 		sb->s_flags |= SB_RDONLY;
->>>>>>> linux-next/akpm-base
 
 	/* determine the minimum size of new large inodes, if present */
 	if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE &&
@@ -5060,11 +5056,7 @@ static int ext4_remount(struct super_blo
 	if (*flags & SB_LAZYTIME)
 		sb->s_flags |= SB_LAZYTIME;
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
-=======
 	if ((bool)(*flags & SB_RDONLY) != sb_rdonly(sb)) {
->>>>>>> linux-next/akpm-base
 		if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) {
 			err = -EROFS;
 			goto restore_opts;
diff -puN fs/fat/inode.c~linux-next-git-rejects fs/fat/inode.c
--- a/fs/fat/inode.c~linux-next-git-rejects
+++ a/fs/fat/inode.c
@@ -786,11 +786,7 @@ static int fat_remount(struct super_bloc
 	sync_filesystem(sb);
 
 	/* make sure we update state on remount. */
-<<<<<<< HEAD
-	new_rdonly = *flags & MS_RDONLY;
-=======
 	new_rdonly = *flags & SB_RDONLY;
->>>>>>> linux-next/akpm-base
 	if (new_rdonly != sb_rdonly(sb)) {
 		if (new_rdonly)
 			fat_set_state(sb, 0, 0);
diff -puN fs/fat/misc.c~linux-next-git-rejects fs/fat/misc.c
--- a/fs/fat/misc.c~linux-next-git-rejects
+++ a/fs/fat/misc.c
@@ -33,11 +33,7 @@ void __fat_fs_error(struct super_block *
 	if (opts->errors == FAT_ERRORS_PANIC)
 		panic("FAT-fs (%s): fs panic from previous error\n", sb->s_id);
 	else if (opts->errors == FAT_ERRORS_RO && !sb_rdonly(sb)) {
-<<<<<<< HEAD
-		sb->s_flags |= MS_RDONLY;
-=======
 		sb->s_flags |= SB_RDONLY;
->>>>>>> linux-next/akpm-base
 		fat_msg(sb, KERN_ERR, "Filesystem has been set read-only");
 	}
 }
diff -puN fs/hfsplus/super.c~linux-next-git-rejects fs/hfsplus/super.c
--- a/fs/hfsplus/super.c~linux-next-git-rejects
+++ a/fs/hfsplus/super.c
@@ -329,11 +329,7 @@ static int hfsplus_statfs(struct dentry
 static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
 {
 	sync_filesystem(sb);
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		return 0;
 	if (!(*flags & SB_RDONLY)) {
 		struct hfsplus_vh *vhdr = HFSPLUS_SB(sb)->s_vhdr;
diff -puN fs/hfs/super.c~linux-next-git-rejects fs/hfs/super.c
--- a/fs/hfs/super.c~linux-next-git-rejects
+++ a/fs/hfs/super.c
@@ -114,13 +114,8 @@ static int hfs_statfs(struct dentry *den
 static int hfs_remount(struct super_block *sb, int *flags, char *data)
 {
 	sync_filesystem(sb);
-<<<<<<< HEAD
-	*flags |= MS_NODIRATIME;
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	*flags |= SB_NODIRATIME;
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		return 0;
 	if (!(*flags & SB_RDONLY)) {
 		if (!(HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
diff -puN fs/jfs/super.c~linux-next-git-rejects fs/jfs/super.c
--- a/fs/jfs/super.c~linux-next-git-rejects
+++ a/fs/jfs/super.c
@@ -477,11 +477,7 @@ static int jfs_remount(struct super_bloc
 			return rc;
 	}
 
-<<<<<<< HEAD
-	if (sb_rdonly(sb) && !(*flags & MS_RDONLY)) {
-=======
 	if (sb_rdonly(sb) && !(*flags & SB_RDONLY)) {
->>>>>>> linux-next/akpm-base
 		/*
 		 * Invalidate any previously read metadata.  fsck may have
 		 * changed the on-disk data since we mounted r/o
@@ -497,11 +493,7 @@ static int jfs_remount(struct super_bloc
 		dquot_resume(sb, -1);
 		return ret;
 	}
-<<<<<<< HEAD
-	if (!sb_rdonly(sb) && (*flags & MS_RDONLY)) {
-=======
 	if (!sb_rdonly(sb) && (*flags & SB_RDONLY)) {
->>>>>>> linux-next/akpm-base
 		rc = dquot_suspend(sb, -1);
 		if (rc < 0)
 			return rc;
diff -puN fs/minix/inode.c~linux-next-git-rejects fs/minix/inode.c
--- a/fs/minix/inode.c~linux-next-git-rejects
+++ a/fs/minix/inode.c
@@ -125,11 +125,7 @@ static int minix_remount (struct super_b
 
 	sync_filesystem(sb);
 	ms = sbi->s_ms;
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		return 0;
 	if (*flags & SB_RDONLY) {
 		if (ms->s_state & MINIX_VALID_FS ||
diff -puN fs/nfs/super.c~linux-next-git-rejects fs/nfs/super.c
--- a/fs/nfs/super.c~linux-next-git-rejects
+++ a/fs/nfs/super.c
@@ -813,15 +813,9 @@ int nfs_show_stats(struct seq_file *m, s
 	 */
 	seq_printf(m, "\n\topts:\t");
 	seq_puts(m, sb_rdonly(root->d_sb) ? "ro" : "rw");
-<<<<<<< HEAD
-	seq_puts(m, root->d_sb->s_flags & MS_SYNCHRONOUS ? ",sync" : "");
-	seq_puts(m, root->d_sb->s_flags & MS_NOATIME ? ",noatime" : "");
-	seq_puts(m, root->d_sb->s_flags & MS_NODIRATIME ? ",nodiratime" : "");
-=======
 	seq_puts(m, root->d_sb->s_flags & SB_SYNCHRONOUS ? ",sync" : "");
 	seq_puts(m, root->d_sb->s_flags & SB_NOATIME ? ",noatime" : "");
 	seq_puts(m, root->d_sb->s_flags & SB_NODIRATIME ? ",nodiratime" : "");
->>>>>>> linux-next/akpm-base
 	nfs_show_mount_options(m, nfss, 1);
 
 	seq_printf(m, "\n\tage:\t%lu", (jiffies - nfss->mount_time) / HZ);
diff -puN fs/nilfs2/super.c~linux-next-git-rejects fs/nilfs2/super.c
--- a/fs/nilfs2/super.c~linux-next-git-rejects
+++ a/fs/nilfs2/super.c
@@ -1144,11 +1144,7 @@ static int nilfs_remount(struct super_bl
 		goto restore_opts;
 	}
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		goto out;
 	if (*flags & SB_RDONLY) {
 		/* Shutting down log writer */
diff -puN fs/ntfs/super.c~linux-next-git-rejects fs/ntfs/super.c
--- a/fs/ntfs/super.c~linux-next-git-rejects
+++ a/fs/ntfs/super.c
@@ -487,11 +487,7 @@ static int ntfs_remount(struct super_blo
 	 * When remounting read-only, mark the volume clean if no volume errors
 	 * have occurred.
 	 */
-<<<<<<< HEAD
-	if (sb_rdonly(sb) && !(*flags & MS_RDONLY)) {
-=======
 	if (sb_rdonly(sb) && !(*flags & SB_RDONLY)) {
->>>>>>> linux-next/akpm-base
 		static const char *es = ".  Cannot remount read-write.";
 
 		/* Remounting read-write. */
@@ -552,11 +548,7 @@ static int ntfs_remount(struct super_blo
 			NVolSetErrors(vol);
 			return -EROFS;
 		}
-<<<<<<< HEAD
-	} else if (!sb_rdonly(sb) && (*flags & MS_RDONLY)) {
-=======
 	} else if (!sb_rdonly(sb) && (*flags & SB_RDONLY)) {
->>>>>>> linux-next/akpm-base
 		/* Remounting read-only. */
 		if (!NVolErrors(vol)) {
 			if (ntfs_clear_volume_flags(vol, VOLUME_IS_DIRTY))
diff -puN fs/ocfs2/super.c~linux-next-git-rejects fs/ocfs2/super.c
--- a/fs/ocfs2/super.c~linux-next-git-rejects
+++ a/fs/ocfs2/super.c
@@ -675,11 +675,7 @@ static int ocfs2_remount(struct super_bl
 	}
 
 	/* We're going to/from readonly mode. */
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
-=======
 	if ((bool)(*flags & SB_RDONLY) != sb_rdonly(sb)) {
->>>>>>> linux-next/akpm-base
 		/* Disable quota accounting before remounting RO */
 		if (*flags & SB_RDONLY) {
 			ret = ocfs2_susp_quotas(osb, 0);
diff -puN fs/reiserfs/super.c~linux-next-git-rejects fs/reiserfs/super.c
--- a/fs/reiserfs/super.c~linux-next-git-rejects
+++ a/fs/reiserfs/super.c
@@ -121,11 +121,7 @@ void reiserfs_schedule_old_flush(struct
 	 * Avoid scheduling flush when sb is being shut down. It can race
 	 * with journal shutdown and free still queued delayed work.
 	 */
-<<<<<<< HEAD
-	if (sb_rdonly(s) || !(s->s_flags & MS_ACTIVE))
-=======
 	if (sb_rdonly(s) || !(s->s_flags & SB_ACTIVE))
->>>>>>> linux-next/akpm-base
 		return;
 
 	spin_lock(&sbi->old_work_lock);
diff -puN fs/ubifs/super.c~linux-next-git-rejects fs/ubifs/super.c
--- a/fs/ubifs/super.c~linux-next-git-rejects
+++ a/fs/ubifs/super.c
@@ -1160,13 +1160,8 @@ static int mount_ubifs(struct ubifs_info
 	size_t sz;
 
 	c->ro_mount = !!sb_rdonly(c->vfs_sb);
-<<<<<<< HEAD
-	/* Suppress error messages while probing if MS_SILENT is set */
-	c->probing = !!(c->vfs_sb->s_flags & MS_SILENT);
-=======
 	/* Suppress error messages while probing if SB_SILENT is set */
 	c->probing = !!(c->vfs_sb->s_flags & SB_SILENT);
->>>>>>> linux-next/akpm-base
 
 	err = init_constants_early(c);
 	if (err)
diff -puN fs/udf/super.c~linux-next-git-rejects fs/udf/super.c
--- a/fs/udf/super.c~linux-next-git-rejects
+++ a/fs/udf/super.c
@@ -673,11 +673,7 @@ static int udf_remount_fs(struct super_b
 	sbi->s_dmode = uopt.dmode;
 	write_unlock(&sbi->s_cred_lock);
 
-<<<<<<< HEAD
-	if ((bool)(*flags & MS_RDONLY) == sb_rdonly(sb))
-=======
 	if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb))
->>>>>>> linux-next/akpm-base
 		goto out_unlock;
 
 	if (*flags & SB_RDONLY)
diff -puN fs/ufs/super.c~linux-next-git-rejects fs/ufs/super.c
--- a/fs/ufs/super.c~linux-next-git-rejects
+++ a/fs/ufs/super.c
@@ -1328,11 +1328,7 @@ static int ufs_remount (struct super_blo
 		return -EINVAL;
 	}
 
-<<<<<<< HEAD
-	if ((bool)(*mount_flags & MS_RDONLY) == sb_rdonly(sb)) {
-=======
 	if ((bool)(*mount_flags & SB_RDONLY) == sb_rdonly(sb)) {
->>>>>>> linux-next/akpm-base
 		UFS_SB(sb)->s_mount_opt = new_mount_opt;
 		mutex_unlock(&UFS_SB(sb)->s_lock);
 		return 0;
diff -puN include/linux/fs.h~linux-next-git-rejects include/linux/fs.h
--- a/include/linux/fs.h~linux-next-git-rejects
+++ a/include/linux/fs.h
@@ -1869,11 +1869,7 @@ struct super_operations {
  */
 #define __IS_FLG(inode, flg)	((inode)->i_sb->s_flags & (flg))
 
-<<<<<<< HEAD
-static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags & MS_RDONLY; }
-=======
 static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags & SB_RDONLY; }
->>>>>>> linux-next/akpm-base
 #define IS_RDONLY(inode)	sb_rdonly((inode)->i_sb)
 #define IS_SYNC(inode)		(__IS_FLG(inode, SB_SYNCHRONOUS) || \
 					((inode)->i_flags & S_SYNC))
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-oom_reaper-skip-mm-structs-with-mmu-notifiers-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
include-linux-sched-mmh-uninline-mmdrop_async-etc.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-09-12 19:29 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-09-12 19:29 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt |    3 --
 arch/arm64/boot/dts/rockchip/rk3328-evb.dts            |   14 ----------
 drivers/clk/meson/gxbb.c                               |    6 ----
 include/dt-bindings/clock/rv1108-cru.h                 |   12 --------
 4 files changed, 35 deletions(-)

diff -puN arch/arm64/boot/dts/rockchip/rk3328-evb.dts~linux-next-git-rejects arch/arm64/boot/dts/rockchip/rk3328-evb.dts
--- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts
@@ -60,16 +60,6 @@
 		regulator-max-microvolt = <12000000>;
 	};
 
-<<<<<<< HEAD
-	vcc_sys: vcc-sys {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&dc_12v>;
-=======
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
@@ -82,7 +72,6 @@
 		 * - PDN (power down when low)
 		 */
 		reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
->>>>>>> linux-next/akpm-base
 	};
 
 	vcc_phy: vcc-phy-regulator {
@@ -252,8 +241,6 @@
 			rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
-<<<<<<< HEAD
-=======
 
 	sdio-pwrseq {
 		wifi_enable_h: wifi-enable-h {
@@ -286,7 +273,6 @@
 	pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
 	vmmc-supply = <&vcc_sd>;
 	status = "okay";
->>>>>>> linux-next/akpm-base
 };
 
 &tsadc {
diff -puN Documentation/devicetree/bindings/watchdog/mtk-wdt.txt~linux-next-git-rejects Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
@@ -4,11 +4,8 @@ Required properties:
 
 - compatible should contain:
 	"mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701
-<<<<<<< HEAD
-=======
 	"mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622
 	"mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623
->>>>>>> linux-next/akpm-base
 	"mediatek,mt6589-wdt": for MT6589
 	"mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797
 
diff -puN drivers/clk/meson/gxbb.c~linux-next-git-rejects drivers/clk/meson/gxbb.c
--- a/drivers/clk/meson/gxbb.c~linux-next-git-rejects
+++ a/drivers/clk/meson/gxbb.c
@@ -1340,8 +1340,6 @@ static struct clk_hw_onecell_data gxbb_h
 		[CLKID_32K_CLK]		    = &gxbb_32k_clk.hw,
 		[CLKID_32K_CLK_SEL]	    = &gxbb_32k_clk_sel.hw,
 		[CLKID_32K_CLK_DIV]	    = &gxbb_32k_clk_div.hw,
-<<<<<<< HEAD
-=======
 		[CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
 		[CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
 		[CLKID_SD_EMMC_A_CLK0]	    = &gxbb_sd_emmc_a_clk0.hw,
@@ -1351,7 +1349,6 @@ static struct clk_hw_onecell_data gxbb_h
 		[CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
 		[CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
 		[CLKID_SD_EMMC_C_CLK0]	    = &gxbb_sd_emmc_c_clk0.hw,
->>>>>>> linux-next/akpm-base
 		[NR_CLKS]		    = NULL,
 	},
 	.num = NR_CLKS,
@@ -1475,8 +1472,6 @@ static struct clk_hw_onecell_data gxl_hw
 		[CLKID_32K_CLK]		    = &gxbb_32k_clk.hw,
 		[CLKID_32K_CLK_SEL]	    = &gxbb_32k_clk_sel.hw,
 		[CLKID_32K_CLK_DIV]	    = &gxbb_32k_clk_div.hw,
-<<<<<<< HEAD
-=======
 		[CLKID_SD_EMMC_A_CLK0_SEL]  = &gxbb_sd_emmc_a_clk0_sel.hw,
 		[CLKID_SD_EMMC_A_CLK0_DIV]  = &gxbb_sd_emmc_a_clk0_div.hw,
 		[CLKID_SD_EMMC_A_CLK0]	    = &gxbb_sd_emmc_a_clk0.hw,
@@ -1486,7 +1481,6 @@ static struct clk_hw_onecell_data gxl_hw
 		[CLKID_SD_EMMC_C_CLK0_SEL]  = &gxbb_sd_emmc_c_clk0_sel.hw,
 		[CLKID_SD_EMMC_C_CLK0_DIV]  = &gxbb_sd_emmc_c_clk0_div.hw,
 		[CLKID_SD_EMMC_C_CLK0]	    = &gxbb_sd_emmc_c_clk0.hw,
->>>>>>> linux-next/akpm-base
 		[NR_CLKS]		    = NULL,
 	},
 	.num = NR_CLKS,
diff -puN include/dt-bindings/clock/rv1108-cru.h~linux-next-git-rejects include/dt-bindings/clock/rv1108-cru.h
--- a/include/dt-bindings/clock/rv1108-cru.h~linux-next-git-rejects
+++ a/include/dt-bindings/clock/rv1108-cru.h
@@ -67,15 +67,9 @@
 #define SCLK_SPI			108
 #define SCLK_SARADC			109
 #define SCLK_TSADC			110
-<<<<<<< HEAD
-#define SCLK_MACPHY_PRE			111
-#define SCLK_MACPHY			112
-#define SCLK_MACPHY_RX			113
-=======
 #define SCLK_MAC_PRE			111
 #define SCLK_MAC			112
 #define SCLK_MAC_RX			113
->>>>>>> linux-next/akpm-base
 #define SCLK_MAC_REF			114
 #define SCLK_MAC_REFOUT			115
 #define SCLK_DSP_PFM			116
@@ -116,10 +110,7 @@
 #define ACLK_CIF2			207
 #define ACLK_CIF3			208
 #define ACLK_PERI			209
-<<<<<<< HEAD
-=======
 #define ACLK_GMAC			210
->>>>>>> linux-next/akpm-base
 
 /* pclk gates */
 #define PCLK_GPIO1			256
@@ -151,10 +142,7 @@
 #define PCLK_EFUSE0			282
 #define PCLK_EFUSE1			283
 #define PCLK_WDT			284
-<<<<<<< HEAD
-=======
 #define PCLK_GMAC			285
->>>>>>> linux-next/akpm-base
 
 /* hclk gates */
 #define HCLK_I2S0_8CH			320
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
drivers-media-cec-cec-adapc-fix-build-with-gcc-444.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-09-06 20:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-09-06 20:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/acpi/arm64/iort.c                       |   21 -----
 drivers/firmware/efi/libstub/arm64-stub.c       |    3 
 drivers/hwtracing/coresight/coresight-tmc.c     |    3 
 drivers/input/misc/axp20x-pek.c                 |   10 --
 drivers/irqchip/irq-mips-gic.c                  |   17 ----
 drivers/phy/Makefile                            |    3 
 drivers/spi/spi.c                               |    3 
 drivers/staging/unisys/visorhba/visorhba_main.c |   52 --------------
 8 files changed, 112 deletions(-)

diff -puN drivers/acpi/arm64/iort.c~linux-next-git-rejects drivers/acpi/arm64/iort.c
--- a/drivers/acpi/arm64/iort.c~linux-next-git-rejects
+++ a/drivers/acpi/arm64/iort.c
@@ -673,26 +673,6 @@ static int iort_iommu_xlate(struct devic
 	if (!ops)
 		return iort_iommu_driver_enabled(node->type) ?
 		       -EPROBE_DEFER : -ENODEV;
-<<<<<<< HEAD
-
-	return arm_smmu_iort_xlate(dev, streamid, iort_fwnode, ops);
-}
-
-struct iort_pci_alias_info {
-	struct device *dev;
-	struct acpi_iort_node *node;
-};
-
-static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
-{
-	struct iort_pci_alias_info *info = data;
-	struct acpi_iort_node *parent;
-	u32 streamid;
-
-	parent = iort_node_map_id(info->node, alias, &streamid,
-				  IORT_IOMMU_TYPE);
-	return iort_iommu_xlate(info->dev, parent, streamid);
-=======
 
 	return arm_smmu_iort_xlate(dev, streamid, iort_fwnode, ops);
 }
@@ -729,7 +709,6 @@ static int nc_dma_get_range(struct devic
 			1ULL<<ncomp->memory_address_limit;
 
 	return 0;
->>>>>>> linux-next/akpm-base
 }
 
 /**
diff -puN drivers/firmware/efi/libstub/arm64-stub.c~linux-next-git-rejects drivers/firmware/efi/libstub/arm64-stub.c
--- a/drivers/firmware/efi/libstub/arm64-stub.c~linux-next-git-rejects
+++ a/drivers/firmware/efi/libstub/arm64-stub.c
@@ -21,10 +21,7 @@
 #include <linux/efi.h>
 #include <asm/efi.h>
 #include <asm/memory.h>
-<<<<<<< HEAD
 #include <asm/sections.h>
-=======
->>>>>>> linux-next/akpm-base
 #include <asm/sysreg.h>
 
 #include "efistub.h"
diff -puN drivers/hwtracing/coresight/coresight-tmc.c~linux-next-git-rejects drivers/hwtracing/coresight/coresight-tmc.c
--- a/drivers/hwtracing/coresight/coresight-tmc.c~linux-next-git-rejects
+++ a/drivers/hwtracing/coresight/coresight-tmc.c
@@ -438,8 +438,6 @@ out:
 }
 
 static const struct amba_id tmc_ids[] = {
-<<<<<<< HEAD
-=======
 	{
 		.id     = 0x000bb961,
 		.mask   = 0x000fffff,
@@ -455,7 +453,6 @@ static const struct amba_id tmc_ids[] =
 		.id	= 0x000bb9e9,
 		.mask	= 0x000fffff,
 	},
->>>>>>> linux-next/akpm-base
 	{
 		/* Coresight SoC 600 TMC-ETF */
 		.id	= 0x000bb9ea,
diff -puN drivers/input/misc/axp20x-pek.c~linux-next-git-rejects drivers/input/misc/axp20x-pek.c
--- a/drivers/input/misc/axp20x-pek.c~linux-next-git-rejects
+++ a/drivers/input/misc/axp20x-pek.c
@@ -354,15 +354,6 @@ static int axp20x_pek_probe(struct platf
 			return error;
 	}
 
-<<<<<<< HEAD
-	error = devm_device_add_group(&pdev->dev, &axp20x_attribute_group);
-	if (error) {
-		dev_err(&pdev->dev, "Failed to create sysfs attributes: %d\n",
-			error);
-		return error;
-	}
-
-=======
 	axp20x_pek->info = (struct axp20x_info *)match->driver_data;
 
 	error = devm_device_add_group(&pdev->dev, &axp20x_attribute_group);
@@ -372,7 +363,6 @@ static int axp20x_pek_probe(struct platf
 		return error;
 	}
 
->>>>>>> linux-next/akpm-base
 	platform_set_drvdata(pdev, axp20x_pek);
 
 	return 0;
diff -puN drivers/irqchip/irq-mips-gic.c~linux-next-git-rejects drivers/irqchip/irq-mips-gic.c
--- a/drivers/irqchip/irq-mips-gic.c~linux-next-git-rejects
+++ a/drivers/irqchip/irq-mips-gic.c
@@ -250,14 +250,8 @@ static int gic_set_affinity(struct irq_d
 			    bool force)
 {
 	unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);
-<<<<<<< HEAD
-	cpumask_t	tmp = CPU_MASK_NONE;
-	unsigned long	flags;
-	int		i, cpu;
-=======
 	unsigned long flags;
 	unsigned int cpu;
->>>>>>> linux-next/akpm-base
 
 	cpu = cpumask_first_and(cpumask, cpu_online_mask);
 	if (cpu >= NR_CPUS)
@@ -269,16 +263,6 @@ static int gic_set_affinity(struct irq_d
 	spin_lock_irqsave(&gic_lock, flags);
 
 	/* Re-route this IRQ */
-<<<<<<< HEAD
-	gic_map_to_vpe(irq, mips_cm_vp_id(cpu));
-
-	/* Update the pcpu_masks */
-	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
-		clear_bit(irq, pcpu_masks[i].pcpu_mask);
-	set_bit(irq, pcpu_masks[cpu].pcpu_mask);
-
-	cpumask_copy(irq_data_get_affinity_mask(d), cpumask);
-=======
 	write_gic_map_vp(irq, BIT(mips_cm_vp_id(cpu)));
 
 	/* Update the pcpu_masks */
@@ -286,7 +270,6 @@ static int gic_set_affinity(struct irq_d
 	if (read_gic_mask(irq))
 		set_bit(irq, per_cpu_ptr(pcpu_masks, cpu));
 
->>>>>>> linux-next/akpm-base
 	irq_data_update_effective_affinity(d, cpumask_of(cpu));
 	spin_unlock_irqrestore(&gic_lock, flags);
 
diff -puN drivers/phy/Makefile~linux-next-git-rejects drivers/phy/Makefile
--- a/drivers/phy/Makefile~linux-next-git-rejects
+++ a/drivers/phy/Makefile
@@ -8,10 +8,7 @@ obj-$(CONFIG_PHY_XGENE)			+= phy-xgene.o
 obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
 obj-$(CONFIG_ARCH_SUNXI)		+= allwinner/
 obj-$(CONFIG_ARCH_MESON)		+= amlogic/
-<<<<<<< HEAD
-=======
 obj-$(CONFIG_LANTIQ)			+= lantiq/
->>>>>>> linux-next/akpm-base
 obj-$(CONFIG_ARCH_MEDIATEK)		+= mediatek/
 obj-$(CONFIG_ARCH_RENESAS)		+= renesas/
 obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
diff -puN drivers/spi/spi.c~linux-next-git-rejects drivers/spi/spi.c
--- a/drivers/spi/spi.c~linux-next-git-rejects
+++ a/drivers/spi/spi.c
@@ -40,10 +40,7 @@
 #include <linux/ioport.h>
 #include <linux/acpi.h>
 #include <linux/highmem.h>
-<<<<<<< HEAD
-=======
 #include <linux/platform_data/x86/apple.h>
->>>>>>> linux-next/akpm-base
 #include <linux/idr.h>
 
 #define CREATE_TRACE_POINTS
diff -puN drivers/staging/unisys/visorhba/visorhba_main.c~linux-next-git-rejects drivers/staging/unisys/visorhba/visorhba_main.c
--- a/drivers/staging/unisys/visorhba/visorhba_main.c~linux-next-git-rejects
+++ a/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -49,11 +49,6 @@ MODULE_ALIAS("visorbus:" VISOR_VHBA_CHAN
 struct visordisk_info {
 	struct scsi_device *sdev;
 	u32 valid;
-<<<<<<< HEAD
-	/* Disk Path */
-	u32 channel, id, lun;
-=======
->>>>>>> linux-next/akpm-base
 	atomic_t ios_threshold;
 	atomic_t error_count;
 	struct visordisk_info *next;
@@ -483,7 +478,6 @@ static const char *visorhba_get_info(str
  * dma_data_dir_linux_to_spar - convert dma_data_direction value to
  *				Unisys-specific equivalent
  * @d: dma direction value to convert
-<<<<<<< HEAD
  *
  * Returns the Unisys-specific dma direction value corresponding to @d
  */
@@ -511,35 +505,6 @@ static u32 dma_data_dir_linux_to_spar(en
  * Queues to scsicmd to the ServicePartition after converting it to a
  * uiscmdrsp structure.
  *
-=======
- *
- * Returns the Unisys-specific dma direction value corresponding to @d
- */
-static u32 dma_data_dir_linux_to_spar(enum dma_data_direction d)
-{
-	switch (d) {
-	case DMA_BIDIRECTIONAL:
-		return UIS_DMA_BIDIRECTIONAL;
-	case DMA_TO_DEVICE:
-		return UIS_DMA_TO_DEVICE;
-	case DMA_FROM_DEVICE:
-		return UIS_DMA_FROM_DEVICE;
-	case DMA_NONE:
-		return UIS_DMA_NONE;
-	default:
-		return UIS_DMA_NONE;
-	}
-}
-
-/*
- * visorhba_queue_command_lck - Queues command to the Service Partition
- * @scsicmd:		Command to be queued
- * @vsiorhba_cmnd_done: Done command to call when scsicmd is returned
- *
- * Queues to scsicmd to the ServicePartition after converting it to a
- * uiscmdrsp structure.
- *
->>>>>>> linux-next/akpm-base
  * Return: 0 if successfully queued to the Service Partition, otherwise
  *	   error code
  */
@@ -639,24 +604,14 @@ static int visorhba_slave_alloc(struct s
 	struct visorhba_devdata *devdata;
 	struct Scsi_Host *scsihost = (struct Scsi_Host *)scsidev->host;
 
-<<<<<<< HEAD
-=======
 	/* already allocated return success */
 	if (scsidev->hostdata)
 		return 0;
 
->>>>>>> linux-next/akpm-base
 	/* even though we errored, treat as success */
 	devdata = (struct visorhba_devdata *)scsihost->hostdata;
 	if (!devdata)
 		return 0;
-<<<<<<< HEAD
-
-	/* already allocated return success */
-	for_each_vdisk_match(vdisk, devdata, scsidev)
-		return 0;
-=======
->>>>>>> linux-next/akpm-base
 
 	vdisk = kzalloc(sizeof(*vdisk), GFP_ATOMIC);
 	if (!vdisk)
@@ -829,17 +784,10 @@ static void visorhba_serverdown_complete
 /*
  * visorhba_serverdown - Got notified that the IOVM is down
  * @devdata: Visorhba that is being serviced by downed IOVM
-<<<<<<< HEAD
- *
- * Something happened to the IOVM, return immediately and
- * schedule cleanup work.
- *
-=======
  *
  * Something happened to the IOVM, return immediately and
  * schedule cleanup work.
  *
->>>>>>> linux-next/akpm-base
  * Return: 0 on success, -EINVAL on failure
  */
 static int visorhba_serverdown(struct visorhba_devdata *devdata)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
mm-page_owner-make-init_pages_in_zone-faster-fix-checkpatch-fixes.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch
mm-swap-add-swap-readahead-hit-statistics-fix.patch
swap-choose-swap-device-according-to-numa-node-v2-fix.patch
mmfork-introduce-madv_wipeonfork-fix.patch
mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes.patch
add-testcases-for-memset16-32-64-fix.patch
vga-optimise-console-scrolling-fix.patch
lib-add-test-for-bitmap_parselist-fix.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
zram-mm-vs-block.patch
drivers-media-cec-cec-adapc-fix-build-with-gcc-444.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-08-28 20:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-08-28 20:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/core/uverbs_cmd.c |   36 -------------------------
 1 file changed, 36 deletions(-)

diff -puN drivers/infiniband/core/uverbs_cmd.c~linux-next-git-rejects drivers/infiniband/core/uverbs_cmd.c
--- a/drivers/infiniband/core/uverbs_cmd.c~linux-next-git-rejects
+++ a/drivers/infiniband/core/uverbs_cmd.c
@@ -2006,44 +2006,8 @@ static int modify_qp(struct ib_uverbs_fi
 	attr->rate_limit	  = cmd->rate_limit;
 
 	if (cmd->base.attr_mask & IB_QP_AV)
-<<<<<<< HEAD
-		attr->ah_attr.type = rdma_ah_find_type(qp->device,
-						       cmd->base.dest.port_num);
-	if (cmd->base.dest.is_global) {
-		rdma_ah_set_grh(&attr->ah_attr, NULL,
-				cmd->base.dest.flow_label,
-				cmd->base.dest.sgid_index,
-				cmd->base.dest.hop_limit,
-				cmd->base.dest.traffic_class);
-		rdma_ah_set_dgid_raw(&attr->ah_attr, cmd->base.dest.dgid);
-	} else {
-		rdma_ah_set_ah_flags(&attr->ah_attr, 0);
-	}
-	rdma_ah_set_dlid(&attr->ah_attr, cmd->base.dest.dlid);
-	rdma_ah_set_sl(&attr->ah_attr, cmd->base.dest.sl);
-	rdma_ah_set_path_bits(&attr->ah_attr, cmd->base.dest.src_path_bits);
-	rdma_ah_set_static_rate(&attr->ah_attr, cmd->base.dest.static_rate);
-	rdma_ah_set_port_num(&attr->ah_attr,
-			     cmd->base.dest.port_num);
-
-	if (cmd->base.attr_mask & IB_QP_ALT_PATH)
-		attr->alt_ah_attr.type =
-			rdma_ah_find_type(qp->device, cmd->base.dest.port_num);
-	if (cmd->base.alt_dest.is_global) {
-		rdma_ah_set_grh(&attr->alt_ah_attr, NULL,
-				cmd->base.alt_dest.flow_label,
-				cmd->base.alt_dest.sgid_index,
-				cmd->base.alt_dest.hop_limit,
-				cmd->base.alt_dest.traffic_class);
-		rdma_ah_set_dgid_raw(&attr->alt_ah_attr,
-				     cmd->base.alt_dest.dgid);
-	} else {
-		rdma_ah_set_ah_flags(&attr->alt_ah_attr, 0);
-	}
-=======
 		copy_ah_attr_from_uverbs(qp->device, &attr->ah_attr,
 					 &cmd->base.dest);
->>>>>>> linux-next/akpm-base
 
 	if (cmd->base.attr_mask & IB_QP_ALT_PATH)
 		copy_ah_attr_from_uverbs(qp->device, &attr->alt_ah_attr,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
mm-page_owner-make-init_pages_in_zone-faster-fix-checkpatch-fixes.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch
mm-swap-add-swap-readahead-hit-statistics-fix.patch
swap-choose-swap-device-according-to-numa-node-v2-fix.patch
mm-change-the-call-sites-of-numa-statistics-items-checkpatch-fixes.patch
add-testcases-for-memset16-32-64-fix.patch
vga-optimise-console-scrolling-fix.patch
lib-add-test-for-bitmap_parselist-fix.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
zram-mm-vs-block.patch
drivers-media-cec-cec-adapc-fix-build-with-gcc-444.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-08-22 20:54 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-08-22 20:54 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kernel/head64.c             |    6 ------
 arch/x86/mm/mmap.c                   |    5 -----
 drivers/gpu/drm/i915/intel_display.c |    9 ---------
 3 files changed, 20 deletions(-)

diff -puN arch/x86/kernel/head64.c~linux-next-git-rejects arch/x86/kernel/head64.c
--- a/arch/x86/kernel/head64.c~linux-next-git-rejects
+++ a/arch/x86/kernel/head64.c
@@ -100,16 +100,10 @@ unsigned long __head __startup_64(unsign
 	 * creates a bunch of nonsense entries but that is fine --
 	 * it avoids problems around wraparound.
 	 */
-<<<<<<< HEAD
-	next_pgt_ptr = fixup_pointer(&next_early_pgt, physaddr);
-	pud = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
-	pmd = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
-=======
 
 	pud = fixup_pointer(early_dynamic_pgts[next_early_pgt++], physaddr);
 	pmd = fixup_pointer(early_dynamic_pgts[next_early_pgt++], physaddr);
 	pgtable_flags = _KERNPG_TABLE_NOENC + sme_get_me_mask();
->>>>>>> linux-next/akpm-base
 
 	if (IS_ENABLED(CONFIG_X86_5LEVEL)) {
 		p4d = fixup_pointer(early_dynamic_pgts[next_early_pgt++], physaddr);
diff -puN arch/x86/mm/mmap.c~linux-next-git-rejects arch/x86/mm/mmap.c
--- a/arch/x86/mm/mmap.c~linux-next-git-rejects
+++ a/arch/x86/mm/mmap.c
@@ -50,14 +50,9 @@ unsigned long task_size_64bit(int full_a
 static unsigned long stack_maxrandom_size(unsigned long task_size)
 {
 	unsigned long max = 0;
-<<<<<<< HEAD
-	if (current->flags & PF_RANDOMIZE) {
-		max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit());
-=======
 	if ((current->flags & PF_RANDOMIZE) &&
 		!(current->personality & ADDR_NO_RANDOMIZE)) {
 		max = (-1UL) & __STACK_RND_MASK(task_size == task_size_32bit());
->>>>>>> linux-next/akpm-base
 		max <<= PAGE_SHIFT;
 	}
 
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -3685,14 +3685,6 @@ void intel_prepare_reset(struct drm_i915
 	    !gpu_reset_clobbers_display(dev_priv))
 		return;
 
-<<<<<<< HEAD
-	/* We have a modeset vs reset deadlock, defensively unbreak it.
-	 *
-	 * FIXME: We can do a _lot_ better, this is just a first iteration.
-	 */
-	i915_gem_set_wedged(dev_priv);
-	DRM_DEBUG_DRIVER("Wedging GPU to avoid deadlocks with pending modeset updates\n");
-=======
 	/* We have a modeset vs reset deadlock, defensively unbreak it. */
 	set_bit(I915_RESET_MODESET, &dev_priv->gpu_error.flags);
 	wake_up_all(&dev_priv->gpu_error.wait_queue);
@@ -3701,7 +3693,6 @@ void intel_prepare_reset(struct drm_i915
 		DRM_DEBUG_KMS("Modeset potentially stuck, unbreaking through wedging\n");
 		i915_gem_set_wedged(dev_priv);
 	}
->>>>>>> linux-next/akpm-base
 
 	/*
 	 * Need mode_config.mutex so that we don't
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch
mm-swap-add-swap-readahead-hit-statistics-fix.patch
swap-choose-swap-device-according-to-numa-node-v2-fix.patch
add-testcases-for-memset16-32-64-fix.patch
lib-add-test-for-bitmap_parselist-fix.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes.patch
bitmap-introduce-bitmap_from_u64-checkpatch-fixes-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-08-08 22:35 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-08-08 22:35 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c |    5 -----
 sound/soc/intel/skylake/skl.c                       |    3 ---
 2 files changed, 8 deletions(-)

diff -puN sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c~linux-next-git-rejects sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c~linux-next-git-rejects
+++ a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -355,10 +355,6 @@ static int kabylake_ssp0_hw_params(struc
 
 			ret = snd_soc_dai_set_sysclk(codec_dai,
 				RT5514_SCLK_S_MCLK, 24576000, SND_SOC_CLOCK_IN);
-<<<<<<< HEAD
-			if (ret < 0) {
-				dev_err(rtd->dev, "set sysclk err: %d\n", ret);
-=======
 			if (ret < 0) {
 				dev_err(rtd->dev, "set sysclk err: %d\n", ret);
 				return ret;
@@ -368,7 +364,6 @@ static int kabylake_ssp0_hw_params(struc
 			ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x30, 3, 8, 16);
 			if (ret < 0) {
 				dev_err(rtd->dev, "DEV0 TDM slot err:%d\n", ret);
->>>>>>> linux-next/akpm-base
 				return ret;
 			}
 		}
diff -puN sound/soc/intel/skylake/skl.c~linux-next-git-rejects sound/soc/intel/skylake/skl.c
--- a/sound/soc/intel/skylake/skl.c~linux-next-git-rejects
+++ a/sound/soc/intel/skylake/skl.c
@@ -996,8 +996,6 @@ static struct sst_acpi_mach sst_glk_devd
 		.fw_filename = "intel/dsp_fw_glk.bin",
 	},
 	{}
-<<<<<<< HEAD
-=======
 };
 
 static const struct sst_acpi_mach sst_cnl_devdata[] = {
@@ -1006,7 +1004,6 @@ static const struct sst_acpi_mach sst_cn
 		.drv_name = "cnl_rt274",
 		.fw_filename = "intel/dsp_fw_cnl.bin",
 	},
->>>>>>> linux-next/akpm-base
 };
 
 /* PCI IDs */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-make-tlb_flush_pending-global-fix.patch
mm-fix-list-corruptions-on-shmem-shrinklist-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
userfaultfd-selftest-exercise-uffdio_copy-zeropage-eexist-fix.patch
add-testcases-for-memset16-32-64-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-08-02 19:27 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-08-02 19:27 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 MAINTAINERS                     |    5 -----
 drivers/net/hyperv/netvsc_drv.c |   21 ---------------------
 drivers/net/virtio_net.c        |    3 ---
 3 files changed, 29 deletions(-)

diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -5123,15 +5123,10 @@ M:	Andrew Lunn <andrew@lunn.ch>
 M:	Florian Fainelli <f.fainelli@gmail.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-<<<<<<< HEAD
-F:	Documentation/ABI/testing/sysfs-bus-mdio
-F:	Documentation/devicetree/bindings/net/mdio*
-=======
 F:	include/linux/phy.h
 F:	include/linux/phy_fixed.h
 F:	include/linux/platform_data/mdio-bcm-unimac.h
 F:	drivers/net/phy/
->>>>>>> linux-next/akpm-base
 F:	Documentation/networking/phy.txt
 F:	drivers/net/phy/
 F:	drivers/of/of_mdio.c
diff -puN drivers/net/hyperv/netvsc_drv.c~linux-next-git-rejects drivers/net/hyperv/netvsc_drv.c
--- a/drivers/net/hyperv/netvsc_drv.c~linux-next-git-rejects
+++ a/drivers/net/hyperv/netvsc_drv.c
@@ -317,7 +317,6 @@ static u32 init_page_array(void *hdr, u3
 }
 
 static int count_skb_frag_slots(struct sk_buff *skb)
-<<<<<<< HEAD
 {
 	int i, frags = skb_shinfo(skb)->nr_frags;
 	int pages = 0;
@@ -336,26 +335,6 @@ static int count_skb_frag_slots(struct s
 
 static int netvsc_get_slots(struct sk_buff *skb)
 {
-=======
-{
-	int i, frags = skb_shinfo(skb)->nr_frags;
-	int pages = 0;
-
-	for (i = 0; i < frags; i++) {
-		skb_frag_t *frag = skb_shinfo(skb)->frags + i;
-		unsigned long size = skb_frag_size(frag);
-		unsigned long offset = frag->page_offset;
-
-		/* Skip unused frames from start of page */
-		offset &= ~PAGE_MASK;
-		pages += PFN_UP(offset + size);
-	}
-	return pages;
-}
-
-static int netvsc_get_slots(struct sk_buff *skb)
-{
->>>>>>> linux-next/akpm-base
 	char *data = skb->data;
 	unsigned int offset = offset_in_page(data);
 	unsigned int len = skb_headlen(skb);
diff -puN drivers/net/virtio_net.c~linux-next-git-rejects drivers/net/virtio_net.c
--- a/drivers/net/virtio_net.c~linux-next-git-rejects
+++ a/drivers/net/virtio_net.c
@@ -952,10 +952,7 @@ static int add_recvbuf_mergeable(struct
 
 	buf = (char *)page_address(alloc_frag->page) + alloc_frag->offset;
 	buf += headroom; /* advance address leaving hole at front of pkt */
-<<<<<<< HEAD
-=======
 	ctx = mergeable_len_to_ctx(len, headroom);
->>>>>>> linux-next/akpm-base
 	get_page(alloc_frag->page);
 	alloc_frag->offset += len + headroom;
 	hole = alloc_frag->size - alloc_frag->offset;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix-fix.patch
fortify-use-warn-instead-of-bug-for-now-fix.patch
swap-fix-oops-during-block-io-poll-in-swapin-path-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
nvdimm-avoid-bogus-wmaybe-uninitialized-warning-fix.patch
treewide-remove-gfp_temporary-allocation-flag-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-07-31 19:18 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-07-31 19:18 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_display.c   |   33 -----------------------
 drivers/gpu/drm/i915/intel_pm.c        |    5 ---
 drivers/gpu/drm/nouveau/nv50_display.c |    5 ---
 3 files changed, 43 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -3400,17 +3400,6 @@ static void skylake_disable_primary_plan
 	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
 }
 
-<<<<<<< HEAD
-static void intel_complete_page_flips(struct drm_i915_private *dev_priv)
-{
-	struct intel_crtc *crtc;
-
-	for_each_intel_crtc(&dev_priv->drm, crtc)
-		intel_finish_page_flip_cs(dev_priv, crtc->pipe);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static int
 __intel_display_resume(struct drm_device *dev,
 		       struct drm_atomic_state *state,
@@ -3518,16 +3507,6 @@ void intel_finish_reset(struct drm_i915_
 
 	if (!state)
 		goto unlock;
-<<<<<<< HEAD
-
-	/*
-	 * Flips in the rings will be nuked by the reset,
-	 * so complete all pending flips so that user space
-	 * will get its events and not get stuck.
-	 */
-	intel_complete_page_flips(dev_priv);
-=======
->>>>>>> linux-next/akpm-base
 
 	dev_priv->modeset_restore_state = NULL;
 
@@ -9030,16 +9009,7 @@ static bool haswell_get_pipe_config(stru
 	u64 power_domain_mask;
 	bool active;
 
-<<<<<<< HEAD
-	if (INTEL_GEN(dev_priv) >= 9) {
-		intel_crtc_init_scalers(crtc, pipe_config);
-
-		pipe_config->scaler_state.scaler_id = -1;
-		pipe_config->scaler_state.scaler_users &= ~(1 << SKL_CRTC_INDEX);
-	}
-=======
 	intel_crtc_init_scalers(crtc, pipe_config);
->>>>>>> linux-next/akpm-base
 
 	power_domain = POWER_DOMAIN_PIPE(crtc->pipe);
 	if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
@@ -9069,8 +9039,6 @@ static bool haswell_get_pipe_config(stru
 	pipe_config->gamma_mode =
 		I915_READ(GAMMA_MODE(crtc->pipe)) & GAMMA_MODE_MODE_MASK;
 
-<<<<<<< HEAD
-=======
 	if (IS_BROADWELL(dev_priv) || dev_priv->info.gen >= 9) {
 		u32 tmp = I915_READ(PIPEMISC(crtc->pipe));
 		bool clrspace_yuv = tmp & PIPEMISC_OUTPUT_COLORSPACE_YUV;
@@ -9088,7 +9056,6 @@ static bool haswell_get_pipe_config(stru
 		}
 	}
 
->>>>>>> linux-next/akpm-base
 	power_domain = POWER_DOMAIN_PIPE_PANEL_FITTER(crtc->pipe);
 	if (intel_display_power_get_if_enabled(dev_priv, power_domain)) {
 		power_domain_mask |= BIT_ULL(power_domain);
diff -puN drivers/gpu/drm/i915/intel_pm.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_pm.c
--- a/drivers/gpu/drm/i915/intel_pm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_pm.c
@@ -4460,13 +4460,8 @@ static int skl_compute_plane_wm(const st
 		    (plane_bytes_per_line / 512 < 1))
 			selected_result = method2;
 		else if (ddb_allocation >=
-<<<<<<< HEAD
-			 fixed_16_16_to_u32_round_up(plane_blocks_per_line))
-			selected_result = min_fixed_16_16(method1, method2);
-=======
 			 fixed16_to_u32_round_up(plane_blocks_per_line))
 			selected_result = min_fixed16(method1, method2);
->>>>>>> linux-next/akpm-base
 		else if (latency >= linetime_us)
 			selected_result = min_fixed16(method1, method2);
 		else
diff -puN drivers/gpu/drm/nouveau/nv50_display.c~linux-next-git-rejects drivers/gpu/drm/nouveau/nv50_display.c
--- a/drivers/gpu/drm/nouveau/nv50_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/nv50_display.c
@@ -4081,12 +4081,7 @@ nv50_disp_atomic_commit_tail(struct drm_
 		if (crtc->state->event) {
 			unsigned long flags;
 			/* Get correct count/ts if racing with vblank irq */
-<<<<<<< HEAD
-			if (crtc->state->active)
-				drm_accurate_vblank_count(crtc);
-=======
 			drm_crtc_accurate_vblank_count(crtc);
->>>>>>> linux-next/akpm-base
 			spin_lock_irqsave(&crtc->dev->event_lock, flags);
 			drm_crtc_send_vblank_event(crtc, crtc->state->event);
 			spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix-fix.patch
fortify-use-warn-instead-of-bug-for-now-fix.patch
swap-fix-oops-during-block-io-poll-in-swapin-path-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch
treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-07-19 20:10 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-07-19 20:10 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/core/verbs.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/infiniband/core/verbs.c~linux-next-git-rejects drivers/infiniband/core/verbs.c
--- a/drivers/infiniband/core/verbs.c~linux-next-git-rejects
+++ a/drivers/infiniband/core/verbs.c
@@ -1298,11 +1298,7 @@ int ib_modify_qp_with_udata(struct ib_qp
 		if (ret)
 			return ret;
 	}
-<<<<<<< HEAD
-	return ib_security_modify_qp(qp, attr, attr_mask, udata);
-=======
 	return ib_security_modify_qp(qp->real_qp, attr, attr_mask, udata);
->>>>>>> linux-next/akpm-base
 }
 EXPORT_SYMBOL(ib_modify_qp_with_udata);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix.patch
mm-mprotect-flush-tlb-if-potentially-racing-with-a-parallel-reclaim-leaving-stale-tlb-entries-fix-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-07-14 19:59 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-07-14 19:59 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN drivers/mtd/spi-nor/spi-nor.c~linux-next-git-rejects drivers/mtd/spi-nor/spi-nor.c
diff -puN include/linux/ipc.h~linux-next-git-rejects include/linux/ipc.h
diff -puN include/linux/mtd/spi-nor.h~linux-next-git-rejects include/linux/mtd/spi-nor.h
diff -puN include/linux/random.h~linux-next-git-rejects include/linux/random.h
diff -puN include/linux/sem.h~linux-next-git-rejects include/linux/sem.h
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-06-30 18:42 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-06-30 18:42 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/i915_gem_execbuffer.c |   45 -------------------
 1 file changed, 45 deletions(-)

diff -puN drivers/gpu/drm/i915/i915_gem_execbuffer.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem_execbuffer.c
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1339,21 +1339,6 @@ out:
 	return target->node.start | UPDATE;
 }
 
-<<<<<<< HEAD
-static int
-i915_gem_execbuffer_relocate_entry(struct i915_vma *vma,
-				   struct eb_vmas *eb,
-				   struct drm_i915_gem_relocation_entry *reloc,
-				   struct reloc_cache *cache)
-{
-	struct drm_i915_gem_object *obj = vma->obj;
-	struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
-	struct drm_gem_object *target_obj;
-	struct drm_i915_gem_object *target_i915_obj;
-	struct i915_vma *target_vma;
-	uint64_t target_offset;
-	int ret;
-=======
 static u64
 eb_relocate_entry(struct i915_execbuffer *eb,
 		  struct i915_vma *vma,
@@ -1361,7 +1346,6 @@ eb_relocate_entry(struct i915_execbuffer
 {
 	struct i915_vma *target;
 	int err;
->>>>>>> linux-next/akpm-base
 
 	/* we've already hold a reference to all valid objects */
 	target = eb_get_vma(eb, reloc->target_handle);
@@ -1445,13 +1429,6 @@ eb_relocate_entry(struct i915_execbuffer
 	 * of our synchronisation.
 	 */
 	vma->exec_entry->flags &= ~EXEC_OBJECT_ASYNC;
-<<<<<<< HEAD
-
-	ret = relocate_entry(obj, reloc, cache, target_offset);
-	if (ret)
-		return ret;
-=======
->>>>>>> linux-next/akpm-base
 
 	/* and update the user's relocation entry */
 	return relocate_entry(vma, reloc, eb, target);
@@ -1504,14 +1481,9 @@ static int eb_relocate_vma(struct i915_e
 		do {
 			u64 offset = eb_relocate_entry(eb, vma, r);
 
-<<<<<<< HEAD
-			ret = i915_gem_execbuffer_relocate_entry(vma, eb, r, &cache);
-			if (ret)
-=======
 			if (likely(offset == 0)) {
 			} else if ((s64)offset < 0) {
 				remain = (int)offset;
->>>>>>> linux-next/akpm-base
 				goto out;
 			} else {
 				/*
@@ -1557,24 +1529,7 @@ eb_relocate_vma_slow(struct i915_execbuf
 	int err;
 
 	for (i = 0; i < entry->relocation_count; i++) {
-<<<<<<< HEAD
-		ret = i915_gem_execbuffer_relocate_entry(vma, eb, &relocs[i], &cache);
-		if (ret)
-			break;
-	}
-	reloc_cache_fini(&cache);
-
-	return ret;
-}
-
-static int
-i915_gem_execbuffer_relocate(struct eb_vmas *eb)
-{
-	struct i915_vma *vma;
-	int ret = 0;
-=======
 		u64 offset = eb_relocate_entry(eb, vma, &relocs[i]);
->>>>>>> linux-next/akpm-base
 
 		if ((s64)offset < 0) {
 			err = (int)offset;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial-fix.patch
mm-memory_hotplug-do-not-associate-hotadded-memory-to-zones-until-online-fix-2-fix.patch
swap-add-block-io-poll-in-swapin-path-checkpatch-fixes.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix-fix.patch
mm-swap-sort-swap-entries-before-free-fix.patch
mm-vmscan-avoid-thrashing-anon-lru-when-free-file-is-low-fix.patch
mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix.patch
mm-hugetlb-warn-the-user-when-issues-arise-on-boot-due-to-hugepages-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix-fix.patch
hugetlb-memory_hotplug-prefer-to-use-reserved-pages-for-migration-fix.patch
mm-page_allocc-eliminate-unsigned-confusion-in-__rmqueue_fallback-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch
mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch
signal-avoid-undefined-behaviour-in-kill_something_info-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
powerpc-64s-implement-arch-specific-hardlockup-watchdog-checkpatch-fixes.patch
mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-06-23 18:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-06-23 18:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/kvm/book3s_hv_rmhandlers.S |   15 --
 block/blk-mq-sched.c                    |  124 ----------------------
 2 files changed, 139 deletions(-)

diff -puN arch/powerpc/kvm/book3s_hv_rmhandlers.S~linux-next-git-rejects arch/powerpc/kvm/book3s_hv_rmhandlers.S
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S~linux-next-git-rejects
+++ a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -45,11 +45,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)
 #define NAPPING_NOVCPU	2
 
 /* Stack frame offsets for kvmppc_hv_entry */
-<<<<<<< HEAD
-#define SFS			144
-=======
 #define SFS			160
->>>>>>> linux-next/akpm-base
 #define STACK_SLOT_TRAP		(SFS-4)
 #define STACK_SLOT_TID		(SFS-16)
 #define STACK_SLOT_PSSCR	(SFS-24)
@@ -58,10 +54,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)
 #define STACK_SLOT_CIABR	(SFS-48)
 #define STACK_SLOT_DAWR		(SFS-56)
 #define STACK_SLOT_DAWRX	(SFS-64)
-<<<<<<< HEAD
-=======
 #define STACK_SLOT_HFSCR	(SFS-72)
->>>>>>> linux-next/akpm-base
 
 /*
  * Call kvmppc_hv_entry in real mode.
@@ -785,11 +778,8 @@ BEGIN_FTR_SECTION
 	std	r6, STACK_SLOT_PSSCR(r1)
 	std	r7, STACK_SLOT_PID(r1)
 	std	r8, STACK_SLOT_IAMR(r1)
-<<<<<<< HEAD
-=======
 	mfspr	r5, SPRN_HFSCR
 	std	r5, STACK_SLOT_HFSCR(r1)
->>>>>>> linux-next/akpm-base
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
 BEGIN_FTR_SECTION
 	mfspr	r5, SPRN_CIABR
@@ -2464,10 +2454,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM)
 	mfspr	r3, SPRN_DEC
 	mfspr	r4, SPRN_HDEC
 	mftb	r5
-<<<<<<< HEAD
-	extsw	r3, r3
-	EXTEND_HDEC(r4)
-=======
 BEGIN_FTR_SECTION
 	/* On P9 check whether the guest has large decrementer mode enabled */
 	ld	r6, HSTATE_KVM_VCORE(r13)
@@ -2477,7 +2463,6 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
 	extsw	r3, r3
 68:	EXTEND_HDEC(r4)
->>>>>>> linux-next/akpm-base
 	cmpd	r3, r4
 	ble	67f
 	mtspr	SPRN_DEC, r4
diff -puN block/blk-mq-sched.c~linux-next-git-rejects block/blk-mq-sched.c
--- a/block/blk-mq-sched.c~linux-next-git-rejects
+++ a/block/blk-mq-sched.c
@@ -48,130 +48,6 @@ void blk_mq_sched_assign_ioc(struct requ
 	}
 	get_io_context(icq->ioc);
 	rq->elv.icq = icq;
-<<<<<<< HEAD
-	if (!blk_mq_sched_get_rq_priv(q, rq, bio)) {
-		rq->rq_flags |= RQF_ELVPRIV;
-		get_io_context(icq->ioc);
-		return;
-	}
-
-	rq->elv.icq = NULL;
-}
-
-static void blk_mq_sched_assign_ioc(struct request_queue *q,
-				    struct request *rq, struct bio *bio)
-{
-	struct io_context *ioc;
-
-	ioc = rq_ioc(bio);
-	if (ioc)
-		__blk_mq_sched_assign_ioc(q, rq, bio, ioc);
-}
-
-/*
- * Mark a hardware queue as needing a restart. For shared queues, maintain
- * a count of how many hardware queues are marked for restart.
- */
-static void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx)
-{
-	if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
-		return;
-
-	if (hctx->flags & BLK_MQ_F_TAG_SHARED) {
-		struct request_queue *q = hctx->queue;
-
-		if (!test_and_set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
-			atomic_inc(&q->shared_hctx_restart);
-	} else
-		set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
-}
-
-static bool blk_mq_sched_restart_hctx(struct blk_mq_hw_ctx *hctx)
-{
-	if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
-		return false;
-
-	if (hctx->flags & BLK_MQ_F_TAG_SHARED) {
-		struct request_queue *q = hctx->queue;
-
-		if (test_and_clear_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state))
-			atomic_dec(&q->shared_hctx_restart);
-	} else
-		clear_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state);
-
-	if (blk_mq_hctx_has_pending(hctx)) {
-		blk_mq_run_hw_queue(hctx, true);
-		return true;
-	}
-
-	return false;
-}
-
-struct request *blk_mq_sched_get_request(struct request_queue *q,
-					 struct bio *bio,
-					 unsigned int op,
-					 struct blk_mq_alloc_data *data)
-{
-	struct elevator_queue *e = q->elevator;
-	struct request *rq;
-
-	blk_queue_enter_live(q);
-	data->q = q;
-	if (likely(!data->ctx))
-		data->ctx = blk_mq_get_ctx(q);
-	if (likely(!data->hctx))
-		data->hctx = blk_mq_map_queue(q, data->ctx->cpu);
-
-	if (e) {
-		data->flags |= BLK_MQ_REQ_INTERNAL;
-
-		/*
-		 * Flush requests are special and go directly to the
-		 * dispatch list.
-		 */
-		if (!op_is_flush(op) && e->type->ops.mq.get_request) {
-			rq = e->type->ops.mq.get_request(q, op, data);
-			if (rq)
-				rq->rq_flags |= RQF_QUEUED;
-		} else
-			rq = __blk_mq_alloc_request(data, op);
-	} else {
-		rq = __blk_mq_alloc_request(data, op);
-	}
-
-	if (rq) {
-		if (!op_is_flush(op)) {
-			rq->elv.icq = NULL;
-			if (e && e->type->icq_cache)
-				blk_mq_sched_assign_ioc(q, rq, bio);
-		}
-		data->hctx->queued++;
-		return rq;
-	}
-
-	blk_queue_exit(q);
-	return NULL;
-}
-
-void blk_mq_sched_put_request(struct request *rq)
-{
-	struct request_queue *q = rq->q;
-	struct elevator_queue *e = q->elevator;
-
-	if (rq->rq_flags & RQF_ELVPRIV) {
-		blk_mq_sched_put_rq_priv(rq->q, rq);
-		if (rq->elv.icq) {
-			put_io_context(rq->elv.icq->ioc);
-			rq->elv.icq = NULL;
-		}
-	}
-
-	if ((rq->rq_flags & RQF_QUEUED) && e && e->type->ops.mq.put_request)
-		e->type->ops.mq.put_request(rq);
-	else
-		blk_mq_finish_request(rq);
-=======
->>>>>>> linux-next/akpm-base
 }
 
 void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial-fix.patch
swap-add-block-io-poll-in-swapin-path-checkpatch-fixes.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix-fix.patch
mm-swap-sort-swap-entries-before-free-fix.patch
mm-vmscan-avoid-thrashing-anon-lru-when-free-file-is-low-fix.patch
mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix.patch
mm-hugetlb-warn-the-user-when-issues-arise-on-boot-due-to-hugepages-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix.patch
mm-improve-readability-of-transparent_hugepage_enabled-fix-fix.patch
hugetlb-memory_hotplug-prefer-to-use-reserved-pages-for-migration-fix.patch
signal-avoid-undefined-behaviour-in-kill_something_info-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
powerpc-64s-implement-arch-specific-hardlockup-watchdog-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-06-05 19:02 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-06-05 19:02 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/dma/mv_xor_v2.c |    6 ------
 drivers/hid/wacom_wac.c |   15 ---------------
 2 files changed, 21 deletions(-)

diff -puN drivers/dma/mv_xor_v2.c~linux-next-git-rejects drivers/dma/mv_xor_v2.c
--- a/drivers/dma/mv_xor_v2.c~linux-next-git-rejects
+++ a/drivers/dma/mv_xor_v2.c
@@ -257,8 +257,6 @@ static int mv_xor_v2_set_desc_size(struc
 	return MV_XOR_V2_EXT_DESC_SIZE;
 }
 
-<<<<<<< HEAD
-=======
 /*
  * Set the IMSG threshold
  */
@@ -282,7 +280,6 @@ void mv_xor_v2_enable_imsg_thrd(struct m
 	writel(reg, xor_dev->dma_base + MV_XOR_V2_DMA_IMSG_TMOT);
 }
 
->>>>>>> linux-next/akpm-base
 static irqreturn_t mv_xor_v2_interrupt_handler(int irq, void *data)
 {
 	struct mv_xor_v2_device *xor_dev = data;
@@ -696,8 +693,6 @@ static int mv_xor_v2_descq_init(struct m
 	/* enable the DMA engine */
 	writel(0, xor_dev->dma_base + MV_XOR_V2_DMA_DESQ_STOP_OFF);
 
-<<<<<<< HEAD
-=======
 	return 0;
 }
 
@@ -719,7 +714,6 @@ static int mv_xor_v2_resume(struct platf
 	mv_xor_v2_enable_imsg_thrd(xor_dev);
 	mv_xor_v2_descq_init(xor_dev);
 
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
diff -puN drivers/hid/wacom_wac.c~linux-next-git-rejects drivers/hid/wacom_wac.c
--- a/drivers/hid/wacom_wac.c~linux-next-git-rejects
+++ a/drivers/hid/wacom_wac.c
@@ -1593,7 +1593,6 @@ static int wacom_tpc_irq(struct wacom_wa
 		switch (len) {
 		case WACOM_PKGLEN_TPC1FG:
 			return wacom_tpc_single_touch(wacom, len);
-<<<<<<< HEAD
 
 		case WACOM_PKGLEN_TPC2FG:
 			return wacom_tpc_mt_touch(wacom);
@@ -1606,20 +1605,6 @@ static int wacom_tpc_irq(struct wacom_wa
 			case WACOM_REPORT_TPC1FGE:
 				return wacom_tpc_single_touch(wacom, len);
 
-=======
-
-		case WACOM_PKGLEN_TPC2FG:
-			return wacom_tpc_mt_touch(wacom);
-
-		default:
-			switch (data[0]) {
-			case WACOM_REPORT_TPC1FG:
-			case WACOM_REPORT_TPCHID:
-			case WACOM_REPORT_TPCST:
-			case WACOM_REPORT_TPC1FGE:
-				return wacom_tpc_single_touch(wacom, len);
-
->>>>>>> linux-next/akpm-base
 			case WACOM_REPORT_TPCMT:
 			case WACOM_REPORT_TPCMT2:
 				return wacom_mt_touch(wacom);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial-fix.patch
swap-add-block-io-poll-in-swapin-path-checkpatch-fixes.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix.patch
mm-oom_kill-count-global-and-memory-cgroup-oom-kills-fix-fix.patch
mm-swap-sort-swap-entries-before-free-fix.patch
mm-vmscan-avoid-thrashing-anon-lru-when-free-file-is-low-fix.patch
mm-hwpoison-dissolve-in-use-hugepage-in-unrecoverable-memory-error-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-05-15 18:50 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-05-15 18:50 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |    6 ------
 include/linux/namei.h                    |    3 ---
 2 files changed, 9 deletions(-)

diff -puN drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c~linux-next-git-rejects drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c~linux-next-git-rejects
+++ a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -1170,11 +1170,8 @@ static struct ibmvscsis_cmd *ibmvscsis_g
 		cmd = list_first_entry_or_null(&vscsi->free_cmd,
 					       struct ibmvscsis_cmd, list);
 		if (cmd) {
-<<<<<<< HEAD
-=======
 			if (cmd->abort_cmd)
 				cmd->abort_cmd = NULL;
->>>>>>> linux-next/akpm-base
 			cmd->flags &= ~(DELAY_SEND);
 			list_del(&cmd->list);
 			cmd->iue = iue;
@@ -1779,10 +1776,7 @@ static void ibmvscsis_send_messages(stru
 				if (cmd->abort_cmd) {
 					retry = true;
 					cmd->abort_cmd->flags &= ~(DELAY_SEND);
-<<<<<<< HEAD
-=======
 					cmd->abort_cmd = NULL;
->>>>>>> linux-next/akpm-base
 				}
 
 				/*
diff -puN include/linux/namei.h~linux-next-git-rejects include/linux/namei.h
--- a/include/linux/namei.h~linux-next-git-rejects
+++ a/include/linux/namei.h
@@ -45,11 +45,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
 #define LOOKUP_ROOT		0x2000
 #define LOOKUP_EMPTY		0x4000
 #define LOOKUP_DOWN		0x8000
-<<<<<<< HEAD
-=======
 
 #define LOOKUP_NO_JUMPS		0x10000
->>>>>>> linux-next/akpm-base
 
 extern int path_pts(struct path *path);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-slub-wrap-cpu_slab-partial-in-config_slub_cpu_partial-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-05-11 18:00 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-05-11 18:00 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


diff -puN fs/btrfs/file.c~linux-next-git-rejects fs/btrfs/file.c
--- a/fs/btrfs/file.c~linux-next-git-rejects
+++ a/fs/btrfs/file.c
@@ -2909,21 +2909,13 @@ static long btrfs_fallocate(struct file
 				free_extent_map(em);
 				break;
 			}
-<<<<<<< HEAD
-			ret = btrfs_qgroup_reserve_data(inode, cur_offset,
-					last_byte - cur_offset);
-=======
 			ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
 					cur_offset, last_byte - cur_offset);
->>>>>>> linux-next/akpm-base
 			if (ret < 0) {
 				free_extent_map(em);
 				break;
 			}
-<<<<<<< HEAD
-=======
 			ret = 0;
->>>>>>> linux-next/akpm-base
 		} else {
 			/*
 			 * Do not need to reserve unwritten extent for this
diff -puN fs/btrfs/qgroup.c~linux-next-git-rejects fs/btrfs/qgroup.c
--- a/fs/btrfs/qgroup.c~linux-next-git-rejects
+++ a/fs/btrfs/qgroup.c
@@ -2022,8 +2022,6 @@ int btrfs_qgroup_account_extents(struct
 
 		if (!ret) {
 			/*
-<<<<<<< HEAD
-=======
 			 * old roots should be searched when inserting qgroup
 			 * extent record
 			 */
@@ -2036,7 +2034,6 @@ int btrfs_qgroup_account_extents(struct
 					goto cleanup;
 			}
 			/*
->>>>>>> linux-next/akpm-base
 			 * Use SEQ_LAST as time_seq to do special search, which
 			 * doesn't lock tree or delayed_refs and search current
 			 * root. It's safe inside commit_transaction().
@@ -2959,10 +2956,7 @@ static int __btrfs_qgroup_release_data(s
 		btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
 				BTRFS_I(inode)->root->objectid,
 				changeset.bytes_changed);
-<<<<<<< HEAD
-=======
 	ret = changeset.bytes_changed;
->>>>>>> linux-next/akpm-base
 out:
 	ulist_release(&changeset.range_changed);
 	return ret;
diff -puN fs/btrfs/transaction.c~linux-next-git-rejects fs/btrfs/transaction.c
--- a/fs/btrfs/transaction.c~linux-next-git-rejects
+++ a/fs/btrfs/transaction.c
@@ -2177,16 +2177,6 @@ int btrfs_commit_transaction(struct btrf
 		goto scrub_continue;
 	}
 
-<<<<<<< HEAD
-	ret = btrfs_qgroup_prepare_account_extents(trans, fs_info);
-	if (ret) {
-		mutex_unlock(&fs_info->tree_log_mutex);
-		mutex_unlock(&fs_info->reloc_mutex);
-		goto scrub_continue;
-	}

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-05-08 19:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-05-08 19:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/media/v4l-drivers/philips.rst     |    5 -----
 drivers/char/tpm/tpm-chip.c                     |   12 ------------
 drivers/firmware/google/memconsole-x86-legacy.c |    3 ---
 drivers/misc/Kconfig                            |    3 ---
 drivers/misc/Makefile                           |    3 ---
 drivers/scsi/osd/osd_uld.c                      |    5 -----
 drivers/staging/Makefile                        |    4 ----
 7 files changed, 35 deletions(-)

diff -puN Documentation/media/v4l-drivers/philips.rst~linux-next-git-rejects Documentation/media/v4l-drivers/philips.rst
--- a/Documentation/media/v4l-drivers/philips.rst~linux-next-git-rejects
+++ a/Documentation/media/v4l-drivers/philips.rst
@@ -145,13 +145,8 @@ dev_hint
 
    A camera is specified by its type (the number from the camera model,
    like PCA645, PCVC750VC, etc) and optionally the serial number (visible
-<<<<<<< HEAD
-   in /sys/kernel/debug/usb/devices). A hint consists of a string with the
-   following format::
-=======
    in /sys/kernel/debug/usb/devices). A hint consists of a string with the following
    format::
->>>>>>> linux-next/akpm-base
 
       [type[.serialnumber]:]node
 
diff -puN drivers/char/tpm/tpm-chip.c~linux-next-git-rejects drivers/char/tpm/tpm-chip.c
--- a/drivers/char/tpm/tpm-chip.c~linux-next-git-rejects
+++ a/drivers/char/tpm/tpm-chip.c
@@ -282,17 +282,6 @@ static int tpm_add_char_device(struct tp
 		return rc;
 	}
 
-<<<<<<< HEAD
-	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
-		rc = cdev_device_add(&chip->cdevs, &chip->devs);
-		if (rc) {
-			dev_err(&chip->devs,
-				"unable to cdev_device_add() %s, major %d, minor %d, err=%d\n",
-				dev_name(&chip->devs), MAJOR(chip->devs.devt),
-				MINOR(chip->devs.devt), rc);
-			return rc;
-		}
-=======
 	if (chip->flags & TPM_CHIP_FLAG_TPM2)
 		rc = cdev_device_add(&chip->cdevs, &chip->devs);
 	if (rc) {
@@ -301,7 +290,6 @@ static int tpm_add_char_device(struct tp
 			dev_name(&chip->devs), MAJOR(chip->devs.devt),
 			MINOR(chip->devs.devt), rc);
 		return rc;
->>>>>>> linux-next/akpm-base
 	}
 
 	/* Make the chip available. */
diff -puN drivers/firmware/google/memconsole-x86-legacy.c~linux-next-git-rejects drivers/firmware/google/memconsole-x86-legacy.c
--- a/drivers/firmware/google/memconsole-x86-legacy.c~linux-next-git-rejects
+++ a/drivers/firmware/google/memconsole-x86-legacy.c
@@ -20,10 +20,7 @@
 #include <linux/dmi.h>
 #include <linux/mm.h>
 #include <asm/bios_ebda.h>
-<<<<<<< HEAD
-=======
 #include <asm/e820/api.h>
->>>>>>> linux-next/akpm-base
 #include <linux/acpi.h>
 
 #include "memconsole.h"
diff -puN drivers/misc/Kconfig~linux-next-git-rejects drivers/misc/Kconfig
--- a/drivers/misc/Kconfig~linux-next-git-rejects
+++ a/drivers/misc/Kconfig
@@ -489,8 +489,6 @@ config ASPEED_LPC_CTRL
 	  Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
 	  ioctl()s, the driver also provides a read/write interface to a BMC ram
 	  region where the host LPC read/write region can be buffered.
-<<<<<<< HEAD
-=======
 
 config PCI_ENDPOINT_TEST
 	depends on PCI
@@ -498,7 +496,6 @@ config PCI_ENDPOINT_TEST
 	---help---
            Enable this configuration option to enable the host side test driver
            for PCI Endpoint.
->>>>>>> linux-next/akpm-base
 
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
diff -puN drivers/misc/Makefile~linux-next-git-rejects drivers/misc/Makefile
--- a/drivers/misc/Makefile~linux-next-git-rejects
+++ a/drivers/misc/Makefile
@@ -53,10 +53,7 @@ obj-$(CONFIG_ECHO)		+= echo/
 obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
 obj-$(CONFIG_CXL_BASE)		+= cxl/
 obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
-<<<<<<< HEAD
-=======
 obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
->>>>>>> linux-next/akpm-base
 
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_core.o
 lkdtm-$(CONFIG_LKDTM)		+= lkdtm_bugs.o
diff -puN drivers/scsi/osd/osd_uld.c~linux-next-git-rejects drivers/scsi/osd/osd_uld.c
--- a/drivers/scsi/osd/osd_uld.c~linux-next-git-rejects
+++ a/drivers/scsi/osd/osd_uld.c
@@ -454,12 +454,7 @@ static int osd_probe(struct device *dev)
 	/* hold one more reference to the scsi_device that will get released
 	 * in __release, in case a logout is happening while fs is mounted
 	 */
-<<<<<<< HEAD
-	if (scsi_device_get(scsi_device))
-		goto err_retract_minor;
-=======
 	scsi_device_get(scsi_device);
->>>>>>> linux-next/akpm-base
 	osd_dev_init(&oud->od, scsi_device);
 
 	/* allocate a disk and set it up */
diff -puN drivers/staging/Makefile~linux-next-git-rejects drivers/staging/Makefile
--- a/drivers/staging/Makefile~linux-next-git-rejects
+++ a/drivers/staging/Makefile
@@ -43,8 +43,4 @@ obj-$(CONFIG_MOST)		+= most/
 obj-$(CONFIG_KS7010)		+= ks7010/
 obj-$(CONFIG_GREYBUS)		+= greybus/
 obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
-<<<<<<< HEAD
-obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/
-=======
 obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
->>>>>>> linux-next/akpm-base
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
docs-vm-transhuge-fix-few-trivial-typos-fix.patch
dax-add-tracepoint-to-dax_writeback_one-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-04-19 20:41 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-04-19 20:41 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/trace/trace.h |    8 --------
 1 file changed, 8 deletions(-)

diff -puN kernel/trace/trace.h~linux-next-git-rejects kernel/trace/trace.h
--- a/kernel/trace/trace.h~linux-next-git-rejects
+++ a/kernel/trace/trace.h
@@ -896,11 +896,7 @@ int using_ftrace_ops_list_func(void);
 void ftrace_init_tracefs(struct trace_array *tr, struct dentry *d_tracer);
 void ftrace_init_tracefs_toplevel(struct trace_array *tr,
 				  struct dentry *d_tracer);
-<<<<<<< HEAD
-void ftrace_clear_pids(struct trace_array *tr);
-=======
 int init_function_trace(void);
->>>>>>> linux-next/akpm-base
 #else
 static inline int ftrace_trace_task(struct trace_array *tr)
 {
@@ -919,11 +915,7 @@ ftrace_init_global_array_ops(struct trac
 static inline void ftrace_reset_array_ops(struct trace_array *tr) { }
 static inline void ftrace_init_tracefs(struct trace_array *tr, struct dentry *d) { }
 static inline void ftrace_init_tracefs_toplevel(struct trace_array *tr, struct dentry *d) { }
-<<<<<<< HEAD
-static inline void ftrace_clear_pids(struct trace_array *tr) { }
-=======
 static inline int init_function_trace(void) { return 0; }
->>>>>>> linux-next/akpm-base
 /* ftace_func_t type is not defined, use macro instead of static inline */
 #define ftrace_init_array_ops(tr, func) do { } while (0)
 #endif /* CONFIG_FUNCTION_TRACER */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
mm-introduce-memalloc_nofs_saverestore-api-fix.patch
jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
docs-vm-transhuge-fix-few-trivial-typos-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-04-11 19:18 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-04-11 19:18 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/crypto/caam/ctrl.c   |    6 ------
 drivers/crypto/caam/intern.h |    3 ---
 2 files changed, 9 deletions(-)

diff -puN arch/metag/include/asm/uaccess.h~linux-next-git-rejects arch/metag/include/asm/uaccess.h
diff -puN arch/metag/lib/usercopy.c~linux-next-git-rejects arch/metag/lib/usercopy.c
diff -puN drivers/crypto/caam/ctrl.c~linux-next-git-rejects drivers/crypto/caam/ctrl.c
--- a/drivers/crypto/caam/ctrl.c~linux-next-git-rejects
+++ a/drivers/crypto/caam/ctrl.c
@@ -313,14 +313,11 @@ static int caam_remove(struct platform_d
 
 	/* Remove platform devices under the crypto node */
 	of_platform_depopulate(ctrldev);
-<<<<<<< HEAD
-=======
 
 #ifdef CONFIG_CAAM_QI
 	if (ctrlpriv->qidev)
 		caam_qi_shutdown(ctrlpriv->qidev);
 #endif
->>>>>>> linux-next/akpm-base
 
 	/* De-initialize RNG state handles initialized by this driver. */
 	if (ctrlpriv->rng4_sh_init)
@@ -618,8 +615,6 @@ static int caam_probe(struct platform_de
 		dev_err(dev, "JR platform devices creation error\n");
 		goto iounmap_ctrl;
 	}
-<<<<<<< HEAD
-=======
 
 #ifdef CONFIG_DEBUG_FS
 	/*
@@ -632,7 +627,6 @@ static int caam_probe(struct platform_de
 	ctrlpriv->dfs_root = debugfs_create_dir(dev_name(dev), NULL);
 	ctrlpriv->ctl = debugfs_create_dir("ctl", ctrlpriv->dfs_root);
 #endif
->>>>>>> linux-next/akpm-base
 
 	ring = 0;
 	for_each_available_child_of_node(nprop, np)
diff -puN drivers/crypto/caam/intern.h~linux-next-git-rejects drivers/crypto/caam/intern.h
--- a/drivers/crypto/caam/intern.h~linux-next-git-rejects
+++ a/drivers/crypto/caam/intern.h
@@ -66,12 +66,9 @@ struct caam_drv_private_jr {
 struct caam_drv_private {
 
 	struct device *dev;
-<<<<<<< HEAD
-=======
 #ifdef CONFIG_CAAM_QI
 	struct device *qidev;
 #endif
->>>>>>> linux-next/akpm-base
 	struct platform_device *pdev;
 
 	/* Physical-presence section */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-page_alloc-re-enable-softirq-use-of-per-cpu-page-allocator-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
mm-introduce-memalloc_nofs_saverestore-api-fix.patch
jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
docs-vm-transhuge-fix-few-trivial-typos-fix.patch
mm-migrate-migrate_vma-unmap-page-from-vma-while-collecting-pages-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-04-05 19:58 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-04-05 19:58 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/msm/adreno/adreno_gpu.c |    4 ----
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c   |   12 ------------
 2 files changed, 16 deletions(-)

diff -puN drivers/gpu/drm/msm/adreno/adreno_gpu.c~linux-next-git-rejects drivers/gpu/drm/msm/adreno/adreno_gpu.c
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -440,10 +440,6 @@ void adreno_gpu_cleanup(struct adreno_gp
 	if (gpu->aspace) {
 		gpu->aspace->mmu->funcs->detach(gpu->aspace->mmu,
 			iommu_ports, ARRAY_SIZE(iommu_ports));
-<<<<<<< HEAD
-		msm_gem_address_space_destroy(gpu->aspace);
-=======
 		msm_gem_address_space_put(gpu->aspace);
->>>>>>> linux-next/akpm-base
 	}
 }
diff -puN drivers/gpu/drm/vmwgfx/vmwgfx_fence.c~linux-next-git-rejects drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -761,18 +761,12 @@ int vmw_fence_obj_wait_ioctl(struct drm_
 		arg->kernel_cookie = jiffies + wait_timeout;
 	}
 
-<<<<<<< HEAD
-	base = vmw_fence_obj_lookup(tfile, arg->handle);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-=======
 	base = ttm_base_object_lookup(tfile, arg->handle);
 	if (unlikely(base == NULL)) {
 		pr_err("Wait invalid fence object handle 0x%08lx\n",
 		       (unsigned long)arg->handle);
 		return -EINVAL;
 	}
->>>>>>> linux-next/akpm-base
 
 	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
 
@@ -811,18 +805,12 @@ int vmw_fence_obj_signaled_ioctl(struct
 	struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
 	struct vmw_private *dev_priv = vmw_priv(dev);
 
-<<<<<<< HEAD
-	base = vmw_fence_obj_lookup(tfile, arg->handle);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
-=======
 	base = ttm_base_object_lookup(tfile, arg->handle);
 	if (unlikely(base == NULL)) {
 		pr_err("Fence signaled invalid fence object handle 0x%08lx\n",
 		       (unsigned long)arg->handle);
 		return -EINVAL;
 	}
->>>>>>> linux-next/akpm-base
 
 	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
 	fman = fman_from_fence(fence);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
ptrace-fix-ptrace_listen-race-corrupting-task-state-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
mm-introduce-memalloc_nofs_saverestore-api-fix.patch
jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-03-31 20:06 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-03-31 20:06 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/thermal/devfreq_cooling.c |   20 --------------------
 1 file changed, 20 deletions(-)

diff -puN drivers/thermal/devfreq_cooling.c~linux-next-git-rejects drivers/thermal/devfreq_cooling.c
--- a/drivers/thermal/devfreq_cooling.c~linux-next-git-rejects
+++ a/drivers/thermal/devfreq_cooling.c
@@ -214,29 +214,9 @@ get_static_power(struct devfreq_cooling_
 	if (!dfc->power_ops->get_static_power)
 		return 0;
 
-<<<<<<< HEAD
-	opp = dev_pm_opp_find_freq_exact(dev, freq, true);
-	if (PTR_ERR(opp) == -ERANGE)
-		opp = dev_pm_opp_find_freq_exact(dev, freq, false);
-
-	if (IS_ERR(opp)) {
-		dev_err_ratelimited(dev, "Failed to find OPP for frequency %lu: %ld\n",
-				    freq, PTR_ERR(opp));
-		return 0;
-	}
-
-	voltage = dev_pm_opp_get_voltage(opp) / 1000; /* mV */
-	dev_pm_opp_put(opp);
-
-	if (voltage == 0) {
-		dev_err_ratelimited(dev,
-				    "Failed to get voltage for frequency %lu\n",
-				    freq);
-=======
 	voltage = get_voltage(df, freq);
 
 	if (voltage == 0)
->>>>>>> linux-next/akpm-base
 		return 0;
 
 	return dfc->power_ops->get_static_power(df, voltage);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
mm-introduce-memalloc_nofs_saverestore-api-fix.patch
jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
kernel-reboot-add-devm_register_reboot_notifier-fix.patch
fault-inject-support-systematic-fault-injection-fix.patch
linux-next-rejects.patch
drivers-net-ethernet-mellanox-mlx5-core-en_mainc-fix-build-with-gcc-444.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
drivers-net-ethernet-mellanox-mlx5-core-en_ethtoolc-fix-build-with-gcc-444.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-03-28 19:10 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-03-28 19:10 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/md/md.c     |    4 ----
 net/rxrpc/sendmsg.c |    6 ------
 2 files changed, 10 deletions(-)

diff -puN drivers/md/md.c~linux-next-git-rejects drivers/md/md.c
--- a/drivers/md/md.c~linux-next-git-rejects
+++ a/drivers/md/md.c
@@ -6522,13 +6522,9 @@ static int update_size(struct mddev *mdd
 	}
 	rv = mddev->pers->resize(mddev, num_sectors);
 	if (!rv) {
-<<<<<<< HEAD
-		if (mddev->queue) {
-=======
 		if (mddev_is_clustered(mddev))
 			md_cluster_ops->update_size(mddev, old_dev_sectors);
 		else if (mddev->queue) {
->>>>>>> linux-next/akpm-base
 			set_capacity(mddev->gendisk, mddev->array_sectors);
 			revalidate_disk(mddev->gendisk);
 		}
diff -puN net/rxrpc/sendmsg.c~linux-next-git-rejects net/rxrpc/sendmsg.c
--- a/net/rxrpc/sendmsg.c~linux-next-git-rejects
+++ a/net/rxrpc/sendmsg.c
@@ -618,14 +618,8 @@ int rxrpc_kernel_send_data(struct socket
 		ret = rxrpc_send_data(rxrpc_sk(sock->sk), call, msg, len);
 		break;
 	case RXRPC_CALL_COMPLETE:
-<<<<<<< HEAD
-		read_lock_bh(&call->state_lock);
-		ret = -call->error;
-		read_unlock_bh(&call->state_lock);
-=======
 		/* It's too late for this call */
 		ret = -ESHUTDOWN;
->>>>>>> linux-next/akpm-base
 		break;
 	default:
 		 /* Request phase complete for this client call */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
mm-introduce-memalloc_nofs_saverestore-api-fix.patch
jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix.patch
taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
linux-next-rejects.patch
drivers-gpu-drm-i915-selftests-i915_selftestc-fix-build-with-gcc-444.patch
drm-use-set_memoryh-header-fix.patch
drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
x86-atomic-move-__atomic_add_unless-out-of-line-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-03-06 19:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-03-06 19:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/scsi/qla2xxx/qla_isr.c |   45 -------------------------------
 fs/f2fs/f2fs.h                 |    5 ---
 2 files changed, 50 deletions(-)

diff -puN drivers/scsi/qla2xxx/qla_isr.c~linux-next-git-rejects drivers/scsi/qla2xxx/qla_isr.c
--- a/drivers/scsi/qla2xxx/qla_isr.c~linux-next-git-rejects
+++ a/drivers/scsi/qla2xxx/qla_isr.c
@@ -572,7 +572,6 @@ qla2x00_find_fcport_by_loopid(scsi_qla_h
 			return f;
 	return NULL;
 }
-<<<<<<< HEAD
 
 fc_port_t *
 qla2x00_find_fcport_by_wwpn(scsi_qla_host_t *vha, u8 *wwpn, u8 incl_deleted)
@@ -592,27 +591,6 @@ qla2x00_find_fcport_by_wwpn(scsi_qla_hos
 }
 
 fc_port_t *
-=======
-
-fc_port_t *
-qla2x00_find_fcport_by_wwpn(scsi_qla_host_t *vha, u8 *wwpn, u8 incl_deleted)
-{
-	fc_port_t *f, *tf;
-
-	f = tf = NULL;
-	list_for_each_entry_safe(f, tf, &vha->vp_fcports, list) {
-		if (memcmp(f->port_name, wwpn, WWN_SIZE) == 0) {
-			if (incl_deleted)
-				return f;
-			else if (f->deleted == 0)
-				return f;
-		}
-	}
-	return NULL;
-}
-
-fc_port_t *
->>>>>>> linux-next/akpm-base
 qla2x00_find_fcport_by_nportid(scsi_qla_host_t *vha, port_id_t *id,
 	u8 incl_deleted)
 {
@@ -1437,28 +1415,6 @@ qla24xxx_nack_iocb_entry(scsi_qla_host_t
 
 	if (pkt->u.isp2x.status != cpu_to_le16(NOTIFY_ACK_SUCCESS))
 		res = QLA_FUNCTION_FAILED;
-<<<<<<< HEAD
-
-	sp->done(sp, res);
-}
-
-static void
-qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
-    sts_entry_t *pkt, int iocb_type)
-{
-	const char func[] = "CT_IOCB";
-	const char *type;
-	srb_t *sp;
-	struct bsg_job *bsg_job;
-	struct fc_bsg_reply *bsg_reply;
-	uint16_t comp_status;
-	int res = 0;
-
-	sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
-	if (!sp)
-		return;
-
-=======
 
 	sp->done(sp, res);
 }
@@ -1479,7 +1435,6 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, s
 	if (!sp)
 		return;
 
->>>>>>> linux-next/akpm-base
 	switch (sp->type) {
 	case SRB_CT_CMD:
 	    bsg_job = sp->u.bsg_job;
diff -puN fs/f2fs/f2fs.h~linux-next-git-rejects fs/f2fs/f2fs.h
--- a/fs/f2fs/f2fs.h~linux-next-git-rejects
+++ a/fs/f2fs/f2fs.h
@@ -2040,13 +2040,8 @@ int f2fs_sync_file(struct file *file, lo
 void truncate_data_blocks(struct dnode_of_data *dn);
 int truncate_blocks(struct inode *inode, u64 from, bool lock);
 int f2fs_truncate(struct inode *inode);
-<<<<<<< HEAD
-int f2fs_getattr(const struct path *path, struct kstat *stat,
-			u32 request_mask, unsigned int flags);
-=======
 int f2fs_getattr(const struct path *path, struct kstat *stat, u32 request_mask,
 		 unsigned int query_flags);
->>>>>>> linux-next/akpm-base
 int f2fs_setattr(struct dentry *dentry, struct iattr *attr);
 int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end);
 int truncate_data_blocks_range(struct dnode_of_data *dn, int count);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
linux-next-rejects.patch
treewide-move-set_memory_-functions-away-from-cacheflushh-fix.patch
arm64-use-set_memoryh-header-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-02-27 20:23 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-02-27 20:23 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/devicetree/bindings/clock/st,stm32-rcc.txt |    3 
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts     |    4 
 arch/arm/mach-ux500/platsmp.c                            |    4 
 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi    |   15 ---
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts            |   24 -----
 arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts           |    3 
 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi          |   42 ----------
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c         |   30 -------
 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c     |    4 
 drivers/gpu/drm/nouveau/dispnv04/dfp.c                   |    4 
 drivers/gpu/drm/nouveau/nouveau_bo.c                     |    4 
 drivers/gpu/drm/nouveau/nouveau_drm.c                    |    4 
 drivers/gpu/drm/rockchip/Kconfig                         |    3 
 drivers/gpu/drm/rockchip/cdn-dp-core.c                   |    7 -
 drivers/gpu/drm/sti/sti_drv.c                            |    3 
 drivers/gpu/drm/sti/sti_vtg.c                            |   12 --
 drivers/gpu/drm/zte/zx_plane.c                           |    8 -
 include/dt-bindings/clock/stm32fx-clock.h                |    3 
 lib/Kconfig                                              |    4 
 19 files changed, 181 deletions(-)

diff -puN Documentation/devicetree/bindings/clock/st,stm32-rcc.txt~linux-next-git-rejects Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
--- a/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
@@ -84,8 +84,6 @@ The secondary index is bound with the fo
 	11	CLK_SAI2
 	12	CLK_I2SQ_PDIV	(post divisor of pll i2s q divisor)
 	13	CLK_SAIQ_PDIV	(post divisor of pll sai q divisor)
-<<<<<<< HEAD
-=======
 
 	14	CLK_HSI		(Internal ocscillator clock)
 	15	CLK_SYSCLK	(System Clock)
@@ -105,7 +103,6 @@ The secondary index is bound with the fo
 	29	CLK_I2C4
 	30	CLK_LPTIMER	(LPTimer1 clock)
 )
->>>>>>> linux-next/akpm-base
 
 Example:
 
diff -puN arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts~linux-next-git-rejects arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts~linux-next-git-rejects
+++ a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -56,11 +56,7 @@
 };
 
 &pio {
-<<<<<<< HEAD
-	mmc2_pins_nrst: mmc2-rst-pin {
-=======
 	mmc2_pins_nrst: mmc2@0 {
->>>>>>> linux-next/akpm-base
 		pins = "PC16";
 		function = "gpio_out";
 	};
diff -puN arch/arm/mach-ux500/platsmp.c~linux-next-git-rejects arch/arm/mach-ux500/platsmp.c
--- a/arch/arm/mach-ux500/platsmp.c~linux-next-git-rejects
+++ a/arch/arm/mach-ux500/platsmp.c
@@ -79,11 +79,7 @@ static int ux500_boot_secondary(unsigned
 	 * backup ram register at offset 0x1FF0, which is what boot rom code
 	 * is waiting for. This will wake up the secondary core from WFE.
 	 */
-<<<<<<< HEAD
-	writel(virt_to_phys(secondary_startup),
-=======
 	writel(__pa_symbol(secondary_startup),
->>>>>>> linux-next/akpm-base
 	       backupram + UX500_CPU1_JUMPADDR_OFFSET);
 	writel(0xA1FEED01,
 	       backupram + UX500_CPU1_WAKEMAGIC_OFFSET);
diff -puN arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi~linux-next-git-rejects arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -217,21 +217,6 @@
 	assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>;
 };
 
-<<<<<<< HEAD
-&cmu_disp {
-	assigned-clocks = <&cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A>,
-			  <&cmu_mif CLK_DIV_SCLK_DECON_TV_ECLK>,
-			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>,
-			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK>;
-	assigned-clock-parents = <&cmu_mif CLK_MOUT_BUS_PLL_DIV2>,
-				 <0>,
-				 <&cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP>,
-				 <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>;
-	assigned-clock-rates = <0>, <400000000>;
-};
-
-=======
->>>>>>> linux-next/akpm-base
 &cmu_fsys {
 	assigned-clocks = <&cmu_top CLK_MOUT_SCLK_USBDRD30>,
 		<&cmu_top CLK_MOUT_SCLK_USBHOST30>,
diff -puN arch/arm64/boot/dts/exynos/exynos5433-tm2.dts~linux-next-git-rejects arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -16,29 +16,6 @@
 / {
 	model = "Samsung TM2 board";
 	compatible = "samsung,tm2", "samsung,exynos5433";
-<<<<<<< HEAD
-};
-
-&hsi2c_9 {
-	status = "okay";
-
-	touchkey@20 {
-		compatible = "cypress,tm2-touchkey";
-		reg = <0x20>;
-		interrupt-parent = <&gpa3>;
-		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
-		vcc-supply = <&ldo32_reg>;
-		vdd-supply = <&ldo33_reg>;
-	};
-};
-
-&ldo31_reg {
-	regulator-name = "TSP_VDD_1.85V_AP";
-	regulator-min-microvolt = <1850000>;
-	regulator-max-microvolt = <1850000>;
-};
-
-=======
 };
 
 &cmu_disp {
@@ -94,7 +71,6 @@
 	regulator-max-microvolt = <1850000>;
 };
 
->>>>>>> linux-next/akpm-base
 &ldo38_reg {
 	regulator-name = "VCC_3.0V_MOTOR_AP";
 	regulator-min-microvolt = <3000000>;
diff -puN arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts~linux-next-git-rejects arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
@@ -18,8 +18,6 @@
 	compatible = "samsung,tm2e", "samsung,exynos5433";
 };
 
-<<<<<<< HEAD
-=======
 &cmu_disp {
 	/*
 	 * TM2 and TM2e differ only by DISP_PLL rate, but define all assigned
@@ -54,7 +52,6 @@
 	assigned-clock-rates = <278000000>, <400000000>;
 };
 
->>>>>>> linux-next/akpm-base
 &ldo31_reg {
 	regulator-name = "TSP_VDD_1.8V_AP";
 	regulator-min-microvolt = <1800000>;
diff -puN arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi~linux-next-git-rejects arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
--- a/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
@@ -497,93 +497,51 @@
 
 	sd0_clk: sd0-clk {
 		samsung,pins = "gpr0-0";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <0>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_cmd: sd0-cmd {
 		samsung,pins = "gpr0-1";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <3>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_ds: sd0-ds {
 		samsung,pins = "gpr0-2";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <1>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_qrdy: sd0-qrdy {
 		samsung,pins = "gpr0-3";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <1>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_bus1: sd0-bus-width1 {
 		samsung,pins = "gpr1-0";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <3>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_bus4: sd0-bus-width4 {
 		samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <3>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd0_bus8: sd0-bus-width8 {
 		samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7";
-<<<<<<< HEAD
-		samsung,pin-function = <2>;
-		samsung,pin-pud = <3>;
-		samsung,pin-drv = <4>;
-=======
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
 		samsung,pin-drv = <EXYNOS7_FSYS1_PIN_DRV_LV2>;
->>>>>>> linux-next/akpm-base
 	};
 
 	sd1_clk: sd1-clk {
diff -puN drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c~linux-next-git-rejects drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -2555,7 +2555,6 @@ static int smu7_get_profiling_clk(struct
 		}
 		if (count < 0 || level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)
 			*sclk_mask = 0;
-<<<<<<< HEAD
 
 		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
 			*sclk_mask = table_info->vdd_dep_on_sclk->count - 1;
@@ -2566,18 +2565,6 @@ static int smu7_get_profiling_clk(struct
 	else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
 		*mclk_mask = golden_dpm_table->mclk_table.count - 1;
 
-=======
-
-		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-			*sclk_mask = table_info->vdd_dep_on_sclk->count - 1;
-	}
-
-	if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)
-		*mclk_mask = 0;
-	else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
-		*mclk_mask = golden_dpm_table->mclk_table.count - 1;
-
->>>>>>> linux-next/akpm-base
 	*pcie_mask = data->dpm_table.pcie_speed_table.count - 1;
 	return 0;
 }
@@ -2634,22 +2621,6 @@ static int smu7_force_dpm_level(struct p
 		if (ret)
 			return ret;
 		hwmgr->dpm_level = level;
-<<<<<<< HEAD
-		break;
-	case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
-	case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
-	case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
-	case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
-		ret = smu7_get_profiling_clk(hwmgr, level, &sclk_mask, &mclk_mask, &pcie_mask);
-		if (ret)
-			return ret;
-		hwmgr->dpm_level = level;
-		smu7_force_clock_level(hwmgr, PP_SCLK, 1<<sclk_mask);
-		smu7_force_clock_level(hwmgr, PP_MCLK, 1<<mclk_mask);
-		smu7_force_clock_level(hwmgr, PP_PCIE, 1<<pcie_mask);
-
-		break;
-=======
 		break;
 	case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
@@ -2664,7 +2635,6 @@ static int smu7_force_dpm_level(struct p
 		smu7_force_clock_level(hwmgr, PP_PCIE, 1<<pcie_mask);
 
 		break;
->>>>>>> linux-next/akpm-base
 	case AMD_DPM_FORCED_LEVEL_MANUAL:
 		hwmgr->dpm_level = level;
 		break;
diff -puN drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c~linux-next-git-rejects drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -503,11 +503,7 @@ static int polaris10_populate_ulv_level(
 	state->VddcOffsetVid = (uint8_t)(table_info->us_ulv_voltage_offset *
 			VOLTAGE_VID_OFFSET_SCALE2 / VOLTAGE_VID_OFFSET_SCALE1);
 
-<<<<<<< HEAD
-	if (smumgr->chip_id == CHIP_POLARIS12 || smumgr->is_kicker)
-=======
 	if (smumgr->is_kicker)
->>>>>>> linux-next/akpm-base
 		state->VddcPhase = data->vddc_phase_shed_control ^ 0x3;
 	else
 		state->VddcPhase = (data->vddc_phase_shed_control) ? 0 : 1;
diff -puN drivers/gpu/drm/nouveau/dispnv04/dfp.c~linux-next-git-rejects drivers/gpu/drm/nouveau/dispnv04/dfp.c
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -417,11 +417,7 @@ static void nv04_dfp_mode_set(struct drm
 	if ((nv_connector->dithering_mode == DITHERING_MODE_ON) ||
 	    (nv_connector->dithering_mode == DITHERING_MODE_AUTO &&
 	     fb->format->depth > connector->display_info.bpc * 3)) {
-<<<<<<< HEAD
 		if (drm->client.device.info.chipset == 0x11)
-=======
-		if (drm->device.info.chipset == 0x11)
->>>>>>> linux-next/akpm-base
 			regp->dither = savep->dither | 0x00010000;
 		else {
 			int i;
diff -puN drivers/gpu/drm/nouveau/nouveau_bo.c~linux-next-git-rejects drivers/gpu/drm/nouveau/nouveau_bo.c
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1198,11 +1198,7 @@ out:
 
 static void
 nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,
-<<<<<<< HEAD
 		     struct ttm_mem_reg *new_reg)
-=======
-		     struct ttm_mem_reg *new_mem)
->>>>>>> linux-next/akpm-base
 {
 	struct nouveau_bo *nvbo = nouveau_bo(bo);
 	struct nvkm_vma *vma;
diff -puN drivers/gpu/drm/nouveau/nouveau_drm.c~linux-next-git-rejects drivers/gpu/drm/nouveau/nouveau_drm.c
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -546,12 +546,8 @@ nouveau_drm_unload(struct drm_device *de
 
 	if (drm->hdmi_device)
 		pci_dev_put(drm->hdmi_device);
-<<<<<<< HEAD
 	nouveau_cli_fini(&drm->client);
 	kfree(drm);
-=======
-	nouveau_cli_destroy(&drm->client);
->>>>>>> linux-next/akpm-base
 }
 
 void
diff -puN drivers/gpu/drm/rockchip/Kconfig~linux-next-git-rejects drivers/gpu/drm/rockchip/Kconfig
--- a/drivers/gpu/drm/rockchip/Kconfig~linux-next-git-rejects
+++ a/drivers/gpu/drm/rockchip/Kconfig
@@ -24,10 +24,7 @@ config ROCKCHIP_ANALOGIX_DP
 config ROCKCHIP_CDN_DP
         tristate "Rockchip cdn DP"
         depends on DRM_ROCKCHIP
-<<<<<<< HEAD
-=======
 	depends on EXTCON
->>>>>>> linux-next/akpm-base
 	select SND_SOC_HDMI_CODEC if SND_SOC
         help
 	  This selects support for Rockchip SoC specific extensions
diff -puN drivers/gpu/drm/rockchip/cdn-dp-core.c~linux-next-git-rejects drivers/gpu/drm/rockchip/cdn-dp-core.c
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -111,11 +111,7 @@ static int cdn_dp_clk_enable(struct cdn_
 	ret = pm_runtime_get_sync(dp->dev);
 	if (ret < 0) {
 		DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret);
-<<<<<<< HEAD
-		goto err_pclk;
-=======
 		goto err_pm_runtime_get;
->>>>>>> linux-next/akpm-base
 	}
 
 	reset_control_assert(dp->core_rst);
@@ -137,11 +133,8 @@ static int cdn_dp_clk_enable(struct cdn_
 	return 0;
 
 err_set_rate:
-<<<<<<< HEAD
-=======
 	pm_runtime_put(dp->dev);
 err_pm_runtime_get:
->>>>>>> linux-next/akpm-base
 	clk_disable_unprepare(dp->core_clk);
 err_core_clk:
 	clk_disable_unprepare(dp->pclk);
diff -puN drivers/gpu/drm/sti/sti_drv.c~linux-next-git-rejects drivers/gpu/drm/sti/sti_drv.c
--- a/drivers/gpu/drm/sti/sti_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sti/sti_drv.c
@@ -117,8 +117,6 @@ err:
 	return ret;
 }
 
-<<<<<<< HEAD
-=======
 static void sti_drm_dbg_cleanup(struct drm_minor *minor)
 {
 	drm_debugfs_remove_files(sti_drm_dbg_list,
@@ -128,7 +126,6 @@ static void sti_drm_dbg_cleanup(struct d
 				 1, minor);
 }
 
->>>>>>> linux-next/akpm-base
 static int sti_atomic_check(struct drm_device *dev,
 			    struct drm_atomic_state *state)
 {
diff -puN drivers/gpu/drm/sti/sti_vtg.c~linux-next-git-rejects drivers/gpu/drm/sti/sti_vtg.c
--- a/drivers/gpu/drm/sti/sti_vtg.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sti/sti_vtg.c
@@ -411,7 +411,6 @@ static int vtg_probe(struct platform_dev
 		DRM_ERROR("failed to remap I/O memory\n");
 		return -ENOMEM;
 	}
-<<<<<<< HEAD
 
 	vtg->irq = platform_get_irq(pdev, 0);
 	if (vtg->irq < 0) {
@@ -421,17 +420,6 @@ static int vtg_probe(struct platform_dev
 
 	RAW_INIT_NOTIFIER_HEAD(&vtg->notifier_list);
 
-=======
-
-	vtg->irq = platform_get_irq(pdev, 0);
-	if (vtg->irq < 0) {
-		DRM_ERROR("Failed to get VTG interrupt\n");
-		return vtg->irq;
-	}
-
-	RAW_INIT_NOTIFIER_HEAD(&vtg->notifier_list);
-
->>>>>>> linux-next/akpm-base
 	ret = devm_request_threaded_irq(dev, vtg->irq, vtg_irq,
 					vtg_irq_thread, IRQF_ONESHOT,
 					dev_name(dev), vtg);
diff -puN drivers/gpu/drm/zte/zx_plane.c~linux-next-git-rejects drivers/gpu/drm/zte/zx_plane.c
--- a/drivers/gpu/drm/zte/zx_plane.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/zte/zx_plane.c
@@ -159,11 +159,7 @@ static void zx_vl_rsz_setup(struct zx_pl
 	void __iomem *rsz = zplane->rsz;
 	u32 src_chroma_w = src_w;
 	u32 src_chroma_h = src_h;
-<<<<<<< HEAD
-	u32 fmt;
-=======
 	int fmt;
->>>>>>> linux-next/akpm-base
 
 	/* Set up source and destination resolution */
 	zx_writel(rsz + RSZ_SRC_CFG, RSZ_VER(src_h - 1) | RSZ_HOR(src_w - 1));
@@ -207,11 +203,7 @@ static void zx_vl_plane_atomic_update(st
 	u32 src_x, src_y, src_w, src_h;
 	u32 dst_x, dst_y, dst_w, dst_h;
 	uint32_t format;
-<<<<<<< HEAD
-	u32 fmt;
-=======
 	int fmt;
->>>>>>> linux-next/akpm-base
 	int num_planes;
 	int i;
 
diff -puN include/dt-bindings/clock/stm32fx-clock.h~linux-next-git-rejects include/dt-bindings/clock/stm32fx-clock.h
--- a/include/dt-bindings/clock/stm32fx-clock.h~linux-next-git-rejects
+++ a/include/dt-bindings/clock/stm32fx-clock.h
@@ -36,8 +36,6 @@
 
 #define END_PRIMARY_CLK		14
 
-<<<<<<< HEAD
-=======
 #define CLK_HSI			14
 #define CLK_SYSCLK		15
 #define CLK_HDMI_CEC		16
@@ -58,5 +56,4 @@
 
 #define END_PRIMARY_CLK_F7	31
 
->>>>>>> linux-next/akpm-base
 #endif
diff -puN lib/Kconfig~linux-next-git-rejects lib/Kconfig
--- a/lib/Kconfig~linux-next-git-rejects
+++ a/lib/Kconfig
@@ -552,14 +552,10 @@ config PARMAN
 	tristate
 
 config PRIME_NUMBERS
-<<<<<<< HEAD
-	tristate
-=======
 	tristate "Prime number generator"
 	default n
 	help
 	  Provides a helper module to generate prime numbers. Useful for writing
 	  test code, especially when checking multiplication and divison.
->>>>>>> linux-next/akpm-base
 
 endmenu
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-02-08 20:20 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-02-08 20:20 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/crypto/chelsio/chcr_core.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/crypto/chelsio/chcr_core.c~linux-next-git-rejects drivers/crypto/chelsio/chcr_core.c
--- a/drivers/crypto/chelsio/chcr_core.c~linux-next-git-rejects
+++ a/drivers/crypto/chelsio/chcr_core.c
@@ -61,11 +61,7 @@ int assign_chcr_device(struct chcr_dev *
 	 */
 	mutex_lock(&dev_mutex); /* TODO ? */
 	list_for_each_entry(u_ctx, &uld_ctx_list, entry)
-<<<<<<< HEAD
-		if (u_ctx && u_ctx->dev) {
-=======
 		if (u_ctx->dev) {
->>>>>>> linux-next/akpm-base
 			*dev = u_ctx->dev;
 			ret = 0;
 			break;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
scripts-spellingtxt-fix-incorrect-typo-words-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-slab-rename-kmalloc-node-cache-to-kmalloc-size-fix.patch
slub-make-sysfs-directories-for-memcg-sub-caches-optional-fix.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
mm-track-active-portions-of-a-section-at-boot-fix.patch
mm-memory_hotplugc-unexport-__remove_pages.patch
z3fold-add-kref-refcounting-checkpatch-fixes.patch
mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch
mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-02-06 21:24 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-02-06 21:24 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/Kconfig                 |    3 ---
 arch/x86/kernel/cpu/microcode/amd.c  |   20 --------------------
 arch/x86/kernel/fpu/core.c           |    6 ------
 drivers/gpu/drm/i915/i915_drv.h      |   18 ------------------
 drivers/gpu/drm/i915/intel_display.c |    8 --------
 drivers/gpu/drm/i915/intel_fbc.c     |    4 ----
 drivers/gpu/drm/i915/intel_sprite.c  |   15 ---------------
 include/drm/drm_connector.h          |   19 -------------------
 8 files changed, 93 deletions(-)

diff -puN arch/powerpc/Kconfig~linux-next-git-rejects arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~linux-next-git-rejects
+++ a/arch/powerpc/Kconfig
@@ -164,11 +164,8 @@ config PPC
 	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
 	select HAVE_ARCH_HARDENED_USERCOPY
 	select HAVE_KERNEL_GZIP
-<<<<<<< HEAD
-=======
 	select HAVE_CONTEXT_TRACKING if PPC64
 	select ARCH_WEAK_RELEASE_ACQUIRE
->>>>>>> linux-next/akpm-base
 
 config GENERIC_CSUM
 	def_bool n
diff -puN arch/x86/kernel/cpu/microcode/amd.c~linux-next-git-rejects arch/x86/kernel/cpu/microcode/amd.c
--- a/arch/x86/kernel/cpu/microcode/amd.c~linux-next-git-rejects
+++ a/arch/x86/kernel/cpu/microcode/amd.c
@@ -302,27 +302,7 @@ void load_ucode_amd_ap(unsigned int cpui
 		new_rev = &ucode_new_rev;
 	}
 
-<<<<<<< HEAD
-reget:
-		if (!get_builtin_microcode(&cp, family)) {
-#ifdef CONFIG_BLK_DEV_INITRD
-			if (!initrd_gone)
-				cp = find_cpio_data(ucode_path, (void *)initrd_start,
-						    initrd_end - initrd_start, NULL);
-#endif
-			if (!(cp.data && cp.size)) {
-				/*
-				 * Mark it so that other APs do not scan again
-				 * for no real reason and slow down boot
-				 * needlessly.
-				 */
-				cont.size = -1;
-				return;
-			}
-		}
-=======
 	native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy);
->>>>>>> linux-next/akpm-base
 
 	/* Check whether we have saved a new patch already: */
 	if (*new_rev && rev < mc->hdr.patch_id) {
diff -puN arch/x86/kernel/fpu/core.c~linux-next-git-rejects arch/x86/kernel/fpu/core.c
--- a/arch/x86/kernel/fpu/core.c~linux-next-git-rejects
+++ a/arch/x86/kernel/fpu/core.c
@@ -180,13 +180,7 @@ void fpstate_init(union fpregs_state *st
 	memset(state, 0, fpu_kernel_xstate_size);
 
 	if (static_cpu_has(X86_FEATURE_XSAVES))
-<<<<<<< HEAD
-		state->xsave.header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT |
-					       xfeatures_mask;
-
-=======
 		fpstate_init_xstate(&state->xsave);
->>>>>>> linux-next/akpm-base
 	if (static_cpu_has(X86_FEATURE_FXSR))
 		fpstate_init_fxstate(&state->fxsave);
 	else
diff -puN drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.h
@@ -1085,11 +1085,7 @@ struct intel_fbc {
 		} plane;
 
 		struct {
-<<<<<<< HEAD
-			uint32_t pixel_format;
-=======
 			const struct drm_format_info *format;
->>>>>>> linux-next/akpm-base
 			unsigned int stride;
 		} fb;
 	} state_cache;
@@ -1104,11 +1100,7 @@ struct intel_fbc {
 		} crtc;
 
 		struct {
-<<<<<<< HEAD
-			uint32_t pixel_format;
-=======
 			const struct drm_format_info *format;
->>>>>>> linux-next/akpm-base
 			unsigned int stride;
 		} fb;
 
@@ -3400,16 +3392,6 @@ i915_vm_to_ppgtt(struct i915_address_spa
 	return container_of(vm, struct i915_hw_ppgtt, base);
 }
 
-<<<<<<< HEAD
-static inline struct i915_vma *
-i915_gem_object_to_ggtt(struct drm_i915_gem_object *obj,
-			const struct i915_ggtt_view *view)
-{
-	return i915_gem_obj_to_vma(obj, &to_i915(obj->base.dev)->ggtt.base, view);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 /* i915_gem_fence_reg.c */
 int __must_check i915_vma_get_fence(struct i915_vma *vma);
 int __must_check i915_vma_put_fence(struct i915_vma *vma);
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -2242,11 +2242,7 @@ err:
 
 void intel_unpin_fb_vma(struct i915_vma *vma)
 {
-<<<<<<< HEAD
-	lockdep_assert_held(&vma->vm->dev->struct_mutex);
-=======
 	lockdep_assert_held(&vma->vm->i915->drm.struct_mutex);
->>>>>>> linux-next/akpm-base
 
 	if (WARN_ON_ONCE(!vma))
 		return;
@@ -3433,11 +3429,7 @@ static void skylake_update_primary_plane
 		I915_WRITE(PLANE_POS(pipe, plane_id), (dst_y << 16) | dst_x);
 	}
 
-<<<<<<< HEAD
-	I915_WRITE(PLANE_SURF(pipe, 0),
-=======
 	I915_WRITE(PLANE_SURF(pipe, plane_id),
->>>>>>> linux-next/akpm-base
 		   intel_plane_ggtt_offset(plane_state) + surf_addr);
 
 	POSTING_READ(PLANE_SURF(pipe, plane_id));
diff -puN drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_fbc.c
--- a/drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_fbc.c
@@ -754,11 +754,7 @@ static void intel_fbc_update_state_cache
 	if (!cache->plane.visible)
 		return;
 
-<<<<<<< HEAD
-	cache->fb.pixel_format = fb->pixel_format;
-=======
 	cache->fb.format = fb->format;
->>>>>>> linux-next/akpm-base
 	cache->fb.stride = fb->pitches[0];
 
 	cache->vma = plane_state->vma;
diff -puN drivers/gpu/drm/i915/intel_sprite.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_sprite.c
--- a/drivers/gpu/drm/i915/intel_sprite.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_sprite.c
@@ -271,17 +271,10 @@ skl_update_plane(struct drm_plane *drm_p
 		I915_WRITE(PLANE_POS(pipe, plane_id), (crtc_y << 16) | crtc_x);
 	}
 
-<<<<<<< HEAD
-	I915_WRITE(PLANE_CTL(pipe, plane), plane_ctl);
-	I915_WRITE(PLANE_SURF(pipe, plane),
-		   intel_plane_ggtt_offset(plane_state) + surf_addr);
-	POSTING_READ(PLANE_SURF(pipe, plane));
-=======
 	I915_WRITE(PLANE_CTL(pipe, plane_id), plane_ctl);
 	I915_WRITE(PLANE_SURF(pipe, plane_id),
 		   intel_plane_ggtt_offset(plane_state) + surf_addr);
 	POSTING_READ(PLANE_SURF(pipe, plane_id));
->>>>>>> linux-next/akpm-base
 }
 
 static void
@@ -462,19 +455,11 @@ vlv_update_plane(struct drm_plane *dplan
 
 	I915_WRITE(SPCONSTALPHA(pipe, plane_id), 0);
 
-<<<<<<< HEAD
-	I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w);
-	I915_WRITE(SPCNTR(pipe, plane), sprctl);
-	I915_WRITE(SPSURF(pipe, plane),
-		   intel_plane_ggtt_offset(plane_state) + sprsurf_offset);
-	POSTING_READ(SPSURF(pipe, plane));
-=======
 	I915_WRITE(SPSIZE(pipe, plane_id), (crtc_h << 16) | crtc_w);
 	I915_WRITE(SPCNTR(pipe, plane_id), sprctl);
 	I915_WRITE(SPSURF(pipe, plane_id),
 		   intel_plane_ggtt_offset(plane_state) + sprsurf_offset);
 	POSTING_READ(SPSURF(pipe, plane_id));
->>>>>>> linux-next/akpm-base
 }
 
 static void
diff -puN include/drm/drm_connector.h~linux-next-git-rejects include/drm/drm_connector.h
--- a/include/drm/drm_connector.h~linux-next-git-rejects
+++ a/include/drm/drm_connector.h
@@ -381,11 +381,7 @@ struct drm_connector_funcs {
 	 * core drm connector interfaces. Everything added from this callback
 	 * should be unregistered in the early_unregister callback.
 	 *
-<<<<<<< HEAD
-	 * This is called while holding drm_connector->mutex.
-=======
 	 * This is called while holding &drm_connector.mutex.
->>>>>>> linux-next/akpm-base
 	 *
 	 * Returns:
 	 *
@@ -402,11 +398,7 @@ struct drm_connector_funcs {
 	 * early in the driver unload sequence to disable userspace access
 	 * before data structures are torndown.
 	 *
-<<<<<<< HEAD
-	 * This is called while holding drm_connector->mutex.
-=======
 	 * This is called while holding &drm_connector.mutex.
->>>>>>> linux-next/akpm-base
 	 */
 	void (*early_unregister)(struct drm_connector *connector);
 
@@ -571,12 +563,6 @@ struct drm_cmdline_mode {
  * @interlace_allowed: can this connector handle interlaced modes?
  * @doublescan_allowed: can this connector handle doublescan?
  * @stereo_allowed: can this connector handle stereo modes?
-<<<<<<< HEAD
- * @modes: modes available on this connector (from fill_modes() + user)
- * @status: one of the drm_connector_status enums (connected, not, or unknown)
- * @probed_modes: list of modes derived directly from the display
-=======
->>>>>>> linux-next/akpm-base
  * @funcs: connector control functions
  * @edid_blob_ptr: DRM property containing EDID if present
  * @properties: property tracking for this connector
@@ -623,13 +609,8 @@ struct drm_connector {
 
 	/**
 	 * @mutex: Lock for general connector state, but currently only protects
-<<<<<<< HEAD
-	 * @registered. Most of the connector state is still protected by the
-	 * mutex in &drm_mode_config.
-=======
 	 * @registered. Most of the connector state is still protected by
 	 * &drm_mode_config.mutex.
->>>>>>> linux-next/akpm-base
 	 */
 	struct mutex mutex;
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
mm-track-active-portions-of-a-section-at-boot-fix.patch
mm-memory_hotplugc-unexport-__remove_pages.patch
z3fold-add-kref-refcounting-checkpatch-fixes.patch
mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-02-02 21:49 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-02-02 21:49 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/cadence/macb.c             |   18 --------------
 drivers/net/ethernet/cadence/macb.h             |    3 --
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c |    9 -------
 net/sched/cls_matchall.c                        |   15 ++---------
 4 files changed, 3 insertions(+), 42 deletions(-)

diff -puN drivers/net/ethernet/cadence/macb.c~linux-next-git-rejects drivers/net/ethernet/cadence/macb.c
--- a/drivers/net/ethernet/cadence/macb.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/cadence/macb.c
@@ -604,7 +604,6 @@ static void macb_set_addr(struct macb *b
 		desc_64 = macb_64b_desc(bp, desc);
 		desc_64->addrh = upper_32_bits(addr);
 	}
-<<<<<<< HEAD
 #endif
 	desc->addr = lower_32_bits(addr);
 }
@@ -620,23 +619,6 @@ static dma_addr_t macb_get_addr(struct m
 		addr = ((u64)(desc_64->addrh) << 32);
 	}
 #endif
-=======
-#endif
-	desc->addr = lower_32_bits(addr);
-}
-
-static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc)
-{
-	dma_addr_t addr = 0;
-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-	struct macb_dma_desc_64 *desc_64;
-
-	if (bp->hw_dma_cap == HW_DMA_CAP_64B) {
-		desc_64 = macb_64b_desc(bp, desc);
-		addr = ((u64)(desc_64->addrh) << 32);
-	}
-#endif
->>>>>>> linux-next/akpm-base
 	addr |= MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, desc->addr));
 	return addr;
 }
diff -puN drivers/net/ethernet/cadence/macb.h~linux-next-git-rejects drivers/net/ethernet/cadence/macb.h
--- a/drivers/net/ethernet/cadence/macb.h~linux-next-git-rejects
+++ a/drivers/net/ethernet/cadence/macb.h
@@ -955,11 +955,8 @@ struct macb {
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 	enum macb_hw_dma_cap hw_dma_cap;
 #endif
-<<<<<<< HEAD
-=======
 
 	struct macb_ptp_info	*ptp_info;	/* macb-ptp interface */
->>>>>>> linux-next/akpm-base
 };
 
 static inline bool macb_is_gem(struct macb *bp)
diff -puN drivers/net/ethernet/mellanox/mlx5/core/en_tc.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -706,22 +706,13 @@ static int mlx5e_route_lookup_ipv4(struc
 	else
 		*out_dev = rt->dst.dev;
 
-<<<<<<< HEAD
-	ttl = ip4_dst_hoplimit(&rt->dst);
-=======
 	*out_ttl = ip4_dst_hoplimit(&rt->dst);
->>>>>>> linux-next/akpm-base
 	n = dst_neigh_lookup(&rt->dst, &fl4->daddr);
 	ip_rt_put(rt);
 	if (!n)
 		return -ENOMEM;
 
 	*out_n = n;
-<<<<<<< HEAD
-	*saddr = fl4->saddr;
-	*out_ttl = ttl;
-=======
->>>>>>> linux-next/akpm-base
 
 	return 0;
 }
diff -puN net/sched/cls_matchall.c~linux-next-git-rejects net/sched/cls_matchall.c
--- a/net/sched/cls_matchall.c~linux-next-git-rejects
+++ a/net/sched/cls_matchall.c
@@ -171,13 +171,9 @@ static int mall_change(struct net *net,
 	if (!new)
 		return -ENOBUFS;
 
-<<<<<<< HEAD
-	tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
-=======
-	err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0);
+	err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
 	if (err)
 		goto err_exts_init;
->>>>>>> linux-next/akpm-base
 
 	if (!handle)
 		handle = 1;
@@ -204,16 +200,11 @@ static int mall_change(struct net *net,
 		call_rcu(&head->rcu, mall_destroy_rcu);
 	return 0;
 
-<<<<<<< HEAD
-errout:
-	kfree(new);
-=======
 err_replace_hw_filter:
 err_set_parms:
-	tcf_exts_destroy(&f->exts);
+	tcf_exts_destroy(&new->exts);
 err_exts_init:
-	kfree(f);
->>>>>>> linux-next/akpm-base
+	kfree(new);
 	return err;
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
mm-track-active-portions-of-a-section-at-boot-fix.patch
mm-memory_hotplugc-unexport-__remove_pages.patch
z3fold-add-kref-refcounting-checkpatch-fixes.patch
mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-01-31 20:26 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-01-31 20:26 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pinctrl/pinctrl-amd.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN drivers/pinctrl/pinctrl-amd.c~linux-next-git-rejects drivers/pinctrl/pinctrl-amd.c
--- a/drivers/pinctrl/pinctrl-amd.c~linux-next-git-rejects
+++ a/drivers/pinctrl/pinctrl-amd.c
@@ -202,10 +202,6 @@ static void amd_gpio_dbg_show(struct seq
 			i = 128;
 			pin_num = AMD_GPIO_PINS_BANK2 + i;
 			break;
-<<<<<<< HEAD
-		default:
-			return;
-=======
 		case 3:
 			i = 192;
 			pin_num = AMD_GPIO_PINS_BANK3 + i;
@@ -213,7 +209,6 @@ static void amd_gpio_dbg_show(struct seq
 		default:
 			/* Illegal bank number, ignore */
 			continue;
->>>>>>> linux-next/akpm-base
 		}
 		for (; i < pin_num; i++) {
 			seq_printf(s, "pin%d\t", i);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
mm-track-active-portions-of-a-section-at-boot-fix.patch
mm-memory_hotplugc-unexport-__remove_pages.patch
hwpoison-soft-offlining-for-non-lru-movable-page-fix-fix.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-01-23 20:27 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-01-23 20:27 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/boot/dts/dra72-evm-revc.dts                 |    3 
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts |    7 -
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi          |   25 ------
 block/blk-mq.c                                       |   37 ----------
 drivers/block/nbd.c                                  |    5 -
 drivers/spi/spi-dw.c                                 |    6 -
 6 files changed, 83 deletions(-)

diff -puN arch/arm/boot/dts/dra72-evm-revc.dts~linux-next-git-rejects arch/arm/boot/dts/dra72-evm-revc.dts
--- a/arch/arm/boot/dts/dra72-evm-revc.dts~linux-next-git-rejects
+++ a/arch/arm/boot/dts/dra72-evm-revc.dts
@@ -78,10 +78,7 @@
 		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
 		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
 		ti,min-output-impedance;
-<<<<<<< HEAD
-=======
 		interrupt-parent = <&gpio6>;
 		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
->>>>>>> linux-next/akpm-base
 	};
 };
diff -puN arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts~linux-next-git-rejects arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts~linux-next-git-rejects
+++ a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -57,15 +57,8 @@
 
 &pio {
 	mmc2_pins_nrst: mmc2-rst-pin {
-<<<<<<< HEAD
-		allwinner,pins = "PC16";
-		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-=======
 		pins = "PC16";
 		function = "gpio_out";
->>>>>>> linux-next/akpm-base
 	};
 };
 
diff -puN arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi~linux-next-git-rejects arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -50,31 +50,6 @@
 / {
 	compatible = "amlogic,meson-gxbb";
 
-<<<<<<< HEAD
-	scpi {
-		compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0";
-		mboxes = <&mailbox 1 &mailbox 2>;
-		shmem = <&cpu_scp_lpri &cpu_scp_hpri>;
-
-		scpi_clocks: clocks {
-			compatible = "arm,scpi-clocks";
-
-			scpi_dvfs: scpi_clocks@0 {
-				compatible = "arm,scpi-dvfs-clocks";
-				#clock-cells = <1>;
-				clock-indices = <0>;
-				clock-output-names = "vcpu";
-			};
-		};
-
-		scpi_sensors: sensors {
-			compatible = "arm,scpi-sensors";
-			#thermal-sensor-cells = <1>;
-		};
-	};
-
-=======
->>>>>>> linux-next/akpm-base
 	soc {
 		usb0_phy: phy@c0000000 {
 			compatible = "amlogic,meson-gxbb-usb2-phy";
diff -puN block/blk-mq.c~linux-next-git-rejects block/blk-mq.c
--- a/block/blk-mq.c~linux-next-git-rejects
+++ a/block/blk-mq.c
@@ -992,43 +992,6 @@ bool blk_mq_dispatch_rq_list(struct blk_
 	return ret != BLK_MQ_RQ_QUEUE_BUSY;
 }
 
-<<<<<<< HEAD
-/*
- * Run this hardware queue, pulling any software queues mapped to it in.
- * Note that this function currently has various problems around ordering
- * of IO. In particular, we'd like FIFO behaviour on handling existing
- * items on the hctx->dispatch list. Ignore that for now.
- */
-static void blk_mq_process_rq_list(struct blk_mq_hw_ctx *hctx)
-{
-	LIST_HEAD(rq_list);
-
-	if (unlikely(blk_mq_hctx_stopped(hctx)))
-		return;
-
-	hctx->run++;
-
-	/*
-	 * Touch any software queue that has pending entries.
-	 */
-	flush_busy_ctxs(hctx, &rq_list);
-
-	/*
-	 * If we have previous entries on our dispatch list, grab them
-	 * and stuff them at the front for more fair dispatch.
-	 */
-	if (!list_empty_careful(&hctx->dispatch)) {
-		spin_lock(&hctx->lock);
-		if (!list_empty(&hctx->dispatch))
-			list_splice_init(&hctx->dispatch, &rq_list);
-		spin_unlock(&hctx->lock);
-	}
-
-	blk_mq_dispatch_rq_list(hctx, &rq_list);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
 {
 	int srcu_idx;
diff -puN drivers/block/nbd.c~linux-next-git-rejects drivers/block/nbd.c
--- a/drivers/block/nbd.c~linux-next-git-rejects
+++ a/drivers/block/nbd.c
@@ -256,15 +256,10 @@ static int sock_xmit(struct nbd_device *
 static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
 {
 	struct request *req = blk_mq_rq_from_pdu(cmd);
-<<<<<<< HEAD
-	int result;
-	struct nbd_request request;
-=======
 	int result, flags;
 	struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)};
 	struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)};
 	struct iov_iter from;
->>>>>>> linux-next/akpm-base
 	unsigned long size = blk_rq_bytes(req);
 	struct bio *bio;
 	u32 type;
diff -puN drivers/spi/spi-dw.c~linux-next-git-rejects drivers/spi/spi-dw.c
--- a/drivers/spi/spi-dw.c~linux-next-git-rejects
+++ a/drivers/spi/spi-dw.c
@@ -107,15 +107,9 @@ static const struct file_operations dw_s
 
 static int dw_spi_debugfs_init(struct dw_spi *dws)
 {
-<<<<<<< HEAD
-	char name[128];
-
-	snprintf(name, 128, "dw_spi-%s", dev_name(&dws->master->dev));
-=======
 	char name[32];
 
 	snprintf(name, 32, "dw_spi%d", dws->master->bus_num);
->>>>>>> linux-next/akpm-base
 	dws->debugfs = debugfs_create_dir(name, NULL);
 	if (!dws->debugfs)
 		return -ENOMEM;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-respect-foll_force-foll_cow-for-thp-checkpatch-fixes.patch
proc-add-a-schedule-point-in-proc_pid_readdir-fix.patch
mm-page_alloc-fix-premature-oom-when-racing-with-cpuset-mems-update-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
dax-enable-iostat-for-read-write-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
mm-track-active-portions-of-a-section-at-boot-fix.patch
mm-memory_hotplugc-unexport-__remove_pages.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-01-18 22:23 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-01-18 22:23 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/rcu/tree_exp.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN kernel/rcu/tree_exp.h~linux-next-git-rejects kernel/rcu/tree_exp.h
--- a/kernel/rcu/tree_exp.h~linux-next-git-rejects
+++ a/kernel/rcu/tree_exp.h
@@ -711,14 +711,11 @@ void synchronize_rcu_expedited(void)
 {
 	struct rcu_state *rsp = rcu_state_p;
 
-<<<<<<< HEAD
-=======
 	RCU_LOCKDEP_WARN(lock_is_held(&rcu_bh_lock_map) ||
 			 lock_is_held(&rcu_lock_map) ||
 			 lock_is_held(&rcu_sched_lock_map),
 			 "Illegal synchronize_rcu_expedited() in RCU read-side critical section");
 
->>>>>>> linux-next/akpm-base
 	if (rcu_scheduler_active == RCU_SCHEDULER_INACTIVE)
 		return;
 	_synchronize_rcu_expedited(rsp, sync_rcu_exp_handler);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-respect-foll_force-foll_cow-for-thp-checkpatch-fixes.patch
proc-add-a-schedule-point-in-proc_pid_readdir-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
dax-enable-iostat-for-read-write-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-01-13 21:32 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-01-13 21:32 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/md/md.h          |    3 ---
 drivers/md/raid5-cache.c |    4 ----
 2 files changed, 7 deletions(-)

diff -puN drivers/md/md.h~linux-next-git-rejects drivers/md/md.h
--- a/drivers/md/md.h~linux-next-git-rejects
+++ a/drivers/md/md.h
@@ -710,9 +710,6 @@ static inline void mddev_clear_unsupport
 {
 	mddev->flags &= ~unsupported_flags;
 }
-<<<<<<< HEAD
-=======
 
 extern void md_writesame_setup(struct mddev *mddev, struct bio *bio);
->>>>>>> linux-next/akpm-base
 #endif /* _MD_MD_H */
diff -puN drivers/md/raid5-cache.c~linux-next-git-rejects drivers/md/raid5-cache.c
--- a/drivers/md/raid5-cache.c~linux-next-git-rejects
+++ a/drivers/md/raid5-cache.c
@@ -2499,11 +2499,7 @@ void r5c_finish_stripe_write_out(struct
 	if (do_wakeup)
 		wake_up(&conf->wait_for_overlap);
 
-<<<<<<< HEAD
-	spin_lock_irq(&conf->log->stripe_in_journal_lock);
-=======
 	spin_lock_irq(&log->stripe_in_journal_lock);
->>>>>>> linux-next/akpm-base
 	list_del_init(&sh->r5c);
 	spin_unlock_irq(&log->stripe_in_journal_lock);
 	sh->log_start = MaxSector;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-respect-foll_force-foll_cow-for-thp-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2017-01-09 21:35 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2017-01-09 21:35 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/i915_gem.c      |    4 ----
 drivers/gpu/drm/i915/intel_overlay.c |   11 -----------
 2 files changed, 15 deletions(-)

diff -puN drivers/gpu/drm/i915/i915_gem.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/i915/i915_gem.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem.c
@@ -2776,11 +2776,7 @@ static void i915_gem_reset_engine(struct
 	if (i915_gem_context_is_default(hung_ctx))
 		return;
 
-<<<<<<< HEAD
-	timeline = i915_gem_context_lookup_timeline(incomplete_ctx, engine);
-=======
 	timeline = i915_gem_context_lookup_timeline(hung_ctx, engine);
->>>>>>> linux-next/akpm-base
 
 	spin_lock_irqsave(&engine->timeline->lock, flags);
 	spin_lock(&timeline->lock);
diff -puN drivers/gpu/drm/i915/intel_overlay.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_overlay.c
--- a/drivers/gpu/drm/i915/intel_overlay.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_overlay.c
@@ -895,17 +895,6 @@ static int intel_overlay_do_put_image(st
 	if (ret)
 		goto out_unpin;
 
-<<<<<<< HEAD
-	i915_gem_track_fb(overlay->vma ? overlay->vma->obj : NULL,
-			  vma->obj, INTEL_FRONTBUFFER_OVERLAY(pipe));
-
-	overlay->old_vma = overlay->vma;
-	overlay->vma = vma;
-
-	intel_frontbuffer_flip(dev_priv, INTEL_FRONTBUFFER_OVERLAY(pipe));

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-12-20 21:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-12-20 21:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/quota/dquot.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN fs/quota/dquot.c~linux-next-git-rejects fs/quota/dquot.c
--- a/fs/quota/dquot.c~linux-next-git-rejects
+++ a/fs/quota/dquot.c
@@ -2184,13 +2184,8 @@ int dquot_disable(struct super_block *sb
 	 * must also discard the blockdev buffers so that we see the
 	 * changes done by userspace on the next quotaon() */
 	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
-<<<<<<< HEAD
-		/* This can happen when suspending quotas on remount-ro... */
-		if (toputinode[cnt] && !sb_has_quota_loaded(sb, cnt)) {
-=======
 		if (toputinode[cnt]) {
 			WARN_ON_ONCE(sb_has_quota_loaded(sb, cnt));
->>>>>>> linux-next/akpm-base
 			inode_lock(toputinode[cnt]);
 			toputinode[cnt]->i_flags &= ~(S_IMMUTABLE |
 				  S_NOATIME | S_NOQUOTA);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-12-12 21:35 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-12-12 21:35 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/boot/dts/sun8i-h3.dtsi |    7 -------
 1 file changed, 7 deletions(-)

diff -puN arch/arm/boot/dts/sun8i-h3.dtsi~linux-next-git-rejects arch/arm/boot/dts/sun8i-h3.dtsi
--- a/arch/arm/boot/dts/sun8i-h3.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -406,15 +406,8 @@
 			};
 
 			uart3_pins: uart3 {
-<<<<<<< HEAD
-				allwinner,pins = "PA13", "PA14";
-				allwinner,function = "uart3";
-				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-=======
 				pins = "PA13", "PA14";
 				function = "uart3";
->>>>>>> linux-next/akpm-base
 			};
 		};
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
mm-disable-numa-migration-faults-for-dax-vmas-fix.patch
filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch
include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch
mm-thp-page-cache-support-for-ppc64-fix.patch
mm-rmap-handle-anon_vma_prepare-common-case-inline-checkpatch-fixes.patch
scripts-checkpatchpl-fix-spelling.patch
init-reduce-rootwait-polling-interval-time-to-5ms-fix.patch
debug-more-properly-delay-for-secondary-cpus-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
vfs-make-may_umount_tree-mount-propogation-aware-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-12-06 19:17 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-12-06 19:17 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/crypto/chelsio/chcr_algo.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/crypto/chelsio/chcr_algo.h~linux-next-git-rejects drivers/crypto/chelsio/chcr_algo.h
--- a/drivers/crypto/chelsio/chcr_algo.h~linux-next-git-rejects
+++ a/drivers/crypto/chelsio/chcr_algo.h
@@ -408,7 +408,6 @@ static u32 round_constant[11] = {
 	0x1B000000, 0x36000000, 0x6C000000
 };
 
-<<<<<<< HEAD
 /* dec_key - OUTPUT - Reverse round key
  * key - INPUT - key
  * keylength - INPUT - length of the key in number of bits
@@ -466,6 +465,4 @@ static inline void get_aes_decrypt_key(u
 	}
 }
 
-=======
->>>>>>> linux-next/akpm-base
 #endif /* __CHCR_ALGO_H__ */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
mm-disable-numa-migration-faults-for-dax-vmas-fix.patch
filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch
include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch
mm-thp-page-cache-support-for-ppc64-fix.patch
mm-rmap-handle-anon_vma_prepare-common-case-inline-checkpatch-fixes.patch
scripts-checkpatchpl-fix-spelling.patch
debug-more-properly-delay-for-secondary-cpus-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
vfs-make-may_umount_tree-mount-propogation-aware-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-11-23 18:26 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-11-23 18:26 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c |   18 -----------
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    9 -----
 include/linux/bpf_verifier.h                       |    3 -
 kernel/bpf/verifier.c                              |    4 --
 4 files changed, 34 deletions(-)

diff -puN drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c~linux-next-git-rejects drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -213,19 +213,11 @@ static void dwmac4_rd_enable_tx_timestam
 static int dwmac4_wrback_get_tx_timestamp_status(struct dma_desc *p)
 {
 	/* Context type from W/B descriptor must be zero */
-<<<<<<< HEAD
-	if (p->des3 & TDES3_CONTEXT_TYPE)
-		return -EINVAL;
-
-	/* Tx Timestamp Status is 1 so des0 and des1'll have valid values */
-	if (p->des3 & TDES3_TIMESTAMP_STATUS)
-=======
 	if (le32_to_cpu(p->des3) & TDES3_CONTEXT_TYPE)
 		return -EINVAL;
 
 	/* Tx Timestamp Status is 1 so des0 and des1'll have valid values */
 	if (le32_to_cpu(p->des3) & TDES3_TIMESTAMP_STATUS)
->>>>>>> linux-next/akpm-base
 		return 0;
 
 	return 1;
@@ -249,13 +241,8 @@ static int dwmac4_rx_check_timestamp(voi
 	u32 own, ctxt;
 	int ret = 1;
 
-<<<<<<< HEAD
-	own = p->des3 & RDES3_OWN;
-	ctxt = ((p->des3 & RDES3_CONTEXT_DESCRIPTOR)
-=======
 	own = le32_to_cpu(p->des3) & RDES3_OWN;
 	ctxt = ((le32_to_cpu(p->des3) & RDES3_CONTEXT_DESCRIPTOR)
->>>>>>> linux-next/akpm-base
 		>> RDES3_CONTEXT_DESCRIPTOR_SHIFT);
 
 	if (likely(!own && ctxt)) {
@@ -277,13 +264,8 @@ static int dwmac4_wrback_get_rx_timestam
 	int ret = -EINVAL;
 
 	/* Get the status from normal w/b descriptor */
-<<<<<<< HEAD
-	if (likely(p->des3 & TDES3_RS1V)) {
-		if (likely(p->des1 & RDES1_TIMESTAMP_AVAILABLE)) {
-=======
 	if (likely(le32_to_cpu(p->des3) & TDES3_RS1V)) {
 		if (likely(le32_to_cpu(p->des1) & RDES1_TIMESTAMP_AVAILABLE)) {
->>>>>>> linux-next/akpm-base
 			int i = 0;
 
 			/* Check if timestamp is OK from context descriptor */
diff -puN drivers/net/ethernet/stmicro/stmmac/stmmac_main.c~linux-next-git-rejects drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2493,11 +2493,7 @@ static int stmmac_rx(struct stmmac_priv
 	if (netif_msg_rx_status(priv)) {
 		void *rx_head;
 
-<<<<<<< HEAD
-		pr_info(">>>>>> %s: descriptor ring:\n", __func__);
-=======
 		netdev_info(priv->dev, ">>>>>> %s: descriptor ring:\n", __func__);
->>>>>>> linux-next/akpm-base
 		if (priv->extend_desc)
 			rx_head = (void *)priv->dma_erx;
 		else
@@ -2584,13 +2580,8 @@ static int stmmac_rx(struct stmmac_priv
 				frame_len -= ETH_FCS_LEN;
 
 			if (netif_msg_rx_status(priv)) {
-<<<<<<< HEAD
-				pr_info("\tdesc: %p [entry %d] buff=0x%x\n",
-					p, entry, des);
-=======
 				netdev_info(priv->dev, "\tdesc: %p [entry %d] buff=0x%x\n",
 					    p, entry, des);
->>>>>>> linux-next/akpm-base
 				if (frame_len > ETH_FRAME_LEN)
 					netdev_dbg(priv->dev, "frame size %d, COE: %d\n",
 						   frame_len, status);
diff -puN include/linux/bpf_verifier.h~linux-next-git-rejects include/linux/bpf_verifier.h
--- a/include/linux/bpf_verifier.h~linux-next-git-rejects
+++ a/include/linux/bpf_verifier.h
@@ -24,10 +24,7 @@ struct bpf_reg_state {
 	 */
 	s64 min_value;
 	u64 max_value;
-<<<<<<< HEAD
-=======
 	u32 id;
->>>>>>> linux-next/akpm-base
 	union {
 		/* valid when type == CONST_IMM | PTR_TO_STACK | UNKNOWN_VALUE */
 		s64 imm;
diff -puN kernel/bpf/verifier.c~linux-next-git-rejects kernel/bpf/verifier.c
--- a/kernel/bpf/verifier.c~linux-next-git-rejects
+++ a/kernel/bpf/verifier.c
@@ -1501,10 +1501,6 @@ static void adjust_reg_min_max_vals(stru
 	struct bpf_reg_state *regs = env->cur_state.regs, *dst_reg;
 	s64 min_val = BPF_REGISTER_MIN_RANGE;
 	u64 max_val = BPF_REGISTER_MAX_RANGE;
-<<<<<<< HEAD
-	bool min_set = false, max_set = false;
-=======
->>>>>>> linux-next/akpm-base
 	u8 opcode = BPF_OP(insn->code);
 
 	dst_reg = &regs[insn->dst_reg];
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
mm-disable-numa-migration-faults-for-dax-vmas-fix.patch
filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch
include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch
mm-thp-page-cache-support-for-ppc64-fix.patch
scripts-checkpatchpl-fix-spelling.patch
debug-more-properly-delay-for-secondary-cpus-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-11-18  1:01 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-11-18  1:01 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c |    4 ---
 net/netfilter/ipvs/ip_vs_ctl.c                             |   11 ----------
 net/netlink/genetlink.c                                    |    7 ------
 3 files changed, 22 deletions(-)

diff -puN drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -59,11 +59,7 @@ mlx5_eswitch_add_offloaded_rule(struct m
 		return ERR_PTR(-EOPNOTSUPP);
 
 	/* per flow vlan pop/push is emulated, don't set that into the firmware */
-<<<<<<< HEAD
-	action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
-=======
 	flow_act.action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
->>>>>>> linux-next/akpm-base
 
 	if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
 		dest[i].type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
diff -puN net/netfilter/ipvs/ip_vs_ctl.c~linux-next-git-rejects net/netfilter/ipvs/ip_vs_ctl.c
--- a/net/netfilter/ipvs/ip_vs_ctl.c~linux-next-git-rejects
+++ a/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2840,18 +2840,7 @@ static struct nf_sockopt_ops ip_vs_socko
  */
 
 /* IPVS genetlink family */
-<<<<<<< HEAD
-static struct genl_family ip_vs_genl_family = {
-	.id		= GENL_ID_GENERATE,
-	.hdrsize	= 0,
-	.name		= IPVS_GENL_NAME,
-	.version	= IPVS_GENL_VERSION,
-	.maxattr	= IPVS_CMD_ATTR_MAX,
-	.netnsok        = true,         /* Make ipvsadm to work on netns */
-};
-=======
 static struct genl_family ip_vs_genl_family;
->>>>>>> linux-next/akpm-base
 
 /* Policy used for first-level command attributes */
 static const struct nla_policy ip_vs_cmd_policy[IPVS_CMD_ATTR_MAX + 1] = {
diff -puN net/netlink/genetlink.c~linux-next-git-rejects net/netlink/genetlink.c
--- a/net/netlink/genetlink.c~linux-next-git-rejects
+++ a/net/netlink/genetlink.c
@@ -369,11 +369,7 @@ int genl_register_family(struct genl_fam
 
 	err = genl_validate_assign_mc_groups(family);
 	if (err)
-<<<<<<< HEAD
-		goto errout_free;
-=======
 		goto errout_remove;
->>>>>>> linux-next/akpm-base
 
 	genl_unlock_all();
 
@@ -385,11 +381,8 @@ int genl_register_family(struct genl_fam
 
 	return 0;
 
-<<<<<<< HEAD
-=======
 errout_remove:
 	idr_remove(&genl_fam_idr, family->id);
->>>>>>> linux-next/akpm-base
 errout_free:
 	kfree(family->attrbuf);
 errout_locked:
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
mm-disable-numa-migration-faults-for-dax-vmas-fix.patch
filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch
scripts-checkpatchpl-fix-spelling.patch
debug-more-properly-delay-for-secondary-cpus-fix.patch
ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-11-08 23:20 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-11-08 23:20 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/admin-guide/index.rst        |    3 
 arch/arc/include/asm/arcregs.h             |    4 -
 arch/arc/kernel/setup.c                    |   73 -------------------
 arch/arm/include/asm/unistd.h              |    9 --
 arch/arm/include/uapi/asm/unistd.h         |   58 ---------------
 arch/arm/mach-imx/gpc.c                    |    3 
 arch/x86/kernel/cpu/microcode/amd.c        |   14 ---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     |    5 -
 drivers/gpu/drm/i915/i915_gem_fence.c      |    7 -
 drivers/gpu/drm/i915/intel_pm.c            |   12 ---
 drivers/net/ethernet/ibm/ibmvnic.c         |    3 
 drivers/net/ethernet/marvell/mv643xx_eth.c |   10 --
 drivers/spi/spi-fsl-espi.c                 |    4 -
 fs/overlayfs/copy_up.c                     |    5 -
 include/linux/netdevice.h                  |   14 ---
 include/net/udp.h                          |    3 
 net/core/dev.c                             |   10 --
 net/sunrpc/auth_gss/auth_gss.c             |    4 -
 net/sunrpc/auth_gss/gss_krb5_crypto.c      |   16 ----
 net/sunrpc/xprtrdma/svc_rdma_backchannel.c |    9 --
 20 files changed, 266 deletions(-)

diff -puN Documentation/admin-guide/index.rst~linux-next-git-rejects Documentation/admin-guide/index.rst
--- a/Documentation/admin-guide/index.rst~linux-next-git-rejects
+++ a/Documentation/admin-guide/index.rst
@@ -58,7 +58,6 @@ configure specific aspects of kernel beh
    binfmt-misc
    mono
    java
-<<<<<<< HEAD
    bad-memory
    basic-profiling
 
@@ -69,5 +68,3 @@ configure specific aspects of kernel beh
 
    * :ref:`genindex`
 
-=======
->>>>>>> doc-tweaks
diff -puN arch/arc/include/asm/arcregs.h~linux-next-git-rejects arch/arc/include/asm/arcregs.h
--- a/arch/arc/include/asm/arcregs.h~linux-next-git-rejects
+++ a/arch/arc/include/asm/arcregs.h
@@ -349,11 +349,7 @@ struct cpuinfo_arc {
 	struct cpuinfo_arc_bpu bpu;
 	struct bcr_identity core;
 	struct bcr_isa isa;
-<<<<<<< HEAD
-	const char *details, *name;
-=======
 	const void *details;
->>>>>>> linux-next/akpm-base
 	unsigned int vec_base;
 	struct cpuinfo_arc_ccm iccm, dccm;
 	struct {
diff -puN arch/arc/kernel/setup.c~linux-next-git-rejects arch/arc/kernel/setup.c
--- a/arch/arc/kernel/setup.c~linux-next-git-rejects
+++ a/arch/arc/kernel/setup.c
@@ -40,29 +40,6 @@ struct task_struct *_current_task[NR_CPU
 
 struct cpuinfo_arc cpuinfo_arc700[NR_CPUS];
 
-<<<<<<< HEAD
-static const struct id_to_str arc_cpu_rel[] = {
-#ifdef CONFIG_ISA_ARCOMPACT
-	{ 0x34, "R4.10"},
-	{ 0x35, "R4.11"},
-#else
-	{ 0x51, "R2.0" },
-	{ 0x52, "R2.1" },
-	{ 0x53, "R3.0" },
-#endif
-	{ 0x00, NULL   }
-};
-
-static const struct id_to_str arc_cpu_nm[] = {
-#ifdef CONFIG_ISA_ARCOMPACT
-	{ 0x20, "ARC 600"   },
-	{ 0x30, "ARC 770"   },  /* 750 identified seperately */
-#else
-	{ 0x40, "ARC EM"  },
-	{ 0x50, "ARC HS38"  },
-#endif
-	{ 0x00, "Unknown"   }
-=======
 static const struct cpuinfo_data arc_cpu_tbl[] = {
 #ifdef CONFIG_ISA_ARCOMPACT
 	{ {0x20, "ARC 600"      }, 0x2F},
@@ -75,7 +52,6 @@ static const struct cpuinfo_data arc_cpu
 	{ {0x53, "ARC HS38 R3.0"}, 0x53},
 #endif
 	{ {0x00, NULL		} }
->>>>>>> linux-next/akpm-base
 };
 
 static void read_decode_ccm_bcr(struct cpuinfo_arc *cpu)
@@ -130,38 +106,21 @@ static void read_arc_build_cfg_regs(void
 	struct bcr_timer timer;
 	struct bcr_generic bcr;
 	struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
-<<<<<<< HEAD
-	const struct id_to_str *tbl;
-=======
 	const struct cpuinfo_data *tbl;
->>>>>>> linux-next/akpm-base
 
 	FIX_PTR(cpu);
 
 	READ_BCR(AUX_IDENTITY, cpu->core);
 	READ_BCR(ARC_REG_ISA_CFG_BCR, cpu->isa);
 
-<<<<<<< HEAD
-	for (tbl = &arc_cpu_rel[0]; tbl->id != 0; tbl++) {
-		if (cpu->core.family == tbl->id) {
-			cpu->details = tbl->str;
-=======
 	for (tbl = &arc_cpu_tbl[0]; tbl->info.id != 0; tbl++) {
 		if ((cpu->core.family >= tbl->info.id) &&
 		    (cpu->core.family <= tbl->up_range)) {
 			cpu->details = tbl;
->>>>>>> linux-next/akpm-base
 			break;
 		}
 	}
 
-<<<<<<< HEAD
-	for (tbl = &arc_cpu_nm[0]; tbl->id != 0; tbl++) {
-		if ((cpu->core.family & 0xF0) == tbl->id)
-			break;
-	}
-	cpu->name = tbl->str;
-=======
 	/* some hacks for lack of feature BCR info in old ARC700 cores */
 	if (is_isa_arcompact()) {
 		if (!cpu->isa.ver)	/* ISA BCR absent, use Kconfig info */
@@ -174,7 +133,6 @@ static void read_arc_build_cfg_regs(void
 
 	cpu->extn.swape = (cpu->core.family >= 0x34) ? 1 :
 				IS_ENABLED(CONFIG_ARC_HAS_SWAPE);
->>>>>>> linux-next/akpm-base
 
 	READ_BCR(ARC_REG_TIMERS_BCR, timer);
 	cpu->extn.timer0 = timer.t0;
@@ -243,56 +201,26 @@ static void read_arc_build_cfg_regs(void
 
 	cpu->extn.debug = cpu->extn.ap | cpu->extn.smart | cpu->extn.rtt;
 
-<<<<<<< HEAD
-	/* some hacks for lack of feature BCR info in old ARC700 cores */
-	if (is_isa_arcompact()) {
-		if (!cpu->isa.ver)	/* ISA BCR absent, use Kconfig info */
-			cpu->isa.atomic = IS_ENABLED(CONFIG_ARC_HAS_LLSC);
-		else
-			cpu->isa.atomic = cpu->isa.atomic1;
-
-		cpu->isa.be = IS_ENABLED(CONFIG_CPU_BIG_ENDIAN);
-
-		 /* there's no direct way to distinguish 750 vs. 770 */
-		if (unlikely(cpu->core.family < 0x34 || cpu->mmu.ver < 3))
-			cpu->name = "ARC750";
-	}
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
 {
 	struct cpuinfo_arc *cpu = &cpuinfo_arc700[cpu_id];
 	struct bcr_identity *core = &cpu->core;
-<<<<<<< HEAD
-=======
 	const struct cpuinfo_data *tbl = cpu->details;
 	char *isa_nm;
->>>>>>> linux-next/akpm-base
 	int i, n = 0;
 
 	FIX_PTR(cpu);
 
-<<<<<<< HEAD
-=======
 	if (is_isa_arcompact()) {
 		isa_nm = "ARCompact";
 	} else {
 		isa_nm = "ARCv2";
 	}
 
->>>>>>> linux-next/akpm-base
 	n += scnprintf(buf + n, len - n,
 		       "\nIDENTITY\t: ARCVER [%#02x] ARCNUM [%#02x] CHIPID [%#4x]\n",
 		       core->family, core->cpu_id, core->chip_id);
 
-<<<<<<< HEAD
-	n += scnprintf(buf + n, len - n, "processor [%d]\t: %s %s (%s ISA) %s\n",
-		       cpu_id, cpu->name, cpu->details,
-		       is_isa_arcompact() ? "ARCompact" : "ARCv2",
-		       IS_AVAIL1(cpu->isa.be, "[Big-Endian]"));
-=======
 	n += scnprintf(buf + n, len - n,
 				       "processor [%d]\t: %s (%s ISA) %s\n",
 				       cpu_id, tbl->info.str, isa_nm,
@@ -300,7 +228,6 @@ static char *arc_cpu_mumbojumbo(int cpu_
 
 	if (tbl->info.id == 0)
 		n += scnprintf(buf + n, len - n, "UNKNOWN ARC Processor\n");
->>>>>>> linux-next/akpm-base
 
 	n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s\nISA Extn\t: ",
 		       IS_AVAIL1(cpu->extn.timer0, "Timer0 "),
diff -puN arch/arm/include/asm/unistd.h~linux-next-git-rejects arch/arm/include/asm/unistd.h
--- a/arch/arm/include/asm/unistd.h~linux-next-git-rejects
+++ a/arch/arm/include/asm/unistd.h
@@ -14,16 +14,7 @@
 #define __ASM_ARM_UNISTD_H
 
 #include <uapi/asm/unistd.h>
-<<<<<<< HEAD
-
-/*
- * This may need to be greater than __NR_last_syscall+1 in order to
- * account for the padding in the syscall table
- */
-#define __NR_syscalls  (400)
-=======
 #include <asm/unistd-nr.h>
->>>>>>> linux-next/akpm-base
 
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_GETHOSTNAME
diff -puN arch/arm/include/uapi/asm/unistd.h~linux-next-git-rejects arch/arm/include/uapi/asm/unistd.h
--- a/arch/arm/include/uapi/asm/unistd.h~linux-next-git-rejects
+++ a/arch/arm/include/uapi/asm/unistd.h
@@ -25,64 +25,6 @@
 
 #include <asm/unistd-common.h>
 #define __NR_sync_file_range2		__NR_arm_sync_file_range
-<<<<<<< HEAD
-#define __NR_tee			(__NR_SYSCALL_BASE+342)
-#define __NR_vmsplice			(__NR_SYSCALL_BASE+343)
-#define __NR_move_pages			(__NR_SYSCALL_BASE+344)
-#define __NR_getcpu			(__NR_SYSCALL_BASE+345)
-#define __NR_epoll_pwait		(__NR_SYSCALL_BASE+346)
-#define __NR_kexec_load			(__NR_SYSCALL_BASE+347)
-#define __NR_utimensat			(__NR_SYSCALL_BASE+348)
-#define __NR_signalfd			(__NR_SYSCALL_BASE+349)
-#define __NR_timerfd_create		(__NR_SYSCALL_BASE+350)
-#define __NR_eventfd			(__NR_SYSCALL_BASE+351)
-#define __NR_fallocate			(__NR_SYSCALL_BASE+352)
-#define __NR_timerfd_settime		(__NR_SYSCALL_BASE+353)
-#define __NR_timerfd_gettime		(__NR_SYSCALL_BASE+354)
-#define __NR_signalfd4			(__NR_SYSCALL_BASE+355)
-#define __NR_eventfd2			(__NR_SYSCALL_BASE+356)
-#define __NR_epoll_create1		(__NR_SYSCALL_BASE+357)
-#define __NR_dup3			(__NR_SYSCALL_BASE+358)
-#define __NR_pipe2			(__NR_SYSCALL_BASE+359)
-#define __NR_inotify_init1		(__NR_SYSCALL_BASE+360)
-#define __NR_preadv			(__NR_SYSCALL_BASE+361)
-#define __NR_pwritev			(__NR_SYSCALL_BASE+362)
-#define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)
-#define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)
-#define __NR_recvmmsg			(__NR_SYSCALL_BASE+365)
-#define __NR_accept4			(__NR_SYSCALL_BASE+366)
-#define __NR_fanotify_init		(__NR_SYSCALL_BASE+367)
-#define __NR_fanotify_mark		(__NR_SYSCALL_BASE+368)
-#define __NR_prlimit64			(__NR_SYSCALL_BASE+369)
-#define __NR_name_to_handle_at		(__NR_SYSCALL_BASE+370)
-#define __NR_open_by_handle_at		(__NR_SYSCALL_BASE+371)
-#define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)
-#define __NR_syncfs			(__NR_SYSCALL_BASE+373)
-#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)
-#define __NR_setns			(__NR_SYSCALL_BASE+375)
-#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)
-#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)
-#define __NR_kcmp			(__NR_SYSCALL_BASE+378)
-#define __NR_finit_module		(__NR_SYSCALL_BASE+379)
-#define __NR_sched_setattr		(__NR_SYSCALL_BASE+380)
-#define __NR_sched_getattr		(__NR_SYSCALL_BASE+381)
-#define __NR_renameat2			(__NR_SYSCALL_BASE+382)
-#define __NR_seccomp			(__NR_SYSCALL_BASE+383)
-#define __NR_getrandom			(__NR_SYSCALL_BASE+384)
-#define __NR_memfd_create		(__NR_SYSCALL_BASE+385)
-#define __NR_bpf			(__NR_SYSCALL_BASE+386)
-#define __NR_execveat			(__NR_SYSCALL_BASE+387)
-#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)
-#define __NR_membarrier			(__NR_SYSCALL_BASE+389)
-#define __NR_mlock2			(__NR_SYSCALL_BASE+390)
-#define __NR_copy_file_range		(__NR_SYSCALL_BASE+391)
-#define __NR_preadv2			(__NR_SYSCALL_BASE+392)
-#define __NR_pwritev2			(__NR_SYSCALL_BASE+393)
-#define __NR_pkey_mprotect		(__NR_SYSCALL_BASE+394)
-#define __NR_pkey_alloc			(__NR_SYSCALL_BASE+395)
-#define __NR_pkey_free			(__NR_SYSCALL_BASE+396)
-=======
->>>>>>> linux-next/akpm-base
 
 /*
  * The following SWIs are ARM private.
diff -puN arch/arm/mach-imx/gpc.c~linux-next-git-rejects arch/arm/mach-imx/gpc.c
--- a/arch/arm/mach-imx/gpc.c~linux-next-git-rejects
+++ a/arch/arm/mach-imx/gpc.c
@@ -423,8 +423,6 @@ static int imx_gpc_genpd_init(struct dev
 	if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
 		return 0;
 
-<<<<<<< HEAD
-=======
 	imx6q_pu_domain.base.states = devm_kzalloc(dev,
 					sizeof(*imx6q_pu_domain.base.states),
 					GFP_KERNEL);
@@ -435,7 +433,6 @@ static int imx_gpc_genpd_init(struct dev
 	imx6q_pu_domain.base.states[0].power_on_latency_ns = 2000000;
 	imx6q_pu_domain.base.state_count = 1;
 
->>>>>>> linux-next/akpm-base
 	for (i = 0; i < ARRAY_SIZE(imx_gpc_domains); i++)
 		pm_genpd_init(imx_gpc_domains[i], NULL, false);
 
diff -puN arch/x86/kernel/cpu/microcode/amd.c~linux-next-git-rejects arch/x86/kernel/cpu/microcode/amd.c
--- a/arch/x86/kernel/cpu/microcode/amd.c~linux-next-git-rejects
+++ a/arch/x86/kernel/cpu/microcode/amd.c
@@ -433,23 +433,9 @@ int __init save_microcode_in_initrd_amd(
 		if (IS_ENABLED(CONFIG_X86_32) && (cont.size != -1)) {
 			struct cpio_data cp = { NULL, 0, "" };
 
-<<<<<<< HEAD
-#ifdef CONFIG_X86_32
-	get_bsp_sig();
-	cont	= (unsigned long)container;
-	cont_va = __va(container);
-#else
-	/*
-	 * We need the physical address of the container for both bitness since
-	 * boot_params.hdr.ramdisk_image is a physical address.
-	 */
-	cont    = __pa_nodebug(container);
-	cont_va = container;
-=======
 #ifdef CONFIG_BLK_DEV_INITRD
 			cp = find_cpio_data(ucode_path, (void *)initrd_start,
 					    initrd_end - initrd_start, NULL);
->>>>>>> linux-next/akpm-base
 #endif
 
 			if (!(cp.data && cp.size)) {
diff -puN drivers/net/ethernet/ibm/ibmvnic.c~linux-next-git-rejects drivers/net/ethernet/ibm/ibmvnic.c
--- a/drivers/net/ethernet/ibm/ibmvnic.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3659,11 +3659,8 @@ static void handle_crq_init_rsp(struct w
 
 	netdev->real_num_tx_queues = adapter->req_tx_queues;
 	netdev->mtu = adapter->req_mtu;
-<<<<<<< HEAD
-=======
 	netdev->min_mtu = adapter->min_mtu;
 	netdev->max_mtu = adapter->max_mtu;
->>>>>>> linux-next/akpm-base
 
 	if (adapter->failover) {
 		adapter->failover = false;
diff -puN drivers/net/ethernet/marvell/mv643xx_eth.c~linux-next-git-rejects drivers/net/ethernet/marvell/mv643xx_eth.c
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3160,17 +3160,10 @@ static int mv643xx_eth_probe(struct plat
 
 	err = 0;
 	if (pd->phy_node) {
-<<<<<<< HEAD
-		mp->phy = of_phy_connect(mp->dev, pd->phy_node,
-					 mv643xx_eth_adjust_link, 0,
-					 get_phy_mode(mp));
-		if (!mp->phy)
-=======
 		phydev = of_phy_connect(mp->dev, pd->phy_node,
 					mv643xx_eth_adjust_link, 0,
 					PHY_INTERFACE_MODE_GMII);
 		if (!phydev)
->>>>>>> linux-next/akpm-base
 			err = -ENODEV;
 		else
 			phy_addr_set(mp, phydev->mdio.addr);
@@ -3227,15 +3220,12 @@ static int mv643xx_eth_probe(struct plat
 	dev->priv_flags |= IFF_UNICAST_FLT;
 	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
 
-<<<<<<< HEAD
-=======
 	/* MTU range: 64 - 9500 */
 	dev->min_mtu = 64;
 	dev->max_mtu = 9500;
 
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
->>>>>>> linux-next/akpm-base
 	if (mp->shared->win_protect)
 		wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
 
diff -puN drivers/spi/spi-fsl-espi.c~linux-next-git-rejects drivers/spi/spi-fsl-espi.c
--- a/drivers/spi/spi-fsl-espi.c~linux-next-git-rejects
+++ a/drivers/spi/spi-fsl-espi.c
@@ -455,11 +455,7 @@ static void fsl_espi_cpu_irq(struct mpc8
 
 		mspi->len -= rx_nr_bytes;
 
-<<<<<<< HEAD
-		if (rx_nr_bytes && mspi->rx)
-=======
 		if (rx_nr_bytes && mspi->rx) {
->>>>>>> linux-next/akpm-base
 			mspi->get_rx(rx_data, mspi);
 			mspi->rx += 4;
 		}
diff -puN include/linux/netdevice.h~linux-next-git-rejects include/linux/netdevice.h
--- a/include/linux/netdevice.h~linux-next-git-rejects
+++ a/include/linux/netdevice.h
@@ -3841,19 +3841,6 @@ struct net_device *netdev_all_lower_get_
 struct net_device *netdev_all_lower_get_next_rcu(struct net_device *dev,
 						 struct list_head **iter);
 
-<<<<<<< HEAD
-#define netdev_for_each_all_lower_dev(dev, ldev, iter) \
-	for (iter = (dev)->all_adj_list.lower.next, \
-	     ldev = netdev_all_lower_get_next(dev, &(iter)); \
-	     ldev; \
-	     ldev = netdev_all_lower_get_next(dev, &(iter)))
-
-#define netdev_for_each_all_lower_dev_rcu(dev, ldev, iter) \
-	for (iter = &(dev)->all_adj_list.lower, \
-	     ldev = netdev_all_lower_get_next_rcu(dev, &(iter)); \
-	     ldev; \
-	     ldev = netdev_all_lower_get_next_rcu(dev, &(iter)))
-=======
 int netdev_walk_all_lower_dev(struct net_device *dev,
 			      int (*fn)(struct net_device *lower_dev,
 					void *data),
@@ -3862,7 +3849,6 @@ int netdev_walk_all_lower_dev_rcu(struct
 				  int (*fn)(struct net_device *lower_dev,
 					    void *data),
 				  void *data);
->>>>>>> linux-next/akpm-base
 
 void *netdev_adjacent_get_private(struct list_head *adj_list);
 void *netdev_lower_get_first_private_rcu(struct net_device *dev);
diff -puN include/net/udp.h~linux-next-git-rejects include/net/udp.h
--- a/include/net/udp.h~linux-next-git-rejects
+++ a/include/net/udp.h
@@ -261,10 +261,7 @@ void udp_flush_pending_frames(struct soc
 void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst);
 int udp_rcv(struct sk_buff *skb);
 int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
-<<<<<<< HEAD
-=======
 int udp_init_sock(struct sock *sk);
->>>>>>> linux-next/akpm-base
 int __udp_disconnect(struct sock *sk, int flags);
 int udp_disconnect(struct sock *sk, int flags);
 unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait);
diff -puN net/core/dev.c~linux-next-git-rejects net/core/dev.c
--- a/net/core/dev.c~linux-next-git-rejects
+++ a/net/core/dev.c
@@ -5446,15 +5446,6 @@ static struct net_device *netdev_next_lo
 	struct netdev_adjacent *lower;
 
 	lower = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);
-<<<<<<< HEAD
-
-	if (&lower->list == &dev->all_adj_list.lower)
-		return NULL;
-
-	*iter = &lower->list;
-
-	return lower->dev;
-=======
 	if (&lower->list == &dev->adj_list.lower)
 		return NULL;
 
@@ -5488,7 +5479,6 @@ int netdev_walk_all_lower_dev_rcu(struct
 	}
 
 	return 0;
->>>>>>> linux-next/akpm-base
 }
 EXPORT_SYMBOL_GPL(netdev_walk_all_lower_dev_rcu);
 
diff -puN drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c~linux-next-git-rejects drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1758,11 +1758,6 @@ void amdgpu_vm_manager_fini(struct amdgp
 
 		dma_fence_put(adev->vm_manager.ids[i].first);
 		amdgpu_sync_free(&adev->vm_manager.ids[i].active);
-<<<<<<< HEAD
-		fence_put(id->flushed_updates);
-		fence_put(id->last_flush);
-=======
 		dma_fence_put(id->flushed_updates);
->>>>>>> linux-next/akpm-base
 	}
 }
diff -puN drivers/gpu/drm/i915/i915_gem_fence.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem_fence.c
--- a/drivers/gpu/drm/i915/i915_gem_fence.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -343,12 +343,9 @@ i915_vma_get_fence(struct i915_vma *vma)
 	struct drm_i915_fence_reg *fence;
 	struct i915_vma *set = i915_gem_object_is_tiled(vma->obj) ? vma : NULL;
 
-<<<<<<< HEAD
-=======
 	/* Note that we revoke fences on runtime suspend. Therefore the user
 	 * must keep the device awake whilst using the fence.
 	 */
->>>>>>> linux-next/akpm-base
 	assert_rpm_wakelock_held(to_i915(vma->vm->dev));
 
 	/* Just update our place in the LRU if our fence is getting reused. */
@@ -398,11 +395,7 @@ void i915_gem_restore_fences(struct drm_
 		 */
 		if (vma && !i915_gem_object_is_tiled(vma->obj)) {
 			GEM_BUG_ON(!reg->dirty);
-<<<<<<< HEAD
-			GEM_BUG_ON(vma->obj->fault_mappable);
-=======
 			GEM_BUG_ON(!list_empty(&vma->obj->userfault_link));
->>>>>>> linux-next/akpm-base
 
 			list_move(&reg->link, &dev_priv->mm.fence_list);
 			vma->fence = NULL;
diff -puN drivers/gpu/drm/i915/intel_pm.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_pm.c
--- a/drivers/gpu/drm/i915/intel_pm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_pm.c
@@ -3401,11 +3401,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_
 		return 0;
 
 	if (!cstate->base.active) {
-<<<<<<< HEAD
-		ddb->pipe[pipe].start = ddb->pipe[pipe].end = 0;
-=======
 		alloc->start = alloc->end = 0;
->>>>>>> linux-next/akpm-base
 		return 0;
 	}
 
@@ -3766,13 +3762,6 @@ skl_compute_linetime_wm(struct intel_crt
 	if (!cstate->base.active)
 		return 0;
 
-<<<<<<< HEAD
-	if (WARN_ON(ilk_pipe_pixel_rate(cstate) == 0))
-		return 0;
-
-	return DIV_ROUND_UP(8 * cstate->base.adjusted_mode.crtc_htotal * 1000,
-			    ilk_pipe_pixel_rate(cstate));
-=======
 	pixel_rate = ilk_pipe_pixel_rate(cstate);
 
 	if (WARN_ON(pixel_rate == 0))
@@ -3780,7 +3769,6 @@ skl_compute_linetime_wm(struct intel_crt
 
 	return DIV_ROUND_UP(8 * cstate->base.adjusted_mode.crtc_htotal * 1000,
 			    pixel_rate);
->>>>>>> linux-next/akpm-base
 }
 
 static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
diff -puN fs/overlayfs/copy_up.c~linux-next-git-rejects fs/overlayfs/copy_up.c
--- a/fs/overlayfs/copy_up.c~linux-next-git-rejects
+++ a/fs/overlayfs/copy_up.c
@@ -185,12 +185,7 @@ static int ovl_copy_up_data(struct path
 		len -= bytes;
 	}
 
-<<<<<<< HEAD
-	if (!error)
-		error = vfs_fsync(new_file, 0);
-=======
 out:
->>>>>>> linux-next/akpm-base
 	fput(new_file);
 out_fput:
 	fput(old_file);
diff -puN net/sunrpc/auth_gss/auth_gss.c~linux-next-git-rejects net/sunrpc/auth_gss/auth_gss.c
--- a/net/sunrpc/auth_gss/auth_gss.c~linux-next-git-rejects
+++ a/net/sunrpc/auth_gss/auth_gss.c
@@ -1631,11 +1631,7 @@ gss_validate(struct rpc_task *task, __be
 		goto out_bad;
 	if (flav != RPC_AUTH_GSS)
 		goto out_bad;
-<<<<<<< HEAD
-	seq = kmalloc(4, GFP_NOFS);
-=======
 	seq = kmalloc(4, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
 	if (!seq)
 		goto out_bad;
 	*seq = htonl(task->tk_rqstp->rq_seqno);
diff -puN net/sunrpc/auth_gss/gss_krb5_crypto.c~linux-next-git-rejects net/sunrpc/auth_gss/gss_krb5_crypto.c
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c~linux-next-git-rejects
+++ a/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -187,11 +187,7 @@ make_checksum_hmac_md5(struct krb5_ctx *
 		return GSS_S_FAILURE;
 	}
 
-<<<<<<< HEAD
-	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_NOFS);
-=======
 	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
 	if (!checksumdata)
 		return GSS_S_FAILURE;
 
@@ -295,11 +291,7 @@ make_checksum(struct krb5_ctx *kctx, cha
 		return GSS_S_FAILURE;
 	}
 
-<<<<<<< HEAD
-	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_NOFS);
-=======
 	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
 	if (checksumdata == NULL)
 		return GSS_S_FAILURE;
 
@@ -396,11 +388,7 @@ make_checksum_v2(struct krb5_ctx *kctx,
 		return GSS_S_FAILURE;
 	}
 
-<<<<<<< HEAD
-	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_NOFS);
-=======
 	checksumdata = kmalloc(GSS_KRB5_MAX_CKSUM_LEN, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
 	if (!checksumdata)
 		return GSS_S_FAILURE;
 
@@ -696,11 +684,7 @@ gss_krb5_cts_crypt(struct crypto_skciphe
 		WARN_ON(0);
 		return -ENOMEM;
 	}
-<<<<<<< HEAD
-	data = kmalloc(GSS_KRB5_MAX_BLOCKSIZE * 2, GFP_NOFS);
-=======
 	data = kmalloc(GSS_KRB5_MAX_BLOCKSIZE * 2, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
 	if (!data)
 		return -ENOMEM;
 
diff -puN net/sunrpc/xprtrdma/svc_rdma_backchannel.c~linux-next-git-rejects net/sunrpc/xprtrdma/svc_rdma_backchannel.c
--- a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c~linux-next-git-rejects
+++ a/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
@@ -182,16 +182,7 @@ xprt_rdma_bc_allocate(struct rpc_task *t
 	if (!page)
 		return -ENOMEM;
 	rqst->rq_buffer = page_address(page);
-<<<<<<< HEAD
-
-	rqst->rq_rbuffer = kmalloc(rqst->rq_rcvsize, RPCRDMA_DEF_GFP);
-	if (!rqst->rq_rbuffer) {
-		put_page(page);
-		return -ENOMEM;
-	}
-=======
 	rqst->rq_rbuffer = (char *)rqst->rq_buffer + rqst->rq_callsize;
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
scripts-checkpatchpl-fix-spelling.patch
debug-more-properly-delay-for-secondary-cpus-fix.patch
ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-10-24 19:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-10-24 19:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/gpu/drm/vmwgfx/vmwgfx_resource.c~linux-next-git-rejects drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -575,11 +575,7 @@ static int vmw_user_dmabuf_synccpu_grab(
 		long lret;
 
 		lret = reservation_object_wait_timeout_rcu(bo->resv, true, true,
-<<<<<<< HEAD
-					nonblock ? 0 : MAX_SCHEDULE_TIMEOUT);
-=======
 							   nonblock ? 0 : MAX_SCHEDULE_TIMEOUT);
->>>>>>> linux-next/akpm-base
 		if (!lret)
 			return -EBUSY;
 		else if (lret < 0)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
mm-page_alloc-use-kern_cont-where-appropriate-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
scripts-checkpatchpl-fix-spelling.patch
powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-10-12 19:07 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-10-12 19:07 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/overlayfs/super.c |    7 -------
 fs/ubifs/dir.c       |    4 ----
 2 files changed, 11 deletions(-)

diff -puN fs/overlayfs/super.c~linux-next-git-rejects fs/overlayfs/super.c
--- a/fs/overlayfs/super.c~linux-next-git-rejects
+++ a/fs/overlayfs/super.c
@@ -274,17 +274,10 @@ static bool ovl_is_opaquedir(struct dent
 	int res;
 	char val;
 
-<<<<<<< HEAD
-	if (!S_ISDIR(inode->i_mode) || !(inode->i_opflags & IOP_XATTR))
-		return false;
-
-	res = __vfs_getxattr(dentry, inode, OVL_XATTR_OPAQUE, &val, 1);
-=======
 	if (!d_is_dir(dentry))
 		return false;
 
 	res = vfs_getxattr(dentry, OVL_XATTR_OPAQUE, &val, 1);
->>>>>>> linux-next/akpm-base
 	if (res == 1 && val == 'y')
 		return true;
 
diff -puN fs/ubifs/dir.c~linux-next-git-rejects fs/ubifs/dir.c
--- a/fs/ubifs/dir.c~linux-next-git-rejects
+++ a/fs/ubifs/dir.c
@@ -1387,11 +1387,7 @@ const struct inode_operations ubifs_dir_
 	.mkdir       = ubifs_mkdir,
 	.rmdir       = ubifs_rmdir,
 	.mknod       = ubifs_mknod,
-<<<<<<< HEAD
-	.rename     = ubifs_rename,
-=======
 	.rename     = ubifs_rename2,
->>>>>>> linux-next/akpm-base
 	.setattr     = ubifs_setattr,
 	.getattr     = ubifs_getattr,
 	.listxattr   = ubifs_listxattr,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-mlx5-deviceh-kill-build_bug_ons.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
b.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-10-10 22:41 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-10-10 22:41 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/conf.py                            |    3 
 Documentation/gpu/index.rst                      |    3 
 Documentation/media/conf_nitpick.py              |   57 -------------
 Documentation/media/index.rst                    |    3 
 Documentation/media/uapi/cec/cec-ioc-dqevent.rst |    5 -
 Documentation/sphinx-static/theme_overrides.css  |    4 
 drivers/char/tpm/tpm-interface.c                 |    6 -
 drivers/char/tpm/tpm_crb.c                       |    3 
 drivers/staging/octeon/ethernet-mdio.c           |    3 
 fs/afs/main.c                                    |    3 
 include/linux/raid/pq.h                          |    3 
 include/linux/sysctl.h                           |    5 -
 include/net/netfilter/nf_tables_ipv4.h           |    4 
 net/netfilter/core.c                             |   28 ------
 net/netfilter/xt_hashlimit.c                     |   14 ---
 15 files changed, 144 deletions(-)

diff -puN Documentation/conf.py~linux-next-git-rejects Documentation/conf.py
--- a/Documentation/conf.py~linux-next-git-rejects
+++ a/Documentation/conf.py
@@ -341,11 +341,8 @@ latex_documents = [
     ('development-process/index', 'development-process.tex', 'Linux Kernel Development Documentation',
      'The kernel development community', 'manual'),
     ('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',
-<<<<<<< HEAD
-=======
      'The kernel development community', 'manual'),
     ('media/index', 'media.tex', 'Linux Media Subsystem Documentation',
->>>>>>> linux-next/akpm-base
      'The kernel development community', 'manual'),
 ]
 
diff -puN Documentation/gpu/index.rst~linux-next-git-rejects Documentation/gpu/index.rst
--- a/Documentation/gpu/index.rst~linux-next-git-rejects
+++ a/Documentation/gpu/index.rst
@@ -12,10 +12,7 @@ Linux GPU Driver Developer's Guide
    drm-uapi
    i915
    vga-switcheroo
-<<<<<<< HEAD
-=======
    vgaarbiter
->>>>>>> linux-next/akpm-base
 
 .. only::  subproject
 
diff -puN Documentation/media/conf_nitpick.py~linux-next-git-rejects Documentation/media/conf_nitpick.py
--- a/Documentation/media/conf_nitpick.py~linux-next-git-rejects
+++ a/Documentation/media/conf_nitpick.py
@@ -21,12 +21,6 @@ nitpick_ignore = [
     ("c:func", "clock_gettime"),
     ("c:func", "close"),
     ("c:func", "container_of"),
-<<<<<<< HEAD
-    ("c:func", "determine_valid_ioctls"),
-    ("c:func", "ERR_PTR"),
-    ("c:func", "ioctl"),
-    ("c:func", "IS_ERR"),
-=======
     ("c:func", "copy_from_user"),
     ("c:func", "copy_to_user"),
     ("c:func", "determine_valid_ioctls"),
@@ -35,7 +29,6 @@ nitpick_ignore = [
     ("c:func", "ioctl"),
     ("c:func", "IS_ERR"),
     ("c:func", "KERNEL_VERSION"),
->>>>>>> linux-next/akpm-base
     ("c:func", "mmap"),
     ("c:func", "open"),
     ("c:func", "pci_name"),
@@ -47,11 +40,6 @@ nitpick_ignore = [
     ("c:func", "struct fd_set"),
     ("c:func", "struct pollfd"),
     ("c:func", "usb_make_path"),
-<<<<<<< HEAD
-    ("c:func", "write"),
-    ("c:type", "atomic_t"),
-    ("c:type", "bool"),
-=======
     ("c:func", "wait_finish"),
     ("c:func", "wait_prepare"),
     ("c:func", "write"),
@@ -59,35 +47,24 @@ nitpick_ignore = [
     ("c:type", "atomic_t"),
     ("c:type", "bool"),
     ("c:type", "boolean"),
->>>>>>> linux-next/akpm-base
     ("c:type", "buf_queue"),
     ("c:type", "device"),
     ("c:type", "device_driver"),
     ("c:type", "device_node"),
     ("c:type", "enum"),
-<<<<<<< HEAD
-=======
     ("c:type", "fd"),
     ("c:type", "fd_set"),
->>>>>>> linux-next/akpm-base
     ("c:type", "file"),
     ("c:type", "i2c_adapter"),
     ("c:type", "i2c_board_info"),
     ("c:type", "i2c_client"),
-<<<<<<< HEAD
-=======
     ("c:type", "int16_t"),
->>>>>>> linux-next/akpm-base
     ("c:type", "ktime_t"),
     ("c:type", "led_classdev_flash"),
     ("c:type", "list_head"),
     ("c:type", "lock_class_key"),
     ("c:type", "module"),
     ("c:type", "mutex"),
-<<<<<<< HEAD
-    ("c:type", "pci_dev"),
-    ("c:type", "pdvbdev"),
-=======
     ("c:type", "NULL"),
     ("c:type", "off_t"),
     ("c:type", "pci_dev"),
@@ -95,43 +72,10 @@ nitpick_ignore = [
     ("c:type", "poll_table"),
     ("c:type", "platform_device"),
     ("c:type", "pollfd"),
->>>>>>> linux-next/akpm-base
     ("c:type", "poll_table_struct"),
     ("c:type", "s32"),
     ("c:type", "s64"),
     ("c:type", "sd"),
-<<<<<<< HEAD
-    ("c:type", "spi_board_info"),
-    ("c:type", "spi_device"),
-    ("c:type", "spi_master"),
-    ("c:type", "struct fb_fix_screeninfo"),
-    ("c:type", "struct pollfd"),
-    ("c:type", "struct timeval"),
-    ("c:type", "struct video_capability"),
-    ("c:type", "u16"),
-    ("c:type", "u32"),
-    ("c:type", "u64"),
-    ("c:type", "u8"),
-    ("c:type", "union"),
-    ("c:type", "usb_device"),
-
-    ("cpp:type", "boolean"),
-    ("cpp:type", "fd"),
-    ("cpp:type", "fd_set"),
-    ("cpp:type", "int16_t"),
-    ("cpp:type", "NULL"),
-    ("cpp:type", "off_t"),
-    ("cpp:type", "pollfd"),
-    ("cpp:type", "size_t"),
-    ("cpp:type", "ssize_t"),
-    ("cpp:type", "timeval"),
-    ("cpp:type", "__u16"),
-    ("cpp:type", "__u32"),
-    ("cpp:type", "__u64"),
-    ("cpp:type", "uint16_t"),
-    ("cpp:type", "uint32_t"),
-    ("cpp:type", "video_system_t"),
-=======
     ("c:type", "size_t"),
     ("c:type", "spi_board_info"),
     ("c:type", "spi_device"),
@@ -162,5 +106,4 @@ nitpick_ignore = [
     # Opaque structures
 
     ("c:type", "v4l2_m2m_dev"),
->>>>>>> linux-next/akpm-base
 ]
diff -puN Documentation/media/index.rst~linux-next-git-rejects Documentation/media/index.rst
--- a/Documentation/media/index.rst~linux-next-git-rejects
+++ a/Documentation/media/index.rst
@@ -1,14 +1,11 @@
 Linux Media Subsystem Documentation
 ===================================
 
-<<<<<<< HEAD
-=======
 .. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks
 .. raw:: latex
 
 	\renewcommand*{\DUrole}[2]{ #2 }
 
->>>>>>> linux-next/akpm-base
 Contents:
 
 .. toctree::
diff -puN Documentation/media/uapi/cec/cec-ioc-dqevent.rst~linux-next-git-rejects Documentation/media/uapi/cec/cec-ioc-dqevent.rst
--- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst~linux-next-git-rejects
+++ a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
@@ -15,13 +15,8 @@ CEC_DQEVENT - Dequeue a CEC event
 Synopsis
 ========
 
-<<<<<<< HEAD
-.. c:function:: int ioctl( int fd, int request, struct cec_event *argp )
-   :name: CEC_DQEVENT
-=======
 .. c:function:: int ioctl( int fd, CEC_DQEVENT, struct cec_event *argp )
     :name: CEC_DQEVENT
->>>>>>> linux-next/akpm-base
 
 Arguments
 =========
diff -puN Documentation/sphinx-static/theme_overrides.css~linux-next-git-rejects Documentation/sphinx-static/theme_overrides.css
--- a/Documentation/sphinx-static/theme_overrides.css~linux-next-git-rejects
+++ a/Documentation/sphinx-static/theme_overrides.css
@@ -56,11 +56,7 @@
 	font-family: "Courier New", Courier, monospace
     }
 
-<<<<<<< HEAD
-    /* inline literal: drop the borderbox, padding and red color */
-=======
     /* inline literal: drop the borderbox and red color */
->>>>>>> linux-next/akpm-base
 
     code, .rst-content tt, .rst-content code {
         color: inherit;
diff -puN drivers/char/tpm/tpm-interface.c~linux-next-git-rejects drivers/char/tpm/tpm-interface.c
--- a/drivers/char/tpm/tpm-interface.c~linux-next-git-rejects
+++ a/drivers/char/tpm/tpm-interface.c
@@ -356,11 +356,8 @@ ssize_t tpm_transmit(struct tpm_chip *ch
 
 	if (!(flags & TPM_TRANSMIT_UNLOCKED))
 		mutex_lock(&chip->tpm_mutex);
-<<<<<<< HEAD
-=======
 
 	pm_runtime_get_sync(chip->dev.parent);
->>>>>>> linux-next/akpm-base
 
 	rc = chip->ops->send(chip, (u8 *) buf, count);
 	if (rc < 0) {
@@ -403,11 +400,8 @@ out_recv:
 		dev_err(&chip->dev,
 			"tpm_transmit: tpm_recv: error %zd\n", rc);
 out:
-<<<<<<< HEAD
-=======
 	pm_runtime_put_sync(chip->dev.parent);
 
->>>>>>> linux-next/akpm-base
 	if (!(flags & TPM_TRANSMIT_UNLOCKED))
 		mutex_unlock(&chip->tpm_mutex);
 	return rc;
diff -puN drivers/char/tpm/tpm_crb.c~linux-next-git-rejects drivers/char/tpm/tpm_crb.c
--- a/drivers/char/tpm/tpm_crb.c~linux-next-git-rejects
+++ a/drivers/char/tpm/tpm_crb.c
@@ -19,10 +19,7 @@
 #include <linux/highmem.h>
 #include <linux/rculist.h>
 #include <linux/module.h>
-<<<<<<< HEAD
-=======
 #include <linux/pm_runtime.h>
->>>>>>> linux-next/akpm-base
 #include "tpm.h"
 
 #define ACPI_SIG_TPM2 "TPM2"
diff -puN drivers/staging/octeon/ethernet-mdio.c~linux-next-git-rejects drivers/staging/octeon/ethernet-mdio.c
--- a/drivers/staging/octeon/ethernet-mdio.c~linux-next-git-rejects
+++ a/drivers/staging/octeon/ethernet-mdio.c
@@ -168,10 +168,7 @@ int cvm_oct_phy_setup_device(struct net_
 
 	phydev = of_phy_connect(dev, phy_node, cvm_oct_adjust_link, 0,
 				PHY_INTERFACE_MODE_GMII);
-<<<<<<< HEAD
-=======
 	of_node_put(phy_node);
->>>>>>> linux-next/akpm-base
 
 	if (!phydev)
 		return -ENODEV;
diff -puN fs/afs/main.c~linux-next-git-rejects fs/afs/main.c
--- a/fs/afs/main.c~linux-next-git-rejects
+++ a/fs/afs/main.c
@@ -15,10 +15,7 @@
 #include <linux/completion.h>
 #include <linux/sched.h>
 #include <linux/random.h>
-<<<<<<< HEAD
-=======
 #include <linux/ktime.h>
->>>>>>> linux-next/akpm-base
 #include "internal.h"
 
 MODULE_DESCRIPTION("AFS Client File System");
diff -puN include/linux/raid/pq.h~linux-next-git-rejects include/linux/raid/pq.h
--- a/include/linux/raid/pq.h~linux-next-git-rejects
+++ a/include/linux/raid/pq.h
@@ -119,10 +119,7 @@ struct raid6_recov_calls {
 extern const struct raid6_recov_calls raid6_recov_intx1;
 extern const struct raid6_recov_calls raid6_recov_ssse3;
 extern const struct raid6_recov_calls raid6_recov_avx2;
-<<<<<<< HEAD
-=======
 extern const struct raid6_recov_calls raid6_recov_avx512;
->>>>>>> linux-next/akpm-base
 extern const struct raid6_recov_calls raid6_recov_s390xc;
 
 extern const struct raid6_calls raid6_neonx1;
diff -puN include/linux/sysctl.h~linux-next-git-rejects include/linux/sysctl.h
--- a/include/linux/sysctl.h~linux-next-git-rejects
+++ a/include/linux/sysctl.h
@@ -158,12 +158,7 @@ struct ctl_table_set {
 
 struct ctl_table_root {
 	struct ctl_table_set default_set;
-<<<<<<< HEAD
-	struct ctl_table_set *(*lookup)(struct ctl_table_root *root,
-					   struct nsproxy *namespaces);
-=======
 	struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
->>>>>>> linux-next/akpm-base
 	void (*set_ownership)(struct ctl_table_header *head,
 			      struct ctl_table *table,
 			      kuid_t *uid, kgid_t *gid);
diff -puN include/net/netfilter/nf_tables_ipv4.h~linux-next-git-rejects include/net/netfilter/nf_tables_ipv4.h
--- a/include/net/netfilter/nf_tables_ipv4.h~linux-next-git-rejects
+++ a/include/net/netfilter/nf_tables_ipv4.h
@@ -33,10 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct n
 	if (!iph)
 		return -1;
 
-<<<<<<< HEAD
-	iph = ip_hdr(skb);
-=======
->>>>>>> linux-next/akpm-base
 	if (iph->ihl < 5 || iph->version != 4)
 		return -1;
 
diff -puN net/netfilter/core.c~linux-next-git-rejects net/netfilter/core.c
--- a/net/netfilter/core.c~linux-next-git-rejects
+++ a/net/netfilter/core.c
@@ -90,18 +90,12 @@ static void nf_set_hooks_head(struct net
 {
 	switch (reg->pf) {
 	case NFPROTO_NETDEV:
-<<<<<<< HEAD
-=======
 #ifdef CONFIG_NETFILTER_INGRESS
->>>>>>> linux-next/akpm-base
 		/* We already checked in nf_register_net_hook() that this is
 		 * used from ingress.
 		 */
 		rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
-<<<<<<< HEAD
-=======
 #endif
->>>>>>> linux-next/akpm-base
 		break;
 	default:
 		rcu_assign_pointer(net->nf.hooks[reg->pf][reg->hooknum],
@@ -115,12 +109,6 @@ int nf_register_net_hook(struct net *net
 	struct nf_hook_entry *hooks_entry;
 	struct nf_hook_entry *entry;
 
-<<<<<<< HEAD
-	if (reg->pf == NFPROTO_NETDEV &&
-	    (reg->hooknum != NF_NETDEV_INGRESS ||
-	     !reg->dev || dev_net(reg->dev) != net))
-		return -EINVAL;
-=======
 	if (reg->pf == NFPROTO_NETDEV) {
 #ifndef CONFIG_NETFILTER_INGRESS
 		if (reg->hooknum == NF_NETDEV_INGRESS)
@@ -130,7 +118,6 @@ int nf_register_net_hook(struct net *net
 		    !reg->dev || dev_net(reg->dev) != net)
 			return -EINVAL;
 	}
->>>>>>> linux-next/akpm-base
 
 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
 	if (!entry)
@@ -153,17 +140,6 @@ int nf_register_net_hook(struct net *net
 		reg->priority >= hooks_entry->orig_ops->priority &&
 		nf_entry_dereference(hooks_entry->next)) {
 		hooks_entry = nf_entry_dereference(hooks_entry->next);
-<<<<<<< HEAD
-	}
-
-	if (hooks_entry) {
-		entry->next = nf_entry_dereference(hooks_entry->next);
-		rcu_assign_pointer(hooks_entry->next, entry);
-	} else {
-		nf_set_hooks_head(net, reg, entry);
-	}
-
-=======
 	}
 
 	if (hooks_entry) {
@@ -173,7 +149,6 @@ int nf_register_net_hook(struct net *net
 		nf_set_hooks_head(net, reg, entry);
 	}
 
->>>>>>> linux-next/akpm-base
 	mutex_unlock(&nf_hook_mutex);
 #ifdef CONFIG_NETFILTER_INGRESS
 	if (reg->pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS)
@@ -192,11 +167,8 @@ void nf_unregister_net_hook(struct net *
 
 	mutex_lock(&nf_hook_mutex);
 	hooks_entry = nf_hook_entry_head(net, reg);
-<<<<<<< HEAD
-	if (hooks_entry->orig_ops == reg) {
 =======
 	if (hooks_entry && hooks_entry->orig_ops == reg) {
->>>>>>> linux-next/akpm-base
 		nf_set_hooks_head(net, reg,
 				  nf_entry_dereference(hooks_entry->next));
 		goto unlock;
diff -puN net/netfilter/xt_hashlimit.c~linux-next-git-rejects net/netfilter/xt_hashlimit.c
--- a/net/netfilter/xt_hashlimit.c~linux-next-git-rejects
+++ a/net/netfilter/xt_hashlimit.c
@@ -467,19 +467,6 @@ static u64 user2credits(u64 user, int re
 		/* If multiplying would overflow... */
 		if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY_v1))
 			/* Divide first. */
-<<<<<<< HEAD
-			return (user / XT_HASHLIMIT_SCALE) *\
-						HZ * CREDITS_PER_JIFFY_v1;
-
-		return (user * HZ * CREDITS_PER_JIFFY_v1) \
-						/ XT_HASHLIMIT_SCALE;
-	} else {
-		if (user > 0xFFFFFFFFFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
-			return (user / XT_HASHLIMIT_SCALE_v2) *\
-						HZ * CREDITS_PER_JIFFY;
-
-		return (user * HZ * CREDITS_PER_JIFFY) / XT_HASHLIMIT_SCALE_v2;
-=======
 			return div64_u64(user, XT_HASHLIMIT_SCALE)
 				* HZ * CREDITS_PER_JIFFY_v1;
 
@@ -492,7 +479,6 @@ static u64 user2credits(u64 user, int re
 
 		return div64_u64(user * HZ * CREDITS_PER_JIFFY,
 				 XT_HASHLIMIT_SCALE_v2);
->>>>>>> linux-next/akpm-base
 	}
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
lib-bitmapc-enhance-bitmap-syntax-fix.patch
relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-checkpatch-fixes.patch
ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-mlx5-deviceh-kill-build_bug_ons.patch
hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix.patch
fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-09-13 20:33 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-09-13 20:33 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/cavium/thunder/nic_main.c           |    3 -
 drivers/net/ethernet/mediatek/mtk_eth_soc.c              |   19 ----------
 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c |    3 -
 drivers/net/ethernet/qlogic/qed/qed_dcbx.c               |   10 -----
 drivers/net/phy/Kconfig                                  |    9 ----
 5 files changed, 44 deletions(-)

diff -puN drivers/net/ethernet/cavium/thunder/nic_main.c~linux-next-git-rejects drivers/net/ethernet/cavium/thunder/nic_main.c
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -290,8 +290,6 @@ static void nic_set_tx_pkt_pad(struct ni
 	 */
 	if (size > 52)
 		size = 52;
-<<<<<<< HEAD
-=======
 
 	pci_read_config_word(nic->pdev, PCI_SUBSYSTEM_ID, &sdevid);
 	/* 81xx's RGX has only one LMAC */
@@ -299,7 +297,6 @@ static void nic_set_tx_pkt_pad(struct ni
 		max_lmac = ((nic->hw->bgx_cnt - 1) * MAX_LMAC_PER_BGX) + 1;
 	else
 		max_lmac = nic->hw->bgx_cnt * MAX_LMAC_PER_BGX;
->>>>>>> linux-next/akpm-base
 
 	for (lmac = 0; lmac < max_lmac; lmac++) {
 		lmac_cfg = nic_reg_read(nic, NIC_PF_LMAC_0_7_CFG | (lmac << 3));
diff -puN drivers/net/ethernet/mediatek/mtk_eth_soc.c~linux-next-git-rejects drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1512,12 +1512,8 @@ static void mtk_uninit(struct net_device
 	struct mtk_eth *eth = mac->hw;
 
 	phy_disconnect(mac->phy_dev);
-<<<<<<< HEAD
-	mtk_irq_disable(eth, ~0);
-=======
 	mtk_irq_disable(eth, MTK_QDMA_INT_MASK, ~0);
 	mtk_irq_disable(eth, MTK_PDMA_INT_MASK, ~0);
->>>>>>> linux-next/akpm-base
 }
 
 static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -1913,7 +1909,6 @@ static int mtk_remove(struct platform_de
 {
 	struct mtk_eth *eth = platform_get_drvdata(pdev);
 	int i;
-<<<<<<< HEAD
 
 	/* stop all devices to make sure that dma is properly shut down */
 	for (i = 0; i < MTK_MAC_COUNT; i++) {
@@ -1922,16 +1917,6 @@ static int mtk_remove(struct platform_de
 		mtk_stop(eth->netdev[i]);
 	}
 
-=======
-
-	/* stop all devices to make sure that dma is properly shut down */
-	for (i = 0; i < MTK_MAC_COUNT; i++) {
-		if (!eth->netdev[i])
-			continue;
-		mtk_stop(eth->netdev[i]);
-	}
-
->>>>>>> linux-next/akpm-base
 	clk_disable_unprepare(eth->clks[MTK_CLK_ETHIF]);
 	clk_disable_unprepare(eth->clks[MTK_CLK_ESW]);
 	clk_disable_unprepare(eth->clks[MTK_CLK_GP1]);
@@ -1941,10 +1926,6 @@ static int mtk_remove(struct platform_de
 	netif_napi_del(&eth->rx_napi);
 	mtk_cleanup(eth);
 	mtk_mdio_cleanup(eth);
-<<<<<<< HEAD
-	platform_set_drvdata(pdev, NULL);
-=======
->>>>>>> linux-next/akpm-base
 
 	return 0;
 }
diff -puN drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -252,8 +252,6 @@ int mlxsw_sp_vport_flood_set(struct mlxs
 	 */
 	vfid = mlxsw_sp_fid_to_vfid(fid);
 	return __mlxsw_sp_port_flood_set(mlxsw_sp_vport, vfid, vfid, set, set);
-<<<<<<< HEAD
-=======
 }
 
 static int mlxsw_sp_port_learning_set(struct mlxsw_sp_port *mlxsw_sp_port,
@@ -282,7 +280,6 @@ err_port_vid_learning_set:
 	for_each_set_bit(vid, mlxsw_sp_port->active_vlans, VLAN_N_VID)
 		__mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, vid, !set);
 	return err;
->>>>>>> linux-next/akpm-base
 }
 
 static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port,
diff -puN drivers/net/ethernet/qlogic/qed/qed_dcbx.c~linux-next-git-rejects drivers/net/ethernet/qlogic/qed/qed_dcbx.c
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -1187,12 +1187,7 @@ int qed_dcbx_get_config_params(struct qe
 	}
 
 	dcbx_info = kzalloc(sizeof(*dcbx_info), GFP_KERNEL);
-<<<<<<< HEAD
-	if (!dcbx_info) {
-		DP_ERR(p_hwfn, "Failed to allocate struct qed_dcbx_info\n");
-=======
 	if (!dcbx_info)
->>>>>>> linux-next/akpm-base
 		return -ENOMEM;
 
 	rc = qed_dcbx_query_params(p_hwfn, dcbx_info, QED_DCBX_OPERATIONAL_MIB);
@@ -1227,12 +1222,7 @@ static struct qed_dcbx_get *qed_dcbnl_ge
 	struct qed_dcbx_get *dcbx_info;
 
 	dcbx_info = kzalloc(sizeof(*dcbx_info), GFP_KERNEL);
-<<<<<<< HEAD
-	if (!dcbx_info) {
-		DP_ERR(hwfn->cdev, "Failed to allocate memory for dcbx_info\n");
-=======
 	if (!dcbx_info)
->>>>>>> linux-next/akpm-base
 		return NULL;
 
 	if (qed_dcbx_query_params(hwfn, dcbx_info, type)) {
diff -puN drivers/net/phy/Kconfig~linux-next-git-rejects drivers/net/phy/Kconfig
--- a/drivers/net/phy/Kconfig~linux-next-git-rejects
+++ a/drivers/net/phy/Kconfig
@@ -309,14 +309,6 @@ config TERANETICS_PHY
         ---help---
           Currently supports the Teranetics TN2020
 
-<<<<<<< HEAD
-config MDIO_XGENE
-	tristate "APM X-Gene SoC MDIO bus controller"
-	depends on ARCH_XGENE || COMPILE_TEST
-	help
-	  This module provides a driver for the MDIO busses found in the
-	  APM X-Gene SoC's.
-=======
 config VITESSE_PHY
         tristate "Vitesse PHYs"
         ---help---
@@ -328,7 +320,6 @@ config XILINX_GMII2RGMII
          This driver support xilinx GMII to RGMII IP core it provides
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
->>>>>>> linux-next/akpm-base
 
 endif # PHYLIB
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
drivers-rapidio-rio_cmc-avoid-gfp_kernel-in-atomic-context.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-vmalloc-fix-align-value-calculation-error-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
mm-page_ioc-replace-some-bug_ons-with-vm_bug_on_page.patch
fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix.patch
seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-checkpatch-fixes.patch
ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-mlx5-deviceh-kill-build_bug_ons.patch
hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-09-06 17:58 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-09-06 17:58 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_drv.h                  |    3 -
 drivers/infiniband/hw/mlx4/cq.c                   |   17 ----------
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c   |    5 ---
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c |   19 +-----------
 sound/soc/generic/Makefile                        |    3 -
 sound/soc/generic/simple-card-utils.c             |    6 ---
 sound/soc/omap/omap-abe-twl6040.c                 |   18 -----------
 7 files changed, 2 insertions(+), 69 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_drv.h~linux-next-git-rejects drivers/gpu/drm/i915/intel_drv.h
--- a/drivers/gpu/drm/i915/intel_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_drv.h
@@ -1745,14 +1745,11 @@ void skl_ddb_get_hw_state(struct drm_i91
 bool skl_can_enable_sagv(struct drm_atomic_state *state);
 int skl_enable_sagv(struct drm_i915_private *dev_priv);
 int skl_disable_sagv(struct drm_i915_private *dev_priv);
-<<<<<<< HEAD
-=======
 void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
 			 const struct skl_wm_values *wm);
 void skl_write_plane_wm(struct intel_crtc *intel_crtc,
 			const struct skl_wm_values *wm,
 			int plane);
->>>>>>> linux-next/akpm-base
 uint32_t ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config);
 bool ilk_disable_lp_wm(struct drm_device *dev);
 int sanitize_rc6_option(struct drm_i915_private *dev_priv, int enable_rc6);
diff -puN drivers/infiniband/hw/mlx4/cq.c~linux-next-git-rejects drivers/infiniband/hw/mlx4/cq.c
--- a/drivers/infiniband/hw/mlx4/cq.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx4/cq.c
@@ -576,14 +576,9 @@ static int mlx4_ib_ipoib_csum_ok(__be16
 		checksum == cpu_to_be16(0xffff);
 }
 
-<<<<<<< HEAD
-static void use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc,
-			    unsigned tail, struct mlx4_cqe *cqe, int is_eth)
-=======
 static void use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq,
 			    struct ib_wc *wc, unsigned tail,
 			    struct mlx4_cqe *cqe, int is_eth)
->>>>>>> linux-next/akpm-base
 {
 	struct mlx4_ib_proxy_sqp_hdr *hdr;
 
@@ -696,11 +691,7 @@ repoll:
 	if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) == MLX4_OPCODE_NOP &&
 		     is_send)) {
 		pr_warn("Completion for NOP opcode detected!\n");
-<<<<<<< HEAD
-		return -EAGAIN;
-=======
 		goto out;
->>>>>>> linux-next/akpm-base
 	}
 
 	/* Resize CQ in progress */
@@ -731,11 +722,7 @@ repoll:
 		if (unlikely(!mqp)) {
 			pr_warn("CQ %06x with entry for unknown QPN %06x\n",
 			       cq->mcq.cqn, be32_to_cpu(cqe->vlan_my_qpn) & MLX4_CQE_QPN_MASK);
-<<<<<<< HEAD
-			return -EAGAIN;
-=======
 			goto out;
->>>>>>> linux-next/akpm-base
 		}
 
 		*cur_qp = to_mibqp(mqp);
@@ -753,11 +740,7 @@ repoll:
 		if (unlikely(!msrq)) {
 			pr_warn("CQ %06x with entry for unknown SRQN %06x\n",
 				cq->mcq.cqn, srq_num);
-<<<<<<< HEAD
-			return -EAGAIN;
-=======
 			goto out;
->>>>>>> linux-next/akpm-base
 		}
 	}
 
diff -puN drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c~linux-next-git-rejects drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4476,17 +4476,12 @@ static void cfg_queues(struct adapter *a
 
 	/* Reduce memory usage in kdump environment, disable all offload.
 	 */
-<<<<<<< HEAD
-	if (is_kdump_kernel())
-		adap->params.offload = 0;
-=======
 	if (is_kdump_kernel()) {
 		adap->params.offload = 0;
 		adap->params.crypto = 0;
 	} else if (adap->num_uld && uld_mem_alloc(adap)) {
 		adap->params.crypto = 0;
 	}
->>>>>>> linux-next/akpm-base
 
 	for_each_port(adap, i)
 		n10g += is_x_10g_port(&adap2pinfo(adap, i)->link_cfg);
diff -puN drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en_main.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3209,19 +3209,13 @@ static void mlx5e_destroy_q_counter(stru
 
 static int mlx5e_create_umr_mkey(struct mlx5e_priv *priv)
 {
+#if 0
 	struct mlx5_core_dev *mdev = priv->mdev;
-<<<<<<< HEAD
 	struct mlx5_create_mkey_mbox_in *in;
 	struct mlx5_mkey_seg *mkc;
 	int inlen = sizeof(*in);
 	u64 npages = MLX5E_REQUIRED_MTTS(priv->profile->max_nch(mdev),
 					 BIT(MLX5E_PARAMS_MAXIMUM_LOG_RQ_SIZE_MPW));
-=======
-	u64 npages = priv->profile->max_nch(mdev) * MLX5_CHANNEL_MAX_NUM_MTTS;
-	int inlen = MLX5_ST_SZ_BYTES(create_mkey_in);
-	void *mkc;
-	u32 *in;
->>>>>>> linux-next/akpm-base
 	int err;
 
 	in = mlx5_vzalloc(inlen);
@@ -3230,21 +3224,11 @@ static int mlx5e_create_umr_mkey(struct
 
 	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
 
-<<<<<<< HEAD
-	npages = min_t(u32, ALIGN(U16_MAX, 4) * 2, npages);
-
-	mkc->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
-	mkc->flags_pd = cpu_to_be32(mdev->mlx5e_res.pdn);
-	mkc->len = cpu_to_be64(npages << PAGE_SHIFT);
-	mkc->xlt_oct_size = cpu_to_be32(MLX5_MTT_OCTW(npages));
-	mkc->log2_page_size = PAGE_SHIFT;
-=======
 	MLX5_SET(mkc, mkc, free, 1);
 	MLX5_SET(mkc, mkc, umr_en, 1);
 	MLX5_SET(mkc, mkc, lw, 1);
 	MLX5_SET(mkc, mkc, lr, 1);
 	MLX5_SET(mkc, mkc, access_mode, MLX5_MKC_ACCESS_MODE_MTT);
->>>>>>> linux-next/akpm-base
 
 	MLX5_SET(mkc, mkc, qpn, 0xffffff);
 	MLX5_SET(mkc, mkc, pd, mdev->mlx5e_res.pdn);
@@ -3257,6 +3241,7 @@ static int mlx5e_create_umr_mkey(struct
 
 	kvfree(in);
 	return err;
+#endif
 }
 
 static void mlx5e_nic_init(struct mlx5_core_dev *mdev,
diff -puN sound/soc/generic/Makefile~linux-next-git-rejects sound/soc/generic/Makefile
--- a/sound/soc/generic/Makefile~linux-next-git-rejects
+++ a/sound/soc/generic/Makefile
@@ -4,7 +4,4 @@ snd-soc-simple-scu-card-objs	:= simple-s
 
 obj-$(CONFIG_SND_SIMPLE_CARD_UTILS)	+= snd-soc-simple-card-utils.o
 obj-$(CONFIG_SND_SIMPLE_CARD)		+= snd-soc-simple-card.o
-<<<<<<< HEAD
-=======
 obj-$(CONFIG_SND_SIMPLE_SCU_CARD)	+= snd-soc-simple-scu-card.o
->>>>>>> linux-next/akpm-base
diff -puN sound/soc/generic/simple-card-utils.c~linux-next-git-rejects sound/soc/generic/simple-card-utils.c
--- a/sound/soc/generic/simple-card-utils.c~linux-next-git-rejects
+++ a/sound/soc/generic/simple-card-utils.c
@@ -7,10 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-<<<<<<< HEAD
-=======
 #include <linux/clk.h>
->>>>>>> linux-next/akpm-base
 #include <linux/module.h>
 #include <linux/of.h>
 #include <sound/simple_card_utils.h>
@@ -101,8 +98,6 @@ int asoc_simple_card_parse_card_name(str
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);
 
-<<<<<<< HEAD
-=======
 int asoc_simple_card_parse_clk(struct device_node *node,
 			       struct device_node *dai_of_node,
 			       struct asoc_simple_dai *simple_dai)
@@ -243,7 +238,6 @@ int asoc_simple_card_clean_reference(str
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_clean_reference);
 
->>>>>>> linux-next/akpm-base
 /* Module information */
 MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
 MODULE_DESCRIPTION("ALSA SoC Simple Card Utils");
diff -puN sound/soc/omap/omap-abe-twl6040.c~linux-next-git-rejects sound/soc/omap/omap-abe-twl6040.c
--- a/sound/soc/omap/omap-abe-twl6040.c~linux-next-git-rejects
+++ a/sound/soc/omap/omap-abe-twl6040.c
@@ -305,32 +305,14 @@ static int omap_abe_probe(struct platfor
 
 	snd_soc_card_set_drvdata(card, priv);
 
-<<<<<<< HEAD
-	ret = snd_soc_register_card(card);
-	if (ret)
-		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
-=======
 	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret)
 		dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
->>>>>>> linux-next/akpm-base
 			ret);
 
 	return ret;
 }
 
-<<<<<<< HEAD
-static int omap_abe_remove(struct platform_device *pdev)
-{
-	struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-	snd_soc_unregister_card(card);
-
-	return 0;
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static const struct of_device_id omap_abe_of_match[] = {
 	{.compatible = "ti,abe-twl6040", },
 	{ },
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-vmalloc-fix-align-value-calculation-error-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
mm-check-that-we-havent-used-more-than-32-bits-in-address_spaceflags.patch
mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-mlx5-deviceh-kill-build_bug_ons.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-08-22 18:37 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-08-22 18:37 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/i915_gem.c  |    5 ---
 drivers/gpu/drm/i915/intel_ddi.c |   45 -----------------------------
 2 files changed, 50 deletions(-)

diff -puN drivers/gpu/drm/i915/i915_gem.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/i915/i915_gem.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem.c
@@ -2469,11 +2469,6 @@ static void i915_gem_reset_engine_cleanu
 		intel_ring_update_space(ring);
 	}
 
-<<<<<<< HEAD
-	intel_ring_init_seqno(engine, engine->last_submitted_seqno);
-
-=======
->>>>>>> linux-next/akpm-base
 	engine->i915->gt.active_engines &= ~intel_engine_flag(engine);
 }
 
diff -puN drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_ddi.c
--- a/drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ddi.c
@@ -420,34 +420,14 @@ void intel_prepare_dp_ddi_buffers(struct
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	u32 iboost_bit = 0;
-<<<<<<< HEAD
-	int i, n_hdmi_entries, n_dp_entries, n_edp_entries,
-	    size;
-	int hdmi_level;
-	enum port port;
-=======
 	int i, n_dp_entries, n_edp_entries, size;
 	enum port port = intel_ddi_get_encoder_port(encoder);
->>>>>>> linux-next/akpm-base
 	const struct ddi_buf_trans *ddi_translations_fdi;
 	const struct ddi_buf_trans *ddi_translations_dp;
 	const struct ddi_buf_trans *ddi_translations_edp;
 	const struct ddi_buf_trans *ddi_translations;
 
-<<<<<<< HEAD
-	port = intel_ddi_get_encoder_port(encoder);
-	hdmi_level = intel_ddi_hdmi_level(dev_priv, port);
-
-	if (IS_BROXTON(dev_priv)) {
-		if (encoder->type != INTEL_OUTPUT_HDMI)
-			return;
-
-		/* Vswing programming for HDMI */
-		bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,
-					INTEL_OUTPUT_HDMI);
-=======
 	if (IS_BROXTON(dev_priv))
->>>>>>> linux-next/akpm-base
 		return;
 
 	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
@@ -456,12 +436,7 @@ void intel_prepare_dp_ddi_buffers(struct
 				skl_get_buf_trans_dp(dev_priv, &n_dp_entries);
 		ddi_translations_edp =
 				skl_get_buf_trans_edp(dev_priv, &n_edp_entries);
-<<<<<<< HEAD
-		ddi_translations_hdmi =
-				skl_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);
-=======
 
->>>>>>> linux-next/akpm-base
 		/* If we're boosting the current, set bit 31 of trans1 */
 		if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
 			iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
@@ -475,19 +450,11 @@ void intel_prepare_dp_ddi_buffers(struct
 		ddi_translations_dp = bdw_ddi_translations_dp;
 		ddi_translations_edp = bdw_get_buf_trans_edp(dev_priv, &n_edp_entries);
 		n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
-<<<<<<< HEAD
-		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
-=======
->>>>>>> linux-next/akpm-base
 	} else if (IS_HASWELL(dev_priv)) {
 		ddi_translations_fdi = hsw_ddi_translations_fdi;
 		ddi_translations_dp = hsw_ddi_translations_dp;
 		ddi_translations_edp = hsw_ddi_translations_dp;
 		n_dp_entries = n_edp_entries = ARRAY_SIZE(hsw_ddi_translations_dp);
-<<<<<<< HEAD
-		n_hdmi_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi);
-=======
->>>>>>> linux-next/akpm-base
 	} else {
 		WARN(1, "ddi translation table missing\n");
 		ddi_translations_edp = bdw_ddi_translations_dp;
@@ -495,10 +462,6 @@ void intel_prepare_dp_ddi_buffers(struct
 		ddi_translations_dp = bdw_ddi_translations_dp;
 		n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
 		n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
-<<<<<<< HEAD
-		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
-=======
->>>>>>> linux-next/akpm-base
 	}
 
 	switch (encoder->type) {
@@ -542,8 +505,6 @@ static void intel_prepare_hdmi_ddi_buffe
 	if (IS_BROXTON(dev_priv))
 		return;
 
-<<<<<<< HEAD
-=======
 	hdmi_level = intel_ddi_hdmi_level(dev_priv, port);
 
 	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
@@ -564,7 +525,6 @@ static void intel_prepare_hdmi_ddi_buffe
 		n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
 	}
 
->>>>>>> linux-next/akpm-base
 	/* Entry 9 is for HDMI: */
 	I915_WRITE(DDI_BUF_TRANS_LO(port, 9),
 		   ddi_translations_hdmi[hdmi_level].trans1 | iboost_bit);
@@ -1689,10 +1649,6 @@ static void intel_ddi_pre_enable(struct
 		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
 		int level = intel_ddi_hdmi_level(dev_priv, port);
 
-<<<<<<< HEAD
-		if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
-			skl_ddi_set_iboost(intel_encoder, level);
-=======
 		intel_prepare_hdmi_ddi_buffers(intel_encoder);
 
 		if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
@@ -1700,7 +1656,6 @@ static void intel_ddi_pre_enable(struct
 		else if (IS_BROXTON(dev_priv))
 			bxt_ddi_vswing_sequence(dev_priv, level, port,
 						INTEL_OUTPUT_HDMI);
->>>>>>> linux-next/akpm-base
 
 		intel_hdmi->set_infoframes(encoder,
 					   crtc->config->has_hdmi_sink,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
sysctl-handle-error-writing-uint_max-to-u32-fields-checkpatch-fixes.patch
sysctl-handle-error-writing-uint_max-to-u32-fields-checkpatch-fixes-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-vmalloc-fix-align-value-calculation-error-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-mlx5-deviceh-kill-build_bug_ons.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-08-16 17:46 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-08-16 17:46 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/thermal/thermal_core.c |   69 -------------------------------
 1 file changed, 69 deletions(-)

diff -puN drivers/thermal/thermal_core.c~linux-next-git-rejects drivers/thermal/thermal_core.c
--- a/drivers/thermal/thermal_core.c~linux-next-git-rejects
+++ a/drivers/thermal/thermal_core.c
@@ -1122,80 +1122,11 @@ static void bind_tz(struct thermal_zone_
 	struct thermal_cooling_device *pos = NULL;
 	const struct thermal_zone_params *tzp = tz->tzp;
 
-<<<<<<< HEAD
-	mutex_lock(&cdev->lock);
-	/* cooling device is updated*/
-	if (cdev->updated) {
-		mutex_unlock(&cdev->lock);
-=======
 	if (!tzp && !tz->ops->bind)
->>>>>>> linux-next/akpm-base
 		return;
 	}
 
-<<<<<<< HEAD
-	/* Make sure cdev enters the deepest cooling state */
-	list_for_each_entry(instance, &cdev->thermal_instances, cdev_node) {
-		dev_dbg(&cdev->device, "zone%d->target=%lu\n",
-				instance->tz->id, instance->target);
-		if (instance->target == THERMAL_NO_TARGET)
-			continue;
-		if (instance->target > target)
-			target = instance->target;
-	}
-	cdev->ops->set_cur_state(cdev, target);
-	cdev->updated = true;
-	mutex_unlock(&cdev->lock);
-	trace_cdev_update(cdev, target);
-	dev_dbg(&cdev->device, "set to state %lu\n", target);
-}
-EXPORT_SYMBOL(thermal_cdev_update);
-
-/**
- * thermal_notify_framework - Sensor drivers use this API to notify framework
- * @tz:		thermal zone device
- * @trip:	indicates which trip point has been crossed
- *
- * This function handles the trip events from sensor drivers. It starts
- * throttling the cooling devices according to the policy configured.
- * For CRITICAL and HOT trip points, this notifies the respective drivers,
- * and does actual throttling for other trip points i.e ACTIVE and PASSIVE.
- * The throttling policy is based on the configured platform data; if no
- * platform data is provided, this uses the step_wise throttling policy.
- */
-void thermal_notify_framework(struct thermal_zone_device *tz, int trip)
-{
-	handle_thermal_trip(tz, trip);
-}
-EXPORT_SYMBOL_GPL(thermal_notify_framework);
-
-/**
- * create_trip_attrs() - create attributes for trip points
- * @tz:		the thermal zone device
- * @mask:	Writeable trip point bitmap.
- *
- * helper function to instantiate sysfs entries for every trip
- * point and its properties of a struct thermal_zone_device.
- *
- * Return: 0 on success, the proper error value otherwise.
- */
-static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
-{
-	int indx;
-	int size = sizeof(struct thermal_attr) * tz->trips;
-
-	tz->trip_type_attrs = kzalloc(size, GFP_KERNEL);
-	if (!tz->trip_type_attrs)
-		return -ENOMEM;
-
-	tz->trip_temp_attrs = kzalloc(size, GFP_KERNEL);
-	if (!tz->trip_temp_attrs) {
-		kfree(tz->trip_type_attrs);
-		return -ENOMEM;
-	}
-=======
 	mutex_lock(&thermal_list_lock);
->>>>>>> linux-next/akpm-base
 
 	/* If there is ops->bind, try to use ops->bind */
 	if (tz->ops->bind) {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-vmalloc-fix-align-value-calculation-error-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-08-11 18:35 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-08-11 18:35 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 scripts/Makefile.gcc-plugins |   16 ----------------
 scripts/gcc-plugins/Makefile |    5 -----
 2 files changed, 21 deletions(-)

diff -puN scripts/Makefile.gcc-plugins~linux-next-git-rejects scripts/Makefile.gcc-plugins
--- a/scripts/Makefile.gcc-plugins~linux-next-git-rejects
+++ a/scripts/Makefile.gcc-plugins
@@ -26,21 +26,6 @@ ifdef CONFIG_GCC_PLUGINS
   endif
 
   GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
-<<<<<<< HEAD
-
-  export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGIN GCC_PLUGIN_SUBDIR SANCOV_PLUGIN
-
-  ifneq ($(PLUGINCC),)
-    # SANCOV_PLUGIN can be only in CFLAGS_KCOV because avoid duplication.
-    GCC_PLUGINS_CFLAGS := $(filter-out $(SANCOV_PLUGIN), $(GCC_PLUGINS_CFLAGS))
-  endif
-
-  KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
-  GCC_PLUGIN := $(gcc-plugin-y)
-  GCC_PLUGIN_SUBDIR := $(gcc-plugin-subdir-y)
-endif
-
-=======
 
   export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGIN GCC_PLUGIN_SUBDIR SANCOV_PLUGIN DISABLE_LATENT_ENTROPY_PLUGIN
 
@@ -54,7 +39,6 @@ endif
   GCC_PLUGIN_SUBDIR := $(gcc-plugin-subdir-y)
 endif
 
->>>>>>> linux-next/akpm-base
 # If plugins aren't supported, abort the build before hard-to-read compiler
 # errors start getting spewed by the main build.
 PHONY += gcc-plugins-check
diff -puN scripts/gcc-plugins/Makefile~linux-next-git-rejects scripts/gcc-plugins/Makefile
--- a/scripts/gcc-plugins/Makefile~linux-next-git-rejects
+++ a/scripts/gcc-plugins/Makefile
@@ -22,11 +22,6 @@ $(HOSTLIBS)-y := $(foreach p,$(GCC_PLUGI
 always := $($(HOSTLIBS)-y)
 $(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o))
 
-<<<<<<< HEAD
-$(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o))

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-08-08 20:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-08-08 20:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/jump_label.c |   11 -----------
 1 file changed, 11 deletions(-)

diff -puN kernel/jump_label.c~linux-next-git-rejects kernel/jump_label.c
--- a/kernel/jump_label.c~linux-next-git-rejects
+++ a/kernel/jump_label.c
@@ -279,19 +279,8 @@ void __init jump_label_init(void)
 	struct static_key *key = NULL;
 	struct jump_entry *iter;
 
-<<<<<<< HEAD
-	/*
-	 * Since we are initializing the static_key.enabled field with
-	 * with the 'raw' int values (to avoid pulling in atomic.h) in
-	 * jump_label.h, let's make sure that is safe. There are only two
-	 * cases to check since we initialize to 0 or 1.
-	 */
-	BUILD_BUG_ON((int)ATOMIC_INIT(0) != 0);
-	BUILD_BUG_ON((int)ATOMIC_INIT(1) != 1);
-=======
 	if (static_key_initialized)
 		return;
->>>>>>> linux-next/akpm-base
 
 	jump_label_lock();
 	jump_label_sort_entries(iter_start, iter_stop);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-07-11 18:10 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-07-11 18:10 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm64/mm/fault.c |    6 ------
 kernel/sched/fair.c   |    4 ----
 2 files changed, 10 deletions(-)

diff -puN arch/arm64/mm/fault.c~linux-next-git-rejects arch/arm64/mm/fault.c
--- a/arch/arm64/mm/fault.c~linux-next-git-rejects
+++ a/arch/arm64/mm/fault.c
@@ -282,14 +282,8 @@ static int __kprobes do_page_fault(unsig
 		mm_flags |= FAULT_FLAG_WRITE;
 	}
 
-<<<<<<< HEAD
-	if (permission_fault(esr) && (addr < USER_DS)) {
-		/* regs->orig_addr_limit may be 0 if we entered from EL0 */
-		if (regs->orig_addr_limit == KERNEL_DS)
-=======
 	if (is_permission_fault(esr) && (addr < USER_DS)) {
 		if (get_fs() == KERNEL_DS)
->>>>>>> linux-next/akpm-base
 			die("Accessing user space memory with fs=KERNEL_DS", regs, esr);
 
 		if (!search_exception_tables(regs->pc))
diff -puN kernel/sched/fair.c~linux-next-git-rejects kernel/sched/fair.c
--- a/kernel/sched/fair.c~linux-next-git-rejects
+++ a/kernel/sched/fair.c
@@ -765,11 +765,7 @@ void post_init_entity_util_avg(struct sc
 		update_tg_load_avg(cfs_rq, false);
 }
 
-<<<<<<< HEAD
-#else
-=======
 #else /* !CONFIG_SMP */
->>>>>>> linux-next/akpm-base
 void init_entity_runnable_average(struct sched_entity *se)
 {
 }
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-improve-recovery-performance-v2-fix.patch
mm.patch
mm-reorganize-slab-freelist-randomization-fix.patch
mm-balloon-use-general-non-lru-movable-page-feature-fix.patch
mm-compaction-split-freepages-without-holding-the-zone-lock-fix-2.patch
mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
mm-add-nr_zsmalloc-to-vmstat-fix.patch
mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
mm-fix-build-warnings-in-linux-compactionh-fix.patch
mm-update-the-comment-in-__isolate_free_page-checkpatch-fixes.patch
mm-zsmalloc-add-per-class-compact-trace-event-checkpatch-fixes.patch
nvme-dont-allocate-unused-nvme_major-fix.patch
treewide-replace-obsolete-_refok-by-__ref-checkpatch-fixes.patch
printk-create-pr_level-functions-fix.patch
kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
kexec-allow-architectures-to-override-boot-mapping-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
bitmap-bitmap_equal-memcmp-optimization-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-06-29  2:00 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-06-29  2:00 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_fbc.c  |    4 ----
 drivers/gpu/drm/sun4i/sun4i_drv.c |    7 -------
 drivers/gpu/drm/sun4i/sun4i_rgb.c |   11 -----------
 3 files changed, 22 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_fbc.c
--- a/drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_fbc.c
@@ -818,10 +818,6 @@ static bool intel_fbc_can_choose(struct
 {
 	struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
 	struct intel_fbc *fbc = &dev_priv->fbc;
-<<<<<<< HEAD
-	bool enable_by_default = IS_BROADWELL(dev_priv);
-=======
->>>>>>> linux-next/akpm-base
 
 	if (intel_vgpu_active(dev_priv)) {
 		fbc->no_fbc_reason = "VGPU is active";
diff -puN drivers/gpu/drm/sun4i/sun4i_drv.c~linux-next-git-rejects drivers/gpu/drm/sun4i/sun4i_drv.c
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -174,13 +174,6 @@ static int sun4i_drv_bind(struct device
 	if (ret)
 		goto free_drm;
 
-<<<<<<< HEAD
-	ret = drm_connector_register_all(drm);
-	if (ret)
-		goto unregister_drm;
-
-=======
->>>>>>> linux-next/akpm-base
 	return 0;
 
 free_drm:
diff -puN drivers/gpu/drm/sun4i/sun4i_rgb.c~linux-next-git-rejects drivers/gpu/drm/sun4i/sun4i_rgb.c
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -95,17 +95,6 @@ static int sun4i_rgb_mode_valid(struct d
 	rounded_rate = clk_round_rate(tcon->dclk, rate);
 	if (rounded_rate < rate)
 		return MODE_CLOCK_LOW;
-<<<<<<< HEAD
-
-	if (rounded_rate > rate)
-		return MODE_CLOCK_HIGH;
-
-	DRM_DEBUG_DRIVER("Clock rate OK\n");
-
-	return MODE_OK;
-}
-=======
->>>>>>> linux-next/akpm-base
 
 	if (rounded_rate > rate)
 		return MODE_CLOCK_HIGH;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-reorganize-slab-freelist-randomization-fix.patch
mm-balloon-use-general-non-lru-movable-page-feature-fix.patch
mm-compaction-split-freepages-without-holding-the-zone-lock-fix-2.patch
mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
mm-add-nr_zsmalloc-to-vmstat-fix.patch
mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
mm-fix-build-warnings-in-linux-compactionh-fix.patch
mm-update-the-comment-in-__isolate_free_page-checkpatch-fixes.patch
nvme-dont-allocate-unused-nvme_major-fix.patch
treewide-replace-obsolete-_refok-by-__ref-checkpatch-fixes.patch
printk-create-pr_level-functions-fix.patch
kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
kexec-allow-architectures-to-override-boot-mapping-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
bitmap-bitmap_equal-memcmp-optimization-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-06-20 19:56 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-06-20 19:56 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 tools/virtio/ringtest/Makefile |   10 ----------
 1 file changed, 10 deletions(-)

diff -puN tools/virtio/ringtest/Makefile~linux-next-git-rejects tools/virtio/ringtest/Makefile
--- a/tools/virtio/ringtest/Makefile~linux-next-git-rejects
+++ a/tools/virtio/ringtest/Makefile
@@ -1,10 +1,6 @@
 all:
 
-<<<<<<< HEAD
-all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring
-=======
 all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring noring
->>>>>>> linux-next/akpm-base
 
 CFLAGS += -Wall
 CFLAGS += -pthread -O2 -ggdb
@@ -20,10 +16,7 @@ ring: ring.o main.o
 virtio_ring_0_9: virtio_ring_0_9.o main.o
 virtio_ring_poll: virtio_ring_poll.o main.o
 virtio_ring_inorder: virtio_ring_inorder.o main.o
-<<<<<<< HEAD
-=======
 ptr_ring: ptr_ring.o main.o
->>>>>>> linux-next/akpm-base
 noring: noring.o main.o
 clean:
 	-rm main.o
@@ -31,10 +24,7 @@ clean:
 	-rm virtio_ring_0_9.o virtio_ring_0_9
 	-rm virtio_ring_poll.o virtio_ring_poll
 	-rm virtio_ring_inorder.o virtio_ring_inorder
-<<<<<<< HEAD
-=======
 	-rm ptr_ring.o ptr_ring
->>>>>>> linux-next/akpm-base
 	-rm noring.o noring
 
 .PHONY: all clean
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-reorganize-slab-freelist-randomization-fix.patch
mm-balloon-use-general-non-lru-movable-page-feature-fix.patch
mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
mm-add-nr_zsmalloc-to-vmstat-fix.patch
mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
mm-fix-build-warnings-in-linux-compactionh-fix.patch
nvme-dont-allocate-unused-nvme_major-fix.patch
kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
kexec-allow-architectures-to-override-boot-mapping-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
bitmap-bitmap_equal-memcmp-optimization-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-06-14 18:36 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-06-14 18:36 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 block/blk-lib.c                  |   15 ---------------
 fs/btrfs/tests/extent-io-tests.c |    6 ------
 kernel/locking/qspinlock.c       |    3 ---
 net/sched/cls_u32.c              |    9 ---------
 4 files changed, 33 deletions(-)

diff -puN block/blk-lib.c~linux-next-git-rejects block/blk-lib.c
--- a/block/blk-lib.c~linux-next-git-rejects
+++ a/block/blk-lib.c
@@ -169,15 +169,8 @@ int blkdev_issue_write_same(struct block
 		}
 	}
 
-<<<<<<< HEAD
-	if (bio) {
-		ret = submit_bio_wait(REQ_WRITE | REQ_WRITE_SAME, bio);
-		bio_put(bio);
-	}
-=======
 	if (bio)
 		ret = submit_bio_wait(bio);
->>>>>>> linux-next/akpm-base
 	return ret != -EOPNOTSUPP ? ret : 0;
 }
 EXPORT_SYMBOL(blkdev_issue_write_same);
@@ -217,16 +210,8 @@ static int __blkdev_issue_zeroout(struct
 		}
 	}
 
-<<<<<<< HEAD
-	if (bio) {
-		ret = submit_bio_wait(WRITE, bio);
-		bio_put(bio);
-		return ret;
-	}
-=======
 	if (bio)
 		return submit_bio_wait(bio);
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
diff -puN fs/btrfs/tests/extent-io-tests.c~linux-next-git-rejects fs/btrfs/tests/extent-io-tests.c
--- a/fs/btrfs/tests/extent-io-tests.c~linux-next-git-rejects
+++ a/fs/btrfs/tests/extent-io-tests.c
@@ -376,15 +376,9 @@ static int test_eb_bitmaps(u32 sectorsiz
 	test_msg("Running extent buffer bitmap tests\n");
 
 	/*
-<<<<<<< HEAD
-	 * In ppc64, sectorsize can be 64K, thus 4 * 64K will be larger than
-	 * BTRFS_MAX_METADATA_BLOCKSIZE.
-	 */
-=======
 	* In ppc64, sectorsize can be 64K, thus 4 * 64K will be
 	* larger than BTRFS_MAX_METADATA_BLOCKSIZE.
 	*/
->>>>>>> linux-next/akpm-base
 	len = (sectorsize < BTRFS_MAX_METADATA_BLOCKSIZE)
 		? sectorsize * 4 : sectorsize;
 
diff -puN kernel/locking/qspinlock.c~linux-next-git-rejects kernel/locking/qspinlock.c
--- a/kernel/locking/qspinlock.c~linux-next-git-rejects
+++ a/kernel/locking/qspinlock.c
@@ -268,8 +268,6 @@ static __always_inline u32  __pv_wait_he
 #endif
 
 /*
-<<<<<<< HEAD
-=======
  * Various notes on spin_is_locked() and spin_unlock_wait(), which are
  * 'interesting' functions:
  *
@@ -327,7 +325,6 @@ static __always_inline u32  __pv_wait_he
  */
 
 /*
->>>>>>> linux-next/akpm-base
  * queued_spin_lock_slowpath() can (load-)ACQUIRE the lock before
  * issuing an _unordered_ store to set _Q_LOCKED_VAL.
  *
diff -puN net/sched/cls_u32.c~linux-next-git-rejects net/sched/cls_u32.c
--- a/net/sched/cls_u32.c~linux-next-git-rejects
+++ a/net/sched/cls_u32.c
@@ -508,19 +508,10 @@ static int u32_replace_hw_knode(struct t
 	offload.type = TC_SETUP_CLSU32;
 	offload.cls_u32 = &u32_offload;
 
-<<<<<<< HEAD
-	if (!tc_should_offload(dev, tp, flags))
-		return tc_skip_sw(flags) ? -EINVAL : 0;
-
-	offload.cls_u32->command = TC_CLSU32_REPLACE_KNODE;
-	offload.cls_u32->knode.handle = n->handle;
-	offload.cls_u32->knode.fshift = n->fshift;
-=======
 	if (tc_should_offload(dev, tp, flags)) {
 		offload.cls_u32->command = TC_CLSU32_REPLACE_KNODE;
 		offload.cls_u32->knode.handle = n->handle;
 		offload.cls_u32->knode.fshift = n->fshift;
->>>>>>> linux-next/akpm-base
 #ifdef CONFIG_CLS_U32_MARK
 	offload.cls_u32->knode.val = n->val;
 	offload.cls_u32->knode.mask = n->mask;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-reorganize-slab-freelist-randomization-fix.patch
mm-balloon-use-general-non-lru-movable-page-feature-fix.patch
mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
mm-add-nr_zsmalloc-to-vmstat-fix.patch
mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
thp-extract-khugepaged-from-mm-huge_memoryc-fix-2.patch
nvme-dont-allocate-unused-nvme_major-fix.patch
kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
kexec-allow-architectures-to-override-boot-mapping-fix.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
bitmap-bitmap_equal-memcmp-optimization-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-06-02 17:58 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-06-02 17:58 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/sfc/rx.c |    6 ------
 1 file changed, 6 deletions(-)

diff -puN drivers/net/ethernet/sfc/rx.c~linux-next-git-rejects drivers/net/ethernet/sfc/rx.c
--- a/drivers/net/ethernet/sfc/rx.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/sfc/rx.c
@@ -845,12 +845,6 @@ int efx_filter_rfs(struct net_device *ne
 	struct flow_keys fk;
 	int rc;
 
-<<<<<<< HEAD
-	if (flow_id == RPS_FLOW_ID_INVALID)
-		return -EINVAL;

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-05-27 18:42 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-05-27 18:42 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/nfs/flexfilelayout/flexfilelayout.h    |    4 ----
 fs/nfs/flexfilelayout/flexfilelayoutdev.c |    3 ---
 fs/nfs/pnfs.c                             |    4 ----
 fs/nfs/write.c                            |    5 -----
 tools/perf/util/machine.c                 |   17 -----------------
 5 files changed, 33 deletions(-)

diff -puN fs/nfs/flexfilelayout/flexfilelayout.h~linux-next-git-rejects fs/nfs/flexfilelayout/flexfilelayout.h
--- a/fs/nfs/flexfilelayout/flexfilelayout.h~linux-next-git-rejects
+++ a/fs/nfs/flexfilelayout/flexfilelayout.h
@@ -199,9 +199,5 @@ struct rpc_cred *ff_layout_get_ds_cred(s
 				       u32 ds_idx, struct rpc_cred *mdscred);
 bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg);
 bool ff_layout_avoid_mds_available_ds(struct pnfs_layout_segment *lseg);
-<<<<<<< HEAD
 bool ff_layout_avoid_read_on_rw(struct pnfs_layout_segment *lseg);
-
-=======
->>>>>>> linux-next/akpm-base
 #endif /* FS_NFS_NFS4FLEXFILELAYOUT_H */
diff -puN fs/nfs/flexfilelayout/flexfilelayoutdev.c~linux-next-git-rejects fs/nfs/flexfilelayout/flexfilelayoutdev.c
--- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c~linux-next-git-rejects
+++ a/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -557,15 +557,12 @@ bool ff_layout_avoid_mds_available_ds(st
 	       ff_layout_has_available_ds(lseg);
 }
 
-<<<<<<< HEAD
 bool ff_layout_avoid_read_on_rw(struct pnfs_layout_segment *lseg)
 {
 	return lseg->pls_range.iomode == IOMODE_RW &&
 	       ff_layout_no_read_on_rw(lseg);
 }
 
-=======
->>>>>>> linux-next/akpm-base
 module_param(dataserver_retrans, uint, 0644);
 MODULE_PARM_DESC(dataserver_retrans, "The  number of times the NFSv4.1 client "
 			"retries a request before it attempts further "
diff -puN fs/nfs/pnfs.c~linux-next-git-rejects fs/nfs/pnfs.c
--- a/fs/nfs/pnfs.c~linux-next-git-rejects
+++ a/fs/nfs/pnfs.c
@@ -1547,11 +1547,7 @@ lookup_again:
 		goto out_unlock;
 	}
 
-<<<<<<< HEAD
 	lseg = pnfs_find_lseg(lo, &arg, strict_iomode);
-=======
-	lseg = pnfs_find_lseg(lo, &arg);
->>>>>>> linux-next/akpm-base
 	if (lseg) {
 		trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
 				PNFS_UPDATE_LAYOUT_FOUND_CACHED);
diff -puN fs/nfs/write.c~linux-next-git-rejects fs/nfs/write.c
--- a/fs/nfs/write.c~linux-next-git-rejects
+++ a/fs/nfs/write.c
@@ -1739,13 +1739,8 @@ int nfs_commit_file(struct file *file, s
 
 	open = get_nfs_open_context(nfs_file_open_context(file));
 	req  = nfs_create_request(open, NULL, NULL, 0, i_size_read(inode));
-<<<<<<< HEAD
 	if (IS_ERR(req)) {
 		ret = PTR_ERR(req);
-=======
-	if (!req) {
-		ret = -ENOMEM;
->>>>>>> linux-next/akpm-base
 		goto out_put;
 	}
 
diff -puN tools/perf/util/machine.c~linux-next-git-rejects tools/perf/util/machine.c
--- a/tools/perf/util/machine.c~linux-next-git-rejects
+++ a/tools/perf/util/machine.c
@@ -1810,11 +1810,7 @@ static int thread__resolve_callchain_sam
 	struct ip_callchain *chain = sample->callchain;
 	int chain_nr = chain->nr;
 	u8 cpumode = PERF_RECORD_MISC_USER;
-<<<<<<< HEAD
-	int i, j, err, nr_entries;
-=======
 	int i, j, err, nr_entries, nr_contexts;
->>>>>>> linux-next/akpm-base
 	int skip_idx = -1;
 	int first_call = 0;
 
@@ -1829,12 +1825,8 @@ static int thread__resolve_callchain_sam
 	 * Based on DWARF debug information, some architectures skip
 	 * a callchain entry saved by the kernel.
 	 */
-<<<<<<< HEAD
-	skip_idx = arch_skip_callchain_idx(thread, chain);
-=======
 	if (chain_nr < sysctl_perf_event_max_stack)
 		skip_idx = arch_skip_callchain_idx(thread, chain);
->>>>>>> linux-next/akpm-base
 
 	/*
 	 * Add branches to call stack for easier browsing. This gives
@@ -1894,11 +1886,7 @@ static int thread__resolve_callchain_sam
 	}
 
 check_calls:
-<<<<<<< HEAD
-	for (i = first_call, nr_entries = 0;
-=======
 	for (i = first_call, nr_entries = 0, nr_contexts = 0;
->>>>>>> linux-next/akpm-base
 	     i < chain_nr && nr_entries < max_stack; i++) {
 		u64 ip;
 
@@ -1913,10 +1901,6 @@ check_calls:
 #endif
 		ip = chain->ips[j];
 
-<<<<<<< HEAD
-		if (ip < PERF_CONTEXT_MAX)
-                       ++nr_entries;
-=======
 		if (ip >= PERF_CONTEXT_MAX) {
 			if (++nr_contexts > sysctl_perf_event_max_contexts_per_stack)
 				goto out_corrupted_callchain;
@@ -1924,7 +1908,6 @@ check_calls:
 			if (++nr_entries > sysctl_perf_event_max_stack)
 				goto out_corrupted_callchain;
 		}
->>>>>>> linux-next/akpm-base
 
 		err = add_callchain_ip(thread, cursor, parent, root_al, &cpumode, ip);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
oom_reaper-close-race-with-exiting-task-checkpatch-fixes.patch
mm-cma-silence-warnings-due-to-max-usage-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-fix.patch
mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
fs-nfs-nfs4statec-work-around-gcc-44-union-initialization-bug.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-05-25 19:12 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-05-25 19:12 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 tools/virtio/ringtest/Makefile |    7 -------
 1 file changed, 7 deletions(-)

diff -puN tools/virtio/ringtest/Makefile~linux-next-git-rejects tools/virtio/ringtest/Makefile
--- a/tools/virtio/ringtest/Makefile~linux-next-git-rejects
+++ a/tools/virtio/ringtest/Makefile
@@ -1,10 +1,6 @@
 all:
 
-<<<<<<< HEAD
-all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder
-=======
 all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder skb_array
->>>>>>> linux-next/akpm-base
 
 CFLAGS += -Wall
 CFLAGS += -pthread -O2 -ggdb
@@ -20,10 +16,7 @@ ring: ring.o main.o
 virtio_ring_0_9: virtio_ring_0_9.o main.o
 virtio_ring_poll: virtio_ring_poll.o main.o
 virtio_ring_inorder: virtio_ring_inorder.o main.o
-<<<<<<< HEAD
-=======
 skb_array: skb_array.o main.o
->>>>>>> linux-next/akpm-base
 clean:
 	-rm main.o
 	-rm ring.o ring
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix-fix.patch
drivers-pinctrl-intel-pinctrl-baytrailc-fix-build-with-gcc-44.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-fix.patch
mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
fs-nfs-nfs4statec-work-around-gcc-44-union-initialization-bug.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-05-23 20:03 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-05-23 20:03 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/include/asm/book3s/64/pgtable.h |    4 ----
 drivers/iommu/arm-smmu.c                     |    3 ---
 2 files changed, 7 deletions(-)

diff -puN arch/powerpc/include/asm/book3s/64/pgtable.h~linux-next-git-rejects arch/powerpc/include/asm/book3s/64/pgtable.h
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h~linux-next-git-rejects
+++ a/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -835,10 +835,6 @@ static inline int has_transparent_hugepa
 		return radix__has_transparent_hugepage();
 	return hash__has_transparent_hugepage();
 }
-<<<<<<< HEAD
-#define has_transparent_hugepage has_transparent_hugepage
-=======
->>>>>>> linux-next/akpm-base
 
 static inline unsigned long
 pmd_hugepage_update(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp,
diff -puN drivers/iommu/arm-smmu.c~linux-next-git-rejects drivers/iommu/arm-smmu.c
--- a/drivers/iommu/arm-smmu.c~linux-next-git-rejects
+++ a/drivers/iommu/arm-smmu.c
@@ -397,15 +397,12 @@ struct arm_smmu_domain {
 	struct iommu_domain		domain;
 };
 
-<<<<<<< HEAD
-=======
 struct arm_smmu_phandle_args {
 	struct device_node *np;
 	int args_count;
 	uint32_t args[MAX_MASTER_STREAMIDS];
 };
 
->>>>>>> linux-next/akpm-base
 static DEFINE_SPINLOCK(arm_smmu_devices_lock);
 static LIST_HEAD(arm_smmu_devices);
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
allocate-idle-task-for-a-cpu-always-on-its-local-node-fix.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-05-09 18:34 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-05-09 18:34 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/input/misc/twl6040-vibra.c~linux-next-git-rejects drivers/input/misc/twl6040-vibra.c
diff -puN arch/arm64/boot/dts/renesas/r8a7795.dtsi~linux-next-git-rejects arch/arm64/boot/dts/renesas/r8a7795.dtsi
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -134,8 +134,6 @@
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <0>;
-<<<<<<< HEAD
-=======
 	};
 
 	/* External PCIe clock - can be overridden by the board */
@@ -143,7 +141,6 @@
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <0>;
->>>>>>> linux-next/akpm-base
 	};
 
 	soc {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch
kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
mm-slab-freelist-randomization-v5-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
include-linux-nodemaskh-create-next_node_in-helper.patch
include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-uninline-page_mapped.patch
mm-uninline-page_mapped-checkpatch-fixes.patch
memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch
mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix-fix.patch
mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch
exit_thread-remove-empty-bodies-fix.patch
exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
lib-gcd-use-binary-gcd-algorithm-instead-of-euclidean-fix.patch
fs-execc-fix-minor-memory-leak.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-05-04 18:54 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-05-04 18:54 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/hid/usbhid/hid-quirks.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/hid/usbhid/hid-quirks.c~linux-next-git-rejects drivers/hid/usbhid/hid-quirks.c
--- a/drivers/hid/usbhid/hid-quirks.c~linux-next-git-rejects
+++ a/drivers/hid/usbhid/hid-quirks.c
@@ -71,14 +71,11 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
-<<<<<<< HEAD
-=======
 	{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70R, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_M65RGB, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K95RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
 	{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB, HID_QUIRK_NO_INIT_REPORTS },
->>>>>>> linux-next/akpm-base
 	{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch
kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
mm-slab-freelist-randomization-v5-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
include-linux-nodemaskh-create-next_node_in-helper.patch
include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-uninline-page_mapped.patch
mm-uninline-page_mapped-checkpatch-fixes.patch
memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch
mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix-fix.patch
mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch
exit_thread-remove-empty-bodies-fix.patch
exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
fs-execc-fix-minor-memory-leak.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
include-linux-fsh-kernel_read_file_id_str-remove-paranoid-check.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-04-28 18:42 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-04-28 18:42 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/boot/dts/dm814x-clocks.dtsi              |   12 ----
 arch/arm/boot/dts/r8a7791-porter.dts              |    5 -
 arch/arm/boot/dts/r8a7791.dtsi                    |    8 --
 arch/arm/mach-shmobile/timer.c                    |   23 -------
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c |   35 ------------
 drivers/net/macsec.c                              |   11 ---
 6 files changed, 94 deletions(-)

diff -puN arch/arm/boot/dts/dm814x-clocks.dtsi~linux-next-git-rejects arch/arm/boot/dts/dm814x-clocks.dtsi
--- a/arch/arm/boot/dts/dm814x-clocks.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/dm814x-clocks.dtsi
@@ -175,11 +175,7 @@
 	};
 
 	/* CPTS_RFT_CLK in RMII_REFCLK_SRC, usually sourced from auiod */
-<<<<<<< HEAD
-	cpsw_cpts_rft_clk: cpsw_cpts_rft_clk {
-=======
 	cpsw_cpts_rft_clk: cpsw_cpts_rft_clk@2e8 {
->>>>>>> linux-next/akpm-base
 		#clock-cells = <0>;
 		compatible = "ti,mux-clock";
 		clocks = <&adpll_video0_ck 1
@@ -196,11 +192,7 @@
 		clock-frequency = <125000000>;
 	};
 
-<<<<<<< HEAD
-	sysclk18_ck: sysclk18_ck {
-=======
 	sysclk18_ck: sysclk18_ck@2f0 {
->>>>>>> linux-next/akpm-base
 		#clock-cells = <0>;
 		compatible = "ti,mux-clock";
 		clocks = <&rtcosc_ck>, <&rtcdivider_ck>;
@@ -319,11 +311,7 @@
 		ti,clock-div = <1>;
 	};
 
-<<<<<<< HEAD
-	sysclk10_ck: sysclk10_ck {
-=======
 	sysclk10_ck: sysclk10_ck@324 {
->>>>>>> linux-next/akpm-base
 		compatible = "ti,divider-clock";
 		reg = <0x324>;
 		ti,max-div = <7>;
diff -puN arch/arm/boot/dts/r8a7791-porter.dts~linux-next-git-rejects arch/arm/boot/dts/r8a7791-porter.dts
--- a/arch/arm/boot/dts/r8a7791-porter.dts~linux-next-git-rejects
+++ a/arch/arm/boot/dts/r8a7791-porter.dts
@@ -143,13 +143,8 @@
 
 &pfc {
 	scif0_pins: serial0 {
-<<<<<<< HEAD
-		renesas,groups = "scif0_data_d";
-		renesas,function = "scif0";
-=======
 		groups = "scif0_data_d";
 		function = "scif0";
->>>>>>> linux-next/akpm-base
 	};
 
 	ether_pins: ether {
diff -puN arch/arm/boot/dts/r8a7791.dtsi~linux-next-git-rejects arch/arm/boot/dts/r8a7791.dtsi
--- a/arch/arm/boot/dts/r8a7791.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/r8a7791.dtsi
@@ -1084,10 +1084,6 @@
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <0>;
-<<<<<<< HEAD
-			clock-output-names = "pcie_bus";
-=======
->>>>>>> linux-next/akpm-base
 		};
 
 		/* External SCIF clock */
@@ -1111,10 +1107,6 @@
 			#clock-cells = <0>;
 			/* This value must be overridden by the board. */
 			clock-frequency = <0>;
-<<<<<<< HEAD
-			clock-output-names = "can_clk";
-=======
->>>>>>> linux-next/akpm-base
 		};
 
 		/* Special CPG clocks */
diff -puN arch/arm/mach-shmobile/timer.c~linux-next-git-rejects arch/arm/mach-shmobile/timer.c
--- a/arch/arm/mach-shmobile/timer.c~linux-next-git-rejects
+++ a/arch/arm/mach-shmobile/timer.c
@@ -23,11 +23,6 @@
 void __init shmobile_init_delay(void)
 {
 	struct device_node *np, *cpus;
-<<<<<<< HEAD
-	unsigned int div = 0;
-	bool has_arch_timer = false;
-=======
->>>>>>> linux-next/akpm-base
 	u32 max_freq = 0;
 
 	cpus = of_find_node_by_path("/cpus");
@@ -47,19 +42,6 @@ void __init shmobile_init_delay(void)
 
 		if (!of_property_read_u32(np, "clock-frequency", &freq))
 			max_freq = max(max_freq, freq);
-<<<<<<< HEAD
-
-		if (of_device_is_compatible(np, "arm,cortex-a8")) {
-			div = 2;
-		} else if (of_device_is_compatible(np, "arm,cortex-a9")) {
-			div = 1;
-		} else if (of_device_is_compatible(np, "arm,cortex-a7") ||
-			 of_device_is_compatible(np, "arm,cortex-a15")) {
-			div = 1;
-			has_arch_timer = true;
-		}
-=======
->>>>>>> linux-next/akpm-base
 	}
 
 	of_node_put(cpus);
@@ -67,10 +49,6 @@ void __init shmobile_init_delay(void)
 	if (!max_freq || !div)
 		return;
 
-<<<<<<< HEAD
-	if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
-		shmobile_setup_delay_hz(max_freq, 1, div);
-=======
 	/*
 	 * Calculate a worst-case loops-per-jiffy value
 	 * based on maximum cpu core hz setting and the
@@ -82,5 +60,4 @@ void __init shmobile_init_delay(void)
 
 	if (!preset_lpj)
 		preset_lpj = max_freq / HZ;
->>>>>>> linux-next/akpm-base
 }
diff -puN drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en_main.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1556,7 +1556,6 @@ static int mlx5e_set_mtu(struct mlx5e_pr
 	mlx5_modify_nic_vport_mtu(mdev, hw_mtu);
 	return 0;
 }
-<<<<<<< HEAD
 
 static void mlx5e_query_mtu(struct mlx5e_priv *priv, u16 *mtu)
 {
@@ -1586,37 +1585,6 @@ static int mlx5e_set_dev_port_mtu(struct
 		netdev_warn(netdev, "%s: VPort MTU %d is different than netdev mtu %d\n",
 			    __func__, mtu, netdev->mtu);
 
-=======
-
-static void mlx5e_query_mtu(struct mlx5e_priv *priv, u16 *mtu)
-{
-	struct mlx5_core_dev *mdev = priv->mdev;
-	u16 hw_mtu = 0;
-	int err;
-
-	err = mlx5_query_nic_vport_mtu(mdev, &hw_mtu);
-	if (err || !hw_mtu) /* fallback to port oper mtu */
-		mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
-
-	*mtu = MLX5E_HW2SW_MTU(hw_mtu);
-}
-
-static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
-{
-	struct mlx5e_priv *priv = netdev_priv(netdev);
-	u16 mtu;
-	int err;
-
-	err = mlx5e_set_mtu(priv, netdev->mtu);
-	if (err)
-		return err;
-
-	mlx5e_query_mtu(priv, &mtu);
-	if (mtu != netdev->mtu)
-		netdev_warn(netdev, "%s: VPort MTU %d is different than netdev mtu %d\n",
-			    __func__, mtu, netdev->mtu);
-
->>>>>>> linux-next/akpm-base
 	netdev->mtu = mtu;
 	return 0;
 }
@@ -2272,8 +2240,6 @@ static int set_feature_rx_vlan(struct ne
 	return err;
 }
 
-<<<<<<< HEAD
-=======
 static int mlx5e_handle_feature(struct net_device *netdev,
 				netdev_features_t wanted_features,
 				netdev_features_t feature,
@@ -2317,7 +2283,6 @@ static int mlx5e_set_features(struct net
 	return err ? -EINVAL : 0;
 }
 
->>>>>>> linux-next/akpm-base
 #define MXL5_HW_MIN_MTU 64
 #define MXL5E_MIN_MTU (MXL5_HW_MIN_MTU + ETH_FCS_LEN)
 
diff -puN drivers/net/macsec.c~linux-next-git-rejects drivers/net/macsec.c
--- a/drivers/net/macsec.c~linux-next-git-rejects
+++ a/drivers/net/macsec.c
@@ -2276,17 +2276,11 @@ static int nla_put_secy(struct macsec_se
 	if (!secy_nest)
 		return 1;
 
-<<<<<<< HEAD
-	if (nla_put_sci(skb, MACSEC_SECY_ATTR_SCI, secy->sci) ||
-	    nla_put_u64(skb, MACSEC_SECY_ATTR_CIPHER_SUITE,
-			MACSEC_DEFAULT_CIPHER_ID) ||
-=======
 	if (nla_put_sci(skb, MACSEC_SECY_ATTR_SCI, secy->sci,
 			MACSEC_SECY_ATTR_PAD) ||
 	    nla_put_u64_64bit(skb, MACSEC_SECY_ATTR_CIPHER_SUITE,
 			      MACSEC_DEFAULT_CIPHER_ID,
 			      MACSEC_SECY_ATTR_PAD) ||
->>>>>>> linux-next/akpm-base
 	    nla_put_u8(skb, MACSEC_SECY_ATTR_ICV_LEN, secy->icv_len) ||
 	    nla_put_u8(skb, MACSEC_SECY_ATTR_OPER, secy->operational) ||
 	    nla_put_u8(skb, MACSEC_SECY_ATTR_PROTECT, secy->protect_frames) ||
@@ -3245,13 +3239,8 @@ static int macsec_fill_info(struct sk_bu
 	if (nla_put_sci(skb, IFLA_MACSEC_SCI, secy->sci,
 			IFLA_MACSEC_PAD) ||
 	    nla_put_u8(skb, IFLA_MACSEC_ICV_LEN, secy->icv_len) ||
-<<<<<<< HEAD
-	    nla_put_u64(skb, IFLA_MACSEC_CIPHER_SUITE,
-			MACSEC_DEFAULT_CIPHER_ID) ||
-=======
 	    nla_put_u64_64bit(skb, IFLA_MACSEC_CIPHER_SUITE,
 			      MACSEC_DEFAULT_CIPHER_ID, IFLA_MACSEC_PAD) ||
->>>>>>> linux-next/akpm-base
 	    nla_put_u8(skb, IFLA_MACSEC_ENCODING_SA, tx_sc->encoding_sa) ||
 	    nla_put_u8(skb, IFLA_MACSEC_ENCRYPT, tx_sc->encrypt) ||
 	    nla_put_u8(skb, IFLA_MACSEC_PROTECT, secy->protect_frames) ||
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch
kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
mm-slab-freelist-randomization-v5-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
include-linux-nodemaskh-create-next_node_in-helper.patch
include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-uninline-page_mapped.patch
mm-uninline-page_mapped-checkpatch-fixes.patch
memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch
mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch
exit_thread-remove-empty-bodies-fix.patch
exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
fs-execc-fix-minor-memory-leak.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-04-26 19:48 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-04-26 19:48 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_ringbuffer.c |    3 -
 drivers/iommu/amd_iommu.c               |   13 -------
 drivers/usb/dwc3/debugfs.c              |   37 ----------------------
 3 files changed, 53 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_ringbuffer.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_ringbuffer.c
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2101,10 +2101,7 @@ int intel_pin_and_map_ringbuffer_obj(str
 	struct drm_i915_gem_object *obj = ringbuf->obj;
 	/* Ring wraparound at offset 0 sometimes hangs. No idea why. */
 	unsigned flags = PIN_OFFSET_BIAS | 4096;
-<<<<<<< HEAD
-=======
 	void *addr;
->>>>>>> linux-next/akpm-base
 	int ret;
 
 	if (HAS_LLC(dev_priv) && !obj->stolen) {
diff -puN drivers/iommu/amd_iommu.c~linux-next-git-rejects drivers/iommu/amd_iommu.c
--- a/drivers/iommu/amd_iommu.c~linux-next-git-rejects
+++ a/drivers/iommu/amd_iommu.c
@@ -279,10 +279,7 @@ static u16 get_alias(struct device *dev)
 	struct pci_dev *pdev = to_pci_dev(dev);
 	u16 devid, ivrs_alias, pci_alias;
 
-<<<<<<< HEAD
-=======
 	/* The callers make sure that get_device_id() does not fail here */
->>>>>>> linux-next/akpm-base
 	devid = get_device_id(dev);
 	ivrs_alias = amd_iommu_alias_table[devid];
 	pci_for_each_dma_alias(pdev, __last_alias, &pci_alias);
@@ -347,8 +344,6 @@ static struct iommu_dev_data *find_dev_d
 }
 
 static struct iommu_dev_data *get_dev_data(struct device *dev)
-<<<<<<< HEAD
-=======
 {
 	return dev->archdata.iommu;
 }
@@ -357,7 +352,6 @@ static struct iommu_dev_data *get_dev_da
 * Find or create an IOMMU group for a acpihid device.
 */
 static struct iommu_group *acpihid_device_group(struct device *dev)
->>>>>>> linux-next/akpm-base
 {
 	struct acpihid_map_entry *p, *entry = NULL;
 	int devid;
@@ -505,11 +499,7 @@ static int iommu_init_device(struct devi
 
 	dev_data->alias = get_alias(dev);
 
-<<<<<<< HEAD
-	if (pci_iommuv2_capable(pdev)) {
-=======
 	if (dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
->>>>>>> linux-next/akpm-base
 		struct amd_iommu *iommu;
 
 		iommu = amd_iommu_rlookup_table[dev_data->devid];
@@ -530,12 +520,9 @@ static void iommu_ignore_device(struct d
 	int devid;
 
 	devid = get_device_id(dev);
-<<<<<<< HEAD
-=======
 	if (devid < 0)
 		return;
 
->>>>>>> linux-next/akpm-base
 	alias = get_alias(dev);
 
 	memset(&amd_iommu_dev_table[devid], 0, sizeof(struct dev_table_entry));
diff -puN drivers/usb/dwc3/debugfs.c~linux-next-git-rejects drivers/usb/dwc3/debugfs.c
--- a/drivers/usb/dwc3/debugfs.c~linux-next-git-rejects
+++ a/drivers/usb/dwc3/debugfs.c
@@ -942,62 +942,25 @@ void dwc3_debugfs_init(struct dwc3 *dwc)
 	dwc->regset->base = dwc->regs;
 
 	file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
-<<<<<<< HEAD
-	if (!file) {
-		ret = -ENOMEM;
-		goto err2;
-	}
-=======
 	if (!file)
 		dev_dbg(dwc->dev, "Can't create debugfs regdump\n");
->>>>>>> linux-next/akpm-base
 
 	if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)) {
 		file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
 				dwc, &dwc3_mode_fops);
-<<<<<<< HEAD
-		if (!file) {
-			ret = -ENOMEM;
-			goto err2;
-		}
-=======
 		if (!file)
 			dev_dbg(dwc->dev, "Can't create debugfs mode\n");
->>>>>>> linux-next/akpm-base
 	}
 
 	if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) ||
 			IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
 		file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
 				dwc, &dwc3_testmode_fops);
-<<<<<<< HEAD
-		if (!file) {
-			ret = -ENOMEM;
-			goto err2;
-		}
-
-		file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root,
-				dwc, &dwc3_link_state_fops);
-		if (!file) {
-			ret = -ENOMEM;
-			goto err2;
-		}
-	}
-
-	return 0;
-
-err2:
-	kfree(dwc->regset);
-
-err1:
-	debugfs_remove_recursive(root);
-=======
 
 		file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR,
 				root, dwc, &dwc3_link_state_fops);
 		if (!file)
 			dev_dbg(dwc->dev, "Can't create debugfs link_state\n");
->>>>>>> linux-next/akpm-base
 
 		dwc3_debugfs_create_endpoint_dirs(dwc, root);
 	}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
include-linux-nodemaskh-create-next_node_in-helper.patch
include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-uninline-page_mapped.patch
mm-uninline-page_mapped-checkpatch-fixes.patch
memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
mm-kasan-initial-memory-quarantine-implementation-v8-fix.patch
exit_thread-remove-empty-bodies-fix.patch
exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
fs-execc-fix-minor-memory-leak.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-03-23 17:40 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-03-23 17:40 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/btrfs/ctree.h   |    9 ---------
 fs/btrfs/disk-io.c |    5 -----
 2 files changed, 14 deletions(-)

diff -puN fs/btrfs/ctree.h~linux-next-git-rejects fs/btrfs/ctree.h
--- a/fs/btrfs/ctree.h~linux-next-git-rejects
+++ a/fs/btrfs/ctree.h
@@ -2200,21 +2200,12 @@ struct btrfs_ioctl_defrag_range_args {
  *
  * - balance status item
  *   (BTRFS_BALANCE_OBJECTID, BTRFS_TEMPORARY_ITEM_KEY, 0)
-<<<<<<< HEAD
  */
 #define BTRFS_TEMPORARY_ITEM_KEY	248
 
 /*
  * Obsolete name, see BTRFS_PERSISTENT_ITEM_KEY
  */
-=======
- */
-#define BTRFS_TEMPORARY_ITEM_KEY	248
-
-/*
- * Obsolete name, see BTRFS_PERSISTENT_ITEM_KEY
- */
->>>>>>> linux-next/akpm-base
 #define BTRFS_DEV_STATS_KEY		249
 
 /*
diff -puN fs/btrfs/disk-io.c~linux-next-git-rejects fs/btrfs/disk-io.c
--- a/fs/btrfs/disk-io.c~linux-next-git-rejects
+++ a/fs/btrfs/disk-io.c
@@ -670,12 +670,7 @@ static int btree_readpage_end_io_hook(st
 				       eb, found_level);
 
 	ret = csum_tree_block(fs_info, eb, 1);
-<<<<<<< HEAD
-	if (ret) {
-		ret = -EIO;
-=======
 	if (ret)
->>>>>>> linux-next/akpm-base
 		goto err;
 
 	/*
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
sched-add-schedule_timeout_idle.patch
drivers-input-eliminate-input_compat_test-macro.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
mm-kasan-stackdepot-implementation-enable-stackdepot-for-slab-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-03-11 19:54 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-03-11 19:54 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/spi/spi-imx.c |   36 ------------------------------------
 kernel/memremap.c     |    5 -----
 2 files changed, 41 deletions(-)

diff -puN drivers/spi/spi-imx.c~linux-next-git-rejects drivers/spi/spi-imx.c
--- a/drivers/spi/spi-imx.c~linux-next-git-rejects
+++ a/drivers/spi/spi-imx.c
@@ -216,12 +216,6 @@ static bool spi_imx_can_dma(struct spi_m
 	if (!master->dma_rx)
 		return false;
 
-<<<<<<< HEAD
-	if (spi_imx->dma_is_inited && transfer->len >= spi_imx->wml &&
-	    (transfer->len % spi_imx->wml) == 0)
-		return true;
-	return false;
-=======
 	if (!bpw)
 		bpw = spi->bits_per_word;
 
@@ -237,7 +231,6 @@ static bool spi_imx_can_dma(struct spi_m
 		return false;
 
 	return true;
->>>>>>> linux-next/akpm-base
 }
 
 #define MX51_ECSPI_CTRL		0x08
@@ -1015,22 +1008,6 @@ static int spi_imx_dma_transfer(struct s
 	desc_tx->callback_param = (void *)spi_imx;
 	dmaengine_submit(desc_tx);
 	reinit_completion(&spi_imx->dma_tx_completion);
-<<<<<<< HEAD
-
-	/* Trigger the cspi module. */
-	spi_imx->dma_finished = 0;
-
-	/*
-	 * Set these order to avoid potential RX overflow. The overflow may
-	 * happen if we enable SPI HW before starting RX DMA due to rescheduling
-	 * for another task and/or interrupt.
-	 * So RX DMA enabled first to make sure data would be read out from FIFO
-	 * ASAP. TX DMA enabled next to start filling TX FIFO with new data.
-	 * And finaly SPI HW enabled to start actual data transfer.
-	 */
-	dma_async_issue_pending(master->dma_rx);
-=======
->>>>>>> linux-next/akpm-base
 	dma_async_issue_pending(master->dma_tx);
 
 	transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len);
@@ -1042,20 +1019,7 @@ static int spi_imx_dma_transfer(struct s
 		dev_err(spi_imx->dev, "I/O Error in DMA TX\n");
 		dmaengine_terminate_all(master->dma_tx);
 		dmaengine_terminate_all(master->dma_rx);
-<<<<<<< HEAD
-	} else {
-		timeout = wait_for_completion_timeout(
-				&spi_imx->dma_rx_completion, IMX_DMA_TIMEOUT);
-		if (!timeout) {
-			pr_warn("%s %s: I/O Error in DMA RX\n",
-				dev_driver_string(&master->dev),
-				dev_name(&master->dev));
-			spi_imx->devtype_data->reset(spi_imx);
-			dmaengine_terminate_all(master->dma_rx);
-		}
-=======
 		return -ETIMEDOUT;
->>>>>>> linux-next/akpm-base
 	}
 
 	timeout = wait_for_completion_timeout(&spi_imx->dma_rx_completion,
diff -puN kernel/memremap.c~linux-next-git-rejects kernel/memremap.c
--- a/kernel/memremap.c~linux-next-git-rejects
+++ a/kernel/memremap.c
@@ -271,11 +271,6 @@ struct dev_pagemap *find_dev_pagemap(res
 void *devm_memremap_pages(struct device *dev, struct resource *res,
 		struct percpu_ref *ref, struct vmem_altmap *altmap)
 {
-<<<<<<< HEAD
-=======
-	int is_ram = region_intersects(res->start, resource_size(res),
-				       IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE);
->>>>>>> linux-next/akpm-base
 	resource_size_t key, align_start, align_size, align_end;
 	struct dev_pagemap *pgmap;
 	struct page_map *page_map;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
slub-drop-lock-at-the-end-of-free_debug_processing-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-3-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
mm-kasan-stackdepot-implementation-enable-stackdepot-for-slab-fix.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
mn10300-c6x-config_generic_bug-must-depend-on-config_bug.patch
arch-mn10300-kernel-fpu-nofpuc-needs-asm-elfh.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sscanf-implement-basic-character-sets-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
rapidio-add-mport-char-device-driver-fix.patch
kernel-add-kcov-code-coverage-fix.patch
kernel-add-kcov-code-coverage-fix-2.patch
kernel-add-kcov-code-coverage-makefile-tweaks.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-03-09 18:23 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-03-09 18:23 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/mellanox/mlx5/core/en.h      |    5 --
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c |    3 -
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c   |    8 ----
 drivers/net/vxlan.c                               |   22 ------------
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c       |    3 -
 include/uapi/linux/bpf.h                          |    3 -
 net/tipc/subscr.c                                 |    5 --
 7 files changed, 49 deletions(-)

diff -puN drivers/net/ethernet/mellanox/mlx5/core/en.h~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en.h
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -286,12 +286,7 @@ struct mlx5e_sq_stats {
 	u64 stopped;
 	u64 wake;
 	u64 dropped;
-<<<<<<< HEAD
-	u64 nop;
-#define NUM_SQ_STATS 9
-=======
 #define NUM_SQ_STATS 11
->>>>>>> linux-next/akpm-base
 };
 
 struct mlx5e_stats {
diff -puN drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en_main.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2246,8 +2246,6 @@ void mlx5e_build_default_indir_rqt(u32 *
 		indirection_rqt[i] = i % num_channels;
 }
 
-<<<<<<< HEAD
-=======
 #ifdef CONFIG_MLX5_CORE_EN_DCB
 static void mlx5e_ets_init(struct mlx5e_priv *priv)
 {
@@ -2266,7 +2264,6 @@ static void mlx5e_ets_init(struct mlx5e_
 }
 #endif
 
->>>>>>> linux-next/akpm-base
 static void mlx5e_build_netdev_priv(struct mlx5_core_dev *mdev,
 				    struct net_device *netdev,
 				    int num_channels)
diff -puN drivers/net/ethernet/mellanox/mlx5/core/en_tx.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -206,13 +206,6 @@ static netdev_tx_t mlx5e_sq_xmit(struct
 	if (skb_is_gso(skb)) {
 		eseg->mss    = cpu_to_be16(skb_shinfo(skb)->gso_size);
 		opcode       = MLX5_OPCODE_LSO;
-<<<<<<< HEAD
-		ihs          = skb_transport_offset(skb) + tcp_hdrlen(skb);
-		payload_len  = skb->len - ihs;
-		num_bytes = skb->len + (skb_shinfo(skb)->gso_segs - 1) * ihs;
-		sq->stats.tso_packets++;
-		sq->stats.tso_bytes += payload_len;
-=======
 
 		if (skb->encapsulation) {
 			ihs = skb_inner_transport_offset(skb) + inner_tcp_hdrlen(skb);
@@ -225,7 +218,6 @@ static netdev_tx_t mlx5e_sq_xmit(struct
 		}
 
 		num_bytes = skb->len + (skb_shinfo(skb)->gso_segs - 1) * ihs;
->>>>>>> linux-next/akpm-base
 	} else {
 		bf = sq->bf_budget &&
 		     !skb->xmit_more &&
diff -puN drivers/net/vxlan.c~linux-next-git-rejects drivers/net/vxlan.c
--- a/drivers/net/vxlan.c~linux-next-git-rejects
+++ a/drivers/net/vxlan.c
@@ -1311,33 +1311,11 @@ static int vxlan_rcv(struct sock *sk, st
 	/* For backwards compatibility, only allow reserved fields to be
 	 * used by VXLAN extensions if explicitly requested.
 	 */
-<<<<<<< HEAD
-	if ((flags & VXLAN_HF_GBP) && (vs->flags & VXLAN_F_GBP)) {
-		struct vxlanhdr_gbp *gbp;
-
-		gbp = (struct vxlanhdr_gbp *)vxh;
-		md->gbp = ntohs(gbp->policy_id);
-
-		if (tun_dst) {
-			tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT;
-			tun_dst->u.tun_info.options_len = sizeof(*md);
-		}
-
-		if (gbp->dont_learn)
-			md->gbp |= VXLAN_GBP_DONT_LEARN;
-
-		if (gbp->policy_applied)
-			md->gbp |= VXLAN_GBP_POLICY_APPLIED;
-
-		flags &= ~VXLAN_GBP_USED_BITS;
-	}
-=======
 	if (vs->flags & VXLAN_F_REMCSUM_RX)
 		if (!vxlan_remcsum(&unparsed, skb, vs->flags))
 			goto drop;
 	if (vs->flags & VXLAN_F_GBP)
 		vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md);
->>>>>>> linux-next/akpm-base
 
 	if (unparsed.vx_flags || unparsed.vx_vni) {
 		/* If there are any unprocessed flags remaining treat
diff -puN drivers/net/wireless/intel/iwlwifi/mvm/fw.c~linux-next-git-rejects drivers/net/wireless/intel/iwlwifi/mvm/fw.c
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c~linux-next-git-rejects
+++ a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -108,8 +108,6 @@ static int iwl_send_tx_ant_cfg(struct iw
 				    sizeof(tx_ant_cmd), &tx_ant_cmd);
 }
 
-<<<<<<< HEAD
-=======
 static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)
 {
 	int i;
@@ -128,7 +126,6 @@ static int iwl_send_rss_cfg_cmd(struct i
 	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);
 }
 
->>>>>>> linux-next/akpm-base
 void iwl_free_fw_paging(struct iwl_mvm *mvm)
 {
 	int i;
diff -puN include/uapi/linux/bpf.h~linux-next-git-rejects include/uapi/linux/bpf.h
--- a/include/uapi/linux/bpf.h~linux-next-git-rejects
+++ a/include/uapi/linux/bpf.h
@@ -324,15 +324,12 @@ enum bpf_func_id {
 /* BPF_FUNC_skb_set_tunnel_key flags. */
 #define BPF_F_ZERO_CSUM_TX		(1ULL << 1)
 
-<<<<<<< HEAD
-=======
 /* BPF_FUNC_get_stackid flags. */
 #define BPF_F_SKIP_FIELD_MASK		0xffULL
 #define BPF_F_USER_STACK		(1ULL << 8)
 #define BPF_F_FAST_STACK_CMP		(1ULL << 9)
 #define BPF_F_REUSE_STACKID		(1ULL << 10)
 
->>>>>>> linux-next/akpm-base
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
diff -puN net/tipc/subscr.c~linux-next-git-rejects net/tipc/subscr.c
--- a/net/tipc/subscr.c~linux-next-git-rejects
+++ a/net/tipc/subscr.c
@@ -326,12 +326,7 @@ static void tipc_subscrb_rcv_cb(struct n
 		return tipc_subscrp_cancel(s, subscriber);
 	}
 
-<<<<<<< HEAD
-	if (sub)
-		tipc_nametbl_subscribe(sub);
-=======
 	tipc_subscrp_subscribe(net, s, subscriber, swap);
->>>>>>> linux-next/akpm-base
 }
 
 /* Handle one request to establish a new subscriber */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
slub-drop-lock-at-the-end-of-free_debug_processing-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-add-a-new-vector-based-madvise-syscall-fix.patch
mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-3-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
mn10300-c6x-config_generic_bug-must-depend-on-config_bug.patch
arch-mn10300-kernel-fpu-nofpuc-needs-asm-elfh.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sscanf-implement-basic-character-sets-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
rapidio-add-mport-char-device-driver-fix.patch
kernel-add-kcov-code-coverage-fix.patch
kernel-add-kcov-code-coverage-fix-2.patch
kernel-add-kcov-code-coverage-makefile-tweaks.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-02-29 20:23 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-02-29 20:23 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |   12 ------------
 drivers/gpu/drm/i915/intel_csr.c            |    3 ---
 drivers/gpu/drm/i915/intel_ddi.c            |   10 ----------
 sound/pci/hda/patch_realtek.c               |   13 -------------
 4 files changed, 38 deletions(-)

diff -puN drivers/gpu/drm/amd/amdgpu/amdgpu_display.c~linux-next-git-rejects drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -124,18 +124,6 @@ static void amdgpu_flip_work_func(struct
 		spin_lock_irqsave(&crtc->dev->event_lock, flags);
 	};
 
-<<<<<<< HEAD
-	if (!repcnt)
-		DRM_DEBUG_DRIVER("Delay problem on crtc %d: min_udelay %d, "
-				 "framedur %d, linedur %d, stat %d, vpos %d, "
-				 "hpos %d\n", work->crtc_id, min_udelay,
-				 vblank->framedur_ns / 1000,
-				 vblank->linedur_ns / 1000, stat, vpos, hpos);
-
-	/* do the flip (mmio) */
-	adev->mode_info.funcs->page_flip(adev, work->crtc_id, work->base);
-=======
->>>>>>> linux-next/akpm-base
 	/* set the flip status */
 	amdgpuCrtc->pflip_status = AMDGPU_FLIP_SUBMITTED;
 	spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
diff -puN drivers/gpu/drm/i915/intel_csr.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_csr.c
--- a/drivers/gpu/drm/i915/intel_csr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_csr.c
@@ -245,11 +245,8 @@ bool intel_csr_load_program(struct drm_i
 	}
 
 	dev_priv->csr.dc_state = 0;
-<<<<<<< HEAD
-=======
 
 	return true;
->>>>>>> linux-next/akpm-base
 }
 
 static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
diff -puN drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_ddi.c
--- a/drivers/gpu/drm/i915/intel_ddi.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ddi.c
@@ -2002,7 +2002,6 @@ bool intel_ddi_get_hw_state(struct intel
 		}
 
 		ret = true;
-<<<<<<< HEAD
 
 		goto out;
 	}
@@ -2010,15 +2009,6 @@ bool intel_ddi_get_hw_state(struct intel
 	for (i = TRANSCODER_A; i <= TRANSCODER_C; i++) {
 		tmp = I915_READ(TRANS_DDI_FUNC_CTL(i));
 
-=======
-
-		goto out;
-	}
-
-	for (i = TRANSCODER_A; i <= TRANSCODER_C; i++) {
-		tmp = I915_READ(TRANS_DDI_FUNC_CTL(i));
-
->>>>>>> linux-next/akpm-base
 		if ((tmp & TRANS_DDI_PORT_MASK) == TRANS_DDI_SELECT_PORT(port)) {
 			if ((tmp & TRANS_DDI_MODE_SELECT_MASK) ==
 			    TRANS_DDI_MODE_SELECT_DP_MST)
diff -puN sound/pci/hda/patch_realtek.c~linux-next-git-rejects sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_realtek.c~linux-next-git-rejects
+++ a/sound/pci/hda/patch_realtek.c
@@ -4758,10 +4758,6 @@ enum {
 	ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY,
 	ALC255_FIXUP_DELL_SPK_NOISE,
 	ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
-<<<<<<< HEAD
-	ALC280_FIXUP_HP_HEADSET_MIC,
-=======
->>>>>>> linux-next/akpm-base
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -5398,15 +5394,6 @@ static const struct hda_fixup alc269_fix
 		.chained = true,
 		.chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE
 	},
-<<<<<<< HEAD
-	[ALC280_FIXUP_HP_HEADSET_MIC] = {
-		.type = HDA_FIXUP_FUNC,
-		.v.func = alc_fixup_disable_aamix,
-		.chained = true,
-		.chain_id = ALC269_FIXUP_HEADSET_MIC,
-	},
-=======
->>>>>>> linux-next/akpm-base
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
slub-drop-lock-at-the-end-of-free_debug_processing-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-config_nr_zones_extended-fix.patch
mm-add-a-new-vector-based-madvise-syscall-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
rapidio-add-mport-char-device-driver-fix.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
kernel-add-kcov-code-coverage-fix.patch
kernel-add-kcov-code-coverage-fix-2.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
net-sched-sch_mqprioc-fix-build-with-older-gcc.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-02-16 18:48 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-02-16 18:48 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/soc/intel/skylake/skl-topology.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/net/vxlan.c~linux-next-git-rejects drivers/net/vxlan.c
diff -puN sound/soc/intel/skylake/skl-topology.c~linux-next-git-rejects sound/soc/intel/skylake/skl-topology.c
--- a/sound/soc/intel/skylake/skl-topology.c~linux-next-git-rejects
+++ a/sound/soc/intel/skylake/skl-topology.c
@@ -603,8 +603,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_e
 	skl_tplg_alloc_pipe_mem(skl, mconfig);
 	skl_tplg_alloc_pipe_mcps(skl, mconfig);
 
-<<<<<<< HEAD
-=======
 	return 0;
 }
 
@@ -665,7 +663,6 @@ static int skl_tplg_set_module_bind_para
 		}
 	}
 
->>>>>>> linux-next/akpm-base
 	return 0;
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-config_nr_zones_extended-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
rapidio-add-mport-char-device-driver-fix.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
kernel-add-kcov-code-coverage-fix.patch
kernel-add-kcov-code-coverage-fix-2.patch
linux-next-rejects.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-02-09 18:47 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-02-09 18:47 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/mips/boot/dts/brcm/bcm6328.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7125.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7346.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7358.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7360.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7362.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7420.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7425.dtsi |    4 -
 arch/mips/boot/dts/brcm/bcm7435.dtsi |    4 -
 drivers/base/regmap/regmap-mmio.c    |   58 -------------------------
 10 files changed, 94 deletions(-)

diff -puN arch/mips/boot/dts/brcm/bcm6328.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm6328.dtsi
--- a/arch/mips/boot/dts/brcm/bcm6328.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@ -74,11 +74,7 @@
 		timer: timer@10000040 {
 			compatible = "syscon";
 			reg = <0x10000040 0x2c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7125.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7125.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7125.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7125.dtsi
@@ -98,11 +98,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7125-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x60c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7346.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7346.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7346.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -118,11 +118,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7346-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7358.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7358.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7358.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7358.dtsi
@@ -112,11 +112,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7358-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7360.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7360.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7360.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7360.dtsi
@@ -112,11 +112,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7360-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7362.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7362.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7362.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -118,11 +118,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7362-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7420.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7420.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7420.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7420.dtsi
@@ -99,11 +99,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7420-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x60c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7425.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7425.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7425.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -100,11 +100,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7425-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN arch/mips/boot/dts/brcm/bcm7435.dtsi~linux-next-git-rejects arch/mips/boot/dts/brcm/bcm7435.dtsi
--- a/arch/mips/boot/dts/brcm/bcm7435.dtsi~linux-next-git-rejects
+++ a/arch/mips/boot/dts/brcm/bcm7435.dtsi
@@ -114,11 +114,7 @@
 		sun_top_ctrl: syscon@404000 {
 			compatible = "brcm,bcm7425-sun-top-ctrl", "syscon";
 			reg = <0x404000 0x51c>;
-<<<<<<< HEAD
-			little-endian;
-=======
 			native-endian;
->>>>>>> linux-next/akpm-base
 		};
 
 		reboot {
diff -puN drivers/base/regmap/regmap-mmio.c~linux-next-git-rejects drivers/base/regmap/regmap-mmio.c
--- a/drivers/base/regmap/regmap-mmio.c~linux-next-git-rejects
+++ a/drivers/base/regmap/regmap-mmio.c
@@ -131,36 +131,7 @@ static int regmap_mmio_write(void *conte
 			return ret;
 	}
 
-<<<<<<< HEAD
-	offset = regmap_mmio_get_offset(reg, reg_size);
-
-	while (val_size) {
-		switch (ctx->val_bytes) {
-		case 1:
-			writeb(*(u8 *)val, ctx->regs + offset);
-			break;
-		case 2:
-			writew(*(u16 *)val, ctx->regs + offset);
-			break;
-		case 4:
-			writel(*(u32 *)val, ctx->regs + offset);
-			break;
-#ifdef CONFIG_64BIT
-		case 8:
-			writeq(*(u64 *)val, ctx->regs + offset);
-			break;
-#endif
-		default:
-			/* Should be caught by regmap_mmio_check_config */
-			BUG();
-		}
-		val_size -= ctx->val_bytes;
-		val += ctx->val_bytes;
-		offset += ctx->val_bytes;
-	}
-=======
 	ctx->reg_write(ctx, reg, val);
->>>>>>> linux-next/akpm-base
 
 	if (!IS_ERR(ctx->clk))
 		clk_disable(ctx->clk);
@@ -217,36 +188,7 @@ static int regmap_mmio_read(void *contex
 			return ret;
 	}
 
-<<<<<<< HEAD
-	offset = regmap_mmio_get_offset(reg, reg_size);
-
-	while (val_size) {
-		switch (ctx->val_bytes) {
-		case 1:
-			*(u8 *)val = readb(ctx->regs + offset);
-			break;
-		case 2:
-			*(u16 *)val = readw(ctx->regs + offset);
-			break;
-		case 4:
-			*(u32 *)val = readl(ctx->regs + offset);
-			break;
-#ifdef CONFIG_64BIT
-		case 8:
-			*(u64 *)val = readq(ctx->regs + offset);
-			break;
-#endif
-		default:
-			/* Should be caught by regmap_mmio_check_config */
-			BUG();
-		}
-		val_size -= ctx->val_bytes;
-		val += ctx->val_bytes;
-		offset += ctx->val_bytes;
-	}
-=======
 	*val = ctx->reg_read(ctx, reg);
->>>>>>> linux-next/akpm-base
 
 	if (!IS_ERR(ctx->clk))
 		clk_disable(ctx->clk);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
vsprintf-kptr_restrict-is-okay-in-irq-when-2-checkpatch-fixes.patch
kernel-locking-lockdepc-convert-hash-tables-to-hlists.patch
kernel-locking-lockdepc-convert-hash-tables-to-hlists-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
sound-query-dynamic-debug_pagealloc-setting-fix.patch
mm-config_nr_zones_extended-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
rapidio-add-global-inbound-port-write-interfaces-fix.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
kernel-add-kcov-code-coverage-fix.patch
kernel-add-kcov-code-coverage-fix-2.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-02-04 20:27 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-02-04 20:27 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 MAINTAINERS |    3 ---
 1 file changed, 3 deletions(-)

diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -1441,10 +1441,7 @@ F:	arch/arm/boot/dts/qcom-*.dts
 F:	arch/arm/boot/dts/qcom-*.dtsi
 F:	arch/arm/mach-qcom/
 F:	arch/arm64/boot/dts/qcom/*
-<<<<<<< HEAD
-=======
 F:	drivers/i2c/busses/i2c-qup.c
->>>>>>> linux-next/akpm-base
 F:	drivers/soc/qcom/
 F:	drivers/spi/spi-qup.c
 F:	drivers/tty/serial/msm_serial.h
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
kernel-locking-lockdepc-convert-hash-tables-to-hlists.patch
kernel-locking-lockdepc-convert-hash-tables-to-hlists-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-code-clean-up-for-direct-io-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
mm.patch
mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
mm-madvise-update-comment-on-sys_madvise-fix.patch
mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
mm-simplify-lock_page_memcg-fix.patch
sched-add-schedule_timeout_idle.patch
mm-oom_reaper-report-success-failure-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
zram-export-the-number-of-available-comp-streams-fix.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
btrfs-use-radix_tree_iter_retry-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-01-14 20:09 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-01-14 20:09 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/acpi/acpi_lpss.c                          |   10 -
 drivers/i2c/busses/i2c-designware-platdrv.c       |    3 
 drivers/infiniband/hw/mlx5/main.c                 |    4 
 drivers/net/ethernet/mellanox/mlx5/core/vport.c   |   67 -------
 drivers/net/wireless/intel/iwlegacy/4965-mac.c    |    9 
 drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c |    9 
 drivers/net/wireless/st/cw1200/sta.c              |    6 
 drivers/s390/char/zcore.c                         |  112 ------------
 include/linux/fs.h                                |   28 ---
 include/linux/mlx5/device.h                       |    4 
 include/linux/mlx5/mlx5_ifc.h                     |   29 ---
 include/linux/mlx5/vport.h                        |    6 
 include/linux/pci_ids.h                           |    3 
 include/net/mac80211.h                            |    6 
 net/mac80211/offchannel.c                         |   62 ------
 net/mac80211/sta_info.c                           |    4 
 16 files changed, 362 deletions(-)

diff -puN drivers/acpi/acpi_lpss.c~linux-next-git-rejects drivers/acpi/acpi_lpss.c
--- a/drivers/acpi/acpi_lpss.c~linux-next-git-rejects
+++ a/drivers/acpi/acpi_lpss.c
@@ -876,21 +876,14 @@ static int acpi_lpss_platform_notify(str
 
 	switch (action) {
 	case BUS_NOTIFY_BIND_DRIVER:
-<<<<<<< HEAD
-		pdev->dev.pm_domain = &acpi_lpss_pm_domain;
-=======
 		dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
->>>>>>> linux-next/akpm-base
 		break;
 	case BUS_NOTIFY_DRIVER_NOT_BOUND:
 	case BUS_NOTIFY_UNBOUND_DRIVER:
 		pdev->dev.pm_domain = NULL;
 		break;
 	case BUS_NOTIFY_ADD_DEVICE:
-<<<<<<< HEAD
-=======
 		dev_pm_domain_set(&pdev->dev, &acpi_lpss_pm_domain);
->>>>>>> linux-next/akpm-base
 		if (pdata->dev_desc->flags & LPSS_LTR)
 			return sysfs_create_group(&pdev->dev.kobj,
 						  &lpss_attr_group);
@@ -898,10 +891,7 @@ static int acpi_lpss_platform_notify(str
 	case BUS_NOTIFY_DEL_DEVICE:
 		if (pdata->dev_desc->flags & LPSS_LTR)
 			sysfs_remove_group(&pdev->dev.kobj, &lpss_attr_group);
-<<<<<<< HEAD
-=======
 		dev_pm_domain_set(&pdev->dev, NULL);
->>>>>>> linux-next/akpm-base
 		break;
 	default:
 		break;
diff -puN drivers/i2c/busses/i2c-designware-platdrv.c~linux-next-git-rejects drivers/i2c/busses/i2c-designware-platdrv.c
--- a/drivers/i2c/busses/i2c-designware-platdrv.c~linux-next-git-rejects
+++ a/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -123,10 +123,7 @@ static const struct acpi_device_id dw_i2
 	{ "80860F41", 0 },
 	{ "808622C1", 0 },
 	{ "AMD0010", ACCESS_INTR_MASK },
-<<<<<<< HEAD
-=======
 	{ "AMDI0510", 0 },
->>>>>>> linux-next/akpm-base
 	{ "APMC0D0F", 0 },
 	{ }
 };
diff -puN drivers/infiniband/hw/mlx5/main.c~linux-next-git-rejects drivers/infiniband/hw/mlx5/main.c
--- a/drivers/infiniband/hw/mlx5/main.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/main.c
@@ -2252,11 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_cor
 			(1ull << IB_USER_VERBS_CMD_CLOSE_XRCD);
 	}
 
-<<<<<<< HEAD
-	if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
-=======
 	if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) ==
->>>>>>> linux-next/akpm-base
 	    IB_LINK_LAYER_ETHERNET) {
 		dev->ib_dev.create_flow	= mlx5_ib_create_flow;
 		dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow;
diff -puN drivers/net/ethernet/mellanox/mlx5/core/vport.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/vport.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -77,7 +77,6 @@ u8 mlx5_query_vport_admin_state(struct m
 	return MLX5_GET(query_vport_state_out, out, admin_state);
 }
 EXPORT_SYMBOL(mlx5_query_vport_admin_state);
-<<<<<<< HEAD
 
 int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,
 				  u16 vport, u8 state)
@@ -136,66 +135,6 @@ static int mlx5_modify_nic_vport_context
 	return mlx5_cmd_exec_check_status(mdev, in, inlen, out, sizeof(out));
 }
 
-=======
-
-int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,
-				  u16 vport, u8 state)
-{
-	u32 in[MLX5_ST_SZ_DW(modify_vport_state_in)];
-	u32 out[MLX5_ST_SZ_DW(modify_vport_state_out)];
-	int err;
-
-	memset(in, 0, sizeof(in));
-
-	MLX5_SET(modify_vport_state_in, in, opcode,
-		 MLX5_CMD_OP_MODIFY_VPORT_STATE);
-	MLX5_SET(modify_vport_state_in, in, op_mod, opmod);
-	MLX5_SET(modify_vport_state_in, in, vport_number, vport);
-
-	if (vport)
-		MLX5_SET(modify_vport_state_in, in, other_vport, 1);
-
-	MLX5_SET(modify_vport_state_in, in, admin_state, state);
-
-	err = mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out,
-					 sizeof(out));
-	if (err)
-		mlx5_core_warn(mdev, "MLX5_CMD_OP_MODIFY_VPORT_STATE failed\n");
-
-	return err;
-}
-EXPORT_SYMBOL(mlx5_modify_vport_admin_state);
-
-static int mlx5_query_nic_vport_context(struct mlx5_core_dev *mdev, u16 vport,
-					u32 *out, int outlen)
-{
-	u32 in[MLX5_ST_SZ_DW(query_nic_vport_context_in)];
-
-	memset(in, 0, sizeof(in));
-
-	MLX5_SET(query_nic_vport_context_in, in, opcode,
-		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);
-
-	MLX5_SET(query_nic_vport_context_in, in, vport_number, vport);
-	if (vport)
-		MLX5_SET(query_nic_vport_context_in, in, other_vport, 1);
-
-	return mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out, outlen);
-}
-
-static int mlx5_modify_nic_vport_context(struct mlx5_core_dev *mdev, void *in,
-					 int inlen)
-{
-	u32 out[MLX5_ST_SZ_DW(modify_nic_vport_context_out)];
-
-	MLX5_SET(modify_nic_vport_context_in, in, opcode,
-		 MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);
-
-	memset(out, 0, sizeof(out));
-	return mlx5_cmd_exec_check_status(mdev, in, inlen, out, sizeof(out));
-}
-
->>>>>>> linux-next/akpm-base
 int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev,
 				     u16 vport, u8 *addr)
 {
@@ -490,8 +429,6 @@ int mlx5_modify_nic_vport_vlans(struct m
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_vlans);
-<<<<<<< HEAD
-=======
 
 int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
 					   u64 *system_image_guid)
@@ -554,7 +491,6 @@ int mlx5_query_nic_vport_qkey_viol_cntr(
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_qkey_viol_cntr);
->>>>>>> linux-next/akpm-base
 
 int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,
 			     u8 port_num, u16  vf_num, u16 gid_index,
@@ -876,8 +812,6 @@ int mlx5_modify_nic_vport_promisc(struct
 	return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_promisc);
-<<<<<<< HEAD
-=======
 
 enum mlx5_vport_roce_state {
 	MLX5_VPORT_ROCE_DISABLED = 0,
@@ -919,4 +853,3 @@ int mlx5_nic_vport_disable_roce(struct m
 	return mlx5_nic_vport_update_roce_state(mdev, MLX5_VPORT_ROCE_DISABLED);
 }
 EXPORT_SYMBOL_GPL(mlx5_nic_vport_disable_roce);
->>>>>>> linux-next/akpm-base
diff -puN drivers/net/wireless/intel/iwlegacy/4965-mac.c~linux-next-git-rejects drivers/net/wireless/intel/iwlegacy/4965-mac.c
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c~linux-next-git-rejects
+++ a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -5982,14 +5982,6 @@ il4965_mac_set_key(struct ieee80211_hw *
 
 int
 il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-<<<<<<< HEAD
-			enum ieee80211_ampdu_mlme_action action,
-			struct ieee80211_sta *sta, u16 tid, u16 * ssn,
-			u8 buf_size, bool amsdu)
-{
-	struct il_priv *il = hw->priv;
-	int ret = -EINVAL;
-=======
 			struct ieee80211_ampdu_params *params)
 {
 	struct il_priv *il = hw->priv;
@@ -5998,7 +5990,6 @@ il4965_mac_ampdu_action(struct ieee80211
 	enum ieee80211_ampdu_mlme_action action = params->action;
 	u16 tid = params->tid;
 	u16 *ssn = &params->ssn;
->>>>>>> linux-next/akpm-base
 
 	D_HT("A-MPDU action on addr %pM tid %d\n", sta->addr, tid);
 
diff -puN drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c~linux-next-git-rejects drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
--- a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c~linux-next-git-rejects
+++ a/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
@@ -732,14 +732,6 @@ static inline bool iwl_enable_tx_ampdu(c
 
 static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
 				   struct ieee80211_vif *vif,
-<<<<<<< HEAD
-				   enum ieee80211_ampdu_mlme_action action,
-				   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-				   u8 buf_size, bool amsdu)
-{
-	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-	int ret = -EINVAL;
-=======
 				   struct ieee80211_ampdu_params *params)
 {
 	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -749,7 +741,6 @@ static int iwlagn_mac_ampdu_action(struc
 	u16 tid = params->tid;
 	u16 *ssn = &params->ssn;
 	u8 buf_size = params->buf_size;
->>>>>>> linux-next/akpm-base
 	struct iwl_station_priv *sta_priv = (void *) sta->drv_priv;
 
 	IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
diff -puN drivers/net/wireless/st/cw1200/sta.c~linux-next-git-rejects drivers/net/wireless/st/cw1200/sta.c
--- a/drivers/net/wireless/st/cw1200/sta.c~linux-next-git-rejects
+++ a/drivers/net/wireless/st/cw1200/sta.c
@@ -2129,13 +2129,7 @@ void cw1200_mcast_timeout(unsigned long
 
 int cw1200_ampdu_action(struct ieee80211_hw *hw,
 			struct ieee80211_vif *vif,
-<<<<<<< HEAD
-			enum ieee80211_ampdu_mlme_action action,
-			struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-			u8 buf_size, bool amsdu)
-=======
 			struct ieee80211_ampdu_params *params)
->>>>>>> linux-next/akpm-base
 {
 	/* Aggregation is implemented fully in firmware,
 	 * including block ack negotiation. Do not allow
diff -puN drivers/s390/char/zcore.c~linux-next-git-rejects drivers/s390/char/zcore.c
--- a/drivers/s390/char/zcore.c~linux-next-git-rejects
+++ a/drivers/s390/char/zcore.c
@@ -140,118 +140,6 @@ static void release_hsa(void)
 	hsa_available = 0;
 }
 
-<<<<<<< HEAD
-/*
- * Read routine for zcore character device
- * First 4K are dump header
- * Next 32MB are HSA Memory
- * Rest is read from absolute Memory
- */
-static ssize_t zcore_read(struct file *file, char __user *buf, size_t count,
-			  loff_t *ppos)
-{
-	unsigned long mem_start; /* Start address in memory */
-	size_t mem_offs;	 /* Offset in dump memory */
-	size_t hdr_count;	 /* Size of header part of output buffer */
-	size_t size;
-	int rc;
-
-	mutex_lock(&zcore_mutex);
-
-	if (*ppos > (sys_info.mem_size + HEADER_SIZE)) {
-		rc = -EINVAL;
-		goto fail;
-	}
-
-	count = min(count, (size_t) (sys_info.mem_size + HEADER_SIZE - *ppos));
-
-	/* Copy dump header */
-	if (*ppos < HEADER_SIZE) {
-		size = min(count, (size_t) (HEADER_SIZE - *ppos));
-		if (copy_to_user(buf, &zcore_header + *ppos, size)) {
-			rc = -EFAULT;
-			goto fail;
-		}
-		hdr_count = size;
-		mem_start = 0;
-	} else {
-		hdr_count = 0;
-		mem_start = *ppos - HEADER_SIZE;
-	}
-
-	mem_offs = 0;
-
-	/* Copy from HSA data */
-	if (*ppos < sclp.hsa_size + HEADER_SIZE) {
-		size = min((count - hdr_count),
-			   (size_t) (sclp.hsa_size - mem_start));
-		rc = memcpy_hsa_user(buf + hdr_count, mem_start, size);
-		if (rc)
-			goto fail;
-
-		mem_offs += size;
-	}
-
-	/* Copy from real mem */
-	size = count - mem_offs - hdr_count;
-	rc = copy_to_user_real(buf + hdr_count + mem_offs,
-			       (void *) mem_start + mem_offs, size);
-	if (rc)
-		goto fail;
-
-	/*
-	 * Since s390 dump analysis tools like lcrash or crash
-	 * expect register sets in the prefix pages of the cpus,
-	 * we copy them into the read buffer, if necessary.
-	 * buf + hdr_count: Start of memory part of output buffer
-	 * mem_start: Start memory address to copy from
-	 * count - hdr_count: Size of memory area to copy
-	 */
-	if (zcore_add_lc(buf + hdr_count, mem_start, count - hdr_count)) {
-		rc = -EFAULT;
-		goto fail;
-	}
-	*ppos += count;
-fail:
-	mutex_unlock(&zcore_mutex);
-	return (rc < 0) ? rc : count;
-}
-
-static int zcore_open(struct inode *inode, struct file *filp)
-{
-	if (!hsa_available)
-		return -ENODATA;
-	else
-		return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
-}
-
-static int zcore_release(struct inode *inode, struct file *filep)
-{
-	if (hsa_available)
-		release_hsa();
-	return 0;
-}
-
-static loff_t zcore_lseek(struct file *file, loff_t offset, int orig)
-{
-	loff_t rc;
-
-	mutex_lock(&zcore_mutex);
-	rc = no_seek_end_llseek(file, offset, orig);
-	mutex_unlock(&zcore_mutex);
-	return rc;
-}
-
-static const struct file_operations zcore_fops = {
-	.owner		= THIS_MODULE,
-	.llseek		= zcore_lseek,
-	.read		= zcore_read,
-	.open		= zcore_open,
-	.release	= zcore_release,
-};
-
-=======
->>>>>>> linux-next/akpm-base
 static ssize_t zcore_memmap_read(struct file *filp, char __user *buf,
 				 size_t count, loff_t *ppos)
 {
diff -puN include/linux/fs.h~linux-next-git-rejects include/linux/fs.h
--- a/include/linux/fs.h~linux-next-git-rejects
+++ a/include/linux/fs.h
@@ -2099,38 +2099,11 @@ static inline int locks_mandatory_locked
 }
 
 static inline int locks_mandatory_area(struct inode *inode, struct file *filp,
-<<<<<<< HEAD
-                                       loff_t start, loff_t end, unsigned char type)
-{
-	return 0;
-}
-
-static inline int __mandatory_lock(struct inode *inode)
-{
-	return 0;
-}
-
-static inline int mandatory_lock(struct inode *inode)
-{
-	return 0;
-}
-
-static inline int locks_verify_locked(struct file *file)
-{
-	return 0;
-}
-
-static inline int locks_verify_truncate(struct inode *inode, struct file *filp,
-					size_t size)
-=======
 		loff_t start, loff_t end, unsigned char type)
->>>>>>> linux-next/akpm-base
 {
 	return 0;
 }
 
-<<<<<<< HEAD
-=======
 static inline int __mandatory_lock(struct inode *inode)
 {
 	return 0;
@@ -2152,7 +2125,6 @@ static inline int locks_verify_truncate(
 	return 0;
 }
 
->>>>>>> linux-next/akpm-base
 #endif /* CONFIG_MANDATORY_FILE_LOCKING */
 
 
diff -puN include/linux/mlx5/device.h~linux-next-git-rejects include/linux/mlx5/device.h
--- a/include/linux/mlx5/device.h~linux-next-git-rejects
+++ a/include/linux/mlx5/device.h
@@ -466,11 +466,7 @@ struct mlx5_init_seg {
 	__be32			rsvd2[880];
 	__be32			internal_timer_h;
 	__be32			internal_timer_l;
-<<<<<<< HEAD
-	__be32			rsrv3[2];
-=======
 	__be32			rsvd3[2];
->>>>>>> linux-next/akpm-base
 	__be32			health_counter;
 	__be32			rsvd4[1019];
 	__be64			ieee1588_clk;
diff -puN include/linux/mlx5/mlx5_ifc.h~linux-next-git-rejects include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/mlx5/mlx5_ifc.h~linux-next-git-rejects
+++ a/include/linux/mlx5/mlx5_ifc.h
@@ -858,28 +858,18 @@ struct mlx5_ifc_cmd_hca_cap_bits {
 	u8         reserved_66[0x8];
 	u8         log_uar_page_sz[0x10];
 
-<<<<<<< HEAD
-	u8         reserved_67[0x40];
-	u8         device_frequency_khz[0x20];
-	u8         reserved_68[0x5f];
-=======
 	u8	   reserved_67[0x20];
 	u8	   device_frequency_mhz[0x20];
 	u8	   device_frequency_khz[0x20];
 	u8         reserved_68[0xa0];
 
 	u8         reserved_69[0x1f];
->>>>>>> linux-next/akpm-base
 	u8         cqe_zip[0x1];
 
 	u8         cqe_zip_timeout[0x10];
 	u8         cqe_zip_max_num[0x10];
 
-<<<<<<< HEAD
-	u8         reserved_69[0x220];
-=======
 	u8         reserved_70[0x220];
->>>>>>> linux-next/akpm-base
 };
 
 enum mlx5_flow_destination_type {
@@ -2231,14 +2221,6 @@ struct mlx5_ifc_nic_vport_context_bits {
 	u8         event_on_vlan_change[0x1];
 	u8         event_on_mc_address_change[0x1];
 	u8         event_on_uc_address_change[0x1];
-<<<<<<< HEAD
-
-	u8         reserved_2[0xf0];
-
-	u8         mtu[0x10];
-
-	u8         reserved_3[0x640];
-=======
 
 	u8         reserved_2[0xf0];
 
@@ -2251,29 +2233,18 @@ struct mlx5_ifc_nic_vport_context_bits {
 	u8         reserved_3[0x140];
 	u8         qkey_violation_counter[0x10];
 	u8         reserved_4[0x430];
->>>>>>> linux-next/akpm-base
 
 	u8         promisc_uc[0x1];
 	u8         promisc_mc[0x1];
 	u8         promisc_all[0x1];
-<<<<<<< HEAD
-	u8         reserved_4[0x2];
-	u8         allowed_list_type[0x3];
-	u8         reserved_5[0xc];
-=======
 	u8         reserved_5[0x2];
 	u8         allowed_list_type[0x3];
 	u8         reserved_6[0xc];
->>>>>>> linux-next/akpm-base
 	u8         allowed_list_size[0xc];
 
 	struct mlx5_ifc_mac_address_layout_bits permanent_address;
 
-<<<<<<< HEAD
-	u8         reserved_6[0x20];
-=======
 	u8         reserved_7[0x20];
->>>>>>> linux-next/akpm-base
 
 	u8         current_uc_mac_address[0][0x40];
 };
diff -puN include/linux/mlx5/vport.h~linux-next-git-rejects include/linux/mlx5/vport.h
--- a/include/linux/mlx5/vport.h~linux-next-git-rejects
+++ a/include/linux/mlx5/vport.h
@@ -45,14 +45,11 @@ int mlx5_query_nic_vport_mac_address(str
 				     u16 vport, u8 *addr);
 int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *dev,
 				      u16 vport, u8 *addr);
-<<<<<<< HEAD
-=======
 int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
 					   u64 *system_image_guid);
 int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);
 int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
 					u16 *qkey_viol_cntr);
->>>>>>> linux-next/akpm-base
 int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,
 			     u8 port_num, u16  vf_num, u16 gid_index,
 			     union ib_gid *gid);
@@ -92,11 +89,8 @@ int mlx5_query_nic_vport_vlans(struct ml
 int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,
 				u16 vlans[],
 				int list_size);
-<<<<<<< HEAD
-=======
 
 int mlx5_nic_vport_enable_roce(struct mlx5_core_dev *mdev);
 int mlx5_nic_vport_disable_roce(struct mlx5_core_dev *mdev);
->>>>>>> linux-next/akpm-base
 
 #endif /* __MLX5_VPORT_H__ */
diff -puN include/linux/pci_ids.h~linux-next-git-rejects include/linux/pci_ids.h
--- a/include/linux/pci_ids.h~linux-next-git-rejects
+++ a/include/linux/pci_ids.h
@@ -2496,13 +2496,10 @@
 #define PCI_DEVICE_ID_KORENIX_JETCARDF3	0x17ff
 
 #define PCI_VENDOR_ID_NETRONOME		0x19ee
-<<<<<<< HEAD
-=======
 #define PCI_DEVICE_ID_NETRONOME_NFP3200	0x3200
 #define PCI_DEVICE_ID_NETRONOME_NFP3240	0x3240
 #define PCI_DEVICE_ID_NETRONOME_NFP6000	0x6000
 #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
->>>>>>> linux-next/akpm-base
 
 #define PCI_VENDOR_ID_QMI		0x1a32
 
diff -puN include/net/mac80211.h~linux-next-git-rejects include/net/mac80211.h
--- a/include/net/mac80211.h~linux-next-git-rejects
+++ a/include/net/mac80211.h
@@ -1954,14 +1954,11 @@ struct ieee80211_txq {
  *	by just its MAC address; this prevents, for example, the same station
  *	from connecting to two virtual AP interfaces at the same time.
  *
-<<<<<<< HEAD
-=======
  * @IEEE80211_HW_SUPPORTS_REORDERING_BUFFER: Hardware (or driver) manages the
  *	reordering buffer internally, guaranteeing mac80211 receives frames in
  *	order and does not need to manage its own reorder buffer or BA session
  *	timeout.
  *
->>>>>>> linux-next/akpm-base
  * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
  */
 enum ieee80211_hw_flags {
@@ -1998,10 +1995,7 @@ enum ieee80211_hw_flags {
 	IEEE80211_HW_SUPPORTS_AMSDU_IN_AMPDU,
 	IEEE80211_HW_BEACON_TX_STATUS,
 	IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
-<<<<<<< HEAD
-=======
 	IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,
->>>>>>> linux-next/akpm-base
 
 	/* keep last, obviously */
 	NUM_IEEE80211_HW_FLAGS
diff -puN net/mac80211/offchannel.c~linux-next-git-rejects net/mac80211/offchannel.c
--- a/net/mac80211/offchannel.c~linux-next-git-rejects
+++ a/net/mac80211/offchannel.c
@@ -252,20 +252,11 @@ static bool ieee80211_recalc_sw_work(str
 static void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc,
 					 unsigned long start_time)
 {
-<<<<<<< HEAD
-	struct ieee80211_local *local = roc->sdata->local;
-
-=======
->>>>>>> linux-next/akpm-base
 	if (WARN_ON(roc->notified))
 		return;
 
 	roc->start_time = start_time;
 	roc->started = true;
-<<<<<<< HEAD
-	roc->hw_begun = true;
-=======
->>>>>>> linux-next/akpm-base
 
 	if (roc->mgmt_tx_cookie) {
 		if (!WARN_ON(!roc->frame)) {
@@ -297,10 +288,7 @@ static void ieee80211_hw_roc_start(struc
 		if (!roc->started)
 			break;
 
-<<<<<<< HEAD
-=======
 		roc->hw_begun = true;
->>>>>>> linux-next/akpm-base
 		ieee80211_handle_roc_started(roc, local->hw_roc_start_time);
 	}
 
@@ -400,7 +388,6 @@ static void _ieee80211_start_next_roc(st
 
 		ieee80211_queue_delayed_work(&local->hw, &local->roc_work,
 					     msecs_to_jiffies(min_dur));
-<<<<<<< HEAD
 
 		/* tell userspace or send frame(s) */
 		list_for_each_entry(tmp, &local->roc_list, list) {
@@ -413,20 +400,6 @@ static void _ieee80211_start_next_roc(st
 	}
 }
 
-=======
-
-		/* tell userspace or send frame(s) */
-		list_for_each_entry(tmp, &local->roc_list, list) {
-			if (tmp->sdata != roc->sdata || tmp->chan != roc->chan)
-				break;
-
-			tmp->on_channel = roc->on_channel;
-			ieee80211_handle_roc_started(tmp, jiffies);
-		}
-	}
-}
-
->>>>>>> linux-next/akpm-base
 void ieee80211_start_next_roc(struct ieee80211_local *local)
 {
 	struct ieee80211_roc_work *roc;
@@ -438,13 +411,10 @@ void ieee80211_start_next_roc(struct iee
 		return;
 	}
 
-<<<<<<< HEAD
-=======
 	/* defer roc if driver is not started (i.e. during reconfig) */
 	if (local->in_reconfig)
 		return;
 
->>>>>>> linux-next/akpm-base
 	roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
 			       list);
 
@@ -566,15 +536,10 @@ ieee80211_coalesce_hw_started_roc(struct
 	 * begin, otherwise they'll both be marked properly by the work
 	 * struct that runs once the driver notifies us of the beginning
 	 */
-<<<<<<< HEAD
-	if (cur_roc->hw_begun)
-		ieee80211_handle_roc_started(new_roc, now);
-=======
 	if (cur_roc->hw_begun) {
 		new_roc->hw_begun = true;
 		ieee80211_handle_roc_started(new_roc, now);
 	}
->>>>>>> linux-next/akpm-base
 
 	return true;
 }
@@ -697,10 +662,7 @@ static int ieee80211_start_roc_work(stru
 			queued = true;
 			roc->on_channel = tmp->on_channel;
 			ieee80211_handle_roc_started(roc, now);
-<<<<<<< HEAD
-=======
 			ieee80211_recalc_sw_work(local, now);
->>>>>>> linux-next/akpm-base
 			break;
 		}
 
@@ -750,11 +712,8 @@ static int ieee80211_cancel_roc(struct i
 	mutex_lock(&local->mtx);
 	list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
 		if (!mgmt_tx && roc->cookie != cookie)
-<<<<<<< HEAD
-=======
 			continue;
 		else if (mgmt_tx && roc->mgmt_tx_cookie != cookie)
->>>>>>> linux-next/akpm-base
 			continue;
 		else if (mgmt_tx && roc->mgmt_tx_cookie != cookie)
 			continue;
@@ -773,8 +732,6 @@ static int ieee80211_cancel_roc(struct i
 		goto out_unlock;
 	}
 
-<<<<<<< HEAD
-=======
 		found = roc;
 		break;
 	}
@@ -789,29 +746,11 @@ static int ieee80211_cancel_roc(struct i
 		goto out_unlock;
 	}
 
->>>>>>> linux-next/akpm-base
 	if (local->ops->remain_on_channel) {
 		ret = drv_cancel_remain_on_channel(local);
 		if (WARN_ON_ONCE(ret)) {
 			mutex_unlock(&local->mtx);
 			return ret;
-<<<<<<< HEAD
-		}
-
-		/* TODO:
-		 * if multiple items were combined here then we really shouldn't
-		 * cancel them all - we should wait for as much time as needed
-		 * for the longest remaining one, and only then cancel ...
-		 */
-		list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
-			if (!roc->started)
-				break;
-			if (roc == found)
-				found = NULL;
-			ieee80211_roc_notify_destroy(roc);
-		}
-
-=======
 		}
 
 		/* TODO:
@@ -827,7 +766,6 @@ static int ieee80211_cancel_roc(struct i
 			ieee80211_roc_notify_destroy(roc);
 		}
 
->>>>>>> linux-next/akpm-base
 		/* that really must not happen - it was started */
 		WARN_ON(found);
 
diff -puN net/mac80211/sta_info.c~linux-next-git-rejects net/mac80211/sta_info.c
--- a/net/mac80211/sta_info.c~linux-next-git-rejects
+++ a/net/mac80211/sta_info.c
@@ -1451,11 +1451,7 @@ ieee80211_sta_ps_deliver_response(struct
 
 	more_data = ieee80211_sta_ps_more_data(sta, ignored_acs, reason, driver_release_tids);
 
-<<<<<<< HEAD
-	if (reason == IEEE80211_FRAME_RELEASE_PSPOLL)
-=======
 	if (driver_release_tids && reason == IEEE80211_FRAME_RELEASE_PSPOLL)
->>>>>>> linux-next/akpm-base
 		driver_release_tids =
 			BIT(find_highest_prio_tid(driver_release_tids));
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount-checkpatch-fixes.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch
mm.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
include-define-__phys_to_pfn-as-phys_pfn-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
mm-zonelist-enumerate-zonelists-array-index-fix.patch
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
mm-vmalloc-remove-vm_vpages-fix.patch
fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
arm64-mm-support-arch_mmap_rnd_bits-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
thp-add-debugfs-handle-to-split-all-huge-pages-fix.patch
mm-support-madvisemadv_free-fix-2-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
sched-add-schedule_timeout_idle.patch
mm-mlockc-change-can_do_mlock-return-value-type-to-boolean-fix.patch
mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
mm-hugetlbfs-unmap-pages-if-page-fault-raced-with-hole-punch-fix.patch
mm-soft-offline-exit-with-failure-for-non-anonymous-thp-fix.patch
kernel-stop_machinec-remove-config_smp-dependencies.patch
kernel-stop_machinec-remove-config_smp-dependencies-fix.patch
lib-vsprintfc-expand-field_width-to-24-bits-fix.patch
lib-test_printfc-test-dentry-printing-fix.patch
printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch
printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix-fix.patch
printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context-fix.patch
ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks-fix.patch
fs-coredump-prevent-core-path-components-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix-3.patch
linux-next-rejects.patch
fs-overlayfs-superc-needs-pagemaph.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
fs-adfs-adfsh-tidy-up-comments.patch
net-drop-tcp_memcontrolc-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-01-08 19:19 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-01-08 19:19 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/mtdcore.c |   18 ------------------
 1 file changed, 18 deletions(-)

diff -puN drivers/mtd/mtdcore.c~linux-next-git-rejects drivers/mtd/mtdcore.c
--- a/drivers/mtd/mtdcore.c~linux-next-git-rejects
+++ a/drivers/mtd/mtdcore.c
@@ -597,23 +597,6 @@ int mtd_device_parse_register(struct mtd
 {
 	struct mtd_partitions parsed;
 	int ret;
-<<<<<<< HEAD
-	struct mtd_partition *real_parts = NULL;
-
-	mtd_set_dev_defaults(mtd);
-
-	ret = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
-	if (ret <= 0 && nr_parts && parts) {
-		real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,
-				     GFP_KERNEL);
-		if (!real_parts)
-			ret = -ENOMEM;
-		else
-			ret = nr_parts;
-	}
-	/* Didn't come up with either parsed OR fallback partitions */
-	if (ret < 0) {
-=======
 
 	mtd_set_dev_defaults(mtd);
 
@@ -628,7 +611,6 @@ int mtd_device_parse_register(struct mtd
 		};
 	} else if (ret < 0) {
 		/* Didn't come up with parsed OR fallback partitions */
->>>>>>> linux-next/akpm-base
 		pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n",
 			ret);
 		/* Don't abort on errors; we can still use unpartitioned MTD */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount-checkpatch-fixes.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch
mm.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
include-define-__phys_to_pfn-as-phys_pfn-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
mm-zonelist-enumerate-zonelists-array-index-fix.patch
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
arm64-mm-support-arch_mmap_rnd_bits-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
thp-add-debugfs-handle-to-split-all-huge-pages-fix.patch
mm-support-madvisemadv_free-fix-2-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
sched-add-schedule_timeout_idle.patch
mm-oom-introduce-oom-reaper-fix-fix.patch
mm-oom-introduce-oom-reaper-fix-fix-2.patch
mm-oom-introduce-oom-reaper-checkpatch-fixes.patch
mm-oom-introduce-oom-reaper-fix-3.patch
mm-oom-introduce-oom-reaper-fix-4-fix.patch
mm-oom-introduce-oom-reaper-fix-5-fix.patch
kernel-stop_machinec-remove-config_smp-dependencies.patch
kernel-stop_machinec-remove-config_smp-dependencies-fix.patch
lib-vsprintfc-expand-field_width-to-24-bits-fix.patch
lib-test_printfc-test-dentry-printing-fix.patch
printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch
printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix-fix.patch
printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context-fix.patch
ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks-fix.patch
fs-coredump-prevent-core-path-components-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix-3.patch
linux-next-rejects.patch
fs-overlayfs-superc-needs-pagemaph.patch
drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
fs-adfs-adfsh-tidy-up-comments.patch
net-drop-tcp_memcontrolc-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2016-01-04 19:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2016-01-04 19:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_display.c |    5 -
 drivers/nvme/host/pci.c              |   95 -------------------------
 2 files changed, 100 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -14141,12 +14141,7 @@ intel_commit_cursor_plane(struct drm_pla
 
 	intel_crtc->cursor_addr = addr;
 
-<<<<<<< HEAD
-	if (crtc->state->active)
-		intel_crtc_update_cursor(crtc, state->visible);
-=======
 	intel_crtc_update_cursor(crtc, state->visible);
->>>>>>> linux-next/akpm-base
 }
 
 static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
diff -puN drivers/nvme/host/pci.c~linux-next-git-rejects drivers/nvme/host/pci.c
--- a/drivers/nvme/host/pci.c~linux-next-git-rejects
+++ a/drivers/nvme/host/pci.c
@@ -1569,81 +1569,6 @@ static int nvme_setup_io_queues(struct n
 	return result;
 }
 
-<<<<<<< HEAD
-static int ns_cmp(void *priv, struct list_head *a, struct list_head *b)
-{
-	struct nvme_ns *nsa = container_of(a, struct nvme_ns, list);
-	struct nvme_ns *nsb = container_of(b, struct nvme_ns, list);
-
-	return nsa->ns_id - nsb->ns_id;
-}
-
-static struct nvme_ns *nvme_find_ns(struct nvme_dev *dev, unsigned nsid)
-{
-	struct nvme_ns *ns;
-
-	list_for_each_entry(ns, &dev->namespaces, list) {
-		if (ns->ns_id == nsid)
-			return ns;
-		if (ns->ns_id > nsid)
-			break;
-	}
-	return NULL;
-}
-
-static inline bool nvme_io_incapable(struct nvme_dev *dev)
-{
-	return (!dev->bar || readl(&dev->bar->csts) & NVME_CSTS_CFS ||
-							dev->online_queues < 2);
-}
-
-static void nvme_ns_remove(struct nvme_ns *ns)
-{
-	bool kill = nvme_io_incapable(ns->dev) && !blk_queue_dying(ns->queue);
-
-	if (kill) {
-		blk_set_queue_dying(ns->queue);
-
-		/*
-		 * The controller was shutdown first if we got here through
-		 * device removal. The shutdown may requeue outstanding
-		 * requests. These need to be aborted immediately so
-		 * del_gendisk doesn't block indefinitely for their completion.
-		 */
-		blk_mq_abort_requeue_list(ns->queue);
-	}
-	if (ns->disk->flags & GENHD_FL_UP)
-		del_gendisk(ns->disk);
-	if (kill || !blk_queue_dying(ns->queue)) {
-		blk_mq_abort_requeue_list(ns->queue);
-		blk_cleanup_queue(ns->queue);
-	}
-	list_del_init(&ns->list);
-	kref_put(&ns->kref, nvme_free_ns);
-}
-
-static void nvme_scan_namespaces(struct nvme_dev *dev, unsigned nn)
-{
-	struct nvme_ns *ns, *next;
-	unsigned i;
-
-	for (i = 1; i <= nn; i++) {
-		ns = nvme_find_ns(dev, i);
-		if (ns) {
-			if (revalidate_disk(ns->disk))
-				nvme_ns_remove(ns);
-		} else
-			nvme_alloc_ns(dev, i);
-	}
-	list_for_each_entry_safe(ns, next, &dev->namespaces, list) {
-		if (ns->ns_id > nn)
-			nvme_ns_remove(ns);
-	}
-	list_sort(NULL, &dev->namespaces, ns_cmp);
-}
-
-=======
->>>>>>> linux-next/akpm-base
 static void nvme_set_irq_hints(struct nvme_dev *dev)
 {
 	struct nvme_queue *nvmeq;
@@ -2044,27 +1969,7 @@ static void nvme_dev_shutdown(struct nvm
 
 	for (i = dev->queue_count - 1; i >= 0; i--)
 		nvme_clear_queue(dev->queues[i]);
-<<<<<<< HEAD
-}
-
-static void nvme_dev_remove(struct nvme_dev *dev)
-{
-	struct nvme_ns *ns, *next;
-
-	if (nvme_io_incapable(dev)) {
-		/*
-		 * If the device is not capable of IO (surprise hot-removal,
-		 * for example), we need to quiesce prior to deleting the
-		 * namespaces. This will end outstanding requests and prevent
-		 * attempts to sync dirty data.
-		 */
-		nvme_dev_shutdown(dev);
-	}
-	list_for_each_entry_safe(ns, next, &dev->namespaces, list)
-		nvme_ns_remove(ns);
-=======
 	mutex_unlock(&dev->shutdown_lock);
->>>>>>> linux-next/akpm-base
 }
 
 static int nvme_setup_prp_pools(struct nvme_dev *dev)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount-checkpatch-fixes.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch
mm.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
include-define-__phys_to_pfn-as-phys_pfn-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
mm-zonelist-enumerate-zonelists-array-index-fix.patch
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
arm64-mm-support-arch_mmap_rnd_bits-fix.patch
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
mm-introduce-kernelcore=mirror-option-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
mm-printk-introduce-new-format-string-for-flags-fix-2.patch
mm-support-madvisemadv_free-fix-2-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch
mm-oom-rework-oom-detection-checkpatch-fixes.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
sched-add-schedule_timeout_idle.patch
mm-oom-introduce-oom-reaper-fix-fix.patch
mm-oom-introduce-oom-reaper-fix-fix-2.patch
mm-oom-introduce-oom-reaper-checkpatch-fixes.patch
mm-oom-introduce-oom-reaper-fix-3.patch
mm-oom-introduce-oom-reaper-fix-4-fix.patch
mm-oom-introduce-oom-reaper-fix-5-fix.patch
kernel-stop_machinec-remove-config_smp-dependencies.patch
kernel-stop_machinec-remove-config_smp-dependencies-fix.patch
lib-vsprintfc-expand-field_width-to-24-bits-fix.patch
lib-test_printfc-test-dentry-printing-fix.patch
printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch
printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix-fix.patch
printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context-fix.patch
ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix-3.patch
linux-next-rejects.patch
include-linux-propertyh-fix-build-issues-with-gcc-444.patch
fs-overlayfs-superc-needs-pagemaph.patch
fs-adfs-adfsh-tidy-up-comments.patch
net-drop-tcp_memcontrolc-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix.patch
mm-memcontrol-reign-in-the-config-space-madness-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-12-08  1:14 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-12-08  1:14 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 0 files changed

diff -puN drivers/spi/spi-mt65xx.c~linux-next-git-rejects drivers/spi/spi-mt65xx.c
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
oom-kill-init-lead-panic-fix.patch
ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch
mm.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
mm-mmapc-remove-redundant-local-variables-for-may_expand_vm-fix.patch
include-define-__phys_to_pfn-as-phys_pfn-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
mm-zonelist-enumerate-zonelists-array-index-fix.patch
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
arm64-mm-support-arch_mmap_rnd_bits-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
mm-increase-swap_cluster_max-to-batch-tlb-flushes-fix-fix.patch
mm-support-madvisemadv_free-fix-2-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch
lib-vsprintfc-expand-field_width-to-24-bits-fix.patch
lib-test_printfc-test-dentry-printing-fix.patch
printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch
ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
ubsan-run-time-undefined-behavior-sanity-checker-fix.patch
linux-next-rejects.patch
fs-adfs-adfsh-tidy-up-comments.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-11-30 20:34 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-11-30 20:34 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/kvm_host.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN include/linux/kvm_host.h~linux-next-git-rejects include/linux/kvm_host.h
--- a/include/linux/kvm_host.h~linux-next-git-rejects
+++ a/include/linux/kvm_host.h
@@ -467,14 +467,11 @@ static inline struct kvm_vcpu *kvm_get_v
 	struct kvm_vcpu *vcpu;
 	int i;
 
-<<<<<<< HEAD
-=======
 	if (id < 0 || id >= KVM_MAX_VCPUS)
 		return NULL;
 	vcpu = kvm_get_vcpu(kvm, id);
 	if (vcpu && vcpu->vcpu_id == id)
 		return vcpu;
->>>>>>> linux-next/akpm-base
 	kvm_for_each_vcpu(i, vcpu, kvm)
 		if (vcpu->vcpu_id == id)
 			return vcpu;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
mm-mmapc-remove-redundant-local-variables-for-may_expand_vm-fix.patch
include-define-__phys_to_pfn-as-phys_pfn-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix.patch
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
mm-zonelist-enumerate-zonelists-array-index-fix.patch
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
mm-mmap-add-new-proc-tunable-for-mmap_base-aslr-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
mm-increase-swap_cluster_max-to-batch-tlb-flushes-fix-fix.patch
ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
fs-adfs-adfsh-tidy-up-comments.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-11-16 20:24 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-11-16 20:24 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/mach-pxa/palm27x.c                |    4 ----
 arch/arm/mach-pxa/palmtc.c                 |    4 ----
 arch/arm64/boot/dts/marvell/berlin4ct.dtsi |    3 ---
 drivers/soc/Kconfig                        |    3 ---
 drivers/soc/Makefile                       |    3 ---
 drivers/soc/ti/knav_qmss_queue.c           |    6 ------
 fs/direct-io.c                             |   10 ----------
 include/linux/fs.h                         |    3 ---
 8 files changed, 36 deletions(-)

diff -puN arch/arm/mach-pxa/palm27x.c~linux-next-git-rejects arch/arm/mach-pxa/palm27x.c
--- a/arch/arm/mach-pxa/palm27x.c~linux-next-git-rejects
+++ a/arch/arm/mach-pxa/palm27x.c
@@ -344,11 +344,7 @@ void __init palm27x_pwm_init(int bl, int
 {
 	palm_bl_power	= bl;
 	palm_lcd_power	= lcd;
-<<<<<<< HEAD
-	pwm_add_lookup(palm27x_pwm_lookup, ARRAY_SIZE(palm27x_pwm_lookup));
-=======
 	pwm_add_table(palm27x_pwm_lookup, ARRAY_SIZE(palm27x_pwm_lookup));
->>>>>>> linux-next/akpm-base
 	platform_device_register(&palm27x_backlight);
 }
 #endif
diff -puN arch/arm/mach-pxa/palmtc.c~linux-next-git-rejects arch/arm/mach-pxa/palmtc.c
--- a/arch/arm/mach-pxa/palmtc.c~linux-next-git-rejects
+++ a/arch/arm/mach-pxa/palmtc.c
@@ -169,11 +169,7 @@ static inline void palmtc_keys_init(void
 #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
 static struct pwm_lookup palmtc_pwm_lookup[] = {
 	PWM_LOOKUP("pxa25x-pwm.1", 0, "pwm-backlight.0", NULL, PALMTC_PERIOD_NS,
-<<<<<<< HEAD
-		   PWM_PERIOD_NORMAL),
-=======
 		   PWM_POLARITY_NORMAL),
->>>>>>> linux-next/akpm-base
 };
 
 static struct platform_pwm_backlight_data palmtc_backlight_data = {
diff -puN arch/arm64/boot/dts/marvell/berlin4ct.dtsi~linux-next-git-rejects arch/arm64/boot/dts/marvell/berlin4ct.dtsi
--- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
@@ -225,8 +225,6 @@
 			};
 		};
 
-<<<<<<< HEAD
-=======
 		soc_pinctrl: pin-controller@ea8000 {
 			compatible = "marvell,berlin4ct-soc-pinctrl";
 			reg = <0xea8000 0x14>;
@@ -237,7 +235,6 @@
 			reg = <0xea8400 0x8>;
 		};
 
->>>>>>> linux-next/akpm-base
 		apb@fc0000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
diff -puN drivers/soc/Kconfig~linux-next-git-rejects drivers/soc/Kconfig
--- a/drivers/soc/Kconfig~linux-next-git-rejects
+++ a/drivers/soc/Kconfig
@@ -4,10 +4,7 @@ source "drivers/soc/brcmstb/Kconfig"
 source "drivers/soc/mediatek/Kconfig"
 source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/rockchip/Kconfig"
-<<<<<<< HEAD
-=======
 source "drivers/soc/samsung/Kconfig"
->>>>>>> linux-next/akpm-base
 source "drivers/soc/sunxi/Kconfig"
 source "drivers/soc/ti/Kconfig"
 source "drivers/soc/versatile/Kconfig"
diff -puN drivers/soc/Makefile~linux-next-git-rejects drivers/soc/Makefile
--- a/drivers/soc/Makefile~linux-next-git-rejects
+++ a/drivers/soc/Makefile
@@ -6,10 +6,7 @@ obj-$(CONFIG_SOC_BRCMSTB)	+= brcmstb/
 obj-$(CONFIG_MACH_DOVE)		+= dove/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
-<<<<<<< HEAD
-=======
 obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
->>>>>>> linux-next/akpm-base
 obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
 obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
diff -puN drivers/soc/ti/knav_qmss_queue.c~linux-next-git-rejects drivers/soc/ti/knav_qmss_queue.c
--- a/drivers/soc/ti/knav_qmss_queue.c~linux-next-git-rejects
+++ a/drivers/soc/ti/knav_qmss_queue.c
@@ -1519,15 +1519,9 @@ static int knav_queue_load_pdsp(struct k
 
 	for (i = 0; i < ARRAY_SIZE(knav_acc_firmwares); i++) {
 		if (knav_acc_firmwares[i]) {
-<<<<<<< HEAD
-			ret = request_firmware(&fw,
-					       knav_acc_firmwares[i],
-					       kdev->dev);
-=======
 			ret = request_firmware_direct(&fw,
 						      knav_acc_firmwares[i],
 						      kdev->dev);
->>>>>>> linux-next/akpm-base
 			if (!ret) {
 				found = true;
 				break;
diff -puN fs/direct-io.c~linux-next-git-rejects fs/direct-io.c
--- a/fs/direct-io.c~linux-next-git-rejects
+++ a/fs/direct-io.c
@@ -399,24 +399,14 @@ static inline void dio_bio_submit(struct
 	if (dio->is_async && dio->rw == READ && dio->should_dirty)
 		bio_set_pages_dirty(bio);
 
-<<<<<<< HEAD
-	dio->bio_bdev = bio->bi_bdev;
-
-=======
->>>>>>> linux-next/akpm-base
 	if (sdio->submit_io) {
 		sdio->submit_io(dio->rw, bio, dio->inode,
 			       sdio->logical_offset_in_bio);
 		dio->bio_cookie = BLK_QC_T_NONE;
-<<<<<<< HEAD
-	} else
-		dio->bio_cookie = submit_bio(dio->rw, bio);
-=======
 	} else {
 		dio->bio_cookie = submit_bio(dio->rw, bio);
 		dio->bio_bdev = bio->bi_bdev;
 	}
->>>>>>> linux-next/akpm-base
 
 	sdio->bio = NULL;
 	sdio->boundary = 0;
diff -puN include/linux/fs.h~linux-next-git-rejects include/linux/fs.h
--- a/include/linux/fs.h~linux-next-git-rejects
+++ a/include/linux/fs.h
@@ -1682,10 +1682,7 @@ struct inode_operations {
 			   umode_t create_mode, int *opened);
 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
 	int (*set_acl)(struct inode *, struct posix_acl *, int);
-<<<<<<< HEAD
-=======
 	int (*set_richacl)(struct inode *, struct richacl *);
->>>>>>> linux-next/akpm-base
 } ____cacheline_aligned;
 
 ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
ncpfs-dont-allow-negative-timeouts-fix.patch
mm.patch
slub-optimize-bulk-slowpath-free-by-detached-freelist-fix.patch
account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
mm-mmapc-remove-redundant-local-variables-for-may_expand_vm-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
mm-increase-swap_cluster_max-to-batch-tlb-flushes-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-10-15 19:26 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-10-15 19:26 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/crypto/camellia_aesni_avx_glue.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN arch/x86/crypto/camellia_aesni_avx_glue.c~linux-next-git-rejects arch/x86/crypto/camellia_aesni_avx_glue.c
--- a/arch/x86/crypto/camellia_aesni_avx_glue.c~linux-next-git-rejects
+++ a/arch/x86/crypto/camellia_aesni_avx_glue.c
@@ -559,12 +559,8 @@ static int __init camellia_aesni_init(vo
 		return -ENODEV;
 	}
 
-<<<<<<< HEAD
-	if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) {
-=======
 	if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM,
 				&feature_name)) {
->>>>>>> linux-next/akpm-base
 		pr_info("CPU feature '%s' is not supported.\n", feature_name);
 		return -ENODEV;
 	}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
lib-kconfig-zlib_deflate-must-select-bitreverse.patch
mm.patch
slub-optimize-bulk-slowpath-free-by-detached-freelist-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix-fix.patch
mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-fix.patch
mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-checkpatch-fixes.patch
mm-page_alloc-only-enforce-watermarks-for-order-0-allocations-fix-fix.patch
mm-fix-declarations-of-nr-delta-and-nr_pagecache_reclaimable-fix.patch
mm-oom_kill-fix-the-wrong-task-mm-==-mm-checks-in-oom_kill_process-fix.patch
include-linux-mmzoneh-reflow-comment.patch
mm-fs-introduce-mapping_gfp_constraint-checkpatch-fixes.patch
mm-vmstatc-uninline-node_page_state.patch
mm-vmstatc-uninline-node_page_state-fix.patch
kasan-various-fixes-in-documentation-checkpatch-fixes.patch
zsmalloc-add-comments-for-inuse-to-zspage-v2-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-support-madvisemadv_free-vs-thp-rename-split_huge_page_pmd-to-split_huge_pmd.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
include-linux-compiler-gcch-improve-__visible-documentation.patch
fs-jffs2-wbufc-remove-stray-semicolon.patch
lib-documentation-synchronize-%p-formatting-documentation-fix-fix.patch
rbtree-clarify-documentation-of-rbtree_postorder_for_each_entry_safe-fix.patch
dma-mapping-tidy-up-dma_parms-default-handling-fix.patch
panic-release-stale-console-lock-to-always-get-the-logbuf-printed-out-fix.patch
linux-next-rejects.patch
net-ipv4-routec-prevent-oops.patch
remove-abs64.patch
remove-abs64-fix.patch
remove-abs64-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-10-08 20:12 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-10-08 20:12 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/nand/sunxi_nand.c |   20 --------------------
 1 file changed, 20 deletions(-)

diff -puN drivers/mtd/nand/sunxi_nand.c~linux-next-git-rejects drivers/mtd/nand/sunxi_nand.c
--- a/drivers/mtd/nand/sunxi_nand.c~linux-next-git-rejects
+++ a/drivers/mtd/nand/sunxi_nand.c
@@ -690,16 +690,9 @@ static int sunxi_nfc_hw_ecc_write_chunk(
 	if (ret)
 		return ret;
 
-<<<<<<< HEAD
-		/* Fill OOB data in */
-		writel(NFC_BUF_TO_USER_DATA(chip->oob_poi +
-					    layout->oobfree[i].offset),
-		       nfc->regs + NFC_REG_USER_DATA_BASE);
-=======
 	writel(NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD |
 	       NFC_ACCESS_DIR | NFC_ECC_OP,
 	       nfc->regs + NFC_REG_CMD);
->>>>>>> linux-next/akpm-base
 
 	ret = sunxi_nfc_wait_int(nfc, NFC_CMD_INT_FLAG, 0);
 	if (ret)
@@ -834,23 +827,10 @@ static int sunxi_nfc_hw_syndrome_ecc_wri
 	sunxi_nfc_hw_ecc_enable(mtd);
 
 	for (i = 0; i < ecc->steps; i++) {
-<<<<<<< HEAD
-		chip->write_buf(mtd, buf + (i * ecc->size), ecc->size);
-		offset += ecc->size;
-
-		/* Fill OOB data in */
-		writel(NFC_BUF_TO_USER_DATA(oob),
-		       nfc->regs + NFC_REG_USER_DATA_BASE);
-
-		tmp = NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ACCESS_DIR |
-		      (1 << 30);
-		writel(tmp, nfc->regs + NFC_REG_CMD);
-=======
 		int data_off = i * (ecc->size + ecc->bytes + 4);
 		int oob_off = data_off + ecc->size;
 		const u8 *data = buf + (i * ecc->size);
 		const u8 *oob = chip->oob_poi + (i * (ecc->bytes + 4));
->>>>>>> linux-next/akpm-base
 
 		ret = sunxi_nfc_hw_ecc_write_chunk(mtd, data, data_off,
 						   oob, oob_off, &cur_off);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm.patch
slub-optimize-bulk-slowpath-free-by-detached-freelist-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix-fix.patch
mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-fix.patch
mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-checkpatch-fixes.patch
mm-page_alloc-only-enforce-watermarks-for-order-0-allocations-fix-fix.patch
mm-fix-declarations-of-nr-delta-and-nr_pagecache_reclaimable-fix.patch
mm-oom_kill-fix-the-wrong-task-mm-==-mm-checks-in-oom_kill_process-fix.patch
include-linux-mmzoneh-reflow-comment.patch
mm-fs-introduce-mapping_gfp_constraint-checkpatch-fixes.patch
mm-vmstatc-uninline-node_page_state.patch
mm-vmstatc-uninline-node_page_state-fix.patch
kasan-various-fixes-in-documentation-checkpatch-fixes.patch
zsmalloc-add-comments-for-inuse-to-zspage-v2-fix.patch
page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
include-linux-compiler-gcch-improve-__visible-documentation.patch
fs-jffs2-wbufc-remove-stray-semicolon.patch
lib-documentation-synchronize-%p-formatting-documentation-fix-fix.patch
rbtree-clarify-documentation-of-rbtree_postorder_for_each_entry_safe-fix.patch
dma-mapping-tidy-up-dma_parms-default-handling-fix.patch
panic-release-stale-console-lock-to-always-get-the-logbuf-printed-out-fix.patch
linux-next-rejects.patch
net-ipv4-routec-prevent-oops.patch
remove-abs64.patch
remove-abs64-fix.patch
remove-abs64-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-09-22 18:20 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-09-22 18:20 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/s390/include/uapi/asm/unistd.h |    4 ----
 arch/s390/kernel/syscalls.S         |    3 ---
 2 files changed, 7 deletions(-)

diff -puN arch/s390/include/uapi/asm/unistd.h~linux-next-git-rejects arch/s390/include/uapi/asm/unistd.h
--- a/arch/s390/include/uapi/asm/unistd.h~linux-next-git-rejects
+++ a/arch/s390/include/uapi/asm/unistd.h
@@ -292,7 +292,6 @@
 #define __NR_execveat		354
 #define __NR_userfaultfd	355
 #define __NR_membarrier		356
-<<<<<<< HEAD
 #define __NR_recvmmsg		357
 #define __NR_sendmmsg		358
 #define __NR_socket		359
@@ -311,9 +310,6 @@
 #define __NR_recvmsg		372
 #define __NR_shutdown		373
 #define NR_syscalls 374
-=======
-#define NR_syscalls 357
->>>>>>> linux-next/akpm-base
 
 /* 
  * There are some system calls that are not present on 64 bit, some
diff -puN arch/s390/kernel/syscalls.S~linux-next-git-rejects arch/s390/kernel/syscalls.S
--- a/arch/s390/kernel/syscalls.S~linux-next-git-rejects
+++ a/arch/s390/kernel/syscalls.S
@@ -365,7 +365,6 @@ SYSCALL(sys_s390_pci_mmio_read,compat_sy
 SYSCALL(sys_execveat,compat_sys_execveat)
 SYSCALL(sys_userfaultfd,sys_userfaultfd)		/* 355 */
 SYSCALL(sys_membarrier,sys_membarrier)
-<<<<<<< HEAD
 SYSCALL(sys_recvmmsg,compat_sys_recvmmsg)
 SYSCALL(sys_sendmmsg,compat_sys_sendmmsg)
 SYSCALL(sys_socket,sys_socket)
@@ -383,5 +382,3 @@ SYSCALL(sys_sendmsg,compat_sys_sendmsg)
 SYSCALL(sys_recvfrom,compat_sys_recvfrom)
 SYSCALL(sys_recvmsg,compat_sys_recvmsg)
 SYSCALL(sys_shutdown,sys_shutdown)
-=======
->>>>>>> linux-next/akpm-base
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm-dax-vma-with-vm_ops-pfn_mkwrite-wants-to-be-write-notified-fix.patch
x86-efi-kasan-undef-memset-memcpy-memmove-per-arch-fix.patch
mm.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix-fix.patch
kasan-various-fixes-in-documentation-checkpatch-fixes.patch
page-flags-introduce-page-flags-policies-wrt-compound-pages-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
include-linux-compiler-gcch-improve-__visible-documentation.patch
net-ipv4-routec-prevent-oops.patch
remove-abs64.patch
remove-abs64-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-08-24 18:36 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-08-24 18:36 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/media/pci/cobalt/Kconfig         |    4 ----
 drivers/media/v4l2-core/videobuf2-core.c |    3 ---
 2 files changed, 7 deletions(-)

diff -puN drivers/media/pci/cobalt/Kconfig~linux-next-git-rejects drivers/media/pci/cobalt/Kconfig
--- a/drivers/media/pci/cobalt/Kconfig~linux-next-git-rejects
+++ a/drivers/media/pci/cobalt/Kconfig
@@ -1,12 +1,8 @@
 config VIDEO_COBALT
 	tristate "Cisco Cobalt support"
 	depends on VIDEO_V4L2 && I2C && MEDIA_CONTROLLER
-<<<<<<< HEAD
-	depends on PCI_MSI && MTD_COMPLEX_MAPPINGS && GPIOLIB
-=======
 	depends on PCI_MSI && MTD_COMPLEX_MAPPINGS
 	depends on GPIOLIB || COMPILE_TEST
->>>>>>> linux-next/akpm-base
 	depends on SND
 	select I2C_ALGOBIT
 	select VIDEO_ADV7604
diff -puN drivers/media/v4l2-core/videobuf2-core.c~linux-next-git-rejects drivers/media/v4l2-core/videobuf2-core.c
--- a/drivers/media/v4l2-core/videobuf2-core.c~linux-next-git-rejects
+++ a/drivers/media/v4l2-core/videobuf2-core.c
@@ -1215,11 +1215,8 @@ void vb2_buffer_done(struct vb2_buffer *
 	atomic_dec(&q->owned_by_drv_count);
 	spin_unlock_irqrestore(&q->done_lock, flags);
 
-<<<<<<< HEAD
-=======
 	trace_vb2_buf_done(q, vb);
 
->>>>>>> linux-next/akpm-base
 	switch (state) {
 	case VB2_BUF_STATE_QUEUED:
 		return;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch
scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch
fs-create-and-use-seq_show_option-for-escaping-fix.patch
watchdog-introduce-watchdog_suspend-and-watchdog_resume-fix.patch
watchdog-use-suspend-resume-interface-in-fixup_ht_bug-fix.patch
mm.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch
genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch
mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch
dax-revert-userfaultfd-change.patch
thp-prepare-for-dax-huge-pages-fix.patch
pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch
pagemap-update-documentation-fix.patch
mm-show-proportional-swap-share-of-the-mapping-fix.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch
mm-srcu-ify-shrinkers-fix-fix.patch
x86-use-generic-early-mem-copy-fix.patch
mm-mmap-simplify-the-failure-return-working-flow-fix.patch
memory-hot-addedthe-memory-can-not-been-added-to-movable-zone-fix.patch
zswap-dynamic-pool-creation-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
proc-add-kpageidle-file-fix-6-fix.patch
proc-add-kpageidle-file-fix-6-fix-2-fix.patch
proc-export-idle-flag-via-kpageflags-fix.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
fs-coda-fix-readlink-buffer-overflow-checkpatch-fixes.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix-fix.patch
kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch
align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch
linux-next-rejects.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix.patch
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch
schedh-dont-include-mm_typesh.patch
schedh-dont-include-mm_typesh-fix.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-08-19 18:44 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-08-19 18:44 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/intel_atomic.c  |  130 -------------------------
 drivers/gpu/drm/i915/intel_display.c |  113 ---------------------
 drivers/scsi/scsi_error.c            |   31 -----
 include/scsi/scsi_eh.h               |    5 
 4 files changed, 279 deletions(-)

diff -puN drivers/gpu/drm/i915/intel_atomic.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_atomic.c
--- a/drivers/gpu/drm/i915/intel_atomic.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_atomic.c
@@ -35,136 +35,6 @@
 #include <drm/drm_plane_helper.h>
 #include "intel_drv.h"
 
-<<<<<<< HEAD
-
-/**
- * intel_atomic_check - validate state object
- * @dev: drm device
- * @state: state to validate
- */
-int intel_atomic_check(struct drm_device *dev,
-		       struct drm_atomic_state *state)
-{
-	int nplanes = dev->mode_config.num_total_plane;
-	int ncrtcs = dev->mode_config.num_crtc;
-	int nconnectors = dev->mode_config.num_connector;
-	enum pipe nuclear_pipe = INVALID_PIPE;
-	struct intel_crtc *nuclear_crtc = NULL;
-	struct intel_crtc_state *crtc_state = NULL;
-	int ret;
-	int i;
-	bool not_nuclear = false;
-
-	/*
-	 * FIXME:  At the moment, we only support "nuclear pageflip" on a
-	 * single CRTC.  Cross-crtc updates will be added later.
-	 */
-	for (i = 0; i < nplanes; i++) {
-		struct intel_plane *plane = to_intel_plane(state->planes[i]);
-		if (!plane)
-			continue;
-
-		if (nuclear_pipe == INVALID_PIPE) {
-			nuclear_pipe = plane->pipe;
-		} else if (nuclear_pipe != plane->pipe) {
-			DRM_DEBUG_KMS("i915 only support atomic plane operations on a single CRTC at the moment\n");
-			return -EINVAL;
-		}
-	}
-
-	/*
-	 * FIXME:  We only handle planes for now; make sure there are no CRTC's
-	 * or connectors involved.
-	 */
-	state->allow_modeset = false;
-	for (i = 0; i < ncrtcs; i++) {
-		struct intel_crtc *crtc = to_intel_crtc(state->crtcs[i]);
-		if (crtc)
-			memset(&crtc->atomic, 0, sizeof(crtc->atomic));
-		if (crtc && crtc->pipe != nuclear_pipe)
-			not_nuclear = true;
-		if (crtc && crtc->pipe == nuclear_pipe) {
-			nuclear_crtc = crtc;
-			crtc_state = to_intel_crtc_state(state->crtc_states[i]);
-		}
-	}
-	for (i = 0; i < nconnectors; i++)
-		if (state->connectors[i] != NULL)
-			not_nuclear = true;
-
-	if (not_nuclear) {
-		DRM_DEBUG_KMS("i915 only supports atomic plane operations at the moment\n");
-		return -EINVAL;
-	}
-
-	ret = drm_atomic_helper_check_planes(dev, state);
-	if (ret)
-		return ret;
-
-	/* FIXME: move to crtc atomic check function once it is ready */
-	ret = intel_atomic_setup_scalers(dev, nuclear_crtc, crtc_state);
-	if (ret)
-		return ret;
-
-	return ret;
-}
-
-
-/**
- * intel_atomic_commit - commit validated state object
- * @dev: DRM device
- * @state: the top-level driver state object
- * @async: asynchronous commit
- *
- * This function commits a top-level state object that has been validated
- * with drm_atomic_helper_check().
- *
- * FIXME:  Atomic modeset support for i915 is not yet complete.  At the moment
- * we can only handle plane-related operations and do not yet support
- * asynchronous commit.
- *
- * RETURNS
- * Zero for success or -errno.
- */
-int intel_atomic_commit(struct drm_device *dev,
-			struct drm_atomic_state *state,
-			bool async)
-{
-	struct drm_crtc_state *crtc_state;
-	struct drm_crtc *crtc;
-	int ret, i;
-
-	if (async) {
-		DRM_DEBUG_KMS("i915 does not yet support async commit\n");
-		return -EINVAL;
-	}
-
-	ret = drm_atomic_helper_prepare_planes(dev, state);
-	if (ret)
-		return ret;
-
-	/* Point of no return */
-	drm_atomic_helper_swap_state(dev, state);
-
-	/* swap crtc_scaler_state */
-	for_each_crtc_in_state(state, crtc, crtc_state, i) {
-		to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);
-
-		if (INTEL_INFO(dev)->gen >= 9)
-			skl_detach_scalers(to_intel_crtc(crtc));
-
-		drm_atomic_helper_commit_planes_on_crtc(crtc_state);
-	}
-
-	drm_atomic_helper_wait_for_vblanks(dev, state);
-	drm_atomic_helper_cleanup_planes(dev, state);
-	drm_atomic_state_free(state);
-
-	return 0;
-}
-
-=======
->>>>>>> linux-next/akpm-base
 /**
  * intel_connector_atomic_get_property - fetch connector property value
  * @connector: connector to fetch property for
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -12883,17 +12883,10 @@ static int haswell_mode_set_planes_worka
 		if (IS_ERR(pipe_config))
 			return PTR_ERR(pipe_config);
 
-<<<<<<< HEAD
-	/* Now enable the clocks, plane, pipe, and connectors that we set up. */
-	for_each_crtc_in_state(state, crtc, crtc_state, i) {
-		if (!needs_modeset(crtc->state) || !crtc->state->enable) {
-			drm_atomic_helper_commit_planes_on_crtc(crtc_state);
-=======
 		pipe_config->hsw_workaround_pipe = INVALID_PIPE;
 
 		if (!pipe_config->base.active ||
 		    needs_modeset(&pipe_config->base))
->>>>>>> linux-next/akpm-base
 			continue;
 		}
 
@@ -12901,12 +12894,7 @@ static int haswell_mode_set_planes_worka
 		if (enabled_pipe != INVALID_PIPE)
 			return 0;
 
-<<<<<<< HEAD
-		dev_priv->display.crtc_enable(crtc);
-		drm_atomic_helper_commit_planes_on_crtc(crtc_state);
-=======
 		enabled_pipe = intel_crtc->pipe;
->>>>>>> linux-next/akpm-base
 	}
 
 	if (enabled_pipe != INVALID_PIPE)
@@ -13111,14 +13099,6 @@ static int intel_atomic_commit(struct dr
 		any_ms = true;
 		intel_pre_plane_update(intel_crtc);
 
-<<<<<<< HEAD
-static int intel_crtc_set_config(struct drm_mode_set *set)
-{
-	struct drm_device *dev;
-	struct drm_atomic_state *state = NULL;
-	struct intel_crtc_state *pipe_config;
-	int ret;
-=======
 		if (crtc_state->active) {
 			intel_crtc_disable_planes(crtc, crtc_state->plane_mask);
 			dev_priv->display.crtc_disable(crtc);
@@ -13133,7 +13113,6 @@ static int intel_crtc_set_config(struct
 
 	if (any_ms) {
 		intel_shared_dpll_commit(state);
->>>>>>> linux-next/akpm-base
 
 		drm_atomic_helper_update_legacy_modeset_state(state->dev, state);
 		modeset_update_crtc_power_domains(state);
@@ -13166,13 +13145,6 @@ static int intel_crtc_set_config(struct
 
 	drm_atomic_state_free(state);
 
-<<<<<<< HEAD
-	ret = intel_set_mode_with_config(set->crtc, pipe_config, true);
-
-	if (ret) {
-		DRM_DEBUG_KMS("failed to set mode on [CRTC:%d], err = %d\n",
-			      set->crtc->base.id, ret);
-=======
 	return 0;
 }
 
@@ -13207,7 +13179,6 @@ retry:
 		drm_atomic_state_clear(state);
 		drm_modeset_backoff(state->acquire_ctx);
 		goto retry;
->>>>>>> linux-next/akpm-base
 	}
 
 	if (ret)
@@ -13449,90 +13420,11 @@ intel_check_primary_plane(struct drm_pla
 		can_position = true;
 	}
 
-<<<<<<< HEAD
-	ret = drm_plane_helper_check_update(plane, crtc, fb,
-					    src, dest, clip,
-					    min_scale,
-					    max_scale,
-					    can_position, true,
-					    &state->visible);
-	if (ret)
-		return ret;
-
-	if (crtc_state ? crtc_state->base.active : intel_crtc->active) {
-		struct intel_plane_state *old_state =
-			to_intel_plane_state(plane->state);
-
-		intel_crtc->atomic.wait_for_flips = true;
-
-		/*
-		 * FBC does not work on some platforms for rotated
-		 * planes, so disable it when rotation is not 0 and
-		 * update it when rotation is set back to 0.
-		 *
-		 * FIXME: This is redundant with the fbc update done in
-		 * the primary plane enable function except that that
-		 * one is done too late. We eventually need to unify
-		 * this.
-		 */
-		if (state->visible &&
-		    INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev) &&
-		    dev_priv->fbc.crtc == intel_crtc &&
-		    state->base.rotation != BIT(DRM_ROTATE_0)) {
-			intel_crtc->atomic.disable_fbc = true;
-		}
-
-		if (state->visible && !old_state->visible) {
-			/*
-			 * BDW signals flip done immediately if the plane
-			 * is disabled, even if the plane enable is already
-			 * armed to occur at the next vblank :(
-			 */
-			if (IS_BROADWELL(dev))
-				intel_crtc->atomic.wait_vblank = true;
-
-			if (crtc_state)
-				intel_crtc->atomic.post_enable_primary = true;
-		}
-
-		/*
-		 * FIXME: Actually if we will still have any other plane enabled
-		 * on the pipe we could let IPS enabled still, but for
-		 * now lets consider that when we make primary invisible
-		 * by setting DSPCNTR to 0 on update_primary_plane function
-		 * IPS needs to be disable.
-		 */
-		if (!state->visible || !fb)
-			intel_crtc->atomic.disable_ips = true;
-
-		if (!state->visible && old_state->visible &&
-		    crtc_state && !needs_modeset(&crtc_state->base))
-			intel_crtc->atomic.pre_disable_primary = true;
-
-		intel_crtc->atomic.fb_bits |=
-			INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
-
-		intel_crtc->atomic.update_fbc = true;
-
-		if (intel_wm_need_update(plane, &state->base))
-			intel_crtc->atomic.update_wm = true;
-	}
-
-	if (INTEL_INFO(dev)->gen >= 9) {
-		ret = skl_update_scaler_users(intel_crtc, crtc_state,
-			to_intel_plane(plane), state, 0);
-		if (ret)
-			return ret;
-	}
-
-	return 0;
-=======
 	return drm_plane_helper_check_update(plane, crtc, fb, &state->src,
 					     &state->dst, &state->clip,
 					     min_scale, max_scale,
 					     can_position, true,
 					     &state->visible);
->>>>>>> linux-next/akpm-base
 }
 
 static void
@@ -15192,11 +15084,6 @@ static void intel_modeset_readout_hw_sta
 		__drm_atomic_helper_crtc_destroy_state(&crtc->base, crtc->base.state);
 		memset(crtc->config, 0, sizeof(*crtc->config));
 		crtc->config->base.crtc = &crtc->base;
-<<<<<<< HEAD
-
-		crtc->config->quirks |= PIPE_CONFIG_QUIRK_INHERITED_MODE;
-=======
->>>>>>> linux-next/akpm-base
 
 		crtc->active = dev_priv->display.get_pipe_config(crtc,
 								 crtc->config);
diff -puN drivers/scsi/scsi_error.c~linux-next-git-rejects drivers/scsi/scsi_error.c
--- a/drivers/scsi/scsi_error.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_error.c
@@ -2456,34 +2456,3 @@ int scsi_get_sense_info_fld(const u8 * s
 	}
 }
 EXPORT_SYMBOL(scsi_get_sense_info_fld);
-<<<<<<< HEAD
-
-/**
- * scsi_build_sense_buffer - build sense data in a buffer
- * @desc:	Sense format (non zero == descriptor format,
- * 		0 == fixed format)
- * @buf:	Where to build sense data
- * @key:	Sense key
- * @asc:	Additional sense code
- * @ascq:	Additional sense code qualifier
- *
- **/
-void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq)
-{
-	if (desc) {
-		buf[0] = 0x72;	/* descriptor, current */
-		buf[1] = key;
-		buf[2] = asc;
-		buf[3] = ascq;
-		buf[7] = 0;
-	} else {
-		buf[0] = 0x70;	/* fixed, current */
-		buf[2] = key;
-		buf[7] = 0xa;
-		buf[12] = asc;
-		buf[13] = ascq;
-	}
-}
-EXPORT_SYMBOL(scsi_build_sense_buffer);
-=======
->>>>>>> linux-next/akpm-base
diff -puN include/scsi/scsi_eh.h~linux-next-git-rejects include/scsi/scsi_eh.h
--- a/include/scsi/scsi_eh.h~linux-next-git-rejects
+++ a/include/scsi/scsi_eh.h
@@ -25,11 +25,6 @@ static inline bool scsi_sense_is_deferre
 extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
 				   u64 * info_out);
 
-<<<<<<< HEAD
-extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq);
-
-=======
->>>>>>> linux-next/akpm-base
 extern int scsi_ioctl_reset(struct scsi_device *, int __user *);
 
 struct scsi_eh_save {
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
mm-make-page-pfmemalloc-check-more-robust-fix.patch
kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch
scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch
ocfs2-sysfile-interfaces-for-online-file-check-fix.patch
fs-create-and-use-seq_show_option-for-escaping-fix.patch
watchdog-introduce-watchdog_suspend-and-watchdog_resume-fix.patch
watchdog-use-suspend-resume-interface-in-fixup_ht_bug-fix.patch
mm.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch
genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch
mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch
dax-revert-userfaultfd-change.patch
thp-prepare-for-dax-huge-pages-fix.patch
pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch
pagemap-update-documentation-fix.patch
mm-show-proportional-swap-share-of-the-mapping-fix.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch
mm-srcu-ify-shrinkers-fix-fix.patch
x86-use-generic-early-mem-copy-fix.patch
mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix-2.patch
mm-mmap-simplify-the-failure-return-working-flow-fix.patch
zswap-dynamic-pool-creation-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
proc-add-kpageidle-file-fix-6-fix.patch
proc-add-kpageidle-file-fix-6-fix-2-fix.patch
proc-export-idle-flag-via-kpageflags-fix.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
fs-coda-fix-readlink-buffer-overflow-checkpatch-fixes.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix-fix.patch
kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch
align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch
linux-next.patch
linux-next-rejects.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix.patch
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-08-05 19:03 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-08-05 19:03 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/drm_atomic_helper.c |    6 ------
 1 file changed, 6 deletions(-)

diff -puN drivers/gpu/drm/drm_atomic_helper.c~linux-next-git-rejects drivers/gpu/drm/drm_atomic_helper.c
--- a/drivers/gpu/drm/drm_atomic_helper.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/drm_atomic_helper.c
@@ -240,14 +240,8 @@ update_connector_routing(struct drm_atom
 	connector_state->best_encoder = new_encoder;
 	idx = drm_crtc_index(connector_state->crtc);
 
-<<<<<<< HEAD
 	crtc_state = state->crtc_states[idx];
 	crtc_state->mode_changed = true;
-=======
-		crtc_state = state->crtc_states[idx];
-		crtc_state->connectors_changed = true;
-	}
->>>>>>> linux-next/akpm-base
 
 	DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d]\n",
 			 connector->base.id,
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch
scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch
ocfs2-sysfile-interfaces-for-online-file-check-fix.patch
watchdog-introduce-watchdog_suspend-and-watchdog_resume-fix.patch
mm.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
mm-mlock-refactor-mlock-munlock-and-munlockall-code-checkpatch-fixes.patch
mm-mlock-add-new-mlock-system-call-checkpatch-fixes.patch
mm-introduce-vm_lockonfault-checkpatch-fixes.patch
genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch
genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch
mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch
dax-revert-userfaultfd-change.patch
thp-prepare-for-dax-huge-pages-fix.patch
pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch
pagemap-update-documentation-fix.patch
mm-show-proportional-swap-share-of-the-mapping-fix.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch
mm-srcu-ify-shrinkers-fix-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
fs-coda-fix-readlink-buffer-overflow-checkpatch-fixes.patch
kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch
linux-next.patch
linux-next-rejects.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-07-27 18:04 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-07-27 18:04 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 MAINTAINERS |   11 -----------
 1 file changed, 11 deletions(-)

diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -5749,17 +5749,6 @@ S:	Maintained
 F:	fs/jffs2/
 F:	include/uapi/linux/jffs2.h
 
-<<<<<<< HEAD
-JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
-M:	Andrew Morton <akpm@linux-foundation.org>
-M:	Jan Kara <jack@suse.com>
-L:	linux-ext4@vger.kernel.org
-S:	Maintained
-F:	fs/jbd/
-F:	include/linux/jbd.h
-
-=======
->>>>>>> fs: Remove ext3 filesystem driver
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
 M:	"Theodore Ts'o" <tytso@mit.edu>
 M:	Jan Kara <jack@suse.cz>
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch
scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch
ocfs2-sysfile-interfaces-for-online-file-check-fix.patch
mm.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
mm-mlock-refactor-mlock-munlock-and-munlockall-code-checkpatch-fixes.patch
mm-gup-add-mm_lock_present-checkpatch-fixes.patch
mm-mlock-introduce-vm_lockonfault-and-add-mlock-flags-to-enable-it-v4-checkpatch-fixes.patch
mm-mmap-add-mmap-flag-to-request-vm_lockonfault-v4-fix.patch
genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch
genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch
mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch
dax-revert-userfaultfd-change.patch
thp-prepare-for-dax-huge-pages-fix.patch
pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch
pagemap-update-documentation-fix.patch
mm-show-proportional-swap-share-of-the-mapping-fix.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
mm-hugetlb-add-cache-of-descriptors-to-resv_map-for-region_add-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch
linux-next.patch
linux-next-rejects.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-07-20 18:43 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-07-20 18:43 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/gpu/drm/i915/i915_drv.h         |    3 
 drivers/gpu/drm/i915/intel_display.c    |  113 ----------------------
 drivers/gpu/drm/i915/intel_ringbuffer.h |    9 -
 3 files changed, 1 insertion(+), 124 deletions(-)

diff -puN drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.h
@@ -867,10 +867,7 @@ struct intel_context {
 	int user_handle;
 	uint8_t remap_slice;
 	struct drm_i915_private *i915;
-<<<<<<< HEAD
-=======
 	int flags;
->>>>>>> linux-next/akpm-base
 	struct drm_i915_file_private *file_priv;
 	struct i915_ctx_hang_stats hang_stats;
 	struct i915_hw_ppgtt *ppgtt;
diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -1053,7 +1053,7 @@ static void intel_wait_for_pipe_off(stru
 		/* Wait for the Pipe State to go off */
 		if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0,
 			     100))
-			WARN(1, "pipe_off wait timed out\n");
+			WARN(1, "pipe_qoff wait timed out\n");
 	} else {
 		/* Wait for the display line to settle */
 		if (wait_for(pipe_dsl_stopped(dev, pipe), 100))
@@ -6330,36 +6330,6 @@ void intel_crtc_update_dpms(struct drm_c
 		enable |= intel_encoder->connectors_active;
 
 	intel_crtc_control(crtc, enable);
-<<<<<<< HEAD
-
-	crtc->state->active = enable;
-}
-
-static void intel_crtc_disable(struct drm_crtc *crtc)
-{
-	struct drm_device *dev = crtc->dev;
-	struct drm_connector *connector;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	intel_crtc_disable_planes(crtc);
-	dev_priv->display.crtc_disable(crtc);
-	dev_priv->display.off(crtc);
-
-	drm_plane_helper_disable(crtc->primary);
-
-	/* Update computed state. */
-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-		if (!connector->encoder || !connector->encoder->crtc)
-			continue;
-
-		if (connector->encoder->crtc != crtc)
-			continue;
-
-		connector->dpms = DRM_MODE_DPMS_OFF;
-		to_intel_encoder(connector->encoder)->connectors_active = false;
-	}
-=======
->>>>>>> linux-next/akpm-base
 }
 
 void intel_encoder_destroy(struct drm_encoder *encoder)
@@ -13059,21 +13029,12 @@ static int haswell_mode_set_planes_worka
 		if (!crtc_state->active || !needs_modeset(crtc_state))
 			continue;
 
-<<<<<<< HEAD
-		if (!crtc_state->enable) {
-			if (crtc->state->enable)
-				intel_crtc_disable(crtc);
-		} else if (crtc->state->enable) {
-			intel_crtc_disable_planes(crtc);
-			dev_priv->display.crtc_disable(crtc);
-=======
 		if (first_crtc_state) {
 			other_crtc_state = to_intel_crtc_state(crtc_state);
 			break;
 		} else {
 			first_crtc_state = to_intel_crtc_state(crtc_state);
 			first_pipe = intel_crtc->pipe;
->>>>>>> linux-next/akpm-base
 		}
 	}
 
@@ -13622,83 +13583,11 @@ intel_check_primary_plane(struct drm_pla
 		can_position = true;
 	}
 
-<<<<<<< HEAD
-	ret = drm_plane_helper_check_update(plane, crtc, fb,
-					    src, dest, clip,
-					    min_scale,
-					    max_scale,
-					    can_position, true,
-					    &state->visible);
-	if (ret)
-		return ret;
-
-	if (crtc_state ? crtc_state->base.active : intel_crtc->active) {
-		struct intel_plane_state *old_state =
-			to_intel_plane_state(plane->state);
-
-		intel_crtc->atomic.wait_for_flips = true;
-
-		/*
-		 * FBC does not work on some platforms for rotated
-		 * planes, so disable it when rotation is not 0 and
-		 * update it when rotation is set back to 0.
-		 *
-		 * FIXME: This is redundant with the fbc update done in
-		 * the primary plane enable function except that that
-		 * one is done too late. We eventually need to unify
-		 * this.
-		 */
-		if (state->visible &&
-		    INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev) &&
-		    dev_priv->fbc.crtc == intel_crtc &&
-		    state->base.rotation != BIT(DRM_ROTATE_0)) {
-			intel_crtc->atomic.disable_fbc = true;
-		}
-
-		if (state->visible && !old_state->visible) {
-			/*
-			 * BDW signals flip done immediately if the plane
-			 * is disabled, even if the plane enable is already
-			 * armed to occur at the next vblank :(
-			 */
-			if (IS_BROADWELL(dev))
-				intel_crtc->atomic.wait_vblank = true;
-		}
-
-		/*
-		 * FIXME: Actually if we will still have any other plane enabled
-		 * on the pipe we could let IPS enabled still, but for
-		 * now lets consider that when we make primary invisible
-		 * by setting DSPCNTR to 0 on update_primary_plane function
-		 * IPS needs to be disable.
-		 */
-		if (!state->visible || !fb)
-			intel_crtc->atomic.disable_ips = true;
-
-		intel_crtc->atomic.fb_bits |=
-			INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
-
-		intel_crtc->atomic.update_fbc = true;
-
-		if (intel_wm_need_update(plane, &state->base))
-			intel_crtc->atomic.update_wm = true;
-	}
-
-	if (INTEL_INFO(dev)->gen >= 9) {
-		ret = skl_update_scaler_users(intel_crtc, crtc_state,
-			to_intel_plane(plane), state, 0);
-		if (ret)
-			return ret;
-	}
-
-	return 0;
-=======
 	return drm_plane_helper_check_update(plane, crtc, fb, &state->src,
 					     &state->dst, &state->clip,
 					     min_scale, max_scale,
 					     can_position, true,
 					     &state->visible);
->>>>>>> linux-next/akpm-base
 }
 
 static void
diff -puN drivers/gpu/drm/i915/intel_ringbuffer.h~linux-next-git-rejects drivers/gpu/drm/i915/intel_ringbuffer.h
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -297,15 +297,6 @@ struct  intel_engine_cs {
 	 * Used exclusively by hang checker to avoid grabbing lock while
 	 * inspecting request list.
 	 */
-<<<<<<< HEAD
-	struct drm_i915_gem_request *outstanding_lazy_request;
-	/**
-	 * Seqno of request most recently submitted to request_list.
-	 * Used exclusively by hang checker to avoid grabbing lock while
-	 * inspecting request list.
-	 */
-=======
->>>>>>> linux-next/akpm-base
 	u32 last_submitted_seqno;
 
 	bool gpu_caches_dirty;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
kernel-kthreadc-kthread_create_on_node-clarify-documentation.patch
scripts-spellingtxt-adding-misspelled-word-for-check-fix.patch
mm.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
genalloc-add-name-arg-to-gen_pool_get-and-devm_gen_pool_create-fix.patch
genalloc-add-support-of-multiple-gen_pools-per-device-fix.patch
mm-make-gup-handle-pfn-mapping-unless-foll_get-is-requested-fix.patch
dax-revert-userfaultfd-change.patch
thp-prepare-for-dax-huge-pages-fix.patch
pagemap-add-mmap-exclusive-bit-for-marking-pages-mapped-only-here-fix.patch
mm-show-proportional-swap-share-of-the-mapping-fix.patch
mm-improve-__gfp_noretry-comment-based-on-implementation-fix.patch
memcg-export-struct-mem_cgroup-fix.patch
memcg-export-struct-mem_cgroup-fix-2.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch
procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
define-kallsyms_cmp_symbol_t-as-function-type-to-simplify-the-code-fix.patch
linux-next.patch
linux-next-rejects.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
sound-soc-codecs-cs4349c-include-gpio-consumerh.patch
fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-07-06 19:44 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-07-06 19:44 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/xfs/xfs_file.c             |    6 ------
 include/asm-generic/barrier.h |    9 ---------
 scripts/kconfig/Makefile      |    8 +-------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff -puN fs/xfs/xfs_file.c~linux-next-git-rejects fs/xfs/xfs_file.c
--- a/fs/xfs/xfs_file.c~linux-next-git-rejects
+++ a/fs/xfs/xfs_file.c
@@ -1516,15 +1516,9 @@ xfs_filemap_fault(
 {
 	struct xfs_inode	*ip = XFS_I(file_inode(vma->vm_file));
 	int			ret;
-<<<<<<< HEAD
 
 	trace_xfs_filemap_fault(ip);
 
-=======
-
-	trace_xfs_filemap_fault(ip);
-
->>>>>>> linux-next/akpm-base
 	/* DAX can shortcut the normal fault path on write faults! */
 	if ((vmf->flags & FAULT_FLAG_WRITE) && IS_DAX(VFS_I(ip)))
 		return xfs_filemap_page_mkwrite(vma, vmf);
diff -puN include/asm-generic/barrier.h~linux-next-git-rejects include/asm-generic/barrier.h
--- a/include/asm-generic/barrier.h~linux-next-git-rejects
+++ a/include/asm-generic/barrier.h
@@ -72,12 +72,7 @@
 #define smp_read_barrier_depends()	read_barrier_depends()
 #endif
 
-<<<<<<< HEAD
-#else	/* !CONFIG_SMP */
-
-=======
 #else
->>>>>>> linux-next/akpm-base
 #ifndef smp_mb
 #define smp_mb()	barrier()
 #endif
@@ -94,11 +89,7 @@
 #define smp_read_barrier_depends()	do { } while (0)
 #endif
 
-<<<<<<< HEAD
-#endif	/* CONFIG_SMP */
-=======
 #endif
->>>>>>> linux-next/akpm-base
 
 #ifndef smp_store_mb
 #define smp_store_mb(var, value)  do { WRITE_ONCE(var, value); mb(); } while (0)
diff -puN scripts/kconfig/Makefile~linux-next-git-rejects scripts/kconfig/Makefile
--- a/scripts/kconfig/Makefile~linux-next-git-rejects
+++ a/scripts/kconfig/Makefile
@@ -125,7 +125,7 @@ tinyconfig:
 
 # Help text used by make help
 help:
-	@echo  '  config	  - Update current config utilising a line-oriented program'
+	@echo  '  config	  - Update current conqfig utilising a line-oriented program'
 	@echo  '  nconfig         - Update current config utilising a ncurses menu based'
 	@echo  '                    program'
 	@echo  '  menuconfig	  - Update current config utilising a menu based program'
@@ -143,15 +143,9 @@ help:
 	@echo  '  alldefconfig    - New config with all symbols set to default'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  listnewconfig   - List new options'
-<<<<<<< HEAD
-	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their default value'
-	@echo  '  kvmconfig	  - Enable additional options for kvm guest kernel support'
-	@echo  '  xenconfig       - Enable additional options for xen dom0 and guest kernel support'
-=======
 	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their'
 	@echo  '                    default value'
 	@echo  '  kvmconfig	  - Enable additional options for guest kernel support'
->>>>>>> linux-next/akpm-base
 	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'
 
 # lxdialog stuff
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
mm.patch
slab-infrastructure-for-bulk-object-allocation-and-freeing-v3-fix.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
fs-userfaultfdc-work-around-i386-build-error.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
linux-next.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-06-29 20:17 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-06-29 20:17 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/tile/Kconfig                         |    3 -
 drivers/edac/mce_amd_inj.c                |   41 --------------------
 drivers/staging/android/lowmemorykiller.c |    4 -
 fs/f2fs/namei.c                           |    4 -
 net/mac802154/cfg.c                       |    5 --
 net/mac802154/iface.c                     |   11 -----
 tools/Makefile                            |    4 -
 7 files changed, 72 deletions(-)

diff -puN arch/tile/Kconfig~linux-next-git-rejects arch/tile/Kconfig
--- a/arch/tile/Kconfig~linux-next-git-rejects
+++ a/arch/tile/Kconfig
@@ -29,11 +29,8 @@ config TILE
 	select HAVE_DEBUG_STACKOVERFLOW
 	select ARCH_WANT_FRAME_POINTERS
 	select HAVE_CONTEXT_TRACKING
-<<<<<<< HEAD
-=======
 	select GENERIC_STRNCPY_FROM_USER
 	select GENERIC_STRNLEN_USER
->>>>>>> linux-next/akpm-base
 	select EDAC_SUPPORT
 
 # FIXME: investigate whether we need/want these options.
diff -puN drivers/edac/mce_amd_inj.c~linux-next-git-rejects drivers/edac/mce_amd_inj.c
--- a/drivers/edac/mce_amd_inj.c~linux-next-git-rejects
+++ a/drivers/edac/mce_amd_inj.c
@@ -17,10 +17,7 @@
 #include <linux/cpu.h>
 #include <linux/string.h>
 #include <linux/uaccess.h>
-<<<<<<< HEAD
-=======
 #include <linux/pci.h>
->>>>>>> linux-next/akpm-base
 #include <asm/mce.h>
 #include <asm/irq_vectors.h>
 #include <asm/amd_nb.h>
@@ -36,31 +33,21 @@ static struct dentry *dfs_inj;
 
 static u8 n_banks;
 
-<<<<<<< HEAD
-#define MAX_FLAG_OPT_SIZE	3
-=======
 #define MAX_FLAG_OPT_SIZE	4
->>>>>>> linux-next/akpm-base
 
 enum injection_type {
 	SW_INJ = 0,	/* SW injection, simply decode the error */
 	HW_INJ,		/* Trigger a #MC */
-<<<<<<< HEAD
-=======
 	DFR_INT_INJ,	/* Trigger Deferred error interrupt */
 	THR_INT_INJ,	/* Trigger threshold interrupt */
->>>>>>> linux-next/akpm-base
 	N_INJ_TYPES,
 };
 
 static const char * const flags_options[] = {
 	[SW_INJ] = "sw",
 	[HW_INJ] = "hw",
-<<<<<<< HEAD
-=======
 	[DFR_INT_INJ] = "dfr",
 	[THR_INT_INJ] = "thr",
->>>>>>> linux-next/akpm-base
 	NULL
 };
 
@@ -124,7 +111,6 @@ static int toggle_hw_mce_inject(unsigned
 static int __set_inj(const char *buf)
 {
 	int i;
-<<<<<<< HEAD
 
 	for (i = 0; i < N_INJ_TYPES; i++) {
 		if (!strncmp(flags_options[i], buf, strlen(flags_options[i]))) {
@@ -141,24 +127,6 @@ static ssize_t flags_read(struct file *f
 	char buf[MAX_FLAG_OPT_SIZE];
 	int n;
 
-=======
-
-	for (i = 0; i < N_INJ_TYPES; i++) {
-		if (!strncmp(flags_options[i], buf, strlen(flags_options[i]))) {
-			inj_type = i;
-			return 0;
-		}
-	}
-	return -EINVAL;
-}
-
-static ssize_t flags_read(struct file *filp, char __user *ubuf,
-			  size_t cnt, loff_t *ppos)
-{
-	char buf[MAX_FLAG_OPT_SIZE];
-	int n;
-
->>>>>>> linux-next/akpm-base
 	n = sprintf(buf, "%s\n", flags_options[inj_type]);
 
 	return simple_read_from_buffer(ubuf, cnt, ppos, buf, n);
@@ -288,8 +256,6 @@ static void do_inject(void)
 		return;
 	}
 
-<<<<<<< HEAD
-=======
 	if (inj_type == DFR_INT_INJ) {
 		/*
 		 * Ensure necessary status bits for deferred errors:
@@ -303,15 +269,12 @@ static void do_inject(void)
 		i_mce.status &= ~MCI_STATUS_UC;
 	}
 
->>>>>>> linux-next/akpm-base
 	/* prep MCE global settings for the injection */
 	mcg_status = MCG_STATUS_MCIP | MCG_STATUS_EIPV;
 
 	if (!(i_mce.status & MCI_STATUS_PCC))
 		mcg_status |= MCG_STATUS_RIPV;
 
-<<<<<<< HEAD
-=======
 	/*
 	 * For multi node CPUs, logging and reporting of bank 4 errors happens
 	 * only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for
@@ -326,7 +289,6 @@ static void do_inject(void)
 		cpu = get_nbc_for_node(amd_get_nb_id(cpu));
 	}
 
->>>>>>> linux-next/akpm-base
 	get_online_cpus();
 	if (!cpu_online(cpu))
 		goto err;
@@ -421,13 +383,10 @@ static const char readme_msg[] =
 "\t    handle the error. Be warned: might cause system panic if MCi_STATUS[PCC] \n"
 "\t    is set. Therefore, consider setting (debugfs_mountpoint)/mce/fake_panic \n"
 "\t    before injecting.\n"
-<<<<<<< HEAD
-=======
 "\t  - \"dfr\": Trigger Deferred error handled by the deferred error APIC handler \n"
 "\t    if the feature is present in HW.\n"
 "\t  - \"thr\": Trigger Thresholding error handled by the thresholding error \n"
 "\t    APIC handler.\n"
->>>>>>> linux-next/akpm-base
 "\n";
 
 static ssize_t
diff -puN drivers/staging/android/lowmemorykiller.c~linux-next-git-rejects drivers/staging/android/lowmemorykiller.c
--- a/drivers/staging/android/lowmemorykiller.c~linux-next-git-rejects
+++ a/drivers/staging/android/lowmemorykiller.c
@@ -167,16 +167,12 @@ static unsigned long lowmem_scan(struct
 		 * infrastructure. There is no real reason why the selected
 		 * task should have access to the memory reserves.
 		 */
-<<<<<<< HEAD
-		mark_oom_victim(selected);
-=======
 		mark_tsk_oom_victim(selected);
 		task_unlock(selected);
 		lowmem_print(1, "send sigkill to %d (%s), adj %hd, size %d\n",
 			     selected->pid, selected->comm,
 			     selected_oom_score_adj, selected_tasksize);
 		lowmem_deathpending_timeout = jiffies + HZ;
->>>>>>> linux-next/akpm-base
 		send_sig(SIGKILL, selected, 0);
 		rem += selected_tasksize;
 	}
diff -puN fs/f2fs/namei.c~linux-next-git-rejects fs/f2fs/namei.c
--- a/fs/f2fs/namei.c~linux-next-git-rejects
+++ a/fs/f2fs/namei.c
@@ -916,12 +916,8 @@ static int f2fs_rename2(struct inode *ol
 }
 
 #ifdef CONFIG_F2FS_FS_ENCRYPTION
-<<<<<<< HEAD
-static const char *f2fs_encrypted_follow_link(struct dentry *dentry, void **cookie)
-=======
 static const char *f2fs_encrypted_follow_link(struct dentry *dentry,
 						void **cookie)
->>>>>>> linux-next/akpm-base
 {
 	struct page *cpage = NULL;
 	char *caddr, *paddr = NULL;
diff -puN net/mac802154/cfg.c~linux-next-git-rejects net/mac802154/cfg.c
--- a/net/mac802154/cfg.c~linux-next-git-rejects
+++ a/net/mac802154/cfg.c
@@ -195,16 +195,11 @@ ieee802154_set_pan_id(struct wpan_phy *w
 	if (wpan_dev->pan_id == pan_id)
 		return 0;
 
-<<<<<<< HEAD
-	wpan_dev->pan_id = pan_id;
-	return 0;
-=======
 	ret = mac802154_wpan_update_llsec(wpan_dev->netdev);
 	if (!ret)
 		wpan_dev->pan_id = pan_id;
 
 	return ret;
->>>>>>> linux-next/akpm-base
 }
 
 static int
diff -puN net/mac802154/iface.c~linux-next-git-rejects net/mac802154/iface.c
--- a/net/mac802154/iface.c~linux-next-git-rejects
+++ a/net/mac802154/iface.c
@@ -314,16 +314,8 @@ static int mac802154_slave_close(struct
 
 	clear_bit(SDATA_STATE_RUNNING, &sdata->state);
 
-<<<<<<< HEAD
-	if (!local->open_count) {
-		flush_workqueue(local->workqueue);
-		hrtimer_cancel(&local->ifs_timer);
-		drv_stop(local);
-	}
-=======
 	if (!local->open_count)
 		ieee802154_stop_device(local);
->>>>>>> linux-next/akpm-base
 
 	return 0;
 }
@@ -476,10 +468,7 @@ ieee802154_setup_sdata(struct ieee802154
 		       enum nl802154_iftype type)
 {
 	struct wpan_dev *wpan_dev = &sdata->wpan_dev;
-<<<<<<< HEAD
-=======
 	int ret;
->>>>>>> linux-next/akpm-base
 	u8 tmp;
 
 	/* set some type-dependent values */
diff -puN tools/Makefile~linux-next-git-rejects tools/Makefile
--- a/tools/Makefile~linux-next-git-rejects
+++ a/tools/Makefile
@@ -135,11 +135,7 @@ freefall_clean:
 
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
 		perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
-<<<<<<< HEAD
-		vm_clean net_clean x86_energy_perf_policy_clean tmon_clean freefall_clean
-=======
 		vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
 		freefall_clean
->>>>>>> linux-next/akpm-base
 
 .PHONY: FORCE
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

origin.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
mm.patch
slab-infrastructure-for-bulk-object-allocation-and-freeing-v3-fix.patch
mm-meminit-inline-some-helper-functions-fix.patch
mm-meminit-finish-initialisation-of-struct-pages-before-basic-setup-fix.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
fs-userfaultfdc-work-around-i386-build-error.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
devpts-if-initialization-failed-dont-crash-when-opening-dev-ptmx-fix.patch
ipcshm-move-bug_on-check-into-shm_lock-fix.patch
scsi-resolve-sg-buffer-const-ness-issue-fix.patch
linux-next.patch
drivers-block-nvme-corec-fix-build-with-gcc-444.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-06-25 19:00 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-06-25 19:00 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: a
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: a

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 MAINTAINERS                                         |    9 -------
 arch/x86/kvm/cpuid.c                                |    4 ---
 arch/x86/kvm/x86.c                                  |    4 ---
 drivers/infiniband/hw/mlx4/mad.c                    |    3 --
 drivers/infiniband/hw/mlx5/main.c                   |    9 -------
 drivers/iommu/intel_irq_remapping.c                 |    8 ------
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c     |    5 ----
 drivers/net/ethernet/chelsio/cxgb4/sge.c            |    7 -----
 drivers/power/axp288_charger.c                      |   12 ----------
 drivers/rtc/Makefile                                |    6 -----
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c |   11 ---------
 drivers/target/target_core_user.c                   |    5 ----
 drivers/watchdog/Kconfig                            |    3 --
 drivers/watchdog/st_lpc_wdt.c                       |    4 ---
 include/dt-bindings/mfd/arizona.h                   |    3 --
 include/linux/mfd/axp20x.h                          |    3 --
 net/sunrpc/xprtrdma/frwr_ops.c                      |    4 ---
 net/sunrpc/xprtrdma/verbs.c                         |   10 --------
 18 files changed, 2 insertions(+), 108 deletions(-)

diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -2341,15 +2341,12 @@ S:	Supported
 F:	drivers/gpio/gpio-bcm-kona.c
 F:	Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
 
-<<<<<<< HEAD
-=======
 BROADCOM NVRAM DRIVER
 M:	Rafał Miłecki <zajec5@gmail.com>
 L:	linux-mips@linux-mips.org
 S:	Maintained
 F:	drivers/firmware/broadcom/*
 
->>>>>>> linux-next/akpm-base
 BROADCOM STB NAND FLASH DRIVER
 M:	Brian Norris <computersforpeace@gmail.com>
 L:	linux-mtd@lists.infradead.org
@@ -8109,10 +8106,7 @@ F:	sound/ppc/snd_ps3*
 
 PS3VRAM DRIVER
 M:	Jim Paris <jim@jtan.com>
-<<<<<<< HEAD
-=======
 M:	Geoff Levand <geoff@infradead.org>
->>>>>>> linux-next/akpm-base
 L:	linuxppc-dev@lists.ozlabs.org
 S:	Maintained
 F:	drivers/block/ps3vram.c
@@ -9829,8 +9823,6 @@ F:	arch/arc/
 F:	Documentation/devicetree/bindings/arc/
 F:	drivers/tty/serial/arc_uart.c
 
-<<<<<<< HEAD
-=======
 SYNOPSYS ARC SDP platform support
 M:	Alexey Brodkin <abrodkin@synopsys.com>
 S:	Supported
@@ -9838,7 +9830,6 @@ F:	arch/arc/plat-axs10x
 F:	arch/arc/boot/dts/ax*
 F:	Documentation/devicetree/bindings/arc/axs10*
 
->>>>>>> linux-next/akpm-base
 SYSTEM CONFIGURATION (SYSCON)
 M:	Lee Jones <lee.jones@linaro.org>
 M:	Arnd Bergmann <arnd@arndb.de>
diff -puN arch/x86/kvm/cpuid.c~linux-next-git-rejects arch/x86/kvm/cpuid.c
--- a/arch/x86/kvm/cpuid.c~linux-next-git-rejects
+++ a/arch/x86/kvm/cpuid.c
@@ -16,12 +16,8 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/uaccess.h>
-<<<<<<< HEAD
-#include <asm/fpu/internal.h> /* For use_eager_fpu.  Ugh! */
-=======
 #include <asm/fpu/api.h>
 #include <asm/fpu/internal.h>
->>>>>>> linux-next/akpm-base
 #include <asm/user.h>
 #include <asm/fpu/xstate.h>
 #include "cpuid.h"
diff -puN arch/x86/kvm/x86.c~linux-next-git-rejects arch/x86/kvm/x86.c
--- a/arch/x86/kvm/x86.c~linux-next-git-rejects
+++ a/arch/x86/kvm/x86.c
@@ -7292,11 +7292,7 @@ void kvm_put_guest_fpu(struct kvm_vcpu *
 	 * Every 255 times fpu_counter rolls over to 0; a guest that uses
 	 * the FPU in bursts will revert to loading it on demand.
 	 */
-<<<<<<< HEAD
-	if (!vcpu->arch.eager_fpu) {
-=======
 	if (!use_eager_fpu()) {
->>>>>>> linux-next/akpm-base
 		if (++vcpu->fpu_counter < 5)
 			kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu);
 	}
diff -puN drivers/infiniband/hw/mlx4/mad.c~linux-next-git-rejects drivers/infiniband/hw/mlx4/mad.c
--- a/drivers/infiniband/hw/mlx4/mad.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx4/mad.c
@@ -857,10 +857,7 @@ int mlx4_ib_process_mad(struct ib_device
 			struct ib_mad_hdr *out, size_t *out_mad_size,
 			u16 *out_mad_pkey_index)
 {
-<<<<<<< HEAD
-=======
 	struct mlx4_ib_dev *dev = to_mdev(ibdev);
->>>>>>> linux-next/akpm-base
 	const struct ib_mad *in_mad = (const struct ib_mad *)in;
 	struct ib_mad *out_mad = (struct ib_mad *)out;
 
diff -puN drivers/infiniband/hw/mlx5/main.c~linux-next-git-rejects drivers/infiniband/hw/mlx5/main.c
--- a/drivers/infiniband/hw/mlx5/main.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/main.c
@@ -215,15 +215,6 @@ static int mlx5_ib_query_device(struct i
 
 	if (uhw->inlen || uhw->outlen)
 		return -EINVAL;
-<<<<<<< HEAD
-
-	gen = &dev->mdev->caps.gen;
-	in_mad  = kzalloc(sizeof(*in_mad), GFP_KERNEL);
-	out_mad = kmalloc(sizeof(*out_mad), GFP_KERNEL);
-	if (!in_mad || !out_mad)
-		goto out;
-=======
->>>>>>> linux-next/akpm-base
 
 	memset(props, 0, sizeof(*props));
 	err = mlx5_query_system_image_guid(ibdev,
diff -puN drivers/iommu/intel_irq_remapping.c~linux-next-git-rejects drivers/iommu/intel_irq_remapping.c
--- a/drivers/iommu/intel_irq_remapping.c~linux-next-git-rejects
+++ a/drivers/iommu/intel_irq_remapping.c
@@ -701,17 +701,9 @@ static int __init intel_prepare_irq_rema
 	if (eim)
 		pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
 
-<<<<<<< HEAD
-	/* Do the initializations early */
-	for_each_iommu(iommu, drhd) {
-		if (intel_setup_irq_remapping(iommu)) {
-			pr_err("Failed to setup irq remapping for %s\n",
-			       iommu->name);
-=======
 	/* Do the allocations early */
 	for_each_iommu(iommu, drhd)
 		if (intel_setup_irq_remapping(iommu))
->>>>>>> linux-next/akpm-base
 			goto error;
 		}
 	}
diff -puN drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c~linux-next-git-rejects drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2358,13 +2358,8 @@ static void process_db_drop(struct work_
 		unsigned int bar2_qid;
 		int ret;
 
-<<<<<<< HEAD
-		ret = cxgb4_t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,
-					      0, &bar2_qoffset, &bar2_qid);
-=======
 		ret = t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,
 					0, &bar2_qoffset, &bar2_qid);
->>>>>>> linux-next/akpm-base
 		if (ret)
 			dev_err(adap->pdev_dev, "doorbell drop recovery: "
 				"qid=%d, pidx_inc=%d\n", qid, pidx_inc);
diff -puN drivers/net/ethernet/chelsio/cxgb4/sge.c~linux-next-git-rejects drivers/net/ethernet/chelsio/cxgb4/sge.c
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -1,4 +1,4 @@
-/*
+q/*
  * This file is part of the Chelsio T4 Ethernet driver for Linux.
  *
  * Copyright (c) 2003-2014 Chelsio Communications, Inc. All rights reserved.
@@ -2401,13 +2401,8 @@ static void __iomem *bar2_address(struct
 	u64 bar2_qoffset;
 	int ret;
 
-<<<<<<< HEAD
-	ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype, 0,
-				      &bar2_qoffset, pbar2_qid);
-=======
 	ret = t4_bar2_sge_qregs(adapter, qid, qtype, 0,
 				&bar2_qoffset, pbar2_qid);
->>>>>>> linux-next/akpm-base
 	if (ret)
 		return NULL;
 
diff -puN drivers/power/axp288_charger.c~linux-next-git-rejects drivers/power/axp288_charger.c
--- a/drivers/power/axp288_charger.c~linux-next-git-rejects
+++ a/drivers/power/axp288_charger.c
@@ -848,11 +848,7 @@ static int axp288_charger_probe(struct p
 	/* Register for extcon notification */
 	INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
 	info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
-<<<<<<< HEAD
-	ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
-=======
 	ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
->>>>>>> linux-next/akpm-base
 	if (ret) {
 		dev_err(&info->pdev->dev,
 			"failed to register extcon notifier %d\n", ret);
@@ -913,11 +909,7 @@ intr_reg_failed:
 		extcon_unregister_interest(&info->otg.cable);
 	power_supply_unregister(info->psy_usb);
 psy_reg_failed:
-<<<<<<< HEAD
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
-=======
 	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
->>>>>>> linux-next/akpm-base
 	return ret;
 }
 
@@ -928,11 +920,7 @@ static int axp288_charger_remove(struct
 	if (info->otg.cable.edev)
 		extcon_unregister_interest(&info->otg.cable);
 
-<<<<<<< HEAD
-	extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
-=======
 	extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
->>>>>>> linux-next/akpm-base
 	power_supply_unregister(info->psy_usb);
 
 	return 0;
diff -puN drivers/rtc/Makefile~linux-next-git-rejects drivers/rtc/Makefile
--- a/drivers/rtc/Makefile~linux-next-git-rejects
+++ a/drivers/rtc/Makefile
@@ -158,9 +158,3 @@ obj-$(CONFIG_RTC_DRV_WM831X)	+= rtc-wm83
 obj-$(CONFIG_RTC_DRV_WM8350)	+= rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)	+= rtc-x1205.o
 obj-$(CONFIG_RTC_DRV_XGENE)	+= rtc-xgene.o
-<<<<<<< HEAD
-obj-$(CONFIG_RTC_DRV_SIRFSOC)	+= rtc-sirfsoc.o
-obj-$(CONFIG_RTC_DRV_ST_LPC)	+= rtc-st-lpc.o
-obj-$(CONFIG_RTC_DRV_MOXART)	+= rtc-moxart.o
-=======
->>>>>>> linux-next/akpm-base
diff -puN drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c~linux-next-git-rejects drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c~linux-next-git-rejects
+++ a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -647,16 +647,6 @@ kib_conn_t *kiblnd_create_conn(kib_peer_
 	kib_net_t *net = peer->ibp_ni->ni_data;
 	kib_dev_t *dev;
 	struct ib_qp_init_attr *init_qp_attr;
-<<<<<<< HEAD
-	struct kib_sched_info	*sched;
-	struct ib_cq_init_attr  cq_attr = {};
-	kib_conn_t		*conn;
-	struct ib_cq		*cq;
-	unsigned long		flags;
-	int			cpt;
-	int			rc;
-	int			i;
-=======
 	struct kib_sched_info *sched;
 	struct ib_cq_init_attr cq_attr = {};
 	kib_conn_t *conn;
@@ -665,7 +655,6 @@ kib_conn_t *kiblnd_create_conn(kib_peer_
 	int cpt;
 	int rc;
 	int i;
->>>>>>> linux-next/akpm-base
 
 	LASSERT(net != NULL);
 	LASSERT(!in_interrupt());
diff -puN drivers/target/target_core_user.c~linux-next-git-rejects drivers/target/target_core_user.c
--- a/drivers/target/target_core_user.c~linux-next-git-rejects
+++ a/drivers/target/target_core_user.c
@@ -1,4 +1,4 @@
-/*
+q/*
  * Copyright (C) 2013 Shaohua Li <shli@kernel.org>
  * Copyright (C) 2014 Red Hat, Inc.
  * Copyright (C) 2015 Arrikto, Inc.
@@ -23,10 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/parser.h>
-<<<<<<< HEAD
-=======
 #include <linux/vmalloc.h>
->>>>>>> linux-next/akpm-base
 #include <linux/uio_driver.h>
 #include <net/genetlink.h>
 #include <scsi/scsi_common.h>
diff -puN drivers/watchdog/Kconfig~linux-next-git-rejects drivers/watchdog/Kconfig
--- a/drivers/watchdog/Kconfig~linux-next-git-rejects
+++ a/drivers/watchdog/Kconfig
@@ -485,10 +485,7 @@ config ST_LPC_WATCHDOG
 	depends on ARCH_STI
 	depends on OF
 	select WATCHDOG_CORE
-<<<<<<< HEAD
-=======
 	select MFD_ST_LPC
->>>>>>> linux-next/akpm-base
 	help
 	  Say Y here to include STMicroelectronics Low Power Controller
 	  (LPC) based Watchdog timer support.
diff -puN drivers/watchdog/st_lpc_wdt.c~linux-next-git-rejects drivers/watchdog/st_lpc_wdt.c
--- a/drivers/watchdog/st_lpc_wdt.c~linux-next-git-rejects
+++ a/drivers/watchdog/st_lpc_wdt.c
@@ -197,11 +197,7 @@ static int st_wdog_probe(struct platform
 		return -EINVAL;
 	}
 
-<<<<<<< HEAD
-	/* LPC can either run in RTC or WDT mode */
-=======
 	/* LPC can either run as a Clocksource or in RTC or WDT mode */
->>>>>>> linux-next/akpm-base
 	if (mode != ST_LPC_MODE_WDT)
 		return -ENODEV;
 
diff -puN include/dt-bindings/mfd/arizona.h~linux-next-git-rejects include/dt-bindings/mfd/arizona.h
--- a/include/dt-bindings/mfd/arizona.h~linux-next-git-rejects
+++ a/include/dt-bindings/mfd/arizona.h
@@ -104,11 +104,8 @@
 #define ARIZONA_MICD_TIME_256MS                      11
 #define ARIZONA_MICD_TIME_512MS                      12
 
-<<<<<<< HEAD
-=======
 #define ARIZONA_ACCDET_MODE_MIC 0
 #define ARIZONA_ACCDET_MODE_HPL 1
 #define ARIZONA_ACCDET_MODE_HPR 2
 
->>>>>>> linux-next/akpm-base
 #endif
diff -puN include/linux/mfd/axp20x.h~linux-next-git-rejects include/linux/mfd/axp20x.h
--- a/include/linux/mfd/axp20x.h~linux-next-git-rejects
+++ a/include/linux/mfd/axp20x.h
@@ -368,12 +368,9 @@ struct axp20x_chrg_pdata {
 	int def_cv;
 };
 
-<<<<<<< HEAD
-=======
 struct axp288_extcon_pdata {
 	/* GPIO pin control to switch D+/D- lines b/w PMIC and SOC */
 	struct gpio_desc *gpio_mux_cntl;
 };
 
->>>>>>> linux-next/akpm-base
 #endif /* __LINUX_MFD_AXP20X_H */
diff -puN net/sunrpc/xprtrdma/frwr_ops.c~linux-next-git-rejects net/sunrpc/xprtrdma/frwr_ops.c
--- a/net/sunrpc/xprtrdma/frwr_ops.c~linux-next-git-rejects
+++ a/net/sunrpc/xprtrdma/frwr_ops.c
@@ -252,11 +252,7 @@ frwr_sendcompletion(struct ib_wc *wc)
 
 	/* WARNING: Only wr_id and status are reliable at this point */
 	r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
-<<<<<<< HEAD
-	dprintk("RPC:       %s: frmr %p (stale), status %s (%d)\n",
-=======
 	pr_warn("RPC:       %s: frmr %p flushed, status %s (%d)\n",
->>>>>>> linux-next/akpm-base
 		__func__, r, ib_wc_status_msg(wc->status), wc->status);
 	r->r.frmr.fr_state = FRMR_IS_STALE;
 }
diff -puN net/sunrpc/xprtrdma/verbs.c~linux-next-git-rejects net/sunrpc/xprtrdma/verbs.c
--- a/net/sunrpc/xprtrdma/verbs.c~linux-next-git-rejects
+++ a/net/sunrpc/xprtrdma/verbs.c
@@ -685,13 +685,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep,
 	INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
 
 	cq_attr.cqe = ep->rep_attr.cap.max_send_wr + 1;
-<<<<<<< HEAD
-	sendcq = ib_create_cq(ia->ri_id->device, rpcrdma_sendcq_upcall,
-				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
-=======
 	sendcq = ib_create_cq(ia->ri_device, rpcrdma_sendcq_upcall,
 			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
->>>>>>> linux-next/akpm-base
 	if (IS_ERR(sendcq)) {
 		rc = PTR_ERR(sendcq);
 		dprintk("RPC:       %s: failed to create send CQ: %i\n",
@@ -707,13 +702,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep,
 	}
 
 	cq_attr.cqe = ep->rep_attr.cap.max_recv_wr + 1;
-<<<<<<< HEAD
-	recvcq = ib_create_cq(ia->ri_id->device, rpcrdma_recvcq_upcall,
-				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
-=======
 	recvcq = ib_create_cq(ia->ri_device, rpcrdma_recvcq_upcall,
 			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
->>>>>>> linux-next/akpm-base
 	if (IS_ERR(recvcq)) {
 		rc = PTR_ERR(recvcq);
 		dprintk("RPC:       %s: failed to create recv CQ: %i\n",
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

origin.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
mm.patch
slab-infrastructure-for-bulk-object-allocation-and-freeing-v3-fix.patch
mm-meminit-inline-some-helper-functions-fix.patch
mm-meminit-finish-initialisation-of-struct-pages-before-basic-setup-fix.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
fs-userfaultfdc-work-around-i386-build-error.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
zswap-runtime-enable-disable-fix.patch
prctl-more-prctlpr_set_mm_-checks-fix.patch
proc-fix-page_size-limit-of-proc-pid-cmdline-fix.patch
maintainers-davidlohr-has-moved.patch
bitmap-remove-explicit-newline-handling-using-scnprintf-format-string-fix.patch
radix-tree-replace-preallocated-node-array-with-linked-list-fix.patch
checkpatch-emit-an-error-when-theres-a-diff-in-a-changelog.patch
init-do_mounts-add-create_dev-failure-log-fix.patch
devpts-if-initialization-failed-dont-crash-when-opening-dev-ptmx-fix.patch
ipcshm-move-bug_on-check-into-shm_lock-fix.patch
scsi-resolve-sg-buffer-const-ness-issue-fix.patch
linux-next.patch
linux-next-rejects.patch
drivers-block-nvme-corec-fix-build-with-gcc-444.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
net-netfilter-ipset-work-around-gcc-444-initializer-bug.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-06-17 18:52 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-06-17 18:52 UTC (permalink / raw)
  To: akpm, mm-commits


The patch titled
     Subject: linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next-git-rejects

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 sound/pci/hda/hda_codec.c |    4 ----
 sound/pci/hda/hda_intel.c |    9 ---------
 2 files changed, 13 deletions(-)

diff -puN sound/pci/hda/hda_codec.c~linux-next-git-rejects sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_codec.c~linux-next-git-rejects
+++ a/sound/pci/hda/hda_codec.c
@@ -437,11 +437,7 @@ static unsigned int get_num_devices(stru
 		return 0;
 
 	parm = snd_hdac_read_parm_uncached(&codec->core, nid, AC_PAR_DEVLIST_LEN);
-<<<<<<< HEAD
-	if (parm == -1 && codec->bus->rirb_error)
-=======
 	if (parm == -1)
->>>>>>> linux-next/akpm-base
 		parm = 0;
 	return parm & AC_DEV_LIST_LEN_MASK;
 }
diff -puN sound/pci/hda/hda_intel.c~linux-next-git-rejects sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/hda_intel.c~linux-next-git-rejects
+++ a/sound/pci/hda/hda_intel.c
@@ -1981,16 +1981,11 @@ static int azx_probe_continue(struct azx
 	 * display codec needs the power and it can be released after probe.
 	 */
 	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
-<<<<<<< HEAD
-#ifdef CONFIG_SND_HDA_I915
-		err = hda_i915_init(hda);
-=======
 		/* HSW/BDW controllers need this power */
 		if (CONTROLLER_IN_GPU(pci))
 			hda->need_i915_power = 1;
 
 		err = snd_hdac_i915_init(bus);
->>>>>>> linux-next/akpm-base
 		if (err < 0) {
 			/* if the controller is bound only with HDMI/DP
 			 * (for HSW and BDW), we need to abort the probe;
@@ -2002,12 +1997,8 @@ static int azx_probe_continue(struct azx
 			else
 				goto skip_i915;
 		}
-<<<<<<< HEAD
-		err = hda_display_power(hda, true);
-=======
 
 		err = snd_hdac_display_power(bus, true);
->>>>>>> linux-next/akpm-base
 		if (err < 0) {
 			dev_err(chip->card->dev,
 				"Cannot turn on display power on i915\n");
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

arch-alpha-kernel-systblss-remove-debug-check.patch
revert-cpumask-dont-perform-while-loop-in-cpumask_next_and.patch
ocfs2-reduce-object-size-of-mlog-uses-fix.patch
ocfs2-remove-__mlog_cpu_guess.patch
ocfs2-remove-__mlog_cpu_guess-fix.patch
ocfs2-fix-null-pointer-dereference-in-function-ocfs2_abort_trigger-fix.patch
mm.patch
mm-slab_common-support-the-slub_debug-boot-option-on-specific-object-size-fix.patch
slab-infrastructure-for-bulk-object-allocation-and-freeing-v3-fix.patch
mm-fix-mprotect-behaviour-on-vm_locked-vmas-fix.patch
mm-new-mm-hook-framework.patch
mm-meminit-inline-some-helper-functions-fix.patch
mm-meminit-finish-initialisation-of-struct-pages-before-basic-setup-fix.patch
mm-memory-failure-introduce-get_hwpoison_page-for-consistent-refcount-handling-fix.patch
rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix.patch
rmap-fix-theoretical-race-between-do_wp_page-and-shrink_active_list-fix-fix.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2.patch
userfaultfd-change-the-read-api-to-return-a-uffd_msg-fix-2-fix.patch
userfaultfd-avoid-mmap_sem-read-recursion-in-mcopy_atomic-fix.patch
fs-userfaultfdc-work-around-i386-build-error.patch
hugetlb-do-not-account-hugetlb-pages-as-nr_file_pages-fix.patch
mm-do-not-ignore-mapping_gfp_mask-in-page-cache-allocation-paths-checkpatch-fixes.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix-fix.patch
zswap-runtime-enable-disable-fix.patch
prctl-more-prctlpr_set_mm_-checks-fix.patch
proc-fix-page_size-limit-of-proc-pid-cmdline-fix.patch
bitmap-remove-explicit-newline-handling-using-scnprintf-format-string-fix.patch
radix-tree-replace-preallocated-node-array-with-linked-list-fix.patch
checkpatch-emit-an-error-when-theres-a-diff-in-a-changelog.patch
init-do_mounts-add-create_dev-failure-log-fix.patch
devpts-if-initialization-failed-dont-crash-when-opening-dev-ptmx-fix.patch
ipcshm-move-bug_on-check-into-shm_lock-fix.patch
scsi-resolve-sg-buffer-const-ness-issue-fix.patch
revert-x86-mm-enable-deferred-struct-page-initialisation-on-x86-64.patch
linux-next.patch
reapply-x86-mm-enable-deferred-struct-page-initialisation-on-x86-64.patch
linux-next-rejects.patch
drivers-block-nvme-corec-fix-build-with-gcc-444.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm-provide-new-get_vaddr_frames-helper-fix.patch
mm-move-get_vaddr_frames-behind-a-config-option.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch


^ permalink raw reply	[flat|nested] 330+ messages in thread

* [obsolete] linux-next-git-rejects.patch removed from -mm tree
@ 2015-06-03 22:26 akpm
  0 siblings, 0 replies; 330+ messages in thread
From: akpm @ 2015-06-03 22:26 UTC (