On Fri, Sep 28, 2012 at 02:02:43PM -0700, Greg KH wrote: > On Fri, Sep 28, 2012 at 10:14:37AM +1000, Andrew Worsley wrote: > > Sorry I must have given completely the wrong idea I had > > *NO* suggestion of taking the patches from my attachment. > > It was just to show how I resolved the nominated mainline changes > > to the 3.0.y tree. > > > > Please try this exact order to check out the stable tree and apply the > > changes. > > I just did this and it worked for me. > > > > git co -b fixes-stable-3.0.y remotes/stable/linux-3.0.y > > git cherry-pick be768912a49b10b68e96fbd8fa3cab0adfbd3091 > > git cherry-pick 2bbc6942273b5b3097bd265d82227bdd84b351b2 > > > > * Now this one has a conflict - but is easily resolved: > > git cherry-pick a4ac9fea016fc5c09227eb479bd35e34978323a4 > > > > - Replace the variable realloc_head in mainline patch with add_head > > in 3.0.y stable branch > > (two lines). > > Ok, thanks for this. I'll wait until the next 3.0.y release, as this > one is big enough as it is, for these changes.
I've applied the first patch above, I'll get to the other two after this release, I want to get one out soon, and that second patch looks like it is a bit "big" for a stable release, which I'll deal with later. greg k-h -- 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
