From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Networking <netdev@vger.kernel.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
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 tty tree with the net-next tree
Date: Wed, 9 Aug 2023 09:54:14 +0200 [thread overview]
Message-ID: <2023080901-scabbed-trailside-3996@gregkh> (raw)
In-Reply-To: <20230809133723.2ebeddd7@canb.auug.org.au>
On Wed, Aug 09, 2023 at 01:37:23PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> arch/powerpc/sysdev/fsl_soc.c
>
> between commit:
>
> 62e106c802c5 ("net: fs_enet: Remove stale prototypes from fsl_soc.c")
>
> from the net-next tree and commit:
>
> 80a8f487b9ba ("serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c")
>
> from the tty 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.
Fix looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2023-08-09 7:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 3:37 linux-next: manual merge of the tty tree with the net-next tree Stephen Rothwell
2023-08-09 7:54 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-09 3:40 Stephen Rothwell
2023-08-09 7:54 ` Greg KH
2021-04-06 8:48 Stephen Rothwell
2021-04-06 9:11 ` Greg KH
2012-03-09 6:02 Stephen Rothwell
2012-03-09 6:02 ` 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=2023080901-scabbed-trailside-3996@gregkh \
--to=greg@kroah.com \
--cc=christophe.leroy@csgroup.eu \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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 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.