On 2014/6/5 8:00, Greg KH wrote: > On Tue, Apr 15, 2014 at 07:51:14PM +0800, Qiang Huang wrote: >> Hi Greg, >> >> We've started to analyze the list of upstream commits that have been >> backported to 3.2 but missing from 3.4. >> >> For the 16 commits that I've analyzed, >> - 1 commit only did comments modification and it is marked for >> stable 3.5+, so we just ignore it. [1] >> - 2 commits are commit-revert pairs. >> - 2 commits were not marked for stable, but they are obviously bugfixes. [2] >> - 1 commit was marked for stable 3.6+, but I think it fits 3.4, and >> both 3.2.x and 3.5.x have merged this patch. [3] >> - 9 commits were marked for stable but can't be applied cleanly to 3.4. >> - 1 commits was marked for stable and can be applied cleanly to 3.4, >> it is obviously bug fix, don't know why it was missed. [4] >> >> Please cherry-pick those commits from 3.2.x: >> 04ed02cc7d43 UBI: erase free PEB with bitflip in EC header >> 0c53cadfdcd9 Input: synaptics - adjust threshold for treating position values as negative >> 5b4478f5dabb floppy: properly handle failure on add_disk loop >> 499f98ab5a0b MISC: hpilo, remove pci_disable_device >> 850722ddad9d i82975x_edac: Fix dimm label initialization >> 29abfe4ddc74 i915: ensure that VGA plane is disabled >> 31980f8fa9e5 regulator: max8997: Use uV in voltage_map_desc >> e8d9897ff064 regulator: max8998: Ensure enough delay time for max8998_set_voltage_buck_time_sel >> 24d64ff793d8 intel_idle: Don't register CPU notifier if we are not running. >> 61869db60d56 can: c_can: Set reserved bit in IFx_MASK2 to 1 on write > > Those all worked fine, but: > >> Please cherry-pick this commit form mainline: >> d821a4c4d11a e1000e: DoS while TSO enabled caused by link partner with small MSS > > This didn't apply cleanly. I fixed it up, it wasn't a big deal, but I > wonder how it made it through your testing? Thanks Greg, Sorry for the trouble, but it did applied cleanly and tested fine in by box, maybe it's a git and my box related issue, I met once before but didn't figure out why, next time if you can't apply but I can, I'll try it again in a new and clean box. :) > >> There are 2 other commits that need trivial context adjustments. I'll send out >> the backport. > > I'll go apply those now, thanks. > > greg k-h > > . > -- 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