| Message ID | 20210927142840.13286-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9a1213849a94065073b1547145c44b2605f72340 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] net: ipv6: squash $(ipv6-offload) in Makefile | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 5 of 5 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 17 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Mon, 27 Sep 2021 23:28:39 +0900 you wrote: > Assign the objects directly to obj-$(CONFIG_INET). > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > net/ipv6/Makefile | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Here is the summary with links: - [1/2] net: ipv6: squash $(ipv6-offload) in Makefile https://git.kernel.org/netdev/net-next/c/9a1213849a94 - [2/2] net: ipv6: use ipv6-y directly instead of ipv6-objs https://git.kernel.org/netdev/net-next/c/1817750bdc67 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 1bc7e143217b..061b74d5563d 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -12,8 +12,6 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \ exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o \ udp_offload.o seg6.o fib6_notifier.o rpl.o ioam6.o -ipv6-offload := ip6_offload.o tcpv6_offload.o exthdrs_offload.o - ipv6-$(CONFIG_SYSCTL) = sysctl_net_ipv6.o ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o @@ -48,7 +46,8 @@ obj-$(CONFIG_IPV6_GRE) += ip6_gre.o obj-$(CONFIG_IPV6_FOU) += fou6.o obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o -obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload) +obj-$(CONFIG_INET) += output_core.o protocol.o \ + ip6_offload.o tcpv6_offload.o exthdrs_offload.o obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
Assign the objects directly to obj-$(CONFIG_INET). Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- net/ipv6/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)