diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 11:03:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-29 11:03:21 -0800 |
| commit | 80b60e3849bfe987801a73ebd4bab43b7b591a09 (patch) | |
| tree | 54a3e6ad4f960ddaa2c3eda7deba1c518d6a6fdb /samples | |
| parent | 701a9c8092ddf299d7f90ab2d66b19b4526d1186 (diff) | |
| parent | 74777eaf7aef0f80276cb1c3fad5b8292c368859 (diff) | |
| download | linux-80b60e3849bfe987801a73ebd4bab43b7b591a09.tar.gz linux-80b60e3849bfe987801a73ebd4bab43b7b591a09.tar.bz2 linux-80b60e3849bfe987801a73ebd4bab43b7b591a09.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"Three objtool fixes, plus marking SFI as obsolete"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Skip samples subdirectory
objtool: Fix ARCH=x86_64 build error
objtool: Silence build output
MAINTAINERS: Mark simple firmware interface (SFI) obsolete
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/Makefile b/samples/Makefile index 5ce50ef0f2b2..f8f847b4f61f 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for Linux samples code +OBJECT_FILES_NON_STANDARD := y obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs/ obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/ |