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
https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
https://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>
---
include/uapi/linux/bpf.h | 4 ----
net/ipv4/ip_vti.c | 3 ---
net/ipv6/ip6_vti.c | 3 ---
3 files changed, 10 deletions(-)
--- a/include/uapi/linux/bpf.h~linux-next-git-rejects
+++ a/include/uapi/linux/bpf.h
@@ -3850,11 +3850,7 @@ union bpf_attr {
*
* long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
* Description
-<<<<<<< HEAD
- * Check ctx packet size against exceeding MTU of net device (based
-=======
* Check packet size against exceeding MTU of net device (based
->>>>>>> linux-next/akpm-base
* on *ifindex*). This helper will likely be used in combination
* with helpers that adjust/change the packet size.
*
--- a/net/ipv4/ip_vti.c~linux-next-git-rejects
+++ a/net/ipv4/ip_vti.c
@@ -238,11 +238,8 @@ static netdev_tx_t vti_xmit(struct sk_bu
if (skb->len > mtu) {
skb_dst_update_pmtu_no_confirm(skb, mtu);
if (skb->protocol == htons(ETH_P_IP)) {
-<<<<<<< HEAD
-=======
if (!(ip_hdr(skb)->frag_off & htons(IP_DF)))
goto xmit;
->>>>>>> linux-next/akpm-base
icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(mtu));
} else {
--- a/net/ipv6/ip6_vti.c~linux-next-git-rejects
+++ a/net/ipv6/ip6_vti.c
@@ -523,11 +523,8 @@ vti6_xmit(struct sk_buff *skb, struct ne
icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
} else {
-<<<<<<< HEAD
-=======
if (!(ip_hdr(skb)->frag_off & htons(IP_DF)))
goto xmit;
->>>>>>> linux-next/akpm-base
icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
htonl(mtu));
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch
mm.patch
mm-memcontrol-switch-to-rstat-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
