On Wed, Apr 20, 2016 at 11:24 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > On Wed, Apr 20, 2016 at 10:26 AM, Lu, Han <han.lu@xxxxxxxxx> wrote: >> Hi Jani, >> >> Please find the repo and commit id below: >> Repo: https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git >> Branch: x86 >> Commit id (begin from earliest): >> 6e0c25e64e0fb65a42dfc63ad5f660302e07cd87 >> 16caa2834b2f08cdfd130baa490c45822edef256 >> ce5c7b5eaad93c7b0043a7509eec319fe0a0e8a0 >> ca376a9909f1151484854c46dc7f01be6d6d9bdb >> 4a62ba36cf4fb77ea35dee1f5992e0e7c48dad14 >> 540cc882de7d1da2e71591e215f0e04cb89883fa >> 433f82c8ab3fcaa7ff3b852d01cc74dbdf6d94f1 >> 65ae86d4fa3473d24445ea402b190e4b4342172e >> 3152b94afb8c27595f9b1bfa67885015cb569ba2 >> >> I have one silly question: if I understand correctly, these patches will be merged into a separate branch and drm-nightly both. After a few weeks, will there be conflicts when merging from upstream to drm-nightly, as both upstream and drm-nightly contain tsc patches? > > All cherry-picked to topic/core-for-CI, pls double-check it's all > there (scripts will take another 5 minutes or so to push it all out > and rebuild drm-intel-nightly with those patches). Dropped them again because they hard-hang Ville's sandybridge on boot-up. Adding Ville and Len and mailing lists. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
