github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: modpost.c: fix up incorrect merge resolution

Browse Source 
When merging changes done in scripts/mod/modpost.c I picked the wrong
"side" of the merge branches.

This fixes things up to match what is upstream identically at this point
in time, as there should not be any need for any changes in this file
right now.

Reported-by: Matthias Maennich <maennich@google.com>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I014adb697866bc15a893f7a108bec361c525d7ad
This commit is contained in:
Greg Kroah-Hartman 2021-02-02 11:31:33 +01:00
parent 4fb49de702
commit 09059c6fca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mod/modpost.c
View File

@ -2647,9 +2647,9 @@ int main(int argc, char **argv)
for (s = symbolhash[n]; s; s = s->next) {
if (s->is_static)
warn("\"%s\" [%s] is a static %s\n",
s->name, s->module->name,
export_str(s->export));
error("\"%s\" [%s] is a static %s\n",
s->name, s->module->name,
export_str(s->export));
}
}