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@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 4 -
drivers/gpu/drm/nouveau/nouveau_fence.c | 35 ----------
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 -
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 5 -
drivers/platform/x86/intel/Kconfig | 3
5 files changed, 52 deletions(-)
--- a/drivers/platform/x86/intel/Kconfig~linux-next-git-rejects
+++ a/drivers/platform/x86/intel/Kconfig
@@ -170,8 +170,6 @@ config INTEL_UNCORE_FREQ_CONTROL
To compile this driver as a module, choose M here: the module
will be called intel-uncore-frequency.
-<<<<<<< HEAD
-=======
config INTEL_VSEC
tristate "Intel Vendor Specific Extended Capabilities Driver"
@@ -183,4 +181,3 @@ config INTEL_VSEC
To compile this driver as a module, choose M here: the module will
be called intel_vsec.
->>>>>>> linux-next/akpm-base
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
@@ -686,11 +686,7 @@ static const struct dc_debug_options deb
.disable_clock_gate = true,
.disable_pplib_clock_request = true,
.disable_pplib_wm_range = true,
-<<<<<<< HEAD
- .pipe_split_policy = MPC_SPLIT_DYNAMIC,
-=======
.pipe_split_policy = MPC_SPLIT_AVOID,
->>>>>>> linux-next/akpm-base
.force_single_disp_pipe_split = false,
.disable_dcc = DCC_ENABLE,
.vsr_support = true,
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -355,19 +355,7 @@ nouveau_fence_sync(struct nouveau_bo *nv
if (ret)
return ret;
-<<<<<<< HEAD
- fobj = NULL;
- } else {
- fobj = dma_resv_shared_list(resv);
- }
-
- /* Waiting for the exclusive fence first causes performance regressions
- * under some circumstances. So manually wait for the shared ones first.
- */
- for (i = 0; i < (fobj ? fobj->shared_count : 0) && !ret; ++i) {
-=======
dma_resv_for_each_fence(&cursor, resv, exclusive, fence) {
->>>>>>> linux-next/akpm-base
struct nouveau_channel *prev = NULL;
bool must_wait = true;
@@ -386,32 +374,9 @@ nouveau_fence_sync(struct nouveau_bo *nv
if (must_wait) {
ret = dma_fence_wait(fence, intr);
-<<<<<<< HEAD
- }
-
- fence = dma_resv_excl_fence(resv);
- if (fence) {
- struct nouveau_channel *prev = NULL;
- bool must_wait = true;
-
- f = nouveau_local_fence(fence, chan->drm);
- if (f) {
- rcu_read_lock();
- prev = rcu_dereference(f->channel);
- if (prev && (prev == chan || fctx->sync(f, prev, chan) == 0))
- must_wait = false;
- rcu_read_unlock();
- }
-
- if (must_wait)
- ret = dma_fence_wait(fence, intr);
-
- return ret;
-=======
if (ret)
return ret;
}
->>>>>>> linux-next/akpm-base
}
return 0;
}
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1430,11 +1430,6 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv
metadata);
if (err)
goto err_out;
-<<<<<<< HEAD
-
- attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
-=======
->>>>>>> linux-next/akpm-base
}
}
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@ -398,13 +398,8 @@ irq_pool_request_vector(struct mlx5_irq_
cpumask_copy(irq->mask, affinity);
if (!irq_pool_is_sf_pool(pool) && !pool->xa_num_irqs.max &&
cpumask_empty(irq->mask))
-<<<<<<< HEAD
- cpumask_set_cpu(cpumask_first(cpu_online_mask), irq->mask);
- irq_set_affinity_hint(irq->irqn, irq->mask);
-=======
cpumask_set_cpu(0, irq->mask);
irq_set_affinity_and_hint(irq->irqn, irq->mask);
->>>>>>> linux-next/akpm-base
unlock:
mutex_unlock(&pool->lock);
return irq;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
shmem-fix-a-race-between-shmem_unused_huge_shrink-and-shmem_evict_inode-checkpatch-fixes.patch
kthread-add-the-helper-function-kthread_run_on_cpu-fix.patch
mm.patch
kmemleak-fix-kmemleak-false-positive-report-with-hw-tag-based-kasan-enable-fix.patch
device-dax-remove-pfn-from-__dev_dax_ptepmdpud_fault-fix.patch
documentation-vm-page_ownerrst-update-the-documentation-fix.patch
mm-shmem-dont-truncate-page-if-memory-failure-happens-checkpatch-fixes.patch
memcg-add-per-memcg-vmalloc-stat-v2-fix.patch
mm-remove-redundant-check-about-fault_flag_allow_retry-bit-checkpatch-fixes.patch
mm-vmalloc-allocate-small-pages-for-area-pages-fix.patch
mm-page_allocc-do-not-warn-allocation-failure-on-zone-dma-if-no-managed-pages-fix.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
mm-memcg-percpu-account-extra-objcg-space-to-memory-cgroups-fix.patch
mm-rmap-fix-potential-batched-tlb-flush-race-fix.patch
proc-make-the-proc_create-stubs-static-inlines-fix.patch
proc-make-the-proc_create-stubs-static-inlines-fix2.patch
proc-make-the-proc_create-stubs-static-inlines-fix2-fix.patch
kernel-sys-only-take-tasklist_lock-for-get-setpriorityprio_pgrp-checkpatch-fixes.patch
hashh-remove-unused-define-directive-fix.patch
panic-use-error_report_end-tracepoint-on-warnings-fix.patch
linux-next-rejects.patch
fs-f2fs-datac-fix-mess.patch
sysctl-move-some-boundary-constants-from-sysctlc-to-sysctl_vals-fix.patch
firmware_loader-move-firmware-sysctl-to-its-own-files-fix.patch
firmware_loader-move-firmware-sysctl-to-its-own-files-fix-fix.patch
sysctl-add-helper-to-register-a-sysctl-mount-point-fix.patch
sysctl-move-maxolduid-as-a-sysctl-specific-const-fix.patch
proc-remove-pde_data-completely-fix.patch
proc-remove-pde_data-completely-fix-fix.patch
mutex-subsystem-synchro-test-module-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
