)]}' { "log": [ { "commit": "0f0910a100951204a48052ce62ca72915511ecc6", "tree": "7eecaf7e01e921db23027143851694dec6cdd748", "parents": [ "0be952c13be80ccdd3cb0d1ba25099de9468ac1b", "a9b1b455c519ee2fd6a4f9c069511e67b5be1ac4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 10:02:21 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 10:02:21 2015 -0700" }, "message": "Merge tag \u0027locks-v4.0-4\u0027 of git://git.samba.org/jlayton/linux\n\nPull file locking bugfix from Jeff Layton:\n \"Just a small fix for a potential problem in one of the lease\n tracepoints\"\n\n* tag \u0027locks-v4.0-4\u0027 of git://git.samba.org/jlayton/linux:\n locks: fix generic_delete_lease tracepoint to use victim pointer\n" }, { "commit": "0be952c13be80ccdd3cb0d1ba25099de9468ac1b", "tree": "c8c02d5240d1ef3b76f3bc9d58ed275a0e8634f5", "parents": [ "9c987a33a864cf405e4c22104508a26197310fd0", "ec76f4007079469e86e2e44c3e5d1d11086de9d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:36:10 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:36:10 2015 -0700" }, "message": "Merge tag \u0027vfio-v4.0-rc4\u0027 of git://github.com/awilliam/linux-vfio\n\nPull VFIO fix from Alex Williamson:\n \"Add missing break to avoid clobbering ioctl (Alexey Kardashevskiy)\"\n\n* tag \u0027vfio-v4.0-rc4\u0027 of git://github.com/awilliam/linux-vfio:\n vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX\n" }, { "commit": "9c987a33a864cf405e4c22104508a26197310fd0", "tree": "5b2c7584e1bad40e6733183e801efb50435897b3", "parents": [ "e6c2d9ce12ad784c82ac289f3adbabc06c6ff996", "947bb7587fc2c1d1f6b89462ef1255ec30d4e682" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:32:00 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:32:00 2015 -0700" }, "message": "Merge tag \u0027arm64-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux\n\nPull arm64 fixes from Catalin Marinas:\n\n - add TLB invalidation for page table tear-down which was missed when\n support for CONFIG_HAVE_RCU_TABLE_FREE was added (assuming page table\n freeing was always deferred)\n\n - use UEFI for system and reset poweroff if available\n\n - fix asm label placement in relation to the alignment statement\n\n* tag \u0027arm64-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:\n arm64: put __boot_cpu_mode label after alignment instead of before\n efi/arm64: use UEFI for system reset and poweroff\n arm64: Invalidate the TLB corresponding to intermediate page table levels\n" }, { "commit": "e6c2d9ce12ad784c82ac289f3adbabc06c6ff996", "tree": "69c2b5a1fb458fe322f1ee8739e9af05c3110f5c", "parents": [ "5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d", "9a0b57451ae8142c74d65bddb6d7765818babbed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:26:23 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 14 09:26:23 2015 -0700" }, "message": "Merge tag \u0027linux-kselftest-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest\n\nPull Kselftest fix from Shuah Khan:\n \"selftests/exec: Check if the syscall exists and bail if not\"\n\n* tag \u0027linux-kselftest-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:\n selftests/exec: Check if the syscall exists and bail if not\n" }, { "commit": "a9b1b455c519ee2fd6a4f9c069511e67b5be1ac4", "tree": "fca77973993a7b94d9e6bd5c38099822a1d3d2cf", "parents": [ "5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d" ], "author": { "name": "Jeff Layton", "email": "jeff.layton@primarydata.com", "time": "Sat Mar 14 09:45:35 2015 -0400" }, "committer": { "name": "Jeff Layton", "email": "jeff.layton@primarydata.com", "time": "Sat Mar 14 09:45:35 2015 -0400" }, "message": "locks: fix generic_delete_lease tracepoint to use victim pointer\n\nIt\u0027s possible that \"fl\" won\u0027t point at a valid lock at this point, so\nuse \"victim\" instead which is either a valid lock or NULL.\n\nSigned-off-by: Jeff Layton \u003cjeff.layton@primarydata.com\u003e\n" }, { "commit": "947bb7587fc2c1d1f6b89462ef1255ec30d4e682", "tree": "f9b780d2292da6a91a1a3d4fcecf866441b7a623", "parents": [ "60c0d45a7f7ab4e30452fa14deb23a33e29adbc2" ], "author": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@linaro.org", "time": "Fri Mar 13 16:21:18 2015 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Sat Mar 14 11:02:26 2015 +0000" }, "message": "arm64: put __boot_cpu_mode label after alignment instead of before\n\nAnother one for the big head.S spring cleaning: the label should\nbe after the .align or it may point to the padding.\n\nSigned-off-by: Ard Biesheuvel \u003card.biesheuvel@linaro.org\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "60c0d45a7f7ab4e30452fa14deb23a33e29adbc2", "tree": "121c8626db3bd9313368c00da9b4f56caee315f8", "parents": [ "285994a62c80f1d72c6924282bcb59608098d5ec" ], "author": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@linaro.org", "time": "Fri Mar 06 15:49:24 2015 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Sat Mar 14 11:00:18 2015 +0000" }, "message": "efi/arm64: use UEFI for system reset and poweroff\n\nIf UEFI Runtime Services are available, they are preferred over direct\nPSCI calls or other methods to reset the system.\n\nFor the reset case, we need to hook into machine_restart(), as the\narm_pm_restart function pointer may be overwritten by modules.\n\nTested-by: Mark Rutland \u003cmark.rutland@arm.com\u003e\nReviewed-by: Mark Rutland \u003cmark.rutland@arm.com\u003e\nReviewed-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Ard Biesheuvel \u003card.biesheuvel@linaro.org\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "285994a62c80f1d72c6924282bcb59608098d5ec", "tree": "475933da723aba44de3a3703fc0629a72dd9c277", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Wed Mar 11 12:20:39 2015 +0000" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Sat Mar 14 10:48:30 2015 +0000" }, "message": "arm64: Invalidate the TLB corresponding to intermediate page table levels\n\nThe ARM architecture allows the caching of intermediate page table\nlevels and page table freeing requires a sequence like:\n\n\tpmd_clear()\n\tTLB invalidation\n\tpte page freeing\n\nWith commit 5e5f6dc10546 (arm64: mm: enable HAVE_RCU_TABLE_FREE logic),\nthe page table freeing batching was moved from tlb_remove_page() to\ntlb_remove_table(). The former takes care of TLB invalidation as this is\nalso shared with pte clearing and page cache page freeing. The latter,\nhowever, does not invalidate the TLBs for intermediate page table levels\nas it probably relies on the architecture code to do it if required.\nWhen the mm-\u003emm_users \u003c 2, tlb_remove_table() does not do any batching\nand page table pages are freed before tlb_finish_mmu() which performs\nthe actual TLB invalidation.\n\nThis patch introduces __tlb_flush_pgtable() for arm64 and calls it from\nthe {pte,pmd,pud}_free_tlb() directly without relying on deferred page\ntable freeing.\n\nFixes: 5e5f6dc10546 arm64: mm: enable HAVE_RCU_TABLE_FREE logic\nReported-by: Jon Masters \u003cjcm@redhat.com\u003e\nTested-by: Jon Masters \u003cjcm@redhat.com\u003e\nTested-by: Steve Capper \u003csteve.capper@linaro.org\u003e\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d", "tree": "2b351ea61e4ca14277471192dd6d20849b377597", "parents": [ "f47e331042fd5c98f8b4aebc224e7a48fd73e8bd", "b176023392360f28c0c8964a10effbc9a1f36c04" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 14:30:38 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 14:30:38 2015 -0700" }, "message": "Merge tag \u0027pm+acpi-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management and ACPI fixes from Rafael Wysocki:\n \"Just two fixes, one for an ACPI LPSS driver issue introduced during\n the 3.17 cycle and one revert of a recent commit that sort of broke\n the cpupower tool.\n\n Specifics:\n\n - Fix an ACPI LPSS (Low-Power Subsystem) driver issue causing the\n 8250_dw driver to confuse an LPSS clock with another one it is\n supposed to handle due to the lack of identification allowing it to\n tell those clocks apart (Heikki Krogerus).\n\n - Revert a recent commit that was supposed to improve the usability\n of the cpupower tool, but clearly did the opposite (Josh Boyer)\"\n\n* tag \u0027pm+acpi-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n Revert \"cpupower Makefile change to help run the tool without \u0027make install\u0027\"\n ACPI / LPSS: provide con_id for the clkdev\n" }, { "commit": "b176023392360f28c0c8964a10effbc9a1f36c04", "tree": "b9e0650f3c0053f2c8f85c81be5c05adeeb441e5", "parents": [ "fcf0789a96777d79d20290e08bf43943a5619387", "b8ea351b0e154c9dc28609db58eddc6c2934c954" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Fri Mar 13 21:43:08 2015 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Fri Mar 13 21:43:08 2015 +0100" }, "message": "Merge branch \u0027pm-tools\u0027\n\n* pm-tools:\n Revert \"cpupower Makefile change to help run the tool without \u0027make install\u0027\"\n" }, { "commit": "f47e331042fd5c98f8b4aebc224e7a48fd73e8bd", "tree": "7404afd384dd5c609b6685f666f2b24aa1438a8c", "parents": [ "bbc54a00d8a3f664cb4bd9619a5c33d75f13d62b", "af6fc858a35b90e89ea7a7ee58e66628c55c776b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 13:34:38 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 13:34:38 2015 -0700" }, "message": "Merge tag \u0027stable/for-linus-4.0-rc3-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip\n\nPull xen bug fixes from David Vrabel:\n\n - fix a PV regression in 3.19.\n\n - fix a dom0 crash on hosts with large numbers of PIRQs.\n\n - prevent pcifront from disabling memory or I/O port access, which may\n trigger host crashes.\n\n* tag \u0027stable/for-linus-4.0-rc3-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:\n xen-pciback: limit guest control of command register\n xen/events: avoid NULL pointer dereference in dom0 on large machines\n xen: Remove trailing semicolon from xenbus_register_frontend() definition\n x86/xen: correct bug in p2m list initialization\n" }, { "commit": "bbc54a00d8a3f664cb4bd9619a5c33d75f13d62b", "tree": "ed945fff5c68ba29fa3f22a76157bd1032e9b72a", "parents": [ "3d52c5bdbe57e2b45d9cc8da930b9ab42b5198c4", "ef403edb75580a3ec5d155f5de82155f0419c621" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 13:30:00 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 13:30:00 2015 -0700" }, "message": "Merge tag \u0027sound-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"This is a round of HD-audio fixes: there are a long-standing\n regression fix and a few more device/codec-specific quirks.\n\n In addition, a couple of FireWire regression fixes, a USB-audio quirk\n for Roland UA-22 and a sanity check in API for user-defined control\n elements\"\n\n* tag \u0027sound-4.0-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Don\u0027t access stereo amps for mono channel widgets\n ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic\n ALSA: hda - Set single_adc_amp flag for CS420x codecs\n ALSA: snd-usb: add quirks for Roland UA-22\n ALSA: control: Add sanity checks for user ctl id name string\n ALSA: hda - Fix built-in mic on Compaq Presario CQ60\n ALSA: firewire-lib: leave unit reference counting completely\n Revert \"ALSA: dice: fix wrong offsets for Dice interface\"\n ALSA: hda - Fix regression of HD-audio controller fallback modes\n" }, { "commit": "3d52c5bdbe57e2b45d9cc8da930b9ab42b5198c4", "tree": "321700b16d75ad5353a82c5e613a27806afb7056", "parents": [ "f788baadbdd95b0309ab8e1565d5c425e197b8db", "a697c2efba03ac7bfdbffbba7f0f1aa294f7dee0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 11:10:10 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 11:10:10 2015 -0700" }, "message": "Merge tag \u0027devicetree-fixes-for-4.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux\n\nPull DeviceTree fixes from Rob Herring:\n\n - fix for stdout-path option parsing with added unittest\n\n - fix for stdout-path interaction with earlycon\n\n - several DT unittest fixes\n\n - fix Sparc allmodconfig build error on of_platform_register_reconfig_notifier\n\n - several DT overlay kconfig and build warning fixes\n\n - several DT binding documentation updates\n\n* tag \u0027devicetree-fixes-for-4.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:\n of/platform: Fix sparc:allmodconfig build\n of: unittest: Add options string testcase variants\n of: fix handling of \u0027/\u0027 in options for of_find_node_by_path()\n of/unittest: Fix the wrong expected value in of_selftest_property_string\n of/unittest: remove the duplicate of_changeset_init\n dt: submitting-patches: clarify that DT maintainers are to be cced on bindings\n of: unittest: fix I2C dependency\n of/overlay: Remove unused variable\n Documentation: DT: Renamed of-serial.txt to 8250.txt\n of: Fix premature bootconsole disable with \u0027stdout-path\u0027\n serial: add device tree binding documentation for ETRAX FS UART\n of/overlay: Directly include idr.h\n of: Drop superfluous dependance for OF_OVERLAY\n of: Add vendor prefix for Arasan\n of: Add prompt for OF_OVERLAY config\n" }, { "commit": "f788baadbdd95b0309ab8e1565d5c425e197b8db", "tree": "b0bd79b85eff2ee7bd36f2ab304d63ab7401645b", "parents": [ "c202baf017aea0c860e53131bc55bb1af7177e76", "96b62a57193494010eed66ca0739c93eb4653162" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 10:55:32 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 13 10:55:32 2015 -0700" }, "message": "Merge branch \u0027gadget\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull gadgetfs fixes from Al Viro:\n \"Assorted fixes around AIO on gadgetfs: leaks, use-after-free, troubles\n caused by -\u003ef_op flipping\"\n\n* \u0027gadget\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n gadgetfs: really get rid of switching -\u003ef_op\n gadgetfs: get rid of flipping -\u003ef_op in ep_config()\n gadget: switch ep_io_operations to -\u003eread_iter/-\u003ewrite_iter\n gadgetfs: use-after-free in -\u003eaio_read()\n gadget/function/f_fs.c: switch to -\u003e{read,write}_iter()\n gadget/function/f_fs.c: use put iov_iter into io_data\n gadget/function/f_fs.c: close leaks\n move iov_iter.c from mm/ to lib/\n new helper: dup_iter()\n" }, { "commit": "a697c2efba03ac7bfdbffbba7f0f1aa294f7dee0", "tree": "d497ac1d60cbeb2c8723e0919c5f06f4df09c9fa", "parents": [ "8cbba1ab1ae15b3a5d96caa526eac607f80bda23" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Tue Mar 10 20:31:04 2015 -0700" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Fri Mar 13 09:45:24 2015 -0500" }, "message": "of/platform: Fix sparc:allmodconfig build\n\nsparc:allmodconfig fails to build with:\n\ndrivers/built-in.o: In function `platform_bus_init\u0027:\n(.init.text+0x3684): undefined reference to `of_platform_register_reconfig_notifier\u0027\n\nof_platform_register_reconfig_notifier is only declared if both OF_ADDRESS\nand OF_DYNAMIC are configured. Yet, the include file only declares a dummy\nfunction if OF_DYNAMIC is not configured. The sparc architecture does not\nconfigure OF_ADDRESS, but does configure OF_DYNAMIC, causing above error.\n\nFixes: 801d728c10db (\"of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type\")\nCc: Pantelis Antoniou \u003cpantelis.antoniou@konsulko.com\u003e\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "ef403edb75580a3ec5d155f5de82155f0419c621", "tree": "619a1effc28507e067292989ca39ad94d7080b39", "parents": [ "2ddee91abe9cc34ddb6294ee14702b46ae07d460" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 08:30:11 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Mar 13 07:37:21 2015 +0100" }, "message": "ALSA: hda - Don\u0027t access stereo amps for mono channel widgets\n\nThe current HDA generic parser initializes / modifies the amp values\nalways in stereo, but this seems causing the problem on ALC3229 codec\nthat has a few mono channel widgets: namely, these mono widgets react\nto actions for both channels equally.\n\nIn the driver code, we do care the mono channel and create a control\nonly for the left channel (as defined in HD-audio spec) for such a\nnode. When the control is updated, only the left channel value is\nchanged. However, in the resume, the right channel value is also\nrestored from the initial value we took as stereo, and this overwrites\nthe left channel value. This ends up being the silent output as the\nright channel has been never touched and remains muted.\n\nThis patch covers the places where unconditional stereo amp accesses\nare done and converts to the conditional accesses.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d94581\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c202baf017aea0c860e53131bc55bb1af7177e76", "tree": "f3b19d008aac14979e115542f4b689e6c99f33cd", "parents": [ "ba68bc0115ebfc37f911db4e87bf5f7991f89698", "7feee590bb18ffc42636975f74c2c3120ce1901c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:19 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:19 2015 -0700" }, "message": "Merge branch \u0027akpm\u0027 (patches from Andrew)\n\nMerge misc fixes from Andrew Morton:\n \"13 fixes\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n memcg: disable hierarchy support if bound to the legacy cgroup hierarchy\n mm: reorder can_do_mlock to fix audit denial\n kasan, module: move MODULE_ALIGN macro into \u003clinux/moduleloader.h\u003e\n kasan, module, vmalloc: rework shadow allocation for modules\n fanotify: fix event filtering with FAN_ONDIR set\n mm/nommu.c: export symbol max_mapnr\n arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU\n nilfs2: fix deadlock of segment constructor during recovery\n mm: cma: fix CMA aligned offset calculation\n mm, hugetlb: close race when setting PageTail for gigantic pages\n mm, oom: do not fail __GFP_NOFAIL allocation if oom killer is disabled\n drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data\n ocfs2: make append_dio an incompat feature\n" }, { "commit": "7feee590bb18ffc42636975f74c2c3120ce1901c", "tree": "58e0fcfa29b1d7a84c7688062a8374464739b7eb", "parents": [ "a5a6579db33af91f4f5134e14be758dc71c1b694" ], "author": { "name": "Vladimir Davydov", "email": "vdavydov@parallels.com", "time": "Thu Mar 12 16:26:19 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "memcg: disable hierarchy support if bound to the legacy cgroup hierarchy\n\nIf the memory cgroup controller is initially mounted in the scope of the\ndefault cgroup hierarchy and then remounted to a legacy hierarchy, it will\nstill have hierarchy support enabled, which is incorrect. We should\ndisable hierarchy support if bound to the legacy cgroup hierarchy.\n\nSigned-off-by: Vladimir Davydov \u003cvdavydov@parallels.com\u003e\nSigned-off-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": "a5a6579db33af91f4f5134e14be758dc71c1b694", "tree": "ed3d625f104b7f320d3ef8da6838a369cc57797a", "parents": [ "d3733e5c98e952d419e77fa721912f09d15a2806" ], "author": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Thu Mar 12 16:26:17 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "mm: reorder can_do_mlock to fix audit denial\n\nA userspace call to mmap(MAP_LOCKED) may result in the successful locking\nof memory while also producing a confusing audit log denial. can_do_mlock\nchecks capable and rlimit. If either of these return positive\ncan_do_mlock returns true. The capable check leads to an LSM hook used by\napparmour and selinux which produce the audit denial. Reordering so\nrlimit is checked first eliminates the denial on success, only recording a\ndenial when the lock is unsuccessful as a result of the denial.\n\nSigned-off-by: Jeff Vander Stoep \u003cjeffv@google.com\u003e\nAcked-by: Nick Kralevich \u003cnnk@google.com\u003e\nCc: Jeff Vander Stoep \u003cjeffv@google.com\u003e\nCc: Sasha Levin \u003csasha.levin@oracle.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Vlastimil Babka \u003cvbabka@suse.cz\u003e\nCc: Paul Cassella \u003ccassella@cray.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3733e5c98e952d419e77fa721912f09d15a2806", "tree": "f5ada9a2bbdac2aedc64bd9d2dc112b7caa0e91d", "parents": [ "a5af5aa8b67dfdba36c853b70564fd2dfe73d478" ], "author": { "name": "Andrey Ryabinin", "email": "a.ryabinin@samsung.com", "time": "Thu Mar 12 16:26:14 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "kasan, module: move MODULE_ALIGN macro into \u003clinux/moduleloader.h\u003e\n\ninclude/linux/moduleloader.h is more suitable place for this macro.\nAlso change alignment to PAGE_SIZE for CONFIG_KASAN\u003dn as such\nalignment already assumed in several places.\n\nSigned-off-by: Andrey Ryabinin \u003ca.ryabinin@samsung.com\u003e\nCc: Dmitry Vyukov \u003cdvyukov@google.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5af5aa8b67dfdba36c853b70564fd2dfe73d478", "tree": "d898e560802ef68b21280539040ccd19dc62678b", "parents": [ "b3c1030d50bad39383fcfa6721bd3c35463b3f3f" ], "author": { "name": "Andrey Ryabinin", "email": "a.ryabinin@samsung.com", "time": "Thu Mar 12 16:26:11 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "kasan, module, vmalloc: rework shadow allocation for modules\n\nCurrent approach in handling shadow memory for modules is broken.\n\nShadow memory could be freed only after memory shadow corresponds it is no\nlonger used. vfree() called from interrupt context could use memory its\nfreeing to store \u0027struct llist_node\u0027 in it:\n\n void vfree(const void *addr)\n {\n ...\n if (unlikely(in_interrupt())) {\n struct vfree_deferred *p \u003d this_cpu_ptr(\u0026vfree_deferred);\n if (llist_add((struct llist_node *)addr, \u0026p-\u003elist))\n schedule_work(\u0026p-\u003ewq);\n\nLater this list node used in free_work() which actually frees memory.\nCurrently module_memfree() called in interrupt context will free shadow\nbefore freeing module\u0027s memory which could provoke kernel crash.\n\nSo shadow memory should be freed after module\u0027s memory. However, such\ndeallocation order could race with kasan_module_alloc() in module_alloc().\n\nFree shadow right before releasing vm area. At this point vfree()\u0027d\nmemory is not used anymore and yet not available for other allocations.\nNew VM_KASAN flag used to indicate that vm area has dynamically allocated\nshadow memory so kasan frees shadow only if it was previously allocated.\n\nSigned-off-by: Andrey Ryabinin \u003ca.ryabinin@samsung.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Dmitry Vyukov \u003cdvyukov@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": "b3c1030d50bad39383fcfa6721bd3c35463b3f3f", "tree": "17cf492aaf8eb272de87667a650e4931584cf619", "parents": [ "5b8bf30721980b254be7a07315c353b3a3175b74" ], "author": { "name": "Suzuki K. Poulose", "email": "suzuki.poulose@arm.com", "time": "Thu Mar 12 16:26:08 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "fanotify: fix event filtering with FAN_ONDIR set\n\nWith FAN_ONDIR set, the user can end up getting events, which it hasn\u0027t\nmarked. This was revealed with fanotify04 testcase failure on\nLinux-4.0-rc1, and is a regression from 3.19, revealed with 66ba93c0d7fe6\n(\"fanotify: don\u0027t set FAN_ONDIR implicitly on a marks ignored mask\").\n\n # /opt/ltp/testcases/bin/fanotify04\n [ ... ]\n fanotify04 7 TPASS : event generated properly for type 100000\n fanotify04 8 TFAIL : fanotify04.c:147: got unexpected event 30\n fanotify04 9 TPASS : No event as expected\n\nThe testcase sets the adds the following marks : FAN_OPEN | FAN_ONDIR for\na fanotify on a dir. Then does an open(), followed by close() of the\ndirectory and expects to see an event FAN_OPEN(0x20). However, the\nfanotify returns (FAN_OPEN|FAN_CLOSE_NOWRITE(0x10)). This happens due to\nthe flaw in the check for event_mask in fanotify_should_send_event() which\ndoes:\n\n\tif (event_mask \u0026 marks_mask \u0026 ~marks_ignored_mask)\n\t\treturn true;\n\nwhere, event_mask \u003d\u003d (FAN_ONDIR | FAN_CLOSE_NOWRITE),\n marks_mask \u003d\u003d (FAN_ONDIR | FAN_OPEN),\n marks_ignored_mask \u003d\u003d 0\n\nFix this by masking the outgoing events to the user, as we already take\ncare of FAN_ONDIR and FAN_EVENT_ON_CHILD.\n\nSigned-off-by: Suzuki K. Poulose \u003csuzuki.poulose@arm.com\u003e\nTested-by: Lino Sanfilippo \u003cLinoSanfilippo@gmx.de\u003e\nReviewed-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5b8bf30721980b254be7a07315c353b3a3175b74", "tree": "359dbc4dd062a4fc64f6bcfbc2a8df169a9fe15b", "parents": [ "65b9ab888cd7bd14b314e9238ce6d4886df846fa" ], "author": { "name": "gchen gchen", "email": "xili_gchen_5257@hotmail.com", "time": "Thu Mar 12 16:26:05 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "mm/nommu.c: export symbol max_mapnr\n\nSeveral modules may need max_mapnr, so export, the related error with\nallmodconfig under c6x:\n\n MODPOST 3327 modules\n ERROR: \"max_mapnr\" [fs/pstore/ramoops.ko] undefined!\n ERROR: \"max_mapnr\" [drivers/media/v4l2-core/videobuf2-dma-contig.ko] undefined!\n\nSigned-off-by: Chen Gang \u003cgang.chen.5i5j@gmail.com\u003e\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nCc: Aurelien Jacquiot \u003ca-jacquiot@ti.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "65b9ab888cd7bd14b314e9238ce6d4886df846fa", "tree": "859219d6ed862f4b7273fe87f4dcea1b1d74db9b", "parents": [ "283ee1482f349d6c0c09dfb725db5880afc56813" ], "author": { "name": "Chen Gang", "email": "762976180@qq.com", "time": "Thu Mar 12 16:26:03 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU\n\nWhen !MMU, asm-generic will not define default pgprot_writecombine, so c6x\nneeds to define it by itself. The related error:\n\n CC [M] fs/pstore/ram_core.o\n fs/pstore/ram_core.c: In function \u0027persistent_ram_vmap\u0027:\n fs/pstore/ram_core.c:399:10: error: implicit declaration of function \u0027pgprot_writecombine\u0027 [-Werror\u003dimplicit-function-declaration]\n prot \u003d pgprot_writecombine(PAGE_KERNEL);\n ^\n fs/pstore/ram_core.c:399:8: error: incompatible types when assigning to type \u0027pgprot_t {aka struct \u003canonymous\u003e}\u0027 from type \u0027int\u0027\n prot \u003d pgprot_writecombine(PAGE_KERNEL);\n ^\n\nSigned-off-by: Chen Gang \u003cgang.chen.5i5j@gmail.com\u003e\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nCc: Aurelien Jacquiot \u003ca-jacquiot@ti.com\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "283ee1482f349d6c0c09dfb725db5880afc56813", "tree": "ef6906116925ddb1449188f73823c8ed9b766255", "parents": [ "850fc430f47aad52092deaaeb32b99f97f0e6aca" ], "author": { "name": "Ryusuke Konishi", "email": "konishi.ryusuke@lab.ntt.co.jp", "time": "Thu Mar 12 16:26:00 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:08 2015 -0700" }, "message": "nilfs2: fix deadlock of segment constructor during recovery\n\nAccording to a report from Yuxuan Shui, nilfs2 in kernel 3.19 got stuck\nduring recovery at mount time. The code path that caused the deadlock was\nas follows:\n\n nilfs_fill_super()\n load_nilfs()\n nilfs_salvage_orphan_logs()\n * Do roll-forwarding, attach segment constructor for recovery,\n and kick it.\n\n nilfs_segctor_thread()\n nilfs_segctor_thread_construct()\n * A lock is held with nilfs_transaction_lock()\n nilfs_segctor_do_construct()\n nilfs_segctor_drop_written_files()\n iput()\n iput_final()\n write_inode_now()\n writeback_single_inode()\n __writeback_single_inode()\n do_writepages()\n nilfs_writepage()\n nilfs_construct_dsync_segment()\n nilfs_transaction_lock() --\u003e deadlock\n\nThis can happen if commit 7ef3ff2fea8b (\"nilfs2: fix deadlock of segment\nconstructor over I_SYNC flag\") is applied and roll-forward recovery was\nperformed at mount time. The roll-forward recovery can happen if datasync\nwrite is done and the file system crashes immediately after that. For\ninstance, we can reproduce the issue with the following steps:\n\n \u003c nilfs2 is mounted on /nilfs (device: /dev/sdb1) \u003e\n # dd if\u003d/dev/zero of\u003d/nilfs/test bs\u003d4k count\u003d1 \u0026\u0026 sync\n # dd if\u003d/dev/zero of\u003d/nilfs/test conv\u003dnotrunc oflag\u003ddsync bs\u003d4k\n count\u003d1 \u0026\u0026 reboot -nfh\n \u003c the system will immediately reboot \u003e\n # mount -t nilfs2 /dev/sdb1 /nilfs\n\nThe deadlock occurs because iput() can run segment constructor through\nwriteback_single_inode() if MS_ACTIVE flag is not set on sb-\u003es_flags. The\nabove commit changed segment constructor so that it calls iput()\nasynchronously for inodes with i_nlink \u003d\u003d 0, but that change was\nimperfect.\n\nThis fixes the another deadlock by deferring iput() in segment constructor\neven for the case that mount is not finished, that is, for the case that\nMS_ACTIVE flag is not set.\n\nSigned-off-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nReported-by: Yuxuan Shui \u003cyshuiv7@gmail.com\u003e\nTested-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "850fc430f47aad52092deaaeb32b99f97f0e6aca", "tree": "a8be132a7ddc2bf8ce84b2a2abc6aae3891746ce", "parents": [ "44fc80573cc760a7154f41fd0a958ee10eba1a81" ], "author": { "name": "Danesh Petigara", "email": "dpetigara@broadcom.com", "time": "Thu Mar 12 16:25:57 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:07 2015 -0700" }, "message": "mm: cma: fix CMA aligned offset calculation\n\nThe CMA aligned offset calculation is incorrect for non-zero order_per_bit\nvalues.\n\nFor example, if cma-\u003eorder_per_bit\u003d1, cma-\u003ebase_pfn\u003d 0x2f800000 and\nalign_order\u003d12, the function returns a value of 0x17c00 instead of 0x400.\n\nThis patch fixes the CMA aligned offset calculation.\n\nThe previous calculation was wrong and would return too-large values for\nthe offset, so that when cma_alloc looks for free pages in the bitmap with\nthe requested alignment \u003e order_per_bit, it starts too far into the bitmap\nand so CMA allocations will fail despite there actually being plenty of\nfree pages remaining. It will also probably have the wrong alignment.\nWith this change, we will get the correct offset into the bitmap.\n\nOne affected user is powerpc KVM, which has kvm_cma-\u003eorder_per_bit set to\nKVM_CMA_CHUNK_ORDER - PAGE_SHIFT, or 18 - 12 \u003d 6.\n\n[gregory.0xf0@gmail.com: changelog additions]\nSigned-off-by: Danesh Petigara \u003cdpetigara@broadcom.com\u003e\nReviewed-by: Gregory Fong \u003cgregory.0xf0@gmail.com\u003e\nAcked-by: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44fc80573cc760a7154f41fd0a958ee10eba1a81", "tree": "2d3fd80fa0bc653b2be577e38ef38217727acd22", "parents": [ "e009d5dc0a94a7133e5f1c083732d760bfd038e6" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Mar 12 16:25:54 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:07 2015 -0700" }, "message": "mm, hugetlb: close race when setting PageTail for gigantic pages\n\nNow that gigantic pages are dynamically allocatable, care must be taken to\nensure that p-\u003efirst_page is valid before setting PageTail.\n\nIf this isn\u0027t done, then it is possible to race and have compound_head()\nreturn NULL.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Davidlohr Bueso \u003cdave@stgolabs.net\u003e\nCc: Luiz Capitulino \u003clcapitulino@redhat.com\u003e\nCc: Joonsoo Kim \u003ciamjoonsoo.kim@lge.com\u003e\nAcked-by: Hillf Danton \u003chillf.zj@alibaba-inc.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e009d5dc0a94a7133e5f1c083732d760bfd038e6", "tree": "844948083016ecb8fe5f7b346c5bada45f34defd", "parents": [ "8792f7772f4f40ffc68bad5f28311205584b734d" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Thu Mar 12 16:25:52 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:07 2015 -0700" }, "message": "mm, oom: do not fail __GFP_NOFAIL allocation if oom killer is disabled\n\nTetsuo Handa has pointed out that __GFP_NOFAIL allocations might fail\nafter OOM killer is disabled if the allocation is performed by a kernel\nthread. This behavior was introduced from the very beginning by\n7f33d49a2ed5 (\"mm, PM/Freezer: Disable OOM killer when tasks are frozen\").\n This means that the basic contract for the allocation request is broken\nand the context requesting such an allocation might blow up unexpectedly.\n\nThere are basically two ways forward.\n\n1) move oom_killer_disable after kernel threads are frozen. This has a\n risk that the OOM victim wouldn\u0027t be able to finish because it would\n depend on an already frozen kernel thread. This would be really tricky\n to debug.\n\n2) do not fail GFP_NOFAIL allocation no matter what and risk a\n potential Freezable kernel threads will loop and fail the suspend.\n Incidental allocations after kernel threads are frozen will at least\n dump a warning - if we are lucky and the serial console is still active\n of course...\n\nThis patch implements the later option because it is safer. We would see\nwarning rather than allocation failures for the kernel threads which would\nblow up otherwise and have a higher chances to identify __GFP_NOFAIL users\nfrom deeper pm code.\n\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: David Rientjes \u003crientjes@gooogle.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Tetsuo Handa \u003cpenguin-kernel@i-love.sakura.ne.jp\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@rjwysocki.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8792f7772f4f40ffc68bad5f28311205584b734d", "tree": "8c2535d511df9db21927107595cfa696b3255296", "parents": [ "18d585f0f2d4c9dc7dfe6e69dcae4933d5a428c9" ], "author": { "name": "Javier Martinez Canillas", "email": "javier.martinez@collabora.co.uk", "time": "Thu Mar 12 16:25:49 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:07 2015 -0700" }, "message": "drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data\n\nCommit df9e26d093d3 (\"rtc: s3c: add support for RTC of Exynos3250 SoC\")\nadded an \"rtc_src\" DT property to specify the clock used as a source to\nthe S3C real-time clock.\n\nNot all SoCs needs this so commit eaf3a659086e (\"drivers/rtc/rtc-s3c.c:\nfix initialization failure without rtc source clock\") changed to check\nthe struct s3c_rtc_data .needs_src_clk to conditionally grab the clock.\n\nBut that commit didn\u0027t update the data for each IP version so the RTC\nbroke on the boards that needs a source clock. This is the case of at\nleast Exynos5250 and Exynos5440 which uses the s3c6410 RTC IP block.\n\nThis commit fixes the S3C rtc on the Exynos5250 Snow and Exynos5420\nPeach Pit and Pi Chromebooks.\n\nSigned-off-by: Javier Martinez Canillas \u003cjavier.martinez@collabora.co.uk\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Chanwoo Choi \u003ccw00.choi@samsung.com\u003e\nCc: Doug Anderson \u003cdianders@chromium.org\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nCc: Kevin Hilman \u003ckhilman@linaro.org\u003e\nCc: Tyler Baker \u003ctyler.baker@linaro.org\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "18d585f0f2d4c9dc7dfe6e69dcae4933d5a428c9", "tree": "2be8f6ffa1717b317f5fcb0a061c25b127fd6edd", "parents": [ "09d35919b06e8508b51ee8a643a67b56f7bea0dd" ], "author": { "name": "Mark Fasheh", "email": "mfasheh@suse.de", "time": "Thu Mar 12 16:25:46 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 18:46:07 2015 -0700" }, "message": "ocfs2: make append_dio an incompat feature\n\nIt turns out that making this feature ro_compat isn\u0027t quite enough to\nprevent accidental corruption on mount from older kernels. Ocfs2 (like\nother file systems) will process orphaned inodes even when the user mounts\nin \u0027ro\u0027 mode. So for the case of a filesystem not knowing the append_dio\nfeature, mounting the filesystem could result in orphaned-for-dio files\nbeing deleted, which we clearly don\u0027t want.\n\nSo instead, turn this into an incompat flag.\n\nBtw, this is kind of my fault - initially I asked that we add a flag to\ncover the feature and even suggested that we use an ro flag. It wasn\u0027t\nuntil I was looking through our commits for v4.0-rc1 that I realized we\nactually want this to be incompat.\n\nSigned-off-by: Mark Fasheh \u003cmfasheh@suse.de\u003e\nCc: Joseph Qi \u003cjoseph.qi@huawei.com\u003e\nCc: Joel Becker \u003cjlbec@evilplan.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ba68bc0115ebfc37f911db4e87bf5f7991f89698", "tree": "4d4806b791a737f9b54ff691f7092f683831d70e", "parents": [ "09d35919b06e8508b51ee8a643a67b56f7bea0dd" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Sat Mar 07 15:20:48 2015 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 14:07:41 2015 -0700" }, "message": "mm: thp: Return the correct value for change_huge_pmd\n\nThe wrong value is being returned by change_huge_pmd since commit\n10c1045f28e8 (\"mm: numa: avoid unnecessary TLB flushes when setting\nNUMA hinting entries\") which allows a fallthrough that tries to adjust\nnon-existent PTEs. This patch corrects it.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ddee91abe9cc34ddb6294ee14702b46ae07d460", "tree": "0eb1cd3a155e65c217d3d8fb3a758952acbca287", "parents": [ "bad994f5b4ab57eec8d56c180edca00505c3eeb2" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 20:47:15 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 20:50:32 2015 +0100" }, "message": "ALSA: hda - Add workaround for MacBook Air 5,2 built-in mic\n\nMacBook Air 5,2 has the same problem as MacBook Pro 8,1 where the\nbuilt-in mic records only the right channel. Apply the same\nworkaround as MBP8,1 to spread the mono channel via a Cirrus codec\nvendor-specific COEF setup.\n\nReported-and-tested-by: Vasil Zlatanov \u003cvasil.zlatanov@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.9+\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "bad994f5b4ab57eec8d56c180edca00505c3eeb2", "tree": "6dacf24e85c73ac8a9434653ae6bc0d039f3591a", "parents": [ "fcdcd1dec6d2c7b718385ec743ae5a9a233edad4" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 20:28:04 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 20:28:04 2015 +0100" }, "message": "ALSA: hda - Set single_adc_amp flag for CS420x codecs\n\nCS420x codecs seem to deal only the single amps of ADC nodes even\nthough the nodes receive multiple inputs. This leads to the\ninconsistent amp value after S3/S4 resume, for example.\n\nThe fix is just to set codec-\u003esingle_adc_amp flag. Then the driver\nhandles these ADC amps as if single connections.\n\nReported-and-tested-by: Vasil Zlatanov \u003cvasil.zlatanov@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.9+\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "09d35919b06e8508b51ee8a643a67b56f7bea0dd", "tree": "cd0a76344f138ba3dc525220393c1bf7be9fb078", "parents": [ "91e9134eda82b57952fdbdb0c5990a7a6609ff13", "a49445727014216703a3c28ccee4cef36d41571e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:50:45 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:50:45 2015 -0700" }, "message": "Merge branch \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux\n\nPull i2c fix from Wolfram Sang:\n \"An important bugfix for the I2C subsystem core\"\n\n* \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:\n Revert \"i2c: core: Dispose OF IRQ mapping at client removal time\"\n" }, { "commit": "91e9134eda82b57952fdbdb0c5990a7a6609ff13", "tree": "e9ce45c461331310ec3c19720b7594949301ac2f", "parents": [ "d3dd73fc9eaa81348f21c6ec33d531fa0397b7bf", "085a68d0010ffa57603b93c2b09fdf98bf74218c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:45:46 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:45:46 2015 -0700" }, "message": "Merge tag \u0027pci-v4.0-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI fixes from Bjorn Helgaas:\n \"Here are a couple updates for v4.0.\n\n One fixes a config accessor problem on APM X-Gene that we introduced\n when switching to generic config accessors, and the other fixes an\n older read-past-end-of-buffer problem in sysfs.\n\n APM X-Gene host bridge driver\n - Add register offset to config space base address (Feng Kan)\n\n Miscellaneous\n - Don\u0027t read past the end of sysfs \"driver_override\" buffer (Sasha Levin)\"\n\n* tag \u0027pci-v4.0-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:\n PCI: xgene: Add register offset to config space base address\n PCI: Don\u0027t read past the end of sysfs \"driver_override\" buffer\n" }, { "commit": "d3dd73fc9eaa81348f21c6ec33d531fa0397b7bf", "tree": "d4ed9f63debf16ff37be19aa8f722c575288a926", "parents": [ "5627511205e474f960d37a6242749c6964993836", "c2219eda547813c0c50dba90d9e989ae36cc3ab8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:34:10 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:34:10 2015 -0700" }, "message": "Merge tag \u0027microblaze-4.0-rc4\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\nPull arch/microblaze fixes from Michal Simek:\n \"Fix syscall error recovery.\n\n Two patches - one is just preparation patch for the second which is\n fixing the problem with syscalls\"\n\n* tag \u0027microblaze-4.0-rc4\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: Fix syscall error recovery for invalid syscall IDs\n microblaze: Coding style cleanup\n" }, { "commit": "5627511205e474f960d37a6242749c6964993836", "tree": "ea408d284be2ac6432dceeaf6d8222cbc1e6c8ac", "parents": [ "53da3bc2ba9e4899f32707b5cd7d18421b943687", "92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:23:30 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 09:23:30 2015 -0700" }, "message": "Merge tag \u0027nios2-fix-4.0-rc4\u0027 of git://git.rocketboards.org/linux-socfpga-next\n\nPull arch/nios2 fix from Ley Foon Tan:\n \"Remove pt_regs from user header and use generic ucontext.h\"\n\n* tag \u0027nios2-fix-4.0-rc4\u0027 of git://git.rocketboards.org/linux-socfpga-next:\n nios2: update pt_regs\n" }, { "commit": "ec76f4007079469e86e2e44c3e5d1d11086de9d6", "tree": "b7011efa16c38666d9c87f8cd8b7189cc2659be0", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Alexey Kardashevskiy", "email": "aik@ozlabs.ru", "time": "Thu Mar 12 14:43:12 2015 +1100" }, "committer": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Thu Mar 12 09:51:38 2015 -0600" }, "message": "vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX\n\nThis adds a missing break statement to VFIO_DEVICE_SET_IRQS handler\nwithout which vfio_pci_set_err_trigger() would never be called.\n\nWhile we are here, add another \"break\" to VFIO_PCI_REQ_IRQ_INDEX case\nso if we add more indexes later, we won\u0027t miss it.\n\nFixes: 6140a8f56238 (\"vfio-pci: Add device request interface\")\nSigned-off-by: Alexey Kardashevskiy \u003caik@ozlabs.ru\u003e\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\n" }, { "commit": "53da3bc2ba9e4899f32707b5cd7d18421b943687", "tree": "b082c60c1fefa6383b0b3ae2834746e7debffa00", "parents": [ "cca28a5fda5d8fa69982bdb54341eeeb3eab215a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 08:45:46 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 12 08:45:46 2015 -0700" }, "message": "mm: fix up numa read-only thread grouping logic\n\nDave Chinner reported that commit 4d9424669946 (\"mm: convert\np[te|md]_mknonnuma and remaining page table manipulations\") slowed down\nhis xfsrepair test enormously. In particular, it was using more system\ntime due to extra TLB flushing.\n\nThe ultimate reason turns out to be how the change to use the regular\npage table accessor functions broke the NUMA grouping logic. The old\nspecial mknuma/mknonnuma code accessed the page table present bit and\nthe magic NUMA bit directly, while the new code just changes the page\nprotections using PROT_NONE and the regular vma protections.\n\nThat sounds equivalent, and from a fault standpoint it really is, but a\nsubtle side effect is that the *other* protection bits of the page table\nentries also change. And the code to decide how to group the NUMA\nentries together used the writable bit to decide whether a particular\npage was likely to be shared read-only or not.\n\nAnd with the change to make the NUMA handling use the regular permission\nsetting functions, that writable bit was basically always cleared for\nprivate mappings due to COW. So even if the page actually ends up being\nwritten to in the end, the NUMA balancing would act as if it was always\nshared RO.\n\nThis code is a heuristic anyway, so the fix - at least for now - is to\ninstead check whether the page is dirty rather than writable. The bit\ndoesn\u0027t change with protection changes.\n\nNOTE! This also adds a FIXME comment to revisit this issue,\n\nNot only should we probably re-visit the whole \"is this a shared\nread-only page\" heuristic (we might want to take the vma permissions\ninto account and base this more on those than the per-page ones, and\nalso look at whether the particular access that triggers it is a write\nor not), but the whole COW issue shows that we should think about the\nNUMA fault handling some more.\n\nFor example, maybe we should do the early-COW thing that a regular fault\ndoes. Or maybe we should accept that while using the same bits as\nPROTNONE was a good thing (and got rid of the specual NUMA bit), we\nmight still want to just preseve the other protection bits across NUMA\nfaulting.\n\nThose are bigger questions, left for later. This just fixes up the\nheuristic so that it at least approximates working again. More analysis\nand work needed.\n\nReported-by: Dave Chinner \u003cdavid@fromorbit.com\u003e\nTested-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Aneesh Kumar \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e,\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a49445727014216703a3c28ccee4cef36d41571e", "tree": "aeed53bea51b29a3b501dd43badfe87242d22e58", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Jakub Kicinski", "email": "kubakici@wp.pl", "time": "Wed Mar 11 18:35:36 2015 +0100" }, "committer": { "name": "Wolfram Sang", "email": "wsa@the-dreams.de", "time": "Thu Mar 12 10:23:05 2015 +0100" }, "message": "Revert \"i2c: core: Dispose OF IRQ mapping at client removal time\"\n\nThis reverts commit e4df3a0b6228\n(\"i2c: core: Dispose OF IRQ mapping at client removal time\")\n\nCalling irq_dispose_mapping() will destroy the mapping and disassociate\nthe IRQ from the IRQ chip to which it belongs. Keeping it is OK, because\nexistent mappings are reused properly.\n\nAlso, this commit breaks drivers using devm* for IRQ management on\nOF-based systems because devm* cleanup happens in device code, after\nbus\u0027s remove() method returns.\n\nSigned-off-by: Jakub Kicinski \u003ckubakici@wp.pl\u003e\nReported-by: Sébastien Szymanski \u003csebastien.szymanski@armadeus.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n[wsa: updated the commit message with findings fromt the other bug report]\nSigned-off-by: Wolfram Sang \u003cwsa@the-dreams.de\u003e\nCc: stable@kernel.org\nFixes: e4df3a0b6228\n" }, { "commit": "fcdcd1dec6d2c7b718385ec743ae5a9a233edad4", "tree": "2e93fd7325e84125cfa73c2f6144cbce38e77a53", "parents": [ "be3bb8236db2d0fcd705062ae2e2a9d75131222f" ], "author": { "name": "Daniel Mack", "email": "daniel@zonque.org", "time": "Thu Mar 12 09:41:32 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 10:19:49 2015 +0100" }, "message": "ALSA: snd-usb: add quirks for Roland UA-22\n\nThe device complies to the UAC1 standard but hides that fact with\nproprietary descriptors. The autodetect quirk for Roland devices\ncatches the audio interface but misses the MIDI part, so a specific\nquirk is needed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@zonque.org\u003e\nReported-by: Rafa Lafuente \u003crafalafuente@gmail.com\u003e\nTested-by: Raphaël Doursenaud \u003craphael@doursenaud.fr\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "be3bb8236db2d0fcd705062ae2e2a9d75131222f", "tree": "844ead97a7f2fcb4dfcb59e078f19c7a22544dcb", "parents": [ "ddb6ca75b5671b8fbf1909bc588c449ee74b34f9" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Mar 11 18:12:49 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Mar 12 07:36:38 2015 +0100" }, "message": "ALSA: control: Add sanity checks for user ctl id name string\n\nThere was no check about the id string of user control elements, so we\naccepted even a control element with an empty string, which is\nobviously bogus. This patch adds more sanity checks of id strings.\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f", "tree": "4d99635aff3be4a2c0b19f0bbe3fe51e19bc1fff", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Chung-Ling Tang", "email": "cltang@codesourcery.com", "time": "Thu Mar 12 13:34:31 2015 +0800" }, "committer": { "name": "Ley Foon Tan", "email": "lftan@altera.com", "time": "Thu Mar 12 13:35:06 2015 +0800" }, "message": "nios2: update pt_regs\n\nRemove struct pt_regs from user header and use generic ucontext.h.\n\nSigned-off-by: Chung-Ling Tang \u003ccltang@codesourcery.com\u003e\nAcked-by: Ley Foon Tan \u003clftan@altera.com\u003e\n" }, { "commit": "b8ea351b0e154c9dc28609db58eddc6c2934c954", "tree": "ee7fcd3be4675d5086acee0f3fd34ea69d311988", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Josh Boyer", "email": "jwboyer@fedoraproject.org", "time": "Tue Mar 10 20:26:36 2015 -0400" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Wed Mar 11 21:56:49 2015 +0100" }, "message": "Revert \"cpupower Makefile change to help run the tool without \u0027make install\u0027\"\n\nThis reverts commit 5c1de006e8e66b0be05be422416629e344c71652.\n\nWhile the original commit makes it easier to run cpupower from the\nlocal build directory, it also leaves the binary with a rather poor\nrpath of \u0027./\u0027 in it after it is installed on a system via \u0027make install\u0027.\n\nThis is considered bad practice and can cause cpupower to fail in\nrpmbuild with the following error:\n\nERROR 0004: file \u0027/usr/bin/cpupower\u0027 contains an insecure rpath \u0027./\u0027 in [./]\nerror: Bad exit status from /var/tmp/rpm-tmp.A6u26r (%install)\n Bad exit status from /var/tmp/rpm-tmp.A6u26r (%install)\n\nDevelopers should be able to use LD_LIBRARY_PATH to achieve the same\neffect and not introduce rpath into the binary.\n\nSigned-off-by: Josh Boyer \u003cjwboyer@feoraproject.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "9a0b57451ae8142c74d65bddb6d7765818babbed", "tree": "39b95b227b7a917319267520370381c77edb9e4c", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Michael Ellerman", "email": "mpe@ellerman.id.au", "time": "Tue Feb 03 14:53:08 2015 +1100" }, "committer": { "name": "Shuah Khan", "email": "shuahkh@osg.samsung.com", "time": "Wed Mar 11 10:15:19 2015 -0600" }, "message": "selftests/exec: Check if the syscall exists and bail if not\n\nOn systems which don\u0027t implement sys_execveat(), this test produces a\nlot of output.\n\nAdd a check at the beginning to see if the syscall is present, and if\nnot just note one error and return.\n\nWhen we run on a system that doesn\u0027t implement the syscall we will get\nENOSYS back from the kernel, so change the logic that handles\n__NR_execveat not being defined to also use ENOSYS rather than -ENOSYS.\n\nSigned-off-by: Michael Ellerman \u003cmpe@ellerman.id.au\u003e\nAcked-by: David Drysdale \u003cdrysdale@google.com\u003e\nSigned-off-by: Shuah Khan \u003cshuahkh@osg.samsung.com\u003e\n" }, { "commit": "ddb6ca75b5671b8fbf1909bc588c449ee74b34f9", "tree": "e60af47fed428a03e38e2349191dea6d6e294db2", "parents": [ "59294a01d7037f63fb8bf994af10ce63c618770a" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Mar 11 16:05:19 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Mar 11 16:05:19 2015 +0100" }, "message": "ALSA: hda - Fix built-in mic on Compaq Presario CQ60\n\nCompaq Presario CQ60 laptop with CX20561 gives a wrong pin for the\nbuilt-in mic NID 0x17 instead of NID 0x1d, and it results in the\nnon-working mic. This patch just remaps the pin correctly via fixup.\n\nBugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id\u003d920604\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "af6fc858a35b90e89ea7a7ee58e66628c55c776b", "tree": "5c794dd0eaf6b82cb5b46a05de14f77b41bb7b8a", "parents": [ "85e40b0539b24518c8bdf63e2605c8522377d00f" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Wed Mar 11 13:51:17 2015 +0000" }, "committer": { "name": "David Vrabel", "email": "david.vrabel@citrix.com", "time": "Wed Mar 11 14:34:40 2015 +0000" }, "message": "xen-pciback: limit guest control of command register\n\nOtherwise the guest can abuse that control to cause e.g. PCIe\nUnsupported Request responses by disabling memory and/or I/O decoding\nand subsequently causing (CPU side) accesses to the respective address\nranges, which (depending on system configuration) may be fatal to the\nhost.\n\nNote that to alter any of the bits collected together as\nPCI_COMMAND_GUEST permissive mode is now required to be enabled\nglobally or on the specific device.\n\nThis is CVE-2015-2150 / XSA-120.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\n" }, { "commit": "cca28a5fda5d8fa69982bdb54341eeeb3eab215a", "tree": "ac563c15a31ea1dcdd4a67f01df3b85b58149913", "parents": [ "9c3e1323ecb382ef8731c7e7dc0891e4e00f9607", "5e0899db69e27abfdc1c6223ca74f479acdedaa6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 10 17:44:34 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 10 17:44:34 2015 -0700" }, "message": "Merge tag \u0027for-linus-20150310\u0027 of git://git.infradead.org/linux-mtd\n\nPull MTD fixes from Brian Norris:\n\n * pxa3xx_nand\n - fix timeout issues when draining the FIFO (BCH only)\n - don\u0027t crash when no chip-selects are used\n\n * hisi504_nand\n - depend on HAS_DMA, to fix compile errors\n\n* tag \u0027for-linus-20150310\u0027 of git://git.infradead.org/linux-mtd:\n mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA\n mtd: pxa3xx_nand: fix driver when num_cs is 0\n mtd: nand: pxa3xx: Fix PIO FIFO draining\n" }, { "commit": "9c3e1323ecb382ef8731c7e7dc0891e4e00f9607", "tree": "db49c6d82881377d5eb5dfb7cb9ae0dce6ea0174", "parents": [ "affb8172de395a6e1db52ed9790ca0456d8c29a9", "d05321ecfd77b6204b28e5d98fb75befabf62b53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 10 17:36:19 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 10 17:36:19 2015 -0700" }, "message": "Merge tag \u0027iommu-fixes-v4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu\n\nPull iommu fixes from Joerg Roedel:\n \"The patches contain:\n\n - fix multiple ARM IOMMU drivers to behave well when the hardware is\n not present\n\n - mark MSM driver as broken\n\n - fix build errors with the new ARM generic io-page-table code\"\n\n* tag \u0027iommu-fixes-v4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:\n iommu/io-pgtable-arm: Add built time dependency\n iommu/msm: Mark driver BROKEN\n iommu/rockchip: Play nice in multi-platform builds\n iommu/omap: Play nice in multi-platform builds\n iommu/exynos: Play nice in multi-platform builds\n iommu/io-pgtable-arm: Fix self-test WARNs on i386\n" }, { "commit": "8cbba1ab1ae15b3a5d96caa526eac607f80bda23", "tree": "f2f58907cd2e0efe8cffc8254f411ca44703a924", "parents": [ "106937e8ccdcf0f4b95fbf0fe9abd42766cade33" ], "author": { "name": "Peter Hurley", "email": "peter@hurleysoftware.com", "time": "Fri Mar 06 13:59:59 2015 -0500" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:44:21 2015 -0500" }, "message": "of: unittest: Add options string testcase variants\n\nAdd testcase variants with \u0027/\u0027 in the options string to test for\nscan beyond end path name terminated by \u0027:\u0027.\n\nSigned-off-by: Peter Hurley \u003cpeter@hurleysoftware.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "106937e8ccdcf0f4b95fbf0fe9abd42766cade33", "tree": "00856969bfbf6f95206d2265d0788bfb02650294", "parents": [ "649022e08e4798ffb6e9b11c56ee6b2c62465d11" ], "author": { "name": "Leif Lindholm", "email": "leif.lindholm@linaro.org", "time": "Fri Mar 06 16:52:53 2015 +0000" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:35 2015 -0500" }, "message": "of: fix handling of \u0027/\u0027 in options for of_find_node_by_path()\n\nEnsure proper handling of paths with appended options (after \u0027:\u0027),\nwhere those options may contain a \u0027/\u0027.\n\nFixes: 7914a7c5651a (\"of: support passing console options with stdout-path\")\nReported-by: Peter Hurley \u003cpeter@hurleysoftware.com\u003e\nSigned-off-by: Leif Lindholm \u003cleif.lindholm@linaro.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.19\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "649022e08e4798ffb6e9b11c56ee6b2c62465d11", "tree": "0358e9b9ab0abcd622ed53471e6c3174406892a7", "parents": [ "dc6a9453eb253658df8740d4d872c6323daf4f0d" ], "author": { "name": "Wang Long", "email": "long.wanglong@huawei.com", "time": "Tue Mar 03 03:50:38 2015 +0000" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:34 2015 -0500" }, "message": "of/unittest: Fix the wrong expected value in of_selftest_property_string\n\nThis patch fix the wrong expected value of of_property_match_string\nin of_selftest_property_string.\n\nSigned-off-by: Wang Long \u003clong.wanglong@huawei.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "dc6a9453eb253658df8740d4d872c6323daf4f0d", "tree": "d4757ffb493403ca03497c9a005b5ad51b056201", "parents": [ "d1e9fa98387549a24633fb6b00a26edb34382488" ], "author": { "name": "Wang Long", "email": "long.wanglong@huawei.com", "time": "Mon Mar 02 06:49:21 2015 +0000" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:34 2015 -0500" }, "message": "of/unittest: remove the duplicate of_changeset_init\n\nRemove the duplicate of_changeset_init. In of_selftest_changeset\ntestcase, the \"struct of_changeset chgset\" is initialized twice,\nbut only once is enough. so, drop the first initializtion code.\n\nSigned-off-by: Wang Long \u003clong.wanglong@huawei.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "d1e9fa98387549a24633fb6b00a26edb34382488", "tree": "dc3540bca850ece24362ba0df634e705d78a727e", "parents": [ "4252de39d644d05d0e5f3a19ab6dd056944e64e4" ], "author": { "name": "Matt Porter", "email": "mporter@konsulko.com", "time": "Thu Mar 05 10:53:11 2015 -0500" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:33 2015 -0500" }, "message": "dt: submitting-patches: clarify that DT maintainers are to be cced on bindings\n\nThe exact steps provided for submitting binding patches can be read\nas requiring the bindings to be sent only to the devicetree@vger.kernel.org\nlist. Since the DT maintainers would like to be Cced on any binding\nsubmissions, make this requirement explicit in step 2.\n\nSigned-off-by: Matt Porter \u003cmporter@konsulko.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "4252de39d644d05d0e5f3a19ab6dd056944e64e4", "tree": "42d52907bfff3227cca205e443bc495dacfe9e88", "parents": [ "d3a891652adb82e1973348c703a597cb54e41dea" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Mar 04 20:49:47 2015 +0100" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:33 2015 -0500" }, "message": "of: unittest: fix I2C dependency\n\nThe unittest fails to link if I2C or I2C_MUX is a loadable module:\n\n drivers/built-in.o: In function `selftest_i2c_mux_remove\u0027:\n unittest.c:(.text+0xb0ce4): undefined reference to `i2c_del_mux_adapter\u0027\n\nThis changes the newly added IS_ENABLED() checks to use IS_BUILTIN()\ninstead, which evaluates to false if the other driver is a module.\n\nReported-by: Chen Gang \u003cgang.chen.5i5j@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nFixes: d5e75500ca401 (\"of: unitest: Add I2C overlay unit tests.\")\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "d3a891652adb82e1973348c703a597cb54e41dea", "tree": "2d203ea5f53bb9debf63ee5e8eb00157440fd56d", "parents": [ "20aa4d8ae8d2ada8f959364ebc096b8841245456" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Tue Mar 03 10:04:45 2015 -0300" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:33 2015 -0500" }, "message": "of/overlay: Remove unused variable\n\nCommit 3e7f7626fd49a (\"of/overlay: Do not generate duplicate nodes\") removed\nthe only use of the \u0027grandchild\u0027 variable, which leads to the following build\nwarning:\n\ndrivers/of/overlay.c: In function \u0027of_overlay_apply_single_device_node\u0027:\ndrivers/of/overlay.c:89:31: warning: unused variable \u0027grandchild\u0027 [-Wunused-variable]\n struct device_node *tchild, *grandchild;\n ^\n\nRemove this unused variable.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "20aa4d8ae8d2ada8f959364ebc096b8841245456", "tree": "9ec72afe45a50532e106f7ff0e1528d80e7652a3", "parents": [ "2fa645cb2703d9b3786d850db815414dfeefa51d" ], "author": { "name": "Chunyan Zhang", "email": "chunyan.zhang@spreadtrum.com", "time": "Fri Jan 16 18:00:07 2015 +0800" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:34:32 2015 -0500" }, "message": "Documentation: DT: Renamed of-serial.txt to 8250.txt\n\nThe file of-serial.txt was only for 8250 compatible UART implementations,\nso renamed it to 8250.txt to avoid confusing other persons.\nThis is suggested by Arnd, see:\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2014-September/291455.html\n\nSigned-off-by: Chunyan Zhang \u003cchunyan.zhang@spreadtrum.com\u003e\nAcked-by: Mark Rutland \u003cmark.rutland@arm.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "2fa645cb2703d9b3786d850db815414dfeefa51d", "tree": "66607f387502f0a31385873ae0812901e5e2b773", "parents": [ "2c192699a7050ef5bdf1e2cc95fdddfbcf524509" ], "author": { "name": "Peter Hurley", "email": "peter@hurleysoftware.com", "time": "Sun Mar 01 12:21:22 2015 -0500" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 10:27:21 2015 -0500" }, "message": "of: Fix premature bootconsole disable with \u0027stdout-path\u0027\n\nSupport for devicetree serial consoles via \u0027stdout-path\u0027 causes\nbootconsoles to be disabled when the vt dummy console loads, since\nthere is no preferred console (the preferred console is not added\nuntil the device is probed).\n\nEnsure there is at least a preferred console, even if never matched.\n\nRequires: \"console: Fix console name size mismatch\"\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Peter Hurley \u003cpeter@hurleysoftware.com\u003e\nSigned-off-by: Rob Herring \u003crobh@kernel.org\u003e\n" }, { "commit": "59294a01d7037f63fb8bf994af10ce63c618770a", "tree": "e788837bd16e4cdc9e1a318ad1b16c19102d0d66", "parents": [ "5b1274efe2a24eb5a85a00cc48c334b1cdfc75aa" ], "author": { "name": "Takashi Sakamoto", "email": "o-takashi@sakamocchi.jp", "time": "Tue Mar 10 21:54:35 2015 +0900" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Mar 10 15:27:19 2015 +0100" }, "message": "ALSA: firewire-lib: leave unit reference counting completely\n\nWith previous commit, this module managed to leave the counting to each\ndrivers, but the isochronous resources functionality still increment/decrement\nthe count.\n\nThis commit purge such codes to leave the responsibility to each drivers.\n\nFix: c6f224dc20ad (\u0027ALSA: firewire-lib: remove reference counting\u0027)\nSigned-off-by: Takashi Sakamoto \u003co-takashi@sakamocchi.jp\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "5b1274efe2a24eb5a85a00cc48c334b1cdfc75aa", "tree": "df94c26c208fe040fb450227b69f432bebecc671", "parents": [ "a1f3f1ca66bd12c339b17a0c2ef93a093f90a277" ], "author": { "name": "Takashi Sakamoto", "email": "o-takashi@sakamocchi.jp", "time": "Tue Mar 10 21:58:48 2015 +0900" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Tue Mar 10 15:26:25 2015 +0100" }, "message": "Revert \"ALSA: dice: fix wrong offsets for Dice interface\"\n\nThis reverts commit 8cdebf71098c07168ef6335e2f1f35d85dbe3049.\n\nThe reverted commit breaks out-stream functionality of Dice driver.\n\nSigned-off-by: Takashi Sakamoto \u003co-takashi@sakamocchi.jp\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "2c192699a7050ef5bdf1e2cc95fdddfbcf524509", "tree": "945d4553691ecb24151a2fa83b7d489665dd3248", "parents": [ "25e8f336e535d10c30216e1ba330fbea98dfccc5", "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 09:03:04 2015 -0500" }, "committer": { "name": "Rob Herring", "email": "robh@kernel.org", "time": "Tue Mar 10 09:03:04 2015 -0500" }, "message": "Merge tag \u0027v4.0-rc3\u0027 into HEAD\n\nLinux 4.0-rc3\n\nMerging in v4.0-rc3 because commit 30a22c215a00 (console: Fix\nconsole name size mismatch) is a dependency.\n" }, { "commit": "affb8172de395a6e1db52ed9790ca0456d8c29a9", "tree": "1415c9c6eabcde5d49a77a75dd71d073c33269e6", "parents": [ "ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead", "bfb8fb4775d3397908ae3a7ff65807097d81d713" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:59:50 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:59:50 2015 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull kvm/s390 bugfixes from Marcelo Tosatti.\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: s390: non-LPAR case obsolete during facilities mask init\n KVM: s390: include guest facilities in kvm facility test\n KVM: s390: fix in memory copy of facility lists\n KVM: s390/cpacf: Fix kernel bug under z/VM\n KVM: s390/cpacf: Enable key wrapping by default\n" }, { "commit": "ec0e6bd3f11c0acf9cbcbe12da3ab45ac7cc7ead", "tree": "2411a0b7a05a6c6c0b43515806180033c8660ac0", "parents": [ "e7901af14398bf0272e523936d0774b4469741a8", "691d5264158e58004904f285417fefaf8650ffe6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:55:52 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:55:52 2015 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 fixes from Martin Schwidefsky:\n \"One performance optimization for page_clear and a couple of bug fixes\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:\n s390/mm: fix incorrect ASCE after crst_table_downgrade\n s390/ftrace: fix crashes when switching tracers / add notrace to cpu_relax()\n s390/pci: unify pci_iomap symbol exports\n s390/pci: fix [un]map_resources sequence\n s390: let the compiler do page clearing\n s390/pci: fix possible information leak in mmio syscall\n s390/dcss: array index \u0027i\u0027 is used before limits check.\n s390/scm_block: fix off by one during cluster reservation\n s390/jump label: improve and fix sanity check\n s390/jump label: add missing jump_label_apply_nops() call\n" }, { "commit": "e7901af14398bf0272e523936d0774b4469741a8", "tree": "1259f6f2632ea31673ddf7bcee0315aca2810cbb", "parents": [ "36bef88380037288d5b575ed2029de694533b1ec", "524a38682573b2e15ab6317ccfe50280441514be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:44:06 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:44:06 2015 -0700" }, "message": "Merge tag \u0027trace-fixes-v4.0-rc2-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull seq-buf/ftrace fixes from Steven Rostedt:\n \"This includes fixes for seq_buf_bprintf() truncation issue. It also\n contains fixes to ftrace when /proc/sys/kernel/ftrace_enabled and\n function tracing are started. Doing the following causes some issues:\n\n # echo 0 \u003e /proc/sys/kernel/ftrace_enabled\n # echo function_graph \u003e /sys/kernel/debug/tracing/current_tracer\n # echo 1 \u003e /proc/sys/kernel/ftrace_enabled\n # echo nop \u003e /sys/kernel/debug/tracing/current_tracer\n # echo function_graph \u003e /sys/kernel/debug/tracing/current_tracer\n\n As well as with function tracing too. Pratyush Anand first reported\n this issue to me and supplied a patch. When I tested this on my x86\n test box, it caused thousands of backtraces and warnings to appear in\n dmesg, which also caused a denial of service (a warning for every\n function that was listed). I applied Pratyush\u0027s patch but it did not\n fix the issue for me. I looked into it and found a slight problem\n with trampoline accounting. I fixed it and sent Pratyush a patch, but\n he said that it did not fix the issue for him.\n\n I later learned tha Pratyush was using an ARM64 server, and when I\n tested on my ARM board, I was able to reproduce the same issue as\n Pratyush. After applying his patch, it fixed the problem. The above\n test uncovered two different bugs, one in x86 and one in ARM and\n ARM64. As this looked like it would affect PowerPC, I tested it on my\n PPC64 box. It too broke, but neither the patch that fixed ARM or x86\n fixed this box (the changes were all in generic code!). The above\n test, uncovered two more bugs that affected PowerPC. Again, the\n changes were only done to generic code. It\u0027s the way the arch code\n expected things to be done that was different between the archs. Some\n where more sensitive than others.\n\n The rest of this series fixes the PPC bugs as well\"\n\n* tag \u0027trace-fixes-v4.0-rc2-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:\n ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled\n ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl\n ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl\n seq_buf: Fix seq_buf_bprintf() truncation\n seq_buf: Fix seq_buf_vprintf() truncation\n" }, { "commit": "36bef88380037288d5b575ed2029de694533b1ec", "tree": "b1e657eec07b8049ff5c966db208f0a3241e963f", "parents": [ "e93df634aac6b6dccaa2c23a5a5a504ed502b97e", "e6441bae326271090755e1707196ad05aa1dc703" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:17:21 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:17:21 2015 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) nft_compat accidently truncates ethernet protocol to 8-bits, from\n Arturo Borrero.\n\n 2) Memory leak in ip_vs_proc_conn(), from Julian Anastasov.\n\n 3) Don\u0027t allow the space required for nftables rules to exceed the\n maximum value representable in the dlen field. From Patrick\n McHardy.\n\n 4) bcm63xx_enet can accidently leave interrupts permanently disabled\n due to errors in the NAPI polling exit logic. Fix from Nicolas\n Schichan.\n\n 5) Fix OOPSes triggerable by the ping protocol module, due to missing\n address family validations etc. From Lorenzo Colitti.\n\n 6) Don\u0027t use RCU locking in sleepable context in team driver, from Jiri\n Pirko.\n\n 7) xen-netback miscalculates statistic offset pointers when reporting\n the stats to userspace. From David Vrabel.\n\n 8) Fix a leak of up to 256 pages per VIF destroy in xen-netaback, also\n from David Vrabel.\n\n 9) ip_check_defrag() cannot assume that skb_network_offset(),\n particularly when it is used by the AF_PACKET fanout defrag code.\n From Alexander Drozdov.\n\n10) gianfar driver doesn\u0027t query OF node names properly when trying to\n determine the number of hw queues available. Fix it to explicitly\n check for OF nodes named queue-group. From Tobias Waldekranz.\n\n11) MID field in macb driver should be 12 bits, not 16. From Punnaiah\n Choudary Kalluri.\n\n12) Fix unintentional regression in traceroute due to timestamp socket\n option changes. Empty ICMP payloads should be allowed in\n non-timestamp cases. From Willem de Bruijn.\n\n13) When devices are unregistered, we have to get rid of AF_PACKET\n multicast list entries that point to it via ifindex. Fix from\n Francesco Ruggeri.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)\n tipc: fix bug in link failover handling\n net: delete stale packet_mclist entries\n net: macb: constify macb configuration data\n MAINTAINERS: add Marc Kleine-Budde as co maintainer for CAN networking layer\n MAINTAINERS: linux-can moved to github\n can: kvaser_usb: Read all messages in a bulk-in URB buffer\n can: kvaser_usb: Avoid double free on URB submission failures\n can: peak_usb: fix missing ctrlmode_ init for every dev\n can: add missing initialisations in CAN related skbuffs\n ip: fix error queue empty skb handling\n bgmac: Clean warning messages\n tcp: align tcp_xmit_size_goal() on tcp_tso_autosize()\n net: fec: fix unbalanced clk disable on driver unbind\n net: macb: Correct the MID field length value\n net: gianfar: correctly determine the number of queue groups\n ipv4: ip_check_defrag should not assume that skb_network_offset is zero\n net: bcmgenet: properly disable password matching\n net: eth: xgene: fix booting with devicetree\n bnx2x: Force fundamental reset for EEH recovery\n xen-netback: refactor xenvif_handle_frag_list()\n ...\n" }, { "commit": "e93df634aac6b6dccaa2c23a5a5a504ed502b97e", "tree": "1727618cb4e5c7b70658448e252b4b58b8730dc0", "parents": [ "068c65c557b5470eb7458cc5d507211eddc97e7d", "4eb8d6e7e5aa14572bc389e554aad9869188cdcd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:06:13 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:06:13 2015 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input subsystem fixes from Dmitry Torokhov:\n \"Miscellaneous driver fixes\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: psmouse - disable \"palm detection\" in the focaltech driver\n Input: psmouse - disable changing resolution/rate/scale for FocalTech\n Input: psmouse - ensure that focaltech reports consistent coordinates\n Input: psmouse - remove hardcoded touchpad size from the focaltech driver\n Input: tc3589x-keypad - set IRQF_ONESHOT flag to ensure IRQ request\n Input: ALPS - fix memory leak when detection fails\n Input: sun4i-ts - add thermal driver dependency\n Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()\n Input: cyapa - fix unaligned functions redefinition error\n Input: mma8450 - add parent device\n" }, { "commit": "068c65c557b5470eb7458cc5d507211eddc97e7d", "tree": "ffcb591287f882c8163ba5c6cd2461c08da565e8", "parents": [ "d08edd8f09a0bc7f28c9559d134ffc37ff264962", "b5dabc8d3b8442df78af9036ac5477770228ebe3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:00:25 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 18:00:25 2015 -0700" }, "message": "Merge tag \u0027regulator-v4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator fixes from Mark Brown:\n \"A couple of driver specific fixes plus a fix for a regression in the\n core where the updates to use sysfs group registration were overly\n enthusiastic in eliding properties and removed some that had been\n previously present\"\n\n* tag \u0027regulator-v4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: Fix regression due to NULL constraints check\n regulator: rk808: Set the enable time for LDOs\n regulator: da9210: Mask all interrupt sources to deassert interrupt line\n" }, { "commit": "d08edd8f09a0bc7f28c9559d134ffc37ff264962", "tree": "527d857382761d626a3a1283077ed33a1fef5c01", "parents": [ "eca8dac4fa477cb26eb6478f4a5d2cf381128753", "60c1beeff40b04097298e10640580f62420a55ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:50:02 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:50:02 2015 -0700" }, "message": "Merge tag \u0027spi-v4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi\n\nPull spi fixes from Mark Brown:\n \"A collection of driver specific fixes to which the usual comments\n about them being important if you see them mostly apply (except for\n the comment fix). The pl022 one is particularly nasty for anyone\n affected by it\"\n\n* tag \u0027spi-v4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:\n spi: pl022: Fix race in giveback() leading to driver lock-up\n spi: dw-mid: avoid potential NULL dereference\n spi: img-spfi: Verify max spfi transfer length\n spi: fix a typo in comment.\n spi: atmel: Fix interrupt setup for PDC transfers\n spi: dw: revisit FIFO size detection again\n spi: dw-pci: correct number of chip selects\n drivers: spi: ti-qspi: wait for busy bit clear before data write/read\n" }, { "commit": "eca8dac4fa477cb26eb6478f4a5d2cf381128753", "tree": "15a9f2b15492da1f81846d09b8a85a24f84a764d", "parents": [ "ecddad64d4ca427c71598cc23183f48bc9cc4568", "4d08a3638c80a2817c9fd7dda8c7b812389bd419" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:45:34 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:45:34 2015 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull tpm fixes from James Morris:\n \"fixes for the TPM driver\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n tpm: fix call order in tpm-chip.c\n tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send\n" }, { "commit": "ecddad64d4ca427c71598cc23183f48bc9cc4568", "tree": "935374c13d013683e8a3bdd2136f6b8adfcf1ff1", "parents": [ "c0e99a71bdb6364b055fadd04eb487a4f590cc1e", "a38bb793eaebe1178fbd8ef6ab66ccc062bad505" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:35:29 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:35:29 2015 -0700" }, "message": "Merge tag \u0027fbdev-fixes-4.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux\n\nPull fbdev fixes from Tomi Valkeinen:\n - Fix regression in with omapdss when using i2c displays\n - Fix possible null deref in fbmon\n - Check kalloc return value in AMBA CLCD\n\n* tag \u0027fbdev-fixes-4.0\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:\n OMAPDSS: fix regression with display sysfs files\n video: fbdev: fix possible null dereference\n video: ARM CLCD: Add missing error check for devm_kzalloc\n" }, { "commit": "c0e99a71bdb6364b055fadd04eb487a4f590cc1e", "tree": "6895b9ab0e1a8cf949ddedec433b89a605f01d51", "parents": [ "f930713b6b6818dc0d280e7eb8ac92ea7d272950", "283cb41f426b723a0255702b761b0fc5d1b53a81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:30:09 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:30:09 2015 -0700" }, "message": "Merge branch \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup fixes from Tejun Heo:\n \"The cgroup iteration update two years ago and the recent cpuset\n restructuring introduced regressions in subset of cpuset\n configurations. Three patches to fix them.\n\n All are marked for -stable\"\n\n* \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cpuset: Fix cpuset sched_relax_domain_level\n cpuset: fix a warning when clearing configured masks in old hierarchy\n cpuset: initialize effective masks when clone_children is enabled\n" }, { "commit": "f930713b6b6818dc0d280e7eb8ac92ea7d272950", "tree": "6fb4de112d13bb9ccc5be8b72b1a6ceb0546ec3a", "parents": [ "b695f31f4efd91c7cab97324ccbcb33201ebaaa2", "29200f12a1167076346415e18eee9065cb77a859" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:23:30 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:23:30 2015 -0700" }, "message": "Merge branch \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata\n\nPull libata fixlet from Tejun Heo:\n \"Speed limiting fix for sata_fsl\"\n\n* \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:\n sata-fsl: Apply link speed limits\n" }, { "commit": "b695f31f4efd91c7cab97324ccbcb33201ebaaa2", "tree": "0cb3111136ba025dfa08a5908cbd241bbc37d011", "parents": [ "9eccca0843205f87c00404b663188b88eb248051", "8603e1b30027f943cc9c1eef2b291d42c3347af1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:00:54 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 17:00:54 2015 -0700" }, "message": "Merge branch \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue fix from Tejun Heo:\n \"One fix patch for a subtle livelock condition which can happen on\n PREEMPT_NONE kernels involving two racing cancel_work calls. Whoever\n comes in the second has to wait for the previous one to finish. This\n was implemented by making the later one block for the same condition\n that the former would be (work item completion) and then loop and\n retest; unfortunately, depending on the wake up order, the later one\n could lock out the former one to finish by busy looping on the cpu.\n\n This is fixed by implementing explicit wait mechanism. Work item\n might not belong anywhere at this point and there\u0027s remote possibility\n of thundering herd problem. I originally tried to use bit_waitqueue\n but it didn\u0027t work for static work items on modules. It\u0027s currently\n using single wait queue with filtering wake up function and exclusive\n wakeup. If this ever becomes a problem, which is not very likely, we\n can try to figure out a way to piggy back on bit_waitqueue\"\n\n* \u0027for-4.0-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: fix hang involving racing cancel[_delayed]_work_sync()\u0027s for PREEMPT_NONE\n" }, { "commit": "fcf0789a96777d79d20290e08bf43943a5619387", "tree": "891349a1eb15ce477a63602a1acb37ad9de79f17", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Heikki Krogerus", "email": "heikki.krogerus@linux.intel.com", "time": "Fri Mar 06 15:48:38 2015 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Mar 10 00:28:43 2015 +0100" }, "message": "ACPI / LPSS: provide con_id for the clkdev\n\nCommit 7d78cbefaa (serial: 8250_dw: add ability to handle\nthe peripheral clock) introduces handling for a second clk\nto 8250_dw.c which is the driver also for LPSS UART. The\nsecond clk forces us to provide identifier (con_id) for the\nclkdev we create.\n\nThis fixes an issue where 8250_dw.c is getting the same\nhandler for both clocks.\n\nFixes: 7d78cbefaa (serial: 8250_dw: add ability to handle the peripheral clock)\nSigned-off-by: Heikki Krogerus \u003cheikki.krogerus@linux.intel.com\u003e\nCc: 3.17+ \u003cstable@vger.kernel.org\u003e # 3.17+\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "e6441bae326271090755e1707196ad05aa1dc703", "tree": "8114a09237def99e37033707b02e8019ca18264c", "parents": [ "82f17091e68254d1612b42cf23291cad63cfaf04" ], "author": { "name": "Jon Paul Maloy", "email": "jon.maloy@ericsson.com", "time": "Mon Mar 09 16:16:22 2015 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 09 16:20:41 2015 -0400" }, "message": "tipc: fix bug in link failover handling\n\nIn commit c637c1035534867b85b78b453c38c495b58e2c5a\n(\"tipc: resolve race problem at unicast message reception\") we\nintroduced a new mechanism for delivering buffers upwards from link\nto socket layer.\n\nThat code contains a bug in how we handle the new link input queue\nduring failover. When a link is reset, some of its users may be blocked\nbecause of congestion, and in order to resolve this, we add any pending\nwakeup pseudo messages to the link\u0027s input queue, and deliver them to\nthe socket. This misses the case where the other, remaining link also\nmay have congested users. Currently, the owner node\u0027s reference to the\nremaining link\u0027s input queue is unconditionally overwritten by the\nreset link\u0027s input queue. This has the effect that wakeup events from\nthe remaining link may be unduely delayed (but not lost) for a\npotentially long period.\n\nWe fix this by adding the pending events from the reset link to the\ninput queue that is currently referenced by the node, whichever one\nit is.\n\nThis commit should be applied to both net and net-next.\n\nSigned-off-by: Jon Maloy \u003cjon.maloy@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82f17091e68254d1612b42cf23291cad63cfaf04", "tree": "dcffa6fb6b17a6adc0debb924dfcdd855feb0977", "parents": [ "0b2eb3e9bc738c23784b9281dd035ee0b450d98a" ], "author": { "name": "Francesco Ruggeri", "email": "fruggeri@arista.com", "time": "Mon Mar 09 11:51:04 2015 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 09 16:17:43 2015 -0400" }, "message": "net: delete stale packet_mclist entries\n\nWhen an interface is deleted from a net namespace the ifindex in the\ncorresponding entries in PF_PACKET sockets\u0027 mclists becomes stale.\nThis can create inconsistencies if later an interface with the same ifindex\nis moved from a different namespace (not that unlikely since ifindexes are\nper-namespace).\nIn particular we saw problems with dev-\u003epromiscuity, resulting\nin \"promiscuity touches roof, set promiscuity failed. promiscuity\nfeature of device might be broken\" warnings and EOVERFLOW failures of\nsetsockopt(PACKET_ADD_MEMBERSHIP).\nThis patch deletes the mclist entries for interfaces that are deleted.\nSince this now causes setsockopt(PACKET_DROP_MEMBERSHIP) to fail with\nEADDRNOTAVAIL if called after the interface is deleted, also make\npacket_mc_drop not fail.\n\nSigned-off-by: Francesco Ruggeri \u003cfruggeri@arista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b2eb3e9bc738c23784b9281dd035ee0b450d98a", "tree": "4a95c77a287f9a3c30359ea6ad885b4b8ceb8f8b", "parents": [ "d03725044a2a75090d1b5b46ed5d87945d2d0116" ], "author": { "name": "Josh Cartwright", "email": "joshc@ni.com", "time": "Mon Mar 09 11:14:39 2015 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 09 15:53:42 2015 -0400" }, "message": "net: macb: constify macb configuration data\n\nThe configurations are not modified by the driver. Make them \u0027const\u0027 so\nthat they may be placed in a read-only section.\n\nSigned-off-by: Josh Cartwright \u003cjoshc@ni.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d03725044a2a75090d1b5b46ed5d87945d2d0116", "tree": "16d1db41b66bd4f8ca6f95d06a9a819534dcaeb3", "parents": [ "c247f0534cc5a5a547a343903f42295a471844e2", "f7214cf29ca6c977ad2c428f2b832e9c66f2ee1b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 09 15:41:00 2015 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 09 15:41:00 2015 -0400" }, "message": "Merge tag \u0027linux-can-fixes-for-4.0-20150309\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can\n\nMarc Kleine-Budde says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\npull-request: can 2015-03-09\n\nthis is a pull request for net/master for the 4.0 release cycle, it consists of\n6 patches:\n\nA patch by Oliver Hartkopp fixes a long outstanding bug in the infrastructure,\nwhich leads to skb_under_panics when CAN interfaces are used by AF_PACKET\nsockets e.g. by dhclient. Stephane Grosjean contributes a patch for the\npeak_usb driver which adds a missing initialization. Two patches by Ahmed S.\nDarwish fix problems in the kvaser_usb driver. Followed by two patches by\nmyself, updating the MAINTAINERS file\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "524a38682573b2e15ab6317ccfe50280441514be", "tree": "3c720aa57454bd920aad5d94937a78e4c4a196f8", "parents": [ "1619dc3f8f555ee1cdd3c75db3885d5715442b12" ], "author": { "name": "Steven Rostedt (Red Hat)", "email": "rostedt@goodmis.org", "time": "Fri Mar 06 19:55:13 2015 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Mar 09 10:55:34 2015 -0400" }, "message": "ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled\n\nSome archs (specifically PowerPC), are sensitive with the ordering of\nthe enabling of the calls to function tracing and setting of the\nfunction to use to be traced.\n\nThat is, update_ftrace_function() sets what function the ftrace_caller\ntrampoline should call. Some archs require this to be set before\ncalling ftrace_run_update_code().\n\nAnother bug was discovered, that ftrace_startup_sysctl() called\nftrace_run_update_code() directly. If the function the ftrace_caller\ntrampoline changes, then it will not be updated. Instead a call\nto ftrace_startup_enable() should be called because it tests to see\nif the callback changed since the code was disabled, and will\ntell the arch to update appropriately. Most archs do not need this\nnotification, but PowerPC does.\n\nThe problem could be seen by the following commands:\n\n # echo 0 \u003e /proc/sys/kernel/ftrace_enabled\n # echo function \u003e /sys/kernel/debug/tracing/current_tracer\n # echo 1 \u003e /proc/sys/kernel/ftrace_enabled\n # cat /sys/kernel/debug/tracing/trace\n\nThe trace will show that function tracing was not active.\n\nCc: stable@vger.kernel.org # 2.6.27+\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "1619dc3f8f555ee1cdd3c75db3885d5715442b12", "tree": "40c56f34c48ad68a4394583b9aa011884e74ca28", "parents": [ "b24d443b8f17d9776f5fc1f6c780a0a21eb02913" ], "author": { "name": "Pratyush Anand", "email": "panand@redhat.com", "time": "Fri Mar 06 23:58:06 2015 +0530" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Mar 09 10:50:51 2015 -0400" }, "message": "ftrace: Fix en(dis)able graph caller when en(dis)abling record via sysctl\n\nWhen ftrace is enabled globally through the proc interface, we must check if\nftrace_graph_active is set. If it is set, then we should also pass the\nFTRACE_START_FUNC_RET command to ftrace_run_update_code(). Similarly, when\nftrace is disabled globally through the proc interface, we must check if\nftrace_graph_active is set. If it is set, then we should also pass the\nFTRACE_STOP_FUNC_RET command to ftrace_run_update_code().\n\nConsider the following situation.\n\n # echo 0 \u003e /proc/sys/kernel/ftrace_enabled\n\nAfter this ftrace_enabled \u003d 0.\n\n # echo function_graph \u003e /sys/kernel/debug/tracing/current_tracer\n\nSince ftrace_enabled \u003d 0, ftrace_enable_ftrace_graph_caller() is never\ncalled.\n\n # echo 1 \u003e /proc/sys/kernel/ftrace_enabled\n\nNow ftrace_enabled will be set to true, but still\nftrace_enable_ftrace_graph_caller() will not be called, which is not\ndesired.\n\nFurther if we execute the following after this:\n # echo nop \u003e /sys/kernel/debug/tracing/current_tracer\n\nNow since ftrace_enabled is set it will call\nftrace_disable_ftrace_graph_caller(), which causes a kernel warning on\nthe ARM platform.\n\nOn the ARM platform, when ftrace_enable_ftrace_graph_caller() is called,\nit checks whether the old instruction is a nop or not. If it\u0027s not a nop,\nthen it returns an error. If it is a nop then it replaces instruction at\nthat address with a branch to ftrace_graph_caller.\nftrace_disable_ftrace_graph_caller() behaves just the opposite. Therefore,\nif generic ftrace code ever calls either ftrace_enable_ftrace_graph_caller()\nor ftrace_disable_ftrace_graph_caller() consecutively two times in a row,\nthen it will return an error, which will cause the generic ftrace code to\nraise a warning.\n\nNote, x86 does not have an issue with this because the architecture\nspecific code for ftrace_enable_ftrace_graph_caller() and\nftrace_disable_ftrace_graph_caller() does not check the previous state,\nand calling either of these functions twice in a row has no ill effect.\n\nLink: http://lkml.kernel.org/r/e4fbe64cdac0dd0e86a3bf914b0f83c0b419f146.1425666454.git.panand@redhat.com\n\nCc: stable@vger.kernel.org # 2.6.31+\nSigned-off-by: Pratyush Anand \u003cpanand@redhat.com\u003e\n[\n removed extra if (ftrace_start_up) and defined ftrace_graph_active as 0\n if CONFIG_FUNCTION_GRAPH_TRACER is not set.\n]\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "b24d443b8f17d9776f5fc1f6c780a0a21eb02913", "tree": "5f24f8373a55295772132bcdfec4e2343dcdf904", "parents": [ "4d4eb4d4fbd9403682e2b75117b6b895531d8e01" ], "author": { "name": "Steven Rostedt (Red Hat)", "email": "rostedt@goodmis.org", "time": "Wed Mar 04 23:10:28 2015 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Mar 09 10:46:00 2015 -0400" }, "message": "ftrace: Clear REGS_EN and TRAMP_EN flags on disabling record via sysctl\n\nWhen /proc/sys/kernel/ftrace_enabled is set to zero, all function\ntracing is disabled. But the records that represent the functions\nstill hold information about the ftrace_ops that are hooked to them.\n\nftrace_ops may request \"REGS\" (have a full set of pt_regs passed to\nthe callback), or \"TRAMP\" (the ops has its own trampoline to use).\nWhen the record is updated to represent the state of the ops hooked\nto it, it sets \"REGS_EN\" and/or \"TRAMP_EN\" to state that the callback\npoints to the correct trampoline (REGS has its own trampoline).\n\nWhen ftrace_enabled is set to zero, all ftrace locations are a nop,\nso they do not point to any trampoline. But the _EN flags are still\nset. This can cause the accounting to go wrong when ftrace_enabled\nis cleared and an ops that has a trampoline is registered or unregistered.\n\nFor example, the following will cause ftrace to crash:\n\n # echo function_graph \u003e /sys/kernel/debug/tracing/current_tracer\n # echo 0 \u003e /proc/sys/kernel/ftrace_enabled\n # echo nop \u003e /sys/kernel/debug/tracing/current_tracer\n # echo 1 \u003e /proc/sys/kernel/ftrace_enabled\n # echo function_graph \u003e /sys/kernel/debug/tracing/current_tracer\n\nAs function_graph uses a trampoline, when ftrace_enabled is set to zero\nthe updates to the record are not done. When enabling function_graph\nagain, the record will still have the TRAMP_EN flag set, and it will\nlook for an op that has a trampoline other than the function_graph\nops, and fail to find one.\n\nCc: stable@vger.kernel.org # 3.17+\nReported-by: Pratyush Anand \u003cpanand@redhat.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "4d08a3638c80a2817c9fd7dda8c7b812389bd419", "tree": "a1cc6ab0d4d0a270315b03b948f8dc722b1ecf95", "parents": [ "9eccca0843205f87c00404b663188b88eb248051", "19913b6db3aa417d855318c9cf5b40fbc1f28e52" ], "author": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Tue Mar 10 00:38:16 2015 +1100" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Tue Mar 10 00:38:16 2015 +1100" }, "message": "Merge branch \u0027for-current\u0027 of https://github.com/PeterHuewe/linux-tpmdd into for-linus\n" }, { "commit": "f7214cf29ca6c977ad2c428f2b832e9c66f2ee1b", "tree": "16d1db41b66bd4f8ca6f95d06a9a819534dcaeb3", "parents": [ "84b0d715d805a2af5b12a51ce85f66cec87111d0" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Mar 06 09:00:38 2015 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:41:45 2015 +0100" }, "message": "MAINTAINERS: add Marc Kleine-Budde as co maintainer for CAN networking layer\n\nThis patch adds Marc Kleine-Budde as a co maintainer for the CAN networking\nlayer.\n\nAcked-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "84b0d715d805a2af5b12a51ce85f66cec87111d0", "tree": "8f00895dc010532c85e77fab918b8faf3f179b24", "parents": [ "2fec5104f9c61de4cf2205aa355101e19a81f490" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Mar 06 08:58:33 2015 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:22:24 2015 +0100" }, "message": "MAINTAINERS: linux-can moved to github\n\nAs gitorious will shut down at the end of May 2015, the linux-can website moved\nto github. This patch reflects this change.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "2fec5104f9c61de4cf2205aa355101e19a81f490", "tree": "7c3fa357f160f9bf6dc44d6d4a87bc73ac4117a5", "parents": [ "deb2701cf704a2fd03a8b598bf73df3edb08818d" ], "author": { "name": "Ahmed S. Darwish", "email": "ahmed.darwish@valeo.com", "time": "Thu Feb 26 10:22:02 2015 -0500" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:22:24 2015 +0100" }, "message": "can: kvaser_usb: Read all messages in a bulk-in URB buffer\n\nThe Kvaser firmware can only read and write messages that are\nnot crossing the USB endpoint\u0027s wMaxPacketSize boundary. While\nreceiving commands from the CAN device, if the next command in\nthe same URB buffer crossed that max packet size boundary, the\nfirmware puts a zero-length placeholder command in its place\nthen moves the real command to the next boundary mark.\n\nThe driver did not recognize such behavior, leading to missing\na good number of rx events during a heavy rx load session.\n\nMoreover, a tx URB context only gets freed upon receiving its\nrespective tx ACK event. Over time, the free tx URB contexts\npool gets depleted due to the missing ACK events. Consequently,\nthe netif transmission queue gets __permanently__ stopped; no\nframes could be sent again except after restarting the CAN\nnewtwork interface.\n\nSigned-off-by: Ahmed S. Darwish \u003cahmed.darwish@valeo.com\u003e\nCc: linux-stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "deb2701cf704a2fd03a8b598bf73df3edb08818d", "tree": "a0481cbc08a3c1ac2ec0eb400b06207dffa9b39b", "parents": [ "b0d4724b8e4ce2a60ee4e097ec50c3759ec2090a" ], "author": { "name": "Ahmed S. Darwish", "email": "ahmed.darwish@valeo.com", "time": "Thu Feb 26 10:20:11 2015 -0500" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:22:24 2015 +0100" }, "message": "can: kvaser_usb: Avoid double free on URB submission failures\n\nUpon a URB submission failure, the driver calls usb_free_urb()\nbut then manually frees the URB buffer by itself. Meanwhile\nusb_free_urb() has alredy freed out that transfer buffer since\nwe\u0027re the only code path holding a reference to this URB.\n\nRemove two of such invalid manual free().\n\nSigned-off-by: Ahmed S. Darwish \u003cahmed.darwish@valeo.com\u003e\nCc: linux-stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "b0d4724b8e4ce2a60ee4e097ec50c3759ec2090a", "tree": "99ee4e832a88b14e1f4b0caf065a631f85164c09", "parents": [ "969439016d2cf61fef53a973d7e6d2061c3793b1" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Mon Mar 02 11:54:38 2015 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:22:24 2015 +0100" }, "message": "can: peak_usb: fix missing ctrlmode_ init for every dev\n\nFixes a missing initialization of ctrlmode and ctrlmode_supported fields,\nfor all other CAN devices than the first one. This fix only concerns\nthe PCAN-USB Pro FD dual-channels CAN-FD device made by PEAK-System.\n\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "969439016d2cf61fef53a973d7e6d2061c3793b1", "tree": "8320e446b2b0f31fd6ca77351ba6ba7b2f05d587", "parents": [ "c247f0534cc5a5a547a343903f42295a471844e2" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Mon Feb 23 20:37:54 2015 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 09 10:22:24 2015 +0100" }, "message": "can: add missing initialisations in CAN related skbuffs\n\nWhen accessing CAN network interfaces with AF_PACKET sockets e.g. by dhclient\nthis can lead to a skb_under_panic due to missing skb initialisations.\n\nAdd the missing initialisations at the CAN skbuff creation times on driver\nlevel (rx path) and in the network layer (tx path).\n\nReported-by: Austin Schuh \u003caustin@peloton-tech.com\u003e\nReported-by: Daniel Steer \u003cdaniel.steer@mclaren.com\u003e\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nCc: linux-stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "a1f3f1ca66bd12c339b17a0c2ef93a093f90a277", "tree": "f373e6537fc2acf5a241b167a59006e57dafe799", "parents": [ "9eccca0843205f87c00404b663188b88eb248051" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Sun Mar 08 18:29:50 2015 +0100" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Mar 09 08:41:13 2015 +0100" }, "message": "ALSA: hda - Fix regression of HD-audio controller fallback modes\n\nThe commit [63e51fd708f5: ALSA: hda - Don\u0027t take unresponsive D3\ntransition too serious] introduced a conditional fallback behavior to\nthe HD-audio controller depending on the flag set. However, it\nintroduced a silly bug, too, that the flag was evaluated in a reverse\nway. This resulted in a regression of HD-audio controller driver\nwhere it can\u0027t go to the fallback mode at communication errors.\n\nUnfortunately (or fortunately?) this didn\u0027t come up until recently\nbecause the affected code path is an error handling that happens only\non an unstable hardware chip. Most of recent chips work stably, thus\nthey didn\u0027t hit this problem. Now, we\u0027ve got a regression report with\na VIA chip, and this seems indeed requiring the fallback to the\npolling mode, and finally the bug was revealed.\n\nThe fix is a oneliner to remove the wrong logical NOT in the check.\n(Lesson learned - be careful about double negation.)\n\nThe bug should be backported to stable, but the patch won\u0027t be\napplicable to 3.13 or earlier because of the code splits. The stable\nfix patches for earlier kernels will be posted later manually.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d94021\nFixes: 63e51fd708f5 (\u0027ALSA: hda - Don\u0027t take unresponsive D3 transition too serious\u0027)\nCc: \u003cstable@vger.kernel.org\u003e # v3.14+\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "c247f0534cc5a5a547a343903f42295a471844e2", "tree": "b823df3d0814df0227bcb0f049ccc6569c36f843", "parents": [ "8edfe3b6fad28da191c8fa15e4e0d8f7335a0091" ], "author": { "name": "Willem de Bruijn", "email": "willemb@google.com", "time": "Sat Mar 07 20:33:22 2015 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 08 23:01:54 2015 -0400" }, "message": "ip: fix error queue empty skb handling\n\nWhen reading from the error queue, msg_name and msg_control are only\npopulated for some errors. A new exception for empty timestamp skbs\nadded a false positive on icmp errors without payload.\n\n`traceroute -M udpconn` only displayed gateways that return payload\nwith the icmp error: the embedded network headers are pulled before\nsock_queue_err_skb, leaving an skb with skb-\u003elen \u003d\u003d 0 otherwise.\n\nFix this regression by refining when msg_name and msg_control\nbranches are taken. The solutions for the two fields are independent.\n\nmsg_name only makes sense for errors that configure serr-\u003eport and\nserr-\u003eaddr_offset. Test the first instead of skb-\u003elen. This also fixes\nanother issue. saddr could hold the wrong data, as serr-\u003eaddr_offset\nis not initialized in some code paths, pointing to the start of the\nnetwork header. It is only valid when serr-\u003eport is set (non-zero).\n\nmsg_control support differs between IPv4 and IPv6. IPv4 only honors\nrequests for ICMP and timestamps with SOF_TIMESTAMPING_OPT_CMSG. The\nskb-\u003elen test can simply be removed, because skb-\u003edev is also tested\nand never true for empty skbs. IPv6 honors requests for all errors\naside from local errors and timestamps on empty skbs.\n\nIn both cases, make the policy more explicit by moving this logic to\na new function that decides whether to process msg_control and that\noptionally prepares the necessary fields in skb-\u003ecb[]. After this\nchange, the IPv4 and IPv6 paths are more similar.\n\nThe last case is rxrpc. Here, simply refine to only match timestamps.\n\nFixes: 49ca0d8bfaf3 (\"net-timestamp: no-payload option\")\n\nReported-by: Jan Niehusmann \u003cjan@gondor.com\u003e\nSigned-off-by: Willem de Bruijn \u003cwillemb@google.com\u003e\n\n----\n\nChanges\n v1-\u003ev2\n - fix local origin test inversion in ip6_datagram_support_cmsg\n - make v4 and v6 code paths more similar by introducing analogous\n ipv4_datagram_support_cmsg\n - fix compile bug in rxrpc\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8edfe3b6fad28da191c8fa15e4e0d8f7335a0091", "tree": "12431bcb8ef968a3f63b7cb5fcaa245c944e1de6", "parents": [ "6c09fa09d468d730eecd7122122175da772d3b09" ], "author": { "name": "Peter Senna Tschudin", "email": "peter.senna@gmail.com", "time": "Sat Mar 07 12:10:26 2015 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 08 22:55:48 2015 -0400" }, "message": "bgmac: Clean warning messages\n\nOn my test environment the throughput of a file transfer drops\nfrom 4.4MBps to 116KBps due the number of repeated warning\nmessages. This patch removes the warning messages as DMA works\ncorrectly with addresses using 0xC0000000 bits.\n\nSigned-off-by: Peter Senna Tschudin \u003cpeter.senna@gmail.com\u003e\nAcked-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9eccca0843205f87c00404b663188b88eb248051", "tree": "4e2f7ea657ad19c3cc122a8cb9af2e1ba4bca1c9", "parents": [ "1711fd9addf214823b993468567cab1f8254fc51" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 16:09:09 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 16:09:09 2015 -0700" }, "message": "Linux 4.0-rc3\n" }, { "commit": "1711fd9addf214823b993468567cab1f8254fc51", "tree": "4b950dc5f99bd1895e4e5a6a2abb6a7b5a892c5c", "parents": [ "1163d504ae69b5e83ab16900f6a96e30bd78bda5" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Sat Mar 07 21:08:46 2015 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:53:46 2015 -0700" }, "message": "sunrpc: fix braino in -\u003epoll()\n\nPOLL_OUT isn\u0027t what callers of -\u003epoll() are expecting to see; it\u0027s\nactually __SI_POLL | 2 and it\u0027s a siginfo code, not a poll bitmap\nbit...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: stable@vger.kernel.org\nCc: Bruce Fields \u003cbfields@fieldses.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1163d504ae69b5e83ab16900f6a96e30bd78bda5", "tree": "6e6509144c3e1adf97607c91371fd38f985da398", "parents": [ "bbbce516bb497404315c1d0a1b13a04038347d3d", "b8cb91e058cd0c0f02059c1207293c5b31d350fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:47:18 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:47:18 2015 -0700" }, "message": "Merge tag \u0027usb-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg KH:\n \"Here\u0027s a round of USB fixes for 4.0-rc3.\n\n Nothing major, the usual gadget, xhci and usb-serial fixes and a few\n new device ids as well.\n\n All have been in linux-next successfully\"\n\n* tag \u0027usb-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (36 commits)\n xhci: Workaround for PME stuck issues in Intel xhci\n xhci: fix reporting of 0-sized URBs in control endpoint\n usb: ftdi_sio: Add jtag quirk support for Cyber Cortex AV boards\n USB: ch341: set tty baud speed according to tty struct\n USB: serial: cp210x: Adding Seletek device id\u0027s\n USB: pl2303: disable break on shutdown\n USB: mxuport: fix null deref when used as a console\n USB: serial: clean up bus probe error handling\n USB: serial: fix port attribute-creation race\n USB: serial: fix tty-device error handling at probe\n USB: serial: fix potential use-after-free after failed probe\n USB: console: add dummy __module_get\n USB: ftdi_sio: add PIDs for Actisense USB devices\n Revert \"USB: serial: make bulk_out_size a lower limit\"\n cdc-acm: Add support for Denso cradle CU-321\n usb-storage: support for more than 8 LUNs\n uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS539\n USB: usbfs: don\u0027t leak kernel data in siginfo\n xhci: Clear the host side toggle manually when endpoint is \u0027soft reset\u0027\n xhci: Allocate correct amount of scratchpad buffers\n ...\n" }, { "commit": "bbbce516bb497404315c1d0a1b13a04038347d3d", "tree": "c65d2aa186c85b9aeb59a892833edeef67ae97cc", "parents": [ "47df986b684ec1de77e243bc5be17725afca18c4", "c37bc682e30b8027054356214eb8a3aafbda8e37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:25:40 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:25:40 2015 -0700" }, "message": "Merge tag \u0027tty-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty/serial fixes from Greg KH:\n \"Here are some tty and serial driver fixes for 4.0-rc3.\n\n Along with the atime fix that you know about, here are some other\n serial driver bugfixes as well. Most notable is a wait_until_sent\n bugfix that was traced back to being around since before 2.6.12 that\n Johan has fixed up.\n\n All have been in linux-next successfully\"\n\n* tag \u0027tty-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n TTY: fix tty_wait_until_sent maximum timeout\n TTY: fix tty_wait_until_sent on 64-bit machines\n USB: serial: fix infinite wait_until_sent timeout\n TTY: bfin_jtag_comm: remove incorrect wait_until_sent operation\n net: irda: fix wait_until_sent poll timeout\n serial: uapi: Declare all userspace-visible io types\n serial: core: Fix iotype userspace breakage\n serial: sprd: Fix missing spin_unlock in sprd_handle_irq()\n console: Fix console name size mismatch\n tty: fix up atime/mtime mess, take four\n serial: 8250_dw: Fix get_mctrl behaviour\n serial:8250:8250_pci: delete unneeded quirk entries\n serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S\n Change email address for 8250_pci\n serial: 8250: Revert \"tty: serial: 8250_core: read only RX if there is something in the FIFO\"\n Revert \"tty/serial: of_serial: add DT alias ID handling\"\n" }, { "commit": "47df986b684ec1de77e243bc5be17725afca18c4", "tree": "d83c1b883c523f1e2faccfab3410dc85fa23e3a4", "parents": [ "29191c7f71aa55401c83df60482417d3c511edde", "abe46b8932dd9a6dfc3698e3eb121809b7b9ed28" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:20:10 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:20:10 2015 -0700" }, "message": "Merge tag \u0027staging-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging driver fixes from Greg KH:\n \"Here are some IIO and staging driver fixes for 4.0-rc3.\n\n Details are in the shortlog, nothing major, mostly IIO fixes for\n reported issues.\n\n All have been in linux-next successfully\"\n\n* tag \u0027staging-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (23 commits)\n staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel\n staging: comedi: vmk80xx: remove \"firmware version\" kernel messages\n staging: comedi: comedi_isadma: fix \"stalled\" detect in comedi_isadma_disable_on_sample()\n iio: ak8975: fix AK09911 dependencies\n iio: common: ssp_sensors: Protect PM-only functions to kill warning\n IIO: si7020: Allocate correct amount of memory in devm_iio_device_alloc\n Revert \"iio:humidity:si7020: fix pointer to i2c client\"\n iio: light: gp2ap020a00f: Select REGMAP_I2C\n iio: light: jsa1212: Select REGMAP_I2C\n iio: ad5686: fix optional reference voltage declaration\n iio:adc:mcp3422 Fix incorrect scales table\n iio: mxs-lradc: fix iio channel map regression\n iio: imu: adis16400: Fix sign extension\n staging: iio: ad2s1200: Fix sign extension\n iio: mxs-lradc: only update the buffer when its conversions have finished\n iio: mxs-lradc: make ADC reads not unschedule touchscreen conversions\n iio: mxs-lradc: make ADC reads not disable touchscreen interrupts\n iio: mxs-lradc: separate touchscreen and buffer virtual channels\n iio: imu: inv_mpu6050: Prevent dereferencing NULL\n iio: iadc: wait_for_completion_timeout time in jiffies\n ...\n" }, { "commit": "96b62a57193494010eed66ca0739c93eb4653162", "tree": "08bf091d434585988e6c52340f9d9ed5bec07433", "parents": [ "d4461a602cf39c59f32817162539f4e723621865" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Wed Mar 04 10:31:50 2015 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 08 15:19:03 2015 -0400" }, "message": "gadgetfs: really get rid of switching -\u003ef_op\n\n... for ep0 as well\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "29191c7f71aa55401c83df60482417d3c511edde", "tree": "58161bbcce76e4416e65559267a5e713b99dad9c", "parents": [ "b0bc65729070b9cbdbb53ff042984a3c545a0e34", "6c15a8516b8118eb19a59fd0bd22df41b9101c32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:15:47 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 12:15:47 2015 -0700" }, "message": "Merge tag \u0027char-misc-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull char/misc driver fixes from Greg KH:\n \"Here are two char/misc fixes for 4.0-rc3.\n\n One is a reported binder driver fix needed due to a change in the mm\n core that happened in 4.0-rc1. Another is a mei driver fix that\n resolves a reported issue in that driver.\n\n Both have been in linux-next for a while\"\n\n* tag \u0027char-misc-4.0-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n mei: make device disabled on stop unconditionally\n android: binder: fix binder mmap failures\n" }, { "commit": "b0bc65729070b9cbdbb53ff042984a3c545a0e34", "tree": "1f2d4bbb22209a21fbdbaa3279ff7b6e8062e681", "parents": [ "2cf3afcd4cbe0e32b8722fc291e9255de1b4d6c6", "ddbd2b7ad99a418c60397901a0f3c997d030c65e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 11:51:04 2015 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 08 11:51:04 2015 -0700" }, "message": "Merge tag \u0027cc-4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull \"code of conflict\" from Greg KH:\n \"This file tries to set the rational basis for our code reviews, gives\n some advice on how to conduct them, and provides an excalation channel\n for any kernel developers if they so desire it\"\n\n[ Let\u0027s see how this works ]\n\n* tag \u0027cc-4.0-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n Code of Conflict\n" }, { "commit": "d4461a602cf39c59f32817162539f4e723621865", "tree": "137d043fa8a0be030396b321e54be8d19135c174", "parents": [ "7fe3976e0f3ab26f8ffd9430d3d2a19a70f2c8d2" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Tue Mar 03 08:39:34 2015 +0000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 08 13:33:50 2015 -0400" }, "message": "gadgetfs: get rid of flipping -\u003ef_op in ep_config()\n\nFinal methods start with get_ready_ep(), which will fail unless we have\n-\u003estate \u003d\u003d STATE_EP_ENABLED. So they\u0027d be failing just fine until that\nfirst write() anyway. Let\u0027s do the following:\n\t* get_ready_ep() gets a new argument - true when called from\nep_write_iter(), false otherwise.\n\t* make it quiet when it finds STATE_EP_READY (no printk, that is;\nthe case won\u0027t be impossible after that change).\n\t* when that new argument is true, treat STATE_EP_READY the same\nway as STATE_EP_ENABLED (i.e. return zero and do not unlock).\n\t* in ep_write_iter(), after success of get_ready_ep() turn\n\tif (!usb_endpoint_dir_in(\u0026epdata-\u003edesc)) {\ninto\n\tif (epdata-\u003estate \u003d\u003d STATE_EP_ENABLED \u0026\u0026\n\t !usb_endpoint_dir_in(\u0026epdata-\u003edesc)) {\n- that logics only applies after config.\n\t* have ep_config() take kernel-side buffer (i.e. use memcpy()\ninstead of copy_from_user() in there) and in the \"let\u0027s call ep_io or\nep_aio\" (again, in ep_write_iter()) add \"... or ep_config() in case it\u0027s\nnot configured yet\"\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" } ], "next": "4eb8d6e7e5aa14572bc389e554aad9869188cdcd" }