From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3449DC432BE for ; Fri, 27 Aug 2021 19:28:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 098A260F4F for ; Fri, 27 Aug 2021 19:28:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230231AbhH0T32 (ORCPT ); Fri, 27 Aug 2021 15:29:28 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:58753 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbhH0T32 (ORCPT ); Fri, 27 Aug 2021 15:29:28 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id 910B02B011B1; Fri, 27 Aug 2021 15:28:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 27 Aug 2021 15:28:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=vemiIggeRwXcQQHV1mjV5Smqyw7 hVT8XQPrsu0dbOaE=; b=tbwnNqqXREaSAieocbtKKL0bbwwvfwadwuY+PCYUqMY cIB8CbkCfCQMxRakgaDfnPZpw68vjqOqxT0BD55hMgrCEao/rjQcTVs2Jfn2/slz mStOcE7UYdj7nMg3PX8uK8tHLYqXOcI+GlxTNyWu2GGU/fLjiCSjW5iCpT3dThCZ s2OLEqcj6jhv+EeIs8OcsCAmyOwQE2+2gGXxG6onlU/cE5zdZCunrH7+a7bL6s27 XIXo5n8L7vEwnNRDhMr5xd0oKUB1psXFulJg28lX9foEkSjt/SWTf6zuxN3+0bSO ra+S8OVoSWhKLSXqdRkIFqdropn5Y0dh4plTv6sfcOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=vemiIg geRwXcQQHV1mjV5Smqyw7hVT8XQPrsu0dbOaE=; b=riJpSnCoVe2nfWGWRDnVt3 LxQJqQtlS31hO82zzyoI6yrz1rFJxhZME+ZgYxyMpw8Do8ldTt77TO9NZsZgpgTh vvTnfegtqHPK94gE2gAplTt+IlVMXYHZjyPIhc0Ax4RJ2gPYB4w1MDE2TMDZ+aYO GnKh6ZfyNzEuTIYE+lr8wUUKe9G9/lmtgNfGuls5hpZVQCYSyIZEVH6Zmgbbwneu xUZquXxZO7W3+ilflYTH2++T7VrI1gtMEHU637v6icAmN04TTpfFE65Ns7r8VdcV O+N7tQp6/bgdWl6QCjXNrSzc7iYWyhE1cbM4fNDc1Z/BHFMVa6s0AIqZmzqGoVcA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddruddufedgudefjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuhe ejgfffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 27 Aug 2021 15:28:33 -0400 (EDT) Date: Fri, 27 Aug 2021 21:28:27 +0200 From: Greg KH To: Manivannan Sadhasivam Cc: Stephen Rothwell , Arnd Bergmann , Jakub Kicinski , Kalle Valo , Linux Kernel Mailing List , Linux Next Mailing List , Loic Poulain Subject: Re: linux-next: manual merge of the char-misc tree with Linus' tree Message-ID: References: <20210827164904.6b1d1f0e@canb.auug.org.au> <20210827175852.GB15018@thinkpad> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210827175852.GB15018@thinkpad> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Aug 27, 2021 at 11:28:52PM +0530, Manivannan Sadhasivam wrote: > Hi Greg, > > On Fri, Aug 27, 2021 at 03:12:02PM +0200, Greg KH wrote: > > On Fri, Aug 27, 2021 at 04:49:04PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the char-misc tree got conflicts in: > > > > > > drivers/bus/mhi/core/main.c > > > net/qrtr/mhi.c > > > > > > between commit: > > > > > > 9ebc2758d0bb ("Revert "net: really fix the build..."") > > > > > > from the origin tree and commit: > > > > > > 0092a1e3f763 ("bus: mhi: Add inbound buffers allocation flag") > > > > > > from the char-misc tree. > > > > > > I fixed it up (the commit in Linus' tree is basically a revert of the > > > char-misc tree, so I effectively reverted the latter) 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. > > > > Hm, what should I do in my tree here? > > > > Kalle, what commit should I make in the char-misc tree now to handle > > this issue, and make the merge with Linus's tree "simple"? Or any other > > ideas? > > > > For making the merge simpler, I'd suggest we revert below commit in char-misc: > > 0092a1e3f763 ("bus: mhi: Add inbound buffers allocation flag") Reverting that works for me, I've done that in my tree and that allows it to be merged cleanly with Linus's tree. thanks, greg k-h