Dave Airlie 8c86394470
Merge tag 'v3.18' into drm-next ...
Linux 3.18
Backmerge Linus tree into -next as we had conflicts in i915/radeon/nouveau,
and everyone was solving them individually.
* tag 'v3.18': (57 commits)
Linux 3.18
watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
uapi: fix to export linux/vm_sockets.h
i2c: cadence: Set the hardware time-out register to maximum value
i2c: davinci: generate STP always when NACK is received
ahci: disable MSI on SAMSUNG 0xa800 SSD
context_tracking: Restore previous state in schedule_user
slab: fix nodeid bounds check for non-contiguous node IDs
lib/genalloc.c: export devm_gen_pool_create() for modules
mm: fix anon_vma_clone() error treatment
mm: fix swapoff hang after page migration and fork
fat: fix oops on corrupted vfat fs
ipc/sem.c: fully initialize sem_array before making it visible
drivers/input/evdev.c: don't kfree() a vmalloc address
cxgb4: Fill in supported link mode for SFP modules
xen-netfront: Remove BUGs on paged skb data which crosses a page boundary
mm/vmpressure.c: fix race in vmpressure_work_fn()
mm: frontswap: invalidate expired data on a dup-store failure
mm: do not overwrite reserved pages counter at show_mem()
drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
...
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/radeon/radeon_cs.c
2014-12-08 10:33:52 +10:00
2013-04-23 13:25:51 -04:00
2014-07-15 09:34:19 +02:00
2013-09-08 14:34:22 -05:00
2013-04-08 06:53:15 -03:00
2014-09-23 23:15:46 -07:00
2014-10-07 20:16:31 +02:00
2014-08-20 15:13:08 +02:00
2014-06-25 19:28:43 +02:00
2014-06-25 19:28:43 +02:00
2013-04-02 12:25:57 +02:00
2014-08-18 15:12:14 -04:00
2014-10-14 13:08:29 +11:00
2014-02-27 13:51:29 +09:00
2014-01-16 17:24:11 -08:00
2014-09-16 09:58:21 -05:00
2013-08-02 12:33:54 -07:00
2014-01-07 13:50:28 +01:00
2014-10-19 16:25:56 -07:00
2013-04-26 16:08:16 +10:00
2014-01-08 13:05:13 -08:00
2013-07-01 15:10:53 +02:00
2014-10-14 16:06:45 -04:00
2014-10-14 16:06:45 -04:00
2014-07-01 10:48:05 -06:00
2014-06-28 13:48:44 -07:00
2014-05-19 09:38:24 +02:00
2014-04-22 21:42:27 -04:00
2014-03-20 14:55:18 +01:00
2013-08-28 19:26:38 -07:00
2013-06-25 15:50:04 -07:00
2014-07-30 17:21:05 -07:00
2014-10-05 20:03:35 -04:00
2014-01-21 23:46:27 -05:00
2014-01-23 16:36:55 -08:00
2013-08-20 16:53:58 -05:00
2014-09-26 14:53:23 -04:00
2014-10-09 09:14:13 +02:00
2014-08-05 16:35:54 -07:00
2014-10-06 01:04:16 -04:00
2013-12-03 15:35:52 +01:00
2014-03-13 19:07:42 +11:00
2014-08-08 15:57:31 -07:00
2014-01-17 11:12:06 +01:00
2013-08-03 10:40:23 -07:00
2013-08-16 22:05:14 -04:00
2014-10-14 16:06:45 -04:00
2013-07-27 20:24:36 +02:00
2014-10-03 16:53:33 -07:00
2014-10-24 00:14:37 +02:00
2014-07-22 16:37:43 +02:00
2013-06-11 02:51:03 -07:00
2013-11-28 18:26:30 -05:00
2014-05-14 10:04:34 +01:00
2013-10-25 17:14:03 -04:00
2013-11-03 23:20:14 -05:00
2014-09-23 23:31:21 -07:00
2014-07-09 16:41:36 -07:00
2013-09-03 22:11:44 -04:00
2014-01-15 17:00:40 -08:00
2013-12-11 12:57:55 -08:00
2013-10-03 15:36:38 -04:00
2014-11-05 17:13:34 -05:00
2013-05-08 13:13:30 -07:00
2014-08-27 22:59:39 -07:00
2014-04-27 19:08:06 -04:00
2014-09-29 15:37:01 -04:00
2014-07-29 11:39:50 -07:00
2013-08-13 15:10:22 -07:00
2013-08-21 12:21:45 -07:00
2014-10-03 16:53:33 -07:00
2014-02-27 15:59:09 -05:00
2014-08-06 15:25:01 -07:00
2014-02-26 15:51:00 -05:00
2014-09-29 00:13:10 -04:00
2014-10-20 21:03:58 +02:00
2014-09-16 09:03:33 +09:00
2013-08-26 16:37:08 -04:00
2014-07-01 12:16:24 -07:00
2014-12-04 15:28:40 -08:00
2014-10-09 22:26:01 -04:00
2014-08-08 15:57:32 -07:00
2013-09-24 10:35:19 +01:00
2014-07-16 15:55:29 +03:00
2014-05-30 21:01:11 +02:00
2014-09-17 13:10:08 +02:00
2014-05-23 16:28:53 -04:00
2014-04-03 16:21:06 -07:00
2013-11-11 21:56:51 -05:00
2013-11-06 23:32:59 -08:00
2013-12-04 14:59:20 -02:00
2014-08-08 15:57:31 -07:00
2013-11-27 11:03:38 -08:00
2014-02-07 15:30:34 -08:00
2014-03-04 13:51:06 -05:00
2014-01-20 14:45:33 -08:00
2013-07-09 10:33:25 -07:00
2014-01-20 14:44:50 -08:00
2014-06-02 17:58:55 -07:00
2014-08-05 16:35:54 -07:00
2013-12-22 18:02:43 -05:00
2014-07-15 16:12:01 -07:00
2014-01-07 23:57:25 +01:00
2013-11-28 18:16:43 -05:00
2013-04-19 14:57:57 -04:00
2014-05-20 00:06:04 +02:00
2014-01-23 16:36:55 -08:00
2013-10-28 15:37:56 -04:00
2014-09-11 13:37:02 +02:00
2014-06-13 10:53:49 -04:00
2014-10-06 00:32:21 -04:00
2013-11-28 18:16:43 -05:00
2014-10-01 12:30:58 -06:00
2014-10-28 10:51:02 +01:00
2014-02-17 07:18:19 +01:00
2013-10-29 17:33:17 -04:00
2014-01-06 15:13:01 -05:00
2014-01-23 16:36:55 -08:00
2014-10-09 22:25:55 -04:00
2014-04-30 04:18:57 -07:00
2014-03-21 14:21:13 -04:00
2013-07-03 16:08:01 -07:00
2014-08-05 16:41:22 -04:00
2013-07-25 19:30:03 +10:00
2014-01-20 14:44:17 -08:00
2013-04-12 16:54:38 +02:00
2013-06-19 23:06:51 -07:00
2014-10-28 10:46:08 +01:00
2014-07-16 14:40:04 -07:00
2014-07-18 12:13:40 -07:00
2014-09-08 16:12:40 -07:00
2014-07-17 18:23:35 -07:00
2014-07-20 14:33:23 -07:00
2014-06-06 16:08:14 -07:00
2014-08-21 15:25:11 -05:00
2014-03-03 15:58:03 -05:00
2013-11-19 19:07:21 +00:00
2014-07-01 12:16:24 -07:00
2014-10-03 11:15:20 -07:00
2014-02-26 17:08:40 -05:00
2014-02-14 16:09:43 -05:00
2014-01-20 14:44:05 -08:00
2014-06-25 18:03:41 -07:00
2014-04-26 12:13:24 -04:00
2014-05-23 16:28:53 -04:00
2014-08-25 03:28:08 -05:00
2014-07-21 14:30:42 -07:00
2013-11-28 18:16:43 -05:00
2014-03-04 15:38:05 -08:00
2014-08-25 10:40:06 -07:00
2014-04-16 18:20:02 -03:00
2014-09-21 20:23:39 -03:00
2014-10-24 08:58:09 -02:00
2014-05-13 13:48:29 -03:00
2014-05-25 12:47:55 -03:00
2014-09-29 10:06:19 -06:00
2013-05-02 13:40:15 +03:00
2014-09-21 20:28:32 -03:00
2013-04-02 16:42:58 +10:30
2014-07-01 10:51:01 -06:00
2013-07-09 10:47:45 +09:30
2013-07-03 13:09:06 -07:00
2013-08-02 12:33:54 -07:00
2013-05-20 12:08:09 +09:30
2013-12-11 09:25:20 -02:00
2014-10-02 14:23:14 -04:00
2014-08-29 16:28:16 -07:00
2014-09-02 13:37:56 +02:00
2013-11-26 11:09:08 +01:00
2013-11-26 11:09:09 +01:00
8c86394470