On Mon, Oct 19, 2015 at 08:13:05AM -0700, Greg KH wrote: > On Mon, Oct 19, 2015 at 11:02:35AM +0300, Jani Nikula wrote: > > On Sat, 17 Oct 2015, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > On Mon, Sep 28, 2015 at 10:09:11PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote: > > >> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > >> > > >> commit 58590c14d80defc94e900308a9d8fa55284de6f2 upstream. > > > > > > This is not the commit id of the patch below at all, I can't take this, > > > please be more careful in the future. > > > > Greg, the commit message tries (and apparently fails) to explain that we > > can't really backport all of the commits to fix this properly. > > Yeah, it failed at that, as this isn't the same patch, so please don't > say that in the first line :( I remember I had trouble figuring out what exactly I should put in the commit message. The documentation said I should specify the upsteam commit, and so that's what I did in the end. There wasn't really much extra guidance for cases where you can't simply cherry-pick the upstream commit as is. > > The referenced upstream commit looks totally different because it > > prevents us from entering the failing path to begin with. Since we can't > > do that in stable, Ville was proposing to just the tune down the error > > message, referencing the commit that gets rid of the error message > > upstream. > > Why can't we do that in the stable tree? First we'd probably get to backport most of whatever atomic modeset work that landed in the meantime (and somehow massage that into a shape that doesn't break everything), then we'd get to backport at least one total rewrite of the VLV/CHV watermark code, and finally we might be able to cherry-pick the patch as is. So that's a non-trivial amount of work, and the risk of breaking everything modeset related is very real. Definitely not something I want to put into stable. > I _REALLY_ do not like taking > patches that are different from what is in Linus's tree. It always > burns us in the end, no matter how hard we try to prevent it... > > thanks, > > greg k-h -- Ville Syrjälä Intel OTC -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html