So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with commit 2208d655a91f9879bd9a39ff9df05dd668b3512c Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Nov 14 09:25:29 2014 +0100 drm/i915: drop WaSetupGtModeTdRowDispatch:snb from -fixes. Worse even small changes in -next move around the conflict context so rerere is equally useless. Let's just backmerge and be done with it. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Except for git getting lost no tricky conflicts really.
Showing the changes to include/uapi (6 of 938 files). Show all
Unified · Split
| @@ -125,6 +125,7 @@ header-y += filter.h · 124 unmodified lines | ||
| 125 | 125 | header-y += firewire-cdev.h |
| 126 | 126 | header-y += firewire-constants.h |
| 127 | 127 | header-y += flat.h |
| 128 | +header-y += fou.h | |
| 128 | 129 | header-y += fs.h |
| 129 | 130 | header-y += fsl_hypervisor.h |
| 130 | 131 | header-y += fuse.h |
| @@ -141,6 +142,7 @@ header-y += hid.h · 10 unmodified lines | ||
| 141 | 142 | header-y += hiddev.h |
| 142 | 143 | header-y += hidraw.h |
| 143 | 144 | header-y += hpet.h |
| 145 | +header-y += hsr_netlink.h | |
| 144 | 146 | header-y += hyperv.h |
| 145 | 147 | header-y += hysdn_if.h |
| 146 | 148 | header-y += i2c-dev.h |
| @@ -251,6 +253,7 @@ header-y += mii.h · 104 unmodified lines | ||
| 251 | 253 | header-y += minix_fs.h |
| 252 | 254 | header-y += mman.h |
| 253 | 255 | header-y += mmtimer.h |
| 256 | +header-y += mpls.h | |
| 254 | 257 | header-y += mqueue.h |
| 255 | 258 | header-y += mroute.h |
| 256 | 259 | header-y += mroute6.h |
| @@ -424,6 +427,7 @@ header-y += virtio_net.h · 167 unmodified lines | ||
| 424 | 427 | header-y += virtio_pci.h |
| 425 | 428 | header-y += virtio_ring.h |
| 426 | 429 | header-y += virtio_rng.h |
| 430 | +header=y += vm_sockets.h | |
| 427 | 431 | header-y += vt.h |
| 428 | 432 | header-y += wait.h |
| 429 | 433 | header-y += wanrouter.h |
| @@ -15,6 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include <linux/types.h> |
| 17 | 17 | #include <linux/if_ether.h> |
| 18 | +#include <linux/in6.h> | |
| 18 | 19 | |
| 19 | 20 | #define SYSFS_BRIDGE_ATTR "bridge" |
| 20 | 21 | #define SYSFS_BRIDGE_FDB "brforward" |
| @@ -739,6 +739,13 @@ struct input_keymap_entry { · 738 unmodified lines | ||
| 739 | 739 | #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ |
| 740 | 740 | #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ |
| 741 | 741 | |
| 742 | +#define KEY_KBDINPUTASSIST_PREV 0x260 | |
| 743 | +#define KEY_KBDINPUTASSIST_NEXT 0x261 | |
| 744 | +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 | |
| 745 | +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 | |
| 746 | +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 | |
| 747 | +#define KEY_KBDINPUTASSIST_CANCEL 0x265 | |
| 748 | + | |
| 742 | 749 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 743 | 750 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 744 | 751 | #define BTN_TRIGGER_HAPPY2 0x2c1 |
| @@ -364,7 +364,7 @@ struct perf_event_mmap_page { · 363 unmodified lines | ||
| 364 | 364 | /* |
| 365 | 365 | * Bits needed to read the hw events in user-space. |
| 366 | 366 | * |
| 367 | − * u32 seq, time_mult, time_shift, idx, width; | |
| 367 | + * u32 seq, time_mult, time_shift, index, width; | |
| 368 | 368 | * u64 count, enabled, running; |
| 369 | 369 | * u64 cyc, time_offset; |
| 370 | 370 | * s64 pmc = 0; |
| @@ -383,11 +383,11 @@ struct perf_event_mmap_page { · 12 unmodified lines | ||
| 383 | 383 | * time_shift = pc->time_shift; |
| 384 | 384 | * } |
| 385 | 385 | * |
| 386 | − * idx = pc->index; | |
| 386 | + * index = pc->index; | |
| 387 | 387 | * count = pc->offset; |
| 388 | − * if (pc->cap_usr_rdpmc && idx) { | |
| 388 | + * if (pc->cap_user_rdpmc && index) { | |
| 389 | 389 | * width = pc->pmc_width; |
| 390 | − * pmc = rdpmc(idx - 1); | |
| 390 | + * pmc = rdpmc(index - 1); | |
| 391 | 391 | * } |
| 392 | 392 | * |
| 393 | 393 | * barrier(); |
| @@ -415,7 +415,7 @@ struct perf_event_mmap_page { · 21 unmodified lines | ||
| 415 | 415 | }; |
| 416 | 416 | |
| 417 | 417 | /* |
| 418 | − * If cap_usr_rdpmc this field provides the bit-width of the value | |
| 418 | + * If cap_user_rdpmc this field provides the bit-width of the value | |
| 419 | 419 | * read using the rdpmc() or equivalent instruction. This can be used |
| 420 | 420 | * to sign extend the result like: |
| 421 | 421 | * |
| @@ -439,10 +439,10 @@ struct perf_event_mmap_page { · 17 unmodified lines | ||
| 439 | 439 | * |
| 440 | 440 | * Where time_offset,time_mult,time_shift and cyc are read in the |
| 441 | 441 | * seqcount loop described above. This delta can then be added to |
| 442 | − * enabled and possible running (if idx), improving the scaling: | |
| 442 | + * enabled and possible running (if index), improving the scaling: | |
| 443 | 443 | * |
| 444 | 444 | * enabled += delta; |
| 445 | − * if (idx) | |
| 445 | + * if (index) | |
| 446 | 446 | * running += delta; |
| 447 | 447 | * |
| 448 | 448 | * quot = count / running; |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ |
| 14 | 14 | #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ |
| 15 | 15 | #define CLONE_THREAD 0x00010000 /* Same thread group? */ |
| 16 | −#define CLONE_NEWNS 0x00020000 /* New namespace group? */ | |
| 16 | +#define CLONE_NEWNS 0x00020000 /* New mount namespace group */ | |
| 17 | 17 | #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ |
| 18 | 18 | #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ |
| 19 | 19 | #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ |
| @@ -21,8 +21,17 @@ · 20 unmodified lines | ||
| 21 | 21 | #ifndef _V4L2_DV_TIMINGS_H |
| 22 | 22 | #define _V4L2_DV_TIMINGS_H |
| 23 | 23 | |
| 24 | +#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6)) | |
| 25 | +/* Sadly gcc versions older than 4.6 have a bug in how they initialize | |
| 26 | + anonymous unions where they require additional curly brackets. | |
| 27 | + This violates the C1x standard. This workaround adds the curly brackets | |
| 28 | + if needed. */ | |
| 24 | 29 | #define V4L2_INIT_BT_TIMINGS(_width, args...) \ |
| 25 | 30 | { .bt = { _width , ## args } } |
| 31 | +#else | |
| 32 | +#define V4L2_INIT_BT_TIMINGS(_width, args...) \ | |
| 33 | + .bt = { _width , ## args } | |
| 34 | +#endif | |
| 26 | 35 | |
| 27 | 36 | /* CEA-861-E timings (i.e. standard HDTV timings) */ |
| 28 | 37 | |