On Fri, Aug 17, 2012 at 3:22 PM, Greg KH <[email protected]> wrote: > On Fri, Aug 17, 2012 at 09:18:44AM +0200, Daniel Vetter wrote: >> On Fri, Aug 17, 2012 at 1:18 AM, Greg KH <[email protected]> wrote: >> > On Tue, Aug 14, 2012 at 01:50:11AM -0400, Gregs git-bot wrote: >> >> commit: 5ab3633d6907018b0b830a720e877c3884d679c3 >> >> From: Hunt Xu <[email protected]> >> >> Date: Sun, 1 Jul 2012 03:45:07 +0000 >> >> Subject: drm/i915: make rc6 in sysfs functions conditional >> >> >> >> Commit 0136db586c028f71e7cc21cc183064ff0d5919c8 merges rc6 information >> >> into the power group. However, when compiled with CONFIG_PM not set, >> >> modprobing i915 would taint since power_group_name is defined as NULL. >> >> >> >> This patch makes these rc6 in sysfs functions conditional upon the >> >> definition of the CONFIG_PM macro to avoid the above-mentioned problem. >> >> >> >> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45181 >> >> Cc: [email protected] >> >> Tested-by: Kris Karas <[email protected]> >> >> Signed-off-by: Hunt Xu <[email protected]> >> >> Signed-off-by: Daniel Vetter <[email protected]> >> >> --- >> >> drivers/gpu/drm/i915/i915_sysfs.c | 12 ++++++++++++ >> >> 1 files changed, 12 insertions(+), 0 deletions(-) >> > >> > As commit 0136db586c028f71e7cc21cc183064ff0d5919c8 only first showed up >> > in 3.6-rc1, is this patch still needed for the stable tree(s)? >> >> >> My git tag --contains claims it's in 3.5 already. > > Really? > > $ git describe --contains 0136db586c028f71e7cc21cc183064ff0d5919c8 > v3.6-rc1~59^2~56^2~76 > > Do you see something else?
tbh I don't quite follow what git describe --contains does (it references a private tag in my drm-intel tree), but here on my system (deleting some private tags) I get $ git tag --contains 0136db586c028f71e7cc21 v3.5 v3.5-rc1 v3.5-rc2 v3.5-rc3 v3.5-rc4 v3.5-rc5 v3.5-rc6 v3.5-rc7 v3.5.1 v3.6-rc1 v3.6-rc2 So I've concluded it's in 3.5. Note that I run the drm-intel-next tree right through the merge-window, which means that -next heading for 3.x is sometimes based on 3.(x-2)-rcY (instead of the more usual 3.(x-1)-rc1), maybe that confuses git describe a bit. Cheers, Daniel -- Daniel Vetter [email protected] - +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
