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/net/virtio_net.c | 54 -------------------------------------
tools/lib/bpf/btf.c | 16 ----------
tools/lib/bpf/btf.h | 5 ---
3 files changed, 75 deletions(-)
diff -puN drivers/net/virtio_net.c~linux-next-git-rejects drivers/net/virtio_net.c
--- a/drivers/net/virtio_net.c~linux-next-git-rejects
+++ a/drivers/net/virtio_net.c
@@ -637,11 +637,7 @@ static struct sk_buff *receive_small(str
void *buf, void *ctx,
unsigned int len,
unsigned int *xdp_xmit,
-<<<<<<< HEAD
- unsigned int *rbytes)
-=======
struct virtnet_rx_stats *stats)
->>>>>>> linux-next/akpm-base
{
struct sk_buff *skb;
struct bpf_prog *xdp_prog;
@@ -656,11 +652,7 @@ static struct sk_buff *receive_small(str
int err;
len -= vi->hdr_len;
-<<<<<<< HEAD
- *rbytes += len;
-=======
stats->rx.bytes += len;
->>>>>>> linux-next/akpm-base
rcu_read_lock();
xdp_prog = rcu_dereference(rq->xdp_prog);
@@ -772,20 +764,12 @@ static struct sk_buff *receive_big(struc
struct receive_queue *rq,
void *buf,
unsigned int len,
-<<<<<<< HEAD
- unsigned int *rbytes)
-=======
struct virtnet_rx_stats *stats)
->>>>>>> linux-next/akpm-base
{
struct page *page = buf;
struct sk_buff *skb = page_to_skb(vi, rq, page, 0, len, PAGE_SIZE);
-<<<<<<< HEAD
- *rbytes += len - vi->hdr_len;
-=======
stats->rx.bytes += len - vi->hdr_len;
->>>>>>> linux-next/akpm-base
if (unlikely(!skb))
goto err;
@@ -804,11 +788,7 @@ static struct sk_buff *receive_mergeable
void *ctx,
unsigned int len,
unsigned int *xdp_xmit,
-<<<<<<< HEAD
- unsigned int *rbytes)
-=======
struct virtnet_rx_stats *stats)
->>>>>>> linux-next/akpm-base
{
struct virtio_net_hdr_mrg_rxbuf *hdr = buf;
u16 num_buf = virtio16_to_cpu(vi->vdev, hdr->num_buffers);
@@ -821,11 +801,7 @@ static struct sk_buff *receive_mergeable
int err;
head_skb = NULL;
-<<<<<<< HEAD
- *rbytes += len - vi->hdr_len;
-=======
stats->rx.bytes += len - vi->hdr_len;
->>>>>>> linux-next/akpm-base
rcu_read_lock();
xdp_prog = rcu_dereference(rq->xdp_prog);
@@ -968,11 +944,7 @@ static struct sk_buff *receive_mergeable
goto err_buf;
}
-<<<<<<< HEAD
- *rbytes += len;
-=======
stats->rx.bytes += len;
->>>>>>> linux-next/akpm-base
page = virt_to_head_page(buf);
truesize = mergeable_ctx_to_truesize(ctx);
@@ -1029,11 +1001,7 @@ err_skb:
dev->stats.rx_length_errors++;
break;
}
-<<<<<<< HEAD
- *rbytes += len;
-=======
stats->rx.bytes += len;
->>>>>>> linux-next/akpm-base
page = virt_to_head_page(buf);
put_page(page);
}
@@ -1046,12 +1014,8 @@ xdp_xmit:
static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
void *buf, unsigned int len, void **ctx,
-<<<<<<< HEAD
- unsigned int *xdp_xmit, unsigned int *rbytes)
-=======
unsigned int *xdp_xmit,
struct virtnet_rx_stats *stats)
->>>>>>> linux-next/akpm-base
{
struct net_device *dev = vi->dev;
struct sk_buff *skb;
@@ -1072,19 +1036,11 @@ static void receive_buf(struct virtnet_i
if (vi->mergeable_rx_bufs)
skb = receive_mergeable(dev, vi, rq, buf, ctx, len, xdp_xmit,
-<<<<<<< HEAD
- rbytes);
- else if (vi->big_packets)
- skb = receive_big(dev, vi, rq, buf, len, rbytes);
- else
- skb = receive_small(dev, vi, rq, buf, ctx, len, xdp_xmit, rbytes);
-=======
stats);
else if (vi->big_packets)
skb = receive_big(dev, vi, rq, buf, len, stats);
else
skb = receive_small(dev, vi, rq, buf, ctx, len, xdp_xmit, stats);
->>>>>>> linux-next/akpm-base
if (unlikely(!skb))
return;
@@ -1369,24 +1325,14 @@ static int virtnet_receive(struct receiv
while (stats.rx.packets < budget &&
(buf = virtqueue_get_buf_ctx(rq->vq, &len, &ctx))) {
-<<<<<<< HEAD
- receive_buf(vi, rq, buf, len, ctx, xdp_xmit, &bytes);
- received++;
-=======
receive_buf(vi, rq, buf, len, ctx, xdp_xmit, &stats);
stats.rx.packets++;
->>>>>>> linux-next/akpm-base
}
} else {
while (stats.rx.packets < budget &&
(buf = virtqueue_get_buf(rq->vq, &len)) != NULL) {
-<<<<<<< HEAD
- receive_buf(vi, rq, buf, len, NULL, xdp_xmit, &bytes);
- received++;
-=======
receive_buf(vi, rq, buf, len, NULL, xdp_xmit, &stats);
stats.rx.packets++;
->>>>>>> linux-next/akpm-base
}
}
diff -puN tools/lib/bpf/btf.c~linux-next-git-rejects tools/lib/bpf/btf.c
--- a/tools/lib/bpf/btf.c~linux-next-git-rejects
+++ a/tools/lib/bpf/btf.c
@@ -37,17 +37,6 @@ struct btf {
int fd;
};
-<<<<<<< HEAD
-static const char *btf_name_by_offset(const struct btf *btf, __u32 offset)
-{
- if (offset < btf->hdr->str_len)
- return &btf->strings[offset];
- else
- return NULL;
-}
-
-=======
->>>>>>> linux-next/akpm-base
static int btf_add_type(struct btf *btf, struct btf_type *t)
{
if (btf->types_size - btf->nr_types < 2) {
@@ -277,10 +266,6 @@ __s64 btf__resolve_size(const struct btf
return nelems * size;
}
-<<<<<<< HEAD
-__s32 btf__find_by_name(const struct btf *btf, const char *type_name)
-{
-=======
int btf__resolve_type(const struct btf *btf, __u32 type_id)
{
const struct btf_type *t;
@@ -303,7 +288,6 @@ int btf__resolve_type(const struct btf *
__s32 btf__find_by_name(const struct btf *btf, const char *type_name)
{
->>>>>>> linux-next/akpm-base
__u32 i;
if (!strcmp(type_name, "void"))
diff -puN tools/lib/bpf/btf.h~linux-next-git-rejects tools/lib/bpf/btf.h
--- a/tools/lib/bpf/btf.h~linux-next-git-rejects
+++ a/tools/lib/bpf/btf.h
@@ -17,13 +17,8 @@ typedef int (*btf_print_fn_t)(const char
void btf__free(struct btf *btf);
struct btf *btf__new(__u8 *data, __u32 size, btf_print_fn_t err_log);
__s32 btf__find_by_name(const struct btf *btf, const char *type_name);
-<<<<<<< HEAD
-const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
-__s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
-=======
__s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
int btf__resolve_type(const struct btf *btf, __u32 type_id);
->>>>>>> linux-next/akpm-base
int btf__fd(const struct btf *btf);
const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
_
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
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
add-oom-victims-memcg-to-the-oom-context-information-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
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-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
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
