)]}' { "log": [ { "commit": "95fcfa70f3bc4b3b82bf582fa5b24a39bdbd23ae", "tree": "9809f3d006ef319b1fe43bd82b159ea1d0b7b818", "parents": [ "cd15c51d6c2f577f896471a058f33a95f164dba2", "23de2278ebc3a2f971ce45ca5e5e35c9d5a74040" ], "author": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Fri Dec 20 11:27:12 2013 -0800" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Fri Dec 20 11:28:30 2013 -0800" }, "message": "Merge tag \u0027renesas-fixes-for-v3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes\n\nFrom Simon Horman:\nRenesas ARM based SoC fixes for v3.13\n\n* r8a7790 (R-Car H1) SoC\n - Correct GPIO resources in DT.\n\n This problem has been present since GPIOs were added to the r8a7790 SoC\n by f98e10c88aa95bf7 (\"ARM: shmobile: r8a7790: Add GPIO controller\n devices to device tree\") in v3.12-rc1.\n\n* irqchip renesas-intc-irqpin\n - Correct register bitfield shift calculation\n\n This bug has been present since the renesas-intc-irqpin driver was\n introduced by 443580486e3b9657 (\"irqchip: Renesas INTC External IRQ pin\n driver\") in v3.10-rc1\n\n* Lager board\n - Do not build the phy fixup unless CONFIG_PHYLIB is enabled\n\n This problem was introduced by 48c8b96f21817aad\n\n* tag \u0027renesas-fixes-for-v3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:\n ARM: shmobile: r8a7790: Fix GPIO resources in DTS\n irqchip: renesas-intc-irqpin: Fix register bitfield shift calculation\n ARM: shmobile: lager: phy fixup needs CONFIG_PHYLIB\n\nSigned-off-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\n" }, { "commit": "cd15c51d6c2f577f896471a058f33a95f164dba2", "tree": "9d42b8ea581ca35bdf75467b8bbbab21e7056ff9", "parents": [ "5b8314a98888b12159d0b1b14982b8dd2d94e3f5", "130f769e81fc472beb2211320777e26050e3fa15" ], "author": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Fri Dec 20 08:30:50 2013 -0800" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Fri Dec 20 08:30:50 2013 -0800" }, "message": "Merge tag \u0027omap-for-v3.13/display-fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nI accidentally removed some mux code for omap4 that I thought was\ndead code as omap4 has been booting with device tree only since\nv3.10. Turns out I also removed some display related mux code,\nso let\u0027s revert that except for the dead code parts.\n\n* tag \u0027omap-for-v3.13/display-fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)\n Revert \"ARM: OMAP2+: Remove legacy mux code for display.c\"\n +Linux 3.13-rc4\n" }, { "commit": "5b8314a98888b12159d0b1b14982b8dd2d94e3f5", "tree": "5187e75f4236b574efff132792e40f0369be6c1a", "parents": [ "cb12057256ec58b6f798855b27e120579d6c9aee", "cffa8e3b5c7dcf7617268561397eb236651446f8" ], "author": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Thu Dec 19 15:12:23 2013 -0800" }, "committer": { "name": "Kevin Hilman", "email": "khilman@linaro.org", "time": "Thu Dec 19 15:13:16 2013 -0800" }, "message": "Merge tag \u0027keystone/maintainer-file\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes\n\nFrom Santosh Shilimkar:\nCouple of updates to MAINTAINERS file for Keystone\n\n- Add git tree information\n- Add clock drivers entry\n\n* tag \u0027keystone/maintainer-file\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:\n MAINTAINERS: Add keystone clock drivers\n MAINTAINERS: Add keystone git tree information\n\nSigned-off-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\n" }, { "commit": "130f769e81fc472beb2211320777e26050e3fa15", "tree": "4ede696ab2c3f6a0c49a04aee48bb676b2d89003", "parents": [ "319e2e3f63c348a9b66db4667efa73178e18b17d" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@ti.com", "time": "Mon Dec 16 09:14:48 2013 +0200" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Dec 17 16:28:34 2013 -0800" }, "message": "Revert \"ARM: OMAP2+: Remove legacy mux code for display.c\"\n\nCommit e30b06f4d5f000c31a7747a7e7ada78a5fd419a1 (ARM: OMAP2+: Remove\nlegacy mux code for display.c) removed non-DT DSI and HDMI pinmuxing.\nHowever, DSI pinmuxing is still needed, and removing that caused DSI\ndisplays not to work.\n\nThis reverts the DSI parts of the commit.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "cffa8e3b5c7dcf7617268561397eb236651446f8", "tree": "033ef42caaf49536769be3f99380c3a63e8a2f7d", "parents": [ "317929cd8ef32121fb6574f12d02621f78f24732" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Sat Nov 23 17:35:23 2013 -0500" }, "committer": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Mon Dec 16 16:01:14 2013 -0500" }, "message": "MAINTAINERS: Add keystone clock drivers\n\nCc: Mike Turquette \u003cmturquette@linaro.org\u003e\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\n" }, { "commit": "317929cd8ef32121fb6574f12d02621f78f24732", "tree": "3ff35b3c34a8310cc1a985c5f5f7b355d607a473", "parents": [ "6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Sat Nov 23 17:31:27 2013 -0500" }, "committer": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Mon Dec 16 16:01:14 2013 -0500" }, "message": "MAINTAINERS: Add keystone git tree information\n\nUpdate the Keystone entry to add git tree information.\n\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\n" }, { "commit": "319e2e3f63c348a9b66db4667efa73178e18b17d", "tree": "b78477d9b0e765b7fcb5b48cbe90e24916a57d4c", "parents": [ "57053d8c5c59562cac156513740c10b502a40968" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 12:31:33 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 12:31:33 2013 -0800" }, "message": "Linux 3.13-rc4\n" }, { "commit": "57053d8c5c59562cac156513740c10b502a40968", "tree": "0e71310912a1004760561540bc7e665957468ee5", "parents": [ "e4158f1b1090d362a7c998bd654cc3fe8f5c863c" ], "author": { "name": "Matias Bjorling", "email": "m@bjorling.me", "time": "Tue Dec 10 16:50:38 2013 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 12:17:16 2013 -0800" }, "message": "null_blk: mem garbage on NUMA systems during init\n\nFor NUMA systems, initializing the blk-mq layer and using per node hctx.\nWe initialize submit queues to 1, while blk-mq nr_hw_queues is\ninitialized to the number of NUMA nodes.\n\nThis makes the null_init_hctx function overwrite memory outside of what\nit allocated. In my case it lead to writing garbage into struct\nrequest_queue\u0027s mq_map.\n\nSigned-off-by: Matias Bjorling \u003cm@bjorling.me\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4158f1b1090d362a7c998bd654cc3fe8f5c863c", "tree": "f7065ff32b51a4b7089c479a58fd81daa46fd2ed", "parents": [ "4a251dd29c30941f338fcd87b4d18274bd7abbf5" ], "author": { "name": "Sergey Senozhatsky", "email": "sergey.senozhatsky@gmail.com", "time": "Fri Dec 13 02:25:57 2013 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 12:16:00 2013 -0800" }, "message": "radeon_pm: fix oops in hwmon_attributes_visible() and radeon_hwmon_show_temp_thresh()\n\nSince commit ec39f64bba34 (\"drm/radeon/dpm: Convert to use\ndevm_hwmon_register_with_groups\") radeon_hwmon_init() is using\nhwmon_device_register_with_groups(), which sets `rdev\u0027 as a device\nprivate driver_data, while hwmon_attributes_visible() and\nradeon_hwmon_show_temp_thresh() are still waiting for `drm_device\u0027.\n\nFix them by using dev_get_drvdata(), in order to avoid this oops:\n\n BUG: unable to handle kernel paging request at 0000000000001e28\n IP: [\u003cffffffffa02ae8b4\u003e] hwmon_attributes_visible+0x18/0x3d [radeon]\n PGD 15057e067 PUD 151a8e067 PMD 0\n Oops: 0000 [#1] PREEMPT SMP\n Call Trace:\n internal_create_group+0x114/0x1d9\n sysfs_create_group+0xe/0x10\n sysfs_create_groups+0x22/0x5f\n device_add+0x34f/0x501\n device_register+0x15/0x18\n hwmon_device_register_with_groups+0xb5/0xed\n radeon_hwmon_init+0x56/0x7c [radeon]\n radeon_pm_init+0x134/0x7e5 [radeon]\n radeon_modeset_init+0x75f/0x8ed [radeon]\n radeon_driver_load_kms+0xc6/0x187 [radeon]\n drm_dev_register+0xf9/0x1b4 [drm]\n drm_get_pci_dev+0x98/0x129 [drm]\n radeon_pci_probe+0xa3/0xac [radeon]\n pci_device_probe+0x6e/0xcf\n driver_probe_device+0x98/0x1c4\n __driver_attach+0x5c/0x7e\n bus_for_each_dev+0x7b/0x85\n driver_attach+0x19/0x1b\n bus_add_driver+0x104/0x1ce\n driver_register+0x89/0xc5\n __pci_register_driver+0x58/0x5b\n drm_pci_init+0x86/0xea [drm]\n radeon_init+0x97/0x1000 [radeon]\n do_one_initcall+0x7f/0x117\n load_module+0x1583/0x1bb4\n SyS_init_module+0xa0/0xaf\n\nSigned-off-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nCc: Borislav Petkov \u003cbp@alien8.de\u003e\nCc: Alexander Deucher \u003cAlexander.Deucher@amd.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4a251dd29c30941f338fcd87b4d18274bd7abbf5", "tree": "0a5f428a484312588f678355643f2f80cd80e21c", "parents": [ "908bfda754a9e972c4728832513b11153bd3a140", "df29df92adda751ac04ca5149d30014b5199db81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:56:47 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:56:47 2013 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Revert CHECKSUM_COMPLETE optimization in pskb_trim_rcsum(), I can\u0027t\n figure out why it breaks things.\n\n 2) Fix comparison in netfilter ipset\u0027s hash_netnet4_data_equal(), it\n was basically doing \"x \u003d\u003d x\", from Dave Jones.\n\n 3) Freescale FEC driver was DMA mapping the wrong number of bytes, from\n Sebastian Siewior.\n\n 4) Blackhole and prohibit routes in ipv6 were not doing the right thing\n because their -\u003einput and -\u003eoutput methods were not being assigned\n correctly. Now they behave properly like their ipv4 counterparts.\n From Kamala R.\n\n 5) Several drivers advertise the NETIF_F_FRAGLIST capability, but\n really do not support this feature and will send garbage packets if\n fed fraglist SKBs. From Eric Dumazet.\n\n 6) Fix long standing user triggerable BUG_ON over loopback in RDS\n protocol stack, from Venkat Venkatsubra.\n\n 7) Several not so common code paths can potentially try to invoke\n packet scheduler actions that might be NULL without checking. Shore\n things up by either 1) defining a method as mandatory and erroring\n on registration if that method is NULL 2) defininig a method as\n optional and the registration function hooks up a default\n implementation when NULL is seen. From Jamal Hadi Salim.\n\n 8) Fix fragment detection in xen-natback driver, from Paul Durrant.\n\n 9) Kill dangling enter_memory_pressure method in cg_proto ops, from\n Eric W Biederman.\n\n10) SKBs that traverse namespaces should have their local_df cleared,\n from Hannes Frederic Sowa.\n\n11) IOCB file position is not being updated by macvtap_aio_read() and\n tun_chr_aio_read(). From Zhi Yong Wu.\n\n12) Don\u0027t free virtio_net netdev before releasing all of the NAPI\n instances. From Andrey Vagin.\n\n13) Procfs entry leak in xt_hashlimit, from Sergey Popovich.\n\n14) IPv6 routes that are no cached routes should not count against the\n garbage collection limits. We had this almost right, but were\n missing handling addrconf generated routes properly. From Hannes\n Frederic Sowa.\n\n15) fib{4,6}_rule_suppress() have to consider potentially seeing NULL\n route info when they are called, from Stefan Tomanek.\n\n16) TUN and MACVTAP have had truncated packet signalling for some time,\n fix from Jason Wang.\n\n17) Fix use after frrr in __udp4_lib_rcv(), from Eric Dumazet.\n\n18) xen-netback does not interpret the NAPI budget properly for TX work,\n fix from Paul Durrant.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (132 commits)\n igb: Fix for issue where values could be too high for udelay function.\n i40e: fix null dereference\n xen-netback: fix gso_prefix check\n net: make neigh_priv_len in struct net_device 16bit instead of 8bit\n drivers: net: cpsw: fix for cpsw crash when build as modules\n xen-netback: napi: don\u0027t prematurely request a tx event\n xen-netback: napi: fix abuse of budget\n sch_tbf: use do_div() for 64-bit divide\n udp: ipv4: must add synchronization in udp_sk_rx_dst_set()\n net:fec: remove duplicate lines in comment about errata ERR006358\n Revert \"8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature\"\n 8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature\n xen-netback: make sure skb linear area covers checksum field\n net: smc91x: Fix device tree based configuration so it\u0027s usable\n udp: ipv4: fix potential use after free in udp_v4_early_demux()\n macvtap: signal truncated packets\n tun: unbreak truncated packet signalling\n net: sched: htb: fix the calculation of quantum\n net: sched: tbf: fix the calculation of max_size\n micrel: add support for KSZ8041RNLI\n ...\n" }, { "commit": "908bfda754a9e972c4728832513b11153bd3a140", "tree": "64181a7a70f2ad49ae01042f9284d190f7c51d7f", "parents": [ "9199c4caa1315c31d160abbd166df0b9a9e8551e", "04bf9ba720fcc4fa313fa122b799ae0989b6cd50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:52:47 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:52:47 2013 -0800" }, "message": "Merge branch \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Peter Anvin:\n \"This is a pretty small batch:\n\n The biggest single change is to stop using EFI time services on 32-bit\n platforms. This matches our current behavior on 64-bit platforms as\n we already had ruled them out there as being too unreliable. Turns\n out that affects 32-bit platforms, too.\n\n One NULL pointer fix for SGI UV.\n\n Two minor build fixes, one of which only affects icc and the other\n which affects icc and future versions or nonstandard default settings\n of gcc\"\n\n* \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, efi: Don\u0027t use (U)EFI time services on 32 bit\n x86, build, icc: Remove uninitialized_var() from compiler-intel.h\n x86/UV: Fix NULL pointer dereference in uv_flush_tlb_others() if the \u0027nobau\u0027 boot option is used\n x86, build: Pass in additional -mno-mmx, -mno-sse options\n" }, { "commit": "9199c4caa1315c31d160abbd166df0b9a9e8551e", "tree": "3f0dea86d44a4aa20695d99faa6f170b68e0f51d", "parents": [ "b5745c59627854afb3cd3f3860ee6f4571e2b633", "f0b75693cbb26439ba959ba7d3b4f43e2fcf3da6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:45:27 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:45:27 2013 -0800" }, "message": "Merge tag \u0027pci-v3.13-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI updates from Bjorn Helgaas:\n \"PCI device hotplug\n - Move device_del() from pci_stop_dev() to pci_destroy_dev() (Rafael\n Wysocki)\n\n Host bridge drivers\n - Update maintainers for DesignWare, i.MX6, Armada, R-Car (Bjorn\n Helgaas)\n - mvebu: Return \u0027unsupported\u0027 for Interrupt Line and Interrupt Pin\n (Jason Gunthorpe)\n\n Miscellaneous\n - Avoid unnecessary CPU switch when calling .probe() (Alexander\n Duyck)\n - Revert \"workqueue: allow work_on_cpu() to be called recursively\"\n (Bjorn Helgaas)\n - Disable Bus Master only on kexec reboot (Khalid Aziz)\n - Omit PCI ID macro strings to shorten quirk names for LTO (Michal\n Marek)\"\n\n* tag \u0027pci-v3.13-fixes-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:\n MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers\n PCI: Disable Bus Master only on kexec reboot\n PCI: mvebu: Return \u0027unsupported\u0027 for Interrupt Line and Interrupt Pin\n PCI: Omit PCI ID macro strings to shorten quirk names\n PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()\n Revert \"workqueue: allow work_on_cpu() to be called recursively\"\n PCI: Avoid unnecessary CPU switch when calling driver .probe() method\n" }, { "commit": "b5745c59627854afb3cd3f3860ee6f4571e2b633", "tree": "df9f3bb37b4cf0f3c52c970927bed4a843234e29", "parents": [ "29b1deb2a48a9dd02b93597aa4c055a24c0e989f", "d93aca6050b10cd7d8b491637c3b5344c5680cac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:28:02 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:28:02 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull SELinux fixes from James Morris.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_postroute()\n selinux: look for IPsec labels on both inbound and outbound packets\n selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()\n selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()\n selinux: fix possible memory leak\n" }, { "commit": "29b1deb2a48a9dd02b93597aa4c055a24c0e989f", "tree": "7e179afa1380b31646512aa5cf025e7b162c4885", "parents": [ "0925f2cdf9d11fb24130d00d6bbea84502610535" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:17:45 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 15 11:17:45 2013 -0800" }, "message": "Revert \"selinux: consider filesystem subtype in policies\"\n\nThis reverts commit 102aefdda4d8275ce7d7100bc16c88c74272b260.\n\nTom London reports that it causes sync() to hang on Fedora rawhide:\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d1033965\n\nand Josh Boyer bisected it down to this commit. Reverting the commit in\nthe rawhide kernel fixes the problem.\n\nEric Paris root-caused it to incorrect subtype matching in that commit\nbreaking fuse, and has a tentative patch, but by now we\u0027re better off\nretrying this in 3.14 rather than playing with it any more.\n\nReported-by: Tom London \u003cselinux@gmail.com\u003e\nBisected-by: Josh Boyer \u003cjwboyer@fedoraproject.org\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Anand Avati \u003cavati@redhat.com\u003e\nCc: Paul Moore \u003cpaul@paul-moore.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "df29df92adda751ac04ca5149d30014b5199db81", "tree": "38ca19e036da94e37077b07b65e533b24de809d7", "parents": [ "3c325ced6aefa72d43a54e324df7562564c26f91" ], "author": { "name": "Carolyn Wyborny", "email": "carolyn.wyborny@intel.com", "time": "Sat Dec 14 03:26:46 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 14 22:59:42 2013 -0500" }, "message": "igb: Fix for issue where values could be too high for udelay function.\n\nThis patch changes the igb_phy_has_link function to check the value of the\nparameter before deciding to use udelay or mdelay in order to be sure that\nthe value is not too high for udelay function.\n\nCC: stable kernel \u003cstable@vger.kernel.org\u003e # 3.9+\nSigned-off-by: Sunil K Pandey \u003csunil.k.pandey@intel.com\u003e\nSigned-off-by: Kevin B Smith \u003ckevin.b.smith@intel.com\u003e\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c325ced6aefa72d43a54e324df7562564c26f91", "tree": "40162d132d29d1620e817a4911ee483ea30f8527", "parents": [ "a3314f3d40215349ab2427800c1e10676691389f" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Sat Dec 14 03:26:45 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 14 22:59:41 2013 -0500" }, "message": "i40e: fix null dereference\n\nIf the vsi-\u003etx_rings structure is NULL we don\u0027t want to panic.\n\nChange-Id: Ic694f043701738c434e8ebe0caf0673f4410dc10\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nTested-by: Kavindya Deegala \u003ckavindya.s.deegala@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0925f2cdf9d11fb24130d00d6bbea84502610535", "tree": "b1ba046d44cdb53c720ee3a4001adfa2d293105e", "parents": [ "b2077ebc19a4792d1b4749ab9fe013c893588989", "bd4b9683623d0d91e87cf22f09008c05f56d7483" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 14 09:37:17 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 14 09:37:17 2013 -0800" }, "message": "Merge tag \u0027edac_fixes_for_3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\nPull EDAC fix from Borislav Petkov:\n \"Silence a compiler warning in sb_edac\"\n\n* tag \u0027edac_fixes_for_3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n sb_edac: Shut up compiler warning when EDAC_DEBUG is enabled\n" }, { "commit": "cb12057256ec58b6f798855b27e120579d6c9aee", "tree": "9b18b281c506b62ed192bf15e942f114d450a7ff", "parents": [ "6f97dc8d4663abed96fa30e3ea4a1d4cfd1c4276" ], "author": { "name": "Tomasz Figa", "email": "tomasz.figa@gmail.com", "time": "Fri Dec 13 20:59:39 2013 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 13 21:48:25 2013 -0800" }, "message": "ARM: s3c64xx: dt: Fix boot failure due to double clock initialization\n\nCommit\n\n4178bac ARM: call of_clk_init from default time_init handler\n\nadded implicit call to of_clk_init() from default time_init callback,\nbut it did not change platforms calling it from other callbacks, despite\nof not having custom time_init callbacks. This caused double clock\ninitialization on such platforms, leading to boot failures. An example\nof such platform is mach-s3c64xx.\n\nThis patch fixes boot failure on s3c64xx by dropping custom init_irq\ncallback, which had a call to of_clk_init() and moving system reset\ninitialization to init_machine callback. This allows us to have\nclocks initialized properly without a need to have custom init_time or\ninit_irq callbacks.\n\nSigned-off-by: Tomasz Figa \u003ctomasz.figa@gmail.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b2077ebc19a4792d1b4749ab9fe013c893588989", "tree": "dcf2cec138264c79e1ac0d85fca320145ab987a6", "parents": [ "2430cdd0fe14884cb533b13020a0ff000144af6d", "b713aa0b15015a65ad5421543b80df86de043d62" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 16:16:03 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 16:16:03 2013 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/~rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"This resolves some further issues with the dma mask changes on ARM\n which have been found by TI and others, and also some corner cases\n with the updates to the virtual to physical address translations.\n\n Konstantin also found some problems with the unwinder, which now\n performs tighter verification that the stack is valid while unwinding\"\n\n* \u0027fixes\u0027 of git://ftp.arm.linux.org.uk/~rmk/linux-arm:\n ARM: fix asm/memory.h build error\n ARM: 7917/1: cacheflush: correctly limit range of memory region being flushed\n ARM: 7913/1: fix framepointer check in unwind_frame\n ARM: 7912/1: check stack pointer in get_wchan\n ARM: 7909/1: mm: Call setup_dma_zone() post early_paging_init()\n ARM: 7908/1: mm: Fix the arm_dma_limit calculation\n ARM: another fix for the DMA mapping checks\n" }, { "commit": "2430cdd0fe14884cb533b13020a0ff000144af6d", "tree": "094cb1b7db94c9824337f67f336eb2582bfefdae", "parents": [ "93e1585e2c909662e97c59fe0204f93fcf985f04", "da990a4f2d5a321911026c26c7eeec3bbc6fb7b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 16:14:39 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 16:14:39 2013 -0800" }, "message": "Merge tag \u0027arc-fixes-for-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc\n\nPull ARC fixes from Vineet Gupta:\n \"These are couple of weeks old already, but I just couldn\u0027t get them to\n you earlier.\n\n - couple of fixes for recently added perf code\n - build time extable sort\"\n\n* tag \u0027arc-fixes-for-3.13\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:\n ARC: [perf] Fix a few thinkos\n ARC: Add guard macro to uapi/asm/unistd.h\n ARC: extable: Enable sorting at build time\n" }, { "commit": "93e1585e2c909662e97c59fe0204f93fcf985f04", "tree": "8c4685fa040f5a2b474e9981791b1f4586918ed5", "parents": [ "1008ebb61e01e3152901b4c5f58bd01a60ed115b", "ed9571f0cf1fe09d3506302610f3ccdfa1d22c4a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 13:22:22 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 13:22:22 2013 -0800" }, "message": "Merge tag \u0027dm-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm\n\nPull device mapper fixes from Mike Snitzer:\n \"A set of device-mapper fixes for 3.13.\n\n A fix for possible memory corruption during DM table load, fix a\n possible leak of snapshot space in case of a crash, fix a possible\n deadlock due to a shared workqueue in the delay target, fix to\n initialize read-only module parameters that are used to export metrics\n for dm stats and dm bufio.\n\n Quite a few stable fixes were identified for both the thin-\n provisioning and caching targets as a result of increased regression\n testing using the device-mapper-test-suite (dmts). The most notable\n of these are the reference counting fixes for the space map btree that\n is used by the dm-array interface -- without these the dm-cache\n metadata will leak, resulting in dm-cache devices running out of\n metadata blocks. Also, some important fixes related to the\n thin-provisioning target\u0027s transition to read-only mode on error\"\n\n* tag \u0027dm-3.13-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:\n dm array: fix a reference counting bug in shadow_ablock\n dm space map: disallow decrementing a reference count below zero\n dm stats: initialize read-only module parameter\n dm bufio: initialize read-only module parameters\n dm cache: actually resize cache\n dm cache: update Documentation for invalidate_cblocks\u0027s range syntax\n dm cache policy mq: fix promotions to occur as expected\n dm thin: allow pool in read-only mode to transition to read-write mode\n dm thin: re-establish read-only state when switching to fail mode\n dm thin: always fallback the pool mode if commit fails\n dm thin: switch to read-only mode if metadata space is exhausted\n dm thin: switch to read only mode if a mapping insert fails\n dm space map metadata: return on failure in sm_metadata_new_block\n dm table: fail dm_table_create on dm_round_up overflow\n dm snapshot: avoid snapshot space leak on crash\n dm delay: fix a possible deadlock due to shared workqueue\n" }, { "commit": "1008ebb61e01e3152901b4c5f58bd01a60ed115b", "tree": "1e7e5b683d732db34a1cb412099fe9b1f5d6ccc1", "parents": [ "ca3367518b89b7c1e593dee82a4a4c9bbdfa8695", "d81cae806af428898f63391b5d7cd7ba0d87025d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 13:21:28 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 13:21:28 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID fixes from Jiri Kosina:\n\n - Genius Gx Imperator Keyboard regression fix (missing break in case),\n by Ben Hutchings\n\n - duplicate sysfs entry error fix for hid-sensor-hub driver, by\n Srinivas Pandruvada\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: hid-sensor-hub: fix duplicate sysfs entry error\n HID: kye: Fix missing break in kye_report_fixup()\n" }, { "commit": "b713aa0b15015a65ad5421543b80df86de043d62", "tree": "589ca5e131220d8c71d17f17b306e30188d64000", "parents": [ "b31459adeab018b297541e288ac88873011da82a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Dec 10 19:21:08 2013 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Dec 13 20:25:30 2013 +0000" }, "message": "ARM: fix asm/memory.h build error\n\nJason Gunthorpe reports a build failure when ARM_PATCH_PHYS_VIRT is\nnot defined:\n\nIn file included from arch/arm/include/asm/page.h:163:0,\n from include/linux/mm_types.h:16,\n from include/linux/sched.h:24,\n from arch/arm/kernel/asm-offsets.c:13:\narch/arm/include/asm/memory.h: In function \u0027__virt_to_phys\u0027:\narch/arm/include/asm/memory.h:244:40: error: \u0027PHYS_OFFSET\u0027 undeclared (first use in this function)\narch/arm/include/asm/memory.h:244:40: note: each undeclared identifier is reported only once for each function it appears in\narch/arm/include/asm/memory.h: In function \u0027__phys_to_virt\u0027:\narch/arm/include/asm/memory.h:249:13: error: \u0027PHYS_OFFSET\u0027 undeclared (first use in this function)\n\nFixes: ca5a45c06cd4 (\"ARM: mm: use phys_addr_t appropriately in p2v and v2p conversions\")\nTested-By: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ca3367518b89b7c1e593dee82a4a4c9bbdfa8695", "tree": "12ba41f3e09e27f60fa02ed66068f4763b5938bf", "parents": [ "599eefa03f5db2c12c7959862410418402e76030", "334a82086d6428ede052c4cd11ee588bcdf2a9e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:39:54 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:39:54 2013 -0800" }, "message": "Merge tag \u0027regulator-v3.13-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator fixes from Mark Brown:\n \"A small set of driver fixes plus one larger core change which changes\n the way we check to see if we\u0027re using DT so that there aren\u0027t any\n races between deciding we\u0027re using DT and the regulator subsystem\n noticing.\n\n This makes the new support for substituting a dummy regulator and\n optional regulators work a lot better on DT systems since it ensures\n that we don\u0027t trigger probe deferral when we shouldn\u0027t which was\n causing bugs in clients\"\n\n* tag \u0027regulator-v3.13-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: pfuze100: allow misprogrammed ID\n regulator: pfuze100: Fix address of FABID\n regulator: as3722: set the correct current limit\n regulator: core: Check for DT every time we check full constraints\n regulator: core: Replace checks of have_full_constraints with a function\n" }, { "commit": "599eefa03f5db2c12c7959862410418402e76030", "tree": "05405a66b5a95aba6405ed0aa791c3d3c8dc93b4", "parents": [ "31f984d10cc7a83529d433dbc820556cf7e775ac", "652787ab1aca35e5e85e644757f7ea2cc00681d1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:38:35 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:38:35 2013 -0800" }, "message": "Merge tag \u0027regmap-v3.13-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap fixes from Mark Brown:\n \"Two small changes to fix some error handling and checking (both of\n which would be quite serious if the errors trigger) plus a trivial\n documentation fix\"\n\n* tag \u0027regmap-v3.13-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n regmap: use IS_ERR() to check clk_get() results\n regmap: make sure we unlock on failure in regmap_bulk_write\n regmap: trivial comment fix (copy\u0027n\u0027paste error)\n" }, { "commit": "31f984d10cc7a83529d433dbc820556cf7e775ac", "tree": "cfc634875ffc83a436270c56bbca9a020554a1d2", "parents": [ "dbb022cb4605fbbf506d57aefedd664876fa2fc2", "e5bf216a945e7292f8718276372d2b41486bed26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:37:57 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:37:57 2013 -0800" }, "message": "Merge branch \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux\n\nPull i2c fixes from Wolfram Sang:\n \"Here are two simple but wanted fixes for the i2c subsystem\"\n\n* \u0027i2c/for-current\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:\n i2c: imx: Check the return value from clk_prepare_enable()\n i2c: mux: Inherit retry count and timeout from parent for muxed bus\n" }, { "commit": "dbb022cb4605fbbf506d57aefedd664876fa2fc2", "tree": "fffadb24f3d364c45da38587436c8ccaa75e989a", "parents": [ "f6493505911b3482523aabcbb0488f29e8578ea6", "15b540c71cac840f0a3e8b1b4b7a773deb847ffb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:31:22 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:31:22 2013 -0800" }, "message": "Merge tag \u0027for-linus-20131212\u0027 of git://git.infradead.org/linux-mtd\n\nPull MTD fixes from Brian Norris:\n \"Two MTD fixes, for the pxa3xx-nand driver:\n\n - This driver was not ready to fully Armada 370 NAND, with\n particularly notable problems seen on flash with 2KB page sizes.\n This \"compatible\" entry really should have been held back until\n 3.14 or later.\n\n - Fix a bug seen in rare cases on the error path of a failed probe\n attempt, where we free unallocated DMA resources\"\n\n* tag \u0027for-linus-20131212\u0027 of git://git.infradead.org/linux-mtd:\n mtd: nand: pxa3xx: Use info-\u003euse_dma to release DMA resources\n Partially revert \"mtd: nand: pxa3xx: Introduce \u0027marvell,armada370-nand\u0027 compatible string\"\n" }, { "commit": "f6493505911b3482523aabcbb0488f29e8578ea6", "tree": "f4fac2e1a128ee97dbcb369dd433756158a2d77d", "parents": [ "8d2763770c34e8ed771f0be86760eb4485febc05", "85726def1e351bdd057cdc4bb349dcbdf6bdd251" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:29:51 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 13 11:29:51 2013 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine fixes from Vinod Koul:\n \"Here is the common fixes PULL for dmaengine.\n\n Dan has been working on fixing the build issues in bunch of drivers.\n Here we have one fixing s3c24xx-dma, along with fix from Russell on\n pl08x. Also we have Kuninori rcar dma fixes. The s3c24xx-dma which\n was added in last merge window missed updates to usage of DMA_COMPLETE\n so converting the last driver\"\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dma: fix build breakage in s3c24xx-dma\n Fix pl08x warnings\n rcar-hpbdma: initialise plane information when halted\n rcar-hpbdma: fixup channel busy check for double plane\n rcar-hpbdma: add max transfer size\n dma: mmp_pdma: add missing platform_set_drvdata() in mmp_pdma_probe()\n dmaengine: s3c24xx-dma: use DMA_COMPLETE for dma completion status\n" }, { "commit": "ed9571f0cf1fe09d3506302610f3ccdfa1d22c4a", "tree": "ec013b939d466fbd06d3c62a5a0de5ca9e5a3ae1", "parents": [ "5b564d80f8bc21094c0cd2b19b679d983aabcc29" ], "author": { "name": "Joe Thornber", "email": "ejt@redhat.com", "time": "Fri Dec 13 14:55:55 2013 +0000" }, "committer": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Fri Dec 13 14:22:10 2013 -0500" }, "message": "dm array: fix a reference counting bug in shadow_ablock\n\nAn old array block could have its reference count decremented below\nzero when it is being replaced in the btree by a new array block.\n\nThe fix is to increment the old ablock\u0027s reference count just before\ninserting a new ablock into the btree.\n\nSigned-off-by: Joe Thornber \u003cejt@redhat.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nCc: stable@vger.kernel.org # 3.9+\n" }, { "commit": "5b564d80f8bc21094c0cd2b19b679d983aabcc29", "tree": "942293da24619a5befb57d03e4a94db9b243710c", "parents": [ "76f5bee5c3b45c617f91243e85547fc8f67bc678" ], "author": { "name": "Joe Thornber", "email": "ejt@redhat.com", "time": "Fri Dec 13 12:31:08 2013 +0000" }, "committer": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Fri Dec 13 14:22:09 2013 -0500" }, "message": "dm space map: disallow decrementing a reference count below zero\n\nThe old behaviour, returning -EINVAL if a ref_count of 0 would be\ndecremented, was removed in commit f722063 (\"dm space map: optimise\nsm_ll_dec and sm_ll_inc\"). To fix this regression we return an error\ncode from the mutator function pointer passed to sm_ll_mutate() and have\ndec_ref_count() return -EINVAL if the old ref_count is 0.\n\nAdd a DMERR to reflect the potential seriousness of this error.\n\nAlso, add missing dm_tm_unlock() to sm_ll_mutate()\u0027s error path.\n\nWith this fix the following dmts regression test now passes:\n dmtest run --suite cache -n /metadata_use_kernel/\n\nThe next patch fixes the higher-level dm-array code that exposed this\nregression.\n\nSigned-off-by: Joe Thornber \u003cejt@redhat.com\u003e\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nCc: stable@vger.kernel.org # 3.12+\n" }, { "commit": "334a82086d6428ede052c4cd11ee588bcdf2a9e8", "tree": "33eb7fc1076405e1f032d1c411c2fbf7a1b7562c", "parents": [ "67cc6885548427a4f7980b57e6ef32945f6d22b1", "75bc9641cadd2a3f91f9c2e7f2fdfdeb8bd4b1d6" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Fri Dec 13 13:44:57 2013 +0000" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Fri Dec 13 13:44:57 2013 +0000" }, "message": "Merge remote-tracking branch \u0027regulator/topic/constraints\u0027 into regulator-linus\n" }, { "commit": "d93aca6050b10cd7d8b491637c3b5344c5680cac", "tree": "216cf72ea9fc6e7e1f995029cf5ead4a4aeb3301", "parents": [ "54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f", "c0828e50485932b7e019df377a6b0a8d1ebd3080" ], "author": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Fri Dec 13 13:27:55 2013 +1100" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Fri Dec 13 13:27:55 2013 +1100" }, "message": "Merge branch \u0027master\u0027 of git://git.infradead.org/users/pcmoore/selinux_fixes into for-linus\n" }, { "commit": "8d2763770c34e8ed771f0be86760eb4485febc05", "tree": "38ca3d44f84b8f575f3378c6be525e559bd314c1", "parents": [ "54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f", "1f14c1ac19aa45118054b6d5425873c5c7fc23a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:22:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:22:10 2013 -0800" }, "message": "Merge branch \u0027akpm\u0027 (fixes from Andrew)\n\nMerge patches from Andrew Morton:\n \"13 fixes\"\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n mm: memcg: do not allow task about to OOM kill to bypass the limit\n mm: memcg: fix race condition between memcg teardown and swapin\n thp: move preallocated PTE page table on move_huge_pmd()\n mfd/rtc: s5m: fix register updating by adding regmap for RTC\n rtc: s5m: enable IRQ wake during suspend\n rtc: s5m: limit endless loop waiting for register update\n rtc: s5m: fix unsuccesful IRQ request during probe\n drivers/rtc/rtc-s5m.c: fix info-\u003ertc assignment\n include/linux/kernel.h: make might_fault() a nop for !MMU\n drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap\n procfs: also fix proc_reg_get_unmapped_area() for !MMU case\n mm: memcg: do not declare OOM from __GFP_NOFAIL allocations\n include/linux/hugetlb.h: make isolate_huge_page() an inline\n" }, { "commit": "1f14c1ac19aa45118054b6d5425873c5c7fc23a1", "tree": "bb7e0beb99d7808579800382db5e5820d1d2ff39", "parents": [ "96f1c58d853497a757463e0b57fed140d6858f3a" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:35 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: do not allow task about to OOM kill to bypass the limit\n\nCommit 4942642080ea (\"mm: memcg: handle non-error OOM situations more\ngracefully\") allowed tasks that already entered a memcg OOM condition to\nbypass the memcg limit on subsequent allocation attempts hoping this\nwould expedite finishing the page fault and executing the kill.\n\nDavid Rientjes is worried that this breaks memcg isolation guarantees\nand since there is no evidence that the bypass actually speeds up fault\nprocessing just change it so that these subsequent charge attempts fail\noutright. The notable exception being __GFP_NOFAIL charges which are\nrequired to bypass the limit regardless.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReported-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-bt: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@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": "96f1c58d853497a757463e0b57fed140d6858f3a", "tree": "9d2c6fca20e2a6de39cb4aff25d015b75615ea64", "parents": [ "3592806cfa08b7cca968f793c33f8e9460bab395" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:34 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: fix race condition between memcg teardown and swapin\n\nThere is a race condition between a memcg being torn down and a swapin\ntriggered from a different memcg of a page that was recorded to belong\nto the exiting memcg on swapout (with CONFIG_MEMCG_SWAP extension). The\nresult is unreclaimable pages pointing to dead memcgs, which can lead to\nanything from endless loops in later memcg teardown (the page is charged\nto all hierarchical parents but is not on any LRU list) or crashes from\nfollowing the dangling memcg pointer.\n\nMemcgs with tasks in them can not be torn down and usually charges don\u0027t\nshow up in memcgs without tasks. Swapin with the CONFIG_MEMCG_SWAP\nextension is the notable exception because it charges the cgroup that\nwas recorded as owner during swapout, which may be empty and in the\nprocess of being torn down when a task in another memcg triggers the\nswapin:\n\n teardown: swapin:\n\n lookup_swap_cgroup_id()\n rcu_read_lock()\n mem_cgroup_lookup()\n css_tryget()\n rcu_read_unlock()\n disable css_tryget()\n call_rcu()\n offline_css()\n reparent_charges()\n res_counter_charge() (hierarchical!)\n css_put()\n css_free()\n pc-\u003emem_cgroup \u003d dead memcg\n add page to dead lru\n\nAdd a final reparenting step into css_free() to make sure any such raced\ncharges are moved out of the memcg before it\u0027s finally freed.\n\nIn the longer term it would be cleaner to have the css_tryget() and the\nres_counter charge under the same RCU lock section so that the charge\nreparenting is deferred until the last charge whose tryget succeeded is\nvisible. But this will require more invasive changes that will be\nharder to evaluate and backport into stable, so better defer them to a\nseparate change set.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@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": "3592806cfa08b7cca968f793c33f8e9460bab395", "tree": "fb988d60d644cf5b561fff0866e2ee5632874b36", "parents": [ "3e1e4a5f3a324502c27c4e8808e06ac2ea842360" ], "author": { "name": "Kirill A. Shutemov", "email": "kirill.shutemov@linux.intel.com", "time": "Thu Dec 12 17:12:33 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "thp: move preallocated PTE page table on move_huge_pmd()\n\nAndrey Wagin reported crash on VM_BUG_ON() in pgtable_pmd_page_dtor() with\nfallowing backtrace:\n\n free_pgd_range+0x2bf/0x410\n free_pgtables+0xce/0x120\n unmap_region+0xe0/0x120\n do_munmap+0x249/0x360\n move_vma+0x144/0x270\n SyS_mremap+0x3b9/0x510\n system_call_fastpath+0x16/0x1b\n\nThe crash can be reproduce with this test case:\n\n #define _GNU_SOURCE\n #include \u003csys/mman.h\u003e\n #include \u003cstdio.h\u003e\n #include \u003cunistd.h\u003e\n\n #define MB (1024 * 1024UL)\n #define GB (1024 * MB)\n\n int main(int argc, char **argv)\n {\n\tchar *p;\n\tint i;\n\n\tp \u003d mmap((void *) GB, 10 * MB, PROT_READ | PROT_WRITE,\n\t\t\tMAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);\n\tfor (i \u003d 0; i \u003c 10 * MB; i +\u003d 4096)\n\t\tp[i] \u003d 1;\n\tmremap(p, 10 * MB, 10 * MB, MREMAP_FIXED | MREMAP_MAYMOVE, 2 * GB);\n\treturn 0;\n }\n\nDue to split PMD lock, we now store preallocated PTE tables for THP\npages per-PMD table. It means we need to move them to other PMD table\nif huge PMD moved there.\n\nSigned-off-by: Kirill A. Shutemov \u003ckirill.shutemov@linux.intel.com\u003e\nReported-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nTested-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nReviewed-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e1e4a5f3a324502c27c4e8808e06ac2ea842360", "tree": "ce7ded2263f37dd7c25c7799a24607b2fd6ebc24", "parents": [ "222ead7fd80f455ac377ae20dfeb56cab513db96" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:31 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mfd/rtc: s5m: fix register updating by adding regmap for RTC\n\nRename old regmap field of \"struct sec_pmic_dev\" to \"regmap_pmic\" and\nadd new regmap for RTC.\n\nOn S5M8767A registers were not properly updated and read due to usage of\nthe same regmap as the PMIC. This could be observed in various hangs,\ne.g. in infinite loop during waiting for UDR field change.\n\nOn this chip family the RTC has different I2C address than PMIC so\nadditional regmap is needed.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "222ead7fd80f455ac377ae20dfeb56cab513db96", "tree": "d32eb368882569d2b9ba1d30805b0e3f658b7f9b", "parents": [ "d73238d4a6ca2eadbd14565d769706c85650c641" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:30 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: enable IRQ wake during suspend\n\nAdd PM suspend/resume ops to rtc-s5m driver and enable IRQ wake during\nsuspend so the RTC would act like a wake up source. This allows waking\nup from suspend to RAM on RTC alarm interrupt.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d73238d4a6ca2eadbd14565d769706c85650c641", "tree": "656c58a23c71db744b97e7d4b79d1924c8099cbb", "parents": [ "7b003be82676ddf0bca52e0f98e0694da2ac427f" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:28 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: limit endless loop waiting for register update\n\nAfter setting alarm or time the driver is waiting for UDR register to be\ncleared indicating that registers data have been transferred.\n\nLimit the endless loop to only 5 retries.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b003be82676ddf0bca52e0f98e0694da2ac427f", "tree": "621a273f3849879d445e1ef4c19c7c97dcfc2e9b", "parents": [ "5ccb7d718e1551ed672b7e2e39fb626dc869594b" ], "author": { "name": "Krzysztof Kozlowski", "email": "k.kozlowski@samsung.com", "time": "Thu Dec 12 17:12:26 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "rtc: s5m: fix unsuccesful IRQ request during probe\n\nProbe failed for rtc-s5m:\n\n\ts5m-rtc s5m-rtc: Failed to request alarm IRQ: 12: -22\n\ts5m-rtc: probe of s5m-rtc failed with error -22\n\nFix rtc-s5m interrupt request by using regmap_irq_get_virq() for mapping\nthe IRQ.\n\nSigned-off-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@linaro.org\u003e\nAcked-by: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Liam Girdwood \u003clgirdwood@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Kyungmin Park \u003ckyungmin.park@samsung.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": "5ccb7d718e1551ed672b7e2e39fb626dc869594b", "tree": "51519468cf7a03ada5393096ecb4712dd1e85dcc", "parents": [ "386e79066f04850352f144e67edfd5b636c0f95c" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Dec 12 17:12:25 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "drivers/rtc/rtc-s5m.c: fix info-\u003ertc assignment\n\nFix this warning:\n\n drivers/rtc/rtc-s5m.c: In function `s5m_rtc_probe\u0027:\n drivers/rtc/rtc-s5m.c:545: warning: assignment from incompatible pointer type\n\nstruct s5m_rtc_info.rtc has type \"struct regmap *\", while\nstruct sec_pmic_dev.rtc has type \"struct i2c_client *\".\n\nProbably the author wanted to assign \"struct sec_pmic_dev.regmap\", which\nhas the correct type.\n\nAlso, as \"rtc\" doesn\u0027t make much sense as a name for a regmap, rename it\nto \"regmap\".\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Sachin Kamat \u003csachin.kamat@linaro.org\u003e\nTested-by: Krzysztof Kozlowski \u003ck.kozlowski@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "386e79066f04850352f144e67edfd5b636c0f95c", "tree": "3944d1346d3209e713b6768d1a0c28c520639a4f", "parents": [ "eb3c227289840eed95ddfb0516046f08d8993940" ], "author": { "name": "Axel Lin", "email": "axel.lin@ingics.com", "time": "Thu Dec 12 17:12:24 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "include/linux/kernel.h: make might_fault() a nop for !MMU\n\nThe machine cannot fault if !MUU, so make might_fault() a nop for !MMU.\n\nThis fixes below build error if\n!CONFIG_MMU \u0026\u0026 (CONFIG_PROVE_LOCKING\u003dy || CONFIG_DEBUG_ATOMIC_SLEEP\u003dy):\n\n arch/arm/kernel/built-in.o: In function `arch_ptrace\u0027:\n arch/arm/kernel/ptrace.c:852: undefined reference to `might_fault\u0027\n arch/arm/kernel/built-in.o: In function `restore_sigframe\u0027:\n arch/arm/kernel/signal.c:173: undefined reference to `might_fault\u0027\n ...\n arch/arm/kernel/built-in.o:arch/arm/kernel/signal.c:177: more undefined references to `might_fault\u0027 follow\n make: *** [vmlinux] Error 1\n\nSigned-off-by: Axel Lin \u003caxel.lin@ingics.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb3c227289840eed95ddfb0516046f08d8993940", "tree": "27121b7d09bf85b682ab373c293e0553844adbf5", "parents": [ "ae5758a1a7b7bdfdcfaf2d78a5a0f8675149dd79" ], "author": { "name": "Linus Pizunski", "email": "linus@narrativeteam.com", "time": "Thu Dec 12 17:12:23 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap\n\nUpdate month and day of month to the alarm month/day instead of current\nday/month when setting the RTC alarm mask.\n\nSigned-off-by: Linus Pizunski \u003clinus@narrativeteam.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.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": "ae5758a1a7b7bdfdcfaf2d78a5a0f8675149dd79", "tree": "724d6af0adf51da4e34c09bb66c9586f0de945b6", "parents": [ "a0d8b00a3381f9d75764b3377590451cb0b4fe41" ], "author": { "name": "Jan Beulich", "email": "JBeulich@suse.com", "time": "Thu Dec 12 17:12:22 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "procfs: also fix proc_reg_get_unmapped_area() for !MMU case\n\nCommit fad1a86e25e0 (\"procfs: call default get_unmapped_area on\nMMU-present architectures\"), as its title says, took care of only the\nMMU case, leaving the !MMU side still in the regressed state (returning\n-EIO in all cases where pde-\u003eproc_fops-\u003eget_unmapped_area is NULL).\n\nFrom the fad1a86e25e0 changelog:\n\n \"Commit c4fe24485729 (\"sparc: fix PCI device proc file mmap(2)\") added\n proc_reg_get_unmapped_area in proc_reg_file_ops and\n proc_reg_file_ops_no_compat, by which now mmap always returns EIO if\n get_unmapped_area method is not defined for the target procfs file, which\n causes regression of mmap on /proc/vmcore.\n\n To address this issue, like get_unmapped_area(), call default\n current-\u003emm-\u003eget_unmapped_area on MMU-present architectures if\n pde-\u003eproc_fops-\u003eget_unmapped_area, i.e. the one in actual file operation\n in the procfs file, is not defined\"\n\nSigned-off-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: HATAYAMA Daisuke \u003cd.hatayama@jp.fujitsu.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.12.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0d8b00a3381f9d75764b3377590451cb0b4fe41", "tree": "8e50e004aa354150558a637ff7a9d5d8ddab9b13", "parents": [ "f40386a4e976acb2bd3e0f9ead11e8e769acbe98" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Dec 12 17:12:20 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:26 2013 -0800" }, "message": "mm: memcg: do not declare OOM from __GFP_NOFAIL allocations\n\nCommit 84235de394d9 (\"fs: buffer: move allocation failure loop into the\nallocator\") started recognizing __GFP_NOFAIL in memory cgroups but\nforgot to disable the OOM killer.\n\nAny task that does not fail allocation will also not enter the OOM\ncompletion path. So don\u0027t declare an OOM state in this case or it\u0027ll be\nleaked and the task be able to bypass the limit until the next\nuserspace-triggered page fault cleans up the OOM state.\n\nReported-by: William Dauchy \u003cwdauchy@gmail.com\u003e\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.12.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f40386a4e976acb2bd3e0f9ead11e8e769acbe98", "tree": "7b87fce0a88425cb3c7bafbf52751500063cb117", "parents": [ "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Thu Dec 12 17:12:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 18:19:25 2013 -0800" }, "message": "include/linux/hugetlb.h: make isolate_huge_page() an inline\n\nWith CONFIG_HUGETLBFS\u003dn:\n\n mm/migrate.c: In function `do_move_page_to_node_array\u0027:\n include/linux/hugetlb.h:140:33: warning: statement with no effect [-Wunused-value]\n #define isolate_huge_page(p, l) false\n ^\n mm/migrate.c:1170:4: note: in expansion of macro `isolate_huge_page\u0027\n isolate_huge_page(page, \u0026pagelist);\n\nReported-by: Borislav Petkov \u003cbp@alien8.de\u003e\nTested-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: David Rientjes \u003crientjes@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": "54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f", "tree": "71a21d846cd6fe301f1077c98cdf6dfff58048d2", "parents": [ "ea1e61cbb9b1397192a478eca4c3138bd1b4441c", "17d68b763f09a9ce824ae23eb62c9efc57b69271" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:46:06 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:46:06 2013 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull kvm fixes from Paolo Bonzini:\n \"Four security fixes for KVM on x86. Thanks to Andrew Honig and Lars\n Bull from Google for reporting them\"\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)\n KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)\n KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)\n KVM: Improve create VCPU parameter (CVE-2013-4587)\n" }, { "commit": "ea1e61cbb9b1397192a478eca4c3138bd1b4441c", "tree": "ffd04ecf7494838c3236896dfea85a975cadcb27", "parents": [ "e09f67f1472bb3027448251d51bd52543d0af699", "6f97dc8d4663abed96fa30e3ea4a1d4cfd1c4276" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:45:03 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:45:03 2013 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Another week, another batch of fixes.\n\n Again, OMAP regressions due to move to DT is the bulk of the changes\n here, but this should be the last of it for 3.13. There are also a\n handful of OMAP hwmod changes (power management, reset handling) for\n USB on OMAP3 that fixes some longish-standing bugs around USB resets.\n\n There are a couple of other changes that also add up line count a bit:\n One is a long-standing bug with the keyboard layout on one of the PXA\n platforms. The other is a fix for highbank that moves their\n power-off/reset button handling to be done in-kernel since relying on\n userspace to handle it was fragile and awkward\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: sun6i: dt: Fix interrupt trigger types\n ARM: sun7i: dt: Fix interrupt trigger types\n MAINTAINERS: merge IMX6 entry into IMX\n ARM: tegra: add missing break to fuse initialization code\n ARM: pxa: prevent PXA270 occasional reboot freezes\n ARM: pxa: tosa: fix keys mapping\n ARM: OMAP2+: omap_device: add fail hook for runtime_pm when bad data is detected\n ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present\n ARM: OMAP3: hwmod data: Don\u0027t prevent RESET of USB Host module\n ARM: OMAP2+: hwmod: Fix SOFTRESET logic\n ARM: OMAP4+: hwmod data: Don\u0027t prevent RESET of USB Host module\n ARM: dts: Fix booting for secure omaps\n ARM: OMAP2+: Fix the machine entry for am3517\n ARM: dts: Fix missing entries for am3517\n ARM: OMAP2+: Fix overwriting hwmod data with data from device tree\n ARM: davinci: Fix McASP mem resource names\n ARM: highbank: handle soft poweroff and reset key events\n ARM: davinci: fix number of resources passed to davinci_gpio_register()\n gpio: davinci: fix check for unbanked gpio\n" }, { "commit": "e09f67f1472bb3027448251d51bd52543d0af699", "tree": "9482160f3a0d000333ed69f5286406e0e9ffbdb0", "parents": [ "c9111b4df407e6b73f2a92c36f7fc93a7b27fd99", "700ff4f095d78af0998953e922e041d75254518b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:25:10 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:25:10 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs fixes from Chris Mason:\n \"This is a small collection of fixes. It was rebased this morning, but\n I was just fixing signed-off-by tags with the wrong email\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: fix access_ok() check in btrfs_ioctl_send()\n Btrfs: make sure we cleanup all reloc roots if error happens\n Btrfs: skip building backref tree for uuid and quota tree when doing balance relocation\n Btrfs: fix an oops when doing balance relocation\n Btrfs: don\u0027t miss skinny extent items on delayed ref head contention\n btrfs: call mnt_drop_write after interrupted subvol deletion\n Btrfs: don\u0027t clear the default compression type\n" }, { "commit": "c9111b4df407e6b73f2a92c36f7fc93a7b27fd99", "tree": "1a5445e1efa58ac914ada74be50ee8ad9593b69f", "parents": [ "2208f6513accb06ccb0f7b6f9e97989cd865585a", "781c2a5a5f75eacc04663aced0f0f1a648d4f308" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:24:32 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 15:24:32 2013 -0800" }, "message": "Merge branch \u0027for-3.13\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd reply cache bugfix from Bruce Fields:\n \"One bugfix for nfsd crashes\"\n\n* \u0027for-3.13\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd: when reusing an existing repcache entry, unhash it first\n" }, { "commit": "15b540c71cac840f0a3e8b1b4b7a773deb847ffb", "tree": "36633b7abe131264da0ca4826351a58e988998b8", "parents": [ "9c59ac616137fb62f6cb3f1219201b09cbcf30be" ], "author": { "name": "Ezequiel Garcia", "email": "ezequiel.garcia@free-electrons.com", "time": "Tue Dec 10 09:57:15 2013 -0300" }, "committer": { "name": "Brian Norris", "email": "computersforpeace@gmail.com", "time": "Thu Dec 12 15:02:04 2013 -0800" }, "message": "mtd: nand: pxa3xx: Use info-\u003euse_dma to release DMA resources\n\nIn commit:\n\n commit 62e8b851783138a11da63285be0fbf69530ff73d\n Author: Ezequiel Garcia \u003cezequiel.garcia@free-electrons.com\u003e\n Date: Fri Oct 4 15:30:38 2013 -0300\n\n mtd: nand: pxa3xx: Allocate data buffer on detected flash size\n\nthe way the buffer is allocated was changed: the first READ_ID is issued\nwith a small kmalloc\u0027ed buffer. Only once the flash page size is detected\nthe DMA buffers are allocated, and info-\u003euse_dma is set.\n\nCurrently, if the device detection fails, the driver checks the \u0027use_dma\u0027\nmodule parameter and tries to release unallocated DMA resources.\n\nFix this by checking the proper indicator of the DMA allocation, which\nis \u0027info-\u003euse_dma\u0027.\n\nSigned-off-by: Ezequiel Garcia \u003cezequiel.garcia@free-electrons.com\u003e\nSigned-off-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\n" }, { "commit": "9c59ac616137fb62f6cb3f1219201b09cbcf30be", "tree": "2bcd1f41e30d9120f977c395ccffceade1dfe361", "parents": [ "6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae" ], "author": { "name": "Ezequiel Garcia", "email": "ezequiel.garcia@free-electrons.com", "time": "Mon Dec 09 18:36:26 2013 -0300" }, "committer": { "name": "Brian Norris", "email": "computersforpeace@gmail.com", "time": "Thu Dec 12 15:01:30 2013 -0800" }, "message": "Partially revert \"mtd: nand: pxa3xx: Introduce \u0027marvell,armada370-nand\u0027 compatible string\"\n\nThis partially reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.\n\nThe \"armada370-nand\" compatible support is not complete, and it was mistake\nto add it. Revert it and postpone the support until the infrastructure is\nin place.\n\nCc: \u003cstable@vger.kernel.org\u003e # 3.12\nSigned-off-by: Ezequiel Garcia \u003cezequiel.garcia@free-electrons.com\u003e\nAcked-by: Jason Cooper \u003cjason@lakedaemon.net\u003e\nSigned-off-by: Brian Norris \u003ccomputersforpeace@gmail.com\u003e\n" }, { "commit": "c0828e50485932b7e019df377a6b0a8d1ebd3080", "tree": "60d953c62261e7ec3b5b33e86e58a3d7286e1c4a", "parents": [ "817eff718dca4e54d5721211ddde0914428fbb7c" ], "author": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Tue Dec 10 14:58:01 2013 -0500" }, "committer": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Thu Dec 12 17:21:31 2013 -0500" }, "message": "selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_postroute()\n\nDue to difficulty in arriving at the proper security label for\nTCP SYN-ACK packets in selinux_ip_postroute(), we need to check packets\nwhile/before they are undergoing XFRM transforms instead of waiting\nuntil afterwards so that we can determine the correct security label.\n\nReported-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\n" }, { "commit": "817eff718dca4e54d5721211ddde0914428fbb7c", "tree": "af7ee8d6ca454532624c7148e9f96bd1a67c0cb3", "parents": [ "446b802437f285de68ffb8d6fac3c44c3cab5b04" ], "author": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Tue Dec 10 14:57:54 2013 -0500" }, "committer": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Thu Dec 12 17:21:31 2013 -0500" }, "message": "selinux: look for IPsec labels on both inbound and outbound packets\n\nPreviously selinux_skb_peerlbl_sid() would only check for labeled\nIPsec security labels on inbound packets, this patch enables it to\ncheck both inbound and outbound traffic for labeled IPsec security\nlabels.\n\nReported-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\n" }, { "commit": "446b802437f285de68ffb8d6fac3c44c3cab5b04", "tree": "2123c25875f8ad75114592e4755d21429765a6c0", "parents": [ "47180068276a04ed31d24fe04c673138208b07a9" ], "author": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Wed Dec 04 16:10:51 2013 -0500" }, "committer": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Thu Dec 12 17:21:31 2013 -0500" }, "message": "selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()\n\nIn selinux_ip_postroute() we perform access checks based on the\npacket\u0027s security label. For locally generated traffic we get the\npacket\u0027s security label from the associated socket; this works in all\ncases except for TCP SYN-ACK packets. In the case of SYN-ACK packet\u0027s\nthe correct security label is stored in the connection\u0027s request_sock,\nnot the server\u0027s socket. Unfortunately, at the point in time when\nselinux_ip_postroute() is called we can\u0027t query the request_sock\ndirectly, we need to recreate the label using the same logic that\noriginally labeled the associated request_sock.\n\nSee the inline comments for more explanation.\n\nReported-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nTested-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\n" }, { "commit": "47180068276a04ed31d24fe04c673138208b07a9", "tree": "957e58757aa1373a9e8696761f00f26d6b6704f8", "parents": [ "0af901643fe3f1f8d44e41115d36609ee4bda2bf" ], "author": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Wed Dec 04 16:10:45 2013 -0500" }, "committer": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Thu Dec 12 17:21:31 2013 -0500" }, "message": "selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()\n\nIn selinux_ip_output() we always label packets based on the parent\nsocket. While this approach works in almost all cases, it doesn\u0027t\nwork in the case of TCP SYN-ACK packets when the correct label is not\nthe label of the parent socket, but rather the label of the larval\nsocket represented by the request_sock struct.\n\nUnfortunately, since the request_sock isn\u0027t queued on the parent\nsocket until *after* the SYN-ACK packet is sent, we can\u0027t lookup the\nrequest_sock to determine the correct label for the packet; at this\npoint in time the best we can do is simply pass/NF_ACCEPT the packet.\nIt must be said that simply passing the packet without any explicit\nlabeling action, while far from ideal, is not terrible as the SYN-ACK\npacket will inherit any IP option based labeling from the initial\nconnection request so the label *should* be correct and all our\naccess controls remain in place so we shouldn\u0027t have to worry about\ninformation leaks.\n\nReported-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nTested-by: Janak Desai \u003cJanak.Desai@gtri.gatech.edu\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\n" }, { "commit": "e5bf216a945e7292f8718276372d2b41486bed26", "tree": "69d106bf305787fe3aa7c9cbf70347f54c6fe1a3", "parents": [ "2212a8529eb06c559256f0cee41c1f14890d54d3" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Wed Dec 04 20:21:37 2013 -0200" }, "committer": { "name": "Wolfram Sang", "email": "wsa@the-dreams.de", "time": "Thu Dec 12 22:48:22 2013 +0100" }, "message": "i2c: imx: Check the return value from clk_prepare_enable()\n\nclk_prepare_enable() may fail, so let\u0027s check its return value and propagate it\nin the case of error.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Wolfram Sang \u003cwsa@the-dreams.de\u003e\n" }, { "commit": "17d68b763f09a9ce824ae23eb62c9efc57b69271", "tree": "2be4f93e491c3094d7ae1994191941ba4c1dcc4f", "parents": [ "fda4e2e85589191b123d31cdc21fd33ee70f50fd" ], "author": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Thu Dec 12 21:20:08 2013 +0100" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:46:18 2013 +0100" }, "message": "KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)\n\nA guest can cause a BUG_ON() leading to a host kernel crash.\nWhen the guest writes to the ICR to request an IPI, while in x2apic\nmode the following things happen, the destination is read from\nICR2, which is a register that the guest can control.\n\nkvm_irq_delivery_to_apic_fast uses the high 16 bits of ICR2 as the\ncluster id. A BUG_ON is triggered, which is a protection against\naccessing map-\u003elogical_map with an out-of-bounds access and manages\nto avoid that anything really unsafe occurs.\n\nThe logic in the code is correct from real HW point of view. The problem\nis that KVM supports only one cluster with ID 0 in clustered mode, but\nthe code that has the bug does not take this into account.\n\nReported-by: Lars Bull \u003clarsbull@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "fda4e2e85589191b123d31cdc21fd33ee70f50fd", "tree": "68cfbeb6ea9d06ffd164bcc8b692993a90367333", "parents": [ "b963a22e6d1a266a67e9eecc88134713fd54775c" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Wed Nov 20 10:23:22 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:46 2013 +0100" }, "message": "KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)\n\nIn kvm_lapic_sync_from_vapic and kvm_lapic_sync_to_vapic there is the\npotential to corrupt kernel memory if userspace provides an address that\nis at the end of a page. This patches concerts those functions to use\nkvm_write_guest_cached and kvm_read_guest_cached. It also checks the\nvapic_address specified by userspace during ioctl processing and returns\nan error to userspace if the address is not a valid GPA.\n\nThis is generally not guest triggerable, because the required write is\ndone by firmware that runs before the guest. Also, it only affects AMD\nprocessors and oldish Intel that do not have the FlexPriority feature\n(unless you disable FlexPriority, of course; then newer processors are\nalso affected).\n\nFixes: b93463aa59d6 (\u0027KVM: Accelerated apic support\u0027)\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "b963a22e6d1a266a67e9eecc88134713fd54775c", "tree": "b378e97caf7869445b6168e87b7c6b36d7e87674", "parents": [ "338c7dbadd2671189cec7faf64c84d01071b3f96" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Tue Nov 19 14:12:18 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:45 2013 +0100" }, "message": "KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)\n\nUnder guest controllable circumstances apic_get_tmcct will execute a\ndivide by zero and cause a crash. If the guest cpuid support\ntsc deadline timers and performs the following sequence of requests\nthe host will crash.\n- Set the mode to periodic\n- Set the TMICT to 0\n- Set the mode bits to 11 (neither periodic, nor one shot, nor tsc deadline)\n- Set the TMICT to non-zero.\nThen the lapic_timer.period will be 0, but the TMICT will not be. If the\nguest then reads from the TMCCT then the host will perform a divide by 0.\n\nThis patch ensures that if the lapic_timer.period is 0, then the division\ndoes not occur.\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "338c7dbadd2671189cec7faf64c84d01071b3f96", "tree": "f8aa565a09db010f6a5693051197bcb75073108a", "parents": [ "2e7babfa892a55588467ef03b545002e32f31528" ], "author": { "name": "Andy Honig", "email": "ahonig@google.com", "time": "Mon Nov 18 16:09:22 2013 -0800" }, "committer": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Dec 12 22:39:33 2013 +0100" }, "message": "KVM: Improve create VCPU parameter (CVE-2013-4587)\n\nIn multiple functions the vcpu_id is used as an offset into a bitfield. Ag\nmalicious user could specify a vcpu_id greater than 255 in order to set or\nclear bits in kernel memory. This could be used to elevate priveges in the\nkernel. This patch verifies that the vcpu_id provided is less than 255.\nThe api documentation already specifies that the vcpu_id must be less than\nmax_vcpus, but this is currently not checked.\n\nReported-by: Andrew Honig \u003cahonig@google.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n" }, { "commit": "2212a8529eb06c559256f0cee41c1f14890d54d3", "tree": "7c30ba6e96646702703d1aecddb28cb4c4c302a1", "parents": [ "374b105797c3d4f29c685f3be535c35f5689b30e" ], "author": { "name": "Elie De Brauwer", "email": "eliedebrauwer@gmail.com", "time": "Mon Dec 09 19:48:28 2013 +0100" }, "committer": { "name": "Wolfram Sang", "email": "wsa@the-dreams.de", "time": "Thu Dec 12 22:39:28 2013 +0100" }, "message": "i2c: mux: Inherit retry count and timeout from parent for muxed bus\n\nIf a muxed i2c bus gets created the default retry count and\ntimeout of the muxed bus is zero. Hence it it possible that you\nend up with a situation where the parent controller sets a default\nretry count and timeout which gets applied and used while the muxed\nbus (using the same controller) has a default retry count of zero\nand a default timeout of 1s (set in i2c_add_adapter()). This can be\nsolved by initializing the retry count and timeout of the muxed\nbus with the values used by the the parent at creation time.\n\nSigned-off-by: Elie De Brauwer \u003celiedebrauwer@gmail.com\u003e\nSigned-off-by: Wolfram Sang \u003cwsa@the-dreams.de\u003e\n" }, { "commit": "2208f6513accb06ccb0f7b6f9e97989cd865585a", "tree": "03514487e4fde23e1cdfe27717d610fad393035b", "parents": [ "ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971", "3690739b013504d33fe9348dd45f6b126aa370fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:14:25 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:14:25 2013 -0800" }, "message": "Merge tag \u0027sound-3.13-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"Still a slightly high amount of changes than wished, but they are all\n good regression and/or device-specific fixes. Majority of commits are\n for HD-audio, an HDMI ctl index fix that hits old graphics boards,\n regression fixes for AD codecs and a few quirks.\n\n Other than that, two major fixes are included: a 64bit ABI fix for\n compress offload, and 64bit dma_addr_t truncation fix, which had hit\n on PAE kernels\"\n\n* tag \u0027sound-3.13-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Add static DAC/pin mapping for AD1986A codec\n ALSA: hda - One more Dell headset detection quirk\n ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices\n ALSA: hda - Mute all aamix inputs as default\n ALSA: compress: Fix 64bit ABI incompatibility\n ALSA: memalloc.h - fix wrong truncation of dma_addr_t\n ALSA: hda - Another Dell headset detection quirk\n ALSA: hda - A Dell headset detection quirk\n ALSA: hda - Remove quirk for Dell Vostro 131\n ALSA: usb-audio: fix uninitialized variable compile warning\n ALSA: hda - fix mic issues on Acer Aspire E-572\n" }, { "commit": "ea4ebd1cb093c8ec5d7f4bf9070dc444184c3971", "tree": "b1a3fd2e9dd3846d5d30c5e75c79db1ad31c0d80", "parents": [ "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa", "241ecf1ce528804d5ffc8fb386ff2a01b1f937c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:13:47 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 13:13:47 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input fixes from Dmitry Torokhov:\n \"A fix for recent sysfs breakage in serio subsystem plus a fixup to\n adxl34x driver\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT\n Input: serio - fix sysfs layout\n" }, { "commit": "a3314f3d40215349ab2427800c1e10676691389f", "tree": "d607b78376eed9c9a82cebb91282f66c023e02aa", "parents": [ "a0a9663dd2146d54339237764e1bfc60e8a39328" ], "author": { "name": "Paul Durrant", "email": "Paul.Durrant@citrix.com", "time": "Thu Dec 12 14:20:13 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 12 15:47:18 2013 -0500" }, "message": "xen-netback: fix gso_prefix check\n\nThere is a mistake in checking the gso_prefix mask when passing large\npackets to a guest. The wrong shift is applied to the bit - the raw skb\ngso type is used rather then the translated one. This leads to large packets\nbeing handed to the guest without the GSO metadata. This patch fixes the\ncheck.\n\nThe mistake manifested as errors whilst running Microsoft HCK large packet\noffload tests between a pair of Windows 8 VMs. I have verified this patch\nfixes those errors.\n\nSigned-off-by: Paul Durrant \u003cpaul.durrant@citrix.com\u003e\nCc: Wei Liu \u003cwei.liu2@citrix.com\u003e\nCc: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0a9663dd2146d54339237764e1bfc60e8a39328", "tree": "ba691d621e527466f5a2a3e47135f35948b167a1", "parents": [ "f280e89ad6a29d9969cb6b216123c798e1689bc4" ], "author": { "name": "Sebastian Siewior", "email": "bigeasy@linutronix.de", "time": "Thu Dec 12 10:15:59 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 12 15:35:09 2013 -0500" }, "message": "net: make neigh_priv_len in struct net_device 16bit instead of 8bit\n\nneigh_priv_len is defined as u8. With all debug enabled struct\nipoib_neigh has 200 bytes. The largest part is sk_buff_head with 96\nbytes and here the spinlock with 72 bytes.\nThe size value still fits in this u8 leaving some room for more.\n\nOn -RT struct ipoib_neigh put on weight and has 392 bytes. The main\nreason is sk_buff_head with 288 and the fatty here is spinlock with 192\nbytes. This does no longer fit into into neigh_priv_len and gcc\ncomplains.\n\nThis patch changes neigh_priv_len from being 8bit to 16bit. Since the\nfollowing element (dev_id) is 16bit followed by a spinlock which is\naligned, the struct remains with a total size of 3200 (allmodconfig) /\n2048 (with as much debug off as possible) bytes on x86-64.\nOn x86-32 the struct is 1856 (allmodconfig) / 1216 (with as much debug\noff as possible) bytes long. The numbers were gained with and without\nthe patch to prove that this change does not increase the size of the\nstruct.\n\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "846f29a6afb5f272ee1c8b2a57c5730ab31eabaa", "tree": "5c0028e45bccaf4af65e9996faf59964e5914593", "parents": [ "86b581f6f18e5cfe420e94ce72e8a44d05cc23b1", "64c832a4f79542809d6c10b8ec6225ff8b76092e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:06:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:06:13 2013 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media fixes from Mauro Carvalho Chehab:\n \"A dvb core deadlock fix, a couple videobuf2 fixes an a series of media\n driver fixes\"\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (30 commits)\n [media] videobuf2-dma-sg: fix possible memory leak\n [media] vb2: regression fix: always set length field.\n [media] mt9p031: Include linux/of.h header\n [media] rtl2830: add parent for I2C adapter\n [media] media: marvell-ccic: use devm to release clk\n [media] ths7303: Declare as static a private function\n [media] em28xx-video: Swap release order to avoid lock nesting\n [media] usbtv: Add support for PAL video source\n [media] media_tree: Fix spelling errors\n [media] videobuf2: Add support for file access mode flags for DMABUF exporting\n [media] radio-shark2: Mark shark_resume_leds() inline to kill compiler warning\n [media] radio-shark: Mark shark_resume_leds() inline to kill compiler warning\n [media] af9035: unlock on error in af9035_i2c_master_xfer()\n [media] af9033: fix broken I2C\n [media] v4l: omap3isp: Don\u0027t check for missing get_fmt op on remote subdev\n [media] af9035: fix broken I2C and USB I/O\n [media] wm8775: fix broken audio routing\n [media] marvell-ccic: drop resource free in driver remove\n [media] tef6862/radio-tea5764: actually assign clamp result\n [media] cx231xx: use after free on error path in probe\n ...\n" }, { "commit": "86b581f6f18e5cfe420e94ce72e8a44d05cc23b1", "tree": "91856f7973addbf1d559fd71b859b755d8038f82", "parents": [ "c8469441c4415b9738327f64c74a5b76bf465815", "efabcc2123f0ed47870033b8d6fc73b50d76d635" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:05:19 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:05:19 2013 -0800" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon fix from Guenter Roeck:\n \"Fix HIH-6130 driver to work with BeagleBone\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK\n" }, { "commit": "c8469441c4415b9738327f64c74a5b76bf465815", "tree": "bb99933464ccbcdef528d21b4c2ee843da56d98f", "parents": [ "11ec50caedb56e3a87715edeff6a1852e6ae5416", "3806b45ba4655147a011df03242cc197ab986c43" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:03:57 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 11:03:57 2013 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\nPull hwmon fixes from Jean Delvare.\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: Prevent some divide by zeros in FAN_TO_REG()\n hwmon: (w83l768ng) Fix fan speed control range\n hwmon: (w83l786ng) Fix fan speed control mode setting and reporting\n hwmon: (lm90) Unregister hwmon device if interrupt setup fails\n" }, { "commit": "f280e89ad6a29d9969cb6b216123c798e1689bc4", "tree": "484f1d67dffdf05e99663930f634160ce7b98f5d", "parents": [ "d9601a36ffdb5c142697bef1228afb5ba4ee4003" ], "author": { "name": "Mugunthan V N", "email": "mugunthanvnm@ti.com", "time": "Wed Dec 11 22:09:05 2013 -0600" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 12 13:46:57 2013 -0500" }, "message": "drivers: net: cpsw: fix for cpsw crash when build as modules\n\nWhen CPSW and Davinci MDIO are build as modules, CPSW crashes when\naccessing CPSW registers in CPSW probe. The same is working in built-in\nas the CPSW clocks are enabled in Davindi MDIO probe, SO Enabling the\nclocks before accessing the version register and moving out the other\nregister access to cpsw device open.\n\nSigned-off-by: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11ec50caedb56e3a87715edeff6a1852e6ae5416", "tree": "a94b6a3d2456800197d67effa2677d426d00d31d", "parents": [ "a5c21dcefa1c3d759457a604b3cfc4af29c8713f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Dec 12 17:40:22 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:39:01 2013 -0800" }, "message": "word-at-a-time: provide generic big-endian zero_bytemask implementation\n\nWhilst architectures may be able to do better than this (which they can,\nby simply defining their own macro), this is a generic stab at a\nzero_bytemask implementation for the asm-generic, big-endian\nword-at-a-time implementation.\n\nOn arm64, a clz instruction is used to implement the fls efficiently.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5c21dcefa1c3d759457a604b3cfc4af29c8713f", "tree": "6832dfcb836f8d5043ba70f17a0ea9c2c428bc4d", "parents": [ "319720f534d88039615bceb88d4bc094a7cd4ce9" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Dec 12 17:40:21 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:39:01 2013 -0800" }, "message": "dcache: allow word-at-a-time name hashing with big-endian CPUs\n\nWhen explicitly hashing the end of a string with the word-at-a-time\ninterface, we have to be careful which end of the word we pick up.\n\nOn big-endian CPUs, the upper-bits will contain the data we\u0027re after, so\nensure we generate our masks accordingly (and avoid hashing whatever\nrandom junk may have been sitting after the string).\n\nThis patch adds a new dcache helper, bytemask_from_count, which creates\na mask appropriate for the CPU endianness.\n\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9601a36ffdb5c142697bef1228afb5ba4ee4003", "tree": "0ab7a3fba3e2c7f238a6f33d5eeaf9d360ddd37d", "parents": [ "10574059ce0451c6572c85329c772aa15085f8eb" ], "author": { "name": "Paul Durrant", "email": "Paul.Durrant@citrix.com", "time": "Wed Dec 11 10:57:16 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 12 13:35:38 2013 -0500" }, "message": "xen-netback: napi: don\u0027t prematurely request a tx event\n\nThis patch changes the RING_FINAL_CHECK_FOR_REQUESTS in\nxenvif_build_tx_gops to a check for RING_HAS_UNCONSUMED_REQUESTS as the\nformer call has the side effect of advancing the ring event pointer and\ntherefore inviting another interrupt from the frontend before the napi\npoll has actually finished, thereby defeating the point of napi.\n\nThe event pointer is updated by RING_FINAL_CHECK_FOR_REQUESTS in\nxenvif_poll, the napi poll function, if the work done is less than the\nbudget i.e. when actually transitioning back to interrupt mode.\n\nReported-by: Malcolm Crossley \u003cmalcolm.crossley@citrix.com\u003e\nSigned-off-by: Paul Durrant \u003cpaul.durrant@citrix.com\u003e\nCc: Wei Liu \u003cwei.liu2@citrix.com\u003e\nCc: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10574059ce0451c6572c85329c772aa15085f8eb", "tree": "292a2a641e2d6d3ec960c72ef28310c60549d987", "parents": [ "d55d282e6af88120ad90e93a88f70e3116dc0e3d" ], "author": { "name": "Paul Durrant", "email": "Paul.Durrant@citrix.com", "time": "Wed Dec 11 10:57:15 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 12 13:35:38 2013 -0500" }, "message": "xen-netback: napi: fix abuse of budget\n\nnetback seems to be somewhat confused about the napi budget parameter. The\nparameter is supposed to limit the number of skbs processed in each poll,\nbut netback has this confused with grant operations.\n\nThis patch fixes that, properly limiting the work done in each poll. Note\nthat this limit makes sure we do not process any more data from the shared\nring than we intend to pass back from the poll. This is important to\nprevent tx_queue potentially growing without bound.\n\nSigned-off-by: Paul Durrant \u003cpaul.durrant@citrix.com\u003e\nCc: Wei Liu \u003cwei.liu2@citrix.com\u003e\nCc: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "319720f534d88039615bceb88d4bc094a7cd4ce9", "tree": "85f6a53e2926de546f02c3f60acf7303984121b7", "parents": [ "5dec682c7f33a765a5eb764cc18b1d02b17cd762", "239a87020b263fe7e70adc5803cb157955023d3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:20:58 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:20:58 2013 -0800" }, "message": "Merge tag \u0027iommu-fixes-for-v3.13-rc4\u0027 of git://github.com/awilliam/linux-vfio\n\nPull iommu fixes from Alex Williamson:\n \"arm/smmu driver updates via Will Deacon fixing locking around page\n table walks and a couple other issues\"\n\n* tag \u0027iommu-fixes-for-v3.13-rc4\u0027 of git://github.com/awilliam/linux-vfio:\n iommu/arm-smmu: fix error return code in arm_smmu_device_dt_probe()\n iommu/arm-smmu: remove potential NULL dereference on mapping path\n iommu/arm-smmu: use mutex instead of spinlock for locking page tables\n" }, { "commit": "5dec682c7f33a765a5eb764cc18b1d02b17cd762", "tree": "fe75d0d632ac4343dcff1335dbccc58dd6bbcdf0", "parents": [ "48a2f0b2728c88b18829e191eafdde60290aa64f", "62226983da070f7e51068ec2e3a4da34672964c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:15:24 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:15:24 2013 -0800" }, "message": "Merge tag \u0027keys-devel-20131210\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs\n\nPull misc keyrings fixes from David Howells:\n \"These break down into five sets:\n\n - A patch to error handling in the big_key type for huge payloads.\n If the payload is larger than the \"low limit\" and the backing store\n allocation fails, then big_key_instantiate() doesn\u0027t clear the\n payload pointers in the key, assuming them to have been previously\n cleared - but only one of them is.\n\n Unfortunately, the garbage collector still calls big_key_destroy()\n when sees one of the pointers with a weird value in it (and not\n NULL) which it then tries to clean up.\n\n - Three patches to fix the keyring type:\n\n * A patch to fix the hash function to correctly divide keyrings off\n from keys in the topology of the tree inside the associative\n array. This is only a problem if searching through nested\n keyrings - and only if the hash function incorrectly puts the a\n keyring outside of the 0 branch of the root node.\n\n * A patch to fix keyrings\u0027 use of the associative array. The\n __key_link_begin() function initially passes a NULL key pointer\n to assoc_array_insert() on the basis that it\u0027s holding a place in\n the tree whilst it does more allocation and stuff.\n\n This is only a problem when a node contains 16 keys that match at\n that level and we want to add an also matching 17th. This should\n easily be manufactured with a keyring full of keyrings (without\n chucking any other sort of key into the mix) - except for (a)\n above which makes it on average adding the 65th keyring.\n\n * A patch to fix searching down through nested keyrings, where any\n keyring in the set has more than 16 keyrings and none of the\n first keyrings we look through has a match (before the tree\n iteration needs to step to a more distal node).\n\n Test in keyutils test suite:\n\n http://git.kernel.org/cgit/linux/kernel/git/dhowells/keyutils.git/commit/?id\u003d8b4ae963ed92523aea18dfbb8cab3f4979e13bd1\n\n - A patch to fix the big_key type\u0027s use of a shmem file as its\n backing store causing audit messages and LSM check failures. This\n is done by setting S_PRIVATE on the file to avoid LSM checks on the\n file (access to the shmem file goes through the keyctl() interface\n and so is gated by the LSM that way).\n\n This isn\u0027t normally a problem if a key is used by the context that\n generated it - and it\u0027s currently only used by libkrb5.\n\n Test in keyutils test suite:\n\n http://git.kernel.org/cgit/linux/kernel/git/dhowells/keyutils.git/commit/?id\u003dd9a53cbab42c293962f2f78f7190253fc73bd32e\n\n - A patch to add a generated file to .gitignore.\n\n - A patch to fix the alignment of the system certificate data such\n that it it works on s390. As I understand it, on the S390 arch,\n symbols must be 2-byte aligned because loading the address discards\n the least-significant bit\"\n\n* tag \u0027keys-devel-20131210\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:\n KEYS: correct alignment of system_certificate_list content in assembly file\n Ignore generated file kernel/x509_certificate_list\n security: shmem: implement kernel private shmem inodes\n KEYS: Fix searching of nested keyrings\n KEYS: Fix multiple key add into associative array\n KEYS: Fix the keyring hash function\n KEYS: Pre-clear struct key on allocation\n" }, { "commit": "48a2f0b2728c88b18829e191eafdde60290aa64f", "tree": "7d8095fbb0afde5a695891b7b141533dd111c780", "parents": [ "5cdec2d833748fbd27d3682f7209225c504c79c5", "f94c44573e7c22860e2c3dfe349c45f72ba35ad3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:14:13 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 10:14:13 2013 -0800" }, "message": "Merge tag \u0027xfs-for-linus-v3.13-rc4\u0027 of git://oss.sgi.com/xfs/xfs\n\nPull xfs bugfixes from Ben Myers:\n\n - fix for buffer overrun in agfl with growfs on v4 superblock\n\n - return EINVAL if requested discard length is less than a block\n\n - fix possible memory corruption in xfs_attrlist_by_handle()\n\n* tag \u0027xfs-for-linus-v3.13-rc4\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: growfs overruns AGFL buffer on V4 filesystems\n xfs: don\u0027t perform discard if the given range length is less than block size\n xfs: underflow bug in xfs_attrlist_by_handle()\n" }, { "commit": "5cdec2d833748fbd27d3682f7209225c504c79c5", "tree": "361baa6aa742bf8f712331c59db9c1b755f0ec35", "parents": [ "f12d5bfceb7e1f9051563381ec047f7f13956c3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:53:51 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:53:51 2013 -0800" }, "message": "futex: move user address verification up to common code\n\nWhen debugging the read-only hugepage case, I was confused by the fact\nthat get_futex_key() did an access_ok() only for the non-shared futex\ncase, since the user address checking really isn\u0027t in any way specific\nto the private key handling.\n\nNow, it turns out that the shared key handling does effectively do the\nequivalent checks inside get_user_pages_fast() (it doesn\u0027t actually\ncheck the address range on x86, but does check the page protections for\nbeing a user page). So it wasn\u0027t actually a bug, but the fact that we\ntreat the address differently for private and shared futexes threw me\nfor a loop.\n\nJust move the check up, so that it gets done for both cases. Also, use\nthe \u0027rw\u0027 parameter for the type, even if it doesn\u0027t actually matter any\nmore (it\u0027s a historical artifact of the old racy i386 \"page faults from\nkernel space don\u0027t check write protections\").\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f12d5bfceb7e1f9051563381ec047f7f13956c3c", "tree": "5b4eba241978619d763e5ba6209e111299a22bd3", "parents": [ "9538e10086bd1301fe915683b1ba0a1de66d7483" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:38:42 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 12 09:38:42 2013 -0800" }, "message": "futex: fix handling of read-only-mapped hugepages\n\nThe hugepage code had the exact same bug that regular pages had in\ncommit 7485d0d3758e (\"futexes: Remove rw parameter from\nget_futex_key()\").\n\nThe regular page case was fixed by commit 9ea71503a8ed (\"futex: Fix\nregression with read only mappings\"), but the transparent hugepage case\n(added in a5b338f2b0b1: \"thp: update futex compound knowledge\") case\nremained broken.\n\nFound by Dave Jones and his trinity tool.\n\nReported-and-tested-by: Dave Jones \u003cdavej@fedoraproject.org\u003e\nCc: stable@kernel.org # v2.6.38+\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Darren Hart \u003cdvhart@linux.intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "700ff4f095d78af0998953e922e041d75254518b", "tree": "62a52b7a6f5f2eaa91809a0cc5abeac44c4c3f4e", "parents": [ "467bb1d27c0b783b73e6349304c0d90b5b4f431b" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Jan 10 03:57:25 2013 -0500" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:13:02 2013 -0800" }, "message": "Btrfs: fix access_ok() check in btrfs_ioctl_send()\n\nThe closing parenthesis is in the wrong place. We want to check\n\"sizeof(*arg-\u003eclone_sources) * arg-\u003eclone_sources_count\" instead of\n\"sizeof(*arg-\u003eclone_sources * arg-\u003eclone_sources_count)\".\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\ncc: stable@vger.kernel.org\n" }, { "commit": "467bb1d27c0b783b73e6349304c0d90b5b4f431b", "tree": "0c425a7f15c52b005cf3265af284cec5597d0a78", "parents": [ "6646374863508e24da7c7d21527f8dadc8687ff9" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Wed Dec 11 19:29:52 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:51 2013 -0800" }, "message": "Btrfs: make sure we cleanup all reloc roots if error happens\n\nI hit an oops when merging reloc roots fails, the reason is that\nnew reloc roots may be added and we should make sure we cleanup\nall reloc roots.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "6646374863508e24da7c7d21527f8dadc8687ff9", "tree": "200c5355b9da16ee192d32fa37ea45d0154edd3f", "parents": [ "c974c4642fee8c58239c7753d0bf548b23799923" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Tue Dec 10 00:14:34 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:36 2013 -0800" }, "message": "Btrfs: skip building backref tree for uuid and quota tree when doing balance relocation\n\nQuota tree and UUID Tree is only cowed, they can not be snapshoted.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "c974c4642fee8c58239c7753d0bf548b23799923", "tree": "a671a832030045d977a38ec25a84044fcbca5d1e", "parents": [ "639eefc8afd1b8b839b1fd5605378d869d3612a1" ], "author": { "name": "Wang Shilong", "email": "wangsl.fnst@cn.fujitsu.com", "time": "Wed Dec 11 19:29:51 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:12:20 2013 -0800" }, "message": "Btrfs: fix an oops when doing balance relocation\n\nI hit an oops when inserting reloc root into @reloc_root_tree(it can be\neasily triggered when forcing cow for relocation root)\n\n[ 866.494539] [\u003cffffffffa0499579\u003e] btrfs_init_reloc_root+0x79/0xb0 [btrfs]\n[ 866.495321] [\u003cffffffffa044c240\u003e] record_root_in_trans+0xb0/0x110 [btrfs]\n[ 866.496109] [\u003cffffffffa044d758\u003e] btrfs_record_root_in_trans+0x48/0x80 [btrfs]\n[ 866.496908] [\u003cffffffffa0494da8\u003e] select_reloc_root+0xa8/0x210 [btrfs]\n[ 866.497703] [\u003cffffffffa0495c8a\u003e] do_relocation+0x16a/0x540 [btrfs]\n\nThis is because reloc root inserted into @reloc_root_tree is not within one\ntransaction,reloc root may be cowed and root block bytenr will be reused then\noops happens.We should update reloc root in @reloc_root_tree when cow reloc\nroot node, fix it.\n\nSigned-off-by: Wang Shilong \u003cwangsl.fnst@cn.fujitsu.com\u003e\nReviewed-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "639eefc8afd1b8b839b1fd5605378d869d3612a1", "tree": "a22b52dc25388f67129fb2bc83248a426cc46bcf", "parents": [ "e43f998e47bae27e37e159915625e8d4b130153b" ], "author": { "name": "Filipe David Borba Manana", "email": "fdmanana@gmail.com", "time": "Sun Dec 08 00:26:29 2013 +0000" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:58 2013 -0800" }, "message": "Btrfs: don\u0027t miss skinny extent items on delayed ref head contention\n\nCurrently extent-tree.c:btrfs_lookup_extent_info() can miss the lookup\nof skinny extent items. This can happen when the execution flow is the\nfollowing:\n\n* We do an extent tree lookup and fail to find a skinny extent item;\n\n* As a result, we attempt to see if a non-skinny extent item exists,\n either by looking at previous item in the leaf or by doing another\n full extent tree search;\n\n* We have a transaction and then we check for a matching delayed ref\n head in the transaction\u0027s delayed refs rbtree;\n\n* We find such delayed ref head and then we try to lock it with a\n call to mutex_trylock();\n\n* The lock was contended so we jump to the label \"again\", which repeats\n the extent tree search but for a non-skinny extent item, because we set\n previously metadata variable to 0 and the search key to look for a\n non-skinny extent-item;\n\n* After the jump (and after releasing the transaction\u0027s delayed refs\n lock), a skinny extent item might have been added to the extent tree\n but we will miss it because metadata is set to 0 and the search key\n is set for a non-skinny extent-item.\n\nThe fix here is to not reset metadata to 0 and to jump to the initial search\nkey setup if the delayed ref head is contended, instead of jumping directly\nto the extent tree search label (\"again\").\n\nThis issue was found while investigating the issue reported at Bugzilla 64961.\n\nDavid Sterba suspected this function was missing extent items, and that\nthis could be caused by the last change to this function, which was made\nin the following patch:\n\n [PATCH] Btrfs: optimize btrfs_lookup_extent_info()\n (commit 74be9510876a66ad9826613ac8a526d26f9e7f01)\n\nBut in fact this issue already existed before, because after failing to find\na skinny extent item, the code set the search key for a non-skinny extent\nitem, and on contention of a matching delayed ref head it would not search\nthe extent tree for a skinny extent item anymore.\n\nSigned-off-by: Filipe David Borba Manana \u003cfdmanana@gmail.com\u003e\nReviewed-by: Liu Bo \u003cbo.li.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "e43f998e47bae27e37e159915625e8d4b130153b", "tree": "03a1788ff0601554fca2c0fce2476548c80c78bd", "parents": [ "a7e252af5a819eb71c9494e62b2bfca982e92f84" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Fri Dec 06 17:51:32 2013 +0100" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:38 2013 -0800" }, "message": "btrfs: call mnt_drop_write after interrupted subvol deletion\n\nIf btrfs_ioctl_snap_destroy blocks on the mutex and the process is\nkilled, mnt_write count is unbalanced and leads to unmountable\nfilesystem.\n\nCC: stable@vger.kernel.org\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "a7e252af5a819eb71c9494e62b2bfca982e92f84", "tree": "73554777e84f56b52adbfe58a52cb6b370ecbcdd", "parents": [ "c0778e2534b81be6b85b5ee07c0e15ff774f7136" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Fri Nov 22 18:47:59 2013 +0800" }, "committer": { "name": "Chris Mason", "email": "clm@fb.com", "time": "Thu Dec 12 07:11:19 2013 -0800" }, "message": "Btrfs: don\u0027t clear the default compression type\n\nWe met a oops caused by the wrong compression type:\n[ 556.512356] BUG: unable to handle kernel NULL pointer dereference at (null)\n[ 556.512370] IP: [\u003cffffffff811dbaa0\u003e] __list_del_entry+0x1/0x98\n[SNIP]\n[ 556.512490] [\u003cffffffff811dbb44\u003e] ? list_del+0xd/0x2b\n[ 556.512539] [\u003cffffffffa05dd5ce\u003e] find_workspace+0x97/0x175 [btrfs]\n[ 556.512546] [\u003cffffffff813c14b5\u003e] ? _raw_spin_lock+0xe/0x10\n[ 556.512576] [\u003cffffffffa05de276\u003e] btrfs_compress_pages+0x2d/0xa2 [btrfs]\n[ 556.512601] [\u003cffffffffa05af060\u003e] compress_file_range.constprop.54+0x1f2/0x4e8 [btrfs]\n[ 556.512627] [\u003cffffffffa05af388\u003e] async_cow_start+0x32/0x4d [btrfs]\n[ 556.512655] [\u003cffffffffa05cc7a1\u003e] worker_loop+0x144/0x4c3 [btrfs]\n[ 556.512661] [\u003cffffffff81059404\u003e] ? finish_task_switch+0x80/0xb8\n[ 556.512689] [\u003cffffffffa05cc65d\u003e] ? btrfs_queue_worker+0x244/0x244 [btrfs]\n[ 556.512695] [\u003cffffffff8104fa4e\u003e] kthread+0x8d/0x95\n[ 556.512699] [\u003cffffffff81050000\u003e] ? bit_waitqueue+0x34/0x7d\n[ 556.512704] [\u003cffffffff8104f9c1\u003e] ? __kthread_parkme+0x65/0x65\n[ 556.512709] [\u003cffffffff813c7eec\u003e] ret_from_fork+0x7c/0xb0\n[ 556.512713] [\u003cffffffff8104f9c1\u003e] ? __kthread_parkme+0x65/0x65\n\nSteps to reproduce:\n # mkfs.btrfs -f \u003cdev\u003e\n # mount -o nodatacow \u003cdev\u003e \u003cmnt\u003e\n # touch \u003cmnt\u003e/\u003cfile\u003e\n # chattr \u003dc \u003cmnt\u003e/\u003cfile\u003e\n # dd if\u003d/dev/zero of\u003d\u003cmnt\u003e/\u003cfile\u003e bs\u003d1M count\u003d10\n\nIt is because we cleared the default compression type when setting the\nnodatacow. In fact, we needn\u0027t do it because we have used COMPRESS flag to\nindicate if we need compressed the file data or not, needn\u0027t use the\nvariant -- compress_type -- in btrfs_info to do the same thing, and just\nuse it to hold the default compression type. Or we would get a wrong compress\ntype for a file whose own compress flag is set but the compress flag of its\nfilesystem is not set.\n\nReported-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nReviewed-by: Liu Bo \u003cbo.li.liu@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cclm@fb.com\u003e\n" }, { "commit": "3806b45ba4655147a011df03242cc197ab986c43", "tree": "6f16fdaab2125caf51cd1c9b2fb9cd9e1eb3674f", "parents": [ "33a7ab91d509fa33b4bcd3ce0038cc80298050da" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Thu Dec 12 08:05:33 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:33 2013 +0100" }, "message": "hwmon: Prevent some divide by zeros in FAN_TO_REG()\n\nThe \"rpm * div\" operations can overflow here, so this patch adds an\nupper limit to rpm to prevent that. Jean Delvare helped me with this\npatch.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Roger Lucas \u003cvt8231@hiddenengine.co.uk\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "33a7ab91d509fa33b4bcd3ce0038cc80298050da", "tree": "1fbadcdac126109d49f064b41e236f26dfc1dd5b", "parents": [ "cf7559bc053471f32373d71d04a9aa19e0b48d59" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (w83l768ng) Fix fan speed control range\n\nThe W83L786NG stores the fan speed on 4 bits while the sysfs interface\nuses a 0-255 range. Thus the driver should scale the user input down\nto map it to the device range, and scale up the value read from the\ndevice before presenting it to the user. The reserved register nibble\nshould be left unchanged.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@vger.kernel.org\nReviewed-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\n" }, { "commit": "cf7559bc053471f32373d71d04a9aa19e0b48d59", "tree": "6bec0dc9466ff39f33d0b98d3cc3a9fa677a07ae", "parents": [ "3d489ac07ed85c4908d864abb77ab1e6f94e0e4b" ], "author": { "name": "Brian Carnes", "email": "bmcarnes@gmail.com", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (w83l786ng) Fix fan speed control mode setting and reporting\n\nThe wrong mask is used, which causes some fan speed control modes\n(pwmX_enable) to be incorrectly reported, and some modes to be\nimpossible to set.\n\n[JD: add subject and description.]\n\nSigned-off-by: Brian Carnes \u003cbmcarnes@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "3d489ac07ed85c4908d864abb77ab1e6f94e0e4b", "tree": "378baa783a7cba54e125f2b1d5f13b277a7fd25c", "parents": [ "9538e10086bd1301fe915683b1ba0a1de66d7483" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Thu Dec 12 08:05:32 2013 +0100" }, "message": "hwmon: (lm90) Unregister hwmon device if interrupt setup fails\n\nCommit 109b1283fb (hwmon: (lm90) Add support to handle IRQ) introduced\ninterrupt support. Its error handling code fails to unregister the already\nregistered hwmon device.\n\nFixes: 109b1283fb532ac773a076748ffccf76a7067cab\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "d55d282e6af88120ad90e93a88f70e3116dc0e3d", "tree": "a0916db83806b2ec296ada4c9c62088a9813e4e5", "parents": [ "975022310233fb0f0193873d79a7b8438070fa82" ], "author": { "name": "Yang Yingliang", "email": "yangyingliang@huawei.com", "time": "Thu Dec 12 10:57:22 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 11 22:53:26 2013 -0500" }, "message": "sch_tbf: use do_div() for 64-bit divide\n\nIt\u0027s doing a 64-bit divide which is not supported\non 32-bit architectures in psched_ns_t2l(). The\ncorrect way to do this is to use do_div().\n\nIt\u0027s introduced by commit cc106e441a63\n(\"net: sched: tbf: fix the calculation of max_size\")\n\nReported-by: kbuild test robot \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Yang Yingliang \u003cyangyingliang@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "975022310233fb0f0193873d79a7b8438070fa82", "tree": "2658e9259ca6a53e07a25fe399a4f61d15093220", "parents": [ "a1bf1750871a6f242b0fdb174cc55d2c57e7ed66" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Dec 11 14:46:51 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 11 20:21:10 2013 -0500" }, "message": "udp: ipv4: must add synchronization in udp_sk_rx_dst_set()\n\nUnlike TCP, UDP input path does not hold the socket lock.\n\nBefore messing with sk-\u003esk_rx_dst, we must use a spinlock, otherwise\nmultiple cpus could leak a refcount.\n\nThis patch also takes care of renewing a stale dst entry.\n(When the sk-\u003esk_rx_dst would not be used by IP early demux)\n\nFixes: 421b3885bf6d (\"udp: ipv4: Add udp early demux\")\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Shawn Bohrer \u003csbohrer@rgmadvisors.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1bf1750871a6f242b0fdb174cc55d2c57e7ed66", "tree": "50e25e4c2dbdad73a9f6c3acb9ae94ed8d98bd9b", "parents": [ "9508fdde4d53f0d9e583e841ed08796d2f310be1" ], "author": { "name": "Philippe De Muyter", "email": "phdm@macqel.be", "time": "Wed Dec 11 23:50:52 2013 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 11 20:19:42 2013 -0500" }, "message": "net:fec: remove duplicate lines in comment about errata ERR006358\n\ncommit 031916568a1aa2ef1809f86d26f0bcfa215ff5c0 worked around\nerrata ERR006358, but comment contains duplicated lines, impairing\nthe readability. Remove them.\n\nSigned-off-by: Philippe De Muyter \u003cphdm@macqel.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f97dc8d4663abed96fa30e3ea4a1d4cfd1c4276", "tree": "58a6f0363e104122e4f4d9fe7d328c0cfce5960b", "parents": [ "378d0aee3b53bd8549b29dcc75f2bf47ee446e8f" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Tue Dec 10 19:37:22 2013 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:15:24 2013 -0800" }, "message": "ARM: sun6i: dt: Fix interrupt trigger types\n\nThe Allwinner A31 uses the ARM GIC as its internal interrupts controller. The\nGIC can work on several interrupt triggers, and the A31 was actually setting it\nup to use a rising edge as a trigger, while it was actually a level high\ntrigger, leading to some interrupts that would be completely ignored if the\nedge was missed.\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nAcked-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: stable@vger.kernel.org # 3.12+\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "378d0aee3b53bd8549b29dcc75f2bf47ee446e8f", "tree": "9bc3b735a436e12e01e6317e8dfdeb6594772acd", "parents": [ "2a82f95c3fb4904a473e205f3510b6e8884dd34d" ], "author": { "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com", "time": "Tue Dec 10 19:37:21 2013 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:15:21 2013 -0800" }, "message": "ARM: sun7i: dt: Fix interrupt trigger types\n\nThe Allwinner A20 uses the ARM GIC as its internal interrupts controller. The\nGIC can work on several interrupt triggers, and the A20 was actually setting it\nup to use a rising edge as a trigger, while it was actually a level high\ntrigger, leading to some interrupts that would be completely ignored if the\nedge was missed.\n\nSigned-off-by: Maxime Ripard \u003cmaxime.ripard@free-electrons.com\u003e\nAcked-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: stable@vger.kernel.org #3.12+\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2a82f95c3fb4904a473e205f3510b6e8884dd34d", "tree": "d45cfcd54896a0e805cbdb9b0ac1a65d6f04a85a", "parents": [ "b988ba1b4eba12008107b16fe3714293afdca47e" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Dec 10 22:19:21 2013 +0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:12:04 2013 -0800" }, "message": "MAINTAINERS: merge IMX6 entry into IMX\n\nI have been co-maintaining IMX sub-architecture for a couple of years,\nand collecting IMX sub-architecture patches rather than IMX6 only ones\nfor a few release cycles. It makes sense to officially add myself as\nthe co-maintainer for IMX sub-architecture now. Consequently, IMX6\nentry can just be merged into IMX.\n\nWhile at it, add a \u0027F:\u0027 entry for IMX DTS files.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b988ba1b4eba12008107b16fe3714293afdca47e", "tree": "cc5301213e4c9f7f711e49a33f65990015d5a9e8", "parents": [ "ff88b4724fde18056a4c539f7327389aec0f4c2d" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Dec 06 14:31:02 2013 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 17:09:11 2013 -0800" }, "message": "ARM: tegra: add missing break to fuse initialization code\n\nAdd a missing break to the switch in tegra_init_fuse() which determines\nwhich SoC the code is running on. This prevents the Tegra30+ fuse\nhandling code from running on Tegra20.\n\nFixes: 3bd1ae57f7bb (\"ARM: tegra: add fuses as device randomness\")\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "ff88b4724fde18056a4c539f7327389aec0f4c2d", "tree": "1b80c7a934808607e0050ec1a11f09b60de22e34", "parents": [ "506cac15ac86f204b83e3cfccde73eeb4e7c5f34" ], "author": { "name": "Sergei Ianovich", "email": "ynvich@gmail.com", "time": "Tue Dec 10 08:39:15 2013 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 16:35:16 2013 -0800" }, "message": "ARM: pxa: prevent PXA270 occasional reboot freezes\n\nErratum 71 of PXA270M Processor Family Specification Update\n(April 19, 2010) explains that watchdog reset time is just\n8us insead of 10ms in EMTS.\n\nIf SDRAM is not reset, it causes memory bus congestion and\nthe device hangs. We put SDRAM in selfresh mode before watchdog\nreset, removing potential freezes.\n\nWithout this patch PXA270-based ICP DAS LP-8x4x hangs after up to 40\nreboots. With this patch it has successfully rebooted 500 times.\n\nSigned-off-by: Sergei Ianovich \u003cynvich@gmail.com\u003e\nTested-by: Marek Vasut \u003cmarex@denx.de\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "506cac15ac86f204b83e3cfccde73eeb4e7c5f34", "tree": "873d391db017f24c96eb4409b17fa31f2547dc9f", "parents": [ "f5c33b070de3fdb8ad995b767ad0e3487cf0d242" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Sat Nov 16 16:47:50 2013 +0400" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Dec 11 16:34:32 2013 -0800" }, "message": "ARM: pxa: tosa: fix keys mapping\n\nWhen converting from tosa-keyboard driver to matrix keyboard, tosa keys\nreceived extra 1 column shift. Replace that with correct values to make\nkeyboard work again.\n\nFixes: f69a6548c9d5 (\u0027[ARM] pxa/tosa: make use of the matrix keypad driver\u0027)\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "67cc6885548427a4f7980b57e6ef32945f6d22b1", "tree": "106a25e19dac241730b0e348c015a10b3849e6bf", "parents": [ "374b105797c3d4f29c685f3be535c35f5689b30e", "6389075eff7dc1e6db39203c968394486c13b3e2", "236c427cbc990e03ec8b39ce8ee9220705daeff9" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Wed Dec 11 22:54:38 2013 +0000" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Wed Dec 11 22:54:38 2013 +0000" }, "message": "Merge remote-tracking branches \u0027regulator/fix/as3722\u0027 and \u0027regulator/fix/pfuze100\u0027 into regulator-linus\n" } ], "next": "9508fdde4d53f0d9e583e841ed08796d2f310be1" }