From: Linus Torvalds Date: Wed, 28 Apr 2010 14:56:05 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: firefly_0821_release~9833^2~2262 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=970b06485ffee36aa3549dfe4c6b2a2c2118354d;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: coda: move backing-dev.h kernel include inside __KERNEL__ mtd: ensure that bdi entries are properly initialized and registered Move mtd_bdi_*mappable to mtdcore.c btrfs: convert to using bdi_setup_and_register() Catch filesystems lacking s_bdi drbd: Terminate a connection early if sending the protocol fails drbd: fix memory leak Fix JFFS2 sync silent failure smbfs: add bdi backing to mount session ncpfs: add bdi backing to mount session exofs: add bdi backing to mount session ecryptfs: add bdi backing to mount session coda: add bdi backing to mount session cifs: add bdi backing to mount session afs: add bdi backing to mount session. 9p: add bdi backing to mount session bdi: add helper function for doing init and register of a bdi for a file system block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer --- 970b06485ffee36aa3549dfe4c6b2a2c2118354d