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>
---
MAINTAINERS | 7 --
drivers/gpu/drm/i915/gvt/kvmgt.c | 8 ---
drivers/gpu/drm/i915/gvt/vgpu.c | 6 --
drivers/gpu/drm/i915/i915_reg.h | 3 -
drivers/gpu/drm/i915/intel_display.h | 3 -
drivers/gpu/drm/i915/intel_ringbuffer.c | 6 --
drivers/gpu/drm/i915/selftests/i915_gem_object.c | 9 ---
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 -
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 -
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 11 ----
drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c | 4 -
drivers/gpu/drm/panel/panel-simple.c | 3 -
drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 --
drivers/scsi/qla2xxx/qla_init.c | 8 ---
drivers/video/console/Kconfig | 4 -
drivers/video/console/dummycon.c | 8 ---
drivers/video/fbdev/core/fbcon.c | 34 -------------
fs/sysfs/group.c | 10 ---
include/linux/mlx5/mlx5_ifc.h | 6 --
net/netfilter/ipvs/ip_vs_conn.c | 8 ---
net/rds/ib_send.c | 4 -
net/xfrm/xfrm_interface.c | 4 -
22 files changed, 158 deletions(-)
diff -puN arch/arm64/include/asm/cpucaps.h~linux-next-git-rejects arch/arm64/include/asm/cpucaps.h
diff -puN arch/Kconfig~linux-next-git-rejects arch/Kconfig
diff -puN drivers/xen/gntdev-dmabuf.c~linux-next-git-rejects drivers/xen/gntdev-dmabuf.c
diff -puN kernel/printk/printk.c~linux-next-git-rejects kernel/printk/printk.c
diff -puN scripts/gcc-plugins/Kconfig~linux-next-git-rejects scripts/gcc-plugins/Kconfig
diff -puN scripts/Makefile.gcc-plugins~linux-next-git-rejects scripts/Makefile.gcc-plugins
diff -puN drivers/gpu/drm/i915/gvt/kvmgt.c~linux-next-git-rejects drivers/gpu/drm/i915/gvt/kvmgt.c
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -189,19 +189,11 @@ static int gvt_dma_map_page(struct intel
/* Setup DMA mapping. */
*dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
-<<<<<<< HEAD
- ret = dma_mapping_error(dev, *dma_addr);
- if (ret) {
- gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
- page_to_pfn(page), ret);
- gvt_unpin_guest_page(vgpu, gfn, size);
-=======
if (dma_mapping_error(dev, *dma_addr)) {
gvt_vgpu_err("DMA mapping failed for pfn 0x%lx, ret %d\n",
page_to_pfn(page), ret);
gvt_unpin_guest_page(vgpu, gfn, size);
return -ENOMEM;
->>>>>>> linux-next/akpm-base
}
return ret;
diff -puN drivers/gpu/drm/i915/gvt/vgpu.c~linux-next-git-rejects drivers/gpu/drm/i915/gvt/vgpu.c
--- a/drivers/gpu/drm/i915/gvt/vgpu.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/gvt/vgpu.c
@@ -240,8 +240,6 @@ void intel_gvt_deactivate_vgpu(struct in
intel_vgpu_stop_schedule(vgpu);
mutex_unlock(&vgpu->vgpu_lock);
-<<<<<<< HEAD
-=======
}
/**
@@ -261,7 +259,6 @@ void intel_gvt_release_vgpu(struct intel
intel_vgpu_clean_workloads(vgpu, ALL_ENGINES);
intel_vgpu_dmabuf_cleanup(vgpu);
mutex_unlock(&vgpu->vgpu_lock);
->>>>>>> linux-next/akpm-base
}
/**
@@ -382,10 +379,7 @@ static struct intel_vgpu *__intel_gvt_cr
vgpu->gvt = gvt;
vgpu->sched_ctl.weight = param->weight;
mutex_init(&vgpu->vgpu_lock);
-<<<<<<< HEAD
-=======
mutex_init(&vgpu->dmabuf_lock);
->>>>>>> linux-next/akpm-base
INIT_LIST_HEAD(&vgpu->dmabuf_obj_list_head);
INIT_RADIX_TREE(&vgpu->page_track_tree, GFP_KERNEL);
idr_init(&vgpu->object_idr);
diff -puN drivers/gpu/drm/i915/i915_reg.h~linux-next-git-rejects drivers/gpu/drm/i915/i915_reg.h
--- a/drivers/gpu/drm/i915/i915_reg.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_reg.h
@@ -9201,10 +9201,7 @@ enum skl_power_gate {
#define TRANS_MSA_10_BPC (2 << 5)
#define TRANS_MSA_12_BPC (3 << 5)
#define TRANS_MSA_16_BPC (4 << 5)
-<<<<<<< HEAD
-=======
#define TRANS_MSA_CEA_RANGE (1 << 3)
->>>>>>> linux-next/akpm-base
/* LCPLL Control */
#define LCPLL_CTL _MMIO(0x130040)
diff -puN drivers/gpu/drm/i915/intel_display.h~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.h
--- a/drivers/gpu/drm/i915/intel_display.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.h
@@ -126,8 +126,6 @@ enum port {
#define port_name(p) ((p) + 'A')
-<<<<<<< HEAD
-=======
/*
* Ports identifier referenced from other drivers.
* Expected to remain stable over time
@@ -152,7 +150,6 @@ static inline const char *port_identifie
}
}
->>>>>>> linux-next/akpm-base
enum tc_port {
PORT_TC_NONE = -1,
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
@@ -1365,15 +1365,9 @@ __ring_context_pin(struct intel_engine_c
/* One ringbuffer to rule them all */
GEM_BUG_ON(!engine->buffer);
ce->ring = engine->buffer;
-<<<<<<< HEAD
return ce;
-=======
-
- return ce;
-
->>>>>>> linux-next/akpm-base
err_unpin:
__context_unpin(ce);
err:
diff -puN drivers/gpu/drm/i915/selftests/i915_gem_object.c~linux-next-git-rejects drivers/gpu/drm/i915/selftests/i915_gem_object.c
--- a/drivers/gpu/drm/i915/selftests/i915_gem_object.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/selftests/i915_gem_object.c
@@ -522,16 +522,7 @@ static int igt_mmap_offset_exhaustion(vo
int loop, err;
/* Disable background reaper */
-<<<<<<< HEAD
- mutex_lock(&i915->drm.struct_mutex);
- if (!i915->gt.active_requests++)
- i915_gem_unpark(i915);
- mutex_unlock(&i915->drm.struct_mutex);
- cancel_delayed_work_sync(&i915->gt.retire_work);
- cancel_delayed_work_sync(&i915->gt.idle_work);
-=======
disable_retire_worker(i915);
->>>>>>> linux-next/akpm-base
GEM_BUG_ON(!i915->gt.awake);
/* Trim the device mmap space to only a page */
diff -puN drivers/gpu/drm/msm/adreno/a5xx_gpu.c~linux-next-git-rejects drivers/gpu/drm/msm/adreno/a5xx_gpu.c
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -21,10 +21,7 @@
#include <linux/pm_opp.h>
#include <linux/nvmem-consumer.h>
#include <linux/iopoll.h>
-<<<<<<< HEAD
-=======
#include <linux/slab.h>
->>>>>>> linux-next/akpm-base
#include "msm_gem.h"
#include "msm_mmu.h"
#include "a5xx_gpu.h"
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
@@ -18,10 +18,7 @@
*/
#include <linux/ascii85.h>
-<<<<<<< HEAD
-=======
#include <linux/kernel.h>
->>>>>>> linux-next/akpm-base
#include <linux/pm_opp.h>
#include <linux/slab.h>
#include "adreno_gpu.h"
diff -puN drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c~linux-next-git-rejects drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -421,11 +421,7 @@ int dpu_encoder_helper_unregister_irq(st
ret = dpu_core_irq_disable(phys_enc->dpu_kms, &irq->irq_idx, 1);
if (ret) {
-<<<<<<< HEAD
- DRM_ERROR("diable failed id=%u, intr=%d, hw=%d, irq=%d ret=%d",
-=======
DRM_ERROR("disable failed id=%u, intr=%d, hw=%d, irq=%d ret=%d",
->>>>>>> linux-next/akpm-base
DRMID(phys_enc->parent), intr_idx, irq->hw_idx,
irq->irq_idx, ret);
}
@@ -2448,11 +2444,8 @@ int dpu_encoder_wait_for_event(struct dr
for (i = 0; i < dpu_enc->num_phys_encs; i++) {
struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
-<<<<<<< HEAD
-=======
if (!phys)
continue;
->>>>>>> linux-next/akpm-base
switch (event) {
case MSM_ENC_COMMIT_DONE:
@@ -2470,11 +2463,7 @@ int dpu_encoder_wait_for_event(struct dr
return -EINVAL;
};
-<<<<<<< HEAD
- if (phys && fn_wait) {
-=======
if (fn_wait) {
->>>>>>> linux-next/akpm-base
DPU_ATRACE_BEGIN("wait_for_completion_event");
ret = fn_wait(phys);
DPU_ATRACE_END("wait_for_completion_event");
diff -puN drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c~linux-next-git-rejects drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/msm/disp/dpu1/dpu_power_handle.c
@@ -121,11 +121,7 @@ void dpu_power_resource_deinit(struct pl
mutex_lock(&phandle->phandle_lock);
list_for_each_entry_safe(curr_client, next_client,
&phandle->power_client_clist, list) {
-<<<<<<< HEAD
- pr_err("cliend:%s-%d still registered with refcount:%d\n",
-=======
pr_err("client:%s-%d still registered with refcount:%d\n",
->>>>>>> linux-next/akpm-base
curr_client->name, curr_client->id,
curr_client->refcount);
curr_client->active = false;
diff -puN drivers/gpu/drm/panel/panel-simple.c~linux-next-git-rejects drivers/gpu/drm/panel/panel-simple.c
--- a/drivers/gpu/drm/panel/panel-simple.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/panel/panel-simple.c
@@ -1385,12 +1385,9 @@ static const struct panel_desc innolux_t
.width = 259,
.height = 173,
},
-<<<<<<< HEAD
-=======
.delay = {
.unprepare = 500,
},
->>>>>>> linux-next/akpm-base
};
static const struct drm_display_mode innolux_zj070na_01p_mode = {
diff -puN drivers/net/ethernet/mellanox/mlx5/core/cmd.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlx5/core/cmd.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -433,11 +433,8 @@ static int mlx5_internal_err_ret_value(s
case MLX5_CMD_OP_FPGA_QUERY_QP:
case MLX5_CMD_OP_FPGA_QUERY_QP_COUNTERS:
case MLX5_CMD_OP_CREATE_GENERAL_OBJECT:
-<<<<<<< HEAD
-=======
case MLX5_CMD_OP_MODIFY_GENERAL_OBJECT:
case MLX5_CMD_OP_QUERY_GENERAL_OBJECT:
->>>>>>> linux-next/akpm-base
*status = MLX5_DRIVER_STATUS_ABORTED;
*synd = MLX5_DRIVER_SYND;
return -EIO;
@@ -617,12 +614,9 @@ const char *mlx5_command_str(int command
MLX5_COMMAND_STR_CASE(ARM_XRQ);
MLX5_COMMAND_STR_CASE(CREATE_GENERAL_OBJECT);
MLX5_COMMAND_STR_CASE(DESTROY_GENERAL_OBJECT);
-<<<<<<< HEAD
-=======
MLX5_COMMAND_STR_CASE(MODIFY_GENERAL_OBJECT);
MLX5_COMMAND_STR_CASE(QUERY_GENERAL_OBJECT);
MLX5_COMMAND_STR_CASE(QUERY_MODIFY_HEADER_CONTEXT);
->>>>>>> linux-next/akpm-base
default: return "unknown command opcode";
}
}
diff -puN drivers/scsi/qla2xxx/qla_init.c~linux-next-git-rejects drivers/scsi/qla2xxx/qla_init.c
--- a/drivers/scsi/qla2xxx/qla_init.c~linux-next-git-rejects
+++ a/drivers/scsi/qla2xxx/qla_init.c
@@ -709,20 +709,12 @@ static void qla24xx_handle_gnl_done_even
qla2x00_find_fcport_by_wwpn(vha,
e->port_name, 0);
if (conflict_fcport) {
-<<<<<<< HEAD
- ql_dbg(ql_dbg_disc + ql_dbg_verbose,
- vha, 0x20e5,
- "%s %d %8phC post del sess\n",
- __func__, __LINE__,
- conflict_fcport->port_name);
-=======
ql_dbg(ql_dbg_disc
+ ql_dbg_verbose,
vha, 0x20e5,
"%s %d %8phC post del sess\n",
__func__, __LINE__,
conflict_fcport->port_name);
->>>>>>> linux-next/akpm-base
qlt_schedule_sess_for_deletion
(conflict_fcport);
}
diff -puN drivers/video/console/dummycon.c~linux-next-git-rejects drivers/video/console/dummycon.c
--- a/drivers/video/console/dummycon.c~linux-next-git-rejects
+++ a/drivers/video/console/dummycon.c
@@ -38,19 +38,11 @@ void dummycon_register_output_notifier(s
if (dummycon_putc_called)
nb->notifier_call(nb, 0, NULL);
}
-<<<<<<< HEAD
-EXPORT_SYMBOL_GPL(dummycon_register_output_notifier);
-=======
->>>>>>> linux-next/akpm-base
void dummycon_unregister_output_notifier(struct notifier_block *nb)
{
raw_notifier_chain_unregister(&dummycon_output_nh, nb);
}
-<<<<<<< HEAD
-EXPORT_SYMBOL_GPL(dummycon_unregister_output_notifier);
-=======
->>>>>>> linux-next/akpm-base
static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos)
{
diff -puN drivers/video/console/Kconfig~linux-next-git-rejects drivers/video/console/Kconfig
--- a/drivers/video/console/Kconfig~linux-next-git-rejects
+++ a/drivers/video/console/Kconfig
@@ -152,11 +152,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
config FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
bool "Framebuffer Console Deferred Takeover"
-<<<<<<< HEAD
- depends on FRAMEBUFFER_CONSOLE=y && DUMMY_CONSOLE=y
-=======
depends on FB=y && FRAMEBUFFER_CONSOLE && DUMMY_CONSOLE
->>>>>>> linux-next/akpm-base
help
If enabled this defers the framebuffer console taking over the
console from the dummy console until the first text is displayed on
diff -puN drivers/video/fbdev/core/fbcon.c~linux-next-git-rejects drivers/video/fbdev/core/fbcon.c
--- a/drivers/video/fbdev/core/fbcon.c~linux-next-git-rejects
+++ a/drivers/video/fbdev/core/fbcon.c
@@ -3592,9 +3592,6 @@ static int fbcon_init_device(void)
}
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
-<<<<<<< HEAD
-static struct notifier_block fbcon_output_nb;
-=======
static void fbcon_register_existing_fbs(struct work_struct *work)
{
int i;
@@ -3609,16 +3606,10 @@ static void fbcon_register_existing_fbs(
static struct notifier_block fbcon_output_nb;
static DECLARE_WORK(fbcon_deferred_takeover_work, fbcon_register_existing_fbs);
->>>>>>> linux-next/akpm-base
static int fbcon_output_notifier(struct notifier_block *nb,
unsigned long action, void *data)
{
-<<<<<<< HEAD
- int i;
-
-=======
->>>>>>> linux-next/akpm-base
WARN_CONSOLE_UNLOCKED();
pr_info("fbcon: Taking over console\n");
@@ -3627,39 +3618,15 @@ static int fbcon_output_notifier(struct
deferred_takeover = false;
logo_shown = FBCON_LOGO_DONTSHOW;
-<<<<<<< HEAD
- for (i = 0; i < FB_MAX; i++) {
- if (registered_fb[i])
- fbcon_fb_registered(registered_fb[i]);
- }
-
- return NOTIFY_OK;
-}
-
-static void fbcon_register_output_notifier(void)
-{
- fbcon_output_nb.notifier_call = fbcon_output_notifier;
- dummycon_register_output_notifier(&fbcon_output_nb);
-}
-#else
-static inline void fbcon_register_output_notifier(void) {}
-=======
/* We may get called in atomic context */
schedule_work(&fbcon_deferred_takeover_work);
return NOTIFY_OK;
}
->>>>>>> linux-next/akpm-base
#endif
static void fbcon_start(void)
{
-<<<<<<< HEAD
- if (deferred_takeover) {
- fbcon_register_output_notifier();
- return;
- }
-=======
WARN_CONSOLE_UNLOCKED();
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
@@ -3672,7 +3639,6 @@ static void fbcon_start(void)
return;
}
#endif
->>>>>>> linux-next/akpm-base
if (num_registered_fb) {
int i;
diff -puN fs/sysfs/group.c~linux-next-git-rejects fs/sysfs/group.c
--- a/fs/sysfs/group.c~linux-next-git-rejects
+++ a/fs/sysfs/group.c
@@ -124,15 +124,6 @@ static int internal_create_group(struct
}
kobject_get_ownership(kobj, &uid, &gid);
if (grp->name) {
-<<<<<<< HEAD
- kn = kernfs_create_dir_ns(kobj->sd, grp->name,
- S_IRWXU | S_IRUGO | S_IXUGO,
- uid, gid, kobj, NULL);
- if (IS_ERR(kn)) {
- if (PTR_ERR(kn) == -EEXIST)
- sysfs_warn_dup(kobj->sd, grp->name);
- return PTR_ERR(kn);
-=======
if (update) {
kn = kernfs_find_and_get(kobj->sd, grp->name);
if (!kn) {
@@ -149,7 +140,6 @@ static int internal_create_group(struct
sysfs_warn_dup(kobj->sd, grp->name);
return PTR_ERR(kn);
}
->>>>>>> linux-next/akpm-base
}
} else
kn = kobj->sd;
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
@@ -82,10 +82,7 @@ enum {
enum {
MLX5_OBJ_TYPE_UCTX = 0x0004,
-<<<<<<< HEAD
-=======
MLX5_OBJ_TYPE_UMEM = 0x0005,
->>>>>>> linux-next/akpm-base
};
enum {
@@ -257,11 +254,8 @@ enum {
MLX5_CMD_OP_FPGA_DESTROY_QP = 0x963,
MLX5_CMD_OP_FPGA_QUERY_QP_COUNTERS = 0x964,
MLX5_CMD_OP_CREATE_GENERAL_OBJECT = 0xa00,
-<<<<<<< HEAD
-=======
MLX5_CMD_OP_MODIFY_GENERAL_OBJECT = 0xa01,
MLX5_CMD_OP_QUERY_GENERAL_OBJECT = 0xa02,
->>>>>>> linux-next/akpm-base
MLX5_CMD_OP_DESTROY_GENERAL_OBJECT = 0xa03,
MLX5_CMD_OP_MAX
};
diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -3588,12 +3588,6 @@ M: Christian Benvenuti <benve@xxxxxxxxx>
S: Supported
F: drivers/infiniband/hw/usnic/
-<<<<<<< HEAD
-CLANG-FORMAT FILE
-M: Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx>
-S: Maintained
-F: .clang-format
-=======
CIRRUS LOGIC MADERA CODEC DRIVERS
M: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxx>
M: Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxx>
@@ -3609,7 +3603,6 @@ F: drivers/gpio/gpio-madera*
F: drivers/mfd/madera*
F: drivers/mfd/cs47l*
F: drivers/pinctrl/cirrus/*
->>>>>>> linux-next/akpm-base
CLEANCACHE API
M: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
diff -puN net/netfilter/ipvs/ip_vs_conn.c~linux-next-git-rejects net/netfilter/ipvs/ip_vs_conn.c
--- a/net/netfilter/ipvs/ip_vs_conn.c~linux-next-git-rejects
+++ a/net/netfilter/ipvs/ip_vs_conn.c
@@ -1123,13 +1123,9 @@ static int ip_vs_conn_seq_show(struct se
&cp->vaddr.in6, ntohs(cp->vport),
dbuf, ntohs(cp->dport),
ip_vs_state_name(cp),
-<<<<<<< HEAD
- (cp->timer.expires-jiffies)/HZ, pe_data);
-=======
jiffies_delta_to_msecs(cp->timer.expires -
jiffies) / 1000,
pe_data);
->>>>>>> linux-next/akpm-base
else
#endif
seq_printf(seq,
@@ -1140,13 +1136,9 @@ static int ip_vs_conn_seq_show(struct se
ntohl(cp->vaddr.ip), ntohs(cp->vport),
dbuf, ntohs(cp->dport),
ip_vs_state_name(cp),
-<<<<<<< HEAD
- (cp->timer.expires-jiffies)/HZ, pe_data);
-=======
jiffies_delta_to_msecs(cp->timer.expires -
jiffies) / 1000,
pe_data);
->>>>>>> linux-next/akpm-base
}
return 0;
}
diff -puN net/rds/ib_send.c~linux-next-git-rejects net/rds/ib_send.c
--- a/net/rds/ib_send.c~linux-next-git-rejects
+++ a/net/rds/ib_send.c
@@ -758,11 +758,7 @@ int rds_ib_xmit_atomic(struct rds_connec
{
struct rds_ib_connection *ic = conn->c_transport_data;
struct rds_ib_send_work *send = NULL;
-<<<<<<< HEAD
- struct ib_send_wr *failed_wr;
-=======
const struct ib_send_wr *failed_wr;
->>>>>>> linux-next/akpm-base
u32 pos;
u32 work_alloc;
int ret;
diff -puN net/xfrm/xfrm_interface.c~linux-next-git-rejects net/xfrm/xfrm_interface.c
--- a/net/xfrm/xfrm_interface.c~linux-next-git-rejects
+++ a/net/xfrm/xfrm_interface.c
@@ -742,11 +742,7 @@ nla_put_failure:
return -EMSGSIZE;
}
-<<<<<<< HEAD
-struct net *xfrmi_get_link_net(const struct net_device *dev)
-=======
static struct net *xfrmi_get_link_net(const struct net_device *dev)
->>>>>>> linux-next/akpm-base
{
struct xfrm_if *xi = netdev_priv(dev);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-checkpatch-fixes.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-fix.patch
mm-zero-out-the-vma-in-vma_init.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
proc-kcore-hold-lock-during-read-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled-fix.patch
checkpatch-check-for-if-0-if-1-fix.patch
checkpatch-warn-when-a-patch-doesnt-have-a-description-fix.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch
linux-next-rejects.patch
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
