From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id BFE7FC433F5
	for <netdev@archiver.kernel.org>; Thu, 19 May 2022 18:31:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S244083AbiESSbm (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Thu, 19 May 2022 14:31:42 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33360 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S244013AbiESSbh (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 19 May 2022 14:31:37 -0400
Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACC3C52B17
        for <netdev@vger.kernel.org>; Thu, 19 May 2022 11:31:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id 2C00FB827D6
        for <netdev@vger.kernel.org>; Thu, 19 May 2022 18:31:25 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id A64A2C385AA;
        Thu, 19 May 2022 18:31:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=k20201202; t=1652985083;
        bh=PwDQ/E+c0RPinCwMKdF3OoSVHKuvOwCSgtfUKlfaPBs=;
        h=Date:From:To:Cc:Subject:From;
        b=gXO9fBjTXNwVH3tmQ3KYNvCW1J8dmSGuLx+N/inIF9P6qzvxvUun0iXTx7h8498OK
         qZBNLSgzjTEZk76sJoqt45YF817MrFUCmJJ4HwbYWXOcWViuueW1Yfak4ztcwgKOjd
         uHk+7snI6bjlYec1eJ4dTz4CMan7HBdTAzql5OmamLxDoV4gXdJ1fBkehUFVnINidy
         IOaaxzbLHxE1EnlWpKYCP8gLK9EuKP66t32YowKlzReiPgHFUqePGAmeV4hYpdNcAN
         H760LPk3f/UFfa4AJZlzhyqUX1BR3tG5QR6dJlio/xH/kK+lAbPCLNnepkM4b+IcFB
         5p3qDMNsbrA6g==
Date:   Thu, 19 May 2022 11:31:22 -0700
From:   Jakub Kicinski <kuba@kernel.org>
To:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc:     David Miller <davem@davemloft.net>,
        Paolo Abeni <pabeni@redhat.com>,
        Mat Martineau <mathew.j.martineau@linux.intel.com>,
        Saeed Mahameed <saeedm@nvidia.com>
Subject: net <> net-next conflicts
Message-ID: <20220519113122.6bb6809a@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi!

The conflicts in today's net -> net-next merge were pretty tedious.

First off - please try to avoid creating them.

If they are unavoidable - please include the expected resolution
in the cover letter and mark the cover letter with [conflict] 
(i.e.  [PATCH tree 0/n][conflict]) so we can easily find them days 
later when doing the merge.

Thanks!