From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.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 driver-core tree with the net-next tree
Date: Mon, 30 Jan 2023 14:31:16 +0200 [thread overview]
Message-ID: <Y9e4lFKZMylweoQF@smile.fi.intel.com> (raw)
In-Reply-To: <20230130153229.6cb70418@canb.auug.org.au>
On Mon, Jan 30, 2023 at 03:32:29PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> include/linux/acpi.h
>
> between commit:
>
> 1b94ad7ccc21 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs")
>
> from the net-next tree and commit:
>
> 162736b0d71a ("driver core: make struct device_type.uevent() take a const *")
>
> from the driver-core tree.
>
> I fixed it up (see below) 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.
Seems correct, thank you!
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2023-01-30 12:31 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 4:32 linux-next: manual merge of the driver-core tree with the net-next tree Stephen Rothwell
2023-01-30 12:31 ` Andy Shevchenko [this message]
2023-01-30 16:00 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2018-07-23 5:12 Stephen Rothwell
2018-07-23 6:20 ` Greg KH
2018-08-15 23:42 ` Stephen Rothwell
2018-08-16 0:05 ` Rajat Jain
2014-12-01 7:19 Stephen Rothwell
2014-12-01 7:34 ` Arend van Spriel
2014-12-03 8:36 ` Jeremiah Mahler
2014-12-03 10:51 ` Jeremiah Mahler
2014-12-03 12:49 ` Arend van Spriel
2014-12-03 16:21 ` Greg KH
2014-12-03 20:07 ` Arend van Spriel
2014-12-03 21:06 ` Jeremiah Mahler
2013-08-01 5:21 Stephen Rothwell
2013-08-02 0:28 ` Greg KH
2013-02-04 4:38 Stephen Rothwell
2013-02-04 4:59 ` Greg KH
2013-02-04 4:34 Stephen Rothwell
2011-10-25 8:07 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y9e4lFKZMylweoQF@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).