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/nbio_v7_4.c | 15 --------
drivers/gpu/drm/i915/intel_display.c | 4 --
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 26 --------------
drivers/net/virtio_net.c | 10 -----
4 files changed, 55 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -91,7 +91,6 @@ static void nbio_v7_4_enable_doorbell_se
bool enable)
{
u32 tmp = 0;
-<<<<<<< HEAD
if (enable) {
tmp = REG_SET_FIELD(tmp, DOORBELL_SELFRING_GPA_APER_CNTL, DOORBELL_SELFRING_GPA_APER_EN, 1) |
@@ -104,20 +103,6 @@ static void nbio_v7_4_enable_doorbell_se
upper_32_bits(adev->doorbell.base));
}
-=======
-
- if (enable) {
- tmp = REG_SET_FIELD(tmp, DOORBELL_SELFRING_GPA_APER_CNTL, DOORBELL_SELFRING_GPA_APER_EN, 1) |
- REG_SET_FIELD(tmp, DOORBELL_SELFRING_GPA_APER_CNTL, DOORBELL_SELFRING_GPA_APER_MODE, 1) |
- REG_SET_FIELD(tmp, DOORBELL_SELFRING_GPA_APER_CNTL, DOORBELL_SELFRING_GPA_APER_SIZE, 0);
-
- WREG32_SOC15(NBIO, 0, mmDOORBELL_SELFRING_GPA_APER_BASE_LOW,
- lower_32_bits(adev->doorbell.base));
- WREG32_SOC15(NBIO, 0, mmDOORBELL_SELFRING_GPA_APER_BASE_HIGH,
- upper_32_bits(adev->doorbell.base));
- }
-
->>>>>>> linux-next/akpm-base
WREG32_SOC15(NBIO, 0, mmDOORBELL_SELFRING_GPA_APER_CNTL, tmp);
}
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -15679,11 +15679,7 @@ static bool has_bogus_dpll_config(const
* without several WARNs, but for now let's take the easy
* road.
*/
-<<<<<<< HEAD
- return IS_GEN6(dev_priv) &&
-=======
return IS_GEN(dev_priv, 6) &&
->>>>>>> linux-next/akpm-base
crtc_state->base.active &&
crtc_state->shared_dpll &&
crtc_state->port_clock == 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
@@ -2080,17 +2080,7 @@ static int alloc_tc_pedit_action(struct
goto out_err;
}
-<<<<<<< HEAD
- if (!parse_attr->mod_hdr_actions) {
- err = alloc_mod_hdr_actions(priv, a, namespace, parse_attr);
- if (err)
- goto out_err;
- }
-
- err = offload_pedit_fields(masks, vals, parse_attr, extack);
-=======
err = offload_pedit_fields(hdrs, parse_attr, extack);
->>>>>>> linux-next/akpm-base
if (err < 0)
goto out_dealloc_parsed_actions;
@@ -2145,11 +2135,7 @@ static bool csum_offload_supported(struc
}
static bool modify_header_match_supported(struct mlx5_flow_spec *spec,
-<<<<<<< HEAD
- struct tcf_exts *exts,
-=======
struct flow_action *flow_action,
->>>>>>> linux-next/akpm-base
u32 actions,
struct netlink_ext_ack *extack)
{
@@ -2165,14 +2151,6 @@ static bool modify_header_match_supporte
else
headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, outer_headers);
-<<<<<<< HEAD
- if (actions & MLX5_FLOW_CONTEXT_ACTION_DECAP)
- headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, inner_headers);
- else
- headers_v = MLX5_ADDR_OF(fte_match_param, spec->match_value, outer_headers);
-
-=======
->>>>>>> linux-next/akpm-base
ethertype = MLX5_GET(fte_match_set_lyr_2_4, headers_v, ethertype);
/* for non-IP we only re-write MACs, so we're okay */
@@ -2224,12 +2202,8 @@ static bool actions_match_supported(stru
return false;
if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
-<<<<<<< HEAD
- return modify_header_match_supported(&parse_attr->spec, exts,
-=======
return modify_header_match_supported(&parse_attr->spec,
flow_action,
->>>>>>> linux-next/akpm-base
actions, extack);
return true;
--- a/drivers/net/virtio_net.c~linux-next-git-rejects
+++ a/drivers/net/virtio_net.c
@@ -1498,7 +1498,6 @@ static int virtnet_poll_tx(struct napi_s
struct virtnet_info *vi = sq->vq->vdev->priv;
unsigned int index = vq2txq(sq->vq);
struct netdev_queue *txq;
-<<<<<<< HEAD
if (unlikely(is_xdp_raw_buffer_queue(vi, index))) {
/* We don't need to enable cb for XDP */
@@ -1506,15 +1505,6 @@ static int virtnet_poll_tx(struct napi_s
return 0;
}
-=======
-
- if (unlikely(is_xdp_raw_buffer_queue(vi, index))) {
- /* We don't need to enable cb for XDP */
- napi_complete_done(napi, 0);
- return 0;
- }
-
->>>>>>> linux-next/akpm-base
txq = netdev_get_tx_queue(vi->dev, index);
__netif_tx_lock(txq, raw_smp_processor_id());
free_old_xmit_skbs(sq, txq, true);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mmslabvmscan-accumulate-gradual-pressure-on-small-slabs-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slub-introduce-slab_warn_on_error-fix.patch
mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
mm-proportional-memorylowmin-reclaim-checkpatch-fixes.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-fix-fix.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch
filemap-drop-the-mmap_sem-for-all-blocking-operations-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
