From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mark.gross@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matthew Gerlach <matthew.gerlach@linux.intel.com>,
Maximilian Luz <luzmaximilian@gmail.com>,
Moritz Fischer <mdf@kernel.org>,
Russ Weight <russell.h.weight@intel.com>,
Wu Hao <hao.wu@intel.com>, Xu Yilun <yilun.xu@intel.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree
Date: Mon, 11 Jan 2021 08:25:32 +0100 [thread overview]
Message-ID: <X/v9bAznWVNMupY7@kroah.com> (raw)
In-Reply-To: <20210111130851.374bf4ea@canb.auug.org.au>
On Mon, Jan 11, 2021 at 01:08:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> include/linux/mod_devicetable.h
> scripts/mod/devicetable-offsets.c
> scripts/mod/file2alias.c
>
> between commit:
>
> eb0e90a82098 ("platform/surface: aggregator: Add dedicated bus and device type")
>
> from the drivers-x86 tree and commits:
>
> 9326eecd9365 ("fpga: dfl: move dfl_device_id to mod_devicetable.h")
> 4a224acec597 ("fpga: dfl: add dfl bus support to MODULE_DEVICE_TABLE()")
>
> from the char-misc 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.
Thanks, this looks correct, and expected as new subsystems add
auto-loading capabilities at the same time.
greg k-h
next prev parent reply other threads:[~2021-01-11 7:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 2:08 linux-next: manual merge of the char-misc tree with the drivers-x86 tree Stephen Rothwell
2021-01-11 7:25 ` Greg KH [this message]
2021-02-14 20:44 ` Stephen Rothwell
2021-02-23 3:28 ` Stephen Rothwell
2021-02-25 7:00 ` Greg KH
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=X/v9bAznWVNMupY7@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=hao.wu@intel.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luzmaximilian@gmail.com \
--cc=mark.gross@intel.com \
--cc=matthew.gerlach@linux.intel.com \
--cc=mdf@kernel.org \
--cc=russell.h.weight@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=yilun.xu@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.