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/ethernet/mellanox/mlx5/core/en/port_buffer.c | 10 ----------
net/batman-adv/bridge_loop_avoidance.c | 9 ---------
tools/lib/bpf/Makefile | 3 ---
3 files changed, 22 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
@@ -167,15 +167,6 @@ static int update_xoff_threshold(struct
}
/**
-<<<<<<< HEAD
- * update_buffer_lossy()
- * max_mtu: netdev's max_mtu
- * pfc_en: <input> current pfc configuration
- * buffer: <input> current prio to buffer mapping
- * xoff: <input> xoff value
- * port_buffer: <output> port receive buffer configuration
- * change: <output>
-=======
* update_buffer_lossy - Update buffer configuration based on pfc
* @max_mtu: netdev's max_mtu
* @pfc_en: <input> current pfc configuration
@@ -183,7 +174,6 @@ static int update_xoff_threshold(struct
* @xoff: <input> xoff value
* @port_buffer: <output> port receive buffer configuration
* @change: <output>
->>>>>>> linux-next/akpm-base
*
* Update buffer configuration based on pfc configuraiton and
* priority to buffer mapping.
--- a/net/batman-adv/bridge_loop_avoidance.c~linux-next-git-rejects
+++ a/net/batman-adv/bridge_loop_avoidance.c
@@ -807,21 +807,12 @@ static void batadv_bla_del_claim(struct
batadv_choose_claim, claim);
if (!claim_removed_node)
goto free_claim;
-<<<<<<< HEAD
/* reference from the hash is gone */
claim_removed_entry = hlist_entry(claim_removed_node,
struct batadv_bla_claim, hash_entry);
batadv_claim_put(claim_removed_entry);
-=======
-
- /* reference from the hash is gone */
- claim_removed_entry = hlist_entry(claim_removed_node,
- struct batadv_bla_claim, hash_entry);
- batadv_claim_put(claim_removed_entry);
-
->>>>>>> linux-next/akpm-base
free_claim:
/* don't need the reference from hash_find() anymore */
batadv_claim_put(claim);
--- a/tools/lib/bpf/Makefile~linux-next-git-rejects
+++ a/tools/lib/bpf/Makefile
@@ -231,13 +231,10 @@ install_headers:
$(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
$(call do_install,btf.h,$(prefix)/include/bpf,644); \
$(call do_install,xsk.h,$(prefix)/include/bpf,644);
-<<<<<<< HEAD
-=======
install_pkgconfig: $(PC_FILE)
$(call QUIET_INSTALL, $(PC_FILE)) \
$(call do_install,$(PC_FILE),$(libdir_SQ)/pkgconfig,644)
->>>>>>> linux-next/akpm-base
install: install_lib install_pkgconfig
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-utilc-fix-strndup_user-comment.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
bitmap_parselist-move-non-parser-logic-to-helpers-fix.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
convert-struct-pid-count-to-refcount_t-fix.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
