Merge tag 'v4.13-rc7' into mtd/next

Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 892148c448cc..5216d2eb2289 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -681,10 +681,10 @@ struct nand_buffers {
  * @tWW_min: WP# transition to WE# low
  */
 struct nand_sdr_timings {
-        u32 tBERS_max;
+        u64 tBERS_max;
         u32 tCCS_min;
-        u32 tPROG_max;
-        u32 tR_max;
+        u64 tPROG_max;
+        u64 tR_max;
         u32 tALH_min;
         u32 tADL_min;
         u32 tALS_min;