)]}' { "log": [ { "commit": "7c7c7f01cc5e3e423120a4848a73dd5e4586f2f9", "tree": "bdd15c5e435b1a380adbf5c4a7d05e7ef44d7403", "parents": [ "252c3d84ed398b090ac2dace46fc6faa6cfaea99" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jan 11 19:30:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 13 10:12:23 2012 -0800" }, "message": "vhost-net: add module alias (v2.1)\n\nBy adding some module aliases, programs (or users) won\u0027t have to explicitly\ncall modprobe. Vhost-net will always be available if built into the kernel.\nIt does require assigning a permanent minor number for depmod to work.\n\nAlso:\n - use C99 style initialization.\n - add missing entry in documentation for loop-control\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-By: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "099469502f62fbe0d7e4f0b83a2f22538367f734", "tree": "5229c3818b2e6e09d35026d49314047121130536", "parents": [ "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "35f1526845a9d804206883e19bd257d3dcef758f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb, take two\")\n\nAndrew explains:\n\n - various misc stuff\n\n - Most of the rest of MM: memcg, threaded hugepages, others.\n\n - cpumask\n\n - kexec\n\n - kdump\n\n - some direct-io performance tweaking\n\n - radix-tree optimisations\n\n - new selftests code\n\n A note on this: often people will develop a new userspace-visible\n feature and will develop userspace code to exercise/test that\n feature. Then they merge the patch and the selftest code dies.\n Sometimes we paste it into the changelog. Sometimes the code gets\n thrown into Documentation/(!).\n\n This saddens me. So this patch creates a bare-bones framework which\n will henceforth allow me to ask people to include their test apps in\n the kernel tree so we can keep them alive. Then when people enhance\n or fix the feature, I can ask them to update the test app too.\n\n The infrastruture is terribly trivial at present - let\u0027s see how it\n evolves.\n\n - checkpoint/restart feature work.\n\n A note on this: this is a project by various mad Russians to perform\n c/r mainly from userspace, with various oddball helper code added\n into the kernel where the need is demonstrated.\n\n So rather than some large central lump of code, what we have is\n little bits and pieces popping up in various places which either\n expose something new or which permit something which is normally\n kernel-private to be modified.\n\n The overall project is an ongoing thing. I\u0027ve judged that the size\n and scope of the thing means that we\u0027re more likely to be successful\n with it if we integrate the support into mainline piecemeal rather\n than allowing it all to develop out-of-tree.\n\n However I\u0027m less confident than the developers that it will all\n eventually work! So what I\u0027m asking them to do is to wrap each piece\n of new code inside CONFIG_CHECKPOINT_RESTORE. So if it all\n eventually comes to tears and the project as a whole fails, it should\n be a simple matter to go through and delete all trace of it.\n\nThis lot pretty much wraps up the -rc1 merge for me.\n\n* akpm: (96 commits)\n unlzo: fix input buffer free\n ramoops: update parameters only after successful init\n ramoops: fix use of rounddown_pow_of_two()\n c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4\n c/r: introduce CHECKPOINT_RESTORE symbol\n selftests: new x86 breakpoints selftest\n selftests: new very basic kernel selftests directory\n radix_tree: take radix_tree_path off stack\n radix_tree: remove radix_tree_indirect_to_ptr()\n dio: optimize cache misses in the submission path\n vfs: cache request_queue in struct block_device\n fs/direct-io.c: calculate fs_count correctly in get_more_blocks()\n drivers/parport/parport_pc.c: fix warnings\n panic: don\u0027t print redundant backtraces on oops\n sysctl: add the kernel.ns_last_pid control\n kdump: add udev events for memory online/offline\n include/linux/crash_dump.h needs elf.h\n kdump: fix crash_kexec()/smp_send_stop() race in panic()\n kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n ...\n" }, { "commit": "b3f7f573a20081910e34e99cbc91831f4f02f1ff", "tree": "2c0aea64b3be4c24f84be6a5275f7202e0dde594", "parents": [ "067bce1a06c1f84146f873a598cd7c3a28eee1d5" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu Jan 12 17:20:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4\n\nThe mm-\u003estart_code/end_code, mm-\u003estart_data/end_data, mm-\u003estart_brk are\ninvolved into calculation of program text/data segment sizes (which might\nbe seen in /proc/\u003cpid\u003e/statm) and into brk() call final address.\n\nFor restore we need to know all these values. While\nmm-\u003estart_code/end_code already present in /proc/$pid/stat, the rest\nmembers are not, so this patch brings them in.\n\nThe restore procedure of these members is addressed in another patch using\nprctl().\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b8f566b04d3cddd192cfd2418ae6d54ac6353792", "tree": "32a5bf86548cd43feff4822d800b6a99e157b5d7", "parents": [ "f5138e42211d4e8bfbd6ac5b3816348da1533433" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Jan 12 17:20:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "sysctl: add the kernel.ns_last_pid control\n\nThe sysctl works on the current task\u0027s pid namespace, getting and setting\nits last_pid field.\n\nWriting is allowed for CAP_SYS_ADMIN-capable tasks thus making it possible\nto create a task with desired pid value. This ability is required badly\nfor the checkpoint/restore in userspace.\n\nThis approach suits all the parties for now.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0527b6903b2838e214c895d527806aefd61b3c8f", "tree": "d9f3eebcf0e43d927ad3a12da1f4dfe56a27c014", "parents": [ "d66c1ce7df6ceb94d1902ac865ad50df4ffdb95f" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Thu Jan 12 17:18:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:06 2012 -0800" }, "message": "memcg: fix pgpgin/pgpgout documentation\n\nThe two memcg stats pgpgin/pgpgout have different meaning than the ones\nin vmstat, which indicates that we picked a bad naming for them.\n\nIt might be late to change the stat name, but better documentation is\nalways helpful.\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d66c1ce7df6ceb94d1902ac865ad50df4ffdb95f", "tree": "84a00a55104d607dbb405a0b80f638dae053db66", "parents": [ "f53d7ce32e13dbd09573b176e6521a04c2c77803" ], "author": { "name": "Zhu Yanhai", "email": "zhu.yanhai@gmail.com", "time": "Thu Jan 12 17:18:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:06 2012 -0800" }, "message": "Documentation/cgroups/memory.txt: fix typo\n\nIt should be memsw.max_usage_in_bytes. This typo has been there for\na really long time.\n\nSigned-off-by: Zhu Yanhai \u003cgaoyang.zyh@taobao.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "888a214dc4c65e1486ef7d3ac6b0cf93ae3cc2c7", "tree": "d371fad11fae907025eb9766d9b2c66978b0e41f", "parents": [ "15ee2d000dd5813fcf1204b078fa276e57046b64" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Thu Jan 12 17:17:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:04 2012 -0800" }, "message": "slub: document setting min order with debug_guardpage_minorder \u003e 0\n\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bcf8a3dfcb274cf6654a19e12e244f3af8c0d355", "tree": "f1d0e0f36c0575a9202750aff65ba17ce91bc437", "parents": [ "61bd5e5683244a564ecfe31c73575ee0bc708ccc", "b6c96c0214138186f495e3ee73737c6fc5e4efa2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "message": "Merge tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux\n\n* tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux: (24 commits)\n lguest: Make sure interrupt is allocated ok by lguest_setup_irq\n lguest: move the lguest tool to the tools directory\n lguest: switch segment-voodoo-numbers to readable symbols\n virtio: balloon: Add freeze, restore handlers to support S4\n virtio: balloon: Move vq initialization into separate function\n virtio: net: Add freeze, restore handlers to support S4\n virtio: net: Move vq and vq buf removal into separate function\n virtio: net: Move vq initialization into separate function\n virtio: blk: Add freeze, restore handlers to support S4\n virtio: blk: Move vq initialization to separate function\n virtio: console: Disable callbacks for virtqueues at start of S4 freeze\n virtio: console: Add freeze and restore handlers to support S4\n virtio: console: Move vq and vq buf removal into separate functions\n virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff\n virtio: pci: switch to new PM API\n virtio_blk: fix config handler race\n virtio: add debugging if driver doesn\u0027t kick.\n virtio: expose added descriptors immediately.\n virtio: avoid modulus operation.\n virtio: support unlocked queue kick\n ...\n" }, { "commit": "a429638cac1e5c656818a45aaff78df7b743004e", "tree": "0465e0d7a431bff97a3dd5a1f91d9b30c69ae0d8", "parents": [ "5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274", "9e4ce164ee3a1d07580f017069c25d180b0aa785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)\n ASoC: twl6040 - Add method to query optimum PDM_DL1 gain\n ALSA: hda - Fix the lost power-setup of seconary pins after PM resume\n ALSA: usb-audio: add Yamaha MOX6/MOX8 support\n ALSA: virtuoso: add S/PDIF input support for all Xonars\n ALSA: ice1724 - Support for ooAoo SQ210a\n ALSA: ice1724 - Allow card info based on model only\n ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations\n ALSA: hdspm - Provide unique driver id based on card serial\n ASoC: Dynamically allocate the rtd device for a non-empty release()\n ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC\n ALSA: hda - Fix the detection of \"Loopback Mixing\" control for VIA codecs\n ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs\n ALSA: hda - Use auto-parser for HP laptops with cx20459 codec\n ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()\n ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()\n ALSA: hda/cirrus - support for iMac12,2 model\n ASoC: cx20442: add bias control over a platform provided regulator\n ALSA: usb-audio - Avoid flood of frame-active debug messages\n ALSA: snd-usb-us122l: Delete calls to preempt_disable\n mfd: Put WM8994 into cache only mode when suspending\n ...\n\nFix up trivial conflicts in:\n - arch/arm/mach-s3c64xx/mach-crag6410.c:\n\trenamed speyside_wm8962 to tobermory, added littlemill right\n\tnext to it\n - drivers/base/regmap/{regcache.c,regmap.c}:\n\tduplicate diff that had already come in with other changes in\n\tthe regmap tree\n" }, { "commit": "9e4ce164ee3a1d07580f017069c25d180b0aa785", "tree": "7569661eae727a5a349e4c98dba42ca681857462", "parents": [ "627b79628f56c3deeb17dec1edf6899b49552fa4", "f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jan 12 09:59:18 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jan 12 09:59:18 2012 +0100" }, "message": "Merge branch \u0027topic/hda\u0027 into for-linus\n" }, { "commit": "627b79628f56c3deeb17dec1edf6899b49552fa4", "tree": "deac8b2cce5d70708fa944a270ee031f069226d8", "parents": [ "29abceb67f8a230da806db4ed73899595bd2ae76", "8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jan 12 09:59:14 2012 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jan 12 09:59:14 2012 +0100" }, "message": "Merge branch \u0027topic/misc\u0027 into for-linus\n" }, { "commit": "07fe9977b6234ede1bd29e10e0323e478860c871", "tree": "802e48e78503b82953b9ff415f882fb6edb05dbc", "parents": [ "39082f7e5912cdc70f9ab0767e7342711f34b9f8" ], "author": { "name": "Davidlohr Bueso", "email": "dave@gnu.org", "time": "Thu Jan 12 15:44:47 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:47 2012 +1030" }, "message": "lguest: move the lguest tool to the tools directory\n\nThis is a better location instead of having it in Documentation.\n\nSigned-off-by: Davidlohr Bueso \u003cdave@gnu.org\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (fixed compile)\n" }, { "commit": "541048a1d31399ccdda27346a37eae4a2ad55186", "tree": "e2a820ee478b18d4214347631b94b9a9b2d8562b", "parents": [ "bcede2f64a3b5cb50c0bdec1553ab480fd75d659", "e58d429209105e698e9d0357481d62b37fe9a7dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "message": "Merge branch \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, reboot: Fix typo in nmi reboot path\n x86, NMI: Add to_cpumask() to silence compile warning\n x86, NMI: NMI selftest depends on the local apic\n x86: Add stack top margin for stack overflow checking\n x86, NMI: NMI-selftest should handle the UP case properly\n x86: Fix the 32-bit stackoverflow-debug build\n x86, NMI: Add knob to disable using NMI IPIs to stop cpus\n x86, NMI: Add NMI IPI selftest\n x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus\n x86: Clean up the range of stack overflow checking\n x86: Panic on detection of stack overflow\n x86: Check stack overflow in detail\n" }, { "commit": "b24ca57e7625bc304e77bc429693ad32a691eb16", "tree": "770aa389c6e763cf37776a35e85ff1e41958b1e9", "parents": [ "6296e5d3c067df41980a5fd09ad4cc6765f79bb9", "913272b3864d6da89c70d9fc2c30ccb57794b369" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:53:05 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:53:05 2012 -0800" }, "message": "Merge git://git.infradead.org/battery-2.6\n\n* git://git.infradead.org/battery-2.6: (68 commits)\n power_supply: Mark da9052 driver as broken\n power_supply: Drop usage of nowarn variant of sysfs_create_link()\n s3c_adc_battery: Average over more than one adc sample\n power_supply: Add DA9052 battery driver\n isp1704_charger: Fix missing check\n jz4740-battery: Fix signedness bug\n power_supply: Assume mains power by default\n sbs-battery: Fix devicetree match table\n ARM: rx51: Add bq27200 i2c board info\n sbs-battery: Change power supply name\n devicetree-bindings: Propagate bq20z75-\u003esbs rename to dt bindings\n devicetree-bindings: Add vendor entry for Smart Battery Systems\n sbs-battery: Rename internals to new name\n bq20z75: Rename to sbs-battery\n wm97xx_battery: Use DEFINE_MUTEX() for work_lock\n max8997_charger: Remove duplicate module.h\n lp8727_charger: Some minor fixes for the header\n lp8727_charger: Add header file\n power_supply: Convert drivers/power/* to use module_platform_driver()\n power_supply: Add \"unknown\" in power supply type\n ...\n" }, { "commit": "6296e5d3c067df41980a5fd09ad4cc6765f79bb9", "tree": "ac10bc5321ac1d750612c0e0ae53d6c4097c5734", "parents": [ "c086ae4ed94f9a1d283318e006813268c2dbf9fc", "5878cf431ca7233a56819ca6970153ac0b129599" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:52:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:52:23 2012 -0800" }, "message": "Merge branch \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux\n\n* \u0027slab/for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:\n slub: disallow changing cpu_partial from userspace for debug caches\n slub: add missed accounting\n slub: Extract get_freelist from __slab_alloc\n slub: Switch per cpu partial page support off for debugging\n slub: fix a possible memleak in __slab_alloc()\n slub: fix slub_max_order Documentation\n slub: add missed accounting\n slab: add taint flag outputting to debug paths.\n slub: add taint flag outputting to debug paths\n slab: introduce slab_max_order kernel parameter\n slab: rename slab_break_gfp_order to slab_max_order\n" }, { "commit": "7b67e751479d50b7f84d1a3cc5216eed5e534b66", "tree": "a1a6746857cf65f04dde739fe271bf4143d55eaf", "parents": [ "9f13a1fd452f11c18004ba2422a6384b424ec8a9", "76ccc297018d25d55b789bbd508861ef1e2cdb0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)\n x86/PCI: Expand the x86_msi_ops to have a restore MSIs.\n PCI: Increase resource array mask bit size in pcim_iomap_regions()\n PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES\n PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)\n PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB\n x86/PCI: amd: factor out MMCONFIG discovery\n PCI: Enable ATS at the device state restore\n PCI: msi: fix imbalanced refcount of msi irq sysfs objects\n PCI: kconfig: English typo in pci/pcie/Kconfig\n PCI/PM/Runtime: make PCI traces quieter\n PCI: remove pci_create_bus()\n xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources\n x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()\n x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()\n x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan\n sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources\n sparc/PCI: convert to pci_create_root_bus()\n sh/PCI: convert to pci_scan_root_bus() for correct root bus resources\n powerpc/PCI: convert to pci_create_root_bus()\n powerpc/PCI: split PHB part out of pcibios_map_io_space()\n ...\n\nFix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due\nto the same patches being applied in other branches.\n" }, { "commit": "5878cf431ca7233a56819ca6970153ac0b129599", "tree": "e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7", "parents": [ "74ee4ef1f901fbb014bdcdc9171d126490ce2b62", "b13683d1cc14d1dd30b8e20f3ebea3f814ad029f" ], "author": { "name": "Pekka Enberg", "email": "penberg@kernel.org", "time": "Wed Jan 11 21:11:29 2012 +0200" }, "committer": { "name": "Pekka Enberg", "email": "penberg@kernel.org", "time": "Wed Jan 11 21:11:29 2012 +0200" }, "message": "Merge branch \u0027slab/urgent\u0027 into slab/for-linus\n" }, { "commit": "e7691a1ce341c80ed9504244a36b31c025217391", "tree": "e9941bb350f64a726130e299c411821da6f41a53", "parents": [ "5cd9599bba428762025db6027764f1c59d0b1e1b", "8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 21:51:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 21:51:23 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security: (32 commits)\n ima: fix invalid memory reference\n ima: free duplicate measurement memory\n security: update security_file_mmap() docs\n selinux: Casting (void *) value returned by kmalloc is useless\n apparmor: fix module parameter handling\n Security: tomoyo: add .gitignore file\n tomoyo: add missing rcu_dereference()\n apparmor: add missing rcu_dereference()\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mpi/mpi-mpow: NULL dereference on allocation failure\n digsig: build dependency fix\n KEYS: Give key types their own lockdep class for key-\u003esem\n TPM: fix transmit_cmd error logic\n TPM: NSC and TIS drivers X86 dependency fix\n TPM: Export wait_for_stat for other vendor specific drivers\n TPM: Use vendor specific function for status probe\n tpm_tis: add delay after aborting command\n tpm_tis: Check return code from getting timeouts/durations\n tpm: Introduce function to poll for result of self test\n ...\n\nFix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI\nand SIGSIG next to CONFIG_DQL addition.\n" }, { "commit": "06792c4dde2ad143928cc95c1ba218c6269c494b", "tree": "92bdd4631612c9e3d8e5f6f06839f75c5473300a", "parents": [ "4690dfa8cd66c37fbe99bb8cd5baa86102110776", "166c0eaedfc3157dc1394c27e827add19f05fb27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:39:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 17:39:40 2012 -0800" }, "message": "Merge tag \u0027for-linux-3.3-merge-window\u0027 of git://linux-c6x.org/git/projects/linux-c6x-upstreaming\n\n* tag \u0027for-linux-3.3-merge-window\u0027 of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: (29 commits)\n C6X: replace tick_nohz_stop/restart_sched_tick calls\n C6X: add register_cpu call\n C6X: deal with memblock API changes\n C6X: fix timer64 initialization\n C6X: fix layout of EMIFA registers\n C6X: MAINTAINERS\n C6X: DSCR - Device State Configuration Registers\n C6X: EMIF - External Memory Interface\n C6X: general SoC support\n C6X: library code\n C6X: headers\n C6X: ptrace support\n C6X: loadable module support\n C6X: cache control\n C6X: clocks\n C6X: build infrastructure\n C6X: syscalls\n C6X: interrupt handling\n C6X: time management\n C6X: signal management\n ...\n" }, { "commit": "40ba587923ae67090d9f141c1d3c951be5c1420e", "tree": "342a72fc0ee13a0d2496ef970b64dfeadf1355d2", "parents": [ "54c2c5761febcca46c8037d3a81612991e6c209a", "6b550f9495947fc279d12c38feaf98500e8d0646" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb\")\n\nAndrew elucidates:\n - First installmeant of MM. We have a HUGE number of MM patches this\n time. It\u0027s crazy.\n - MAINTAINERS updates\n - backlight updates\n - leds\n - checkpatch updates\n - misc ELF stuff\n - rtc updates\n - reiserfs\n - procfs\n - some misc other bits\n\n* akpm: (124 commits)\n user namespace: make signal.c respect user namespaces\n workqueue: make alloc_workqueue() take printf fmt and args for name\n procfs: add hidepid\u003d and gid\u003d mount options\n procfs: parse mount options\n procfs: introduce the /proc/\u003cpid\u003e/map_files/ directory\n procfs: make proc_get_link to use dentry instead of inode\n signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n sparc: make SA_NOMASK a synonym of SA_NODEFER\n reiserfs: don\u0027t lock root inode searching\n reiserfs: don\u0027t lock journal_init()\n reiserfs: delay reiserfs lock until journal initialization\n reiserfs: delete comments referring to the BKL\n drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range\n drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n drivers/rtc/: remove redundant spi driver bus initialization\n drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static\n drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static\n rtc: convert drivers/rtc/* to use module_platform_driver()\n drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()\n drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler\n ...\n" }, { "commit": "0499680a42141d86417a8fbaa8c8db806bea1201", "tree": "eb2aeb559bf5418476319aa81fa4f6ed3659bbc0", "parents": [ "97412950b10e64f347aec4a9b759395c2465adf6" ], "author": { "name": "Vasiliy Kulikov", "email": "segooon@gmail.com", "time": "Tue Jan 10 15:11:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "procfs: add hidepid\u003d and gid\u003d mount options\n\nAdd support for mount options to restrict access to /proc/PID/\ndirectories. The default backward-compatible \"relaxed\" behaviour is left\nuntouched.\n\nThe first mount option is called \"hidepid\" and its value defines how much\ninfo about processes we want to be available for non-owners:\n\nhidepid\u003d0 (default) means the old behavior - anybody may read all\nworld-readable /proc/PID/* files.\n\nhidepid\u003d1 means users may not access any /proc/\u003cpid\u003e/ directories, but\ntheir own. Sensitive files like cmdline, sched*, status are now protected\nagainst other users. As permission checking done in proc_pid_permission()\nand files\u0027 permissions are left untouched, programs expecting specific\nfiles\u0027 modes are not confused.\n\nhidepid\u003d2 means hidepid\u003d1 plus all /proc/PID/ will be invisible to other\nusers. It doesn\u0027t mean that it hides whether a process exists (it can be\nlearned by other means, e.g. by kill -0 $PID), but it hides process\u0027 euid\nand egid. It compicates intruder\u0027s task of gathering info about running\nprocesses, whether some daemon runs with elevated privileges, whether\nanother user runs some sensitive program, whether other users run any\nprogram at all, etc.\n\ngid\u003dXXX defines a group that will be able to gather all processes\u0027 info\n(as in hidepid\u003d0 mode). This group should be used instead of putting\nnonroot user in sudoers file or something. However, untrusted users (like\ndaemons, etc.) which are not supposed to monitor the tasks in the whole\nsystem should not be added to the group.\n\nhidepid\u003d1 or higher is designed to restrict access to procfs files, which\nmight reveal some sensitive private information like precise keystrokes\ntimings:\n\nhttp://www.openwall.com/lists/oss-security/2011/11/05/3\n\nhidepid\u003d1/2 doesn\u0027t break monitoring userspace tools. ps, top, pgrep, and\nconky gracefully handle EPERM/ENOENT and behave as if the current user is\nthe only user running processes. pstree shows the process subtree which\ncontains \"pstree\" process.\n\nNote: the patch doesn\u0027t deal with setuid/setgid issues of keeping\npreopened descriptors of procfs files (like\nhttps://lkml.org/lkml/2011/2/7/368). We rely on that the leaked\ninformation like the scheduling counters of setuid apps doesn\u0027t threaten\nanybody\u0027s privacy - only the user started the setuid program may read the\ncounters.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nCc: Theodore Tso \u003ctytso@MIT.EDU\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "948170f8944dfd29d13612fff48110a9814daeb1", "tree": "6d88f55925e407c096db6a6bc4df4ad3b5c2448d", "parents": [ "6c3fb55793f79bc975df0494c4d56ea6f0b0cc45" ], "author": { "name": "Benoit Cousson", "email": "b-cousson@ti.com", "time": "Tue Jan 10 15:10:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:53 2012 -0800" }, "message": "drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n\nAdd the DT support for the TI rtc-twl present in the twl4030 and twl6030\ndevices.\n\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nAcked-by: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dda367ac064d7473d397b1965019fb3be7cfb6b0", "tree": "332b14ebfc6340c6941be7ec64250093ee631f3d", "parents": [ "012e52e15e7ebbc7b08165e8f4b10f71a3e6810b" ], "author": { "name": "Mark Godfrey", "email": "mark.godfrey@stericsson.com", "time": "Tue Jan 10 15:10:42 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:52 2012 -0800" }, "message": "rtc/ab8500: add calibration attribute to AB8500 RTC\n\nThe rtc_calibration attribute allows user-space to get and set the\nAB8500\u0027s RtcCalibration register. The AB8500 will then use the value in\nthis register to compensate for RTC drift every 60 seconds.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Mark Godfrey \u003cmark.godfrey@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c0a32fc5a2e470d0b02597b23ad79a317735253e", "tree": "2d164edae0062918ca2088772c00b0615781353b", "parents": [ "1399ff86f2a2bbacbbe68fa00c5f8c752b344723" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue Jan 10 15:07:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:42 2012 -0800" }, "message": "mm: more intensive memory corruption debugging\n\nWith CONFIG_DEBUG_PAGEALLOC configured, the CPU will generate an exception\non access (read,write) to an unallocated page, which permits us to catch\ncode which corrupts memory. However the kernel is trying to maximise\nmemory usage, hence there are usually few free pages in the system and\nbuggy code usually corrupts some crucial data.\n\nThis patch changes the buddy allocator to keep more free/protected pages\nand to interlace free/protected and allocated pages to increase the\nprobability of catching corruption.\n\nWhen the kernel is compiled with CONFIG_DEBUG_PAGEALLOC,\ndebug_guardpage_minorder defines the minimum order used by the page\nallocator to grant a request. The requested size will be returned with\nthe remaining pages used as guard pages.\n\nThe default value of debug_guardpage_minorder is zero: no change from\ncurrent behaviour.\n\n[akpm@linux-foundation.org: tweak documentation, s/flg/flag/]\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90a5d5af74f6570af063fb6bff33c6b2f8361bbc", "tree": "3165cde652d1c8cf3c8817b34ba880fc35fa6c96", "parents": [ "b413d48aa70605701c0b395b2e350ca15f5d643a" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 10 15:07:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:41 2012 -0800" }, "message": "mm-tracepoint: fix documentation and examples\n\nWe renamed the page-free mm tracepoints.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b413d48aa70605701c0b395b2e350ca15f5d643a", "tree": "6aa777c589eedfb9dc498f375d553e561e203506", "parents": [ "da066ad3570b88e7dee82e76a06ee9a7adffcf0d" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 10 15:07:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:41 2012 -0800" }, "message": "mm-tracepoint: rename page-free events\n\nRename mm_page_free_direct into mm_page_free and mm_pagevec_free into\nmm_page_free_batched\n\nSince v2.6.33-5426-gc475dab the kernel triggers mm_page_free_direct for\nall freed pages, not only for directly freed. So, let\u0027s name it properly.\n For pages freed via page-list we also trigger mm_page_free_batched event.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "54c2c5761febcca46c8037d3a81612991e6c209a", "tree": "e6a686088f16e182138bdf8ae13f6cd27b8613b0", "parents": [ "609eac1c152353ee4cd6f292d49f0aa0b885951a", "ff9cb1c4eead5e4c292e75cd3170a82d66944101" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 15:51:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 15:51:48 2012 -0800" }, "message": "Merge tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nExt4 commits for 3.3 merge window\n\n* tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (32 commits)\n ext4: fix undefined behavior in ext4_fill_flex_info()\n ext4: make more symbols static\n ext4: make local symbol ext4_initxattrs static\n jbd2: fix hung processes in jbd2_journal_lock_updates()\n ext4: reserve new feature flag codepoints\n ext4: Report max_batch_time option correctly\n ext4: add missing ext4_resize_end on error paths\n ext4: let ext4_group_add() use common code\n ext4: let ext4_group_extend() use common code\n ext4: add new online resize interface\n ext4: add a new function which adds a flex group to a fs\n ext4: add a new function which allocates bitmaps and inode tables\n ext4: pass verify_reserved_gdb() the number of group decriptors\n ext4: add a function which updates the super block during online resizing\n ext4: add a function which sets up a block group descriptors of a flex bg\n ext4: add a function which sets up group blocks of a flex bg\n ext4: add a structure which will be used by 64bit-resize interface\n ext4: add a function which adds a new group descriptors to a fs\n ext4: add a function which extends a group without checking parameters\n ext4: use proper little-endian bitops\n ...\n" }, { "commit": "57eccf1c2acae2fcb748730881ba75643fc31c81", "tree": "be47ac42ef0b2e3e7157ce196ad2ed1224739c6c", "parents": [ "5c395ae7033099fc657114ea997858aa622f08b2", "074b1d12fe2500d7d453902f9266e6674b30d84c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 14:57:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 14:57:40 2012 -0800" }, "message": "Merge branch \u0027nfs-for-3.3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\n* \u0027nfs-for-3.3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Change the default setting of the nfs4_disable_idmapping parameter\n NFSv4: Save the owner/group name string when doing open\n NFS: Remove pNFS bloat from the generic write path\n pnfs-obj: Must return layout on IO error\n pnfs-obj: pNFS errors are communicated on iodata-\u003epnfs_error\n NFS: Cache state owners after files are closed\n NFS: Clean up nfs4_find_state_owners_locked()\n NFSv4: include bitmap in nfsv4 get acl data\n nfs: fix a minor do_div portability issue\n NFSv4.1: cleanup comment and debug printk\n NFSv4.1: change nfs4_free_slot parameters for dynamic slots\n NFSv4.1: cleanup init and reset of session slot tables\n NFSv4.1: fix backchannel slotid off-by-one bug\n nfs: fix regression in handling of context\u003d option in NFSv4\n NFS - fix recent breakage to NFS error handling.\n NFS: Retry mounting NFSROOT\n SUNRPC: Clean up the RPCSEC_GSS service ticket requests\n" }, { "commit": "7b3480f8b701170c046e1ed362946f5f0d005e13", "tree": "bd25e05b4f35699689b485480dddf24f840f80af", "parents": [ "1c8106528aa6bf16b3f457de80df1cf7462a49a4", "b60ef99c1164a8ad346cf41f9e71acfffb6d25a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 13:45:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 13:45:22 2012 -0800" }, "message": "Merge tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/mtd-2.6\n\nMTD pull for 3.3\n\n* tag \u0027for-linus-3.3\u0027 of git://git.infradead.org/mtd-2.6: (113 commits)\n mtd: Fix dependency for MTD_DOC200x\n mtd: do not use mtd-\u003eblock_markbad directly\n logfs: do not use \u0027mtd-\u003eblock_isbad\u0027 directly\n mtd: introduce mtd_can_have_bb helper\n mtd: do not use mtd-\u003esuspend and mtd-\u003eresume directly\n mtd: do not use mtd-\u003elock, unlock and is_locked directly\n mtd: do not use mtd-\u003esync directly\n mtd: harmonize mtd_writev usage\n mtd: do not use mtd-\u003elock_user_prot_reg directly\n mtd: mtd-\u003ewrite_user_prot_reg directly\n mtd: do not use mtd-\u003eread_*_prot_reg directly\n mtd: do not use mtd-\u003eget_*_prot_info directly\n mtd: do not use mtd-\u003eread_oob directly\n mtd: mtdoops: do not use mtd-\u003epanic_write directly\n romfs: do not use mtd-\u003eget_unmapped_area directly\n mtd: do not use mtd-\u003eget_unmapped_area directly\n mtd: do use mtd-\u003epoint directly\n mtd: introduce mtd_has_oob helper\n mtd: mtdcore: export symbols cleanup\n mtd: clean-up the default_mtd_writev function\n ...\n\nFix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c\n" }, { "commit": "1c8106528aa6bf16b3f457de80df1cf7462a49a4", "tree": "4aed009c4a36195fd14c9f8d70fe2723a49583da", "parents": [ "1a464cbb3d483f2f195b614cffa4aa1b910a0440", "f93ea733878733f3e98475bc3e2ccf789bebcfb8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:08:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 11:08:21 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (53 commits)\n iommu/amd: Set IOTLB invalidation timeout\n iommu/amd: Init stats for iommu\u003dpt\n iommu/amd: Remove unnecessary cache flushes in amd_iommu_resume\n iommu/amd: Add invalidate-context call-back\n iommu/amd: Add amd_iommu_device_info() function\n iommu/amd: Adapt IOMMU driver to PCI register name changes\n iommu/amd: Add invalid_ppr callback\n iommu/amd: Implement notifiers for IOMMUv2\n iommu/amd: Implement IO page-fault handler\n iommu/amd: Add routines to bind/unbind a pasid\n iommu/amd: Implement device aquisition code for IOMMUv2\n iommu/amd: Add driver stub for AMD IOMMUv2 support\n iommu/amd: Add stat counter for IOMMUv2 events\n iommu/amd: Add device errata handling\n iommu/amd: Add function to get IOMMUv2 domain for pdev\n iommu/amd: Implement function to send PPR completions\n iommu/amd: Implement functions to manage GCR3 table\n iommu/amd: Implement IOMMUv2 TLB flushing routines\n iommu/amd: Add support for IOMMUv2 domain mode\n iommu/amd: Add amd_iommu_domain_direct_map function\n ...\n" }, { "commit": "dbe950f201a8edd353b0bd9079e8d536ee4ce37c", "tree": "dffbada6b3d33cc67383758570de22b4f45693b6", "parents": [ "f62f61917d72c1fb0101ad405664f6fc868d676b", "da733563be5a9da26fe81d9f007262d00b846e22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:55:52 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)\n Input: tc3589x-keypad - add missing kerneldoc\n Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages\n Input: ucb1400_ts - convert to threaded IRQ\n Input: ucb1400_ts - drop inline annotations\n Input: usb1400_ts - add __devinit/__devexit section annotations\n Input: ucb1400_ts - set driver owner\n Input: ucb1400_ts - convert to use dev_pm_ops\n Input: psmouse - make sure we do not use stale methods\n Input: evdev - do not block waiting for an event if fd is nonblock\n Input: evdev - if no events and non-block, return EAGAIN not 0\n Input: evdev - only allow reading events if a full packet is present\n Input: add driver for pixcir i2c touchscreens\n Input: samsung-keypad - implement runtime power management support\n Input: tegra-kbc - report wakeup key for some platforms\n Input: tegra-kbc - add device tree bindings\n Input: add driver for AUO In-Cell touchscreens using pixcir ICs\n Input: mpu3050 - configure the sampling method\n Input: mpu3050 - ensure we enable interrupts\n Input: mpu3050 - add of_match table for device-tree probing\n Input: sentelic - document the latest hardware\n ...\n\nFix up fairly trivial conflicts (device tree matching conflicting with\nsome independent cleanups) in drivers/input/keyboard/samsung-keypad.c\n" }, { "commit": "f62f61917d72c1fb0101ad405664f6fc868d676b", "tree": "cedeb85a8d1c97dc3be0b667734b0fe4e0dd84b6", "parents": [ "d04baa157d1b35cbd27c87b4a13111d9675b61f3", "420174afdc7023c000e5b5b1b6fe9e028470c713" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:48:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:48:28 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (68 commits)\n hid-input/battery: add FEATURE quirk\n hid-input/battery: remove battery_val\n hid-input/battery: power-supply type really *is* a battery\n hid-input/battery: make the battery setup common for INPUTs and FEATUREs\n hid-input/battery: deal with both FEATURE and INPUT report batteries\n hid-input/battery: add quirks for battery\n hid-input/battery: remove apparently redundant kmalloc\n hid-input: add support for HID devices reporting Battery Strength\n HID: hid-multitouch: add support 9 new Xiroku devices\n HID: multitouch: add support for 3M 32\"\n HID: multitouch: add support of Atmel multitouch panels\n HID: usbhid: defer LED setting to a workqueue\n HID: usbhid: hid-core: submit queued urbs before suspend\n HID: usbhid: remove LED_ON\n HID: emsff: use symbolic name instead of hardcoded PID constant\n HID: Enable HID_QUIRK_MULTI_INPUT for Trio Linker Plus II\n HID: Kconfig: fix syntax\n HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY\n HID: multitouch: support PixArt optical touch screen\n HID: make parser more verbose about parsing errors by default\n ...\n\nFix up rename/delete conflict in drivers/hid/hid-hyperv.c (removed in\nstaging, moved in this branch) and similarly for the rules for same file\nin drivers/staging/hv/{Kconfig,Makefile}.\n" }, { "commit": "88266917b518e2ca954d85983470592aaaf82993", "tree": "e8c6e77cf6c70de0dbe655ce3cd4401391a06b6e", "parents": [ "269d430131b699c2cadf58495f025a4092959ef5", "e2bf7c4c22939bd83814d8da40a352d246030b1b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:29:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:29:23 2012 -0800" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\n* git://www.linux-watchdog.org/linux-watchdog:\n watchdog: omap_wdt.c: fix the WDIOC_GETBOOTSTATUS ioctl if not implemented.\n watchdog: new driver for VIA chipsets\n watchdog: ath79_wdt: flush register writes\n drivers/watchdog/lantiq_wdt.c: drop iounmap for devm_ allocated data\n watchdog: documentation: describe nowayout in coversion-guide\n watchdog: documentation: update index file\n watchdog: Convert wm831x driver to devm_kzalloc()\n watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API\n watchdog: convert drivers/watchdog/* to use module_platform_driver()\n watchdog: Use DEFINE_SPINLOCK() for static spinlocks\n watchdog: Convert Wolfson drivers to module_platform_driver\n" }, { "commit": "269d430131b699c2cadf58495f025a4092959ef5", "tree": "d9972cd7e03f82b6ac59bc471fb59e49dc6fcaab", "parents": [ "d52739c62e0096dccea59f012d80256c6e359a98", "0c437c4ae71c0a8110eb21c06b99853c7056b317" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:20:34 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)\n regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config\n regulator: max8925: fix enabled/disabled judgement mistake\n regulator: add regulator_bulk_force_disable function\n regulator: pass regulator_register of_node in fixed voltage driver\n regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR\n regulator: Enable supply regulator if child rail is enabled.\n regulator: mc13892: Convert to devm_kzalloc()\n regulator: mc13783: Convert to devm_kzalloc()\n regulator: Fix checking return value of create_regulator\n regulator: Fix the error handling if create_regulator fails\n regulator: Export regulator_is_supported_voltage()\n regulator: mc13892: add device tree probe support\n regulator: mc13892: remove the unnecessary prefix from regulator name\n regulator: Convert wm831x regulator drivers to devm_kzalloc()\n regulator: da9052: Staticize non-exported symbols\n regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator\n regulator: Update da9052-regulator for DT changes\n regulator: DA9052/53 Regulator support\n regulator: pass device_node to of_get_regulator_init_data()\n regulator: If a single voltage is set with device tree then set apply_uV\n ...\n" }, { "commit": "d52739c62e0096dccea59f012d80256c6e359a98", "tree": "4df8ae0640c360eb79b6d0511f084b2337e21e12", "parents": [ "abce00f962a11ed6f748c2569e11695a30716b53", "0d2006bbf09e817f125ba1e42b2549bc2c5d7351" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:19:57 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)\n pinctrl: remove unnecessary max pin number\n pinctrl: correct a offset while enumerating pins\n pinctrl: some typo fixes\n pinctrl: rename U300 and SIRF pin controllers\n pinctrl: pass name instead of device to pin_config_*\n pinctrl: add \"struct seq_file;\" to pinconf.h\n pinctrl: conjure names for unnamed pins\n pinctrl: add a group-specific hog macro\n pinctrl: don\u0027t create a device for each pin controller\n arm/u300: don\u0027t use PINMUX_MAP_PRIMARY*\n pinctrl: implement PINMUX_MAP_SYS_HOG\n pinctrl: add a pin config interface\n pinctrl/coh901: driver to request its pins\n pinctrl: u300-pinmux: register proper GPIO ranges\n pinctrl: move the U300 GPIO driver to pinctrl\n ARM: u300: localize GPIO assignments\n pinctrl: make it possible to add multiple maps\n pinctrl: make a copy of pinmux map\n pinctrl: GPIO direction support for muxing\n pinctrl: print pin range in GPIO range debugs\n ...\n" }, { "commit": "90160371b3a3e67ef78d68210a94dd30664a703d", "tree": "2841ea811be129133cf9b83d9c3badd96e7ffab4", "parents": [ "ae5cfc0546ca2698b9dcddf72accbd70e57590a0", "6c254de16a1d14c1ac931d3aa08dc88ac9fc582b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 10:09:59 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (37 commits)\n xen/pciback: Expand the warning message to include domain id.\n xen/pciback: Fix \"device has been assigned to X domain!\" warning\n xen/pciback: Move the PCI_DEV_FLAGS_ASSIGNED ops to the \"[un|]bind\"\n xen/xenbus: don\u0027t reimplement kvasprintf via a fixed size buffer\n xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX\n xen/xenbus: Reject replies with payload \u003e XENSTORE_PAYLOAD_MAX.\n Xen: consolidate and simplify struct xenbus_driver instantiation\n xen-gntalloc: introduce missing kfree\n xen/xenbus: Fix compile error - missing header for xen_initial_domain()\n xen/netback: Enable netback on HVM guests\n xen/grant-table: Support mappings required by blkback\n xenbus: Use grant-table wrapper functions\n xenbus: Support HVM backends\n xen/xenbus-frontend: Fix compile error with randconfig\n xen/xenbus-frontend: Make error message more clear\n xen/privcmd: Remove unused support for arch specific privcmp mmap\n xen: Add xenbus_backend device\n xen: Add xenbus device driver\n xen: Add privcmd device driver\n xen/gntalloc: fix reference counts on multi-page mappings\n ...\n" }, { "commit": "3dcf6c1b6b29f327ec24a1986aaa8eba399b463f", "tree": "51e8d0659aa3e4aa50ac94cf13051fef135bda19", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "da69dee073a27ee2d4e50c9b19e9faf8776857eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "message": "Merge branch \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)\n KVM: PPC: Whitespace fix for kvm.h\n KVM: Fix whitespace in kvm_para.h\n KVM: PPC: annotate kvm_rma_init as __init\n KVM: x86 emulator: implement RDPMC (0F 33)\n KVM: x86 emulator: fix RDPMC privilege check\n KVM: Expose the architectural performance monitoring CPUID leaf\n KVM: VMX: Intercept RDPMC\n KVM: SVM: Intercept RDPMC\n KVM: Add generic RDPMC support\n KVM: Expose a version 2 architectural PMU to a guests\n KVM: Expose kvm_lapic_local_deliver()\n KVM: x86 emulator: Use opcode::execute for Group 9 instruction\n KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions\n KVM: x86 emulator: Use opcode::execute for Group 1A instruction\n KVM: ensure that debugfs entries have been created\n KVM: drop bsp_vcpu pointer from kvm struct\n KVM: x86: Consolidate PIT legacy test\n KVM: x86: Do not rely on implicit inclusions\n KVM: Make KVM_INTEL depend on CPU_SUP_INTEL\n KVM: Use memdup_user instead of kmalloc/copy_from_user\n ...\n" }, { "commit": "913272b3864d6da89c70d9fc2c30ccb57794b369", "tree": "4fb0a8ab1b53623d2a8ea200b80a3ace2d271471", "parents": [ "6cfc2a23540667cff6da6e41d1f1167a9a45aa9a", "629bcb4b72d49b3631ae3dd0fe1d345820fadfcc" ], "author": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Tue Jan 10 20:55:11 2012 +0400" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Tue Jan 10 20:55:11 2012 +0400" }, "message": "Merge git://git.infradead.org/users/cbou/battery-urgent\n" }, { "commit": "ff9cb1c4eead5e4c292e75cd3170a82d66944101", "tree": "cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "d50f2ab6f050311dbf7b8f5501b25f0bf64a439b" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Tue Jan 10 11:54:07 2012 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Tue Jan 10 11:54:07 2012 -0500" }, "message": "Merge branch \u0027for_linus\u0027 into for_linus_merged\n\nConflicts:\n\tfs/ext4/ioctl.c\n" }, { "commit": "b3c37522928b5452588fc202eaa0f11f6e339256", "tree": "37bfe21d9977b15271903d1a4b304289a232e364", "parents": [ "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "6d0a5636fba5a3f82ec80ab124dd4748344549c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\npower management changes for omap and imx\n\nA significant part of the changes for these two platforms went into\npower management, so they are split out into a separate branch.\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)\n ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1\n ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation\n ARM: imx6q: resume PL310 only when CACHE_L2X0 defined\n ARM: imx6q: build pm code only when CONFIG_PM selected\n ARM: mx5: use generic irq chip pm interface for pm functions on\n ARM: omap: pass minimal SoC/board data for UART from dt\n arm/dts: Add minimal device tree support for omap2420 and omap2430\n omap-serial: Add minimal device tree support\n omap-serial: Use default clock speed (48Mhz) if not specified\n omap-serial: Get rid of all pdev-\u003eid usage\n ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init\n ARM: OMAP4: PRM: use PRCM interrupt handler\n ARM: OMAP3: pm: use prcm chain handler\n ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad\n ARM: OMAP2+: mux: add support for PAD wakeup interrupts\n ARM: OMAP: PRCM: add suspend prepare / finish support\n ARM: OMAP: PRCM: add support for chain interrupt handler\n ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier\n ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup\n ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list\n ...\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "6d889d03ab1417645e76e129834f76204bae37c0", "tree": "577e37b5597b27f6de25bbbc634a0f17ccfb15f7", "parents": [ "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "421b759b86eb8a914cbbd11f6d09a74f411762c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nBoard-level changes\n\nThis adds and extends support for specific boards on a number of\nARM platforms: omap, imx, samsung, tegra, ...\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n mioa701: add newly available DoC G3 chip\n arm/tegra: remove __initdata annotation from pinmux tables\n arm/tegra: Use bus notifiers to trigger pinmux setup\n arm/tegra: Refactor board-*-pinmux.c to share code\n arm/tegra: Fix mistake in Trimslice\u0027s pinmux\n arm/tegra: Rework Seaboard-vs-Ventana pinmux table\n arm/tegra: Remove useless entries from ventana_pinmux[]\n arm/tegra: PCIe: Remove include of mach/pinmux.h\n arm/tegra: Harmony PCIe: Don\u0027t touch pinmux\n arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio\n arm/tegra: Split Seaboard GPIO table to allow for Ventana\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n ...\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "55b81e6f2795484ea8edf5805c95c007cacfa736", "tree": "c3724975107857fcc03b5dd649c462e4f72397be", "parents": [ "5983faf942f260023e547f3c5f38c1033c35cc9b", "08e87d0d773dc9ca5faf4c3306e238ed0ea129b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)\n USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c\n xhci: Clean up 32-bit build warnings.\n USB: update documentation for usbmon\n usb: usb-storage doesn\u0027t support dynamic id currently, the patch disables the feature to fix an oops\n drivers/usb/class/cdc-acm.c: clear dangling pointer\n drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree\n drivers/usb/host/isp1760-if.c: introduce missing kfree\n usb: option: add ZD Incorporated HSPA modem\n usb: ch9: fix up MaxStreams helper\n USB: usb-skeleton.c: cleanup open_count\n USB: usb-skeleton.c: fix open/disconnect race\n xhci: Properly handle COMP_2ND_BW_ERR\n USB: remove dead code from suspend/resume path\n USB: add quirk for another camera\n drivers: usb: wusbcore: Fix dependency for USB_WUSB\n xhci: Better debugging for critical host errors.\n xhci: Be less verbose during URB cancellation.\n xhci: Remove debugging about ring structure allocation.\n xhci: Remove debugging about toggling cycle bits.\n xhci: Remove debugging for individual transfers.\n ...\n" }, { "commit": "5983faf942f260023e547f3c5f38c1033c35cc9b", "tree": "f54ce89de5d9f7a05e99948937ac5456df09df30", "parents": [ "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "995234da19b927f42722d796e8270384f33be11c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)\n tty: serial: imx: move del_timer_sync() to avoid potential deadlock\n imx: add polled io uart methods\n imx: Add save/restore functions for UART control regs\n serial/imx: let probing fail for the dt case without a valid alias\n serial/imx: propagate error from of_alias_get_id instead of using -ENODEV\n tty: serial: imx: Allow UART to be a source for wakeup\n serial: driver for m32 arch should not have DEC alpha errata\n serial/documentation: fix documented name of DCD cpp symbol\n atmel_serial: fix spinlock lockup in RS485 code\n tty: Fix memory leak in virtual console when enable unicode translation\n serial: use DIV_ROUND_CLOSEST instead of open coding it\n serial: add support for 400 and 800 v3 series Titan cards\n serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.\n serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.\n serial: make FSL errata depend on 8250_CONSOLE, not just 8250\n serial: add irq handler for Freescale 16550 errata.\n serial: manually inline serial8250_handle_port\n serial: make 8250 timeout use the specified IRQ handler\n serial: export the key functions for an 8250 IRQ handler\n serial: clean up parameter passing for 8250 Rx IRQ handling\n ...\n" }, { "commit": "074b1d12fe2500d7d453902f9266e6674b30d84c", "tree": "e451a00bc071af886451a3e0ab02619d2b8fab66", "parents": [ "6926afd1925a54a13684ebe05987868890665e2b" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 09 13:46:26 2012 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 09 14:22:27 2012 -0500" }, "message": "NFSv4: Change the default setting of the nfs4_disable_idmapping parameter\n\nNow that the use of numeric uids/gids is officially sanctioned in\nRFC3530bis, it is time to change the default here to \u0027enabled\u0027.\n\nBy doing so, we ensure that NFSv4 copies the behaviour of NFSv3 when we\u0027re\nusing the default AUTH_SYS authentication (i.e. when the client uses the\nnumeric uids/gids as authentication tokens), so that when new files are\ncreated, they will appear to have the correct user/group.\nIt also fixes a number of backward compatibility issues when migrating\nfrom NFSv3 to NFSv4 on a platform where the server uses different uid/gid\nmappings than the client.\n\nNote also that this setting has been successfully tested against servers\nthat do not support numeric uids/gids at several Connectathon/Bakeathon\nevents at this point, and the fall back to using string names/groups has\nbeen shown to work well in all those test cases.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "775c32208708de3e2e2379c85e429ab11957f864", "tree": "1b40ad4ce02cdea3ae988c9ce8fe4e14986ec875", "parents": [ "f98872fc14ecb96f796443911b6bc4767e58e885" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Sun Dec 18 10:00:49 2011 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Jan 09 18:23:58 2012 +0000" }, "message": "mtd: gpio-nand: add device tree bindings\n\nAdd device tree bindings so that the gpio-nand driver may be\ninstantiated from the device tree. This also allows the partitions\nto be specified in the device tree.\n\nv7:\t- restore runtime device tree/non device tree detection\nv6:\t- convert to mtd_device_parse_register()\nv5:\t- fold dt config helpers into a single gpio_nand_of_get_config()\nv4:\t- get io sync address from gpio-control-nand,io-sync-reg\n\t property rather than a resource\n\t- clarified a few details in the binding\nv3:\t- remove redundant cast and a couple of whitespace/naming\n\t changes\nv2:\t- add CONFIG_OF guards for non-dt platforms\n\t- compatible becomes gpio-control-nand\n\t- clarify some binding details\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1f9327fcffdac27e7b100b3a392291a7b94c97fd", "tree": "b2bdc5ebc42b7cdd2b65c185e4b2bf9b0ecb63aa", "parents": [ "b49e345e61a2e0c4decbe9b1bd670ed5599fac6e" ], "author": { "name": "Robert Jarzmik", "email": "robert.jarzmik@free.fr", "time": "Tue Nov 29 23:16:35 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Jan 09 18:12:17 2012 +0000" }, "message": "Documentation: add sysfs entries for mtd docg3 chips\n\nAdd documentation for MSystems disk-on-chip docg3 chips\nsysfs entries, which enable and disable protection areas,\ngiving or disabling access to the chip\u0027s memory.\n\nSigned-off-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "421b759b86eb8a914cbbd11f6d09a74f411762c6", "tree": "505ca7f23987d8eaaa519a7e8506b854e2c0d030", "parents": [ "e067096c8d57d191f29d734cd5692695c95cc36e", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx6q.c\n\tarch/arm/mach-omap2/board-ti8168evm.c\n\tarch/arm/mach-s3c64xx/Kconfig\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/board-dt-tegra20.c\n\tarch/arm/mach-tegra/common.c\n\nLots of relatively simple conflicts between the board\nchanges and stuff from the arm tree. This pulls in\nthe resolution from the samsung/cleanup tree, so we\ndon\u0027t get conflicting merges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "72f318897e50c29b91efd1ed24515a93c138a2ba", "tree": "7e7ef8138d5afacd1be4655e4458dc4cee432d1e", "parents": [ "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "2fa1d4fce599809e6bd7d95756709a5faef30710" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)\n [S390] disassembler: mark exception causing instructions\n [S390] Enable exception traces by default\n [S390] return address of compat signals\n [S390] sysctl: get rid of dead declaration\n [S390] dasd: fix fixpoint divide exception in define_extent\n [S390] dasd: add sanity check to detect path connection error\n [S390] qdio: fix kernel panic for zfcp 31-bit\n [S390] Add s390x description to Documentation/kdump/kdump.txt\n [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo\n [S390] dasd: fix expiration handling for recovery requests\n [S390] outstanding interrupts vs. smp_send_stop\n [S390] ipc: call generic sys_ipc demultiplexer\n [S390] zcrypt: Fix error return codes.\n [S390] zcrypt: Rework length parameter checking.\n [S390] cleanup trap handling\n [S390] Remove Kerntypes leftovers\n [S390] topology: increase poll frequency if change is anticipated\n [S390] entry[64].S improvements\n [S390] make arch/s390 subdirectories depend on config option\n [S390] kvm: move cmf host id constant out of lowcore\n ...\n\nFix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the\nsysdev removal clashing with \"topology: get rid of ifdefs\" which moved\nsome of that code around.\n" }, { "commit": "f93ea733878733f3e98475bc3e2ccf789bebcfb8", "tree": "ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0", "parents": [ "00fb5430f547e411ab03385cfa548776aaac1c92", "95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jan 09 13:06:28 2012 +0100" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jan 09 13:06:28 2012 +0100" }, "message": "Merge branches \u0027iommu/page-sizes\u0027 and \u0027iommu/group-id\u0027 into next\n\nConflicts:\n\tdrivers/iommu/amd_iommu.c\n\tdrivers/iommu/intel-iommu.c\n\tinclude/linux/iommu.h\n" }, { "commit": "00fb5430f547e411ab03385cfa548776aaac1c92", "tree": "f2c543e9c9ce4b1400081de08bcaf6fd55b72972", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "1a36ea815a3557c03819ec7c90a6b2fb128385ca", "1456e9d2c4667a6e9221eda27b9648fb3bcc1e8e" ], "author": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jan 09 13:04:05 2012 +0100" }, "committer": { "name": "Joerg Roedel", "email": "joerg.roedel@amd.com", "time": "Mon Jan 09 13:04:05 2012 +0100" }, "message": "Merge branches \u0027iommu/fixes\u0027, \u0027arm/omap\u0027 and \u0027x86/amd\u0027 into next\n\nConflicts:\n\tdrivers/pci/hotplug/acpiphp_glue.c\n" }, { "commit": "8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8", "tree": "a118eaef15d4ba22247f45ee01537ecc906cd161", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 09 12:16:48 2012 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jan 09 12:16:48 2012 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n\nConflicts:\n\tsecurity/integrity/evm/evm_crypto.c\n\nResolved upstream fix vs. next conflict manually.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "8e369672af8700299ab372bad9397f230b1d591a", "tree": "8676cfdb7f8c1ac5ee124aef050d541d70f876d0", "parents": [ "6950d76c531671ec389e36183311826597951ac6", "a125a3945c950caef001f22055bf201a36568533" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "message": "Merge branch \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux:\n dma-buf: mark EXPERIMENTAL for 1st release.\n dma-buf: Documentation for buffer sharing framework\n dma-buf: Introduce dma buffer sharing mechanism\n" }, { "commit": "6950d76c531671ec389e36183311826597951ac6", "tree": "58294fa8afd16e4bda41a9104f8a4f68f09a61ae", "parents": [ "b7d845f8825b058b80e76320f573505afbf4a1fc", "91c8eabef1b52ef12c49ddea14152aadd9830a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n max1111.c: fix checkpatch warning\n hwmon: (lm75) fix checkpatch warnings\n hwmon: (lm80) fix checkpatch messages\n hwmon: replaced strict_str* with kstr*\n hwmon: (lm75) fix checkpatch warning\n hwmon: (lm75) added error handling\n hwmon: (ltc4261) set data-\u003evalid to 0 if error\n hwmon: (f75375s) Add support for F75387SG/RG\n hwmon: (f75375s) Disable setting DC fan control mode for F75373\n hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data\n hwmon: (f75375s) Fix value range for PWM modes\n hwmon: (f75375s) Use standard sysfs attribute names\n hwmon: (f75375s) Fix checkpatch errors and warnings\n hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled\n hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]\n hwmon: (pmbus/zl6100) Add support for ZL2005\n hwmon: (pmbus/adm1275) Validate device ID\n" }, { "commit": "2943c833222ef87c111ee0c6b7b8519ad2983e99", "tree": "0ef8cc4f72a63b325e7ae858ec68822ec4f3c64f", "parents": [ "98793265b429a3f0b3f1750e74d67cd4d740d162", "19d671695e1931ebfd75b2b888778201aefe35ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "message": "Merge tag \u0027md-3.3\u0027 of git://neil.brown.name/md\n\nmd update for 3.3\n\nBig change is new hot-replacement.\nA slot in an array can hold 2 devices - one that\nwants-replacement and one that is the replacement.\nOnce the replacement is built - either from the\noriginal or (in the case of errors) from elsewhere,\nthe wants-replacement device will be removed.\n\n* tag \u0027md-3.3\u0027 of git://neil.brown.name/md: (36 commits)\n md/raid1: Mark device want_replacement when we see a write error.\n md/raid1: If there is a spare and a want_replacement device, start replacement.\n md/raid1: recognise replacements when assembling arrays.\n md/raid1: handle activation of replacement device when recovery completes.\n md/raid1: Allow a failed replacement device to be removed.\n md/raid1: Allocate spare to store replacement devices and their bios.\n md/raid1: Replace use of mddev-\u003eraid_disks with conf-\u003eraid_disks.\n md/raid10: If there is a spare and a want_replacement device, start replacement.\n md/raid10: recognise replacements when assembling array.\n md/raid10: Allow replacement device to be replace old drive.\n md/raid10: handle recovery of replacement devices.\n md/raid10: Handle replacement devices during resync.\n md/raid10: writes should get directed to replacement as well as original.\n md/raid10: allow removal of failed replacement devices.\n md/raid10: preferentially read from replacement device if possible.\n md/raid10: change read_balance to return an rdev\n md/raid10: prepare data structures for handling replacement.\n md/raid5: Mark device want_replacement when we see a write error.\n md/raid5: If there is a spare and a want_replacement device, start replacement.\n md/raid5: recognise replacements when assembling array.\n ...\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "b001befe58691ef3627458cd814e8cee7f845c5f", "tree": "1083f1a1cd3feeceeac4b395534df0ff032fdbc8", "parents": [ "31b2a868451d630bacfdeddc626371b3f9d9a01c", "928a11ba36f999436915ea2b1eadf54301f93059" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:44:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:40:51 2012 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into next/dt\n\n* samsung/dt: (3 commit)\n Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-tegra/board-dt.c\n\tarch/arm/mach-tegra/include/mach/entry-macro.S\n\nThe latest version of the samsung/dt branch resolves\nall sorts of conflicts with the latest upstream, no functional\nchanges that are not already there.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "237c78beb8a988453bac1993d21f025d070a0d8d", "tree": "9864f0924650770881141359a2d5bac623949789", "parents": [ "4eb821999086417ab42a15174b51497122fc406e", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:30:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:42:17 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\tarch/arm/mach-exynos/cpu.c -\u003e common.c\n\tarch/arm/mach-exynos/include/mach/entry-macro.S\n\tarch/arm/mach-exynos/init.c -\u003e common.c\n\tarch/arm/mach-s5p64x0/init.c -\u003e common.c\n\tarch/arm/mach-s5pv210/init.c -\u003e common.c\n\nMultiple files were moved into common.c files in the rmk/for-linus\nbranch, so this moves over the samsung/dt changes to the new\nfiles.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4", "tree": "7dcbf0a4e09464247e6992c8f44fcc872867bd3a", "parents": [ "a6322de67b58a00e3a783ad9c87c2a11b2d67b47" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:19:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_options() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "e067096c8d57d191f29d734cd5692695c95cc36e", "tree": "e1c200404c3ed3730d04837113d59ca898eb483a", "parents": [ "1fc3eb81100c3f3cd44e706e54390151b0f1ce74", "e5570bbc9c06634cfac94e06ac1432b53d8595e5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "message": "Merge branch \u0027tegra/soc\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-tegra/board-harmony-pcie.c\n\nTo fix an internal merge conflict between the tegra/soc and tegra/boards\nbranches.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "69734b644bf19f20d2989e1a8e5bf59c837ee5c1", "tree": "b1afd22d6e84db04516e466c223d67c1c340e6d9", "parents": [ "67b0243131150391125d8d0beb5359d7aec78b55", "ceb7b40b65539a771d1bfaf47660ac0ee57e0c4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:59:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:59:14 2012 -0800" }, "message": "Merge branch \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n x86: Fix atomic64_xxx_cx8() functions\n x86: Fix and improve cmpxchg_double{,_local}()\n x86_64, asm: Optimise fls(), ffs() and fls64()\n x86, bitops: Move fls64.h inside __KERNEL__\n x86: Fix and improve percpu_cmpxchg{8,16}b_double()\n x86: Report cpb and eff_freq_ro flags correctly\n x86/i386: Use less assembly in strlen(), speed things up a bit\n x86: Use the same node_distance for 32 and 64-bit\n x86: Fix rflags in FAKE_STACK_FRAME\n x86: Clean up and extend do_int3()\n x86: Call do_notify_resume() with interrupts enabled\n x86/div64: Add a micro-optimization shortcut if base is power of two\n x86-64: Cleanup some assembly entry points\n x86-64: Slightly shorten line system call entry and exit paths\n x86-64: Reduce amount of redundant code generated for invalidate_interruptNN\n x86-64: Slightly shorten int_ret_from_sys_call\n x86, efi: Convert efi_phys_get_time() args to physical addresses\n x86: Default to vsyscall\u003demulate\n x86-64: Set siginfo and context on vsyscall emulation faults\n x86: consolidate xchg and xadd macros\n ...\n" }, { "commit": "7e00fe2e53fd3a1540febcb2d2bee9d0b2eea507", "tree": "48af088a8e81080f94159e7988a4c0493d456b8f", "parents": [ "1e39ae9f9035ee02e014b5fe29461674fe19624d" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:26:05 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:55 2012 -0800" }, "message": "PCI: deprecate pci_scan_bus_parented()\n\nUsers of pci_scan_bus_parented() should be converted to use either\n pci_scan_root_bus() (preferred, but also calls pci_bus_add_devices)\nor\n pci_create_root_bus()\n pci_scan_child_bus()\n\nSince pci_scan_bus_parented(), I\u0027m marking it deprecated now and will\nactually remove it later.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "da8d1c8ba4dcb16d60be54b233deca9a7cac98dc", "tree": "ac4713f9dd29aab4d4d5b167cf61081aeb2ccdb4", "parents": [ "8b6a5af92c03b363df050da906480085b6cd6e00" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Thu Oct 06 14:08:18 2011 -0400" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:25 2012 -0800" }, "message": "PCI/sysfs: add per pci device msi[x] irq listing (v5)\n\nThis patch adds a per-pci-device subdirectory in sysfs called:\n/sys/bus/pci/devices/\u003cdevice\u003e/msi_irqs\n\nThis sub-directory exports the set of msi vectors allocated by a given\npci device, by creating a numbered sub-directory for each vector beneath\nmsi_irqs. For each vector various attributes can be exported.\nCurrently the only attribute is called mode, which tracks the\noperational mode of that vector (msi vs. msix)\n\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "tree": "502a8f9499bc1b4cb3300d666dab2d01a1921224", "parents": [ "423d091dfe58d3109d84c408810a7cfa82f6f184", "9e183426bfb52bb44bf3c443d6587e4d02478603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)\n perf kvm: Fix copy \u0026 paste error in description\n perf script: Kill script_spec__delete\n perf top: Fix a memory leak\n perf stat: Introduce get_ratio_color() helper\n perf session: Remove impossible condition check\n perf tools: Fix feature-bits rework fallout, remove unused variable\n perf script: Add generic perl handler to process events\n perf tools: Use for_each_set_bit() to iterate over feature flags\n perf tools: Unify handling of features when writing feature section\n perf report: Accept fifos as input file\n perf tools: Moving code in some files\n perf tools: Fix out-of-bound access to struct perf_session\n perf tools: Continue processing header on unknown features\n perf tools: Improve macros for struct feature_ops\n perf: builtin-record: Document and check that mmap_pages must be a power of two.\n perf: builtin-record: Provide advice if mmap\u0027ing fails with EPERM.\n perf tools: Fix truncated annotation\n perf script: look up thread using tid instead of pid\n perf tools: Look up thread names for system wide profiling\n perf tools: Fix comm for processes with named threads\n ...\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "8c717b72dec32a50666175b62b41de24e4b39be7", "tree": "e2b4335496cbddb5cded7b1bfd7579ee33f60505", "parents": [ "07d106d0a33d6063d2061305903deb02489eba20", "dc4218bd0fe499fce2896f88101ea42dac1f60fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "message": "Merge branch \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n timer: Use debugobjects to catch deletion of uninitialized timers\n timer: Setup uninitialized timer with a stub callback\n debugobjects: Extend to assert that an object is initialized\n debugobjects: Be smarter about static objects\n" }, { "commit": "02861cca4b4f1ceaa7dc805041d84caee580670b", "tree": "497521e74d64c1eddd7ab1e141bea9bfd045e0d2", "parents": [ "9d36bc8cd8d607ec5db98bcc85b27cff9e1b6dfd" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Dec 02 00:43:11 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 06 15:26:14 2012 +0100" }, "message": "watchdog: documentation: describe nowayout in coversion-guide\n\nnowayout is also handled by the watchdog core. Describe how this needs\nto be addressed in the conversion guide.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "9d36bc8cd8d607ec5db98bcc85b27cff9e1b6dfd", "tree": "2b39106cd628e8dfd6acb7c7472af0cb7e2b0cab", "parents": [ "7b9bb6d8cfe80580329318caf6c3a137762ecea3" ], "author": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Nov 29 12:14:30 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 06 15:25:47 2012 +0100" }, "message": "watchdog: documentation: update index file\n\nAdd the convert_drivers_to_kernel_api.txt to the 00-INDEX file.\n\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "ff0b3cd4a416bc727b0797b95b229b278d2a28f2", "tree": "cd6bdc2304ee8fd751f3bd79607c7bcaf337e198", "parents": [ "b8ec61189f3b4cd9d1b2856342f5d7676151d01c" ], "author": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Tue Nov 29 16:24:16 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 06 15:22:04 2012 +0100" }, "message": "watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API\n\nAdd two nowayout helpers for the Watchdog Timer Driver Kernel API.\nAnd apply this to the already converted drivers.\nNote: s3c2410_wdt lost the nowayout feature during the conversion.\n\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "a7df4719a3ca1c839bf703c5eca3a9c430466696", "tree": "1026f377b2f9051f3a382cdcff901a2ab7434a71", "parents": [ "d15bd7ee445d0702ad801fdaece348fdb79e6581" ], "author": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Mon Dec 26 14:53:16 2011 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:20:24 2012 +0000" }, "message": "dma-buf: Documentation for buffer sharing framework\n\nAdd documentation for dma buffer sharing framework, explaining the\nvarious operations, members and API of the dma buffer sharing\nframework.\n\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@ti.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e57f1b68c4066459ed9e49177cdcefa6973ce9d2", "tree": "630fe21c4bb8fc46e49240eec863dcb5ed35f312", "parents": [ "1c84b60b813cb10476618b2311a89e31018b2cc4" ], "author": { "name": "Rhyland Klein", "email": "rklein@nvidia.com", "time": "Mon Dec 05 17:50:48 2011 -0800" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Fri Jan 06 05:25:53 2012 +0400" }, "message": "devicetree-bindings: Propagate bq20z75-\u003esbs rename to dt bindings\n\nSigned-off-by: Rhyland Klein \u003crklein@nvidia.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "1c84b60b813cb10476618b2311a89e31018b2cc4", "tree": "516bcec7bce1a2644e2e13de7a7c892e085307bc", "parents": [ "3ddca062f8d71724529b0d52609994c9886f1a18" ], "author": { "name": "Rhyland Klein", "email": "rklein@nvidia.com", "time": "Mon Dec 05 17:50:47 2011 -0800" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Fri Jan 06 05:25:31 2012 +0400" }, "message": "devicetree-bindings: Add vendor entry for Smart Battery Systems\n\nSigned-off-by: Rhyland Klein \u003crklein@nvidia.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "443830f6fd986b894da2ea7403163a64c0925f54", "tree": "7bfee6449602e401538bd88f419907d1a661abca", "parents": [ "bc581e6fcc3bd901d20765638422ef957559a8d1" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Oct 01 17:35:44 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 05 08:19:28 2012 -0800" }, "message": "hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]\n\nAdd support for Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464, which are\nbased on ZL2005 and ZL2008, to zl6100 driver. Remove BMR450 and BMR451 device\nIDs from generic PMBus driver.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nReviewed-by: Robert Coulson \u003crobert.coulson@ericsson.com\u003e\n" }, { "commit": "bc581e6fcc3bd901d20765638422ef957559a8d1", "tree": "6109bd949447be039d4dd4630b9456ec2281d27e", "parents": [ "87102808d03948c825c3bdc48316e48f6422fd7e" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Oct 01 16:50:36 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 05 08:19:27 2012 -0800" }, "message": "hwmon: (pmbus/zl6100) Add support for ZL2005\n\nAdd explicit support for ZL2005. Functionality is almost the same as with other\nZilker Labs / Intersil chips, but limit register detection does not work reliably.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nReviewed-by: Robert Coulson \u003crobert.coulson@ericsson.com\u003e\n" }, { "commit": "e0273728564a395a13cfed70e34da4f2613d2d44", "tree": "e57de35badafff2cc3afcd8896479242b94cc3ec", "parents": [ "74c4fb058083b47571a4f76dcfce95085f2d8098", "11576c6114c3b6505aea2e0c988bedb856a0e20c", "d41c2a7011dffc60571eab8dc4e2a297ef106f44", "4371ea8202e98c8ef77ca887de3b19affbb3498f", "cd07655e732b265eb12a5804ddf7ffae945c9ab9", "78761ff9bc4e944e0b4e5df1e7eedcfdbb1a9a1a", "90120d66974ecf22c32d8cbb2347097ce4144403" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jan 05 15:51:02 2012 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jan 05 15:51:02 2012 +0100" }, "message": "Merge branches \u0027hyperv\u0027, \u0027multitouch\u0027, \u0027roccat\u0027, \u0027upstream\u0027, \u0027upstream-fixes\u0027, \u0027wacom\u0027 and \u0027wiimote\u0027 into for-linus\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "343fe4074bf8a1551831f6505e738e99777f739d", "tree": "395a131a5deaacca3677142aa7f29318d6c8f5a1", "parents": [ "dbf1115d3f8c7052788aa4e6e46abd27f3b3eeba" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Jan 04 15:27:32 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 16:26:32 2012 -0800" }, "message": "serial/documentation: fix documented name of DCD cpp symbol\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d8cae98cddd286e38db1724dda1b0e7b467f9237", "tree": "83de956f0281814254ec22119de6ed6a6d3f2b66", "parents": [ "1a3a026ba1b6bbfe0b7f79ab38cf991d691e7c9a" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Wed Jan 04 16:36:35 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 16:04:30 2012 -0800" }, "message": "USB: update documentation for usbmon\n\nThe documentation for usbmon is out of date; the usbfs \"devices\" file\nnow exists in /sys/kernel/debug/usb rather than /proc/bus/usb. This\npatch (as1505) updates the documentation accordingly, and also\nmentions that the necessary information can be found by running lsusb.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: Pete Zaitcev \u003czaitcev@redhat.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "19c5246d251640ac76daa4d34165af78c64b1454", "tree": "cdf4f2250ca6b61d4910a3279d4d991486631d30", "parents": [ "4bac1f8cef7bfd2c62793f75aba66a5b8357dede" ], "author": { "name": "Yongqiang Yang", "email": "xiaoqiangnk@gmail.com", "time": "Wed Jan 04 17:09:44 2012 -0500" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Wed Jan 04 17:09:44 2012 -0500" }, "message": "ext4: add new online resize interface\n\nThis patch adds new online resize interface, whose input argument is a\n64-bit integer indicating how many blocks there are in the resized fs.\n\nIn new resize impelmentation, all work like allocating group tables\nare done by kernel side, so the new resize interface can support\nflex_bg feature and prepares ground for suppoting resize with features\nlike bigalloc and exclude bitmap. Besides these, user-space tools just\npasses in the new number of blocks.\n\nWe delay initializing the bitmaps and inode tables of added groups if\npossible and add multi groups (a flex groups) each time, so new resize\nis very fast like mkfs.\n\nSigned-off-by: Yongqiang Yang \u003cxiaoqiangnk@gmail.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "adaf4ed2abbd285c93808060924eeec3af483aee", "tree": "425c6c37c08af0b69efaa7457c9b428eda347c36", "parents": [ "ca3d30cc02f780f68771087040ce935add6ba2b7", "5f0a6e2d503896062f641639dacfe5055c2f593b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 04 15:00:43 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 04 15:01:28 2012 +0100" }, "message": "Merge commit \u0027v3.2-rc7\u0027 into x86/asm\n\nMerge reason: Update from -rc4 to -rc7.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "251f39fe42dae863bd24e30864e6b66076ba076d", "tree": "c804944bc17f3836d19cc8b5bc611dd1fb0ea915", "parents": [ "9b8872273af6983b246252a6508fa7cf34c69d6e", "35b4c01e29bdd9632dabf9784ed3486333f00427" ], "author": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 09:09:35 2012 +0400" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 09:09:35 2012 +0400" }, "message": "Merge branch \u0027power-supply-scope\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n" }, { "commit": "ad3d13eee78ec44194bf919a37e2f711e53cbdf0", "tree": "e7a950b1e1d2642c4fae0a7019ac7ceed5241104", "parents": [ "3bb3dbbd56ea39e5537db8f8041ea95d28f16a7f" ], "author": { "name": "Donggeun Kim", "email": "dg77.kim@samsung.com", "time": "Tue Dec 27 18:47:49 2011 +0900" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 08:08:45 2012 +0400" }, "message": "power_supply: Charger-Manager: Add properties for power-supply-class\n\nCharger Manager provides power-supply-class aggregating\ninformation from multiple chargers and a fuel-gauge.\n\nSigned-off-by: Donggeun Kim \u003cdg77.kim@samsung.com\u003e\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "3bb3dbbd56ea39e5537db8f8041ea95d28f16a7f", "tree": "b660ceed66ef404530109f9670b63640bd2be4b6", "parents": [ "00a159a5567232fbe1dd85bc611c55f53943b0fc" ], "author": { "name": "Donggeun Kim", "email": "dg77.kim@samsung.com", "time": "Tue Dec 27 18:47:48 2011 +0900" }, "committer": { "name": "Anton Vorontsov", "email": "cbouatmailru@gmail.com", "time": "Wed Jan 04 08:08:27 2012 +0400" }, "message": "power_supply: Add initial Charger-Manager driver\n\nBecause battery health monitoring should be done even when suspended,\nit needs to wake up and suspend periodically. Thus, userspace battery\nmonitoring may incur too much overhead; every device and task is woken\nup periodically. Charger Manager uses suspend-again to provide\nin-suspend monitoring.\n\nThis patch allows to monitor battery health in-suspend state.\n\nSigned-off-by: Donggeun Kim \u003cdg77.kim@samsung.com\u003e\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\n" }, { "commit": "faef2b6c9960b5ae288899f461a2218ec6bb7928", "tree": "af61427bb0984315800617263dbc4d8c42b7d7e7", "parents": [ "5b91aca0bd462c80cf509cbc1014f803eabdc205" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 23:44:53 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:03 2012 -0500" }, "message": "sysfs: propagate umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "439475140bed762c04567c325d48409862341ae4", "tree": "a4023e4536d39e8e5c4b8abd7747aa43f0338ef2", "parents": [ "fbd48a69a0b576dd8cba01b2b4fc24fad76f1b68" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jul 25 00:05:26 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:57 2012 -0500" }, "message": "configfs: convert to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f4ae40a6a50a98ac23d4b285f739455e926a473e", "tree": "c84d7393700bd85e5285a194f8c22d4d00e36b28", "parents": [ "48176a973d65572e61d0ce95495e5072887e6fb6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 04:33:43 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:56 2012 -0500" }, "message": "switch debugfs to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1a67aafb5f72a436ca044293309fa7e6351d6a35", "tree": "d9e58600148de9d41b478cf815773b746647d15b", "parents": [ "4acdaf27ebe2034c342f3be57ef49aed1ad885ef" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:52:52 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:54 2012 -0500" }, "message": "switch -\u003emknod() to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4acdaf27ebe2034c342f3be57ef49aed1ad885ef", "tree": "d89a876ee19cd88609a587f8aa6c464a52ee6d98", "parents": [ "18bb1db3e7607e4a997d50991a6f9fa5b0f8722c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:42:34 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:53 2012 -0500" }, "message": "switch -\u003ecreate() to umode_t\n\nvfs_create() ignores everything outside of 16bit subset of its\nmode argument; switching it to umode_t is obviously equivalent\nand it\u0027s the only caller of the method\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" } ], "next": "18bb1db3e7607e4a997d50991a6f9fa5b0f8722c" }