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/SubmitChecklist 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/net/ethernet/mellanox/mlxsw/spectrum.c | 23 ---------------
net/ipv4/ip_tunnel.c | 6 ---
net/ipv6/netfilter/nft_fib_ipv6.c | 4 --
net/smc/smc_core.c | 3 -
tools/testing/selftests/bpf/test_verifier.c | 3 -
5 files changed, 39 deletions(-)
diff -puN drivers/net/ethernet/mellanox/mlxsw/spectrum.c~linux-next-git-rejects drivers/net/ethernet/mellanox/mlxsw/spectrum.c
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3822,17 +3822,6 @@ static struct devlink_resource_ops mlxsw
.occ_get = mlxsw_sp_resource_kvd_linear_occ_get,
};
-<<<<<<< HEAD
-static struct devlink_resource_ops mlxsw_sp_resource_kvd_hash_single_ops = {
- .size_validate = mlxsw_sp_resource_kvd_hash_single_size_validate,
-};
-
-static struct devlink_resource_ops mlxsw_sp_resource_kvd_hash_double_ops = {
- .size_validate = mlxsw_sp_resource_kvd_hash_double_size_validate,
-};
-
-=======
->>>>>>> linux-next/akpm-base
static void
mlxsw_sp_resource_size_params_prepare(struct mlxsw_core *mlxsw_core,
struct devlink_resource_size_params *kvd_size_params,
@@ -3895,11 +3884,7 @@ static int mlxsw_sp_resources_register(s
MLXSW_SP_RESOURCE_KVD,
DEVLINK_RESOURCE_ID_PARENT_TOP,
&kvd_size_params,
-<<<<<<< HEAD
- &mlxsw_sp_resource_kvd_ops);
-=======
NULL);
->>>>>>> linux-next/akpm-base
if (err)
return err;
@@ -3927,11 +3912,7 @@ static int mlxsw_sp_resources_register(s
MLXSW_SP_RESOURCE_KVD_HASH_DOUBLE,
MLXSW_SP_RESOURCE_KVD,
&hash_double_size_params,
-<<<<<<< HEAD
- &mlxsw_sp_resource_kvd_hash_double_ops);
-=======
NULL);
->>>>>>> linux-next/akpm-base
if (err)
return err;
@@ -3941,11 +3922,7 @@ static int mlxsw_sp_resources_register(s
MLXSW_SP_RESOURCE_KVD_HASH_SINGLE,
MLXSW_SP_RESOURCE_KVD,
&hash_single_size_params,
-<<<<<<< HEAD
- &mlxsw_sp_resource_kvd_hash_single_ops);
-=======
NULL);
->>>>>>> linux-next/akpm-base
if (err)
return err;
diff -puN net/ipv4/ip_tunnel.c~linux-next-git-rejects net/ipv4/ip_tunnel.c
--- a/net/ipv4/ip_tunnel.c~linux-next-git-rejects
+++ a/net/ipv4/ip_tunnel.c
@@ -694,15 +694,9 @@ void ip_tunnel_xmit(struct sk_buff *skb,
}
}
-<<<<<<< HEAD
- init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
- tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,
- tunnel->fwmark);
-=======
ip_tunnel_init_flow(&fl4, protocol, dst, tnl_params->saddr,
tunnel->parms.o_key, RT_TOS(tos),
tunnel->parms.link, tunnel->fwmark);
->>>>>>> linux-next/akpm-base
if (ip_tunnel_encap(skb, tunnel, &protocol, &fl4) < 0)
goto tx_error;
diff -puN net/ipv6/netfilter/nft_fib_ipv6.c~linux-next-git-rejects net/ipv6/netfilter/nft_fib_ipv6.c
--- a/net/ipv6/netfilter/nft_fib_ipv6.c~linux-next-git-rejects
+++ a/net/ipv6/netfilter/nft_fib_ipv6.c
@@ -180,12 +180,8 @@ void nft_fib6_eval(const struct nft_expr
}
*dest = 0;
-<<<<<<< HEAD
- rt = (void *)ip6_route_lookup(nft_net(pkt), &fl6, lookup_flags);
-=======
rt = (void *)ip6_route_lookup(nft_net(pkt), &fl6, pkt->skb,
lookup_flags);
->>>>>>> linux-next/akpm-base
if (rt->dst.error)
goto put_rt_err;
diff -puN net/smc/smc_core.c~linux-next-git-rejects net/smc/smc_core.c
--- a/net/smc/smc_core.c~linux-next-git-rejects
+++ a/net/smc/smc_core.c
@@ -177,10 +177,7 @@ static int smc_lgr_create(struct smc_soc
lnk = &lgr->lnk[SMC_SINGLE_LINK];
/* initialize link */
lnk->link_id = SMC_SINGLE_LINK;
-<<<<<<< HEAD
-=======
lnk->state = SMC_LNK_ACTIVATING;
->>>>>>> linux-next/akpm-base
lnk->smcibdev = smcibdev;
lnk->ibport = ibport;
lnk->path_mtu = smcibdev->pattr[ibport - 1].active_mtu;
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
@@ -11281,8 +11281,6 @@ static struct bpf_test tests[] = {
.errstr = "BPF_XADD stores into R2 packet",
.prog_type = BPF_PROG_TYPE_XDP,
},
-<<<<<<< HEAD
-=======
{
"jit: lsh, rsh, arsh by 1",
.insns = {
@@ -11372,7 +11370,6 @@ static struct bpf_test tests[] = {
.retval = 2,
},
->>>>>>> linux-next/akpm-base
};
static int probe_filter_length(const struct bpf_insn *fp)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.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
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
sysctl-add-flags-to-support-min-max-range-clamping-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
