From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kees Cook <keescook@chromium•org>
Subject: Re: linux-next: manual merge of the tip tree with the block tree
Date: Wed, 1 Nov 2017 08:25:00 -0600 [thread overview]
Message-ID: <bc21c070-3a7d-b469-62fd-1258ab265e3b@kernel.dk> (raw)
In-Reply-To: <20171101171007.6a340098@canb.auug.org.au>
On 11/01/2017 12:10 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/block/amiflop.c
>
> between commit:
>
> f37ecbfc238b ("amifloppy: Convert timers to use timer_setup()")
>
> from the block tree and commit:
>
> 3c557df67257 ("timer: Remove meaningless .data/.function assignments")
>
> from the tip tree.
>
> I fixed it up (I just used the former version of the motor_on_callback
> definition) 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.
Kees, why are we in this situation? Making similar timer fixups in the
same driver and submitting it through two different trees is a mess.
--
Jens Axboe
next prev parent reply other threads:[~2017-11-01 14:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 6:10 linux-next: manual merge of the tip tree with the block tree Stephen Rothwell
2017-11-01 14:25 ` Jens Axboe [this message]
2017-11-01 14:37 ` Kees Cook
[not found] <1Vn5Pr0rEN5VNr1V-oUtQYs_wVms3VZ7jsttDqMtVv3XxoMEIBc7Yf3FJhEanCMsvJe9z8HjzX7cEMedSJX68A==@protonmail.internalid>
2025-09-15 22:25 ` Mark Brown
2025-09-16 0:28 ` Boqun Feng
2025-09-17 7:46 ` Andreas Hindborg
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 3:14 Stephen Rothwell
2020-11-09 13:45 ` Thomas Gleixner
2020-11-09 14:06 ` Jens Axboe
2019-02-13 2:41 Stephen Rothwell
2017-07-03 3:56 Stephen Rothwell
2017-07-03 4:03 ` Stephen Rothwell
2014-05-09 4:46 Stephen Rothwell
[not found] <20100622143121.186fe9c4.sfr@canb.auug.org.au>
2010-06-22 21:06 ` Paul E. McKenney
2010-06-21 6:16 Stephen Rothwell
2010-06-21 17:13 ` Paul E. McKenney
2010-06-21 23:40 ` Stephen Rothwell
2010-06-22 0:04 ` Stephen Rothwell
2010-06-22 0:40 ` Paul E. McKenney
2010-06-22 6:26 ` Jens Axboe
2010-06-22 17:14 ` Paul E. McKenney
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=bc21c070-3a7d-b469-62fd-1258ab265e3b@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=hpa@zytor$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(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