Merge branch 'kbuild' into for-next

diff --cc scripts/mod/modpost.c
index 1ec7158b6c1f67e7264260c5995842d93854ee42,859bee4972e95fac48e9b63a670795f01e6c22f7..33122ca04e7cd99cfb1be6bb4a5c62fd66efe51b
--- 1/scripts/mod/modpost.c
--- 2/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -1230,9 -1218,9 +1233,9 @@@ static char *sec2annotation(const char 
                        strcat(p, "data ");
                else
                        strcat(p, " ");
-               return r; /* we leak her but we do not care */
+               return r;
        } else {
 -              return "";
 +              return strdup("");
        }
  }