From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jens Axboe <axboe@kernel•dk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the tip tree with the block tree
Date: Fri, 9 May 2014 14:46:25 +1000 [thread overview]
Message-ID: <20140509144625.67839275@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/block/mtip32xx/mtip32xx.c between commit b10fd728b985
("mtip32xx: convert to use blk-mq") from the block tree and commit
4e857c58efeb ("arch: Mass conversion of smp_mb__*()") from the tip tree.
I fixed it up (I used the block tree version which removed the code
being updated by the tip tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-09 4:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 4:46 Stephen Rothwell [this message]
[not found] <1Vn5Pr0rEN5VNr1V-oUtQYs_wVms3VZ7jsttDqMtVv3XxoMEIBc7Yf3FJhEanCMsvJe9z8HjzX7cEMedSJX68A==@protonmail.internalid>
2025-09-15 22:25 ` linux-next: manual merge of the tip tree with the block tree 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-11-01 6:10 Stephen Rothwell
2017-11-01 14:25 ` Jens Axboe
2017-11-01 14:37 ` Kees Cook
2017-07-03 3:56 Stephen Rothwell
2017-07-03 4:03 ` 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=20140509144625.67839275@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hpa@zytor$(echo .)com \
--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=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