From patchwork Thu Apr 13 16:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1161929vqo; Thu, 13 Apr 2023 09:27:33 -0700 (PDT) X-Google-Smtp-Source: AKy350aukGumbaQ1AIAQOEB4cAfQH+IxotZKu1F5FwjaqO6XBtBvSfLh+J9gou6lwT9gZ9ipFWjE X-Received: by 2002:a05:6a00:b52:b0:62d:c382:1384 with SMTP id p18-20020a056a000b5200b0062dc3821384mr3043603pfo.5.1681403252848; Thu, 13 Apr 2023 09:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681403252; cv=none; d=google.com; s=arc-20160816; b=QWxz0HUzyuUdxHIE3WkXogRTp6g97IG4VCKYaRGXxzUlY/vFAx3Poz6wo/ifho5V4u 4ExH/CZOabAfq23ErOwcc5LSX7+83YKH5bma6CbFjlrPA7BBvodxAcz11PoLe8OoiINX dKGdOfVLPJTZFX0I2G+dw84SCKyFusM2MBClVR5jHfThetc3DCONYfyHqRMsPQZqvO/1 sd1ricckFg8UmE+6VRR+M6xr7YmcZSR/ZDarlMboRnKrs78c5laN39mqH5VFdMSS829t ONpV+OMO3NWAWwjP0Ksw0WZvzde2mAV896QTaeve/seDLxaXJ2EzqWIRFgTpz5cXnbbt oWHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YpvScJjxgZrh21Li3Gb85PmTfSyFW+CI4Y/zhkBfHaM=; b=qIqX4JetrqvPQBo5enpGy9MErhl2ooKTcUR0xrGHjsIdd69Eyyo+Zwm+dvljJq8sQb BiehyAon8cyc+aQluujPHHievtVgkw90QgcpFLCxbDvIOcoV4dses2CEuDFMAdasBYuH BmoGe4jllvSBYVCWDhylcStlLIhHdaIQkZgJMrPWJY+f1uSzoAUjV5l2QhpchNOIK3Ms KD+vu+mrNcPuolpmU59tpjM1Bo7WO+LWAABOLWPe4vtTWhbfWb4fZRTXwsEGhyTockFP sBWkapFRiSW3Br8Uxx9twQhQ3Ev2SomOKPEOCS3Wh5oBIUrFju/k47I21flvspdXEJPW vyaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D3tQKpG2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z23-20020aa79497000000b005a8f2051fd3si2002440pfk.230.2023.04.13.09.27.18; Thu, 13 Apr 2023 09:27:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D3tQKpG2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230134AbjDMQHR (ORCPT + 99 others); Thu, 13 Apr 2023 12:07:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbjDMQHK (ORCPT ); Thu, 13 Apr 2023 12:07:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A46FAF19; Thu, 13 Apr 2023 09:06:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2553263FAE; Thu, 13 Apr 2023 16:06:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB5FAC43445; Thu, 13 Apr 2023 16:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681402018; bh=7UpSyVAtwNT84JAbWIX2mRz/svkFLEyQ1Y2JkSBuIVA=; h=From:To:Cc:Subject:Date:From; b=D3tQKpG2VpnTOBodwzCy8ERn4FwU616rfzFwb7EWsmaymvQF12ssQX7yMgrfZ3gZC eyZUWaFTZrdnAQV4MKv42bdnMzsiBNwgDkHcggjpKmG4XRF21uo3hYzd2QjNWJiPYQ 4emV66AMgclMPo1fEBnRCl5M9y2fezkPn7f3UaJz7Mq3DmhwMMqIE0cn2zlG5Se3MX 0e0QgV0YwPel3j2pFbK3sHWWtfE9QrfnKcfsTLEKT2t9w/zJ+BICh480svNygb2LdN a6QT87i0Ol0BNbNbdcVD6kRpUr68GDnPIqAfebkHSpGm2Qu8NxDpxQxR3jgOI0L2K0 KMgwLCr0+qACQ== From: broonie@kernel.org To: David Miller , Networking Cc: Alexei Starovoitov , Bobby Eshleman , John Fastabend , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the origin tree Date: Thu, 13 Apr 2023 17:06:53 +0100 Message-Id: <20230413160654.3996931-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763079097150197788?= X-GMAIL-MSGID: =?utf-8?q?1763079097150197788?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: tools/testing/selftests/bpf/prog_tests/sockmap_listen.c between commit: 989cdc373248a ("bpf: sockmap, pull socket helpers out of listen test for general use") from the origin tree and commit: d61bd8c1fd02c ("selftests/bpf: add a test case for vsock sockmap") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c diff --cc tools/testing/selftests/bpf/prog_tests/sockmap_listen.c index f3913ba9e899c,8f09e1ea3ba75..0000000000000 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c