Re: linux-next: manual merge of the pm tree with the i2c tree

From: Wolfram Sang <wsa@the-dreams.de>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Octavian Purdila <octavian.purdila@intel.com>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Date: Sun, 17 Jul 2016 20:14:48 +0200	[thread overview]
Message-ID: <20160717181448.GC1814@katana> (raw)
In-Reply-To: <2196027.ndrBocBl2R@vostro.rjw.lan>

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

> > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > 
> > > > For a start, it generates this warning, now:
> > > > 
> > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not used [-Wunused-function]
> > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > >                    ^
> > > 
> > > OK, thanks for the heads-up.
> > 
> > Yes, thanks!
> > 
> > > 
> > > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > > 
> > > You could resolve this in your tree then.
> > 
> > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > revert given that we are quite late in the cycle already.
> 
> The branch is here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables
> 
> The top-most commit is:
> 
> fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
> 
> I won't rebase this branch going forward, so it is safe to pull.
> 
> Please let me know how I can help with the conflict resolution.

Well, not knowing much about ACPI, I just need the conflict resolution
for my latest i2c/for-next and your above branch. If you want to do it,
fine with me. But maybe Jarkko will be back to office on Monday, too.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]