Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.
Showing the changes to scripts (3 of 549 files). Show all
Unified · Split
| @@ -52,6 +52,13 @@ ifndef obj · 51 unmodified lines | |||
| 52 | $(warning kbuild: Makefile.build is included improperly) | 52 | $(warning kbuild: Makefile.build is included improperly) |
| 53 | endif | 53 | endif |
| 54 | 54 | ||
| 55 | ifeq ($(MAKECMDGOALS)$(need-modorder),) | ||
| 56 | ifneq ($(obj-m),) | ||
| 57 | $(warning $(patsubst %.o,'%.ko',$(obj-m)) will not be built even though obj-m is specified.) | ||
| 58 | $(warning You cannot use subdir-y/m to visit a module Makefile. Use obj-y/m instead.) | ||
| 59 | endif | ||
| 60 | endif | ||
| 61 | |||
| 55 | # =========================================================================== | 62 | # =========================================================================== |
| 56 | 63 | ||
| 57 | ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),) | 64 | ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),) |
| @@ -487,7 +494,9 @@ targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \ · 429 unmodified lines | |||
| 487 | 494 | ||
| 488 | PHONY += $(subdir-ym) | 495 | PHONY += $(subdir-ym) |
| 489 | $(subdir-ym): | 496 | $(subdir-ym): |
| 490 | $(Q)$(MAKE) $(build)=$@ need-builtin=$(if $(findstring $@,$(subdir-obj-y)),1) | 497 | $(Q)$(MAKE) $(build)=$@ \ |
| 498 | need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \ | ||
| 499 | need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1)) | ||
| 491 | 500 | ||
| 492 | # Add FORCE to the prequisites of a target to force it to be always rebuilt. | 501 | # Add FORCE to the prequisites of a target to force it to be always rebuilt. |
| 493 | # --------------------------------------------------------------------------- | 502 | # --------------------------------------------------------------------------- |
| @@ -85,10 +85,8 @@ endif · 84 unmodified lines | |||
| 85 | 85 | ||
| 86 | include scripts/Makefile.lib | 86 | include scripts/Makefile.lib |
| 87 | 87 | ||
| 88 | modorder := $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order | ||
| 89 | |||
| 90 | # find all modules listed in modules.order | 88 | # find all modules listed in modules.order |
| 91 | modules := $(sort $(shell cat $(modorder))) | 89 | modules := $(sort $(shell cat $(MODORDER))) |
| 92 | 90 | ||
| 93 | # Stop after building .o files if NOFINAL is set. Makes compile tests quicker | 91 | # Stop after building .o files if NOFINAL is set. Makes compile tests quicker |
| 94 | __modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) | 92 | __modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) |
| @@ -98,7 +96,7 @@ MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - $(wildcard vmlinux) · 3 unmodified lines | |||
| 98 | 96 | ||
| 99 | # We can go over command line length here, so be careful. | 97 | # We can go over command line length here, so be careful. |
| 100 | quiet_cmd_modpost = MODPOST $(words $(modules)) modules | 98 | quiet_cmd_modpost = MODPOST $(words $(modules)) modules |
| 101 | cmd_modpost = sed 's/ko$$/o/' $(modorder) | $(MODPOST) | 99 | cmd_modpost = sed 's/ko$$/o/' $(MODORDER) | $(MODPOST) |
| 102 | 100 | ||
| 103 | PHONY += modules-modpost | 101 | PHONY += modules-modpost |
| 104 | modules-modpost: | 102 | modules-modpost: |
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | // Check if refcount_t type and API should be used | 2 | // Check if refcount_t type and API should be used |
| 2 | // instead of atomic_t type when dealing with refcounters | 3 | // instead of atomic_t type when dealing with refcounters |
| 3 | // | 4 | // |