From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wolfram Sang <wsa@the-dreams•de>
Cc: Helge Deller <deller@gmx•de>,
Heiner Kallweit <hkallweit1@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Zimmermann <tzimmermann@suse•de>,
Wolfram Sang <wsa@kernel•org>
Subject: Re: linux-next: manual merge of the fbdev tree with the i2c tree
Date: Wed, 17 Jan 2024 10:35:50 +1100 [thread overview]
Message-ID: <20240117103550.05ccef37@canb.auug.org.au> (raw)
In-Reply-To: <20240109113914.6178e733@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 997 bytes --]
Hi all,
On Tue, 9 Jan 2024 11:39:14 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the fbdev tree got a conflict in:
>
> drivers/video/fbdev/intelfb/intelfb_i2c.c
>
> between commit:
>
> ef2984d633ce ("fbdev: remove I2C_CLASS_DDC support")
>
> from the i2c tree and commit:
>
> 256b7e8673a6 ("fbdev/intelfb: Remove driver")
This is now commit
689237ab37c5 ("fbdev/intelfb: Remove driver")
in Linus' tree.
> I fixed it up (I just removed the file) 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.
This is now a conflict between the i2c tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-01-16 23:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 0:39 linux-next: manual merge of the fbdev tree with the i2c tree Stephen Rothwell
2024-01-16 23:35 ` Stephen Rothwell [this message]
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=20240117103550.05ccef37@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=deller@gmx$(echo .)de \
--cc=hkallweit1@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tzimmermann@suse$(echo .)de \
--cc=wsa@kernel$(echo .)org \
--cc=wsa@the-dreams$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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