)]}' { "log": [ { "commit": "98b6ed0f2bf4abfb759206aa70690636372bdee7", "tree": "b9cf1610ae949db98916d0cedde5c409ecb6d341", "parents": [ "1a506e473576cdcb922d339aea76b67d0fe344f7", "578a1310f2592ba90c5674bca21c1dbd1adf3f0a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 19:24:37 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 19:24:37 2013 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Found via trinity:\n\n If you connect up an ipv6 socket to an ipv4 mapped address then an\n ipv6 one, sendmsg() can croak because ip6_sk_dst_check() assumes the\n route cached in the socket is an ipv6 one. In this case there is an\n ipv4 route attached, so it gets stomped on.\n\n Reported by Dave Jones and Hannes Frederic Sowa, fixed by Eric\n Dumazet.\n\n 2) AF_KEY notifications leak some kernel memory to userspace, fix from\n Mathias Krause.\n\n 3) DLCI calls __dev_get_by_name() without proper locking, and dlci_del\n doesn\u0027t validate that the device being deleted is actually a DLCI\n one. Fixes from Li Zefan.\n\n 4) Length check on bluetooth l2cap information responses is wrong, each\n response type has a different lenth, so we should make sure it\u0027s in\n a given range rather than enforce one single valid length. From\n Jaganath Kanakkassery.\n\n 5) Receive FIFO overflow is really easy to trigger in stress scenerios\n in the sh_eth driver, but the event isn\u0027t being handled properly at\n all. Specifically, the mask of error interrupts doesn\u0027t include the\n event so we never clear it, resulting in the driver becomming wedged\n processing an interrupt that never gets cleared.\n\n Fix from Sergei Shtylyov.\n\n 6) qlcnic sleeps while holding a spinlock, use mdelay() instead of\n msleep(). From Shahed Shaikh.\n\n 7) Missing curly braces causes SIP netfilter NAT module to always drop\n packets. Fix from Balazs Peter Odor.\n\n 8) ipt_ULOG in netfilter passes the wrong value to timer setup, causing\n the timer to dereference crap when it fires. Fix from Gao Feng.\n\n 9) Missing RCU protection around txq-\u003eaxq_acq traversal in\n ath_txq_schedule(). Fix from Felix Fietkau.\n\n10) Idle state transition test in ath9k_htc_config() is reversed, fix\n from Sujith Manoharan.\n\n11) IPV6 forwarding handles unicast Router Alert packets incorrectly.\n It tests the wrong option state. Previously opt-\u003era being non-zero\n indicated a router alert marking in the SKB, but now it\u0027s indicated\n by a bit in opt-\u003eflags. Fix from YOSHIFUJI Hideaki.\n\n12) SKB leak in GRE tunnel GSO handling, from Eric Dumazet.\n\n13) get_user_pages_fast() error handling in TUN and MACVTAP use the same\n local variable for the base index and the loop iterator for page\n traversal, oops! Fix from Michael S Tsirkin.\n\n14) ipv6_get_lladdr() can fail, and we must therefore check it\u0027s return\n value in inet6_set_iftoken(). For from Hannes Frederic Sowa.\n\n15) If you change an interface name and meanwhile can sneak in something\n that looks up the name (like SO_BINDTODEVICE or SIOCGIFNAME) we can\n deadlock with CONFIG_PREEMPT\u003dn. Fix this by providing a helper\n function that properly uses raw_seqcount_begin(). From Nicolas\n Schichan.\n\n16) Chain noise calibration test is inverted in iwlwifi, fix from\n Nikolay Martynov.\n\n17) Properly set TX iwlwifi descriptor flags for back requests. Fix\n from Emmanuel Grumbach.\n\n18) We can\u0027t assume skb_transport_header() is set in xt_TCPOPTSTRAP\n module, fix from Pablo Neira Ayuso.\n\n19) Some crummy APs don\u0027t provide the proper High Throughput info in\n association response frames. Add a workaround by assume we\u0027ll use\n whatever is in the beacon/probe. Fix from Johannes Berg.\n\n20) mac80211 call to rate_idx_match_mask() swaps two arguments (mask and\n channel width). Fix from Simon Wunderlich.\n\n21) xt_TCPMSS (like xt_TCPOPTSTRAP) must not try to handle fragmented\n frames. Fix from Phil Oester.\n\n22) Fix rate control regression causing iwlwifi/iwlegacy chips to use\n 1Mbit/s on pre-11n networks. From Moshe Benji and Stanslaw Gruszka.\n\n23) Disable brcmsmac power-save functions, they cause regressions. From\n Arend van Spriel.\n\n24) Enforce a sane minimum MTU in l2cap_build_cmd() otherwise we can\n easily crash. Fix from Anderson Lizardo.\n\n25) If a learning packet arrives during vxlan_stop() we crash, easily\n fixed by checking netif_running(). From Stephen Hemminger.\n\n26) Static vxlan FDB entries should not be migrated, also from Stephen.\n\n27) skb_clone() failures not handled in vxlan_xmit(), oops. Also from\n Stephen.\n\n28) Add minimal driver for AR816x/AR817x ethernet chips, from Johannes\n Berg.\n\n29) Fix regression in userspace VLAN acceleration control, added by the\n 802.1ad support changes. Fix from Fernando Luis Vazquez Cao.\n\n30) Interval selection for MLD queries in the bridging code was\n reversed. Fix from Linus Lüssing.\n\n31) ipv6\u0027s ndisc_send_redirect() erroneously writes to the packet we\n received not the packet we are building to send out. Fix from\n Matthias Schiffer.\n\n32) Don\u0027t free netdev before unregistering it, in usb_8dev can driver.\n From Marc Kleine-Budde.\n\n33) Fix nl80211 attribute buffer races, from Johannes Berg.\n\n34) Although netlink_diag.h is under uapi/ it isn\u0027t present in Kbuild.\n From Stephen Hemminger.\n\n35) Wrong address and family passed to MD5 key lookups in TCP, from\n Aydin Arik.\n\n36) phy_type attribute created by SFC driver should not be writable.\n From Ben Hutchings.\n\n37) Receive/Transmit queue allocations in pxa168_eth and mv643xx_eth\n should use kzalloc(). Otherwise if setup fails half-way, we\u0027ll\n dereference garbage when trying to teardown the rings. From Lubomir\n Rintel.\n\n38) Fix double-allocation of dst (resulting in unfreeable net device) in\n ipv6\u0027s init_loopback(). From Gao Feng.\n\n39) Fix fragmentation handling SKB leak in netfilter conntrack, we were\n freeing the wrong skb pointer. From Phil Oester.\n\n40) Don\u0027t report \"-1\" (SPEED_UNKNOWN) in bond_miimon_commit(), from\n Nikolay Aleksandrov.\n\n41) davinci_cpdma doesn\u0027t check for DMA mapping errors, letting the\n device scribble to random addresses. From Sebastian Siewior.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits)\n dlci: validate the net device in dlci_del()\n dlci: acquire rtnl_lock before calling __dev_get_by_name()\n af_key: fix info leaks in notify messages\n ipv6: ip6_sk_dst_check() must not assume ipv6 dst\n net: fix kernel deadlock with interface rename and netdev name retrieval.\n net/tg3: Avoid delay during MMIO access\n ipv6: check return value of ipv6_get_lladdr\n macvtap: fix recovery from gup errors\n tun: fix recovery from gup errors\n gre: fix a possible skb leak\n ipv6: Process unicast packet with Router Alert by checking flag in skb.\n ath9k_htc: Handle IDLE state transition properly\n ath9k: fix an RCU issue in calling ieee80211_get_tx_rates\n netfilter: ipt_ULOG: fix incorrect setting of ulog timer\n netfilter: ctnetlink: send event when conntrack label was modified\n netfilter: nf_nat_sip: fix mangling\n qlcnic: Do not sleep while holding spinlock\n drivers: net: cpsw: fix compilation error with cpsw driver\n tcp: doc : fix the syncookies default value\n sh_eth: fix misreporting of transmit abort\n ...\n" }, { "commit": "1a506e473576cdcb922d339aea76b67d0fe344f7", "tree": "a92289ddf4a7480dd75328321be9c421da74a959", "parents": [ "34a08681832f835269670b1d72e45f48b014375f", "426729dcc713b3d1ae802e314030e5556a62da53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 19:23:15 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 19:23:15 2013 -1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull i915 drm fixes from Dave Airlie:\n \"These should be the last two fixes for i915, one is for a fence leak\n killing X on some older GPUs, and one is a late regression partial\n revert for an swiotlb/xen/i915 interaction, Konrad has promised to\n figure out the proper answer, and this patch is the best thing to do\n at this stage to avoid regressing\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: make compact dma scatter lists creation work with SWIOTLB backend.\n drm/i915: Restore fences after resume and GPU resets\n" }, { "commit": "578a1310f2592ba90c5674bca21c1dbd1adf3f0a", "tree": "a8596ba1eeb67cfe8cd317822b83a76205b9ae6b", "parents": [ "11eb2645cbf38a08ae491bf6c602eea900ec0bb5" ], "author": { "name": "Zefan Li", "email": "lizefan@huawei.com", "time": "Wed Jun 26 15:31:58 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 15:36:42 2013 -0700" }, "message": "dlci: validate the net device in dlci_del()\n\nWe triggered an oops while running trinity with 3.4 kernel:\n\nBUG: unable to handle kernel paging request at 0000000100000d07\nIP: [\u003cffffffffa0109738\u003e] dlci_ioctl+0xd8/0x2d4 [dlci]\nPGD 640c0d067 PUD 0\nOops: 0000 [#1] PREEMPT SMP\nCPU 3\n...\nPid: 7302, comm: trinity-child3 Not tainted 3.4.24.09+ 40 Huawei Technologies Co., Ltd. Tecal RH2285 /BC11BTSA\nRIP: 0010:[\u003cffffffffa0109738\u003e] [\u003cffffffffa0109738\u003e] dlci_ioctl+0xd8/0x2d4 [dlci]\n...\nCall Trace:\n [\u003cffffffff8137c5c3\u003e] sock_ioctl+0x153/0x280\n [\u003cffffffff81195494\u003e] do_vfs_ioctl+0xa4/0x5e0\n [\u003cffffffff8118354a\u003e] ? fget_light+0x3ea/0x490\n [\u003cffffffff81195a1f\u003e] sys_ioctl+0x4f/0x80\n [\u003cffffffff81478b69\u003e] system_call_fastpath+0x16/0x1b\n...\n\nIt\u0027s because the net device is not a dlci device.\n\nReported-by: Li Jinyue \u003clijinyue@huawei.com\u003e\nSigned-off-by: Li Zefan \u003clizefan@huawei.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11eb2645cbf38a08ae491bf6c602eea900ec0bb5", "tree": "aa6e7b01ff83084985633ec26b5913fa363d2e93", "parents": [ "a5cc68f3d63306d0d288f31edfc2ae6ef8ecd887" ], "author": { "name": "Zefan Li", "email": "lizefan@huawei.com", "time": "Wed Jun 26 15:29:54 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 15:36:42 2013 -0700" }, "message": "dlci: acquire rtnl_lock before calling __dev_get_by_name()\n\nOtherwise the net device returned can be freed at anytime.\n\nSigned-off-by: Li Zefan \u003clizefan@huawei.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a5cc68f3d63306d0d288f31edfc2ae6ef8ecd887", "tree": "a126282a827b2ff1b25c3213a4a38aecc08d84fd", "parents": [ "a963a37d384d71ad43b3e9e79d68d42fbe0901f3" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Wed Jun 26 23:52:30 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 15:15:54 2013 -0700" }, "message": "af_key: fix info leaks in notify messages\n\nkey_notify_sa_flush() and key_notify_policy_flush() miss to initialize\nthe sadb_msg_reserved member of the broadcasted message and thereby\nleak 2 bytes of heap memory to listeners. Fix that.\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a963a37d384d71ad43b3e9e79d68d42fbe0901f3", "tree": "dbcde09eab1cfe02ef8bf35471e5c97ec489589c", "parents": [ "5dbe7c178d3f0a4634f088d9e729f1909b9ddcd1" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Jun 26 04:15:07 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 15:13:47 2013 -0700" }, "message": "ipv6: ip6_sk_dst_check() must not assume ipv6 dst\n\nIt\u0027s possible to use AF_INET6 sockets and to connect to an IPv4\ndestination. After this, socket dst cache is a pointer to a rtable,\nnot rt6_info.\n\nip6_sk_dst_check() should check the socket dst cache is IPv6, or else\nvarious corruptions/crashes can happen.\n\nDave Jones can reproduce immediate crash with\ntrinity -q -l off -n -c sendmsg -c connect\n\nWith help from Hannes Frederic Sowa\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nReported-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5dbe7c178d3f0a4634f088d9e729f1909b9ddcd1", "tree": "8945b6c5125b57cee5f36e903fc995e58664a639", "parents": [ "6d446ec32f169c6a5d9bc90684a8082a6cbe90f6" ], "author": { "name": "Nicolas Schichan", "email": "nschichan@freebox.fr", "time": "Wed Jun 26 17:23:42 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 13:42:54 2013 -0700" }, "message": "net: fix kernel deadlock with interface rename and netdev name retrieval.\n\nWhen the kernel (compiled with CONFIG_PREEMPT\u003dn) is performing the\nrename of a network interface, it can end up waiting for a workqueue\nto complete. If userland is able to invoke a SIOCGIFNAME ioctl or a\nSO_BINDTODEVICE getsockopt in between, the kernel will deadlock due to\nthe fact that read_secklock_begin() will spin forever waiting for the\nwriter process (the one doing the interface rename) to update the\ndevnet_rename_seq sequence.\n\nThis patch fixes the problem by adding a helper (netdev_get_name())\nand using it in the code handling the SIOCGIFNAME ioctl and\nSO_BINDTODEVICE setsockopt.\n\nThe netdev_get_name() helper uses raw_seqcount_begin() to avoid\nspinning forever, waiting for devnet_rename_seq-\u003esequence to become\neven. cond_resched() is used in the contended case, before retrying\nthe access to give the writer process a chance to finish.\n\nThe use of raw_seqcount_begin() will incur some unneeded work in the\nreader process in the contended case, but this is better than\ndeadlocking the system.\n\nSigned-off-by: Nicolas Schichan \u003cnschichan@freebox.fr\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34a08681832f835269670b1d72e45f48b014375f", "tree": "ad1c4ad1e993f8160bf38ee73cef425126f42403", "parents": [ "6b935ca29562181c8713f19553e6c7743d905fd7", "ec8da805c43a6cc0252dad0ff6e348c731e0b138" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 09:18:37 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 09:18:37 2013 -1000" }, "message": "Merge tag \u0027regulator-v3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator fix from Mark Brown:\n \"Fix module loading for tps6586x.\n\n A simple one liner fix to make module loading work for distros\n (product specific kernels tend to have things built in)\"\n\n* tag \u0027regulator-v3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n mfd: tps6586x: correct device name of the regulator cell\n" }, { "commit": "6b935ca29562181c8713f19553e6c7743d905fd7", "tree": "489f5223a5f2ed5e988bf568bb9d92ad3ec7e4c0", "parents": [ "687058aed4cdb95468cf019b5a35bf1bae17864c", "397eada946712b90e0620c378b366bcc6c98c9f6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 09:08:58 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 09:08:58 2013 -1000" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux\n\nPull GPIO regression fix from Grant Likely:\n \"It took a while to work out the correct solution to this regression.\n It is sorted now. This branch was constructed and tested by Tony.\n I\u0027ve verified that it builds and signed the tag\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux:\n gpio/omap: don\u0027t use linear domain mapping for OMAP1\n" }, { "commit": "687058aed4cdb95468cf019b5a35bf1bae17864c", "tree": "c2cb398631b03797da5be9c3aad8a4351661f633", "parents": [ "54faf77d065926adbcc2a49e6df3559094cc93ba", "45e00374db944b1c12987b501bcaa279b3e36d93" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:55:03 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:55:03 2013 -1000" }, "message": "Merge tag \u0027pm+acpi-3.10-late\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull late power management and ACPI fixes from Rafael Wysocki:\n \"Sorry about the timing of this, but ACPI-based docking stations with\n PCI devices on them and ATA bays would be hardly usable with 3.10\n without it. We\u0027ve been working on these fixes for the last couple of\n weeks and everyone involved appears to be reasonably comfortable with\n them now.\n\n The PM part is one fix for a cpufreq regression introduced recently\n\n - Fix for an ACPI dock regression introduced by the recent rework of\n the ACPI-based PCI hotplug code (acpiphp) that caused it to be\n initialized before the ACPI dock driver, which is incorrect (ACPI\n dock has to be initialized before acpiphp so that acpiphp can\n register PCI devices on docking stations with it for PCI hotplug on\n re-dock to work). From Jiang Liu.\n\n - Fix for PCI resources allocation in the ACPI-based PCI hotplug code\n (acpiphp) that makes it use the same PCI resources assignment rules\n during runtime hotplug that are used during boot (the BIOS\u0027 choices\n are now respected in both cases). This prevents PCI resource\n allocation failures during hotplug from happening in some cases.\n From Jiang Liu.\n\n - Fix for ordering and synchronization issues during hot-removal of\n PCI devices on docking stations. It makes the ACPI dock code carry\n out the PCI devices removal synchronously during undock instead of\n spawning a separate asynchronous work item to remove each of them\n without even bothering to wait for all those work items to\n complete. The hot-addition part is changed analogously.\n\n - Fix for a regression (introduced a few releases ago) that removed\n the code to register a hotplug notificaion handler for for ATA\n ports/devices inadvertently which prevented ATA bays hotplug from\n working. The missing code is added back with some improvements.\n From Aaron Lu.\n\n - Fix for a recent cpufreq regression causing a NULL pointer\n dereference to trigger in od_set_powersave_bias() in some\n situations from Jacob Shin\"\n\n* tag \u0027pm+acpi-3.10-late\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n cpufreq: fix NULL pointer deference at od_set_powersave_bias()\n libata-acpi: add back ACPI based hotplug functionality\n ACPI / dock / PCI: Synchronous handling of dock events for PCI devices\n PCI / ACPI: Use boot-time resource allocation rules during hotplug\n ACPI / dock: Initialize ACPI dock subsystem upfront\n" }, { "commit": "54faf77d065926adbcc2a49e6df3559094cc93ba", "tree": "b1dec3c63c0255d750b0ac491aa7dd04913039aa", "parents": [ "e3ff91143eb2a6eaaab4831c85a2837a95fbbea3", "c790b0ad23f427c7522ffed264706238c57c007e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:51:44 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:51:44 2013 -1000" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"Three small fixlets\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hw_breakpoint: Use cpu_possible_mask in {reserve,release}_bp_slot()\n hw_breakpoint: Fix cpu check in task_bp_pinned(cpu)\n kprobes: Fix arch_prepare_kprobe to handle copy insn failures\n" }, { "commit": "e3ff91143eb2a6eaaab4831c85a2837a95fbbea3", "tree": "5975c762d747e5c4d765a8a69de1c57fb58a14c1", "parents": [ "de6e1317f746fbc527a73976c58b4119e506ff7c", "3e0a07f8c401bb43e0f964c5f1285b2cb2028645" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:50:39 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:50:39 2013 -1000" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Another round of ARM fixes. Largest one is the second half of the\n PJ4B fix which was pushed in the previous -rc - this one was delayed\n because its original caused a build regression while trying to fix a\n regression!\n\n As ever, noMMU gets forgotten when fixing problems on MMU, so we have\n a noMMU fix for a previous fix included in this set.\n\n A couple of fixes from Lorenzo for problems with the ARM DT CPU code,\n and a one liner to remove the buggy \u0027wait for interrupt\u0027 with FA526\n cores\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7773/1: PJ4B: Add support for errata 4742\n ARM: 7772/1: Fix missing flush_kernel_dcache_page() for noMMU\n ARM: 7763/1: kernel: fix __cpu_logical_map default initialization\n ARM: 7762/1: kernel: fix arm_dt_init_cpu_maps() to skip non-cpu nodes\n ARM: 7760/1: cpu_fa526_do_idle: remove WFI\n" }, { "commit": "de6e1317f746fbc527a73976c58b4119e506ff7c", "tree": "45935c444918e3f0b8d544cb31e5ce3055969d53", "parents": [ "78750f1908869c3bfcbf2a1f1f00f078f2948271", "2884d4230867c8a46cf701214051e923301e7429" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:48:53 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:48:53 2013 -1000" }, "message": "Merge tag \u0027critical_fix_for_3.9\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe\n\nPull FCoE fix from Robert W Love:\n \"This patch fixes a critical bug that was introduced in 3.9 related to\n VLAN tagging FCoE frames\"\n\n* tag \u0027critical_fix_for_3.9\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rwlove/fcoe:\n fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs\n" }, { "commit": "78750f1908869c3bfcbf2a1f1f00f078f2948271", "tree": "8d5b2444f8966e696a8da772eca465995c111204", "parents": [ "1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82", "1617e40c1eeeeb857ff4b66acee20ed2acc1b5e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:47:46 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 26 08:47:46 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull Ceph fix from Sage Weil:\n \"This fixes another problem with using v2 images on 3.10 due to the\n order in which fields are read from the image header.\n\n Hopefully this is the last one\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fetch object order before using it\n" }, { "commit": "397eada946712b90e0620c378b366bcc6c98c9f6", "tree": "5a53948117108e915b462addc84afdae4d647768", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d" ], "author": { "name": "Javier Martinez Canillas", "email": "javier.martinez@collabora.co.uk", "time": "Mon Jun 24 17:13:23 2013 +0200" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Jun 25 23:13:40 2013 -0700" }, "message": "gpio/omap: don\u0027t use linear domain mapping for OMAP1\n\nCommit ede4d7a5 (\"gpio/omap: convert gpio irq domain to linear mapping\")\nconverted the OMAP GPIO driver to use a linear mapping for the GPIO IRQ\ndomain instead of using a legacy mapping. Not using a legacy mapping has\na number of benefits but it requires the platform to support SPARSE_IRQ\nwhich currently is not supported on OMAP1.\n\nSo this change caused a regression on OMAP1 platforms [1].\n\nSince this issue is not present on all OMAP2+ platforms, there is no need to\nrevert the driver to use legacy domain mapping for all the platforms.\n\n[1]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg89005.html\n\nSigned-off-by: Javier Martinez Canillas \u003cjavier.martinez@collabora.co.uk\u003e\nTested-by: Aaro Koskinen \u003caaro.koskinen@iki.fi\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "6d446ec32f169c6a5d9bc90684a8082a6cbe90f6", "tree": "5c43bb12f31bbe9ccc96c837349a4ade53256087", "parents": [ "dc8482926e2b1006ed6962ac8388cb92aed4efc7" ], "author": { "name": "Gavin Shan", "email": "shangw@linux.vnet.ibm.com", "time": "Tue Jun 25 15:24:32 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 17:00:40 2013 -0700" }, "message": "net/tg3: Avoid delay during MMIO access\n\nWhen the EEH error is the result of a fenced host bridge, MMIO accesses\ncan be very slow (milliseconds) to timeout and return all 1\u0027s,\nthus causing the driver various timeout loops to take way too long and\ntrigger soft-lockup warnings (in addition to taking minutes to recover).\n\nIt might be worthwhile to check if for any of these cases, ffffffff is\na valid possible value, and if not, bail early since that means the HW\nis either gone or isolated. In the meantime, checking that the PCI channel\nis offline would be workaround of the problem.\n\nCc: \u003cstable@vger.kernel.org\u003e # v3.0+\nSigned-off-by: Gavin Shan \u003cshangw@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dc8482926e2b1006ed6962ac8388cb92aed4efc7", "tree": "c4d2ff3316fbc20cb942e7ea443f4c88f60a70ab", "parents": [ "4c7ab054ab4f5d63625508ed6f8a607184cae7c2" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Mon Jun 24 21:42:40 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:27:28 2013 -0700" }, "message": "ipv6: check return value of ipv6_get_lladdr\n\nWe should check the return value of ipv6_get_lladdr in inet6_set_iftoken.\n\nA possible situation, which could leave ll_addr unassigned is, when\nthe user removed her link-local address but a global scoped address was\nalready set. In this case the interface would still be IF_READY and not\ndead. In that case the RS source address is some value from the stack.\n\nv2: Daniel Borkmann noted a small indent inconstancy; no semantic\nchanges.\n\nCc: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nAcked-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nReviewed-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c7ab054ab4f5d63625508ed6f8a607184cae7c2", "tree": "63273346588712553b8bece014b124cd2b6196e4", "parents": [ "7e24bfbe43b545b1689a5f134ed83645b9e34b86" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Jun 23 17:26:58 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:17:10 2013 -0700" }, "message": "macvtap: fix recovery from gup errors\n\nget user pages might fail partially in macvtap zero copy\nmode. To recover we need to put all pages that we got,\nbut code used a wrong index resulting in double-free\nerrors.\n\nReported-by: Brad Hubbard \u003cbhubbard@redhat.com\u003e\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Jason Wang \u003cjasowang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e24bfbe43b545b1689a5f134ed83645b9e34b86", "tree": "74dde1d00b2eb4c739dbe1375853e0e7383ac523", "parents": [ "bd8a7036c06cf15779b31a5397d4afcb12be81ea" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Jun 23 17:19:03 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:16:45 2013 -0700" }, "message": "tun: fix recovery from gup errors\n\nget user pages might fail partially in tun zero copy\nmode. To recover we need to put all pages that we got,\nbut code used a wrong index resulting in double-free\nerrors.\n\nReported-by: Brad Hubbard \u003cbhubbard@redhat.com\u003e\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd8a7036c06cf15779b31a5397d4afcb12be81ea", "tree": "d78794e12fb4ac0005f019e6a51e797230d38970", "parents": [ "2b7a5db060f5e7d7f79bc45f818e08b8f244a3b8" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Jun 24 06:26:00 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:07:44 2013 -0700" }, "message": "gre: fix a possible skb leak\n\ncommit 68c331631143 (\"v4 GRE: Add TCP segmentation offload for GRE\")\nadded a possible skb leak, because it frees only the head of segment\nlist, in case a skb_linearize() call fails.\n\nThis patch adds a kfree_skb_list() helper to fix the bug.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nCc: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b7a5db060f5e7d7f79bc45f818e08b8f244a3b8", "tree": "de87e8753de68fdb377a455b6bdecfd8c32f25f1", "parents": [ "ab4eb3537e3f20b2a88467e1f708a136df6e0ecb", "9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:04:35 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 16:04:35 2013 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nA few more late-breaking fixes hoping for 3.10...\n\nRegarding the Bluetooth fix, Gustavo says:\n\n\"A important fix to 3.10, this patch fixes an issues that was preventing\nthe l2cap info response command to be handled properly.\"\n\nAlso for that Bluetooth fix, Johan adds:\n\n\"Once the code gives up parsing this PDU it also gives up essential\nparts of the L2CAP connection creation process, i.e. without this\npatch the stack will fail to establish connections properly.\"\n\nMoving onto ath9k, Felix Fietkau fixes an RCU locking issue in\nthe transmit path. As for ath9k_htc, Sujith Manoharan fixes some\nauthentication timeouts by ensuring that a chip reset is done when\nIDLE is turned off.\n\nI think these are all micro-fixes that shouldn\u0027t cause any trouble.\nPlease let me know if there are problems!\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab4eb3537e3f20b2a88467e1f708a136df6e0ecb", "tree": "8628924f196b022395f241acec9eab9ae946b55f", "parents": [ "a3d9dd89b781bdcb14201847608b658442de812b" ], "author": { "name": "YOSHIFUJI Hideaki / 吉藤英明", "email": "yoshfuji@linux-ipv6.org", "time": "Sat Jun 22 11:13:13 2013 +0900" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 25 14:47:22 2013 -0700" }, "message": "ipv6: Process unicast packet with Router Alert by checking flag in skb.\n\nRouter Alert option is marked in skb.\nPreviously, IP6CB(skb)-\u003era was set to positive value for such packets.\nSince commit dd3332bf (\"ipv6: Store Router Alert option in IP6CB\ndirectly.\"), IP6SKB_ROUTERALERT is set in IP6CB(skb)-\u003eflags, and\nthe value of Router Alert option (in network byte order) is set\nto IP6CB(skb)-\u003era for such packets.\n\nMulticast forwarding path uses that flag and value, but unicast\nforwarding path does not use the flag and misuses IP6CB(skb)-\u003era\nvalue.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "45e00374db944b1c12987b501bcaa279b3e36d93", "tree": "6866a97ac823d15d211c1d81853c82e58179dcd4", "parents": [ "96c9ddae034a301bbd32c52da5c972778d73ad2e", "c28375583b6471c1cb833a628ab6afb5b69079d0" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 22:47:07 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 22:47:07 2013 +0200" }, "message": "Merge branch \u0027pm-fixes\u0027\n\n* pm-fixes:\n cpufreq: fix NULL pointer deference at od_set_powersave_bias()\n" }, { "commit": "96c9ddae034a301bbd32c52da5c972778d73ad2e", "tree": "25ca63815efbe874ec2140efd7b6ad034afea387", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d", "44521527be36172864e6e7a6fba4b66e9aa48e40" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 22:46:47 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 22:46:47 2013 +0200" }, "message": "Merge branch \u0027acpi-fixes\u0027\n\n* acpi-fixes:\n libata-acpi: add back ACPI based hotplug functionality\n ACPI / dock / PCI: Synchronous handling of dock events for PCI devices\n PCI / ACPI: Use boot-time resource allocation rules during hotplug\n ACPI / dock: Initialize ACPI dock subsystem upfront\n" }, { "commit": "c28375583b6471c1cb833a628ab6afb5b69079d0", "tree": "80255430a54c44c57a39d88cc2d7d030a4b0d8b6", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d" ], "author": { "name": "Jacob Shin", "email": "jacob.shin@amd.com", "time": "Tue Jun 25 22:42:37 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 22:42:37 2013 +0200" }, "message": "cpufreq: fix NULL pointer deference at od_set_powersave_bias()\n\nWhen initializing the default powersave_bias value, we need to first\nmake sure that this policy is running the ondemand governor.\n\nReported-and-tested-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nSigned-off-by: Jacob Shin \u003cjacob.shin@amd.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "1617e40c1eeeeb857ff4b66acee20ed2acc1b5e7", "tree": "9dc61d610aadb7fb43163ea22dca87df166fb79a", "parents": [ "3a96d5cd7bdce45d5dded75c3a62d4fb98050280" ], "author": { "name": "Josh Durgin", "email": "josh.durgin@inktank.com", "time": "Wed Jun 12 14:43:10 2013 -0700" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Tue Jun 25 12:27:31 2013 -0700" }, "message": "rbd: fetch object order before using it\n\nrbd_dev_v2_header_onetime() fetches striping information, and\nchecks whether the image can be read by compariing the stripe unit\nto the object size. It determines the object size by shifting\nthe object order, which is 0 at this point since it has not been\nread yet. Move the call to get the image size and object order\nbefore rbd_dev_v2_header_onetime() so it is set before use.\n\nSigned-off-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\nReviewed-by: Sage Weil \u003csage@inktank.com\u003e\n" }, { "commit": "2884d4230867c8a46cf701214051e923301e7429", "tree": "7271e615907ce6304b63bd6f0dfa33c44fdc5f22", "parents": [ "1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82" ], "author": { "name": "Robert Love", "email": "robert.w.love@intel.com", "time": "Wed Jun 19 01:56:54 2013 +0000" }, "committer": { "name": "Robert Love", "email": "robert.w.love@intel.com", "time": "Tue Jun 25 12:23:19 2013 -0700" }, "message": "fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs\n\nfcoe_xmit was coded such that it would skip the vlan net device/layer\nand instead set some vlan flags and transmit on the real net device.\nThe real net device has code that would add the vlan tag for fcoe skbs.\nThis avoids some extra processing for data frames and provides a small\nperformance improvement.\n\nSince fcoe_xmit was not using the vlan net device, __vlan_put_tag\nwithin the real net device\u0027s xmit routine was ultimately being\ncalled to set the vlan tag.\n\nWith the below change the behavior of __vlan_put_tag changed slightly,\nit now sets the skb-\u003eprotocol \u003d vlan_proto. vlan_proto was not a field\nbeing set by fcoe_xmit, so the skb-\u003eprotocol is now not being set to\nETH_P_8021Q, as it should be.\n\nThis patch converts fcoe_xmit to use the vlan_put_tag routine which\nwill tag the skb and fcoe will continue to transmit fcoe skbs on the\nreal net device.\n\nFor reference, the below change was the one that altered the\n__vlan_put_tag behavior.\n\n commit 86a9bad3ab6b6f858fd4443b48738cabbb6d094c\n Author: Patrick McHardy \u003ckaber@trash.net\u003e\n Date: Fri Apr 19 02:04:30 2013 +0000\n\n net: vlan: add protocol argument to packet tagging functions\n\n Add a protocol argument to the VLAN packet tagging functions. In case of HW\n tagging, we need that protocol available in the ndo_start_xmit functions,\n so it is stored in a new field in the skb. The new field fits into a hole\n (on 64 bit) and doesn\u0027t increase the sks\u0027s size.\n\nSigned-off-by: Robert Love \u003crobert.w.love@intel.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\n" }, { "commit": "1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82", "tree": "e5f77a7bf65cd4b2d564c2b6cec49b3770796f17", "parents": [ "ad465470563152f8dcc61161148ff620efefb2a8", "eda4ddf7e3a2245888e8c45c566fd514cdd5abbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:08:07 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:08:07 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 fixes from Martin Schwidefsky:\n \"A couple of last-minute fixes: a build regression for !SMP, a recent\n memory detection patch caused kdump to break, a regression in regard\n to sscanf vs reboot from FCP, and two fixes in the DMA mapping code\n for PCI\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:\n s390/ipl: Fix FCP WWPN and LUN format strings for read\n s390/mem_detect: fix memory hole handling\n s390/dma: support debug_dma_mapping_error\n s390/dma: fix mapping_error detection\n s390/irq: Only define synchronize_irq() on SMP\n" }, { "commit": "ad465470563152f8dcc61161148ff620efefb2a8", "tree": "c988264bff14e710f93b3612835289903806efc5", "parents": [ "5dbc746960b5cd62c558cd6663697afd41f59d39", "b37e161388ac3980d5dfb73050e85874b84253eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:06:48 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:06:48 2013 -1000" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc bugfix from Ben Herrenschmidt:\n \"This is a fix for a regression causing a freescale \"83xx\" based\n platforms to crash on boot due to some PCI breakage\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/pci: Fix boot panic on mpc83xx (regression)\n" }, { "commit": "5dbc746960b5cd62c558cd6663697afd41f59d39", "tree": "41486216b93c026c92743d64e16295528ac68c88", "parents": [ "f97f7d2d27bf092b40babda9ded29cc85cf77eec", "14c14414d157ea851119c96c61a17306a2b4a035" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:06:04 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 25 09:06:04 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse bugfix from Miklos Szeredi:\n \"This fixes a race between fallocate() and truncate()\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: hold i_mutex in fuse_file_fallocate()\n" }, { "commit": "9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737", "tree": "41ff0839bb0fe650797b9681e138f1c2408e1208", "parents": [ "f57da7a65b386dd4535daa4f7a3773a025fbb022", "57bf74407bd501b0599568a3112fc16395b575d9" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 25 13:24:12 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 25 13:24:12 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "f97f7d2d27bf092b40babda9ded29cc85cf77eec", "tree": "bd6b038bb85e6265c8aed04211687ac6f5b859e5", "parents": [ "acdb37c361dc87e165889a504e291c1e82ae133c", "332ec81d413bd4e7375c25d628e7f658c37138f6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 24 20:17:11 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 24 20:17:11 2013 -1000" }, "message": "Merge tag \u0027spi-v3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi\n\nPull spi updates from Mark Brown:\n \"A few last minute SPI updates: fix a missized allocation and use\n atomic allocations in atomic context in the PXA driver, and fix the\n checking of return codes in the S3C64xx driver which caused spurious\n errors under heavy load.\"\n\n* tag \u0027spi-v3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:\n spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()\n spi/pxa2xx: use GFP_ATOMIC in sg table allocation\n spi: s3c64xx: Fix pm_runtime_get_sync() return value check\n" }, { "commit": "426729dcc713b3d1ae802e314030e5556a62da53", "tree": "47d09c47ecf6e1f5dba69c043c2a433caacca6a5", "parents": [ "0d20299dbb47b1ee429140ae0784b49231dc7781" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Jun 24 11:47:48 2013 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 25 10:39:57 2013 +1000" }, "message": "drm/i915: make compact dma scatter lists creation work with SWIOTLB backend.\n\nGit commit 90797e6d1ec0dfde6ba62a48b9ee3803887d6ed4\n(\"drm/i915: create compact dma scatter lists for gem objects\") makes\ncertain assumptions about the under laying DMA API that are not always\ncorrect.\n\nOn a ThinkPad X230 with an Intel HD 4000 with Xen during the bootup\nI see:\n\n[drm:intel_pipe_set_base] *ERROR* pin \u0026 fence failed\n[drm:intel_crtc_set_config] *ERROR* failed to set mode on [CRTC:3], err \u003d -28\n\nBit of debugging traced it down to dma_map_sg failing (in\ni915_gem_gtt_prepare_object) as some of the SG entries were huge (3MB).\n\nThat unfortunately are sizes that the SWIOTLB is incapable of handling -\nthe maximum it can handle is a an entry of 512KB of virtual contiguous\nmemory for its bounce buffer. (See IO_TLB_SEGSIZE).\n\nPrevious to the above mention git commit the SG entries were of 4KB, and\nthe code introduced by above git commit squashed the CPU contiguous PFNs\nin one big virtual address provided to DMA API.\n\nThis patch is a simple semi-revert - were we emulate the old behavior\nif we detect that SWIOTLB is online. If it is not online then we continue\non with the new compact scatter gather mechanism.\n\nAn alternative solution would be for the the \u0027.get_pages\u0027 and the\ni915_gem_gtt_prepare_object to retry with smaller max gap of the\namount of PFNs that can be combined together - but with this issue\ndiscovered during rc7 that might be too risky.\n\nReported-and-Tested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCC: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCC: Imre Deak \u003cimre.deak@intel.com\u003e\nCC: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCC: David Airlie \u003cairlied@linux.ie\u003e\nCC: \u003cdri-devel@lists.freedesktop.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0d20299dbb47b1ee429140ae0784b49231dc7781", "tree": "e02f06a6968bd5baf73a94ec5141a71935dc9cae", "parents": [ "acdb37c361dc87e165889a504e291c1e82ae133c", "19b2dbde5732170a03bd82cc8bd442cf88d856f7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 25 10:38:44 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 25 10:38:44 2013 +1000" }, "message": "Merge tag \u0027drm-intel-fixes-2013-06-24\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes\n\nOne remaining regression fix for i915. I\u0027ve left it in -fixes for more\nthan a week since it\u0027s in tricky code, and it took us a few kernel\nreleases to notice the regression at all. The fence leak is especially\nannoying on gen2/3 and will kill userspace there quickly. For extra\nparanoia we\u0027ve added a WARN in -next to catch this, things seem to be\nsolid now.\n\n* tag \u0027drm-intel-fixes-2013-06-24\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: Restore fences after resume and GPU resets\n" }, { "commit": "44521527be36172864e6e7a6fba4b66e9aa48e40", "tree": "25ca63815efbe874ec2140efd7b6ad034afea387", "parents": [ "21a31013f774c726bd199526cd673acc6432b21d" ], "author": { "name": "Aaron Lu", "email": "aaron.lu@intel.com", "time": "Thu Jun 20 09:38:34 2013 +0800" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Jun 25 00:51:33 2013 +0200" }, "message": "libata-acpi: add back ACPI based hotplug functionality\n\nCommit 30dcf76acc69 \"libata: migrate ACPI code over to new bindings\"\nmistakenly dropped the code to register hotplug notificaion handler\nfor ATA port/devices, causing regression for people using ATA bay,\nas kernel bug #59871 shows.\n\nFix this by adding back the hotplug notification handler registration\ncode. Since this code has to be run once and notification needs to\nbe installed on every ATA port/devices handle no matter if there is\nactual device attached, we can\u0027t do this in binding time for ATA\ndevice ACPI handle, as the binding only occurs when a SCSI device is\ncreated, i.e. there is device attached. So introduce the\nata_acpi_hotplug_init() function to loop scan all ATA ACPI handles\nand if it is available, install the notificaion handler for it during\nATA init time.\n\nWith the ATA ACPI handle binding to SCSI device tree, it is possible\nnow that when the SCSI hotplug work removes the SCSI device, the ACPI\nunbind function will find that the corresponding ACPI device has\nalready been deleted by dock driver, causing a scaring message like:\n[ 128.263966] scsi 4:0:0:0: Oops, \u0027acpi_handle\u0027 corrupt\nFix this by waiting for SCSI hotplug task finish in our notificaion\nhandler, so that the removal of ACPI device done in ACPI unbind\nfunction triggered by the removal of SCSI device is run earlier when\nACPI device is still available.\n\n[rjw: Rebased]\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d59871\nReported-bisected-and-tested-by: Dirk Griesbach \u003cspamthis@freenet.de\u003e\nSigned-off-by: Aaron Lu \u003caaron.lu@intel.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: 3.6+ \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "b37e161388ac3980d5dfb73050e85874b84253eb", "tree": "49216c3a8c311009d5d85db41c7844a69d6548e6", "parents": [ "17858ca65eef148d335ffd4cfc09228a1c1cbfb5" ], "author": { "name": "Rojhalat Ibrahim", "email": "imr@rtschenk.de", "time": "Mon Jun 17 16:02:41 2013 +0200" }, "committer": { "name": "Scott Wood", "email": "scottwood@freescale.com", "time": "Mon Jun 24 16:54:09 2013 -0500" }, "message": "powerpc/pci: Fix boot panic on mpc83xx (regression)\n\nThe following commit caused a fatal oops when booting on mpc83xx with\na non-express PCI bus (regardless of whether a PCI device is present):\n\ncommit 50d8f87d2b39313dae9d0a2d9b23d377328f2f7b\nAuthor: Rojhalat Ibrahim \u003cimr@rtschenk.de\u003e\nDate: Mon Apr 8 10:15:28 2013 +0200\n\n powerpc/fsl-pci Make PCIe hotplug work with Freescale PCIe controllers\n\n Up to now the PCIe link status on Freescale PCIe controllers was only\n checked once at boot time. So hotplug did not work. With this patch the\n link status is checked on every config read. PCIe devices not present at\n boot time are found after doing \u0027echo 1 \u003e/sys/bus/pci/rescan\u0027.\n\n Signed-off-by: Rojhalat Ibrahim \u003cimr@rtschenk.de\u003e\n Signed-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n\nThis patch fixes the issue by calling setup_indirect_pci for all device types.\nfsl_indirect_read_config is now only used for booke/86xx PCIe controllers.\n\nReported-by: Michael Guntsche \u003cmike@it-loops.com\u003e\nCc: Scott Wood \u003cscottwood@freescale.com\u003e\nSigned-off-by: Rojhalat Ibrahim \u003cimr@rtschenk.de\u003e\nSigned-off-by: Scott Wood \u003cscottwood@freescale.com\u003e\n" }, { "commit": "a3d9dd89b781bdcb14201847608b658442de812b", "tree": "a5f0be09bc4d591cdc7b4422efd8c0d9c41fb722", "parents": [ "f57da7a65b386dd4535daa4f7a3773a025fbb022", "c8fc51cfa758be945c6113a4b446e0159070f768" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 12:45:24 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 12:45:24 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following patchset contains five fixes for Netfilter/IPVS, they are:\n\n* A skb leak fix in fragmentation handling in case that helpers are in place,\n it occurs since the IPV6 NAT infrastructure, from Phil Oester.\n\n* Fix SCTP port mangling in ICMP packets for IPVS, from Julian Anastasov.\n\n* Fix event delivery in ctnetlink regarding the new connlabel infrastructure,\n from Florian Westphal.\n\n* Fix mangling in the SIP NAT helper, from Balazs Peter Odor.\n\n* Fix crash in ipt_ULOG introduced while adding netnamespace support,\n from Gao Feng.\n\nI\u0027ll take care of passing several of these patches to -stable once they hit\nLinus\u0027 tree.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57bf74407bd501b0599568a3112fc16395b575d9", "tree": "6619c33b02bc5f5d80ca1b1a7a2ef506e03c0852", "parents": [ "075163bbb0f51174359947e1bce84f5edb23f21e", "3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 13:53:15 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 13:53:15 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth\n" }, { "commit": "075163bbb0f51174359947e1bce84f5edb23f21e", "tree": "4e71ab3c973183108ea55afbf29d21f40818816e", "parents": [ "23bc2021c54b048302f6f4844c030660ce0fcfe9" ], "author": { "name": "Sujith Manoharan", "email": "c_manoha@qca.qualcomm.com", "time": "Thu Jun 20 13:57:07 2013 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 13:52:52 2013 -0400" }, "message": "ath9k_htc: Handle IDLE state transition properly\n\nMake sure that a chip reset is done when IDLE is turned\noff - this fixes authentication timeouts.\n\nCc: stable@vger.kernel.org\nReported-by: Ignacy Gawedzki \u003ci@lri.fr\u003e\nSigned-off-by: Sujith Manoharan \u003cc_manoha@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "23bc2021c54b048302f6f4844c030660ce0fcfe9", "tree": "54befdd279991dbc041c298172ea5596bcf9e9a1", "parents": [ "2f2a8846d51ed7342603a8d7c196fcc9e2f8a319" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jun 22 12:39:26 2013 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 13:52:52 2013 -0400" }, "message": "ath9k: fix an RCU issue in calling ieee80211_get_tx_rates\n\nath_txq_schedule is called outside of the drv_tx call, so it needs RCU\nprotection.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c8fc51cfa758be945c6113a4b446e0159070f768", "tree": "7fe9bb354958c4453a7fa03dcbe5ffe9b4696594", "parents": [ "797a7d66d2048fe8a4ac1ba58c5d4752d64b1ac4" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Mon Jun 24 17:04:02 2013 +0800" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jun 24 17:10:44 2013 +0200" }, "message": "netfilter: ipt_ULOG: fix incorrect setting of ulog timer\n\nThe parameter of setup_timer should be \u0026ulog-\u003enlgroup[i].\nthe incorrect parameter will cause kernel panic in\nulog_timer.\n\nBug introducted in commit 355430671ad93546b34b4e91bdf720f3a704efa4\n\"netfilter: ipt_ULOG: add net namespace support for ipt_ULOG\"\n\nebt_ULOG doesn\u0027t have this problem.\n\n[ I have mangled this patch to fix nlgroup !\u003d 0 case, we were\n also crashing there --pablo ]\n\nTested-by: George Spelvin \u003clinux@horizon.com\u003e\nReported-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "3e0a07f8c401bb43e0f964c5f1285b2cb2028645", "tree": "8d25c87e417d999d33f621cf74371df5d6751c66", "parents": [ "63384fd0b1509acf522a8a8fcede09087eedb7df" ], "author": { "name": "Gregory CLEMENT", "email": "gregory.clement@free-electrons.com", "time": "Sun Jun 23 10:17:11 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 24 14:28:46 2013 +0100" }, "message": "ARM: 7773/1: PJ4B: Add support for errata 4742\n\nThis commit fixes the regression on Armada 370 (the kernal hang during\nboot) introduced by the commit: \"ARM: 7691/1: mm: kill unused\nTLB_CAN_READ_FROM_L1_CACHE and use ALT_SMP instead\".\n\nWhen coming out of either a Wait for Interrupt (WFI) or a Wait for\nEvent (WFE) IDLE states, a specific timing sensitivity exists between\nthe retiring WFI/WFE instructions and the newly issued subsequent\ninstructions. This sensitivity can result in a CPU hang scenario. The\nworkaround is to insert either a Data Synchronization Barrier (DSB) or\nData Memory Barrier (DMB) command immediately after the WFI/WFE\ninstruction.\n\nThis commit was based on the work of Lior Amsalem, but heavily\nmodified to apply the errata fix dynamically according to the\nprocessor type thanks to the suggestions of Russell King and Nicolas\nPitre.\n\nSigned-off-by: Gregory CLEMENT \u003cgregory.clement@free-electrons.com\u003e\nReviewed-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nTested-by: Willy Tarreau \u003cw@1wt.eu\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "63384fd0b1509acf522a8a8fcede09087eedb7df", "tree": "3bdd2d078cdf5300d84c3288bcce1096da2361f2", "parents": [ "18d7f152df31e5a326301fdaad385e40874dff80" ], "author": { "name": "Simon Baatz", "email": "gmbnomis@gmail.com", "time": "Sat Jun 22 22:01:25 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 24 14:28:44 2013 +0100" }, "message": "ARM: 7772/1: Fix missing flush_kernel_dcache_page() for noMMU\n\nCommit 1bc3974 (ARM: 7755/1: handle user space mapped pages in\nflush_kernel_dcache_page) moved the implementation of\nflush_kernel_dcache_page() into mm/flush.c but did not implement it\non noMMU ARM.\n\nSigned-off-by: Simon Baatz \u003cgmbnomis@gmail.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@linaro.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.2+: 1bc3974: ARM: 7755/1\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "18d7f152df31e5a326301fdaad385e40874dff80", "tree": "f7972dce2a6b55d99dcae103d076816d95366492", "parents": [ "1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9" ], "author": { "name": "Lorenzo Pieralisi", "email": "lorenzo.pieralisi@arm.com", "time": "Wed Jun 19 10:40:48 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 24 14:28:43 2013 +0100" }, "message": "ARM: 7763/1: kernel: fix __cpu_logical_map default initialization\n\nThe __cpu_logical_map array is statically initialized to 0, which is a valid\nMPIDR value. To prevent issues with the current implementation, this patch\ndefines an MPIDR_INVALID value, and statically initializes the\n__cpu_logical_map[] array to it. Entries in the arm_dt_init_cpu_maps()\ntmp_map array used to stash DT reg properties while parsing DT are initialized\nwith the MPIDR_INVALID value as well for consistency.\n\nSigned-off-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1ba9bf0a9ae779c1a2b3eb64951e4161d9bad7a9", "tree": "6d975c4d04a66923303971ad7fa6f59719c12c19", "parents": [ "8182a34d85698d2fb696bfdafa21140916fd5d47" ], "author": { "name": "Lorenzo Pieralisi", "email": "lorenzo.pieralisi@arm.com", "time": "Wed Jun 19 10:36:26 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 24 14:25:42 2013 +0100" }, "message": "ARM: 7762/1: kernel: fix arm_dt_init_cpu_maps() to skip non-cpu nodes\n\nThe introduction of the cpu-map topology node in the cpus node implies\nthat cpus node might have children that are not cpu nodes. The DT\nparsing code needs updating otherwise it would check for cpu nodes\nproperties in nodes that are not required to contain them, resulting\nin warnings that have no bearing on bindings defined in the dts source file.\n\nCc: \u003cstable@vger.kernel.org\u003e [3.8+]\nSigned-off-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8182a34d85698d2fb696bfdafa21140916fd5d47", "tree": "1b9aae3eb01a1a827d9568942f3040a9373ae6d5", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d" ], "author": { "name": "Jonas Jensen", "email": "jonas.jensen@gmail.com", "time": "Tue Jun 18 09:20:50 2013 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 24 14:25:41 2013 +0100" }, "message": "ARM: 7760/1: cpu_fa526_do_idle: remove WFI\n\nAs it was already suggested by Russell King and Arnd Bergmann:\n\nhttps://lkml.org/lkml/2013/5/16/133\n\nmoxart and gemini seem to be the only platforms using CPU_FA526,\nand instead of pointing arm_pm_idle to an empty function from\nplatform code, it makes sense to remove WFI code from the processor\nspecific idle function.\n\nApplies to arm-soc/for-next (and 3.10-rc1).\n\nChanges since v1:\n\n1. remove WFI but make sure cpu_fa526_do_idle do not fall through\n to cpu_fa526_dcache_clean_area\n\nNote: moxart boots and prints to UART without this patch, but input is broken.\n\nSigned-off-by: Jonas Jensen \u003cjonas.jensen@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ec8da805c43a6cc0252dad0ff6e348c731e0b138", "tree": "fa7925d0f44f92f9a18456b5384178a0f4192d4f", "parents": [ "317ddd256b9c24b0d78fa8018f80f1e495481a10" ], "author": { "name": "Marc Dietrich", "email": "marvin24@gmx.de", "time": "Mon Jun 10 22:27:55 2013 +0200" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Mon Jun 24 12:37:47 2013 +0100" }, "message": "mfd: tps6586x: correct device name of the regulator cell\n\nChange the device name of the regulator function to the one chosen for\nMODULE_ALIAS. This fixes kernel auto-module loading for the regulator function.\n\nSigned-off-by: Marc Dietrich \u003cmarvin24@gmx.de\u003e\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\n" }, { "commit": "332ec81d413bd4e7375c25d628e7f658c37138f6", "tree": "c4dc242a2161f38c4a45385cff2199400795e622", "parents": [ "2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9", "6c6cf64b16438eac6da9a90412a82316ad196e7c" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Mon Jun 24 12:28:29 2013 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Mon Jun 24 12:28:29 2013 +0100" }, "message": "Merge remote-tracking branch \u0027spi/fix/s3c64xx\u0027 into spi-linus\n" }, { "commit": "2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9", "tree": "4f622f5ab48c55c24f70104f842479697e49cf92", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d", "cc0ee9873c6afafb387379ca1df25da78a08c603" ], "author": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Mon Jun 24 12:28:28 2013 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Mon Jun 24 12:28:28 2013 +0100" }, "message": "Merge remote-tracking branch \u0027spi/fix/pxa\u0027 into spi-linus\n" }, { "commit": "797a7d66d2048fe8a4ac1ba58c5d4752d64b1ac4", "tree": "7daf7f21006ae948b6ae1cb82426e7e35ec29b4f", "parents": [ "5aed93875cd88502f04a0d4517b8a2d89a849773" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Fri Jun 21 16:51:30 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jun 24 11:32:56 2013 +0200" }, "message": "netfilter: ctnetlink: send event when conntrack label was modified\n\ncommit 0ceabd83875b72a29f33db4ab703d6ba40ea4c58\n(netfilter: ctnetlink: deliver labels to userspace) sets the event bit\nwhen we raced with another packet, instead of raising the event bit\nwhen the label bit is set for the first time.\n\ncommit 9b21f6a90924dfe8e5e686c314ddb441fb06501e\n(netfilter: ctnetlink: allow userspace to modify labels) forgot to update\nthe event mask in the \"conntrack already exists\" case.\n\nBoth issues result in CTA_LABELS attribute not getting included in the\nconntrack event.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "5aed93875cd88502f04a0d4517b8a2d89a849773", "tree": "fefcfe476ae59a4bec926e121eabbf34eb828017", "parents": [ "142dcdd3c25fc7a3866bb06980e8f93a2ed7e050" ], "author": { "name": "Balazs Peter Odor", "email": "balazs@obiserver.hu", "time": "Sat Jun 22 19:24:43 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jun 24 11:32:40 2013 +0200" }, "message": "netfilter: nf_nat_sip: fix mangling\n\nIn (b20ab9c netfilter: nf_ct_helper: better logging for dropped packets)\nthere were some missing brackets around the logging information, thus\nalways returning drop.\n\nCloses https://bugzilla.kernel.org/show_bug.cgi?id\u003d60061\n\nSigned-off-by: Balazs Peter Odor \u003cbalazs@obiserver.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "21a31013f774c726bd199526cd673acc6432b21d", "tree": "ba9659d45f91fda6f574b9488c1a273bd6c105c4", "parents": [ "d66ecb7220a70ec3f6c0e38e4af28fb8b25d31c6" ], "author": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Mon Jun 24 11:22:53 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Mon Jun 24 11:22:53 2013 +0200" }, "message": "ACPI / dock / PCI: Synchronous handling of dock events for PCI devices\n\nThe interactions between the ACPI dock driver and the ACPI-based PCI\nhotplug (acpiphp) are currently problematic because of ordering\nissues during hot-remove operations.\n\nFirst of all, the current ACPI glue code expects that physical\ndevices will always be deleted before deleting the companion ACPI\ndevice objects. Otherwise, acpi_unbind_one() will fail with a\nwarning message printed to the kernel log, for example:\n\n[ 185.026073] usb usb5: Oops, \u0027acpi_handle\u0027 corrupt\n[ 185.035150] pci 0000:1b:00.0: Oops, \u0027acpi_handle\u0027 corrupt\n[ 185.035515] pci 0000:18:02.0: Oops, \u0027acpi_handle\u0027 corrupt\n[ 180.013656] port1: Oops, \u0027acpi_handle\u0027 corrupt\n\nThis means, in particular, that struct pci_dev objects have to\nbe deleted before the struct acpi_device objects they are \"glued\"\nwith.\n\nNow, the following happens the during the undocking of an ACPI-based\ndock station:\n 1) hotplug_dock_devices() invokes registered hotplug callbacks to\n destroy physical devices associated with the ACPI device objects\n depending on the dock station. It calls dd-\u003eops-\u003ehandler() for\n each of those device objects.\n 2) For PCI devices dd-\u003eops-\u003ehandler() points to\n handle_hotplug_event_func() that queues up a separate work item\n to execute _handle_hotplug_event_func() for the given device and\n returns immediately. That work item will be executed later.\n 3) hotplug_dock_devices() calls dock_remove_acpi_device() for each\n device depending on the dock station. This runs acpi_bus_trim()\n for each of them, which causes the underlying ACPI device object\n to be destroyed, but the work items queued up by\n handle_hotplug_event_func() haven\u0027t been started yet.\n 4) _handle_hotplug_event_func() queued up in step 2) are executed\n and cause the above failure to happen, because the PCI devices\n they handle do not have the companion ACPI device objects any\n more (those objects have been deleted in step 3).\n\nThe possible breakage doesn\u0027t end here, though, because\nhotplug_dock_devices() may return before at least some of the\n_handle_hotplug_event_func() work items spawned by it have a\nchance to complete and then undock() will cause _DCK to be\nevaluated and that will cause the devices handled by the\n_handle_hotplug_event_func() to go away possibly while they are\nbeing accessed.\n\nThis means that dd-\u003eops-\u003ehandler() for PCI devices should not point\nto handle_hotplug_event_func(). Instead, it should point to a\nfunction that will do the work of _handle_hotplug_event_func()\nsynchronously. For this reason, introduce such a function,\nhotplug_event_func(), and modity acpiphp_dock_ops to point to\nit as the handler.\n\nUnfortunately, however, this is not sufficient, because if the dock\ncode were not changed further, hotplug_event_func() would now\ndeadlock with hotplug_dock_devices() that called it, since it would\nrun unregister_hotplug_dock_device() which in turn would attempt to\nacquire the dock station\u0027s hp_lock mutex already acquired by\nhotplug_dock_devices().\n\nTo resolve that deadlock use the observation that\nunregister_hotplug_dock_device() won\u0027t need to acquire hp_lock\nif PCI bridges the devices on the dock station depend on are\nprevented from being removed prematurely while the first loop in\nhotplug_dock_devices() is in progress.\n\nTo make that possible, introduce a mechanism by which the callers of\nregister_hotplug_dock_device() can provide \"init\" and \"release\"\nroutines that will be executed, respectively, during the addition\nand removal of the physical device object associated with the\ngiven ACPI device handle. Make acpiphp use two new functions,\nacpiphp_dock_init() and acpiphp_dock_release(), that call\nget_bridge() and put_bridge(), respectively, on the acpiphp bridge\nholding the given device, for this purpose.\n\nIn addition to that, remove the dock station\u0027s list of\n\"hotplug devices\" and make the dock code always walk the whole list\nof \"dependent devices\" instead in such a way that the loops in\nhotplug_dock_devices() and dock_event() (replacing the loops over\n\"hotplug devices\") will take references to the list entries that\nregister_hotplug_dock_device() has been called for. That prevents\nthe \"release\" routines associated with those entries from being\ncalled while the given entry is being processed and for PCI\ndevices this means that their bridges won\u0027t be removed (by a\nconcurrent thread) while hotplug_event_func() handling them is\nbeing executed.\n\nThis change is based on two earlier patches from Jiang Liu.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d59501\nReported-and-tested-by: Alexander E. Patrakov \u003cpatrakov@gmail.com\u003e\nTracked-down-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nTested-by: Illya Klymov \u003cxanf@xanf.me\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: 3.9+ \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "eda4ddf7e3a2245888e8c45c566fd514cdd5abbb", "tree": "2696b557069247b9a3d4761bfbcff48383fa6723", "parents": [ "35b03aec919c952e67b0b093638e0d79b468f9bc" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Fri Jun 21 13:21:30 2013 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Jun 24 11:16:34 2013 +0200" }, "message": "s390/ipl: Fix FCP WWPN and LUN format strings for read\n\nThe following git commit changed the behavior of sscanf:\n\ncommit 53809751ac230a3611b5cdd375f3389f3207d471\nAuthor: Jan Beulich \u003cJBeulich@suse.com\u003e\nDate: Mon Dec 17 16:01:31 2012 -0800\n sscanf: don\u0027t ignore field widths for numeric conversions\n\nThis broke the WWPN and LUN sysfs attributes for s390 reipl and dump\non panic.\n\nExample:\n\n$ echo 0x0123456701234567 \u003e /sys/firmware/reipl/fcp/wwpn\n$ cat /sys/firmware/reipl/fcp/wwpn\n0x0001234567012345\n\nSo fix this and use format strings that work also with the\nnew sscanf implementation:\n\n$ echo 0x012345670123456789 \u003e /sys/firmware/reipl/fcp/wwpn\n$ cat /sys/firmware/reipl/fcp/wwpn\n0x0123456701234567\n\nCc: stable@vger.kernel.org # 3.8+\nReviewed-by: Steffen Maier \u003cmaier@linux.vnet.ibm.com\u003e\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "f57da7a65b386dd4535daa4f7a3773a025fbb022", "tree": "810364eb46a754b2179e17331636f7606dae747d", "parents": [ "b90fc27a64a57b273351ceef7ae298558ff8a6ac" ], "author": { "name": "Shahed Shaikh", "email": "shahed.shaikh@qlogic.com", "time": "Fri Jun 21 12:09:42 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:28:28 2013 -0700" }, "message": "qlcnic: Do not sleep while holding spinlock\n\nThis patch reverts commit a4791254b6625b06aa33e36304f6e8a1a4a1fdea\n(\"qlcnic: change mdelay to msleep\") which overwrote a commit\n68b3f28c11bf896be32ad2a2e151aaa5f4a7c98e\n(\"qlcnic: Fix scheduling while atomic bug\")\n\nSigned-off-by: Shahed Shaikh \u003cshahed.shaikh@qlogic.com\u003e\nSigned-off-by: Jitendra Kalsaria \u003cjitendra.kalsaria@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b90fc27a64a57b273351ceef7ae298558ff8a6ac", "tree": "94bcbd9be4da07ff7788915f44a13e7adff44a34", "parents": [ "a3c910d2e796ce878231350b904105261a8cf09c" ], "author": { "name": "Mugunthan V N", "email": "mugunthanvnm@ti.com", "time": "Fri Jun 21 19:15:09 2013 +0530" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:28:27 2013 -0700" }, "message": "drivers: net: cpsw: fix compilation error with cpsw driver\n\ndrivers/net/ethernet/ti/cpsw.c: In function \u0027cpsw_suspend\u0027:\ndrivers/net/ethernet/ti/cpsw.c:1979:26: error: \u0027priv\u0027 undeclared (first use in this function)\ndrivers/net/ethernet/ti/cpsw.c:1979:26: note: each undeclared identifier is reported only once for each function it appears in\nmake[4]: *** [drivers/net/ethernet/ti/cpsw.o] Error 1\n\nThe compilation error was introduced by the following commit\n6d3d76f (drivers: net: cpsw: fix cpsw clock gating issue across suspend/resume)\n\nSigned-off-by: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a3c910d2e796ce878231350b904105261a8cf09c", "tree": "5464f7c1e3b04d799b42baa9c58f78d8346cb785", "parents": [ "4eb313a7a939a983c525648227b5fe0a9d41679f" ], "author": { "name": "Shan Wei", "email": "shanwei88@gmail.com", "time": "Fri Jun 21 15:18:32 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:26:26 2013 -0700" }, "message": "tcp: doc : fix the syncookies default value\n\nsyncookies is on for default since in commit e994b7c901\n(tcp: Don\u0027t make syn cookies initial setting depend on CONFIG_SYSCTL).\n\nAnd fix a typo of CONFIG_SYN_COOKIES.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4eb313a7a939a983c525648227b5fe0a9d41679f", "tree": "edd6f21e3ce428d0828a2023f2e65f58c827c788", "parents": [ "ca8c35852138ee0585eaffe6b9f10a5261ea7771" ], "author": { "name": "Sergei Shtylyov", "email": "sergei.shtylyov@cogentembedded.com", "time": "Fri Jun 21 01:13:42 2013 +0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:10:21 2013 -0700" }, "message": "sh_eth: fix misreporting of transmit abort\n\nDue to obviously missing braces, EESR.TABT (transmit abort) interrupt may be\nreported even if it hasn\u0027t happened, just when EESR.TWB (transmit descriptor\nwrite-back) interrupt happens. Luckily (?), EESR.TWB is disabled by the driver\nvia the TRIMD register and all the interrupt masks, so that transmit abort is\nnever actually logged...\n\nPut the braces where they should be and fix the incoherent comment, while at it.\n\nSigned-off-by: Sergei Shtylyov \u003csergei.shtylyov@cogentembedded.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca8c35852138ee0585eaffe6b9f10a5261ea7771", "tree": "bc6dddbdba3f2014b150a69869adedca66502146", "parents": [ "8afe3dc891c4dec2ebddbba6f3767684f95ac2f9" ], "author": { "name": "Sergei Shtylyov", "email": "sergei.shtylyov@cogentembedded.com", "time": "Fri Jun 21 01:12:21 2013 +0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:10:21 2013 -0700" }, "message": "sh_eth: fix unhandled RFE interrupt\n\nEESR.RFE (receive FIFO overflow) interrupt is enabled by the driver on all SoCs\nand sh_eth_error() handles it but it\u0027s not present in any initializer/assignment\nof the \u0027eesr_err_check\u0027 field of \u0027struct sh_eth_cpu_data\u0027. This leads to that\ninterrupt not being handled and cleared, and finally to disabling IRQ and the\ndriver being non-functional.\n\nModify DEFAULT_EESR_ERR_CHECK macro and all explicit initializers of the above\nmentioned field to contain the EESR.RFE bit. Remove useless backslashes from the\ninitializers, while at it.\n\nSigned-off-by: Sergei Shtylyov \u003csergei.shtylyov@cogentembedded.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8afe3dc891c4dec2ebddbba6f3767684f95ac2f9", "tree": "2658e8229f72e6bc1a068b84ebc37cabadd46a68", "parents": [ "14bd076955f4e9cb911326d1b7291e3a2b40bdec" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Thu Jun 20 16:10:59 2013 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:08:38 2013 -0700" }, "message": "qmi_wwan: add various Novatel Gobi1K IDs\n\nFound in the Windows INF files while investigating the\nNovatel/Verizon USB-1000 device. The USB-1000 is verified as\na Gobi1K device and works with QMI after loading appropriate\nfirmware.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nAcked-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14bd076955f4e9cb911326d1b7291e3a2b40bdec", "tree": "13ebc4335959adc0abe2ea414a77107c8a0acbe7", "parents": [ "db4e9b2b98bac7adc7657ef94bb6d1a419a35571" ], "author": { "name": "Sebastian Siewior", "email": "bigeasy@linutronix.de", "time": "Thu Jun 20 16:58:45 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:07:30 2013 -0700" }, "message": "net: eth: davicnci_cpdma: check dma map error\n\nSince the DMA mapping may fail the caller should check the return value.\n\nCc: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nSigned-off-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db4e9b2b98bac7adc7657ef94bb6d1a419a35571", "tree": "896bf67806e257d30d754b0498b07a5253f991ba", "parents": [ "f9bd2d7f6d18d96fa31a657f35290741117c0dd3" ], "author": { "name": "Nikolay Aleksandrov", "email": "nikolay@redhat.com", "time": "Thu Jun 20 14:34:13 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:04:55 2013 -0700" }, "message": "bonding: fix slave speed reporting in bond_miimon_commit\n\nWhen we have BOND_LINK_UP the speed is reported unconditionally with %u\nformat although it can be SPEED_UNKNOWN (-1). After this patch it returns\n0 in that case in an attempt to keep the existing scripts happy.\nOne line is intenionally left 81 chars because it gets ugly if broken.\n\nSigned-off-by: Nikolay Aleksandrov \u003cnikolay@redhat.com\u003e\nAcked-by: Veaceslav Falico \u003cvfalico@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9bd2d7f6d18d96fa31a657f35290741117c0dd3", "tree": "882f61da3f4e44d93ef4d3b919b6482456bb9ac8", "parents": [ "a7bf58040f4e8a7245cb3e24ab93057be3c46363" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.com", "time": "Thu Jun 20 14:58:10 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 00:02:58 2013 -0700" }, "message": "net/mlx_en: Timestamping is not supported in slave mode\n\nOld hypervisors don\u0027t mask out timestamp capability for slave. Till slave\nsupport will be added, need to disable capability by slave.\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acdb37c361dc87e165889a504e291c1e82ae133c", "tree": "a464e25f7a3e74ab6383df7cd725b2cacc8f30b1", "parents": [ "e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@infradead.org", "time": "Sat Jun 22 19:44:08 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 23 16:19:56 2013 -1000" }, "message": "fs: fix new splice.c kernel-doc warning\n\nFix new kernel-doc warning in fs/splice.c:\n\n Warning(fs/splice.c:1298): No description found for parameter \u0027opos\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d", "tree": "83386b43591bd152352c5f967829c89cb9de85da", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d", "be66227151c0cd4da536098c3ee07809101c6faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 23 16:12:46 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 23 16:12:46 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input subsystem updates from Dmitry Torokhov:\n \"A few small fixups for cyttsp, wacom and xpad drivers\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: xpad - fix for \"Mad Catz Street Fighter IV FightPad\" controllers\n Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs\n Input: add missing dependencies on CONFIG_HAS_IOMEM\n Input: cyttsp - fix swapped mfg_stat and mfg_cmd registers\n Input: cyttsp - add missing handshake\n Input: cyttsp - fix memcpy size param\n" }, { "commit": "3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112", "tree": "1a91f5399d9638bc2ce6a668bec576057121f406", "parents": [ "fcb3701849957917a234a61b58ad70ed35c83eda" ], "author": { "name": "Jaganath Kanakkassery", "email": "jaganath.k@samsung.com", "time": "Fri Jun 21 19:55:11 2013 +0530" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Sun Jun 23 00:24:58 2013 +0100" }, "message": "Bluetooth: Fix invalid length check in l2cap_information_rsp()\n\nThe length check is invalid since the length varies with type of\ninfo response.\n\nThis was introduced by the commit cb3b3152b2f5939d67005cff841a1ca748b19888\n\nBecause of this, l2cap info rsp is not handled and command reject is sent.\n\n\u003e ACL data: handle 11 flags 0x02 dlen 16\n L2CAP(s): Info rsp: type 2 result 0\n Extended feature mask 0x00b8\n Enhanced Retransmission mode\n Streaming mode\n FCS Option\n Fixed Channels\n\u003c ACL data: handle 11 flags 0x00 dlen 10\n L2CAP(s): Command rej: reason 0\n Command not understood\n\nCc: stable@vger.kernel.org\nSigned-off-by: Jaganath Kanakkassery \u003cjaganath.k@samsung.com\u003e\nSigned-off-by: Chan-Yeol Park \u003cchanyeol.park@samsung.com\u003e\nAcked-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "d66ecb7220a70ec3f6c0e38e4af28fb8b25d31c6", "tree": "7fdc232881ed9685e94a2f8e17bc112ddd1c3f1e", "parents": [ "94add0f82469fa3c4ff978d03a34da90813c819d" ], "author": { "name": "Jiang Liu", "email": "jiang.liu@huawei.com", "time": "Sun Jun 23 01:01:35 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Sun Jun 23 01:01:35 2013 +0200" }, "message": "PCI / ACPI: Use boot-time resource allocation rules during hotplug\n\nOn x86 platforms, the kernel respects PCI resource assignments from\nthe BIOS and only reassigns resources for unassigned BARs at boot\ntime. However, with the ACPI-based hotplug (acpiphp), it ignores the\nBIOS\u0027 PCI resource assignments completely and reassigns all resources\nby itself. This causes differences in PCI resource allocation\nbetween boot time and runtime hotplug to occur, which is generally\nundesirable and sometimes actively breaks things.\n\nNamely, if there are enough resources, reassigning all PCI resources\nduring runtime hotplug should work, but it may fail if the resources\nare constrained. This may happen, for instance, when some PCI\ndevices with huge MMIO BARs are involved in the runtime hotplug\noperations, because the current PCI MMIO alignment algorithm may\nwaste huge chunks of MMIO address space in those cases.\n\nOn the Alexander\u0027s Sony VAIO VPCZ23A4R the BIOS allocates limited\nMMIO resources for the dock station which contains a device\n(graphics adapter) with a 256MB MMIO BAR. An attempt to reassign\nthat during runtime hotplug causes the dock station MMIO window to be\nexhausted and acpiphp fails to allocate resources for the majority\nof devices on the dock station as a result.\n\nTo prevent that from happening, modify acpiphp to follow the boot\ntime resources allocation behavior so that the BIOS\u0027 resource\nassignments are respected during runtime hotplug too.\n\n[rjw: Changelog]\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d56531\nReported-and-tested-by: Alexander E. Patrakov \u003cpatrakov@gmail.com\u003e\nTested-by: Illya Klymov \u003cxanf@xanf.me\u003e\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: 3.9+ \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "94add0f82469fa3c4ff978d03a34da90813c819d", "tree": "467e9082ad2d979a216b3c0f4f0dbb15c7462b08", "parents": [ "9e895ace5d82df8929b16f58e9f515f6d54ab82d" ], "author": { "name": "Jiang Liu", "email": "jiang.liu@huawei.com", "time": "Sun Jun 23 00:59:55 2013 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Sun Jun 23 00:59:55 2013 +0200" }, "message": "ACPI / dock: Initialize ACPI dock subsystem upfront\n\nCommit 3b63aaa70e1 (PCI: acpiphp: Do not use ACPI PCI subdriver\nmechanism) introduced an ACPI dock support regression, because it\nchanged the relative initialization order of the ACPI dock subsystem\nand the ACPI-based PCI hotplug (acpiphp).\n\nNamely, the ACPI dock subsystem has to be initialized before\nacpiphp_enumerate_slots() is first run, which after commit\n3b63aaa70e1 happens during the initial enumeration of the PCI\nhierarchy triggered by the initial ACPI namespace scan in\nacpi_scan_init(). For this reason, the dock subsystem has to be\ninitialized before the initial ACPI namespace scan in\nacpi_scan_init().\n\nTo make that happen, modify the ACPI dock subsystem to be\nnon-modular and add the invocation of its initialization routine,\nacpi_dock_init(), to acpi_scan_init() directly before the initial\nnamespace scan.\n\n[rjw: Changelog, removal of dock_exit().]\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d59501\nReported-and-tested-by: Alexander E. Patrakov \u003cpatrakov@gmail.com\u003e\nTested-by: Illya Klymov \u003cxanf@xanf.me\u003e\nSigned-off-by: Jiang Liu \u003cjiang.liu@huawei.com\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: 3.9+ \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "9e895ace5d82df8929b16f58e9f515f6d54ab82d", "tree": "acd2921e0411bb2d203f6c0331d164a815ab26da", "parents": [ "f3c15b0a128f7de42a0332107218ef747e48c288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:47:31 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:47:31 2013 -1000" }, "message": "Linux 3.10-rc7\n" }, { "commit": "f3c15b0a128f7de42a0332107218ef747e48c288", "tree": "aa1606cfc629647722c4909527311646fb147e08", "parents": [ "e10e57718544a321b97c036cf124d2a0b3f91d38", "8b6fd652641e5ab1892d092e73e83d49291ed638" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:44:45 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:44:45 2013 -1000" }, "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 Arnd Bergmann:\n \"These are two fixes that came in this week, one for a regression we\n introduced in 3.10 in the GIC interrupt code, and the other one fixes\n a typo in newly introduced code\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n irqchip: gic: call gic_cpu_init() as well in CPU_STARTING_FROZEN case\n ARM: dts: Correct the base address of pinctrl_3 on Exynos5250\n" }, { "commit": "e10e57718544a321b97c036cf124d2a0b3f91d38", "tree": "88dadc46ca90eff37a966fb9437f1fb216d2f4f3", "parents": [ "b71055beaaa7fddbbfd2a60644dcb308408f686c", "875979368eb4cfecff9f0e97625b90cc6009269d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:02:44 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:02:44 2013 -1000" }, "message": "Merge tag \u0027driver-core-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core fix from Greg Kroah-Hartman:\n \"Here\u0027s a single patch for the firmware core that resolves a reported\n oops in the firmware core that people have been hitting.\"\n\n* tag \u0027driver-core-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n firmware loader: fix use-after-free by double abort\n" }, { "commit": "b71055beaaa7fddbbfd2a60644dcb308408f686c", "tree": "c9bf86b9ca08c654d25fba37acd93a4c6ff7781f", "parents": [ "dcfdc28f300380ad31033aa0bfb8cf80f23c453a", "35a2fbc941accd0e9f1bfadd669311786118d874" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:01:47 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:01:47 2013 -1000" }, "message": "Merge tag \u0027usb-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are two USB patches for 3.10.\n\n One updates the Kconfig wording for CONFIG_USB_PHY to make it,\n hopefully, more obvious what this option is (I know you complained\n about this when it hit the tree.) The other is a new device id for a\n driver\"\n\n* tag \u0027usb-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n USB: serial: ti_usb_3410_5052: new device id for Abbot strip port cable\n usb: phy: Improve Kconfig help for CONFIG_USB_PHY\n" }, { "commit": "dcfdc28f300380ad31033aa0bfb8cf80f23c453a", "tree": "14fdc07ba17f7bb920057c785cf77c06d1039ca4", "parents": [ "67e5b2fad4e9848a954fd97de0509ec5cb6e6d47", "7c61c3d8f44d5d822f758754287af644307b4af9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:00:28 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 09:00:28 2013 -1000" }, "message": "Merge tag \u0027tty-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPul tty fixes from Greg Kroah-Hartman:\n \"Here are two tty core fixes that resolve some regressions that have\n been reported recently. Both tiny fixes, but needed\"\n\n* tag \u0027tty-3.10-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n tty: Fix transient pty write() EIO\n tty/vt: Return EBUSY if deallocating VT1 and it is busy\n" }, { "commit": "67e5b2fad4e9848a954fd97de0509ec5cb6e6d47", "tree": "2aeb8a41d628fbbabebf407079b62cf0283b58ce", "parents": [ "70a3067d55b31839720db1502eafd76f36a8c1af", "58807a524782744aed5fb7b8fefac7134721331a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:54:06 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:54:06 2013 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull SCSI target fixes from Nicholas Bellinger:\n \"Included is the recent tcm_qla2xxx residual underrun length fix from\n Roland, along with Joern\u0027s iscsi-target patch for session_lock\n breakage within iscsit_stop_time2retain_timer() code. Both are CC\u0027ed\n to stable.\n\n The remaining two are specific to recent iscsi-target + iser\n conversion changes. One drops some left-over debug noise, and Andy\u0027s\n patch fixes configfs attribute handling during an explicit network\n portal feature bit disable when iser-target is unsupported.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n iscsi-target: Remove left over v3.10-rc debug printks\n target/iscsi: Fix op\u003ddisable + error handling cases in np_store_iser\n tcm_qla2xxx: Fix residual for underrun commands that fail\n target/iscsi: don\u0027t corrupt bh_count in iscsit_stop_time2retain_timer()\n" }, { "commit": "70a3067d55b31839720db1502eafd76f36a8c1af", "tree": "ca7ea0d7a1b4e1c034db6b8f71a561b278d19f78", "parents": [ "b8ff768b5ab9d17204c1a8b3647ee6db608f63ab", "bb69ee27b96110c509d5b92c9ee541d81a821706" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:43:17 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:43:17 2013 -1000" }, "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 \"Another set of fixes for Kernel 3.10.\n\n This series contain:\n - two Kbuild fixes for randconfig\n - a buffer overflow when using rtl28xuu with r820t tuner\n - one clk fixup on exynos4-is driver\"\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:\n [media] Fix build when drivers are builtin and frontend modules\n [media] s5p makefiles: don\u0027t override other selections on obj-[ym]\n [media] exynos4-is: Fix FIMC-IS clocks initialization\n [media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner\n" }, { "commit": "b8ff768b5ab9d17204c1a8b3647ee6db608f63ab", "tree": "7be3d5a4ac5a8e3d68ab9259d69add29c2998a07", "parents": [ "f71194a7d47c1da787555d27aac63973ca72323b", "945fb136dfcb5291b4fb2abd4fd1edf790de44ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:42:20 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 22 08:42:20 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs fixes from Al Viro:\n \"Several fixes for bugs caught while looking through f_pos (ab)users\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n aout32 coredump compat fix\n splice: don\u0027t pass the address of -\u003ef_pos to methods\n mconsole: we\u0027d better initialize pos before passing it to vfs_read()...\n" }, { "commit": "945fb136dfcb5291b4fb2abd4fd1edf790de44ff", "tree": "a32b99fade5a47d619b1c9fa5613f49f84bfa9dc", "parents": [ "7995bd287134f6c8f80d94bebe7396f05a9bc42b" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jun 22 11:01:38 2013 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jun 22 11:01:38 2013 +0400" }, "message": "aout32 coredump compat fix\n\ndump_seek() does SEEK_CUR, not SEEK_SET; native binfmt_aout\nhandles it correctly (seeks by PAGE_SIZE - sizeof(struct user),\ngetting the current position to PAGE_SIZE), compat one seeks\nby PAGE_SIZE and ends up at PAGE_SIZE + already written...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f71194a7d47c1da787555d27aac63973ca72323b", "tree": "85ede7bda228024062469403ef085f90ac212c6a", "parents": [ "e61cd5e2e36746e5a4e791b9232aed39bce52ded", "df91c3513f9a1da5388a5d5972fe4f777fe0d516" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:33:48 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:33:48 2013 -1000" }, "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 series fixes a couple of build failures, and fixes MTRR cleanup\n and memory setup on very specific memory maps.\n\n Finally, it fixes triggering backtraces on all CPUs, which was\n inadvertently disabled on x86.\"\n\n* \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/efi: Fix dummy variable buffer allocation\n x86: Fix trigger_all_cpu_backtrace() implementation\n x86: Fix section mismatch on load_ucode_ap\n x86: fix build error and kconfig for ia32_emulation and binfmt\n range: Do not add new blank slot with add_range_with_merge\n x86, mtrr: Fix original mtrr range get for mtrr_cleanup\n" }, { "commit": "e61cd5e2e36746e5a4e791b9232aed39bce52ded", "tree": "9a9ba4b291698f94e00aaedbe6e4c551d7a51f5a", "parents": [ "64a2f30a89a3c26a5152b09f4d390b9d91cab0cc", "9aa36876ddeb85dfb0bcf37be06bbdc62e954f16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:33:06 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:33:06 2013 -1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm radeon fixes from Dave Airlie:\n \"One core fix, but mostly radeon fixes for s/r and big endian UVD\n support, and a fix to stop the GPU being reset for no good reason, and\n crashing people\u0027s machines.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/radeon: update lockup tracking when scheduling in empty ring\n drm/prime: Honor requested file flags when exporting a buffer\n drm/radeon: fix UVD on big endian\n drm/radeon: fix write back suspend regression with uvd v2\n drm/radeon: do not try to uselessly update virtual memory pagetable\n" }, { "commit": "64a2f30a89a3c26a5152b09f4d390b9d91cab0cc", "tree": "c6823ceef71ee0e031ce81932dd3b3b0ab504d2c", "parents": [ "9d0be540d73dc8256e8eff85285bd3b682e3c1d1", "b9e95fc65ededbec083aa91b4faa58ad992c0891" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:31:10 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:31:10 2013 -1000" }, "message": "Merge tag \u0027acpi-3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull ACPI fixes from Rafael Wysocki:\n\n - Fix for a regression causing a failure to turn on some devices on\n some systems during initialization introduced by a recent revert of\n an ACPI PM change that broke something else. Fortunately, we know\n exactly what devices are affected, so we can add a fix just for them\n leaving everyone else alone.\n\n - ACPI power resources initialization fix preventing a NULL pointer\n from being dereferenced in the acpi_add_power_resource() error code\n path.\n\n - ACPI dock station driver fix that adds missing locking to\n write_undock().\n\n - ACPI resources allocation fix changing the scope of an old workaround\n so that it doesn\u0027t affect systems that aren\u0027t actually buggy. This\n was reported a couple of days ago to fix DMA problems on some new\n platforms so we need it in -stable. From Mika Westerberg.\n\n* tag \u0027acpi-3.10-rc7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n ACPI / LPSS: Power up LPSS devices during enumeration\n ACPI / PM: Fix error code path for power resources initialization\n ACPI / dock: Take ACPI scan lock in write_undock()\n ACPI / resources: call acpi_get_override_irq() only for legacy IRQ resources\n" }, { "commit": "9d0be540d73dc8256e8eff85285bd3b682e3c1d1", "tree": "4b4f1f407f6499bca7fef1899a6263f3693c38a4", "parents": [ "92616ee65422d03930816250cb1e6ce7493cf14d", "07868fc6aaf57847b0f3a3d53086b7556eb83f4a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:29:22 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:29:22 2013 -1000" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fixes from Paolo Bonzini:\n \"Three one-line fixes for my first pull request; one for x86 host, one\n for x86 guest, one for PPC\"\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n x86: kvmclock: zero initialize pvclock shared memory area\n kvm/ppc/booke: Delay kvmppc_lazy_ee_enable\n KVM: x86: remove vcpu\u0027s CPL check in host-invoked XCR set\n" }, { "commit": "92616ee65422d03930816250cb1e6ce7493cf14d", "tree": "648ceee001f717be24058a4dad6b27f8232f9532", "parents": [ "7ecba6f2f3f6e862287e07908ba583199c7772a9", "fe6510b5d6349a8999b83ef7c5671e5a561b803a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:28:39 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:28:39 2013 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto fix from Herbert Xu:\n \"This fixes an unaligned crash in XTS mode when using aseni_intel\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: aesni_intel - fix accessing of unaligned memory\n" }, { "commit": "7ecba6f2f3f6e862287e07908ba583199c7772a9", "tree": "538719bb3395752dc1e1feba2bca94ee49c3a50e", "parents": [ "a3d5c3460a86f52ea435b3fb98be112bd18faabc", "3a96d5cd7bdce45d5dded75c3a62d4fb98050280" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:27:40 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 21 06:27:40 2013 -1000" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull Ceph fix from Sage Weil:\n \"This fixes a problem preventing the kernel and userland librbd\n libraries from sharing data with the new format 2 images\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: use the correct length for format 2 object names\n" }, { "commit": "df91c3513f9a1da5388a5d5972fe4f777fe0d516", "tree": "39c44a690d42d5a3cc521d8fd34c3eb6916452cf", "parents": [ "b52e0a7c4e4100f8683af508664e60e1603070f9", "b8cb62f82103083a6e8fa5470bfe634a2c06514d" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Jun 21 03:01:21 2013 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Jun 21 03:01:21 2013 -0700" }, "message": "Merge tag \u0027efi-urgent\u0027 into x86/urgent\n\n * Don\u0027t leak random kernel memory to EFI variable NVRAM when attempting\n to initiate garbage collection. Also, free the kernel memory when\n we\u0027re done with it instead of leaking - Ben Hutchings\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "cc0ee9873c6afafb387379ca1df25da78a08c603", "tree": "dba1298b5ed3619c0c500481e3011ee8be634383", "parents": [ "5548f98c46538d1da04eff179a52e50537d11465" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@linux.intel.com", "time": "Thu Jun 20 17:44:22 2013 +0300" }, "committer": { "name": "Mark Brown", "email": "broonie@linaro.org", "time": "Fri Jun 21 10:53:37 2013 +0100" }, "message": "spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()\n\nACPI part of the driver accidentally used sizeof(*ssp) instead of the\ncorrect sizeof(*pdata). This leads to nasty memory corruptions like the one\nbelow:\n\n BUG: unable to handle kernel paging request at 0000000749fd30b8\n IP: [\u003cffffffff813fe8a1\u003e] __list_del_entry+0x31/0xd0\n PGD 0\n Oops: 0000 [#1] PREEMPT SMP\n Modules linked in:\n CPU: 0 PID: 30 Comm: kworker/0:1 Not tainted 3.10.0-rc6v3.10-rc6_sdhci_modprobe+ #443\n task: ffff8801483a0940 ti: ffff88014839e000 task.ti: ffff88014839e000\n RIP: 0010:[\u003cffffffff813fe8a1\u003e] [\u003cffffffff813fe8a1\u003e] __list_del_entry+0x31/0xd0\n RSP: 0000:ffff88014839fde8 EFLAGS: 00010046\n RAX: ffff880149fd30b0 RBX: ffff880149fd3040 RCX: dead000000200200\n RDX: 0000000749fd30b0 RSI: ffff880149fd3058 RDI: ffff88014834d640\n RBP: ffff88014839fde8 R08: ffff88014834d640 R09: 0000000000000001\n R10: ffff8801483a0940 R11: 0000000000000001 R12: ffff880149fd3040\n R13: ffffffff810e0b30 R14: ffff8801483a0940 R15: ffff88014834d640\n FS: 0000000000000000(0000) GS:ffff880149e00000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n CR2: 0000000000000168 CR3: 0000000001e0b000 CR4: 00000000001407f0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Stack:\n ffff88014839fe48 ffffffff810e0baf ffffffff81120abd ffff88014839fe20\n ffff8801483a0940 ffff8801483a0940 ffff8801483a0940 ffff8801486b1c90\n ffff88014834d640 ffffffff810e0b30 0000000000000000 0000000000000000\n Call Trace:\n [\u003cffffffff810e0baf\u003e] worker_thread+0x7f/0x390\n [\u003cffffffff81120abd\u003e] ? trace_hardirqs_on+0xd/0x10\n [\u003cffffffff810e0b30\u003e] ? manage_workers.isra.22+0x2b0/0x2b0\n [\u003cffffffff810e6c09\u003e] kthread+0xd9/0xe0\n [\u003cffffffff810f93df\u003e] ? local_clock+0x3f/0x50\n [\u003cffffffff810e6b30\u003e] ? kthread_create_on_node+0x110/0x110\n [\u003cffffffff818c5dec\u003e] ret_from_fork+0x7c/0xb0\n [\u003cffffffff810e6b30\u003e] ? kthread_create_on_node+0x110/0x110\n\nFix this by using the right structure size in devm_kzalloc().\n\nReported-by: Jerome Blin \u003cjerome.blin@intel.com\u003e\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@linux.intel.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@linaro.org\u003e\nCc: stable@vger.kernel.org # 3.9+\n" }, { "commit": "b8cb62f82103083a6e8fa5470bfe634a2c06514d", "tree": "62367f3923a90603697cac95557521eec5c161bb", "parents": [ "f8b8404337de4e2466e2e1139ea68b1f8295974f" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Jun 16 21:27:12 2013 +0100" }, "committer": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Fri Jun 21 10:52:49 2013 +0100" }, "message": "x86/efi: Fix dummy variable buffer allocation\n\n1. Check for allocation failure\n2. Clear the buffer contents, as they may actually be written to flash\n3. Don\u0027t leak the buffer\n\nCompile-tested only.\n\n[ Tested successfully on my buggy ASUS machine - Matt ]\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\n" }, { "commit": "58807a524782744aed5fb7b8fefac7134721331a", "tree": "e3aa05aed56050f0a0849998655a887701e9c8fb", "parents": [ "58bd0c69ffa27ea2309959836811e88004d73720" ], "author": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Thu Jun 20 16:36:17 2013 -0700" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Thu Jun 20 16:47:41 2013 -0700" }, "message": "iscsi-target: Remove left over v3.10-rc debug printks\n\nReported-by: Andy Grover \u003cagrover@redhat.com\u003e\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "58bd0c69ffa27ea2309959836811e88004d73720", "tree": "5828e17a3a7708e55b511e88affeea0f3172a9ef", "parents": [ "b5aff3d2747bea08b386edd070941a45611ffe51" ], "author": { "name": "Andy Grover", "email": "agrover@redhat.com", "time": "Wed May 29 12:05:59 2013 -0700" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Thu Jun 20 16:47:32 2013 -0700" }, "message": "target/iscsi: Fix op\u003ddisable + error handling cases in np_store_iser\n\nWriting 0 when iser was not previously enabled, so succeed but do\nnothing so that user-space code doesn\u0027t need a try: catch block\nwhen ib_isert logic is not available.\n\nAlso, return actual error from add_network_portal using PTR_ERR\nduring op\u003denable failure.\n\nSigned-off-by: Andy Grover \u003cagrover@redhat.com\u003e\nSigned-off-by: Nicholas Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "9aa36876ddeb85dfb0bcf37be06bbdc62e954f16", "tree": "5162ac17fb8814935f81d4f90c700f1e708138f6", "parents": [ "784a4d5539eaff3316933f8f3dc2fdad5a9b9f4d", "8444d5c69549aa0f0b574cc608742d4669e1cc01" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jun 21 08:52:19 2013 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jun 21 08:52:19 2013 +1000" }, "message": "Merge branch \u0027drm-fixes-3.10\u0027 of git://people.freedesktop.org/~agd5f/linux into drm-fixes\n\nOne user visible fix to stop misreport GPU hangs and subsequent resets.\n* \u0027drm-fixes-3.10\u0027 of git://people.freedesktop.org/~agd5f/linux:\n drm/radeon: update lockup tracking when scheduling in empty ring\n" }, { "commit": "8444d5c69549aa0f0b574cc608742d4669e1cc01", "tree": "59f7dde4636afd2260815d7d5beda15c0f42f3ab", "parents": [ "c139b1ee4e36374af705660af6172d7477352792" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Jun 19 10:02:28 2013 -0400" }, "committer": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Jun 20 14:45:08 2013 -0400" }, "message": "drm/radeon: update lockup tracking when scheduling in empty ring\n\nThere might be issue with lockup detection when scheduling on an\nempty ring that have been sitting idle for a while. Thus update\nthe lockup tracking data when scheduling new work in an empty ring.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nTested-by: Andy Lutomirski \u003cluto@amacapital.net\u003e\nCc: stable@vger.kernel.org\nReviewed-by: Christian König \u003cchristian.koenig@amd.com\u003e\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\n" }, { "commit": "a3d5c3460a86f52ea435b3fb98be112bd18faabc", "tree": "48a32968b569af0e0f0af1def3effa0770710fea", "parents": [ "86c76676cfdbf283f6131d5a2783bed3f3d490ea", "29bb9e5a75684106a37593ad75ec75ff8312731b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:18:35 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:18:35 2013 -1000" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar:\n \"Two smaller fixes - plus a context tracking tracing fix that is a bit\n bigger\"\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tracing/context-tracking: Add preempt_schedule_context() for tracing\n sched: Fix clear NOHZ_BALANCE_KICK\n sched/x86: Construct all sibling maps if smt\n" }, { "commit": "86c76676cfdbf283f6131d5a2783bed3f3d490ea", "tree": "a4062bcf58783950768e68fcd5321ce0630fd9fc", "parents": [ "805e318548fa0f6007bcece06bde1ddd9393246c", "f1a527899ef0a8a241eb3bea619eb2e29d797f44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:17:36 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:17:36 2013 -1000" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"Four fixes. The mmap ones are unfortunately larger than desired -\n fuzzing uncovered bugs that needed perf context life time management\n changes to fix properly\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf/x86: Fix broken PEBS-LL support on SNB-EP/IVB-EP\n perf: Fix mmap() accounting hole\n perf: Fix perf mmap bugs\n kprobes: Fix to free gone and unused optprobes\n" }, { "commit": "805e318548fa0f6007bcece06bde1ddd9393246c", "tree": "421f6d22d9b57289110da25520f0104e0bd338b6", "parents": [ "4db88eb4c300333ed37585f75ab9a664ec537d68", "29ce3785b22da47c49f4ef6e14b9014fa5dee261" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:16:07 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:16:07 2013 -1000" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull cpu idle fixes from Thomas Gleixner:\n - Add a missing irq enable. Fallout of the idle conversion\n - Fix stackprotector wreckage caused by the idle conversion\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n idle: Enable interrupts in the weak arch_cpu_idle() implementation\n idle: Add the stack canary init to cpu_startup_entry()\n" }, { "commit": "4db88eb4c300333ed37585f75ab9a664ec537d68", "tree": "08b65728c54965970d711131dd83077ebb97b407", "parents": [ "53d5defcfa8c9603554a3174cbe206fb69f6e8ef", "f5d00c1f9adb350c24c5301600f7bf2da99b66de" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:15:13 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:15:13 2013 -1000" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Thomas Gleixner:\n - Fix inconstinant clock usage in virtual time accounting\n - Fix a build error in KVM caused by the NOHZ work\n - Remove a pointless timekeeping duty assignment which breaks NOHZ\n - Use a proper notifier return value to avoid random behaviour\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tick: Remove useless timekeeping duty attribution to broadcast source\n nohz: Fix notifier return val that enforce timekeeping\n kvm: Move guest entry/exit APIs to context_tracking\n vtime: Use consistent clocks among nohz accounting\n" }, { "commit": "53d5defcfa8c9603554a3174cbe206fb69f6e8ef", "tree": "2b1429170872fce52b88f48cdef565d104fdf1df", "parents": [ "f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8", "8bbd9f04b7d982d1c6aeb5c08f5983b3d0b9e2fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:08:46 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:08:46 2013 -1000" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fix fro, Benjamin Herrenschmidt:\n \"We accidentally broke hugetlbfs on Freescale embedded processors which\n use a slightly different page table layout than our server processors\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix bad pmd error with book3E config\n" }, { "commit": "f92d0dc95d137c0abe7d1478d6e7d2cf4ca5fce8", "tree": "4229aa4d6a69ecb7b7b6798ad836bb1250bd695a", "parents": [ "fd58b517e593ed4f54d8c8b47613928c2066c046", "3cb3f839d306443f3d1e79b0bde1a2ad2c12b555" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:07:42 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:07:42 2013 -1000" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull tilepro fix from Chris Metcalf:\n \"This change allows the older tilepro architecture to be correctly\n built by newer gccs, despite a change that caused gcc to start trying\n to use an out-of-line implementation for __builtin_ffsll().\n\n This should be inline again starting with gcc 4.7.4 and 4.8.2 or so,\n but meanwhile this change keeps things from breaking, with the only\n cost being a few bytes of code in the kernel to provide __ffsdi2 even\n for compilers that do inline it\"\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n tilepro: work around module link error with gcc 4.7\n" }, { "commit": "fd58b517e593ed4f54d8c8b47613928c2066c046", "tree": "16ca5856a2ae65a6885260b74f248aee454fabf7", "parents": [ "c0691143dfe1d42ec9bd89de5921ccb6a27ea1b3", "abc41254181e901ef5eda2c884ca6cd88a186b6d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:06:48 2013 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 20 08:06:48 2013 -1000" }, "message": "Merge tag \u0027arm64-stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull arm64 perf fix from Catalin Marinas:\n \"Perf fix (user-mode PC recording)\"\n\n* tag \u0027arm64-stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:\n perf: arm64: Record the user-mode PC in the call chain.\n" }, { "commit": "c790b0ad23f427c7522ffed264706238c57c007e", "tree": "b05dfd247ea14cbba3931b44614635b0de4760fd", "parents": [ "8b4d801b2b123b6c09742f861fe44a8527b84d47" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Jun 20 17:50:09 2013 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Jun 20 17:57:01 2013 +0200" }, "message": "hw_breakpoint: Use cpu_possible_mask in {reserve,release}_bp_slot()\n\nfetch_bp_busy_slots() and toggle_bp_slot() use\nfor_each_online_cpu(), this is obviously wrong wrt cpu_up() or\ncpu_down(), we can over/under account the per-cpu numbers.\n\nFor example:\n\n\t# echo 0 \u003e\u003e /sys/devices/system/cpu/cpu1/online\n\t# perf record -e mem:0x10 -p 1 \u0026\n\t# echo 1 \u003e\u003e /sys/devices/system/cpu/cpu1/online\n\t# perf record -e mem:0x10,mem:0x10,mem:0x10,mem:0x10 -C1 -a \u0026\n\t# taskset -p 0x2 1\n\ntriggers the same WARN_ONCE(\"Can\u0027t find any breakpoint slot\") in\narch_install_hw_breakpoint().\n\nReported-by: Vince Weaver \u003cvincent.weaver@maine.edu\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nLink: http://lkml.kernel.org/r/20130620155009.GA6327@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "8b4d801b2b123b6c09742f861fe44a8527b84d47", "tree": "12f820394b663a494bc70d63307fad8589a497ef", "parents": [ "003002e04ed38618fc37b92ba128f5ca79d39f4f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Jun 20 17:50:06 2013 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Jun 20 17:57:00 2013 +0200" }, "message": "hw_breakpoint: Fix cpu check in task_bp_pinned(cpu)\n\ntrinity fuzzer triggered WARN_ONCE(\"Can\u0027t find any breakpoint\nslot\") in arch_install_hw_breakpoint() but the problem is not\narch-specific.\n\nThe problem is, task_bp_pinned(cpu) checks \"cpu \u003d\u003d iter-\u003ecpu\"\nbut this doesn\u0027t account the \"all cpus\" events with iter-\u003ecpu \u003c\n0.\n\nThis means that, say, register_user_hw_breakpoint(tsk) can\nhappily create the arbitrary number \u003e HBP_NUM of breakpoints\nwhich can not be activated. toggle_bp_task_slot() is equally\nwrong by the same reason and nr_task_bp_pinned[] can have\nnegative entries.\n\nSimple test:\n\n\t# perl -e \u0027sleep 1 while 1\u0027 \u0026\n\t# perf record -e mem:0x10,mem:0x10,mem:0x10,mem:0x10,mem:0x10 -p `pidof perl`\n\nBefore this patch this triggers the same problem/WARN_ON(),\nafter the patch it correctly fails with -ENOSPC.\n\nReported-by: Vince Weaver \u003cvincent.weaver@maine.edu\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nLink: http://lkml.kernel.org/r/20130620155006.GA6324@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "7995bd287134f6c8f80d94bebe7396f05a9bc42b", "tree": "7e94bb13bb30b8549892ed93e0e5b11d8b642bc2", "parents": [ "c9036e9f3b2b77f678572260e1ef1075fcb08c36" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Jun 20 18:58:36 2013 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Jun 20 19:02:45 2013 +0400" }, "message": "splice: don\u0027t pass the address of -\u003ef_pos to methods\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bb69ee27b96110c509d5b92c9ee541d81a821706", "tree": "3ce3f8b42fc1b543229bc8d87d624baf1f43f57e", "parents": [ "5f63adbb4cb9f952a8daee97f89c8811da5fd68a" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jun 20 10:35:53 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jun 20 10:35:53 2013 -0300" }, "message": "[media] Fix build when drivers are builtin and frontend modules\n\nThere are a large number of reports that the media build is\nnot compiling when some drivers are compiled as builtin, while\nthe needed frontends are compiled as module.\n\nOn the last one of such reports:\n\tFrom: kbuild test robot \u003cfengguang.wu@intel.com\u003e\n\tSubject: saa7134-dvb.c:undefined reference to `zl10039_attach\u0027\n\nThe .config file has:\n\n\tCONFIG_VIDEO_SAA7134\u003dy\n\tCONFIG_VIDEO_SAA7134_DVB\u003dy\n\t# CONFIG_MEDIA_ATTACH is not set\n\tCONFIG_DVB_ZL10039\u003dm\n\nAnd it produces all those errors:\n\n drivers/built-in.o: In function `set_type\u0027:\n tuner-core.c:(.text+0x2f263e): undefined reference to `tea5767_attach\u0027\n tuner-core.c:(.text+0x2f273e): undefined reference to `tda9887_attach\u0027\n drivers/built-in.o: In function `tuner_probe\u0027:\n tuner-core.c:(.text+0x2f2d20): undefined reference to `tea5767_autodetection\u0027\n drivers/built-in.o: In function `av7110_attach\u0027:\n av7110.c:(.text+0x330bda): undefined reference to `ves1x93_attach\u0027\n av7110.c:(.text+0x330bf7): undefined reference to `stv0299_attach\u0027\n av7110.c:(.text+0x330c63): undefined reference to `tda8083_attach\u0027\n av7110.c:(.text+0x330d09): undefined reference to `ves1x93_attach\u0027\n av7110.c:(.text+0x330d33): undefined reference to `tda8083_attach\u0027\n av7110.c:(.text+0x330d5d): undefined reference to `stv0297_attach\u0027\n av7110.c:(.text+0x330dbe): undefined reference to `stv0299_attach\u0027\n drivers/built-in.o: In function `tuner_attach_dtt7520x\u0027:\n ngene-cards.c:(.text+0x3381cb): undefined reference to `dvb_pll_attach\u0027\n drivers/built-in.o: In function `demod_attach_lg330x\u0027:\n ngene-cards.c:(.text+0x33828a): undefined reference to `lgdt330x_attach\u0027\n drivers/built-in.o: In function `demod_attach_stv0900\u0027:\n ngene-cards.c:(.text+0x3383d5): undefined reference to `stv090x_attach\u0027\n drivers/built-in.o: In function `cineS2_probe\u0027:\n ngene-cards.c:(.text+0x338b7f): undefined reference to `drxk_attach\u0027\n drivers/built-in.o: In function `configure_tda827x_fe\u0027:\n saa7134-dvb.c:(.text+0x346ae7): undefined reference to `tda10046_attach\u0027\n drivers/built-in.o: In function `dvb_init\u0027:\n saa7134-dvb.c:(.text+0x347283): undefined reference to `mt352_attach\u0027\n saa7134-dvb.c:(.text+0x3472cd): undefined reference to `mt352_attach\u0027\n saa7134-dvb.c:(.text+0x34731c): undefined reference to `tda10046_attach\u0027\n saa7134-dvb.c:(.text+0x34733c): undefined reference to `tda10046_attach\u0027\n saa7134-dvb.c:(.text+0x34735c): undefined reference to `tda10046_attach\u0027\n saa7134-dvb.c:(.text+0x347378): undefined reference to `tda10046_attach\u0027\n saa7134-dvb.c:(.text+0x3473db): undefined reference to `tda10046_attach\u0027\n drivers/built-in.o:saa7134-dvb.c:(.text+0x347502): more undefined references to `tda10046_attach\u0027 follow\n drivers/built-in.o: In function `dvb_init\u0027:\n saa7134-dvb.c:(.text+0x347812): undefined reference to `mt352_attach\u0027\n saa7134-dvb.c:(.text+0x347951): undefined reference to `mt312_attach\u0027\n saa7134-dvb.c:(.text+0x3479a9): undefined reference to `mt312_attach\u0027\n\u003e\u003e saa7134-dvb.c:(.text+0x3479c1): undefined reference to `zl10039_attach\u0027\n\nThis is happening because a builtin module can\u0027t use directly a symbol\nfound on a module. By enabling CONFIG_MEDIA_ATTACH, the configuration\nbecomes valid, as dvb_attach() macro loads the module if needed, making\nthe symbol available to the builtin module.\n\nWhile this bug started to appear after the patches that use IS_DEFINED\nmacro (like changeset 7b34be71db533f3e0cf93d53cf62d036cdb5418a), this\nbug is a way ancient than that.\n\nThe thing is that, before the IS_DEFINED() patches, the logic used to be:\n\n \u0026\u0026 defined(MODULE))\nstruct dvb_frontend *zl10039_attach(struct dvb_frontend *fe,\n\t\t\t\t\tu8 i2c_addr,\n\t\t\t\t\tstruct i2c_adapter *i2c);\nstatic inline struct dvb_frontend *zl10039_attach(struct dvb_frontend *fe,\n\t\t\t\t\tu8 i2c_addr,\n\t\t\t\t\tstruct i2c_adapter *i2c)\n{\n\tprintk(KERN_WARNING \"%s: driver disabled by Kconfig\\n\", __func__);\n\treturn NULL;\n}\n\nThe above code, with the .config file used, was evoluting to FALSE\n(instead of TRUE as it should be, as CONFIG_DVB_ZL10039 is \u0027m\u0027),\nand were adding the static inline code at saa7134-dvb, instead\nof the external call. So, while it weren\u0027t producing any compilation\nerror, the code weren\u0027t working either.\n\nSo, as the overhead for using CONFIG_MEDIA_ATTACH is minimal, just\nenable it, if MODULES is defined.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" } ], "next": "8b6fd652641e5ab1892d092e73e83d49291ed638" }