Received-SPF: pass (google.com: domain of linux-kernel+bounces-128092-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 2 Apr 2024 17:00:49 +0300
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lee Jones <lee@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= <kw@linux.com>,
	Damien Le Moal <dlemoal@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the pci tree
Message-ID: <ZgwPkWB5QBUDX2cj@smile.fi.intel.com>
References: <20240402113116.70d6a885@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240402113116.70d6a885@canb.auug.org.au>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

On Tue, Apr 02, 2024 at 11:31:16AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/mfd/intel-lpss-pci.c
> 
> between commit:
> 
>   5133224938b9 ("mfd: intel-lpss: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY")
> 
> from the pci tree and commit:
> 
>   e42199bf13d4 ("mfd: intel-lpss: Switch over to MSI interrupts")
> 
> from the mfd tree.
> 
> I fixed it up (I just used the latter)

This is correct fix, thank you!

>	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.

-- 
With Best Regards,
Andy Shevchenko