From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Apr 2010 18:50:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f4084209adc77f9a1c9f38db3019a509e167882;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.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: (34 commits)
  cfq-iosched: Fix the incorrect timeslice accounting with forced_dispatch
  loop: Update mtime when writing using aops
  block: expose the statistics in blkio.time and blkio.sectors for the root cgroup
  backing-dev: Handle class_create() failure
  Block: Fix block/elevator.c elevator_get() off-by-one error
  drbd: lc_element_by_index() never returns NULL
  cciss: unlock on error path
  cfq-iosched: Do not merge queues of BE and IDLE classes
  cfq-iosched: Add additional blktrace log messages in CFQ for easier debugging
  i2o: Remove the dangerous kobj_to_i2o_device macro
  block: remove 16 bytes of padding from struct request on 64bits
  cfq-iosched: fix a kbuild regression
  block: make CONFIG_BLK_CGROUP visible
  Remove GENHD_FL_DRIVERFS
  block: Export max number of segments and max segment size in sysfs
  block: Finalize conversion of block limits functions
  block: Fix overrun in lcm() and move it to lib
  vfs: improve writeback_inodes_wb()
  paride: fix off-by-one test
  drbd: fix al-to-on-disk-bitmap for 4k logical_block_size
  ...
---

2f4084209adc77f9a1c9f38db3019a509e167882
diff --cc block/blk-settings.c
index d9a9db5f0a2b,4c4700dca56a..f5ed5a1187ba
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -8,8 -8,8 +8,9 @@@
  #include <linux/blkdev.h>
  #include <linux/bootmem.h>	/* for max_pfn/max_low_pfn */
  #include <linux/gcd.h>
+ #include <linux/lcm.h>
  #include <linux/jiffies.h>
 +#include <linux/gfp.h>
  
  #include "blk.h"