Greg Kroah-Hartman 09059c6fca ANDROID: modpost.c: fix up incorrect merge resolution ...

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

2021-02-03 14:58:23 +01:00

..

.gitignore

.gitignore: add SPDX License Identifier

2020-03-25 11:50:48 +01:00

devicetable-offsets.c

Add auxiliary bus support

2020-12-04 12:23:25 +01:00

empty.c

…

file2alias.c

Add auxiliary bus support

2020-12-04 12:23:25 +01:00

Makefile

kbuild: introduce hostprogs-always-y and userprogs-always-y

2020-08-10 01:32:59 +09:00

mk_elfconfig.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

modpost.c

ANDROID: modpost.c: fix up incorrect merge resolution

2021-02-03 14:58:23 +01:00

modpost.h

modpost: refactor error handling and clarify error/fatal difference

2020-12-21 13:57:08 +09:00

sumversion.c

modpost: use read_text_file() and get_line() for reading text files

2020-06-06 23:38:13 +09:00