The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/soc15.c | 3 ---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 -------------
drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 ---
drivers/scsi/qla2xxx/qla_os.c | 4 ----
4 files changed, 23 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1136,8 +1136,6 @@ static int soc15_common_early_init(void
adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN;
}
-<<<<<<< HEAD
-=======
break;
case CHIP_ARCTURUS:
adev->asic_funcs = &vega20_asic_funcs;
@@ -1185,7 +1183,6 @@ static int soc15_common_early_init(void
adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
AMD_PG_SUPPORT_CP |
AMD_PG_SUPPORT_RLC_SMU_HS;
->>>>>>> linux-next/akpm-base
break;
default:
/* FIXME: not supported yet */
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -19,16 +19,7 @@
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_probe_helper.h>
-<<<<<<< HEAD
-#include <linux/component.h>
-#include <linux/iommu.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/pm_runtime.h>
-#include <linux/dma-mapping.h>
-=======
#include <drm/drm_vblank.h>
->>>>>>> linux-next/akpm-base
#include "mtk_drm_crtc.h"
#include "mtk_drm_ddp.h"
@@ -375,10 +366,6 @@ static struct drm_driver mtk_drm_driver
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-<<<<<<< HEAD
- .gem_prime_export = drm_gem_prime_export,
-=======
->>>>>>> linux-next/akpm-base
.gem_prime_import = mtk_drm_gem_prime_import,
.gem_prime_get_sg_table = mtk_gem_prime_get_sg_table,
.gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1475,10 +1475,7 @@ int bfregn_to_uar_index(struct mlx5_ib_d
bool dyn_bfreg);
int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);
-<<<<<<< HEAD
-=======
u16 mlx5_ib_get_counters_id(struct mlx5_ib_dev *dev, u8 port_num);
->>>>>>> linux-next/akpm-base
static inline bool mlx5_ib_can_use_umr(struct mlx5_ib_dev *dev,
bool do_modify_atomic)
--- a/drivers/scsi/qla2xxx/qla_os.c~linux-next-git-rejects
+++ a/drivers/scsi/qla2xxx/qla_os.c
@@ -4812,11 +4812,7 @@ struct scsi_qla_host *qla2x00_create_hos
dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
vha->gnl.l, vha->gnl.ldma);
vha->gnl.l = NULL;
-<<<<<<< HEAD
- scsi_remove_host(vha->host);
-=======
scsi_host_put(vha->host);
->>>>>>> linux-next/akpm-base
return NULL;
}
INIT_DELAYED_WORK(&vha->scan.scan_work, qla_scan_work_fn);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm.patch
mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch
mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch
lib-test_kasan-add-roundtrip-tests-checkpatch-fixes.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.patch
mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch
linux-next-rejects.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
