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>
---
arch/arm/boot/dts/imx7d-pico.dtsi | 7 ---
drivers/net/ethernet/netronome/nfp/flower/offload.c | 13 ------
drivers/net/phy/phy_device.c | 7 ---
include/uapi/linux/bpf.h | 15 -------
kernel/bpf/btf.c | 4 --
net/core/filter.c | 19 ----------
net/dsa/master.c | 6 ---
net/ipv4/tcp_output.c | 3 -
net/sched/cls_flower.c | 4 --
tools/include/uapi/linux/bpf.h | 3 -
tools/testing/selftests/bpf/test_verifier.c | 13 ------
11 files changed, 94 deletions(-)
--- a/arch/arm/boot/dts/imx7d-pico.dtsi~linux-next-git-rejects
+++ a/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -76,8 +76,6 @@
<&clks IMX7D_CLKO2_ROOT_DIV>;
assigned-clock-parents = <&clks IMX7D_CKIL>;
assigned-clock-rates = <0>, <32768>;
-<<<<<<< HEAD
-=======
};
&ecspi3 {
@@ -135,7 +133,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
status = "okay";
->>>>>>> linux-next/akpm-base
};
&i2c4 {
@@ -325,11 +322,7 @@
non-removable;
keep-power-in-suspend;
wakeup-source;
-<<<<<<< HEAD
- vmmc-supply = <®_ap6212>;
-=======
vmmc-supply = <®_wlreg_on>;
->>>>>>> linux-next/akpm-base
mmc-pwrseq = <&usdhc2_pwrseq>;
status = "okay";
};
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -456,12 +456,7 @@ nfp_flower_add_offload(struct nfp_app *a
if (err)
goto err_destroy_flow;
-<<<<<<< HEAD
- err = nfp_compile_flow_metadata(app, flow, flow_pay,
- flow_pay->ingress_dev);
-=======
err = nfp_compile_flow_metadata(app, flow, flow_pay, netdev);
->>>>>>> linux-next/akpm-base
if (err)
goto err_destroy_flow;
@@ -470,14 +465,6 @@ nfp_flower_add_offload(struct nfp_app *a
nfp_flower_table_params);
if (err)
goto err_release_metadata;
-<<<<<<< HEAD
-
- err = nfp_flower_xmit_flow(netdev, flow_pay,
- NFP_FLOWER_CMSG_TYPE_FLOW_ADD);
- if (err)
- goto err_remove_rhash;
-=======
->>>>>>> linux-next/akpm-base
err = nfp_flower_xmit_flow(app, flow_pay,
NFP_FLOWER_CMSG_TYPE_FLOW_ADD);
--- a/drivers/net/phy/phy_device.c~linux-next-git-rejects
+++ a/drivers/net/phy/phy_device.c
@@ -1914,12 +1914,6 @@ static int __set_phy_supported(struct ph
{
switch (max_speed) {
case SPEED_10:
-<<<<<<< HEAD
- phydev->supported &= ~PHY_100BT_FEATURES;
- /* fall through */
- case SPEED_100:
- phydev->supported &= ~PHY_1000BT_FEATURES;
-=======
linkmode_clear_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,
phydev->supported);
linkmode_clear_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,
@@ -1930,7 +1924,6 @@ static int __set_phy_supported(struct ph
phydev->supported);
linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
phydev->supported);
->>>>>>> linux-next/akpm-base
break;
case SPEED_1000:
break;
--- a/include/uapi/linux/bpf.h~linux-next-git-rejects
+++ a/include/uapi/linux/bpf.h
@@ -2218,15 +2218,9 @@ union bpf_attr {
* This helper is available only if the kernel was compiled with
* **CONFIG_NET** configuration option.
* Return
-<<<<<<< HEAD
- * Pointer to *struct bpf_sock*, or NULL in case of failure.
- * For sockets with reuseport option, the *struct bpf_sock*
- * result is from reuse->socks[] using the hash of the tuple.
-=======
* A pointer to *struct bpf_sock*, or **NULL** in case of failure.
* For sockets with reuseport option, the **struct bpf_sock**
* return is from **reuse->socks**\ [] using hash of the packet.
->>>>>>> linux-next/akpm-base
*
* struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
* Description
@@ -2260,16 +2254,10 @@ union bpf_attr {
* This helper is available only if the kernel was compiled with
* **CONFIG_NET** configuration option.
* Return
-<<<<<<< HEAD
- * Pointer to *struct bpf_sock*, or NULL in case of failure.
- * For sockets with reuseport option, the *struct bpf_sock*
- * result is from reuse->socks[] using the hash of the tuple.
-=======
* A pointer to **struct bpf_sock**, or **NULL** in case of
* failure. For sockets with reuseport option, the
* **struct bpf_sock** return is from **reuse->socks**\ []
* using hash of the packet.
->>>>>>> linux-next/akpm-base
*
* int bpf_sk_release(struct bpf_sock *sock)
* Description
@@ -2543,11 +2531,8 @@ struct __sk_buff {
__u32 data_meta;
__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
-<<<<<<< HEAD
-=======
__u64 tstamp;
__u32 wire_len;
->>>>>>> linux-next/akpm-base
};
struct bpf_tunnel_key {
--- a/kernel/bpf/btf.c~linux-next-git-rejects
+++ a/kernel/bpf/btf.c
@@ -474,11 +474,7 @@ static bool btf_name_valid_identifier(co
return !*src;
}
-<<<<<<< HEAD
-static const char *btf_name_by_offset(const struct btf *btf, u32 offset)
-=======
const char *btf_name_by_offset(const struct btf *btf, u32 offset)
->>>>>>> linux-next/akpm-base
{
if (!offset)
return "(anon)";
--- a/net/core/filter.c~linux-next-git-rejects
+++ a/net/core/filter.c
@@ -5077,18 +5077,11 @@ __bpf_sk_lookup(struct sk_buff *skb, str
if (family == AF_INET)
sdif = inet_sdif(skb);
else
-<<<<<<< HEAD
- caller_net = sock_net(skb->sk);
- if ((s32)netns_id < 0) {
- net = caller_net;
- sk = sk_lookup(net, tuple, skb, family, proto);
-=======
sdif = inet6_sdif(skb);
if ((s32)netns_id < 0) {
net = caller_net;
sk = sk_lookup(net, tuple, ifindex, sdif, family, proto);
->>>>>>> linux-next/akpm-base
} else {
net = get_net_ns_by_id(caller_net, netns_id);
if (unlikely(!net))
@@ -5747,13 +5740,10 @@ static bool bpf_skb_is_valid_access(int
break;
case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):
if (size != sizeof(__u64))
-<<<<<<< HEAD
-=======
return false;
break;
case bpf_ctx_range(struct __sk_buff, tstamp):
if (size != sizeof(__u64))
->>>>>>> linux-next/akpm-base
return false;
break;
default:
@@ -5809,10 +5799,7 @@ static bool cg_skb_is_valid_access(int o
case bpf_ctx_range(struct __sk_buff, tc_classid):
case bpf_ctx_range(struct __sk_buff, data_meta):
case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):
-<<<<<<< HEAD
-=======
case bpf_ctx_range(struct __sk_buff, wire_len):
->>>>>>> linux-next/akpm-base
return false;
case bpf_ctx_range(struct __sk_buff, data):
case bpf_ctx_range(struct __sk_buff, data_end):
@@ -5858,11 +5845,8 @@ static bool lwt_is_valid_access(int off,
case bpf_ctx_range_till(struct __sk_buff, family, local_port):
case bpf_ctx_range(struct __sk_buff, data_meta):
case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):
-<<<<<<< HEAD
-=======
case bpf_ctx_range(struct __sk_buff, tstamp):
case bpf_ctx_range(struct __sk_buff, wire_len):
->>>>>>> linux-next/akpm-base
return false;
}
@@ -6292,11 +6276,8 @@ static bool sk_skb_is_valid_access(int o
case bpf_ctx_range(struct __sk_buff, tc_classid):
case bpf_ctx_range(struct __sk_buff, data_meta):
case bpf_ctx_range_ptr(struct __sk_buff, flow_keys):
-<<<<<<< HEAD
-=======
case bpf_ctx_range(struct __sk_buff, tstamp):
case bpf_ctx_range(struct __sk_buff, wire_len):
->>>>>>> linux-next/akpm-base
return false;
}
--- a/net/dsa/master.c~linux-next-git-rejects
+++ a/net/dsa/master.c
@@ -179,8 +179,6 @@ static const struct attribute_group dsa_
.attrs = dsa_slave_attrs,
};
-<<<<<<< HEAD
-=======
static void dsa_master_set_mtu(struct net_device *dev, struct dsa_port *cpu_dp)
{
unsigned int mtu = ETH_DATA_LEN + cpu_dp->tag_ops->overhead;
@@ -207,16 +205,12 @@ static void dsa_master_reset_mtu(struct
rtnl_unlock();
}
->>>>>>> linux-next/akpm-base
int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
{
int ret;
-<<<<<<< HEAD
-=======
dsa_master_set_mtu(dev, cpu_dp);
->>>>>>> linux-next/akpm-base
/* If we use a tagging format that doesn't have an ethertype
* field, make sure that all packets from this point on get
* sent to the tag format's receive function.
--- a/net/ipv4/tcp_output.c~linux-next-git-rejects
+++ a/net/ipv4/tcp_output.c
@@ -1913,10 +1913,7 @@ static bool tcp_tso_should_defer(struct
struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *head;
int win_divisor;
-<<<<<<< HEAD
-=======
s64 delta;
->>>>>>> linux-next/akpm-base
if (icsk->icsk_ca_state >= TCP_CA_Recovery)
goto send_now;
--- a/net/sched/cls_flower.c~linux-next-git-rejects
+++ a/net/sched/cls_flower.c
@@ -1355,11 +1355,7 @@ static int fl_change(struct net *net, st
if (err)
goto errout_idr;
-<<<<<<< HEAD
- if (!fold && fl_lookup(fnew->mask, &fnew->mkey)) {
-=======
if (!fold && __fl_lookup(fnew->mask, &fnew->mkey)) {
->>>>>>> linux-next/akpm-base
err = -EEXIST;
goto errout_mask;
}
--- a/tools/include/uapi/linux/bpf.h~linux-next-git-rejects
+++ a/tools/include/uapi/linux/bpf.h
@@ -2529,11 +2529,8 @@ struct __sk_buff {
__u32 data_meta;
__bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
-<<<<<<< HEAD
-=======
__u64 tstamp;
__u32 wire_len;
->>>>>>> linux-next/akpm-base
};
struct bpf_tunnel_key {
--- a/tools/testing/selftests/bpf/test_verifier.c~linux-next-git-rejects
+++ a/tools/testing/selftests/bpf/test_verifier.c
@@ -14404,21 +14404,8 @@ static void do_test_single(struct bpf_te
expected_val = unpriv && test->retval_unpriv ?
test->retval_unpriv : test->retval;
-<<<<<<< HEAD
- reject_from_alignment = fd_prog < 0 &&
- (test->flags & F_NEEDS_EFFICIENT_UNALIGNED_ACCESS) &&
- strstr(bpf_vlog, "misaligned");
-#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
- if (reject_from_alignment) {
- printf("FAIL\nFailed due to alignment despite having efficient unaligned access: '%s'!\n",
- strerror(errno));
- goto fail_log;
- }
-#endif
-=======
alignment_prevented_execution = 0;
->>>>>>> linux-next/akpm-base
if (expected_ret == ACCEPT) {
if (fd_prog < 0) {
printf("FAIL\nFailed to load prog '%s'!\n",
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slab-remove-unnecessary-unlikely-fix.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch
mm-slub-improve-performance-by-skipping-checked-node-in-get_any_partial-fix.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch
mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch
mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch
mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch
mm-page_alloc-free-order-0-pages-through-pcp-in-page_frag_free-fix.patch
mm-dont-break-integrity-writeback-on-writepage-error-fix.patch
mm-use-common-iterator-for-deferred_init_pages-and-deferred_free_pages-fix.patch
mm-kmemleak-little-optimization-while-scanning-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-callback-fix-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-v2-checkpatch-fixes.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
fs-epoll-deal-with-wait_queue-only-once-fix.patch
autofs-improve-ioctl-sbi-checks-fix.patch
exec-separate-mm_anonpages-and-rlimit_stack-accounting-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
mm-convert-pg_balloon-to-pg_offline-fix.patch
fs-remove-caller-signal_pending-branch-predictions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
