Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Fun set of conflict resolutions here...

For the mac80211 stuff, these were fortunately just parallel
adds.  Trivially resolved.

In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.

In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.

The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.

The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:

====================

    Due to bug fixes found by the syzkaller bot and taken into the for-rc
    branch after development for the 4.17 merge window had already started
    being taken into the for-next branch, there were fairly non-trivial
    merge issues that would need to be resolved between the for-rc branch
    and the for-next branch.  This merge resolves those conflicts and
    provides a unified base upon which ongoing development for 4.17 can
    be based.

    Conflicts:
            drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524
            (IB/mlx5: Fix cleanup order on unload) added to for-rc and
            commit b5ca15ad7e61 (IB/mlx5: Add proper representors support)
            add as part of the devel cycle both needed to modify the
            init/de-init functions used by mlx5.  To support the new
            representors, the new functions added by the cleanup patch
            needed to be made non-static, and the init/de-init list
            added by the representors patch needed to be modified to
            match the init/de-init list changes made by the cleanup
            patch.
    Updates:
            drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
            prototypes added by representors patch to reflect new function
            names as changed by cleanup patch
            drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
            stage list to match new order from cleanup patch
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 20 deletions

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 46c1d239cc1b..92b6a2c21631 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1116,42 +1116,29 @@ static int read_unwind_hints(struct objtool_file *file)
 
 static int read_retpoline_hints(struct objtool_file *file)
 {
-        struct section *sec, *relasec;
+        struct section *sec;
         struct instruction *insn;
         struct rela *rela;
-        int i;
 
-        sec = find_section_by_name(file->elf, ".discard.retpoline_safe");
+        sec = find_section_by_name(file->elf, ".rela.discard.retpoline_safe");
         if (!sec)
                 return 0;
 
-        relasec = sec->rela;
-        if (!relasec) {
-                WARN("missing .rela.discard.retpoline_safe section");
-                return -1;
-        }
-
-        if (sec->len % sizeof(unsigned long)) {
-                WARN("retpoline_safe size mismatch: %d %ld", sec->len, sizeof(unsigned long));
-                return -1;
-        }
-
-        for (i = 0; i < sec->len / sizeof(unsigned long); i++) {
-                rela = find_rela_by_dest(sec, i * sizeof(unsigned long));
-                if (!rela) {
-                        WARN("can't find rela for retpoline_safe[%d]", i);
+        list_for_each_entry(rela, &sec->rela_list, list) {
+                if (rela->sym->type != STT_SECTION) {
+                        WARN("unexpected relocation symbol type in %s", sec->name);
                         return -1;
                 }
 
                 insn = find_insn(file, rela->sym->sec, rela->addend);
                 if (!insn) {
-                        WARN("can't find insn for retpoline_safe[%d]", i);
+                        WARN("bad .discard.retpoline_safe entry");
                         return -1;
                 }
 
                 if (insn->type != INSN_JUMP_DYNAMIC &&
                     insn->type != INSN_CALL_DYNAMIC) {
-                        WARN_FUNC("retpoline_safe hint not a indirect jump/call",
+                        WARN_FUNC("retpoline_safe hint not an indirect jump/call",
                                   insn->sec, insn->offset);
                         return -1;
                 }