)]}' { "log": [ { "commit": "a5149bf3fed59b94207809704b5d06fec337a771", "tree": "7a2f0297d35c962040bdd90981376c4b41c40c0f", "parents": [ "3ff8f932bce11fc89e435acb30263a06cb8bd084", "b61c37f57988567c84359645f8202a7c84bc798a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:11:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:11:24 2012 -0700" }, "message": "Merge branch \u0027selinux\u0027 (\"struct common_audit_data\" sanitizer)\n\nMerge common_audit_data cleanup patches from Eric Paris.\n\nThis is really too late, but it\u0027s a long-overdue cleanup of the costly\nwrapper functions for the security layer.\n\nThe \"struct common_audit_data\" is used all over in critical paths,\nallocated and initialized on the stack. And used to be much too large,\ncausing not only unnecessarily big stack frames but the clearing of the\n(mostly useless) data was also very visible in profiles.\n\nAs a particular example, in one microbenchmark for just doing \"stat()\"\nover files a lot, selinux_inode_permission() used 7% of the CPU time.\nThat\u0027s despite the fact that it doesn\u0027t actually *do* anything: it is\njust a helper wrapper function in the selinux security layer.\n\nThis patch-series shrinks \"struct common_audit_data\" sufficiently that\ncode generation for these kinds of wrapper functions is improved\nnoticeably, and we spend much less time just initializing data that we\nwill never use.\n\nThe functions still get called all the time, and it still shows up at\n3.5+% in my microbenchmark, but it\u0027s quite a bit lower down the list,\nand much less noticeable.\n\n* Emailed patches from Eric Paris \u003ceparis@redhat.com\u003e:\n lsm_audit: don\u0027t specify the audit pre/post callbacks in \u0027struct common_audit_data\u0027\n SELinux: do not allocate stack space for AVC data unless needed\n SELinux: remove avd from slow_avc_audit()\n SELinux: remove avd from selinux_audit_data\n LSM: shrink the common_audit_data data union\n LSM: shrink sizeof LSM specific portion of common_audit_data\n" }, { "commit": "3ff8f932bce11fc89e435acb30263a06cb8bd084", "tree": "690ae19fd4f6f24da48cedf926f56a3996dfc68a", "parents": [ "4a1e8ebc5e5918079109cc1cd1c44c2f0fd0e11b", "4b4e9e43fd210e0cd2a5d29357e7c000e13e08ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:10:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:10:14 2012 -0700" }, "message": "Merge tag \u0027regmap-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull a single regmap fix from Mark Brown:\n \"A simple bug that\u0027s been lurking for a while but not terribly visible\n since a high proportion of chips have no register 0 so the normal\n failure is that we end up doing a bit of extra I/O.\"\n\n* tag \u0027regmap-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n regmap: rbtree: Fix register default look-up in sync\n" }, { "commit": "4a1e8ebc5e5918079109cc1cd1c44c2f0fd0e11b", "tree": "3fcdeb8579c47735d82f44306282d7af2140a102", "parents": [ "66cfb32772495068fbb5627b2dc88649ad66c3e5", "d49fe3c4cd22965de7422dd81d46110fc3d4deef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:09:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:09:30 2012 -0700" }, "message": "Merge tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator fixes from Mark Brown:\n \"A bunch of smallish fixes that came up during the merge window as\n things got more testing - even more fixes from Axel, a fix for error\n handling in more complex systems using -EPROBE_DEFER and a couple of\n small fixes for the new dummy regulators.\"\n\n* tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: Remove non-existent parameter from fixed-helper.c kernel doc\n regulator: Fix setting new voltage in s5m8767_set_voltage\n regulator: fix sysfs name collision between dummy and fixed dummy regulator\n regulator: Fix deadlock on removal of regulators with supplies\n regulator: Fix comments in include/linux/regulator/machine.h\n regulator: Only update [LDOx|DCx]_HIB_MODE bits in wm8350_[ldo|dcdc]_set_suspend_disable\n regulator: Fix setting low power mode for wm831x aldo\n regulator: Return microamps in wm8350_isink_get_current\n regulator: wm8350: Fix the logic to choose best current limit setting\n regulator: wm831x-isink: Fix the logic to choose best current limit setting\n regulator: wm831x-dcdc: Fix the logic to choose best current limit setting\n regulator: anatop: patching to device-tree property \"reg\".\n regulator: Do proper shift to set correct bit for DC[2|5]_HIB_MODE setting\n regulator: Fix restoring pmic.dcdcx_hib_mode settings in wm8350_dcdc_set_suspend_enable\n regulator: Fix unbalanced lock/unlock in mc13892_regulator_probe error path\n regulator: Fix set and get current limit for wm831x_buckv\n regulator: tps6586x: Fix list minimal voltage setting for LDO0\n" }, { "commit": "66cfb32772495068fbb5627b2dc88649ad66c3e5", "tree": "4ce3537afdbd9be92a7a3e6ef4e8e8519ee11543", "parents": [ "6742259866d03d5bc19815441ba928e8378343dc", "7b8e6da46b921d30ac1553cac56d8fb74f0b431d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:04:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:04:42 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar.\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf/x86/p4: Add format attributes\n tracing, sched, vfs: Fix \u0027old_pid\u0027 usage in trace_sched_process_exec()\n" }, { "commit": "6742259866d03d5bc19815441ba928e8378343dc", "tree": "3450a2e7c22777ca5ca4cb4944c4b2ed1f218805", "parents": [ "20d9d9a0544436b1b8c94689c01d746d6bd5525c", "dba69d1092e291e257fb5673a3ad0e4c87878ebc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:04:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 10:04:01 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Ingo Molnar.\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, kvm: Call restore_sched_clock_state() only after %gs is initialized\n x86: Use -mno-avx when available\n x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility\n x86: Preserve lazy irq disable semantics in fixup_irqs()\n" }, { "commit": "20d9d9a0544436b1b8c94689c01d746d6bd5525c", "tree": "3a6db09d7855c77b1bc70d46fa6263ffaeef10c1", "parents": [ "7114a72ff850ac6f8f5336c510a5a874c9eadf42", "e16de9137c8beab02d78fb4fa82bb96e9f3d0ac3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 09:03:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 09:03:41 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon patches from Guenter Roeck:\n - Fix crash in ad7314 driver\n - Add support for AMD Trinity CPUs to k10temp driver\n - Fix __initdata/__initconst mixup in w83627ehf driver\n - Fix runtime warnings in acpi_power_meter and max6639 drivers\n - Fix build warnings in adm1031, f75375s, sht15, and gpio-fan drivers\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (ad7314) Adds missing spi_dev initialization\n hwmon: (k10temp) Add support for AMD Trinity CPUs\n hwmon: (w83627ehf) mark const init data with __initconst instead of __initdata\n hwmon: (acpi_power_meter) fix lockdep spew due to non-static lock class\n hwmon: (adm1031) Fix compiler warning\n hwmon: (f75375s) Fix warning message seen in some configurations\n hwmon: (max6639) Convert to dev_pm_ops\n hwmon: (sht15) Fix Kconfig dependencies\n hwmon: (gpio-fan) Fix Kconfig dependencies\n" }, { "commit": "7114a72ff850ac6f8f5336c510a5a874c9eadf42", "tree": "90a35cd4006db3ef713e9ff0160fdc0bb3fd5ff2", "parents": [ "36bbffc0d55fbb7ab2c2de2613e3bbb0a6749b9b", "ec3e82d6dc46cac7309b01ff9761f469b0263019" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 09:02:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 09:02:38 2012 -0700" }, "message": "Merge tag \u0027mce-fix-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\nPull MCE fixlet from Borislav Petkov:\n \"One fix which makes MCE decoding much more \"liberal\" wrt families.\"\n\n* tag \u0027mce-fix-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n MCE, AMD: Drop too granulary family model checks\n" }, { "commit": "36bbffc0d55fbb7ab2c2de2613e3bbb0a6749b9b", "tree": "c3091d2eb5cc6f451ce0fcee6bfb2fed63db56e9", "parents": [ "20a2a811602b16c42ce88bada3d52712cdfb988b", "5020ad7d143ccfcf8149974096220d59e5572120" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:31:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:31:06 2012 -0700" }, "message": "Merge tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md\n\nPull assorted md fixes from Neil Brown:\n - some RAID levels didn\u0027t clear up properly if md_integrity_register\n failed\n - a \u0027check\u0027 of RAID5/RAID6 doesn\u0027t actually read any data since a\n recent patch - so fix that (and mark for -stable)\n - a couple of other minor bugs.\n\n* tag \u0027md-3.4-fixes\u0027 of git://neil.brown.name/md:\n md/raid1,raid10: don\u0027t compare excess byte during consistency check.\n md/raid5: Fix a bug about judging if the operation is syncing or replacing\n md/raid1:Remove unnecessary rcu_dereference(conf-\u003emirrors[i].rdev).\n md: Avoid OOPS when reshaping raid1 to raid0\n md/raid5: fix handling of bad blocks during recovery.\n md/raid1: If md_integrity_register() failed,run() must free the mem\n md/raid0: If md_integrity_register() fails, raid0_run() must free the mem.\n md/linear: If md_integrity_register() fails, linear_run() must free the mem.\n" }, { "commit": "20a2a811602b16c42ce88bada3d52712cdfb988b", "tree": "f2a30a383c47336b0352ed473abafc0cdca4ca2c", "parents": [ "a92bc5a65ce966ccc49bc8e37c6714c0b4042818", "6d008893e45ad5957a9a31afa00c4c6582504fe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:25:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:25:23 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Nothing too big here, just small fixes.\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)\n ARM: fix bios32.c build warning\n ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms\n ARM: fix missing bug.h include in arch/arm/kernel/insn.c\n ARM: sa11x0: fix build errors from DMA engine API updates\n" }, { "commit": "a92bc5a65ce966ccc49bc8e37c6714c0b4042818", "tree": "86df7b619b654a0ded4cfa0b37f8a0b57b674f96", "parents": [ "167d82152079debd0a76726972a76ea032d82043", "ca6f327dfdc6b3b90aa0c5247182ae023dce6450" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:24:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:24:21 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull Sparc fixes from David Miller:\n \"One build regression and one serial probe regression fix on sparc.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n serial/sunzilog: fix keyboard on SUN SPARCstation\n sparc: pgtable_64: change include order\n" }, { "commit": "167d82152079debd0a76726972a76ea032d82043", "tree": "076a9d27a89e6540692bbcabc5b9f600cbbe1856", "parents": [ "f3718a818f7fb3636130d5f34bde8df34f45c5e5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Apr 03 19:14:04 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:23:44 2012 -0700" }, "message": "avr32: fix nop compile fails from system.h split up\n\nTo fix:\n\n In file included from kernel/exit.c:61:\n arch/avr32/include/asm/mmu_context.h: In function \u0027enable_mmu\u0027:\n arch/avr32/include/asm/mmu_context.h:135: error: implicit declaration of function \u0027nop\u0027\n\nIt needs an include of the new file created in commit ae4739465866\n(\"Disintegrate asm/system.h for AVR32\"), but since that file only\ncontains \"nop\", and since other arch already have precedent of putting\nnop in asm/barrier.h we should just delete the new file and put nop in\nbarrier.h\n\nSuggested-and-acked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3718a818f7fb3636130d5f34bde8df34f45c5e5", "tree": "1fafcb0f15ac4c6d964aa9b8e70527ac479df624", "parents": [ "01627d968c8b5e2810fe8c417b406b968297c236" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:16:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:16:25 2012 -0700" }, "message": "Revert \"nouveau/bios: Fix tracking of BIOS image data\"\n\nThis reverts commit d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1.\n\nIt turns out to trigger the \"BUG_ON(!PageCompound(page))\" in kfree(),\napparently because the code ends up trying to free somethng that was\nnever kmalloced in the first place.\n\nBenH points out that the patch was untested and wasn\u0027t meant to go into\nthe upstream kernel that quickly in the first place.\n\nBacktrace:\n bios_shadow\n bios_shadow_prom\n nv_mask\n init_io\n bios_shadow\n nouveau_bios_init\n NVReadVgaCrtc\n NVSetOwner\n nouveau_card_init\n nouveau_load\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nRequested-by: Dave Airlie \u003cairlied@gmail.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec3e82d6dc46cac7309b01ff9761f469b0263019", "tree": "00d13c865b9f7c58c0b097ca7543f01b907bf67d", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Wed Apr 04 14:21:02 2012 +0200" }, "committer": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Wed Apr 04 15:50:11 2012 +0200" }, "message": "MCE, AMD: Drop too granulary family model checks\n\nMCA details seldom change inbetween the models of a family so don\u0027t\nbe too conservative and enable decoding on everything starting from\nK8 onwards. Minor adjustments can come in later but most importantly,\nwe have some decoding infrastructure in place for upcoming models by\ndefault.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "ca6f327dfdc6b3b90aa0c5247182ae023dce6450", "tree": "873fe868515b33454c9aa84d76503d563590aff4", "parents": [ "2533e824153b51bda27fe41ed1a5512047f42707" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Wed Apr 04 09:35:06 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 00:37:10 2012 -0700" }, "message": "serial/sunzilog: fix keyboard on SUN SPARCstation\n\nThe keyboard on my SUN SPARCstation 5 no longer worked.\n\n The culprint was: d4e33fac2408d37f7b52e80ca2a89f9fb482914f\n (\"serial: Kill off NO_IRQ\")\n\nFix up logic for no irq / irq so the keyboard works again.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e16de9137c8beab02d78fb4fa82bb96e9f3d0ac3", "tree": "cbb7b2c9ab82934c0980f7d4a7ce471c50d4405f", "parents": [ "fbc729a446f7d80ec8b73fe90d8c0cc3e95ad277" ], "author": { "name": "Graeme Smecher", "email": "gsmecher@threespeedlogic.com", "time": "Tue Apr 03 19:42:21 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue Apr 03 17:08:28 2012 -0700" }, "message": "hwmon: (ad7314) Adds missing spi_dev initialization\n\nThis driver was recently moved from IIO (where it worked) to hwmon (where\nit doesn\u0027t.) This breakage occured because the hwmon version neglected to\ncorrectly initialize a reference to spi_dev in its drvdata. The result is a\nsegfault every time the temperature is queried.\n\nSigned-off-by: Graeme Smecher \u003cgsmecher@threespeedlogic.com\u003e\nCc: stable@vger.kernel.org # 3.2+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "01627d968c8b5e2810fe8c417b406b968297c236", "tree": "e49077d45d6998adee302f142f7d54e472c81bc3", "parents": [ "e1a7eb08ee097e97e928062a242b0de5b2599a11", "e37acc0f5ea18ff1ea4db96a84a51b90044c0dbd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:13:34 2012 -0700" }, "message": "Merge branch \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm update from Dave Airlie:\n \"This pull just contains a forward of the Intel fixes from Daniel.\n\n The only annoyance is the RC6 enable, which really should have made\n -next, but since Ubuntu are shipping it I reckon its getting a good\n testing now by the time 3.4 comes out.\n\n The pull from Daniel contains his pull message to me:\n\n \"A few patches for 3.4, major part is 3 regression fixes:\n - ppgtt broke hibernate on snb/ivb. Somehow our QA claims that it\n still works, which is why this has not been caught earlier.\n - ppgtt flails in combination with dmar. I kinda expected this one :(\n - fence handling bugfix for gen2/3. Iirc this one is about a year\n old, fix curtesy Chris Wilson. I\u0027ve created an shockingly simple\n i-g-t test to catch this in the future.\"\n\n Wrt regressions I\u0027ve just got a report that gmbus (newly enabled\n again in 3.4) is a bit noisy. I\u0027m looking into this atm.\n\n Also included are the rc6 enable patches for snb from Eugeni. I\n wanted to include these in the main 3.4 pull but screwed it up.\n Please hit me. Imo these kind of patches really should go in\n before -rc1, but in thise case rc6 has brought us tons of press and\n guinea pigs^W^W testers and ubuntu is already running with it. So\n I estimate a pretty small chance for this to blow up.\n\n And some smaller things:\n - two minor locking snafus\n - server gt2 ivb pciid\n - 2 patches to sanitize the register state left behind by the bios\n some more\n - 2 new quirk entries\n - cs readback trick against missed IRQs from ivb also enabled on snb\n - sprite fix from Jesse\"\n\nLet\u0027s see if the \"enable RC6 on sandybridge\" finally works and sticks.\nI\u0027ve been enabling it by hand (i915.i915_enable_rc6\u003d1) for several\nmonths on my Macbook Air, and it definitely makes a difference (and has\nworked for me). But every time we enabled it before it showed some odd\nhw buglet for *somebody*.\n\nThis time it\u0027s all good, I\u0027m sure.\n\n* \u0027drm-fixes-intel\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n drm/i915: no-lvds quirk on MSI DC500\n drm/i915: Add lock on drm_helper_resume_force_mode\n drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n drm/i915: disable ppgtt on snb when dmar is enabled\n drm/i915: add Ivy Bridge GT2 Server entries\n drm/i915: properly clear SSC1 bit in the pch refclock init code\n drm/i915: apply CS reg readback trick against missed IRQ on snb\n drm/i915: quirk away broken OpRegion VBT\n drm/i915: enable plain RC6 on Sandy Bridge by default\n drm/i915: allow to select rc6 modes via kernel parameter\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n drm/i915: properly restore the ppgtt page directory on resume\n drm/i915: Sanitize BIOS debugging bits from PIPECONF\n" }, { "commit": "e1a7eb08ee097e97e928062a242b0de5b2599a11", "tree": "2e94ca0bd2ac5a53a4a7234b2f1b5f98f669cca8", "parents": [ "464662b91614188b4af9df51baaa0d6b3d89a15f", "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:21 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mainly nouveau fixes, one for a regressions in -rc1, fixes for booting\n on a ppc G5, and a Kconfig fix. Two radeon fixes, one oops, one s/r\n fix. One udl mmap fix. And one core drm fix to stop bad fbdev apps\n overwriting bits of ram.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: Validate requested virtual size against allocated fb size\n drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n mm, drm/udl: fixup vma flags on mmap\n drm/radeon/kms: fix fans after resume\n nouveau/bios: Fix tracking of BIOS image data\n nouveau: Fix crash when pci_ram_rom() returns a size of 0\n drm/nouveau: select POWER_SUPPLY\n drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n drm/nouveau: oops, create m2mf for nvd9 too\n" }, { "commit": "464662b91614188b4af9df51baaa0d6b3d89a15f", "tree": "0257f83b14d1bf2fac072d66bfbe60023d7fc372", "parents": [ "1e649afde3708012daf43ff91730595e30e6f3bb", "0dd90aa9d6222e12201f05c0058e8741b7f66474" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:12:05 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\nPull arch/microblaze fixes from Michal Simek.\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: Fix ret_from_fork declaration\n microblaze: Do not use tlb_skip in early_printk\n microblaze: Add missing headers caused by disintegration asm/system.h\n microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user\n microblaze: Fix tlb_skip variable on noMMU system\n microblaze: Fix __futex_atomic_op macro register usage\n" }, { "commit": "1e649afde3708012daf43ff91730595e30e6f3bb", "tree": "3b3a9e873621e7729cc64f36465ffa3cf116c11c", "parents": [ "7d6e1cb7aed231b58acd71bdbe67fc03221373e4", "450aed725c9a53282483c48ebd012feefae94a07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:07:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 10:07:13 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\nPull m68k fixes from Geert Uytterhoeven:\n \"Here are a few fixes for the m68k architecture. Nothing fancy this\n time, just a build fix for the asm/system.h disintegration, and two\n fixes for missing platform checks (one got in during last merge\n window), which can cause crashes in multi-platform kernels.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k/q40: Add missing platform check before registering platform devices\n m68k/mac: Add missing platform check before registering platform devices\n m68k: include asm/cmpxchg.h in our m68k atomic.h\n" }, { "commit": "b61c37f57988567c84359645f8202a7c84bc798a", "tree": "a808c891711d060060a751f4119198dc06e2c847", "parents": [ "3f0882c48286e7bdb0bbdec9c4bfa934e0db8e09" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 15:48:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:49:59 2012 -0700" }, "message": "lsm_audit: don\u0027t specify the audit pre/post callbacks in \u0027struct common_audit_data\u0027\n\nIt just bloats the audit data structure for no good reason, since the\nonly time those fields are filled are just before calling the\ncommon_lsm_audit() function, which is also the only user of those\nfields.\n\nSo just make them be the arguments to common_lsm_audit(), rather than\nbloating that structure that is passed around everywhere, and is\ninitialized in hot paths.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3f0882c48286e7bdb0bbdec9c4bfa934e0db8e09", "tree": "20a7485417c8528d975ef4ff6e90467f63f67ab2", "parents": [ "f8294f1144ad0630075918df4bf94075f5384604" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Apr 03 09:38:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:49:41 2012 -0700" }, "message": "SELinux: do not allocate stack space for AVC data unless needed\n\nInstead of declaring the entire selinux_audit_data on the stack when we\nstart an operation on declare it on the stack if we are going to use it.\nWe know it\u0027s usefulness at the end of the security decision and can declare\nit there.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f8294f1144ad0630075918df4bf94075f5384604", "tree": "9c794bc9a5cbc688d3b6819d211df16b979a56c9", "parents": [ "7f6a47cf1477ffae9cff1d6ee181e2ce6bfb2f02" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Mon Apr 02 13:15:55 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:49:10 2012 -0700" }, "message": "SELinux: remove avd from slow_avc_audit()\n\nWe don\u0027t use the argument, so remove it.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7f6a47cf1477ffae9cff1d6ee181e2ce6bfb2f02", "tree": "55d2bfda38776aeed69b82cf0bd5b409744b4afd", "parents": [ "48c62af68a403ef1655546bd3e021070c8508573" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Mon Apr 02 13:15:50 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:49:10 2012 -0700" }, "message": "SELinux: remove avd from selinux_audit_data\n\nWe do not use it. Remove it.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "48c62af68a403ef1655546bd3e021070c8508573", "tree": "ba938e4fb45d5bdaad2dad44071d0625f8e36945", "parents": [ "3b3b0e4fc15efa507b902d90cea39e496a523c3b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Mon Apr 02 13:15:44 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:49:10 2012 -0700" }, "message": "LSM: shrink the common_audit_data data union\n\nAfter shrinking the common_audit_data stack usage for private LSM data I\u0027m\nnot going to shrink the data union. To do this I\u0027m going to move anything\nlarger than 2 void * ptrs to it\u0027s own structure and require it to be declared\nseparately on the calling stack. Thus hot paths which don\u0027t need more than\na couple pointer don\u0027t have to declare space to hold large unneeded\nstructures. I could get this down to one void * by dealing with the key\nstruct and the struct path. We\u0027ll see if that is helpful after taking care of\nnetworking.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b3b0e4fc15efa507b902d90cea39e496a523c3b", "tree": "d7b91c21ad6c6f4ac21dd51297b74eec47c61684", "parents": [ "95694129b43165911dc4e8a972f0d39ad98d86be" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Apr 03 09:37:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 03 09:48:40 2012 -0700" }, "message": "LSM: shrink sizeof LSM specific portion of common_audit_data\n\nLinus found that the gigantic size of the common audit data caused a big\nperf hit on something as simple as running stat() in a loop. This patch\nrequires LSMs to declare the LSM specific portion separately rather than\ndoing it in a union. Thus each LSM can be responsible for shrinking their\nportion and don\u0027t have to pay a penalty just because other LSMs have a\nbigger space requirement.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e37acc0f5ea18ff1ea4db96a84a51b90044c0dbd", "tree": "c54ef9a06165265e89213eaf9a4c00095cdf2045", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "b4db1e35ac59c144965f517bc575a0d75b60b03f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 16:00:23 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 16:00:29 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes\n\nFrom Daniel Vetter:\n\n\"A few patches for 3.4, major part is 3 regression fixes:\n- ppgtt broke hibernate on snb/ivb. Somehow our QA claims that it still\n works, which is why this has not been caught earlier.\n- ppgtt flails in combination with dmar. I kinda expected this one :(\n- fence handling bugfix for gen2/3. Iirc this one is about a year old, fix\n curtesy Chris Wilson. I\u0027ve created an shockingly simple i-g-t test to\n catch this in the future.\n\nWrt regressions I\u0027ve just got a report that gmbus (newly enabled again in\n3.4) is a bit noisy. I\u0027m looking into this atm.\n\nAlso included are the rc6 enable patches for snb from Eugeni. I wanted to\ninclude these in the main 3.4 pull but screwed it up. Please hit me. Imo\nthese kind of patches really should go in before -rc1, but in thise case\nrc6 has brought us tons of press and guinea pigs^W^W testers and ubuntu is\nalready running with it. So I estimate a pretty small chance for this to\nblow up.\n\nAnd some smaller things:\n- two minor locking snafus\n- server gt2 ivb pciid\n- 2 patches to sanitize the register state left behind by the bios some\n more\n- 2 new quirk entries\n- cs readback trick against missed IRQs from ivb also enabled on snb\n- sprite fix from Jesse\"\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n drm/i915: no-lvds quirk on MSI DC500\n drm/i915: Add lock on drm_helper_resume_force_mode\n drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n drm/i915: disable ppgtt on snb when dmar is enabled\n drm/i915: add Ivy Bridge GT2 Server entries\n drm/i915: properly clear SSC1 bit in the pch refclock init code\n drm/i915: apply CS reg readback trick against missed IRQ on snb\n drm/i915: quirk away broken OpRegion VBT\n drm/i915: enable plain RC6 on Sandy Bridge by default\n drm/i915: allow to select rc6 modes via kernel parameter\n drm/i915: Mark untiled BLT commands as fenced on gen2/3\n drm/i915: properly restore the ppgtt page directory on resume\n drm/i915: Sanitize BIOS debugging bits from PIPECONF\n" }, { "commit": "62fb376e214d3c1bfdf6fbb77dac162f6da04d7e", "tree": "e740485e5c058ad0f8e22f26081c24014e127d5a", "parents": [ "e199fd422420d1620cf64fd9bdd4ff8bc255cc76" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Mar 26 21:15:53 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 03 11:18:46 2012 +0100" }, "message": "drm: Validate requested virtual size against allocated fb size\n\nmplayer -vo fbdev tries to create a screen that is twice as tall as the\nallocated framebuffer for \"doublebuffering\". By default, and all in-tree\nusers, only sufficient memory is allocated and mapped to satisfy the\nsmallest framebuffer and the virtual size is no larger than the actual.\nFor these users, we should therefore reject any userspace request to\ncreate a screen that requires a buffer larger than the framebuffer\noriginally allocated.\n\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d38138\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b4db1e35ac59c144965f517bc575a0d75b60b03f", "tree": "c54ef9a06165265e89213eaf9a4c00095cdf2045", "parents": [ "97effadb65ed08809e1720c8d3ee80b73a93665c" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Mar 20 10:59:09 2012 -0700" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 11:33:33 2012 +0200" }, "message": "drm/i915: treat src w \u0026 h as fixed point in sprite handling code\n\nThis was missed when we converted the source values to 16.16 fixed point.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "97effadb65ed08809e1720c8d3ee80b73a93665c", "tree": "0a70d3114495a58424ac1ab9eabbec2e3b8f9e74", "parents": [ "927a2f119e8235238a2fc64871051b16c9bdae75" ], "author": { "name": "Anisse Astier", "email": "anisse@astier.eu", "time": "Wed Mar 07 18:36:35 2012 +0100" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:44:05 2012 +0200" }, "message": "drm/i915: no-lvds quirk on MSI DC500\n\nThis hardware doesn\u0027t have an LVDS, it\u0027s a desktop box. Fix incorrect\nLVDS detection.\n\nCc: stable@kernel.org\nSigned-off-by: Anisse Astier \u003canisse@astier.eu\u003e\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "927a2f119e8235238a2fc64871051b16c9bdae75", "tree": "982fd48fc0a39dd5ce0e073b3475283219bd11a7", "parents": [ "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead" ], "author": { "name": "Sean Paul", "email": "seanpaul@chromium.org", "time": "Fri Mar 23 08:52:58 2012 -0400" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:37:37 2012 +0200" }, "message": "drm/i915: Add lock on drm_helper_resume_force_mode\n\ni915_drm_thaw was not locking the mode_config lock when calling\ndrm_helper_resume_force_mode. When there were multiple wake sources,\nthis caused FDI training failure on SNB which in turn corrupted the\ndisplay.\n\nSigned-off-by: Sean Paul \u003cseanpaul@chromium.org\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "e02f14cd48a5da0ebaecf88c93dbd54a81e0dead", "tree": "9a5af6d70c2a8e9c499f73f42ca3b6e548715190", "parents": [ "650dc07ec3b0eba8ff21da706d2b1876ada59fc3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 23:33:03 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Apr 03 10:25:33 2012 +0200" }, "message": "drm/i915: don\u0027t leak struct_mutex lock on ppgtt init failures\n\nReported-by: Konstantin Belousov \u003ckostikbel@gmail.com\u003e\nReviewed-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "7b8e6da46b921d30ac1553cac56d8fb74f0b431d", "tree": "c1dde602088af9d02dc10d8d8bed94dcb3a706bb", "parents": [ "6308191f6f55d3629c7dbe72dfb856ad9fa560fd" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Mar 27 16:50:42 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Apr 03 08:33:38 2012 +0200" }, "message": "perf/x86/p4: Add format attributes\n\nSteven reported his P4 not booting properly, the missing format\nattributes cause a NULL ptr deref. Cure this by adding the\nmissing format specification.\n\nI took the format description out of the comment near\np4_config_pack*() and hope that comment is still relatively\naccurate.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nReported-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nTested-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Lin Ming \u003cming.m.lin@intel.com\u003e\nCc: Stephane Eranian \u003ceranian@google.com\u003e\nLink: http://lkml.kernel.org/r/1332859842.16159.227.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "5020ad7d143ccfcf8149974096220d59e5572120", "tree": "0124b6866ecd63b3a8913a6661e1d96699d60b71", "parents": [ "c6d2e084c7411f61f2b446d94989e5aaf9879b0f" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Mon Apr 02 01:39:05 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Apr 03 15:39:23 2012 +1000" }, "message": "md/raid1,raid10: don\u0027t compare excess byte during consistency check.\n\nWhen comparing two pages read from different legs of a mirror, only\ncompare the bytes that were read, not the whole page.\n\nIn most cases we read a whole page, but in some cases with\nbad blocks or odd sizes devices we might read fewer than that.\n\nThis bug has been present \"forever\" but at worst it might cause\na report of two many mismatches and generate a little bit\nextra resync IO, so there is no need to back-port to -stable\nkernels.\n\nReported-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "c6d2e084c7411f61f2b446d94989e5aaf9879b0f", "tree": "521616d7bd6ff7eb38217bed1b81c5960fa2023d", "parents": [ "a42f9d83b5c05dc6e678a1f0cd9767502c2c58de" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Mon Apr 02 01:16:59 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Apr 03 15:37:38 2012 +1000" }, "message": "md/raid5: Fix a bug about judging if the operation is syncing or replacing\n\nWhen create a raid5 using assume-clean and echo check or repair to\nsync_action.Then component disks did not operated IO but the raid\ncheck/resync faster than normal.\nBecause the judgement in function analyse_stripe():\n\t\tif (do_recovery ||\n\t\t sh-\u003esector \u003e\u003d conf-\u003emddev-\u003erecovery_cp)\n\t\t\ts-\u003esyncing \u003d 1;\n\t\telse\n\t\t\ts-\u003ereplacing \u003d 1;\nWhen check or repair,the recovery_cp \u003d\u003d MaxSectore,so syncing equal zero\nnot one.\n\nThis bug was introduced by commit 9a3e1101b827\n md/raid5: detect and handle replacements during recovery.\nso this patch is suitable for 3.3-stable.\n\nCc: stable@vger.kernel.org\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "a42f9d83b5c05dc6e678a1f0cd9767502c2c58de", "tree": "e1864a59287f1441a4b016938efea5ca30a57df1", "parents": [ "24b961f811a3e790a9b93604d2594bfb6cce4fa4" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Mon Apr 02 01:04:19 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Apr 03 15:37:33 2012 +1000" }, "message": "md/raid1:Remove unnecessary rcu_dereference(conf-\u003emirrors[i].rdev).\n\nBecause rde-\u003enr_pending \u003e 0,so can not remove this disk.\nAnd in any case, we aren\u0027t holding rcu_read_lock()\n\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "24b961f811a3e790a9b93604d2594bfb6cce4fa4", "tree": "8cde643f6d3d142538d8e2499e65b368f5320bcc", "parents": [ "18b9837ea0dc3cf844c6c4196871ce91d047bddb" ], "author": { "name": "Jes Sorensen", "email": "Jes.Sorensen@redhat.com", "time": "Sun Apr 01 23:48:38 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Apr 03 15:37:26 2012 +1000" }, "message": "md: Avoid OOPS when reshaping raid1 to raid0\n\nraid1 arrays do not have the notion of chunk size. Calculate the\nlargest chunk sector size we can use to avoid a divide by zero OOPS\nwhen aligning the size of the new array to the chunk size.\n\nSigned-off-by: Jes Sorensen \u003cJes.Sorensen@redhat.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "18b9837ea0dc3cf844c6c4196871ce91d047bddb", "tree": "de8be80b767d144405aeeaf7238c723f575b4b40", "parents": [ "5220ea1e640869e70f894837678315c878c651fd" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Sun Apr 01 23:48:38 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Apr 03 15:36:17 2012 +1000" }, "message": "md/raid5: fix handling of bad blocks during recovery.\n\n1/ We can only treat a known-bad-block like a read-error if we\n have the data that belongs in that block. So fix that test.\n\n2/ If we cannot recovery a stripe due to insufficient data,\n don\u0027t tell \"md_done_sync\" that the sync failed unless we really\n did fail something. If we successfully record bad blocks,\n that is success.\n\nReported-by: \"majianpeng\" \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "7d6e1cb7aed231b58acd71bdbe67fc03221373e4", "tree": "da1a0cdb2f19caa765e8fc2b5917efef10583d9e", "parents": [ "ed359a3b7b6ade0071f378c0cf4392d252f7d334", "3248877ea1796915419fba7c89315fdbf00cb56a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:58:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:58:04 2012 -0700" }, "message": "Merge branch \u0027drm-prime-dmabuf-initial\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull dma-buf prime support from Dave Airlie:\n \"This isn\u0027t a majorly urgent thing to have, but we\u0027d like to set the\n stage for working on dma-buf support in the drm drivers for the next\n merge window, so I\u0027d like to push in the initial submission now so\n people have something that we can build on top of. The code just\n introduces the user interface and internal helper functions for\n drivers to use.\n\n We have driver support under development for i915, nouveau, udl on x86\n and exynos, omapdrm on arm, which we would be aiming for the next\n merge window.\"\n\nIn the -rc1 announcement I asked for people who would use this to\ncomment on it, and got severa \"Yes please\" from people for this and for\nHSI (that I merged earlier).\n\nSo far crickets on pohmelfs and the DMA-mapping infrastructure.\n\n* \u0027drm-prime-dmabuf-initial\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: base prime/dma-buf support (v5)\n" }, { "commit": "ed359a3b7b6ade0071f378c0cf4392d252f7d334", "tree": "8f81e03fcb44a7d36f53bc5a53d8eced7154bee2", "parents": [ "95694129b43165911dc4e8a972f0d39ad98d86be", "2240eb4ae3dc4acff20d1a8947c441c451513e37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:53:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 17:53:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Provide device string properly for USB i2400m wimax devices, also\n don\u0027t OOPS when providing firmware string. From Phil Sutter.\n\n 2) Add support for sh_eth SH7734 chips, from Nobuhiro Iwamatsu.\n\n 3) Add another device ID to USB zaurus driver, from Guan Xin.\n\n 4) Loop index start in pool vector iterator is wrong causing MAC to not\n get configured in bnx2x driver, fix from Dmitry Kravkov.\n\n 5) EQL driver assumes HZ\u003d100, fix from Eric Dumazet.\n\n 6) Now that skb_add_rx_frag() can specify the truesize increment\n separately, do so in f_phonet and cdc_phonet, also from Eric\n Dumazet.\n\n 7) virtio_net accidently uses net_ratelimit() not only on the kernel\n warning but also the statistic bump, fix from Rick Jones.\n\n 8) ip_route_input_mc() uses fixed init_net namespace, oops, use\n dev_net(dev) instead. Fix from Benjamin LaHaise.\n\n 9) dev_forward_skb() needs to clear the incoming interface index of the\n SKB so that it looks like a new incoming packet, also from Benjamin\n LaHaise.\n\n10) iwlwifi mistakenly initializes a channel entry as 2GHZ instead of\n 5GHZ, fix from Stanislav Yakovlev.\n\n11) Missing kmalloc() return value checks in orinoco, from Santosh\n Nayak.\n\n12) ath9k doesn\u0027t check for HT capabilities in the right way, it is\n checking ht_supported instead of the ATH9K_HW_CAP_HT flag. Fix from\n Sujith Manoharan.\n\n13) Fix x86 BPF JIT emission of 16-bit immediate field of AND\n instructions, from Feiran Zhuang.\n\n14) Avoid infinite loop in GARP code when registering sysfs entries.\n From David Ward.\n\n15) rose protocol uses memcpy instead of memcmp in a device address\n comparison, oops. Fix from Daniel Borkmann.\n\n16) Fix build of lpc_eth due to dev_hw_addr_rancom() interface being\n renamed to eth_hw_addr_random(). From Roland Stigge.\n\n17) Make ipv6 RTM_GETROUTE interpret RTA_IIF attribute the same way\n that ipv4 does. Fix from Shmulik Ladkani.\n\n18) via-rhine has an inverted bit test, causing suspend/resume\n regressions. Fix from Andreas Mohr.\n\n19) RIONET assumes 4K page size, fix from Akinobu Mita.\n\n20) Initialization of imask register in sky2 is buggy, because bits are\n \"or\u0027d\" into an uninitialized local variable. Fix from Lino\n Sanfilippo.\n\n21) Fix FCOE checksum offload handling, from Yi Zou.\n\n22) Fix VLAN processing regression in e1000, from Jiri Pirko.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)\n sky2: dont overwrite settings for PHY Quick link\n tg3: Fix 5717 serdes powerdown problem\n net: usb: cdc_eem: fix mtu\n net: sh_eth: fix endian check for architecture independent\n usb/rtl8150 : Remove duplicated definitions\n rionet: fix page allocation order of rionet_active\n via-rhine: fix wait-bit inversion.\n ipv6: Fix RTM_GETROUTE\u0027s interpretation of RTA_IIF to be consistent with ipv4\n net: lpc_eth: Fix rename of dev_hw_addr_random\n net/netfilter/nfnetlink_acct.c: use linux/atomic.h\n rose_dev: fix memcpy-bug in rose_set_mac_address\n Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.\n net/garp: avoid infinite loop if attribute already exists\n x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND\n bonding: emit event when bonding changes MAC\n mac80211: fix oper channel timestamp updation\n ath9k: Use HW HT capabilites properly\n MAINTAINERS: adding maintainer for ipw2x00\n net: orinoco: add error handling for failed kmalloc().\n net/wireless: ipw2x00: fix a typo in wiphy struct initilization\n ...\n" }, { "commit": "2240eb4ae3dc4acff20d1a8947c441c451513e37", "tree": "18e2923bb441df812bcdae8a928076e22eaf2e9a", "parents": [ "085f1afc56619bda424941412fdeaff1e32c21dc" ], "author": { "name": "Lino Sanfilippo", "email": "LinoSanfilippo@gmx.de", "time": "Fri Mar 30 07:28:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 02 18:41:06 2012 -0400" }, "message": "sky2: dont overwrite settings for PHY Quick link\n\nThis patch corrects a bug in function sky2_open() of the Marvell Yukon 2 driver\nin which the settings for PHY quick link are overwritten.\n\nSigned-off-by: Lino Sanfilippo \u003cLinoSanfilippo@gmx.de\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyattta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95694129b43165911dc4e8a972f0d39ad98d86be", "tree": "a7faf4b70c85b457f684cbc1033ac5b79457c2e9", "parents": [ "b1a808ff436343956a6ae63178ea1810c5e5a3a1", "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "message": "Merge branch \u0027paul\u0027 (Fixups from Paul Gortmaker)\n\nThis merges some of the fixes from Paul Gortmaker for the header file\ncleanup fallout.\n\nSome of the patches are going through arch maintainer trees, and David\nHowells suggested another be done differently, but this at least fixes a\nfew cases.\n\n* emailed from Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e:\n asm-generic: add linux/types.h to cmpxchg.h\n firewire: restore the device.h include in linux/firewire.h\n frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL\n parisc: fix missing cmpxchg file error from system.h split\n blackfin: fix cmpxchg build fails from system.h fallout\n avr32: fix build failures from mis-naming of atmel_nand.h\n ARM: mach-msm: fix compile fail from system.h fallout\n irq_work: fix compile failure on MIPS from system.h split\n" }, { "commit": "085f1afc56619bda424941412fdeaff1e32c21dc", "tree": "aa4a4d06413f4c597d75678a7319c434232fb987", "parents": [ "78fb72f7936c01d5b426c03a691eca082b03f2b9" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Apr 02 09:01:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 02 17:41:42 2012 -0400" }, "message": "tg3: Fix 5717 serdes powerdown problem\n\nIf port 0 of a 5717 serdes device powers down, it hides the phy from\nport 1. This patch works around the problem by keeping port 0\u0027s phy\npowered up.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8", "tree": "4f2826dadc1daa16058d4505f3d24ac98b45a397", "parents": [ "f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:47 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:27 2012 -0700" }, "message": "asm-generic: add linux/types.h to cmpxchg.h\n\nBuilds of the openrisc or1ksim_defconfig show the following:\n\n In file included from arch/openrisc/include/generated/asm/cmpxchg.h:1:0,\n from include/asm-generic/atomic.h:18,\n from arch/openrisc/include/generated/asm/atomic.h:1,\n from include/linux/atomic.h:4,\n from include/linux/dcache.h:4,\n from fs/notify/fsnotify.c:19:\n include/asm-generic/cmpxchg.h: In function \u0027__xchg\u0027:\n include/asm-generic/cmpxchg.h:34:20: error: expected \u0027)\u0027 before \u0027u8\u0027\n include/asm-generic/cmpxchg.h:34:20: warning: type defaults to \u0027int\u0027 in type name\n\nand many more lines of similar errors. It seems specific to the or32\nbecause most other platforms have an arch specific component that would\nhave already included types.h ahead of time, but the o32 does not.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2", "tree": "d8f241632882ee7de71bc1aed211ac9f220d9352", "parents": [ "9a78da114c18c130769c1ba25cabbc34da7ad70c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:45 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:27 2012 -0700" }, "message": "firewire: restore the device.h include in linux/firewire.h\n\nCommit 313162d0b838 (\"device.h: audit and cleanup users in main include\ndir\") exchanged an include \u003clinux/device.h\u003e for a struct *device but in\nactuality I misread this file when creating 313162d and it should have\nremained an include.\n\nThere were no build regressions since all consumers were already getting\ndevice.h anyway, but make it right regardless.\n\nReported-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9a78da114c18c130769c1ba25cabbc34da7ad70c", "tree": "bf429427c742d597977e501bbc7e6d24a9bed902", "parents": [ "9e5228ce0b9619bde7dcd6c51fb26e2401cfe81a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:44 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:26 2012 -0700" }, "message": "frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL\n\nTo fix:\n\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: data definition has no type or storage class [enabled by default]\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027 [-Wimplicit-int]\n arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: parameter names (without types) in function declaration [enabled by default]\n arch/frv/mb93090-mb00/pci-dma.c:38:1: warning: data definition has no type or storage class [enabled by default]\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9e5228ce0b9619bde7dcd6c51fb26e2401cfe81a", "tree": "4fdfdd44fbbf3e62cb4a9691dd537955ee91a072", "parents": [ "1512cdc3572dac34a1809764f9a646cde7e82407" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:42 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:26 2012 -0700" }, "message": "parisc: fix missing cmpxchg file error from system.h split\n\nCommit b4816afa3986 (\"Move the asm-generic/system.h xchg()\nimplementation to asm-generic/cmpxchg.h\") introduced the concept of\nasm/cmpxchg.h but the parisc arch never got one. Fork the cmpxchg\ncontent out of the asm/atomic.h file to create one.\n\nSome minor whitespace fixups were done on the block of code that created\nthe new file.\n\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1512cdc3572dac34a1809764f9a646cde7e82407", "tree": "abd8318fb7a49bb0a04b338197eeecaa373ac5ed", "parents": [ "3d92e05118262379f76a220772b666dfddb77a9d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:41 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:25 2012 -0700" }, "message": "blackfin: fix cmpxchg build fails from system.h fallout\n\nCommit 3bed8d67469c (\"Disintegrate asm/system.h for Blackfin [ver #2]\")\nintroduced arch/blackfin/include/asm/cmpxchg.h but has it also including\nthe asm-generic one which causes this:\n\n CC arch/blackfin/kernel/asm-offsets.s\n In file included from arch/blackfin/include/asm/cmpxchg.h:125:0,\n from arch/blackfin/include/asm/atomic.h:10,\n from include/linux/atomic.h:4,\n from include/linux/spinlock.h:384,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:57,\n from arch/blackfin/kernel/asm-offsets.c:10:\n include/asm-generic/cmpxchg.h:24:15: error: redefinition of \u0027__xchg\u0027\n arch/blackfin/include/asm/cmpxchg.h:82:29: note: previous definition of \u0027__xchg\u0027 was here\n make[2]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1\n\nIt really only needs two simple defines from asm-generic, so just use\nthose instead.\n\nCc: Bob Liu \u003clliubbo@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3d92e05118262379f76a220772b666dfddb77a9d", "tree": "a63a1e55edd9bfa3e9ff9e1f8e2d09fe12b11615", "parents": [ "b443caf12f9ee14e9843e53d4d929319e637275a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:40 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:25 2012 -0700" }, "message": "avr32: fix build failures from mis-naming of atmel_nand.h\n\nCommit bf4289cba02b (\"ATMEL: fix nand ecc support\") indicated that it\nwanted to \"Move platform data to a common header\ninclude/linux/platform_data/atmel_nand.h\" and the new header even had\nre-include protectors with:\n\n #ifndef __ATMEL_NAND_H__\n\nHowever, the file that was added was simply called atmel.h\nand this caused avr32 defconfig to fail with:\n\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: \u0027struct atmel_nand_data\u0027 declared inside parameter list\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want\n make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1\n\nIt seems the scope of the file contents will expand beyond\njust nand, so ignore the original intention, and fix up the\nusers who reference the bad name with the _nand suffix.\n\nCC: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCC: David Woodhouse \u003cdwmw2@infradead.org\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b443caf12f9ee14e9843e53d4d929319e637275a", "tree": "5d1a5b58411d06122fea2f7659e739dff52b7ea3", "parents": [ "83e3fa6f0193299f8b7180db588edd5ca61a3b82" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:38 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:16 2012 -0700" }, "message": "ARM: mach-msm: fix compile fail from system.h fallout\n\nTo fix:\n\n In file included from arm/boot/compressed/misc.c:28:0:\n arm/mach-msm/include/mach/uncompress.h: In function \u0027putc\u0027:\n arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit\n declaration of function \u0027smp_mb\u0027 [-Werror\u003dimplicit-function-declaration]\n\nThe putc does a cpu_relax which for this platform is smp_mb.\n\nBisect indicates the 1st failing commit as: 0195c00244dc (\"Merge tag\n\u0027split-asm_system_h...\")\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1a808ff436343956a6ae63178ea1810c5e5a3a1", "tree": "bd510d5ea6b407df6ea0b8353e1788e12f95e427", "parents": [ "97754175042e77d02c4232d5fb24c16abd1c77f1", "43139a61fc68f4b0af7327a0e63f340a7c81c69a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:50:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:50:40 2012 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi\n\nPull HSI (High Speed Synchronous Serial Interface) framework from Carlos Chinea:\n \"The High Speed Synchronous Serial Interface (HSI) is a serial\n interface mainly used for connecting application engines (APE) with\n cellular modem engines (CMT) in cellular handsets.\n\n The framework is currently being used for some people and we would\n like to see it integrated into the kernel for 3.3. There is no HW\n controller drivers in this pull, but some people have already some of\n them pending which they would like to push as soon as this integrated.\n I am also working on the acceptance for an TI OMAP one, based on a\n compatible legacy version of the interface called SSI.\"\n\nOk, so it didn\u0027t get into 3.3, but here it is pulled into 3.4.\n\nSeveral people piped up to say \"yeah, we want this\".\n\n* \u0027for-next\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi:\n HSI: hsi_char: Update ioctl-number.txt\n HSI: Add HSI API documentation\n HSI: hsi_char: Add HSI char device kernel configuration\n HSI: hsi_char: Add HSI char device driver\n HSI: hsi: Introducing HSI framework\n" }, { "commit": "97754175042e77d02c4232d5fb24c16abd1c77f1", "tree": "5f318edf0420807259835b40c3a269f8e1267057", "parents": [ "8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d", "0eb043d0eec44cd083ea6910b1db2f77eb212ebd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:42:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:42:55 2012 -0700" }, "message": "Merge branch \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull \u0027make cscope\u0027 fix from Michal Marek:\n \"The kbuild.git#misc pull request introduced a bug that broke make\n cscope. Apparently, both the original author and me only tested the\n use case that the commit was supposed to improve (make tags/TAGS), and\n not the use case that was not supposed (make cscope).\"\n\n* \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n tags.sh: Add missing quotes\n" }, { "commit": "8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d", "tree": "aaac7c2858dab9817af579f2ad39f2f18ce4dbd8", "parents": [ "143418d0c87fda0c587205c45094d8b05222fd49", "5219a5342ab13650ae0f0c62319407268c48d0ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:40:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:40:24 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto fixes from Herbert Xu:\n - Fix for CPU hotplug hang in padata.\n - Avoid using cpu_active inappropriately in pcrypt and padata.\n - Fix for user-space algorithm lookup hang with IV generators.\n - Fix for netlink dump of algorithms where stuff went missing due to\n incorrect calculation of message size.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: user - Fix size of netlink dump message\n crypto: user - Fix lookup of algorithms with IV generator\n crypto: pcrypt - Use the online cpumask as the default\n padata: Fix cpu hotplug\n padata: Use the online cpumask as the default\n padata: Add a reference to the api documentation\n" }, { "commit": "143418d0c87fda0c587205c45094d8b05222fd49", "tree": "31204467c0632c356cb77e374c270016f72d4ef3", "parents": [ "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "9b218f63e50e590fe0c7724a0838d7eaa6dae5ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:38:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 09:38:51 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"This contains a couple more fixes for the system.h disintegration, a\n trivial section mismatch fix, a couple of patches from akpm that I\n didn\u0027t quite get he expected me to pickup, and a few more trivialities\n form Kumar that he appear to have forgotten to send me in the previous\n batch.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart\n powerpc/eeh: Remove eeh_event_handler()-\u003edaemonize()\n powerpc/kvm: Fallout from system.h disintegration\n powerpc: Fix fallout from system.h split up\n powerpc: Mark const init data with __initconst instead of __initdata\n powerpc/qe: Update the SNUM table for MPC8569 Rev2.0\n powerpc/dts: Removed fsl,msi property from dts.\n powerpc/epapr: add \"memory\" as a clobber to all hypercalls\n powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigs\n powerpc/85xx: add the P1020UTM-PC DTS support\n powerpc/85xx: add the P1020MBG-PC DTS support\n powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h\n" }, { "commit": "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "tree": "ee9eb01e5433ea50f3414a469521a4c1cfaccb7a", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "615399c84d1b8d8d8752629e5e5ab4e5044d6918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nPull cpumask cleanups from Rusty Russell:\n \"(Somehow forgot to send this out; it\u0027s been sitting in linux-next, and\n if you don\u0027t want it, it can sit there another cycle)\"\n\nI\u0027m a sucker for things that actually delete lines of code.\n\nFix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed\na user of \u0026cpu_online_map to be cpu_online_mask, but that code got\ndeleted by commit b21d55e98ac2 (\"ARM: 7332/1: extract out code patch\nfunction from kprobes\").\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n cpumask: remove old cpu_*_map.\n documentation: remove references to cpu_*_map.\n drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.\n remove references to cpu_*_map in arch/\n" }, { "commit": "83e3fa6f0193299f8b7180db588edd5ca61a3b82", "tree": "bb7298e580619fd3b7923364e3c4cd1e9d341972", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:37 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:48:04 2012 -0700" }, "message": "irq_work: fix compile failure on MIPS from system.h split\n\nBuilds of the MIPS platform ip32_defconfig fails as of commit\n0195c00244dc (\"Merge tag \u0027split-asm_system_h ...\") because MIPS xchg()\nmacro uses BUILD_BUG_ON and it was moved in commit b81947c646bf\n(\"Disintegrate asm/system.h for MIPS\").\n\nThe root cause is that the system.h split wasn\u0027t tested on a baseline\nwith commit 6c03438edeb5 (\"kernel.h: doesn\u0027t explicitly use bug.h, so\ndon\u0027t include it.\")\n\nSince this file uses BUG code in several other places besides the xchg\ncall, simply make the inclusion explicit.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "650dc07ec3b0eba8ff21da706d2b1876ada59fc3", "tree": "337809fc7c960a6c525f473d498c339aa7075ab3", "parents": [ "cc22a938fc1db0c8ef5e693a69b159c4b851dab3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 10:08:35 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:59:07 2012 +0200" }, "message": "drm/i915: disable ppgtt on snb when dmar is enabled\n\nTotally unexpected that this regressed. Luckily it sounds like we just\nneed to have dmar disable on the igfx, not the entire system. At least\nthat\u0027s what a few days of testing between Tony Vroon and me indicates.\n\nReported-by: Tony Vroon \u003ctony@linx.net\u003e\nCc: Tony Vroon \u003ctony@linx.net\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d43024\nAcked-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "cc22a938fc1db0c8ef5e693a69b159c4b851dab3", "tree": "9d2e52caed1d848c267dcb33997b6fc8e6b3f739", "parents": [ "e77166b5a653728f312d07e60a80819d1c54fca4" ], "author": { "name": "Eugeni Dodonov", "email": "eugeni.dodonov@intel.com", "time": "Thu Mar 29 20:55:48 2012 -0300" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Mon Apr 02 15:58:47 2012 +0200" }, "message": "drm/i915: add Ivy Bridge GT2 Server entries\n\nThis adds PCI ID for IVB GT2 server variant which we were missing.\n\nSigned-off-by: Eugeni Dodonov \u003ceugeni.dodonov@intel.com\u003e\n[danvet: fix up conflict because the patch has been diffed against next. tsk.]\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "dba69d1092e291e257fb5673a3ad0e4c87878ebc", "tree": "9094d916ec45ec61d4014bc160f6314823ce3a7c", "parents": [ "c0e9afc0da6cb0f11497e5ea83377b3c451450e0" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Sun Apr 01 13:53:36 2012 -0300" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Mon Apr 02 13:53:00 2012 +0200" }, "message": "x86, kvm: Call restore_sched_clock_state() only after %gs is initialized\n\ns2ram broke due to this KVM commit:\n\n b74f05d61b73 x86: kvmclock: abstract save/restore sched_clock_state\n\nrestore_sched_clock_state() methods use percpu data, therefore\nthey must run after %gs is initialized, but before mtrr_bp_restore()\n(due to lockstat using sched_clock).\n\nMove it to the correct place.\n\nReported-and-tested-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "0dd90aa9d6222e12201f05c0058e8741b7f66474", "tree": "8a57798f1d84db887b77abc2a66a2217d3b5ca6e", "parents": [ "0fc7374bb5df938ef3d386e48ac9797d7651e9cc" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 12:55:47 2012 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 13:00:26 2012 +0200" }, "message": "microblaze: Fix ret_from_fork declaration\n\nret_from_fork is used by noMMU system too.\n\nIt should be the part of patch\n\"Disintegrate asm/system.h for Microblaze\"\n(sha1: c40d04df152a1111c5bbcb632278394dabd2b73d)\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "0fc7374bb5df938ef3d386e48ac9797d7651e9cc", "tree": "41c2fe3282ec9e88dad9f81bcbb85fa72f395d0e", "parents": [ "90c0d80daa82fa9cbaa85d1a787375b33877d2d4" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 12:50:54 2012 +0200" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Apr 02 13:00:22 2012 +0200" }, "message": "microblaze: Do not use tlb_skip in early_printk\n\ntlb_skip is valid only for MMU system.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "e199fd422420d1620cf64fd9bdd4ff8bc255cc76", "tree": "305939ba483e3c935a29aea84c624a536e68e353", "parents": [ "fa9e855025b19e96e493ee00de7d933a9794f742" ], "author": { "name": "Michel Dänzer", "email": "michel.daenzer@amd.com", "time": "Thu Mar 29 16:47:43 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:09:50 2012 +0100" }, "message": "drm/radeon: Don\u0027t dereference possibly-NULL pointer.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nReviewed-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fa9e855025b19e96e493ee00de7d933a9794f742", "tree": "f58d289ecb25d82483b9158406f510a3783022fb", "parents": [ "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Sat Mar 31 13:29:25 2012 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:08:17 2012 +0100" }, "message": "mm, drm/udl: fixup vma flags on mmap\n\nThere should be VM_MIXEDMAP, not VM_PFNMAP, because udl_gem_fault() inserts\npages via vm_insert_page(). Other drm/gem drivers already do this.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd", "tree": "2de887cae4ddcaf291562f796231c4feb829ad42", "parents": [ "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Mar 29 19:04:08 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:07:42 2012 +0100" }, "message": "drm/radeon/kms: fix fans after resume\n\nOn pre-R600 asics, the SpeedFanControl table is not\nexecuted as part of ASIC_Init as it is on newer asics.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d29412\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d06221c0617ab6d0bc41c4980cefdd9c8cc9a1c1", "tree": "5ec7d22876848e194036c019aaea9f6a14e63c2a", "parents": [ "ea71f98d680c9ac768a7849d26d7ce4744064510" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:38:19 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:06:33 2012 +0100" }, "message": "nouveau/bios: Fix tracking of BIOS image data\n\nThe code tries various methods for retreiving the BIOS data. However\nit doesn\u0027t clear the bios-\u003edata pointer between the iterations.\n\nIn some cases, the shadow() method will fail and not update bios-\u003edata\nat all, which will cause us to \"score\" the old data and incorrectly\nattribute that score to the new method. This can cause double frees\nlater when disposing of the unused data.\n\nAdditionally, we were not freeing the data for methods that fail the\nscore test (we only freed when a \"best\" is superseeded, not when the\nnew method has a lower score than the exising \"best\"). Fix that as well.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ea71f98d680c9ac768a7849d26d7ce4744064510", "tree": "696b8eb9fc6541f71caede709857de3f07d08f06", "parents": [ "40c61046ee3007d73f141e96aa2f3dd56ee321c6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:37:13 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 11:05:58 2012 +0100" }, "message": "nouveau: Fix crash when pci_ram_rom() returns a size of 0\n\nFrom b15b244d6e6e20964bd4b85306722cb60c3c0809 Mon Sep 17 00:00:00 2001\nFrom: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nDate: Mon, 2 Apr 2012 13:28:18 +1000\nSubject:\n\nUnder some circumstances, pci_map_rom() can return a valid mapping\nbut a size of 0 (if it cannot find an image in the header).\n\nThis causes nouveau to try to kmalloc() a 0 sized pointer and\ndereference it, which crashes.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "40c61046ee3007d73f141e96aa2f3dd56ee321c6", "tree": "8ae9f4dc5aa83a4e7cc8664de97d1001fcddd92b", "parents": [ "e0d2e320210a0e0a75110bad8501b1cd498221de" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:49 2012 +0100" }, "message": "drm/nouveau: select POWER_SUPPLY\n\nBen H. reported that building nouveau into the kernel and power supply\nas a module was broken.\n\nJust have nouveau select it, like radeon does.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e0d2e320210a0e0a75110bad8501b1cd498221de", "tree": "ba8bf718645591c2638fc7fbb4c55454d94e0801", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "02bfc2881e0d5b23147211bb6420798d946a7b5c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:03 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Apr 02 10:45:03 2012 +0100" }, "message": "Merge branch \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes\n\n* \u0027drm-nouveau-fixes\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nouveau: inform userspace of relaxed kernel subchannel requirements\n Revert \"drm/nouveau: inform userspace of new kernel subchannel requirements\"\n drm/nouveau: oops, create m2mf for nvd9 too\n" }, { "commit": "0eb043d0eec44cd083ea6910b1db2f77eb212ebd", "tree": "fae70f3b77368b9f6397b0ebaacf05d5f4a0ce75", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Sat Mar 31 23:41:07 2012 -0700" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Apr 02 11:28:17 2012 +0200" }, "message": "Subject: [PATCH] tags.sh: Add missing quotes\n\nWhen $remove_structs is empty a test for empty string will turn\ninto test -n with no arguments meaning true. Add quotes so an\nempty string is tested and so that make cscope works again.\n\nReported-and-tested-by: Jike Song \u003calbcamus@gmail.com\u003e\nReported-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nAcked-by: Yang Bai \u003chamo.by@gmail.com\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "9b218f63e50e590fe0c7724a0838d7eaa6dae5ce", "tree": "2879a705de175bc7e956d90d72dee2bf1c38499c", "parents": [ "37ef9bd48af6ab9a3d1fd28df4f929abc19f2cc3" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Mar 28 12:20:58 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:31:19 2012 +1000" }, "message": "powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart\n\nThat set_current_state() won\u0027t work very well: the subsequent mutex_lock()\nmight flip the task back into TASK_RUNNING.\n\nAttempt to put it somewhere where it might have been meant to be, and\nattempt to describe why it might have been added.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "37ef9bd48af6ab9a3d1fd28df4f929abc19f2cc3", "tree": "7352315e60fca4aead9bb25ae1985068cb38a88b", "parents": [ "95327d08fd5fc686b35ac21050a1b74f9bce3abe" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Mar 28 12:20:57 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:31:19 2012 +1000" }, "message": "powerpc/eeh: Remove eeh_event_handler()-\u003edaemonize()\n\ndaemonize() is only needed when a user-space task does kernel_thread().\n\neeh_event_handler() thread is created by the worker kthread, and thus it\ndoesn\u0027t need the soon-to-be-deprecated daemonize().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Linas Vepstas \u003clinasvepstas@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "95327d08fd5fc686b35ac21050a1b74f9bce3abe", "tree": "8fe15aac8ea373bb2b8dd0476ca7a495179f255f", "parents": [ "cad3c8346b94edd68e4b9c2c0056a5f61411af1a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Sun Apr 01 17:35:53 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:04 2012 +1000" }, "message": "powerpc/kvm: Fallout from system.h disintegration\n\nAdd a missing include to fix build\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "cad3c8346b94edd68e4b9c2c0056a5f61411af1a", "tree": "ba8899651f4ab61f9d268bf65c262d879270aaa5", "parents": [ "059378e3ff36094dccdd55600c3ad67a88c302aa" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Fri Mar 30 14:01:07 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:03 2012 +1000" }, "message": "powerpc: Fix fallout from system.h split up\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "059378e3ff36094dccdd55600c3ad67a88c302aa", "tree": "cf3de6bdf02df80408fe5db35d25a7e86b642d94", "parents": [ "e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Mar 30 10:05:00 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 14:00:03 2012 +1000" }, "message": "powerpc: Mark const init data with __initconst instead of __initdata\n\nAs long as there is no other non-const variable marked __initdata in the\nsame compilation unit it doesn\u0027t hurt. If there were one however\ncompilation would fail with\n\n\terror: $variablename causes a section type conflict\n\nbecause a section containing const variables is marked read only and so\ncannot contain non-const variables.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Josh Boyer \u003cjwboyer@gmail.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: linuxppc-dev@lists.ozlabs.org\nCc: cbe-oss-dev@lists.ozlabs.org\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b", "tree": "e897997d1844a712391772444817abc12d2bc3d6", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "fa1b42b45a9c96da77f3ddabf715f49525a87209" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:57:46 2012 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 02 13:57:46 2012 +1000" }, "message": "Merge remote-tracking branch \u0027kumar/next\u0027 into merge\n" }, { "commit": "78fb72f7936c01d5b426c03a691eca082b03f2b9", "tree": "e35842c46e105ef286c4e148977494fd81946eee", "parents": [ "10b9194f959608368ed89df1937f17cfe6bd6d84" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Thu Mar 29 07:15:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:32:35 2012 -0400" }, "message": "net: usb: cdc_eem: fix mtu\n\nMake CDC EEM recalculate the hard_mtu after adjusting the\nhard_header_len.\n\nWithout this, usbnet adjusts the MTU down to 1494 bytes, and the host is\nunable to receive standard 1500-byte frames from the device.\n\nTested with the Linux USB Ethernet gadget.\n\nCc: Oliver Neukum \u003coliver@neukum.name\u003e\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10b9194f959608368ed89df1937f17cfe6bd6d84", "tree": "867eec7da75983ee378204b8bdbeefc26301c336", "parents": [ "6bafd6436e99d08e8def37ae9f790e1aff871bae" ], "author": { "name": "Yoshihiro Shimoda", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Thu Mar 29 19:32:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:22:11 2012 -0400" }, "message": "net: sh_eth: fix endian check for architecture independent\n\nSuperH has the \"CONFIG_CPU_LITTLE_ENDIAN\" and the \"__LITTLE_ENDIAN__\".\nBut, other architecture doesn\u0027t have them. So, this patch fixes it.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6bafd6436e99d08e8def37ae9f790e1aff871bae", "tree": "3b3fcac82ed3db0c2f1694d87b69e7969d5ae377", "parents": [ "acc656323ab904803393acefdc8e1b78cde752e5" ], "author": { "name": "huajun li", "email": "huajun.li.lee@gmail.com", "time": "Fri Mar 30 00:11:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:20:37 2012 -0400" }, "message": "usb/rtl8150 : Remove duplicated definitions\n\nThere exist duplicated macro definitions in rtl8150.c, remove them.\n\nSigned-off-by: Huajun Li \u003chuajun.li.lee@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acc656323ab904803393acefdc8e1b78cde752e5", "tree": "4d11bd3fc1c943d639af8d1bd68c0eb211309d55", "parents": [ "3f8c91a7398b9266fbe7abcbe4bd5dffef907643" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Mar 30 01:01:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:17:16 2012 -0400" }, "message": "rionet: fix page allocation order of rionet_active\n\nrionet_active is allocated from the page allocator and the allocation\norder is calculated on the assumption that the page size is 4KB, so it\nwastes memory on more than 4K page systems.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Matt Porter \u003cmporter@kernel.crashing.org\u003e\nCc: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f8c91a7398b9266fbe7abcbe4bd5dffef907643", "tree": "b49aab8ce6ded6ba2c718ce889bfa80d5e42f246", "parents": [ "72331bc0cd072c3f4b670cd1256e47681fc53b80" ], "author": { "name": "Andreas Mohr", "email": "andi@lisas.de", "time": "Sun Apr 01 12:35:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 23:09:36 2012 -0400" }, "message": "via-rhine: fix wait-bit inversion.\n\nBug appeared in a384a33bb1c9ec2d99db2046b41f57023fa7d77b\n(\"via-rhine: RHINE_WAIT_FOR macro removal). It can be noticed\nduring suspend/resume.\n\nSigned-off-by: Andreas Mohr \u003candi@lisas.de\u003e\nAcked-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: David Lv \u003cDavidLv@viatech.com.cn\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5220ea1e640869e70f894837678315c878c651fd", "tree": "b18af9d438b634e81bd5d87c2323ae58d52eaf73", "parents": [ "0366ef847581d692e197b88825867ca9ee00e358" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Mon Apr 02 09:48:38 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Mon Apr 02 09:48:38 2012 +1000" }, "message": "md/raid1: If md_integrity_register() failed,run() must free the mem\n\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "0366ef847581d692e197b88825867ca9ee00e358", "tree": "7faec66efc6e77b24dd349a42c7dabefbc1964be", "parents": [ "98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Mon Apr 02 09:48:37 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Mon Apr 02 09:48:37 2012 +1000" }, "message": "md/raid0: If md_integrity_register() fails, raid0_run() must free the mem.\n\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3", "tree": "6397046f8dc7a82986ebd7e442491dc118d1a850", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "majianpeng", "email": "majianpeng@gmail.com", "time": "Mon Apr 02 09:48:37 2012 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Mon Apr 02 09:48:37 2012 +1000" }, "message": "md/linear: If md_integrity_register() fails, linear_run() must free the mem.\n\n\nSigned-off-by: majianpeng \u003cmajianpeng@gmail.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "72331bc0cd072c3f4b670cd1256e47681fc53b80", "tree": "46665ad2830342d94b4d784c5aa397e3a6f0045b", "parents": [ "cdaf0b835df04177397b90214f8b457fd23b67e0" ], "author": { "name": "Shmulik Ladkani", "email": "shmulik.ladkani@gmail.com", "time": "Sun Apr 01 04:03:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 17:29:40 2012 -0400" }, "message": "ipv6: Fix RTM_GETROUTE\u0027s interpretation of RTA_IIF to be consistent with ipv4\n\nIn IPv4, if an RTA_IIF attribute is specified within an RTM_GETROUTE\nmessage, then a route is searched as if a packet was received on the\nspecified \u0027iif\u0027 interface.\n\nHowever in IPv6, RTA_IIF is not interpreted in the same way:\n\u0027inet6_rtm_getroute()\u0027 always calls \u0027ip6_route_output()\u0027, regardless the\nRTA_IIF attribute.\n\nAs a result, in IPv6 there\u0027s no way to use RTM_GETROUTE in order to look\nfor a route as if a packet was received on a specific interface.\n\nFix \u0027inet6_rtm_getroute()\u0027 so that RTA_IIF is interpreted as \"lookup a\nroute as if a packet was received on the specified interface\", similar\nto IPv4\u0027s \u0027inet_rtm_getroute()\u0027 interpretation.\n\nReported-by: Ami Koren \u003camikoren@yahoo.com\u003e\nSigned-off-by: Shmulik Ladkani \u003cshmulik.ladkani@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2533e824153b51bda27fe41ed1a5512047f42707", "tree": "c4d6400fb59e23ae6c6dc8e86e8a0a9d75709da2", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Aaro Koskinen", "email": "aaro.koskinen@iki.fi", "time": "Sun Apr 01 08:54:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 14:22:23 2012 -0700" }, "message": "sparc: pgtable_64: change include order\n\nFix the following build breakage in v3.4-rc1:\n\n CC arch/sparc/kernel/cpu.o\nIn file included from /home/aaro/git/linux/arch/sparc/include/asm/pgtable_64.h:15:0,\n from /home/aaro/git/linux/arch/sparc/include/asm/pgtable.h:4,\n from arch/sparc/kernel/cpu.c:15:\ninclude/asm-generic/pgtable-nopud.h:13:16: error: unknown type name \u0027pgd_t\u0027\ninclude/asm-generic/pgtable-nopud.h:25:28: error: unknown type name \u0027pgd_t\u0027\ninclude/asm-generic/pgtable-nopud.h:26:27: error: unknown type name \u0027pgd_t\u0027\ninclude/asm-generic/pgtable-nopud.h:27:31: error: unknown type name \u0027pgd_t\u0027\ninclude/asm-generic/pgtable-nopud.h:28:30: error: unknown type name \u0027pgd_t\u0027\ninclude/asm-generic/pgtable-nopud.h:38:34: error: unknown type name \u0027pgd_t\u0027\nIn file included from /home/aaro/git/linux/arch/sparc/include/asm/pgtable_64.h:783:0,\n from /home/aaro/git/linux/arch/sparc/include/asm/pgtable.h:4,\n from arch/sparc/kernel/cpu.c:15:\ninclude/asm-generic/pgtable.h: In function \u0027pgd_none_or_clear_bad\u0027:\ninclude/asm-generic/pgtable.h:258:2: error: implicit declaration of function \u0027pgd_none\u0027 [-Werror\u003dimplicit-function-declaration]\ninclude/asm-generic/pgtable.h:260:2: error: implicit declaration of function \u0027pgd_bad\u0027 [-Werror\u003dimplicit-function-declaration]\ninclude/asm-generic/pgtable.h: In function \u0027pud_none_or_clear_bad\u0027:\ninclude/asm-generic/pgtable.h:269:6: error: request for member \u0027pgd\u0027 in something not a structure or union\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nSigned-off-by: Aaro Koskinen \u003caaro.koskinen@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "450aed725c9a53282483c48ebd012feefae94a07", "tree": "2cbd5e664c0f66490294a641033cf361820a3564", "parents": [ "6cfeba53911d6d2f17ebbd1246893557d5ff5aeb" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 18 13:20:27 2012 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:53 2012 +0200" }, "message": "m68k/q40: Add missing platform check before registering platform devices\n\nOn multi-platform kernels, the Q40/Q60 platform devices should be\nregistered when running on Q40/Q60 only. Else it may crash later.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "6cfeba53911d6d2f17ebbd1246893557d5ff5aeb", "tree": "ec74c829f11b9fe5b4fa5c35cffd61f83454ad22", "parents": [ "7224c0d1045327d637dab2c90777b6d5ec6d6804" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 18 13:21:38 2012 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:51 2012 +0200" }, "message": "m68k/mac: Add missing platform check before registering platform devices\n\nOn multi-platform kernels, the Mac platform devices should be registered\nwhen running on Mac only. Else it may crash later.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "7224c0d1045327d637dab2c90777b6d5ec6d6804", "tree": "ef39bbd027772ebec21435f762815d783ba0e3da", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Mar 30 15:52:09 2012 +1000" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 01 22:57:49 2012 +0200" }, "message": "m68k: include asm/cmpxchg.h in our m68k atomic.h\n\nAfter commit 9ffc93f203c18a70623f21950f1dd473c9ec48cd (\"Remove all\n\n CC init/main.o\nIn file included from include/linux/mm.h:15:0,\n from include/linux/ring_buffer.h:5,\n from include/linux/ftrace_event.h:4,\n from include/trace/syscall.h:6,\n from include/linux/syscalls.h:78,\n from init/main.c:16:\ninclude/linux/debug_locks.h: In function ‘__debug_locks_off’:\ninclude/linux/debug_locks.h:16:2: error: implicit declaration of function ‘xchg’\n\nThere is no indirect inclusions of the new asm/cmpxchg.h for m68k here.\nLooking at most other architectures they include asm/cmpxchg.h in their\nasm/atomic.h. M68k currently does not do this. Including this in atomic.h\nfixes all m68k build problems.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "cdaf0b835df04177397b90214f8b457fd23b67e0", "tree": "a1d291b17a63a4cd9c2c213351a1f12b02d07a34", "parents": [ "6523cf9a460c488c681b7e4ecef2395491de1d4e" ], "author": { "name": "stigge@antcom.de", "email": "stigge@antcom.de", "time": "Wed Mar 28 12:36:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "net: lpc_eth: Fix rename of dev_hw_addr_random\n\nIn parallel to the integration of lpc_eth.c, dev_hw_addr_random() has been\nrenamed to eth_hw_addr_random(). This patch fixes it also in the new driver\nlpc_eth.c.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6523cf9a460c488c681b7e4ecef2395491de1d4e", "tree": "6783e2d14e9a767058837f343a3748e5ecffc111", "parents": [ "81213b5e8ae68e204aa7a3f83c4f9100405dbff9" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Mar 28 12:10:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "net/netfilter/nfnetlink_acct.c: use linux/atomic.h\n\nThere\u0027s no known problem here, but this is one of only two non-arch files\nin the kernel which use asm/atomic.h instead of linux/atomic.h.\n\nAcked-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81213b5e8ae68e204aa7a3f83c4f9100405dbff9", "tree": "cf12b20ee5162471bf0a319beb3db8657f190c28", "parents": [ "464b57da56910c8737ede75ad820b9a7afc46b3e" ], "author": { "name": "danborkmann@iogearbox.net", "email": "danborkmann@iogearbox.net", "time": "Tue Mar 27 22:47:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "rose_dev: fix memcpy-bug in rose_set_mac_address\n\nIf both addresses equal, nothing needs to be done. If the device is down,\nthen we simply copy the new address to dev-\u003edev_addr. If the device is up,\nthen we add another loopback device with the new address, and if that does\nnot fail, we remove the loopback device with the old address. And only\nthen, we update the dev-\u003edev_addr.\n\nSigned-off-by: Daniel Borkmann \u003cdaniel.borkmann@tik.ee.ethz.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "464b57da56910c8737ede75ad820b9a7afc46b3e", "tree": "0d5ec220c1dbe97b9fdfe4f6bd0e748cddf191a7", "parents": [ "67378563df2e168d32a4054616f244a91aec462d" ], "author": { "name": "Kenth Eriksson", "email": "kenth.eriksson@transmode.com", "time": "Tue Mar 27 22:05:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:12 2012 -0400" }, "message": "Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.\n\nThe merge done in commit b26e478f undid bug fix in commit c3e072f8\n(\"net: fsl_pq_mdio: fix non tbi phy access\"), with the result that non\nTBI (e.g. MDIO) PHYs cannot be accessed.\n\nSigned-off-by: Kenth Eriksson \u003ckenth.eriksson@transmode.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67378563df2e168d32a4054616f244a91aec462d", "tree": "ef7a14168f63eedbdcfdc0f3345d48dc21cbd352", "parents": [ "54f5ffbf308828b588b9d1acd9a512d433be8a09" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Tue Mar 27 09:01:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:11 2012 -0400" }, "message": "net/garp: avoid infinite loop if attribute already exists\n\nAn infinite loop occurred if garp_attr_create was called with the values\nof an existing attribute. This might happen if a previous leave request\nfor the attribute has not yet been followed by a PDU transmission (or,\nif the application previously issued a join request for the attribute\nand is now issuing another one, without having issued a leave request).\n\nIf garp_attr_create finds an existing attribute having the same values,\nreturn the address to it. Its state will then get updated (i.e., if it\nwas in a leaving state, it will move into a non-leaving state and not\nget deleted during the next PDU transmission).\n\nTo accomplish this fix, collapse garp_attr_insert into garp_attr_create\n(which is its only caller).\n\nThanks to Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e for contributing to\nthis fix.\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nAcked-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "54f5ffbf308828b588b9d1acd9a512d433be8a09", "tree": "02746522e57bd0c92432a17d53ba40666cd41ced", "parents": [ "1d24fb3684f347226747c6b11ea426b7b992694e", "de312db345f9770b64ff39ef5a7f86f6358e93cc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:08 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 16:47:08 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "fbc729a446f7d80ec8b73fe90d8c0cc3e95ad277", "tree": "081220f0cba43480b46da505f182705093b62b1e", "parents": [ "6f7805a8d9dc6fa8af999f8603188157505558d9" ], "author": { "name": "Andre Przywara", "email": "andre.przywara@amd.com", "time": "Fri Mar 30 16:48:20 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:25:56 2012 -0700" }, "message": "hwmon: (k10temp) Add support for AMD Trinity CPUs\n\nThe on-chip northbridge\u0027s temperature sensor of the upcoming\nAMD Trinity CPUs works the same as for the previous CPUs.\nSince it has a different PCI-ID, we just add the new one to the list\nsupported by k10temp.\nThis allows to use the k10temp driver on those CPUs.\n\nSigned-off-by: Andre Przywara \u003candre.przywara@amd.com\u003e\nCc: stable@vger.kernel.org # 3.0+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "6f7805a8d9dc6fa8af999f8603188157505558d9", "tree": "69bd439afdba007019204a0580c97495c3d4b033", "parents": [ "31e354ee653c3d85e802a372f27224130fc95011" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Mar 30 16:04:55 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:24:36 2012 -0700" }, "message": "hwmon: (w83627ehf) mark const init data with __initconst instead of __initdata\n\nAs long as there is no other non-const variable marked __initdata in the\nsame compilation unit it doesn\u0027t hurt. If there were one however\ncompilation would fail with\n\n\terror: $variablename causes a section type conflict\n\nbecause a section containing const variables is marked read only and so\ncannot contain non-const variables.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: lm-sensors@lm-sensors.org\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "31e354ee653c3d85e802a372f27224130fc95011", "tree": "7141540fe458224d870c7e106581dfc9d9fb7298", "parents": [ "ce15a81da33b961852f6e6a55305ccc60856de25" ], "author": { "name": "Kyle McMartin", "email": "kyle@redhat.com", "time": "Wed Mar 28 15:11:47 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:24:36 2012 -0700" }, "message": "hwmon: (acpi_power_meter) fix lockdep spew due to non-static lock class\n\nSimilar to a30dcb4f which fixed asus_atk0110.ko, I recently received a\nbug report from someone hitting the same issue in acpi_power_meter.\n\n[ 13.963168] power_meter ACPI000D:00: Found ACPI power meter.\n[ 13.963900] BUG: key ffff8802161f3920 not in .data!\n[ 13.963904] ------------[ cut here ]------------\n[ 13.963915] WARNING: at kernel/lockdep.c:2986\n\tlockdep_init_map+0x52f/0x560()\n\nSo let\u0027s fix that up for them by statically declaring the\nlockdep_class_key.\n\nSigned-off-by: Kyle McMartin \u003ckyle@redhat.com\u003e\nCc: stable@vger.kernel.org # 3.0+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "ce15a81da33b961852f6e6a55305ccc60856de25", "tree": "5aebc56efafb1b8d0af2fcc453f7331b32e6021f", "parents": [ "6394011d65b7e74666f07cca98747601cf8298fa" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Sat Mar 24 08:51:05 2012 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:24:35 2012 -0700" }, "message": "hwmon: (adm1031) Fix compiler warning\n\nSome configurations produce the following compile warning:\n\ndrivers/hwmon/adm1031.c: In function \u0027set_fan_auto_channel\u0027:\ndrivers/hwmon/adm1031.c:292: warning: \u0027reg\u0027 may be used uninitialized in this function\n\nWhile this is a false positive, it can easily be fixed by overloading the return\nvalue from get_fan_auto_nearest with both register value and error return code\n(the register value is never negative). Coincidentially, that also reduces\nmodule size by a few bytes.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "6394011d65b7e74666f07cca98747601cf8298fa", "tree": "18036d2fd612797970611b65f19c91947687af9f", "parents": [ "52f30f77171f934cb9562908cb279178b890a048" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Sat Mar 24 08:38:21 2012 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:24:34 2012 -0700" }, "message": "hwmon: (f75375s) Fix warning message seen in some configurations\n\nIn some configurations, BUG() does not result in an endless loop but returns to\nthe caller. This results in the following compiler warning:\n\ndrivers/hwmon/f75375s.c: In function \u0027duty_mode_enabled\u0027:\ndrivers/hwmon/f75375s.c:280: warning: control reaches end of non-void function\ndrivers/hwmon/f75375s.c: In function \u0027auto_mode_enabled\u0027:\ndrivers/hwmon/f75375s.c:295: warning: control reaches end of non-void function\n\nFix the warning by returning something sensible after BUG().\n\nCc: Nikolaus Schulz \u003cschulz@macnetix.de\u003e\nCc: Riku Voipio \u003criku.voipio@iki.fi\u003e\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "52f30f77171f934cb9562908cb279178b890a048", "tree": "1c6f67cfe7954a4fc971bed22672631b65c47a78", "parents": [ "be45d422d96ba22ecd0e34690644099d172e9c6d" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Mar 22 16:23:58 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:24:08 2012 -0700" }, "message": "hwmon: (max6639) Convert to dev_pm_ops\n\nThe I2C specific PM operations have been deprecated and printing a\nwarning on boot for over a year now.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n[guenter.roeck@ericsson.com: Added missing #ifdef around pm functions]\nCc: stable@vger.kernel.org # 3.0+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "be45d422d96ba22ecd0e34690644099d172e9c6d", "tree": "774845676b111c92ba83f6a4fdab2d335189837d", "parents": [ "c1a1260244d8ffe017fbb3199f65c842e4d42fe6" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Tue Mar 20 23:06:35 2012 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Apr 01 10:09:53 2012 -0700" }, "message": "hwmon: (sht15) Fix Kconfig dependencies\n\nsht15 depends on GPIOLIB, not on GENERIC_GPIO.\n\nThis fixes the following build error, seen if GPIOLIB is not defined:\n\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_direction_input\u0027: \u003d\u003e 293:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_direction_output\u0027: \u003d\u003e 216:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_free\u0027: \u003d\u003e 1000:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_get_value\u0027: \u003d\u003e 296:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_request\u0027: \u003d\u003e 946:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_set_value\u0027: \u003d\u003e 218:2\nsrc/drivers/hwmon/sht15.c: error: implicit declaration of function \u0027gpio_to_irq\u0027: \u003d\u003e 514:2\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" } ], "next": "c1a1260244d8ffe017fbb3199f65c842e4d42fe6" }