From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Jens Axboe <axboe@kernel•dk>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Coly Li <colyli@suse•de>
Subject: linux-next: manual merge of the akpm-current tree with the block tree
Date: Mon, 13 Aug 2018 17:51:59 +1000 [thread overview]
Message-ID: <20180813175159.36ac9d4b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2374 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
drivers/md/bcache/Kconfig
drivers/md/bcache/util.h
between commits:
bc81b47e828a ("bcache: prefer 'help' in Kconfig")
fc2d5988b597 ("bcache: add identifier names to arguments of function definitions")
from the block tree and commit:
fbb43f40e27b ("bcache: use routines from lib/crc64.c for CRC64 calculation")
from the akpm-current tree.
I fixed it up (see below, and the latter removed some fo the lines changed
by fc2d5988b597) 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/md/bcache/Kconfig
index 817b9fba50db,af247298409a..000000000000
--- a/drivers/md/bcache/Kconfig
+++ b/drivers/md/bcache/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
config BCACHE
tristate "Block device as cache"
+ select CRC64
- ---help---
+ help
Allows a block device to be used as cache for other devices; uses
a btree for indexing and the layout is optimized for SSDs.
diff --cc drivers/md/bcache/util.h
index 4e0ed19e32d3,a1579e28049f..000000000000
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@@ -543,11 -543,26 +544,27 @@@ dup:
#define RB_PREV(ptr, member) \
container_of_or_null(rb_prev(&(ptr)->member), typeof(*ptr), member)
+ static inline uint64_t bch_crc64(const void *p, size_t len)
+ {
+ uint64_t crc = 0xffffffffffffffffULL;
+
+ crc = crc64_be(crc, p, len);
+ return crc ^ 0xffffffffffffffffULL;
+ }
+
+ static inline uint64_t bch_crc64_update(uint64_t crc,
+ const void *p,
+ size_t len)
+ {
+ crc = crc64_be(crc, p, len);
+ return crc;
+ }
+
/* Does linear interpolation between powers of two */
-static inline unsigned fract_exp_two(unsigned x, unsigned fract_bits)
+static inline unsigned int fract_exp_two(unsigned int x,
+ unsigned int fract_bits)
{
- unsigned fract = x & ~(~0 << fract_bits);
+ unsigned int fract = x & ~(~0 << fract_bits);
x >>= fract_bits;
x = 1 << x;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-13 7:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 7:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-02 5:40 linux-next: manual merge of the akpm-current tree with the block tree Stephen Rothwell
2021-04-07 9:18 Stephen Rothwell
2021-03-18 6:17 Stephen Rothwell
2021-03-18 17:54 ` Shakeel Butt
2021-03-18 18:19 ` Jens Axboe
2020-11-17 5:05 Stephen Rothwell
2020-10-15 6:27 Stephen Rothwell
2020-09-25 9:57 Stephen Rothwell
2019-05-03 9:10 Stephen Rothwell
2019-05-03 12:35 ` Amir Goldstein
2018-10-02 7:21 Stephen Rothwell
2018-08-02 8:31 Stephen Rothwell
2018-03-19 6:36 Stephen Rothwell
2016-07-13 6:14 Stephen Rothwell
2016-07-13 16:31 ` Jens Axboe
2015-12-07 8:12 Stephen Rothwell
2015-12-07 19:44 ` Andrew Morton
2015-12-07 20:24 ` Stephen Rothwell
2015-11-01 15:51 Stephen Rothwell
2015-11-01 16:04 ` kbuild test robot
2015-11-01 16:05 ` kbuild test robot
2015-11-01 18:38 ` Mel Gorman
2015-11-01 21:51 ` Stephen Rothwell
2015-01-21 7:14 Stephen Rothwell
2014-07-02 6:06 Stephen Rothwell
2013-11-05 6:29 Stephen Rothwell
2013-11-05 6:25 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=20180813175159.36ac9d4b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=colyli@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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