All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: "Brown, Len" <len.brown@intel.com>
Cc: "Nikula, Jani" <jani.nikula@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx <intel-gfx@lists.freedesktop.org>,
	"Lu, Han" <han.lu@intel.com>
Subject: Re: Could you merge the tsc patches directly from Len Brown's public repo?
Date: Tue, 26 Apr 2016 19:36:13 +0300	[thread overview]
Message-ID: <20160426163613.GW4329@intel.com> (raw)
In-Reply-To: <1A7043D5F58CCB44A599DFD55ED4C94846A3570C@fmsmsx115.amr.corp.intel.com>

On Tue, Apr 26, 2016 at 06:46:23AM +0000, Brown, Len wrote:
> > On Wed, Apr 20, 2016 at 11:24 AM, Daniel Vetter <daniel.vetter@ffwll.ch>
> > wrote:
> > > On Wed, Apr 20, 2016 at 10:26 AM, Lu, Han <han.lu@intel.com> 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.
> 
> Does the SNB work if you revert this one?:
> 
> commit 540cc882de7d1da2e71591e215f0e04cb89883fa
> Author: Len Brown <len.brown@intel.com>
> Date:   Sun Nov 29 01:21:06 2015 -0500
> 
>     x86 tsc_msr: Extend to include Intel Core Architecture

Yep, that does seem to be the bad apple.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2016-04-26 16:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <B51200AC81AB024499A3C2C9A1BB90A83D3C5FBB@SHSMSX101.ccr.corp.intel.com>
     [not found] ` <87y488oibe.fsf@intel.com>
     [not found]   ` <B51200AC81AB024499A3C2C9A1BB90A83D3C6043@SHSMSX101.ccr.corp.intel.com>
     [not found]     ` <CAKMK7uE4HHO3cgBxNUBqqft_WMgWZ00FAjTRx-Kw82_tQywrXg@mail.gmail.com>
2016-04-20 11:57       ` Could you merge the tsc patches directly from Len Brown's public repo? Daniel Vetter
2016-04-26  6:46         ` Brown, Len
2016-04-26 16:36           ` Ville Syrjälä [this message]
2016-04-27  5:18             ` Lu, Han
2016-04-29  1:38               ` Lu, Han
2016-04-29  1:43                 ` Chen, Yu C
2016-04-29  1:44                   ` Yang, Libin
2016-04-29  5:02                   ` Lu, Han
2016-04-29  9:09                     ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160426163613.GW4329@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=han.lu@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=len.brown@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.