From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
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 input tree with the arm-soc tree
Date: Wed, 22 Feb 2023 09:10:26 +1100 [thread overview]
Message-ID: <20230222091026.4b440e8e@canb.auug.org.au> (raw)
In-Reply-To: <20230112103928.25976ad3@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 964 bytes --]
Hi all,
On Thu, 12 Jan 2023 10:39:28 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the input tree got a conflict in:
>
> drivers/input/touchscreen/ucb1400_ts.c
>
> between commit:
>
> 481ac55a74c9 ("mfd: remove ucb1400 support")
>
> from the arm-soc tree and commit:
>
> 2cfa7c9c55d8 ("Input: ucb1400_ts - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()")
>
> from the input tree.
>
> I fixed it up (I 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 input-current tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-02-21 22:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 23:39 linux-next: manual merge of the input tree with the arm-soc tree Stephen Rothwell
2023-02-21 22:10 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 5:06 Stephen Rothwell
2019-05-01 3:40 Stephen Rothwell
2019-05-12 23:28 ` Stephen Rothwell
2012-01-03 3:33 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=20230222091026.4b440e8e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
/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