From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: Dave Airlie <airlied@redhat•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Ard Biesheuvel <ardb@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Zimmermann <tzimmermann@suse•de>
Subject: Re: linux-next: manual merge of the drm-misc tree with the asm-generic tree
Date: Thu, 2 Nov 2023 08:37:18 +1100 [thread overview]
Message-ID: <20231102083718.0036fea2@canb.auug.org.au> (raw)
In-Reply-To: <20231018124636.4a973762@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Hi all,
On Wed, 18 Oct 2023 12:46:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > arch/ia64/include/asm/fb.h
> >
> > between commit:
> >
> > cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> >
> > from the asm-generic tree and commit:
> >
> > 052ddf7b86d2 ("fbdev: Replace fb_pgprotect() with pgprot_framebuffer()")
> >
> > from the drm-misc 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 asm-generic tree and the drm tree.
And now between the asm-generic tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2023-11-01 21:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 0:46 linux-next: manual merge of the drm-misc tree with the asm-generic tree Stephen Rothwell
2023-10-13 6:57 ` Thomas Zimmermann
2023-10-18 1:46 ` Stephen Rothwell
2023-11-01 21:37 ` 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=20231102083718.0036fea2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tzimmermann@suse$(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