Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp2656234pxf; Sun, 21 Mar 2021 02:22:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZLUUVuib/0YFiYqGfVxbFdIXnbMjIxXdXiFdqbYLE3xMDsrRpLX8xQii+IyCaWYFsAXv9 X-Received: by 2002:aa7:d841:: with SMTP id f1mr19315009eds.286.1616318576578; Sun, 21 Mar 2021 02:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616318576; cv=none; d=google.com; s=arc-20160816; b=PGw1bv9umTAn37A3vyDgON/NYIV8P+TH4R5rGNMZBE1GwaVrAAKjMX1rB9r24XZ2pC 67yvSuYHcb7bM/BSd6EPIEehB8W/gCSvVEDJqYXXOIRWUbTlnTLZO9vdZ3pp8hDWyvll 1Bq4nULyGOdUpGHTRAtuHgZLbsnfTyRoJkJMVNIZx6cptAI4vG2qYY5RQ9R3DeSlaXxG XsdK3nYQULlGrIoVVlWtw0le5juEgl06z+8aJCIIK19AwnWmJFTGO9gVP7ixWS0zvRQy GInQKGjCyxAxAake6/dASpSo89d25aRfK146crm+c2XoAqVTbTDksLfbxdK5a0p+tm8C XRxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=wkesuio6oO4GWiXW9nM1umNJlITipJNKmPH4sJpeD0g=; b=pm3vQPUzzuSVG19KCWsnTof607l2PIfQ92EWeCtv1VV/QsxUW1YuAVZl8+Abmld9gk WKJ9naixUP4y99PXGa7dE1GJnlxhyeRjOeoYWtVlITQ91unrDw7o6STKfNC6BnW1qHtx 7ltA2+/7DzNDBk9HSFXxJZRLbMwip7QqLdXSFiXy/+txNySvJmxX3VzXLCXBStHo+bJ/ hOhhyyhXZrZiUOsoXSsNIHkj1wv3eRJRBLu0Ma2QORJsekeCHdJbyrt9i98RvUTXWcji v7RxOUXavleA/DonTHs775HVDppjLal3ctL8maFQWC4UdSHKQvqn6Oi9FQMDhYylVtcw uyiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TvBVtgqe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bq17si8759614ejb.679.2021.03.21.02.22.22; Sun, 21 Mar 2021 02:22:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TvBVtgqe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S230114AbhCUJOp (ORCPT + 99 others); Sun, 21 Mar 2021 05:14:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:52286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229871AbhCUJOl (ORCPT ); Sun, 21 Mar 2021 05:14:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B00E461930; Sun, 21 Mar 2021 09:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616318081; bh=z97kX6cRsiWQ+kLn2PcEWBpfL+Nxlr7V5w7JYn8raEo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TvBVtgqetIN8APxXPAErCysuUdh/nZg0AoZ2Nld3XgCVpurPKbzK6hcOPDhezkMQB r2CarikIJkobRmGb+0Jj0uRXH4hskPuUrm8CbfwqMkEpAX6qMkRneNbwyhj/lNHLUt 1lSHrzyRGmpd3quKdzk27Ea2rzoQncTkYHv3AWoUuFPsrpm+zFHHl9N90oJrxcJxp4 dCQKc10KNDMri8FFw0kx0IOyRDdWHQEElulJPA/TO5ZdJn6D8GpSyzHN88XJQXTS7C rgKT2GxCAOO95lpn+n+NF/9mjtbb7MNg0DOp2JrcnmncL5Nh0vsJw1Qq001W3ObOQQ 5LSMhVISbskXA== Date: Sun, 21 Mar 2021 11:14:37 +0200 From: Leon Romanovsky To: Linus Torvalds Cc: Marc Kleine-Budde , Stephen Rothwell , David Miller , Networking , Linux Kernel Mailing List , Linux Next Mailing List , Stephane Grosjean Subject: Re: linux-next: manual merge of the net tree with Linus' tree Message-ID: References: <20210319082939.77495e55@canb.auug.org.au> <65e47dcc-702b-98e0-2750-d5b11a7c0ae1@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Mar 20, 2021 at 12:42:06PM -0700, Linus Torvalds wrote: > On Sat, Mar 20, 2021 at 12:28 PM Marc Kleine-Budde wrote: > > > > Good idea. I'll send a pull request to David and Jakub. > > I don't think the revert is necessary. The conflict is so trivial that > it doesn't really matter. <...> > But something like this that just removes the > MODULE_SUPPORTED_DEVICE() thing that basically never gets touched > anyway, and we happened to be unlucky in *one* file? Not a worry at > all. For me this specific revert is a way to reduce the overhead from the maintainer when they prepare PRs. At least for me, PRs are most time consuming tasks. No patch - no conflict - less worries. Thanks