On Wed, Jan 29 2014, Geert Uytterhoeven wrote: > Hi Jens, > > On Wed, Jan 29, 2014 at 4:17 PM, Jens Axboe <ax...@kernel.dk> wrote: > > On Wed, Jan 29 2014, Geert Uytterhoeven wrote: > >> On Tue, Jan 28, 2014 at 11:52 PM, Jens Axboe <ax...@kernel.dk> wrote: > >> >> - Finally the immutable biovec changes from Kent Overstreet. This > >> >> enables some nice future work on making arbitrarily sized bios > >> >> possible, and splitting more efficient. Related fixes to immutable > >> >> bio_vecs: > >> >> > >> >> - dm-cache immutable fixup from Mike Snitzer. > >> >> - btrfs immutable fixup from Muthu Kumar. > >> >> > >> >> - bio-integrity fix from Nic Bellinger, which is also going to stable. > >> >> > >> >> > >> >> Please pull! There will be a bit of merge work for you, but it should be > >> >> fairly straight forward. It's mostly related to changin: > >> >> > >> >> bio->bi_sector -> bio->bi_iter.bi_sector > >> >> bio->bi_size -> bio->bi_iter.bi_size > >> >> > >> >> > >> >> git://git.kernel.dk/linux-block.git for-3.14/core > >> > > >> > BTW, let me know if you want me to merge this. The above has been in > >> > for-next since forever, and Stephen has carried a fix or two for new > >> > merges. > >> > >> arch/xtensa/platforms/iss/simdisk.c:108:23: error: 'struct bio' has no > >> member named 'bi_sector' > >> > >> http://kisskb.ellerman.id.au/kisskb/buildresult/10542666/ > > > > Does the below fix it for you? There's an existing bug in there where it > > kunmaps the wrong part (page instead of the address). Not sure that > > matters on xtensa or whether the kmaps are a no-op, but cleaned up none > > the less. > > Yes, it does. Thanks!
Thanks for testing! > Acked-by: Geert Uytterhoeven <ge...@linux-m68k.org> Added. Linus, I queued up this patch, it's in for-3.14/core as well. This will offset the inserted/deleted lines by 7/7. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
