)]}' { "log": [ { "commit": "de248a75c35e0208294cf304b112916254b69184", "tree": "0d00a02fdb994f8b1cbf239c11080fec86977639", "parents": [ "2d319508a3551d2995e5cd12d649821b3be00e5b" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Wed Apr 25 23:43:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 06:13:51 2012 -0400" }, "message": "tcp repair: Fix unaligned access when repairing options (v2)\n\nDon\u0027t pick __u8/__u16 values directly from raw pointers, but instead use\nan array of structures of code:value pairs. This is OK, since the buffer\nwe take options from is not an skb memory, but a user-to-kernel one.\n\nFor those options which don\u0027t require any value now, require this to be\nzero (for potential future extension of this API).\n\nv2: Changed tcp_repair_opt to use two __u32-s as spotted by David Laight.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8dcf01fc009d12d01fd195ed95eaaee61178f21a", "tree": "daa9665ec6c4fe8ca17232242c8b3126e7b14076", "parents": [ "808db80a7eeff8314ac51654bfefc864582eea13" ], "author": { "name": "Shan Wei", "email": "davidshan@tencent.com", "time": "Tue Apr 24 18:21:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 25 20:46:59 2012 -0400" }, "message": "net: sock_diag_handler structs can be const\n\nread only, so change it to const.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38ba0a65faf451dd46c7860b4fade84c0b8e444f", "tree": "30689f565d6ff6a0b046e0c8b05a5aa7544144dd", "parents": [ "783c175f902b1ae011f12de45770e7912638ea1a" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 23 17:48:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 24 00:18:02 2012 -0400" }, "message": "net: skb_can_coalesce returns a boolean\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f24001941c99776f41bd3f09c07d91205c2ad9d4", "tree": "0ab31480ccdf343b61db045e195d096068ef7c73", "parents": [ "a108d5f35adc5c5d5cdc882dc0bb920565551bff", "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:14:36 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:15:17 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nFix merge between commit 3adadc08cc1e (\"net ax25: Reorder ax25_exit to\nremove races\") and commit 0ca7a4c87d27 (\"net ax25: Simplify and\ncleanup the ax25 sysctl handling\")\n\nThe former moved around the sysctl register/unregister calls, the\nlater simply removed them.\n\nWith help from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "205b9c9c6eb9c309759ff1e52ffa85ae8965b382", "tree": "4ca6761d0fd5bc5b04bd2b059bfe8cbd59c067f6", "parents": [ "7e296295437d3e54662e9e217fb20330e3c38f6f", "446f6d06fab0b49c61887ecbe8286d6aaa796637" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:07:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:07:51 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"Here are a few fixes for powerpc. Note the addition to the generic\n irq.h. This is part of a 3-patches regression fix for mpic due to\n changes in how IRQ_TYPE_NONE is being handled. Thomas agreed to the\n addition of the new IRQ_TYPE_DEFAULT contant, however he hasn\u0027t\n replied with an Ack to the actual patch yet. I don\u0027t to wait much\n longer with these patches tho.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/mpic: Properly set default triggers\n irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers\n powerpc/mpic: Fix confusion between hw_irq and virq\n powerpc/pmac: Don\u0027t add_timer() twice\n powerpc/eeh: Fix crash caused by null eeh_dev\n powerpc/mpc85xx: add MPIC message dts node\n powerpc/mpic_msgr: fix offset error when setting mer register\n powerpc/mpic_msgr: add lock for MPIC message global variable\n powerpc/mpic_msgr: fix compile error when SMP disabled\n powerpc: fix build when CONFIG_BOOKE_WDT is enabled\n powerpc/85xx: don\u0027t call of_platform_bus_probe() twice\n" }, { "commit": "7e296295437d3e54662e9e217fb20330e3c38f6f", "tree": "ff3385c8a7615f9fa1c8fe1b6bc0406559afe62f", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c", "d135c522f1234f62e81be29cebdf59e9955139ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:02:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:02:57 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix namespace init and cleanup in phonet to fix some oopses, from\n Eric W. Biederman.\n\n 2) Missing kfree_skb() in AF_KEY, from Julia Lawall.\n\n 3) Refcount leak and source address handling fix in l2tp from James\n Chapman.\n\n 4) Memory leak fix in CAIF from Tomasz Gregorek.\n\n 5) When routes are cloned from ipv6 addrconf routes, we don\u0027t process\n expirations properly. Fix from Gao Feng.\n\n 6) Fix panic on DMA errors in atl1 driver, from Tony Zelenoff.\n\n 7) Only enable interrupts in 8139cp driver after we\u0027ve registered the\n IRQ handler. From Jason Wang.\n\n 8) Fix too many reads of KS_CIDER register in ks8851 during probe,\n fixing crashes on spurious interrupts. From Matt Renzelmann.\n\n 9) Missing include in ath5k driver and missing iounmap on probe\n failure, from Jonathan Bither.\n\n10) Fix RX packet handling in smsc911x driver, from Will Deacon.\n\n11) Fix ixgbe WoL on fiber by leaving the laser on during shutdown.\n\n12) ks8851 needs MAX_RECV_FRAMES increased otherwise the internal MAC\n buffers are easily overflown. Fix from Davide Cimingahi.\n\n13) Fix memory leaks in peak_usb CAN driver, from Jesper Juhl.\n\n14) gred packet scheduler can dump in WRED more when doing a netlink\n dump. Fix from David Ward.\n\n15) Fix MTU in USB smsc75xx driver, from Stephane Fillod.\n\n16) Dummy device needs -\u003endo_uninit handler to properly handle\n -\u003endo_init failures. From Hiroaki SHIMODA.\n\n17) Fix TX fragmentation in ath9k driver, from Sujith Manoharan.\n\n18) Missing RTNL lock in ixgbe PM resume, from Benjamin Poirier.\n\n19) Missing iounmap in farsync WAN driver, from Julia Lawall.\n\n20) With LRO/GRO, tcp_grow_window() is easily tricked into not growing\n the receive window properly, and this hurts performance. Fix from\n Eric Dumazet.\n\n21) Network namespace init failure can leak net_generic data, fix from\n Julian Anastasov.\n\n22) Fix skb_over_panic due to mis-accounting in TCP for partially ACK\u0027d\n SKBs. From Eric Dumazet.\n\n23) New IDs for qmi_wwan driver, from Bjørn Mork.\n\n24) Fix races in ax25_exit(), from Eric W. Biederman.\n\n25) IPV6 TCP doesn\u0027t handle TCP_MAXSEG socket option properly, copy over\n logic from the IPV4 side. From Neal Cardwell.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)\n tcp: fix TCP_MAXSEG for established IPv6 passive sockets\n drivers/net: Do not free an IRQ if its request failed\n drop_monitor: allow more events per second\n ks8851: Fix request_irq/free_irq mismatch\n net/hyperv: Adding cancellation to ensure rndis filter is closed\n ks8851: Fix mutex deadlock in ks8851_net_stop()\n net ax25: Reorder ax25_exit to remove races.\n icplus: fix interrupt for IC+ 101A/G and 1001LF\n net: qmi_wwan: support Sierra Wireless MC77xx devices in QMI mode\n bnx2x: off by one in bnx2x_ets_e3b0_sp_pri_to_cos_set()\n ksz884x: don\u0027t copy too much in netdev_set_mac_address()\n tcp: fix retransmit of partially acked frames\n netns: do not leak net_generic data on failed init\n net/sock.h: fix sk_peek_off kernel-doc warning\n tcp: fix tcp_grow_window() for large incoming frames\n drivers/net/wan/farsync.c: add missing iounmap\n davinci_mdio: Fix MDIO timeout check\n ipv6: clean up rt6_clean_expires\n ipv6: fix rt6_update_expires\n arcnet: rimi: Fix device name in debug output\n ...\n" }, { "commit": "3fca40c704dd013797f2c0c518f37cd2cc8e19fe", "tree": "250169398a74aca872c11717135f84826cbfbdad", "parents": [ "3a2b4f7c355ff1c97e4adebadf0a1aefd7c4518a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Apr 19 17:29:42 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 23 11:04:29 2012 +1000" }, "message": "irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers\n\nThis is meant typically to allow a PIC driver\u0027s irq domain map() callback\nto establish sane defaults for the interrupt (and make sure that the HW\nand the irq_desc are in sync as far as the trigger is concerned).\n\nThe irq core may not call the set_trigger callback if it thinks the\ntrigger is already set to the right setting, so we need to ensure new\ndescriptors are properly synchronized with the hardware.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "19a0b58e506b06fd41659d8734bba6a3e87980f4", "tree": "f9844eaf9d1471c6fcd98c850b1ed6cd57f2bce3", "parents": [ "4c78bb845bd2aaf1f7136e75314c7d034cfd120f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Fri Apr 20 04:42:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 16:26:33 2012 -0400" }, "message": "team: allow to enable/disable ports\n\nThis patch changes content of hashlist (used to get port struct by\ncomputed index (0...en_port_count-1)). Now the hash list contains only\nenabled ports so userspace will be able to say what ports can be used\nfor tx/rx. This becomes handy when userspace will need to disable ports\nwhich does not belong to active aggregator. By default, newly added port\nis enabled.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b139ba4e90dccbf4cd4efb112af96a5c9e0b098c", "tree": "c955ff09255e74b8cc991dfa6f67853668a3b3c4", "parents": [ "5e6a3ce6573f0c519d1ff57df60e3877bb2d3151" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Apr 19 03:41:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 15:52:25 2012 -0400" }, "message": "tcp: Repair connection-time negotiated parameters\n\nThere are options, which are set up on a socket while performing\nTCP handshake. Need to resurrect them on a socket while repairing.\nA new sockoption accepts a buffer and parses it. The buffer should\nbe CODE:VALUE sequence of bytes, where CODE is standard option\ncode and VALUE is the respective value.\n\nOnly 4 options should be handled on repaired socket.\n\nTo read 3 out of 4 of these options the TCP_INFO sockoption can be\nused. An ability to get the last one (the mss_clamp) was added by\nthe previous patch.\n\nNow the restore. Three of these options -- timestamp_ok, mss_clamp\nand snd_wscale -- are just restored on a coket.\n\nThe sack_ok flags has 2 issues. First, whether or not to do sacks\nat all. This flag is just read and set back. No other sack info is\nsaved or restored, since according to the standart and the code\ndropping all sack-ed segments is OK, the sender will resubmit them\nagain, so after the repair we will probably experience a pause in\nconnection. Next, the fack bit. It\u0027s just set back on a socket if\nthe respective sysctl is set. No collected stats about packets flow\nis preserved. As far as I see (plz, correct me if I\u0027m wrong) the\nfack-based congestion algorithm survives dropping all of the stats\nand repairs itself eventually, probably losing the performance for\nthat period.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee9952831cfd0bbe834f4a26489d7dce74582e37", "tree": "64c195fa45e1a200f38d68751161d8e06dfb5a6c", "parents": [ "370816aef0c5436c2adbec3966038f36ca326933" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Apr 19 03:40:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 15:52:25 2012 -0400" }, "message": "tcp: Initial repair mode\n\nThis includes (according the the previous description):\n\n* TCP_REPAIR sockoption\n\nThis one just puts the socket in/out of the repair mode.\nAllowed for CAP_NET_ADMIN and for closed/establised sockets only.\nWhen repair mode is turned off and the socket happens to be in\nthe established state the window probe is sent to the peer to\n\u0027unlock\u0027 the connection.\n\n* TCP_REPAIR_QUEUE sockoption\n\nThis one sets the queue which we\u0027re about to repair. The\n\u0027no-queue\u0027 is set by default.\n\n* TCP_QUEUE_SEQ socoption\n\nSets the write_seq/rcv_nxt of a selected repaired queue.\nAllowed for TCP_CLOSE-d sockets only. When the socket changes\nits state the other seq-s are changed by the kernel according\nto the protocol rules (most of the existing code is actually\nreused).\n\n* Ability to forcibly bind a socket to a port\n\nThe sk-\u003esk_reuse is set to SK_FORCE_REUSE.\n\n* Immediate connect modification\n\nThe connect syscall initializes the connection, then directly jumps\nto the code which finalizes it.\n\n* Silent close modification\n\nThe close just aborts the connection (similar to SO_LINGER with 0\ntime) but without sending any FIN/RST-s to peer.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "126a3483d6e3c3370a2c7976073a0f4a5c942318", "tree": "1c176fe1ed331b93463440c50c249a9eb7ef2496", "parents": [ "8898159650093e9eee8829e30a9139b4273a0ac4", "7c5709194096beea1ab6e6db46768d70a068efb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:44:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:44:37 2012 -0700" }, "message": "Merge tag \u0027mmc-fixes-for-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC fixes from Chris Ball:\n - Build fix for omap_hsmmc with OF against 3.4-rc1.\n - Fix CONFIG_MMC_UNSAFE_RESUME semantics regression against 3.3, which\n broke hotplug card detection when UNSAFE_RESUME is set.\n - Fix a race condition in omap_hsmmc with runtime PM.\n - Fix two libertas SDIO-powered-resume regressions.\n - Small fixes for discard/sanitize, dw_mmc, cd-gpio and esdhc-imx.\n\n* tag \u0027mmc-fixes-for-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: core: Do not pre-claim host in suspend\n mmc: dw_mmc: prevent NULL dereference for dma_ops\n mmc: unbreak sdhci-esdhc-imx on i.MX25\n mmc: cd-gpio: Include header to pickup exported symbol prototypes\n mmc: sdhci: refine non-removable card checking for card detection\n mmc: dw_mmc: Fix switch from DMA to PIO\n mmc: remove MMC bus legacy suspend/resume method\n mmc: omap_hsmmc: Get rid of of_have_populated_dt() usage\n mmc: omap_hsmmc: build fix for CONFIG_OF\u003dy and CONFIG_MMC_OMAP_HS\u003dm\n mmc: fixes for eMMC v4.5 sanitize operation\n mmc: fixes for eMMC v4.5 discard operation\n" }, { "commit": "9f24ff6f4236f117729bdb2fe8b0c202ce86098f", "tree": "103ac64430efbb0340940fa95d5ad336b29b01de", "parents": [ "bfce281c287a427d0841fadf5d59242757b4e620", "82ea267f7dc853a5e6a724916a70a10656efdfc2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:42:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:42:12 2012 -0700" }, "message": "Merge tag \u0027mfd-for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull MFD fixes from Samuel Ortiz:\n \"We have 3 build fixes, a OMAP USB host PHY reset fix and the twl6040\n conversion to an i2c driver. The latter may not sound like a fix but\n the twl6040 MFD driver won\u0027t probe without it, triggering an OMAP4\n audio regression.\"\n\n* tag \u0027mfd-for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Fix modular builds of rc5t583 regulator support\n mfd: Fix asic3_gpio_to_irq\n ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue\n mfd: Convert twl6040 to i2c driver, and separate it from twl core\n mfd : Fix dbx500 compilation error\n" }, { "commit": "bfce281c287a427d0841fadf5d59242757b4e620", "tree": "abca9ebeef4c668021e85e4d54e6e779121e92cc", "parents": [ "9f3a4afb276e4d8b3be7f3e678d4dbd11470416f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 20 21:57:04 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 21 01:58:20 2012 -0400" }, "message": "kill mm argument of vm_munmap()\n\nit\u0027s always current-\u003emm\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a5347fe36b313c07d59b065d00a8fa56362c5f97", "tree": "8778711b514baca6f5686777c0dea245a8874711", "parents": [ "ec8f23ce0f4005b74013d4d122e0d540397a93c9" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Apr 19 13:45:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 20 21:22:30 2012 -0400" }, "message": "net: Delete all remaining instances of ctl_path\n\nWe don\u0027t use struct ctl_path anymore so delete the exported constants.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32d317c60e56c2a34463b51fc0336cc96b3e1735", "tree": "170c8d9ee71358a242fa1f7edb3fa073714eaacc", "parents": [ "4d048f915f32c8455605b106aa0de2cf68a71903" ], "author": { "name": "Chuanxiao Dong", "email": "chuanxiao.dong@intel.com", "time": "Wed Apr 11 19:54:38 2012 +0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Fri Apr 20 20:30:19 2012 -0400" }, "message": "mmc: remove MMC bus legacy suspend/resume method\n\nMMC bus is using legacy suspend/resume method, which is not compatible if\nruntime pm callbacks are used. In this scenario, MMC bus suspend/resume\ncallbacks cannot be called when system entering S3. So change to use the\nnew defined dev_pm_ops for system sleeping mode.\n\nTested on AM335x Platform. Solves major issue/crash reported at\nhttp://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html\n\nSigned-off-by: Chuanxiao Dong \u003cchuanxiao.dong@intel.com\u003e\nTested-by: Hebbar, Gururaja \u003cgururaja.hebbar@ti.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Ulf Hansson \u003culf.hansson@stericsson.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6be5ceb02e98eaf6cfc4f8b12a896d04023f340d", "tree": "f34de1392300bbf63549f4eeb20f7606d6f7b1f9", "parents": [ "a46ef99d80817a167477ed1c8b4d90ee0c2e726f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:13:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_mmap()\" helper function\n\nThis continues the theme started with vm_brk() and vm_munmap():\nvm_mmap() does the same thing as do_mmap(), but additionally does the\nrequired VM locking.\n\nThis uninlines (and rewrites it to be clearer) do_mmap(), which sadly\nduplicates it in mm/mmap.c and mm/nommu.c. But that way we don\u0027t have\nto export our internal do_mmap_pgoff() function.\n\nSome day we hopefully don\u0027t have to export do_mmap() either, if all\nmodular users can become the simpler vm_mmap() instead. We\u0027re actually\nvery close to that already, with the notable exception of the (broken)\nuse in i810, and a couple of stragglers in binfmt_elf.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a46ef99d80817a167477ed1c8b4d90ee0c2e726f", "tree": "3d8c980c627e8b9c009dbf63628a9be8b8d1069f", "parents": [ "e4eb1ff61b323d6141614e5458a1f53c7046ff8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 16:20:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_munmap()\" helper function\n\nLike the vm_brk() function, this is the same as \"do_munmap()\", except it\ndoes the VM locking for the caller.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4eb1ff61b323d6141614e5458a1f53c7046ff8e", "tree": "7a0251509c169b0df1a6bf4bc47c5bca709e06da", "parents": [ "3b422e9c2c020a1137349c614da7f9c9761a0922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 15:35:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:28:17 2012 -0700" }, "message": "VM: add \"vm_brk()\" helper function\n\nIt does the same thing as \"do_brk()\", except it handles the VM locking\ntoo.\n\nIt turns out that all external callers want that anyway, so we can make\ndo_brk() static to just mm/mmap.c while at it.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b422e9c2c020a1137349c614da7f9c9761a0922", "tree": "0bbcfa6ca3cbee25b1ef624d908704c2773d24dc", "parents": [ "3a5374303923a543ff3e5f491030b21836d288f5", "f84cc342b1999db11ece939e1d2bf0743eb4578b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 12:28:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 12:28:06 2012 -0700" }, "message": "Merge tag \u0027for-torvalds-20120418\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl fixes from Linus Walleij:\n - Fixed compilation errors and warnings\n - Stricter checks on the ops vtable\n\n* tag \u0027for-torvalds-20120418\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl: implement pinctrl_check_ops\n pinctrl: include \u003clinux/bug.h\u003e to prevent compile errors\n pinctrl: fix compile error if not select PINMUX support\n" }, { "commit": "1cd653a665b08a3920e320a71b4ac5b80d36953c", "tree": "f600a1885faeb16ddb54445235480ae56941a3e7", "parents": [ "c1acb0ba330b3bcf4b110c4ae538f4f80b991fda", "2d5733fcd33dd451022d197cb6b476e970519ca7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 11:38:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 11:38:02 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of tiny USB fixes for 3.4-rc4.\n\n Most of them are in the USB gadget area, but a few other minor USB\n driver and core fixes are here as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (36 commits)\n USB: serial: cp210x: Fixed usb_control_msg timeout values\n USB: ehci-tegra: don\u0027t call set_irq_flags(IRQF_VALID)\n USB: yurex: Fix missing URB_NO_TRANSFER_DMA_MAP flag in urb\n USB: yurex: Remove allocation of coherent buffer for setup-packet buffer\n drivers/usb/misc/usbtest.c: add kfrees\n USB: ehci-fsl: Fix kernel crash on mpc5121e\n uwb: fix error handling\n uwb: fix use of del_timer_sync() in interrupt\n EHCI: always clear the STS_FLR status bit\n EHCI: fix criterion for resuming the root hub\n USB: sierra: avoid QMI/wwan interface on MC77xx\n usb: usbtest: avoid integer overflow in alloc_sglist()\n usb: usbtest: avoid integer overflow in test_ctrl_queue()\n USB: fix deadlock in bConfigurationValue attribute method\n usb: gadget: eliminate NULL pointer dereference (bugfix)\n usb: gadget: uvc: Remove non-required locking from \u0027uvc_queue_next_buffer\u0027 routine\n usb: gadget: rndis: fix Missing req-\u003econtext assignment\n usb: musb: omap: fix the error check for pm_runtime_get_sync\n usb: gadget: udc-core: fix asymmetric calls in remove_driver\n usb: musb: omap: fix crash when musb glue (omap) gets initialized\n ...\n" }, { "commit": "3256251f9850d00c8e4a4fd82440092bb0f1fd7d", "tree": "8326e0a296ed075a78182a19b8e8a4391b72e538", "parents": [ "a104104fd70b5a8d03162468701f499901e250d2" ], "author": { "name": "Francesco Virlinzi", "email": "francesco.virlinzi@st.com", "time": "Wed Apr 18 19:48:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 20:08:44 2012 -0400" }, "message": "stmmac: use custom init/exit functions in pm ops\n\nFreeze and restore can call the custom init/exit functions.\nAlso the patch adds a custom data field that can be used\nfor storing platform data useful on restore the embedded\nsetup (e.g. GPIO, SYSCFG).\n\nSigned-off-by: Francesco Virlinzi \u003cfrancesco.virlinzi@st.com\u003e\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c6f5c93098f5577210f8f3ea22209b3f266c66af", "tree": "bc641dfb6f71b6584cedde4b6721ca716f8bf3d0", "parents": [ "19853301ef3289bda2d5264c1093e74efddaeab9", "d22053cdbd914a6c97ea101adf411a8fd7e282ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd bugfixes from J. Bruce Fields:\n \"One bugfix, and one minor header fix from Jeff Layton while we\u0027re\n here\"\n\n* \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd: include cld.h in the headers_install target\n nfsd: don\u0027t fail unchecked creates of non-special files\n" }, { "commit": "bf1ac5ca6f0dede02635588704d216da474b4baa", "tree": "c231d5e4baed611d37d70aa34a732c41797e18ff", "parents": [ "cbf8f7bb200f5dbdc9ce11243431440720db03dc" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Apr 18 23:19:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 15:18:50 2012 -0400" }, "message": "nf_bridge: remove holes in struct nf_bridge_info\n\nPut use \u0026 mask on same location to avoid two holes on 64bit arches\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e01297ee1ada71e621c8b58a80a28a421a00471", "tree": "b62959354c0b514d95b9829b8395aae12869d3e0", "parents": [ "9b7f43afd417a6feb80841d30ced4051c362eb5d", "21a1416a1c945c5aeaeaf791b63c64926018eb77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 10:28:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 10:28:59 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM updates from Marcelo Tosatti.\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: lock slots_lock around device assignment\n KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context\n KVM: unmap pages from the iommu when slots are removed\n KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset\n" }, { "commit": "dbfad21422f8d2c0866185b3e449c4a6ebaec4e2", "tree": "a30de27f59ddce92ba9b950d5bb1b20ff23191b4", "parents": [ "743e89ebc0215900040b1c2d1563d70a22ac2cb0", "c628ee67fb15a0d8d48351aa2e487c5f14779785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse updates from Miklos Szeredi.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: use flexible array in fuse.h\n fuse: allow nanosecond granularity\n fuse: O_DIRECT support for files\n fuse: fix nlink after unlink\n" }, { "commit": "59ef43e681d103a51c3727dad0315e093f07ec61", "tree": "87f6320f1440ce3ce6c0c15ad3cef8bc98186f88", "parents": [ "91fbe33034c184c6a60e31c2207a2f7ec2f180dc", "b5abcf0219263f4e961dca71cbe26e06c5b0ee68" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 14:17:13 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 14:27:48 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-testmode.c\n\tinclude/net/nfc/nfc.h\n\tnet/nfc/netlink.c\n\tnet/wireless/nl80211.c\n" }, { "commit": "82ea267f7dc853a5e6a724916a70a10656efdfc2", "tree": "74a0377dbdfc759f813f2ac5d0bef4c5727a0765", "parents": [ "02269ab10f1130d35dc35db72ab026d16ba31abf" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Apr 16 21:24:32 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 21:27:07 2012 +0200" }, "message": "mfd: Fix modular builds of rc5t583 regulator support\n\nThe combination of commit 1b1247dd75aa5cf5fae54a3bec7280046e9c7957\n\n \"mfd: Add support for RICOH PMIC RC5T583\"\n\nand commit 6ffc3270210efa2bea526953a142ffc908f5bd86\n\n \"regulator: Add support for RICOH PMIC RC5T583 regulator\"\n\nare causing the i386 allmodconfig builds to fail with this:\n\n ERROR: \"rc5t583_update\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_set_bits\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_clear_bits\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_read\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n\nand this:\n\n ERROR: \"rc5t583_ext_power_req_config\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n\nFor the 1st four, make the simple ops static inline, instead of\npolluting the namespace with trivial exports. For the last one,\nadd an EXPORT_SYMBOL.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "d22053cdbd914a6c97ea101adf411a8fd7e282ad", "tree": "a4d1f1e7b431169c8d06ad55a9ad5cf9ae4d5d11", "parents": [ "9dc4e6c4d1182d34604ea40fef641775f5b15456" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Mon Apr 16 12:07:02 2012 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Mon Apr 16 15:19:12 2012 -0400" }, "message": "nfsd: include cld.h in the headers_install target\n\nThe cld.h file contains the definition of the upcall format to talk\nwith nfsdcld. When I added the file though, I neglected to add it\nto the headers-y target, so make headers_install wasn\u0027t installing it.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "dcca1cfc0978fa084245937ec1472b870edde97d", "tree": "c72d7bb892a106517416f5c30b1e8e3a88c789a6", "parents": [ "b381fa3229a30f6d7b0e6053314c4a5378c9389d" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Thu Apr 12 14:32:20 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 16 14:19:29 2012 -0400" }, "message": "mac80211: Set the correct values for hwmp (1) and airtimeLinkMetric (1)\n\nPer sections 8.4.2.100.2 and 8.4.2.100.3 of Std 802.11-2012\n\nReported-by: Shinichi Hotori \u003chotorinn@gmail.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "edffaa031e50f913f0272516b39dd1cad7aa4aea", "tree": "7addb06d0f2259834cb2bc2b2d007c03752d21a6", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015", "92b0abf80c5c5f0e0d71d1309688a330fd74731b" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 16 08:35:33 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 16 08:35:33 2012 -0700" }, "message": "Merge tag \u0027fixes-for-v3.4-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus\n\nusb: fixes for v3.4-rc cycle\n\nHere are the fixes I have queued for v3.4-rc cycle so far.\n\nIt includes fixes on many of the gadget drivers and a few\nof the UDC controller drivers.\n\nFor musb we have a fix for a kernel oops when unloading\nomap2430.ko glue layer, proper error checking for pm_runtime_*,\nfix for the ULPI transfer block, and a bug fix in musb_cleanup_urb\nroutine.\n\nFor s3c-hsotg we have mostly FIFO-related fixes (proper TX FIFO\nallocation, TX FIFO corruption fix in DMA mode) but also a couple\nof minor fixes (fixing maximum packet size for ep0 and fix for\nbig transfers with DMA).\n\nFor the dwc3 driver we have a memory leak fix, a very important\nfix for USB30CV with SetFeature tests and the hability to handle\nep0 requests bigger than wMaxPacketSize.\n\nOn top of that there\u0027s a bunch of gadget driver minor fixes adding\nproper section annotations, and fixing up the sysfs interface for\ndoing device-initiated connect/disconnect and so on.\n\nAll patches have been pending on the mailing list for quite a while\nand look good for your for-linus branch.\n" }, { "commit": "8eaeb9393397be8eb700ab38a69c450975463b77", "tree": "1f6b9d8d8197b16c19ed0ed03d55886e0c519ba5", "parents": [ "4accdff7a3e397b43e50f605ee561ba7994745c7" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue Apr 03 11:56:51 2012 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 16:45:34 2012 +0200" }, "message": "mfd: Convert twl6040 to i2c driver, and separate it from twl core\n\nComplete the separation of the twl6040 from the twl core since\nit is a separate chip, not part of the twl6030 PMIC.\n\nMake the needed Kconfig changes for the depending drivers at the\nsame time to avoid breaking the kernel build (vibra, ASoC components).\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonicro.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "4accdff7a3e397b43e50f605ee561ba7994745c7", "tree": "2d47d3fdb69cf2cc01298331cbb883a62bb6674a", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Daniel Lezcano", "email": "daniel.lezcano@linaro.org", "time": "Mon Apr 02 17:55:48 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 16:42:43 2012 +0200" }, "message": "mfd : Fix dbx500 compilation error\n\nThe ux500 default config enables the db5500 and the db8500.\nThe incoming cpuidle driver uses the \u0027prcmu_enable_wakeups\u0027\nand the \u0027prcmu_set_power_state\u0027 functions but these ones\nare defined but not implemented for the db5500, leading to\nan unresolved symbol error at link time. In order to compile,\nwe have to disable the db5500 support which is not acceptable\nfor the default config.\n\nI noticed there are also some other functions which are\ndefined but not implemented.\n\nThis patch fix this by removing the functions definitions\nand move out of the config section the empty functions which\nare normally used when the DB550 config is disabled.\nOnly the functions which are not implemented are concerned\nby this modification.\n\nSigned-off-by: Daniel Lezcano \u003cdaniel.lezcano@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "9a8e5d41124a7352e554581333d4d9689dc1526b", "tree": "88e74fe2cdca5ca2d1d5424a728ade00a12f05d3", "parents": [ "12e993b89464707398e4209bd99983e376454985", "708e5978dfee0090a27c5531ce3b017dd6d190a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 15 17:35:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 15 17:35:19 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Nothing too disasterous, the biggest thing being the removal of the\n regulator support for vcore in the AMBA driver; only one SoC was using\n this and it got broken during the last merge window, which then\n started causing problems for other people. Mutual agreement was\n reached for it to be removed.\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7386/1: jump_label: fixup for rename to static_key\n ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE\n ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU\n ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus\n ARM: 7383/1: nommu: populate vectors page from paging_init\n ARM: 7381/1: nommu: fix typo in mm/Kconfig\n ARM: 7380/1: DT: do not add a zero-sized memory property\n ARM: 7379/1: DT: fix atags_to_fdt() second call site\n ARM: 7366/3: amba: Remove AMBA level regulator support\n ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler\n ARM: 7368/1: fault.c: correct how the tsk-\u003e[maj|min]_flt gets incremented\n" }, { "commit": "56845d78cee8576a8160cee8aeac62efdb561ae2", "tree": "f891afed5324d359da1713a80a7131968373acc4", "parents": [ "df8ef8f3aaa6692970a436204c4429210addb23a", "8a9a0ea6032186e3030419262678d652b88bf6a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:19:04 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:19:04 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/atheros/atlx/atl1.c\n\tdrivers/net/ethernet/atheros/atlx/atl1.h\n\nResolved a conflict between a DMA error bug fix and NAPI\nsupport changes in the atl1 driver.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "df8ef8f3aaa6692970a436204c4429210addb23a", "tree": "e214674aeafc01e140cc9d2eb24e5d6fb37b422a", "parents": [ "2b2027124ff1bc420d4a86e37a57feae5e356d2d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:44:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:05 2012 -0400" }, "message": "macvlan: add FDB bridge ops and macvlan flags\n\nThis adds FDB bridge ops to the macvlan device passthru mode.\nAdditionally a flags field was added and a NOPROMISC bit to\nallow users to use passthru mode without the driver calling\ndev_set_promiscuity(). The flags field is a u16 placed in a\n4 byte hole (consuming 2 bytes) of the macvlan_dev struct.\n\nWe want to do this so that the macvlan driver or stack\nabove the macvlan driver does not have to process every\npacket. For the use case where we know all the MAC addresses\nof the endstations above us this works well.\n\nThis patch is a result of Roopa Prabhu\u0027s work. Follow up\npatches are needed for VEPA and VEB macvlan modes.\n\nv2: Change from distinct nopromisc mode to a flags field to\n configure this. This avoids the tendency to add a new\n mode every time we need some slightly different behavior.\nv3: fix error in dev_set_promiscuity and add change and get\n link attributes for flags.\n\nCC: Roopa Prabhu \u003croprabhu@cisco.com\u003e\nCC: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12a94634453c61fd9a11c4702002e3db6d4feb70", "tree": "1131fded53fdab8b912cd14d8240def52166d2f2", "parents": [ "77162022ab26a1f99d3af30c03760a76f86e193d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:44:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:04 2012 -0400" }, "message": "net: addr_list: add exclusive dev_uc_add and dev_mc_add\n\nThis adds a dev_uc_add_excl() and dev_mc_add_excl() calls\nsimilar to the original dev_{uc|mc}_add() except it sets\nthe global bit and returns -EEXIST for duplicat entires.\n\nThis is useful for drivers that support SR-IOV, macvlan\ndevices and any other devices that need to manage the\nunicast and multicast lists.\n\nv2: fix typo UNICAST should be MULTICAST in dev_mc_add_excl()\n\nCC: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "77162022ab26a1f99d3af30c03760a76f86e193d", "tree": "dabae13dc00b91198c5bed91ebb790942d456081", "parents": [ "136cd14e1ea2bfde66d212d8e18e81552c94e4e3" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:43:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:04 2012 -0400" }, "message": "net: add generic PF_BRIDGE:RTM_ FDB hooks\n\nThis adds two new flags NTF_MASTER and NTF_SELF that can\nnow be used to specify where PF_BRIDGE netlink commands should\nbe sent. NTF_MASTER sends the commands to the \u0027dev-\u003emaster\u0027\ndevice for parsing. Typically this will be the linux net/bridge,\nor open-vswitch devices. Also without any flags set the command\nwill be handled by the master device as well so that current user\nspace tools continue to work as expected.\n\nThe NTF_SELF flag will push the PF_BRIDGE commands to the\ndevice. In the basic example below the commands are then parsed\nand programmed in the embedded bridge.\n\nNote if both NTF_SELF and NTF_MASTER bits are set then the\ncommand will be sent to both \u0027dev-\u003emaster\u0027 and \u0027dev\u0027 this allows\nuser space to easily keep the embedded bridge and software bridge\nin sync.\n\nThere is a slight complication in the case with both flags set\nwhen an error occurs. To resolve this the rtnl handler clears\nthe NTF_ flag in the netlink ack to indicate which sets completed\nsuccessfully. The add/del handlers will abort as soon as any\nerror occurs.\n\nTo support this new net device ops were added to call into\nthe device and the existing bridging code was refactored\nto use these. There should be no required changes in user space\nto support the current bridge behavior.\n\nA basic setup with a SR-IOV enabled NIC looks like this,\n\n veth0 veth2\n | |\n ------------\n | bridge0 | \u003c---- software bridging\n ------------\n /\n /\n ethx.y ethx\n VF PF\n \\ \\ \u003c---- propagate FDB entries to HW\n \\ \\\n --------------------\n | Embedded Bridge | \u003c---- hardware offloaded switching\n --------------------\n\nIn this case the embedded bridge must be managed to allow \u0027veth0\u0027\nto communicate with \u0027ethx.y\u0027 correctly. At present drivers managing\nthe embedded bridge either send frames onto the network which\nthen get dropped by the switch OR the embedded bridge will flood\nthese frames. With this patch we have a mechanism to manage the\nembedded bridge correctly from user space. This example is specific\nto SR-IOV but replacing the VF with another PF or dropping this\ninto the DSA framework generates similar management issues.\n\nExamples session using the \u0027br\u0027[1] tool to add, dump and then\ndelete a mac address with a new \"embedded\" option and enabled\nixgbe driver:\n\n# br fdb add 22:35:19:ac:60:59 dev eth3\n# br fdb\nport mac addr flags\nveth0 22:35:19:ac:60:58 static\nveth0 9a:5f:81:f7:f6:ec local\neth3 00:1b:21:55:23:59 local\neth3 22:35:19:ac:60:59 static\nveth0 22:35:19:ac:60:57 static\n#br fdb add 22:35:19:ac:60:59 embedded dev eth3\n#br fdb\nport mac addr flags\nveth0 22:35:19:ac:60:58 static\nveth0 9a:5f:81:f7:f6:ec local\neth3 00:1b:21:55:23:59 local\neth3 22:35:19:ac:60:59 static\nveth0 22:35:19:ac:60:57 static\neth3 22:35:19:ac:60:59 local embedded\n#br fdb del 22:35:19:ac:60:59 embedded dev eth3\n\nI added a couple lines to \u0027br\u0027 to set the flags correctly is all. It\nis my opinion that the merit of this patch is now embedded and SW\nbridges can both be modeled correctly in user space using very nearly\nthe same message passing.\n\n[1] \u0027br\u0027 tool was published as an RFC here and will be renamed \u0027bridge\u0027\n http://patchwork.ozlabs.org/patch/117664/\n\nThanks to Jamal Hadi Salim, Stephen Hemminger and Ben Hutchings for\nvaluable feedback, suggestions, and review.\n\nv2: fixed api descriptions and error case with both NTF_SELF and\n NTF_MASTER set plus updated patch description.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95c961747284a6b83a5e2d81240e214b0fa3464d", "tree": "c7be86a00db3605a48a03109fafcbe31039ca2e0", "parents": [ "5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Apr 15 05:58:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 12:44:40 2012 -0400" }, "message": "net: cleanup unsigned to unsigned int\n\nUse of \"unsigned int\" is preferred to bare \"unsigned\" in net tree.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "586d17c5a01bf1ae4e215adc6c48457eee5482bc", "tree": "20738485061d7965712bc711035883501d02bcc5", "parents": [ "8831a3f2c9ee7d952e6d7a018d11c0c9c5b56749" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Wed Apr 11 20:43:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 03:23:31 2012 -0400" }, "message": "virtio-net: send gratuitous packets when needed\n\nAs hypervior does not have the knowledge of guest network configuration, it\u0027s\nbetter to ask guest to send gratuitous packets when needed.\n\nThis patch implements VIRTIO_NET_F_GUEST_ANNOUNCE feature: hypervisor would\nnotice the guest when it thinks it\u0027s time for guest to announce the link\npresnece. Guest tests VIRTIO_NET_S_ANNOUNCE bit during config change interrupt\nand woule send gratuitous packets through netif_notify_peers() and ack the\nnotification through ctrl vq.\n\nWe need to make sure the atomicy of read and ack in guest otherwise we may ack\nmore times than being notified. This is done through handling the whole config\nchange interrupt in an non-reentrant workqueue.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c72e118334a2590f4f07d9e51490b902c33f5280", "tree": "d8974faaaf6afa5afe2b771e3a5390ee6ec97c21", "parents": [ "fd4f2cead6983735a4e6283126b9276873d7ff09" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Apr 12 22:16:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 14 15:24:26 2012 -0400" }, "message": "inet: makes syn_ack_timeout mandatory\n\nThere are two struct request_sock_ops providers, tcp and dccp.\n\ninet_csk_reqsk_queue_prune() can avoid testing syn_ack_timeout being\nNULL if we make it non NULL like syn_ack_timeout\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\nCc: dccp@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2084c24a81413b75bc97e4bee56b32ffece70460", "tree": "299c0e84719c352eea4c79db560912f858b08b33", "parents": [ "668ce0ac707719d866af7e432e518af7b4c575ad" ], "author": { "name": "Lubos Lunak", "email": "l.lunak@suse.cz", "time": "Wed Mar 21 14:08:24 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 14 07:47:49 2012 -0700" }, "message": "do not export kernel\u0027s NULL #define to userspace\n\nGCC\u0027s NULL is actually __null, which allows detecting some questionable\nNULL usage and warn about it. Moreover each platform/compiler should\nhave its own stddef.h anyway (which is different from linux/stddef.h).\n\nSo there\u0027s no good reason to leak kernel\u0027s NULL to userspace and\noverride what the compiler provides.\n\nSigned-off-by: Luboš Luňák \u003cl.lunak@suse.cz\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8dd0b6d4836bce81cece60509ef3b157a420776", "tree": "7a28f327a15443d6c9d091f3d272abd107251ab7", "parents": [ "2d59dcfb54ade45cacc59a6e7bd96b8c19088c3d", "1b2e19f17ed327af6add02978efdf354e4f8e4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "message": "Merge branch \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block core bits from Jens Axboe:\n \"It\u0027s a nice and quiet round this time, since most of the tricky stuff\n has been pushed to 3.5 to give it more time to mature. After a few\n hectic block IO core changes for 3.3 and 3.2, I\u0027m quite happy with a\n slow round.\n\n Really minor stuff in here, the only real functional change is making\n the auto-unplug threshold a per-queue entity. The threshold is set so\n that it\u0027s low enough that we don\u0027t hold off IO for too long, but still\n big enough to get a nice benefit from the batched insert (and hence\n queue lock cost reduction). For raid configurations, this currently\n breaks down.\"\n\n* \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block:\n block: make auto block plug flush threshold per-disk based\n Documentation: Add sysfs ABI change for cfq\u0027s target latency.\n block: Make cfq_target_latency tunable through sysfs.\n block: use lockdep_assert_held for queue locking\n block: blk_alloc_queue_node(): use caller\u0027s GFP flags instead of GFP_KERNEL\n" }, { "commit": "cf7d8a5550779486524f775c8cf4be9b91365d23", "tree": "0be1d7e7aebcedcd97e1ec9a1af3a190f45a20b4", "parents": [ "4166fb64593514ad920b7dbd290e0a934b37d24a", "39ec0d38141b198f94fd19c2bb10fd7c616510d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI bug fixes from Grant Likely:\n \"Miscellaneous driver bug fixes. No major changes in this branch.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/imx: prevent NULL pointer dereference in spi_imx_probe()\n spi/imx: mark base member in spi_imx_data as __iomem\n spi/mpc83xx: fix NULL pdata dereference bug\n spi/davinci: Fix DMA API usage in davinci\n spi/pL022: include types.h to remove compilation warnings\n" }, { "commit": "ca8f4fb21d08747013cce9cf1840aa5bfc31f2d8", "tree": "f18de0412ec64d7aa4a26ff85d0ad1c57263dbff", "parents": [ "9a5d2bd99e0dfe9a31b3c160073ac445ba3d773f" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Apr 09 00:24:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 13:09:19 2012 -0400" }, "message": "skbuff: struct ubuf_info callback type safety\n\nThe skb struct ubuf_info callback gets passed struct ubuf_info\nitself, not the arg value as the field name and the function signature\nseem to imply. Rename the arg field to ctx to match usage,\nadd documentation and change the callback argument type\nto make usage clear and to have compiler check correctness.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1e45860f541497d73162305d48b638d9b87e1ae3", "tree": "06b324a3a99a278810c5403af84cf106afea19b4", "parents": [ "34af657916332e89564566bc8d35e3e06cc0c236" ], "author": { "name": "Mark Brown", "email": "broonie@sirena.org.uk", "time": "Fri Apr 13 13:11:50 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Apr 13 14:04:08 2012 +0100" }, "message": "ARM: 7366/3: amba: Remove AMBA level regulator support\n\nThe AMBA bus regulator support is being used to model on/off switches\nfor power domains which isn\u0027t terribly idiomatic for modern kernels with\nthe generic power domain code and creates integration problems on platforms\nwhich don\u0027t use regulators for their power domains as it\u0027s hard to tell\nthe difference between a regulator that is needed but failed to be provided\nand one that isn\u0027t supposed to be there (though DT does make that easier).\n\nPlatforms that wish to use the regulator API to manage their power domains\ncan indirect via the power domain interface.\n\nThis feature is only used with the vape supply of the db8500 PRCMU\ndriver which supplies the UARTs and MMC controllers, none of which have\nsupport for managing vcore at runtime in mainline (only pl022 SPI\ncontroller does). Update that supply to have an always_on constraint\nuntil the power domain support for the system is updated so that it is\nenabled for these users, this is likely to have no impact on practical\nsystems as probably at least one of these devices will be active and\ncause AMBA to hold the supply on anyway.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "69349c2dc01c489eccaa4c472542c08e370c6d7e", "tree": "2422ef07a511d51714e0e16da1ac65c7256e9add", "parents": [ "7c427f45503f77f148cc2b66864e0684c60fa3a0" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 12 19:46:32 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:35:58 2012 -0700" }, "message": "kconfig: fix IS_ENABLED to not require all options to be defined\n\nUsing IS_ENABLED() within C (vs. within CPP #if statements) in its\ncurrent form requires us to actually define every possible bool/tristate\nKconfig option twice (__enabled_* and __enabled_*_MODULE variants).\n\nThis results in a huge autoconf.h file, on the order of 16k lines for a\nx86_64 defconfig.\n\nFixing IS_ENABLED to be able to work on the smaller subset of just\nthings that we really have defined is step one to fixing this. Which\nmeans it has to not choke when fed non-enabled options, such as:\n\n include/linux/netdevice.h:964:1: warning: \"__enabled_CONFIG_FCOE_MODULE\" is not defined [-Wundef]\n\nThe original prototype of how to implement a C and preprocessor\ncompatible way of doing this came from the Google+ user \"comex .\" in\nresponse to Linus\u0027 crowdsourcing challenge for a possible improvement on\nhis earlier C specific solution:\n\n\t#define config_enabled(x) (__stringify(x)[0] \u003d\u003d \u00271\u0027)\n\nIn this implementation, I\u0027ve chosen variable names that hopefully make\nhow it works more understandable.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "816a7854d56f19aeba3c83e1ed8c2c0ef275365a", "tree": "c3b82ad98006fc5fa7b408c142e75a6053195dfa", "parents": [ "011e3c63251be832d23df9f0697626ab7b354d02", "7eab0f64a9eba5405222fdef0ede2468bf495efd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 20:12:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 20:12:31 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n" }, { "commit": "011e3c63251be832d23df9f0697626ab7b354d02", "tree": "2cad5b58c274c93ae49d9b58fb15d784d4dfd78f", "parents": [ "c1412fce7eccae62b4de22494f6ab3ff8a90c0c6", "ecca5c3acc0d0933d89abc44e60afb0cc8170e35" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 19:41:23 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 19:41:23 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "7c427f45503f77f148cc2b66864e0684c60fa3a0", "tree": "5cd354211d9b926bc16dcf0a02e21911e6d46039", "parents": [ "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "9de29225bdd25958c1fa82521ff02726f1cab953" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg KH:\n \"Here are a number of fixes for the USB core and drivers for 3.4-rc2\n\n Lots of tiny xhci fixes here, a few usb-serial driver fixes and new\n device ids, and a smattering of other minor fixes in different USB\n drivers.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (30 commits)\n USB: update usbtmc api documentation\n xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI\n xHCI: use gfp flags from caller instead of GFP_ATOMIC\n xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host\n USB: fix bug of device descriptor got from superspeed device\n xhci: Fix register save/restore order.\n xhci: Restore event ring dequeue pointer on resume.\n xhci: Don\u0027t write zeroed pointers to xHC registers.\n xhci: Warn when hosts don\u0027t halt.\n xhci: don\u0027t re-enable IE constantly\n usb: xhci: fix section mismatch in linux-next\n xHCI: correct to print the true HSEE of USBCMD\n USB: serial: fix race between probe and open\n UHCI: hub_status_data should indicate if ports are resuming\n EHCI: keep track of ports being resumed and indicate in hub_status_data\n USB: fix race between root-hub suspend and remote wakeup\n USB: sierra: add support for Sierra Wireless MC7710\n USB: ftdi_sio: fix race condition in TIOCMIWAIT, and abort of TIOCMIWAIT when the device is removed\n USB: ftdi_sio: fix status line change handling for TIOCMIWAIT and TIOCGICOUNT\n USB: don\u0027t ignore suspend errors for root hubs\n ...\n" }, { "commit": "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "tree": "92719848d035ddf5233a297dabb587f95652a975", "parents": [ "3dbc35a339d7c8c756cb159b9ba076fac4e7faeb", "11bbd5b6dae49fd7072ebf5eb63735827bd72f42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "message": "Merge tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty and serial fixes from Greg KH:\n \"Here are some tty and serial fixes for 3.4-rc2.\n\n Most important here is the pl011 fix, which has been reported by about\n 100 different people, which means more people use it than I expected\n :)\n\n There are also some 8250 driver reverts due to some problems reported\n by them. And other minor fixes as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n pch_uart: Add Kontron COMe-mTT10 uart clock quirk\n pch_uart: Fix MSI setting issue\n serial/8250_pci: add a \"force background timer\" flag and use it for the \"kt\" serial port\n Revert \"serial/8250_pci: setup-quirk workaround for the kt serial controller\"\n Revert \"serial/8250_pci: init-quirk msi support for kt serial controller\"\n tty/serial/omap: console can only be built-in\n serial: samsung: fix omission initialize ulcon in reset port fn()\n printk(): add KERN_CONT where needed in hpet and vt code\n tty/serial: atmel_serial: fix RS485 half-duplex problem\n tty: serial: altera_uart: Check for NULL platform_data in probe.\n isdn/gigaset: use gig_dbg() for debugging output\n omap-serial: Fix the error handling in the omap_serial probe\n serial: PL011: move interrupt clearing\n" }, { "commit": "174808af90a06ee59ffedd60c00c252f1f887f25", "tree": "5e026fdc0d2b4d66c0a79267e5755e10d6d04bd8", "parents": [ "778c2dee6f134bf0472ed45eedaee53b4f336afb", "5d949944229b0a08e218723be231731cd86b94f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix bluetooth userland regression reported by Keith Packard, from\n Gustavo Padovan.\n\n 2) Revert ath9k PS idle change, from Sujith Manoharan.\n\n 3) Correct default TCP memory limits (again), from Eric Dumazet.\n\n 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal\n Cardwell.\n\n 5) We made a facility for layers like wireless to say how much tailroom\n they need in the SKB for link layer stuff such as wireless\n encryption etc., but TCP works hard to fill every SKB out to the end\n defeating this specification.\n\n This leads to every TCP packet getting reallocated by the wireless\n code in order to have the right amount of tailroom available.\n\n Fix TCP to only fill SKBs out to the real amount of data area it\n asked for during the allocation, this way it won\u0027t eat into the\n slack added for the device\u0027s tailroom needs.\n\n Reported by Marc Merlin and fixed by Eric Dumazet.\n\n 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh\n Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,\n AceLan Kao, and Andrei Emeltchenko.\n\n 7) OOPS on tty_close fix in bluetooth\u0027s hci_ldisc from Johan Hovold.\n\n 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.\n\n 9) Memleak fix in wext-core from Julia Lawall.\n\n10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,\n from Jozsef Kadlecsik.\n\n11) Validate IP header length properly in netfilter conntrack\u0027s\n ipv4_get_l4proto().\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)\n NFC: Fix the LLCP Tx fragmentation loop\n rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n tcp: avoid order-1 allocations on wifi and tx path\n net: allow pskb_expand_head() to get maximum tailroom\n bridge: Do not send queries on multicast group leaves\n MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n tcp: restore correct limit\n Revert \"ath9k: fix going to full-sleep on PS idle\"\n rt2x00: Fix rfkill_polling register function.\n bcma: fix build error on MIPS; implicit pcibios_enable_device\n netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n net/wireless/wext-core.c: add missing kfree\n rtlwifi: Fix oops on rate-control failure\n mac80211: Convert WARN_ON to WARN_ON_ONCE\n rtlwifi: rtl8192de: Fix firmware initialization\n nl80211: ensure interface is up in various APIs\n ...\n" }, { "commit": "778c2dee6f134bf0472ed45eedaee53b4f336afb", "tree": "8f2d50f1876aeb142f0642ebfc2c39bf877cb222", "parents": [ "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "173fa4eccc39b04fbc0b569fabac6dbcec33507a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mostly exynos and intel.\n\n Intel has 3 regression fixers (more info in intel merge commit), along\n with some other make hw work fixes, exynos has some cleanups and an\n ioctl fix.\n\n A couple of radeon fixes, couple of build fixes, and a savage\n userspace interface possible overflow fix.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (23 commits)\n drm/exynos: fixed exynos broken ioctl\n drm/i915: clear fencing tracking state when retiring requests\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n vgaarb.h: fix build warnings\n drm/i915: properly compute dp dithering for user-created modes\n drm/radeon/kms: fix DVO setup on some r4xx chips\n drm/savage: fix integer overflows in savage_bci_cmdbuf()\n drm/radeon: replace udelay with mdelay for long timeouts\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n ...\n" }, { "commit": "7e066489726b52bea419085e5b8929e1e89f57a8", "tree": "b144712e5200002b55b45f362ffa1fd53d0389c6", "parents": [ "4abb663b641ee21024906dae45af7de50ebad2d8", "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irqdomain bug fixes from Grant Likely:\n \"This branch fixes a bug in irq_create_mapping() where an error return\n from irq_alloc_desc_from() gets ignored.\n\n It also removes irq_virq_count to fix a bug on powerpc where the\n irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS\n boundary.\n\n The remaining patches get rid of an completely pointless export and\n fix some minor bugs in the irqdomain debug output.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irq_domain: Move irq_virq_count into NOMAP revmap\n irqdomain: Fix debugfs formatting\n irq_domain: correct the debugfs file name\n irq: Kill pointless irqd_to_hw export\n irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().\n" }, { "commit": "8112a5c91d781a22d2b631f3295386b0b70de7c8", "tree": "d4239b5d7b2dff9d24b8db793cb6729c23f901c9", "parents": [ "997002785e3f932fd26a0f9c3cd91d4b4861ed29" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 10 19:43:04 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 15:10:33 2012 -0400" }, "message": "NFC: Add a target lost netlink event\n\nSome chips are capable of detecting when a tag is out of the field, so\nthey could send a netlink event about it to userspace.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7eab0f64a9eba5405222fdef0ede2468bf495efd", "tree": "ec99640b8d0b12adbfacb85c27683125debd14f2", "parents": [ "cade455596504fae8e134a27189713ddf7c6d04d", "8065248069097dddf9945acfb2081025e9618c16" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 14:25:14 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 14:41:59 2012 -0400" }, "message": "Merge branch \u0027master\u0027 into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-testmode.c\n\tnet/wireless/nl80211.c\n" }, { "commit": "8065248069097dddf9945acfb2081025e9618c16", "tree": "eddf3fb0372ba0f65c01382d386942ea8d18932d", "parents": [ "e66a8ddff72e85605f2212a0ebc666c7e9116641", "b4838d12e1f3cb48c2489a0b08733b5dbf848297" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 13:49:28 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 13:49:28 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "c628ee67fb15a0d8d48351aa2e487c5f14779785", "tree": "378d9ab0ce3e0309c324606a9835e3fe9e48607f", "parents": [ "0a2da9b2ef2ef76c09397597f260245b020e6522" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Thu Apr 12 12:57:08 2012 +0200" }, "committer": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Thu Apr 12 12:57:08 2012 +0200" }, "message": "fuse: use flexible array in fuse.h\n\nUse the ISO C standard compliant form instead of the gcc extension in the\ninterface definition.\n\nReported-by: Shachar Sharon \u003cssnail@gmail.com\u003e\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\n" }, { "commit": "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e", "tree": "34dc13fb2448eab4916f55edd10dfa34c36505df", "parents": [ "15e06bf64f686befd2030da867a3dad965b96cc0" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Feb 15 15:06:08 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Apr 12 00:37:48 2012 -0600" }, "message": "irq_domain: Move irq_virq_count into NOMAP revmap\n\nThis patch replaces the old global setting of irq_virq_count that is only\nused by the NOMAP mapping and instead uses a revmap_data property so that\nthe maximum NOMAP allocation can be set per NOMAP irq_domain.\n\nThere is exactly one user of irq_virq_count in-tree right now: PS3.\nAlso, irq_virq_count is only useful for the NOMAP mapping. So,\ninstead of having a single global irq_virq_count values, this change\ndrops it entirely and added a max_irq argument to irq_domain_add_nomap().\nThat makes it a property of an individual nomap irq domain instead of\na global system settting.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\n" }, { "commit": "32f6daad4651a748a58a3ab6da0611862175722f", "tree": "09e2643d6df18db1ab7655fcb53ab797e9ac69c1", "parents": [ "f19a0c2c2e6add90b7d6a1b7595abebfe2e4c37a" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Wed Apr 11 09:51:49 2012 -0600" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Wed Apr 11 22:55:25 2012 -0300" }, "message": "KVM: unmap pages from the iommu when slots are removed\n\nWe\u0027ve been adding new mappings, but not destroying old mappings.\nThis can lead to a page leak as pages are pinned using\nget_user_pages, but only unpinned with put_page if they still\nexist in the memslots list on vm shutdown. A memslot that is\ndestroyed while an iommu domain is enabled for the guest will\ntherefore result in an elevated page reference count that is\nnever cleared.\n\nAdditionally, without this fix, the iommu is only programmed\nwith the first translation for a gpa. This can result in\npeer-to-peer errors if a mapping is destroyed and replaced by a\nnew mapping at the same gpa as the iommu will still be pointing\nto the original, pinned memory address.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "5314526b1743e8e8614293db7d86e480b4fe9824", "tree": "c493979d2d417b9a146ac6ef5e1b5562a5fda6df", "parents": [ "14dc7852099535d17807e348dd127433413b7e0a" ], "author": { "name": "Thomas Pedersen", "email": "c_tpeder@qca.qualcomm.com", "time": "Fri Apr 06 13:35:47 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 16:23:59 2012 -0400" }, "message": "cfg80211: add channel switch notify event\n\nThe firmware may decide to switch channels while already beaconing, e.g.\nin response to a cfg80211 connect request on a different vif. Add this\nevent to notify userspace when an AP or GO interface has successfully\nmigrated to a new channel, so it can update its configuration\naccordingly.\n\nSigned-off-by: Thomas Pedersen \u003cc_tpeder@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a21d45726acacc963d8baddf74607d9b74e2b723", "tree": "7cd7e1409ac0242148a0a8117956d08572eb32cf", "parents": [ "87151b8689d890dfb495081f7be9b9e257f7a2df" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 20:30:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:11:12 2012 -0400" }, "message": "tcp: avoid order-1 allocations on wifi and tx path\n\nMarc Merlin reported many order-1 allocations failures in TX path on its\nwireless setup, that dont make any sense with MTU\u003d1500 network, and non\nSG capable hardware.\n\nAfter investigation, it turns out TCP uses sk_stream_alloc_skb() and\nused as a convention skb_tailroom(skb) to know how many bytes of data\npayload could be put in this skb (for non SG capable devices)\n\nNote : these skb used kmalloc-4096 (MTU\u003d1500 + MAX_HEADER +\nsizeof(struct skb_shared_info) being above 2048)\n\nLater, mac80211 layer need to add some bytes at the tail of skb\n(IEEE80211_ENCRYPT_TAILROOM \u003d 18 bytes) and since no more tailroom is\navailable has to call pskb_expand_head() and request order-1\nallocations.\n\nThis patch changes sk_stream_alloc_skb() so that only\nsk-\u003esk_prot-\u003emax_header bytes of headroom are reserved, and use a new\nskb field, avail_size to hold the data payload limit.\n\nThis way, order-0 allocations done by TCP stack can leave more than 2 KB\nof tailroom and no more allocation is performed in mac80211 layer (or\nany layer needing some tailroom)\n\navail_size is unioned with mark/dropcount, since mark will be set later\nin IP stack for output packets. Therefore, skb size is unchanged.\n\nReported-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nTested-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71472ec12c61dd305ab4d11822af7ecc4f9717f9", "tree": "4f0470a410a76eb59530100dd757be6753fda55f", "parents": [ "14f066bab19946545130a7379f420af860a02ae8" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Apr 10 05:15:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:03:52 2012 -0400" }, "message": "team: add user_linkup and user_linkup_enabled per-port option\n\nAllows userspace to setup linkup for ports. Default is to take linkup\ndirectly from ethtool state.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14f066bab19946545130a7379f420af860a02ae8", "tree": "7d8bac0fb889e2c7bee2c129d540ce6e6cacb340", "parents": [ "80f7c6683fe0e891ef1db7c967d538b5fdddd22c" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Apr 10 05:15:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:03:51 2012 -0400" }, "message": "team: add bool option type\n\nAdd another (hopefully last) option type. Use NLA_FLAG to implement\nthat.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80f7c6683fe0e891ef1db7c967d538b5fdddd22c", "tree": "7252117971ea67654ede4e716b771bb1fe824e36", "parents": [ "7a5cc24277b57ce38eb0afa6634b71d4d5cc671e" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Apr 10 05:15:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:03:51 2012 -0400" }, "message": "team: add support for per-port options\n\nThis patch allows to create per-port options. That becomes handy for all\nsorts of stuff, for example for userspace driven link-state, 802.3ad\nimplementation and so on.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6069a4c988d75c0fb309fa7da0909df2a222a65e", "tree": "9d41616713da1f2baf6c31e45fe17b4e993106ef", "parents": [ "afceb9319f21b18ee3bc15ee9a5f92e18ef8a8c9" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon Jan 30 11:43:52 2012 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 11 09:36:00 2012 +0100" }, "message": "vgaarb.h: fix build warnings\n\nFix build warnings by providing a struct stub since no fields of\nthe struct are used:\n\ninclude/linux/vgaarb.h:66:9: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:66:9: warning: its scope is only this definition or declaration, which is probably not what you want\ninclude/linux/vgaarb.h:99:34: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:109:6: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:121:8: warning: \u0027struct pci_dev\u0027 declared inside parameter list\ninclude/linux/vgaarb.h:140:37: warning: \u0027struct pci_dev\u0027 declared inside parameter list\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6f11f6f1a0a717eb8bd0dadd101c4522b945c501", "tree": "f9de4499341c9fb78841143969613a96da5c768e", "parents": [ "89e004e78ff6317520d35bdb0d0174893ab49f17" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Fri Mar 16 14:54:23 2012 -0600" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Apr 11 09:31:01 2012 +0200" }, "message": "pinctrl: include \u003clinux/bug.h\u003e to prevent compile errors\n\nMacros in \u003clinux/pinctrl/machine.h\u003e call ARRAY_SIZE(), the definition of\nwhich eventually calls BUILD_BUG_ON_ZERO(), which is defined in\n\u003clinux/bug.h\u003e. Include that so that every .c file using the pinctrl macros\ndoesn\u0027t have to do that itself.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "89e004e78ff6317520d35bdb0d0174893ab49f17", "tree": "bba46d61c1ed59376b06f89260b7566b582bee61", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e" ], "author": { "name": "Dong Aisheng", "email": "dong.aisheng@linaro.org", "time": "Thu Apr 05 17:07:23 2012 +0800" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Apr 11 09:30:49 2012 +0200" }, "message": "pinctrl: fix compile error if not select PINMUX support\n\nThe pinctrl_register_mappings is defined in core.c, so change the dependent\nmacro from CONFIG_MUX to CONFIG_PINCTRL.\n\nThe compile error message is:\ndrivers/pinctrl/core.c:886: error: redefinition of \u0027pinctrl_register_mappings\u0027\ninclude/linux/pinctrl/machine.h:160: note: previous definition of \u0027pinctrl_register_mappings\u0027 was here\nmake[2]: *** [drivers/pinctrl/core.o] Error 1\nmake[1]: *** [drivers/pinctrl] Error 2\nmake: *** [drivers] Error 2\n\nAcked-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "a699e4e49ec3fb62c4a44394357d14081df10bef", "tree": "4a64e6fd8bc6a71fe7212a69f552f4aef3bd473c", "parents": [ "5b7526e3a640e491075557acaa842c59c652c0c3" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 03 07:11:04 2012 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 10 22:39:17 2012 -0600" }, "message": "irq: Kill pointless irqd_to_hw export\n\nIt makes no sense to export this trivial function. Make it a static inline\ninstead.\n\nThis patch also drops virq_to_hw from arch/c6x since it is unused by that\narchitecture.\n\nv2: Move irq_hw_number_t into types.h to fix ARM build failure\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "94fb175c0414902ad9dbd956addf3a5feafbc85b", "tree": "5d3c37abe78f072e92072f2079a98303c92cf16e", "parents": [ "a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e", "a2bd1140a264b561e38d99e656cd843c2d840e86" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "message": "Merge tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine\n\nPull dmaengine fixes from Dan Williams:\n\n1/ regression fix for Xen as it now trips over a broken assumption\n about the dma address size on 32-bit builds\n\n2/ new quirk for netdma to ignore dma channels that cannot meet\n netdma alignment requirements\n\n3/ fixes for two long standing issues in ioatdma (ring size overflow)\n and iop-adma (potential stack corruption)\n\n* tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:\n netdma: adding alignment check for NETDMA ops\n ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata\n ioat: ring size variables need to be 32bit to avoid overflow\n iop-adma: Corrected array overflow in RAID6 Xscale(R) test.\n ioat: fix size of \u0027completion\u0027 for Xen\n" }, { "commit": "d299a1f21ea7ffd5114d099b2f92c867c495e8b3", "tree": "4325e83c1ad096be0d2fa71c52d1ad115ea23ca4", "parents": [ "dbf498fbafa2c23139d5a990e94ed78bafbbea19" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Sat Mar 31 11:31:33 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 15:20:33 2012 -0400" }, "message": "{nl,cfg}80211: Support for mesh synchronization\n\nReport Toffset to userspace.\nLet userspace select the mesh synchronization method.\n\nSigned-off-by: Marco Porsch \u003cmarco.porsch@s2005.tu-chemnitz.de\u003e\nSigned-off-by: Pavel Zubarev \u003cpavel.zubarev@gmail.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dbf498fbafa2c23139d5a990e94ed78bafbbea19", "tree": "723a2ed4575ab2178cbd210d85a19d5c968a95a1", "parents": [ "9bdd3a6bf8513a0a9eda031d15b36e4677854243" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Sat Mar 31 11:31:32 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 15:20:31 2012 -0400" }, "message": "mac80211: Implement mesh synchronization framework\n\nThis patch adds MBSS extensible synchronization framework (Sec.\n13.13.2 of IEEE Std. 802.11-2012).\n\nThe framework is implemented via an ops table which defines the\nfollowing functions:\n\n rx_bcn_presp() - this is called every time a mesh beacon is\nreceived.\n adjust_tbtt() - this is called immediately before a beacon is about\nto be transmitted.\n\nThe default neighbor offset synchronization defined in the standard is\nimplemented. We also provide template functions for vendor specific\nmethods.\n\nWhen neighbor offset synchronization is active (which is the default)\nmesh neighbors in the same MBSS will track timing offsets to each other\nand compensate clock drift.\n\nIn our tests we observed that this mesh synchronization implementation\nsuccessfully corrected drifts between stations of ~2PPM while\nintroducing a jitter of ~20us.\n\nIt is also possible to test this framework on mac80211_hwsim simulated\nphys to see how it behaves under different topologies, over poor links,\netc.\n\nSigned-off-by: Marco Porsch \u003cmarco.porsch@s2005.tu-chemnitz.de\u003e\nSigned-off-by: Pavel Zubarev \u003cpavel.zubarev@gmail.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a3304b0a17495183a2270d4a25978795226597a4", "tree": "1b1f91ab191e77833b84232ba5a61d6a584b3cd6", "parents": [ "d748b4642a53cd1ead303f9e2b008295391466b7" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Mar 28 11:04:24 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 10 14:54:09 2012 -0400" }, "message": "cfg80211/nl80211: clarify TX queue API\n\nWith the plan to change mac80211\u0027s queue API to\nnot map ACs to queues 1:1, it seems necessary to\nclarify some APIs that act on ACs rather than on\nqueues to spell that out explicitly. Do this.\n\nAlso verify that the AC number given is valid.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ecd159fc5f415fa742d5daa5b43200606e6ad493", "tree": "3f2996088bdf0d275d6b5fdb3cc184f80a12e21f", "parents": [ "f68e556e23d1a4176b563bcb25d8baf2c5313f91", "6ba900676bec8baaf61aa2f85b7345c0e65774d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "06eb4eafbdc0796d741d139a44f1253278da8611", "tree": "fbdb44317130c371928154c9e6903e699fe2b995", "parents": [ "32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48", "f68e556e23d1a4176b563bcb25d8baf2c5313f91" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "bf070bc14178f1458e7eccd76316ac24f76f1890", "tree": "7d4569f916eb4718476c788aae853edde40c79cf", "parents": [ "692933b2ccfce02400dc8360a97acde2846e8541" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Wed Mar 21 16:35:52 2012 +0200" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Tue Apr 10 19:11:48 2012 +0300" }, "message": "usb: musb: wake the device before ulpi transfers\n\nmusb can be suspended at the time some other driver wants to do ulpi\ntransfers using usb_phy_io_* functions, and that can cause data abort,\nas it happened with isp1704_charger:\nhttp://article.gmane.org/gmane.linux.kernel/1226122\n\nAdd pm_runtime to ulpi functions to rectify this. This also adds io_dev\nto usb_phy so that pm_runtime_* functions can be used.\n\nCc: Felipe Contreras \u003cfelipe.contreras@gmail.com\u003e\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "891a3b1fddb24b4b53426685bd0390bb74c9b5b3", "tree": "4012c0f2365d14475f68223a2bee149f0341b99b", "parents": [ "3a450850e2bb0f92cacb12da90fe98eccd105468" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Wed Mar 28 16:10:49 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 15:36:20 2012 -0700" }, "message": "USB: fix bug in serial driver unregistration\n\nThis patch (as1536) fixes a bug in the USB serial core. Unloading and\nreloading a serial driver while a serial device is plugged in causes\nerrors because of the code in usb_serial_disconnect() that tries to\nmake sure the port_remove method is called. With the new order of\ndriver registration introduced in the 3.4 kernel, this is definitely\nnot the right thing to do (if indeed it ever was).\n\nThe patch removes that whole section code, along with the mechanism\nfor keeping track of each port\u0027s registration state, which is no\nlonger needed. The driver core can handle all that stuff for us.\n\nNote: This has been tested only with one or two USB serial drivers.\nIn theory, other drivers might still run into trouble. But if they\ndo, it will be the fault of the drivers, not of this patch -- that is,\nthe drivers will need to be fixed.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nReported-and-tested-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "292c41acddfdbe0fb42d4c4ad9b896168fd16e91", "tree": "b7fa07a43ca2362ee491dd2d72bf13be58e93e32", "parents": [ "70b12f2612a6b352d16342b5952cf9f9de6c1d56" ], "author": { "name": "Chun-Yeow Yeoh", "email": "yeohchunyeow@gmail.com", "time": "Mon Mar 19 21:38:46 2012 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 09 16:12:30 2012 -0400" }, "message": "mac80211: fix the sparse warnings on endian handling in RANN propagation\n\nThe HWMP sequence number of received RANN element is compared to decide whether to be\npropagated. The sequence number is required to covert from 32bit little endian data into\nCPUs endianness for comparison. The same applies to the RANN metric.\n\nSigned-off-by: Chun-Yeow Yeoh \u003cyeohchunyeow@gmail.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "074d46d1d23f27488a3f314e29cae2453541f17d", "tree": "c6abb99637c808f6eb9da722c3197cc980ce1a98", "parents": [ "f69b9c79c99b607a8d6b1d9e1913861154af8c63" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Mar 15 19:45:16 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 09 16:05:55 2012 -0400" }, "message": "wireless: rename ht_info to ht_operation\n\nSince some of the HT code pre-dates 802.11n-2009\nsome names are wrong. The one that bothers me most\nis that \"HT operation\" is called \"HT information\"\nin our code and that causes confusion.\n\nRename \"HT information\" to \"HT operation\" and also\nthe control_chan field to primary_chan to match\nthe name used in the spec.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bc02d15a3452fdf9276e8fb89c5e504a88df888a", "tree": "b7014c75d121418b0bc88d8c74f699f9a59adc24", "parents": [ "49b532f96fda23663f8be35593d1c1372c0f91e0" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Apr 06 11:49:50 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 10:38:30 2012 -0700" }, "message": "serial/8250_pci: add a \"force background timer\" flag and use it for the \"kt\" serial port\n\nWorkaround dropped notifications in the iir register. Register reads\ncoincident with new interrupt notifications sometimes result in this\ndevice clearing the interrupt event without reporting it in the read\ndata.\n\nThe serial core already has a heuristic for determining when a device\nhas an untrustworthy iir register. In this case when we apriori know\nthat the iir is faulty use a flag (UPF_BUG_THRE) to bypass the test and\nforce usage of the background timer.\n\n[stable: 3.3.x]\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nReported-by: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nReported-by: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nTested-by: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nTested-by: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "49b532f96fda23663f8be35593d1c1372c0f91e0", "tree": "778aacfa431d612f03a136847a0ebe84a9ffe82a", "parents": [ "3579812373aba92b2f3b632bdf99329bc3c05d62" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Apr 06 11:49:44 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 09 10:34:52 2012 -0700" }, "message": "Revert \"serial/8250_pci: setup-quirk workaround for the kt serial controller\"\n\nThis reverts commit 448ac154c957c4580531fa0c8f2045816fe2f0e7.\n\nThe semantic of UPF_IIR_ONCE is only guaranteed to workaround the race\ncondition in the kt serial\u0027s iir register if the only source of\ninterrupts is THRE (fifo-empty) events. An modem status event at the\nwrong time can again cause an iir read to drop the \u0027empty\u0027 status\nleading to a hang. So, revert this in preparation for using the\nexisting \"I don\u0027t trust my iir register\" workaround in the 8250 core\n(UART_BUG_THRE).\n\n[stable: 3.3.x]\nCc: stable \u003cstable@vger.kernel.org\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Sudhakar Mamillapalli \u003csudhakar@fb.com\u003e\nReported-by: Nhan H Mai \u003cnhan.h.mai@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "95ad2f873d5d404dc9ebc2377de0b762346346c0", "tree": "61a2b1897a62e245729667844204bbef01be2573", "parents": [ "6ee0b693bdb8ec56689e0d1cc533b16466fda048" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Apr 06 18:12:54 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 09 16:29:34 2012 +0200" }, "message": "netfilter: ip6_tables: ip6t_ext_hdr is now static inline\n\nWe may hit this in xt_LOG:\n\nnet/built-in.o:xt_LOG.c:function dump_ipv6_packet:\n\terror: undefined reference to \u0027ip6t_ext_hdr\u0027\n\nhappens with these config options:\n\nCONFIG_NETFILTER_XT_TARGET_LOG\u003dy\nCONFIG_IP6_NF_IPTABLES\u003dm\n\nip6t_ext_hdr is fairly small and it is called in the packet path.\nMake it static inline.\n\nReported-by: Simon Kirby \u003csim@netnation.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "23f347ef63aa36b5a001b6791f657cd0e2a04de3", "tree": "ce06ebdccd16b99265b3e74f8e9b7bd1e29cf465", "parents": [ "314489bd4c7780fde6a069783d5128f6cef52919", "110c43304db6f06490961529536c362d9ac5732f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 06 10:37:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 06 10:37:38 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n\n 1) Fix inaccuracies in network driver interface documentation, from Ben\n Hutchings.\n\n 2) Fix handling of negative offsets in BPF JITs, from Jan Seiffert.\n\n 3) Compile warning, locking, and refcounting fixes in netfilter\u0027s\n xt_CT, from Pablo Neira Ayuso.\n\n 4) phonet sendmsg needs to validate user length just like any other\n datagram protocol, fix from Sasha Levin.\n\n 5) Ipv6 multicast code uses wrong loop index, from RongQing Li.\n\n 6) Link handling and firmware fixes in bnx2x driver from Yaniv Rosner\n and Yuval Mintz.\n\n 7) mlx4 erroneously allocates 4 pages at a time, regardless of page\n size, fix from Thadeu Lima de Souza Cascardo.\n\n 8) SCTP socket option wasn\u0027t extended in a backwards compatible way,\n fix from Thomas Graf.\n\n 9) Add missing address change event emissions to bonding, from Shlomo\n Pongratz.\n\n10) /proc/net/dev regressed because it uses a private offset to track\n where we are in the hash table, but this doesn\u0027t track the offset\n pullback that the seq_file code does resulting in some entries being\n missed in large dumps.\n\n Fix from Eric Dumazet.\n\n11) do_tcp_sendpage() unloads the send queue way too fast, because it\n invokes tcp_push() when it shouldn\u0027t. Let the natural sequence\n generated by the splice paths, and the assosciated MSG_MORE\n settings, guide the tcp_push() calls.\n\n Otherwise what goes out of TCP is spaghetti and doesn\u0027t batch\n effectively into GSO/TSO clusters.\n\n From Eric Dumazet.\n\n12) Once we put a SKB into either the netlink receiver\u0027s queue or a\n socket error queue, it can be consumed and freed up, therefore we\n cannot touch it after queueing it like that.\n\n Fixes from Eric Dumazet.\n\n13) PPP has this annoying behavior in that for every transmit call it\n immediately stops the TX queue, then calls down into the next layer\n to transmit the PPP frame.\n\n But if that next layer can take it immediately, it just un-stops the\n TX queue right before returning from the transmit method.\n\n Besides being useless work, it makes several facilities unusable, in\n particular things like the equalizers. Well behaved devices should\n only stop the TX queue when they really are full, and in PPP\u0027s case\n when it gets backlogged to the downstream device.\n\n David Woodhouse therefore fixed PPP to not stop the TX queue until\n it\u0027s downstream can\u0027t take data any more.\n\n14) IFF_UNICAST_FLT got accidently lost in some recent stmmac driver\n changes, re-add. From Marc Kleine-Budde.\n\n15) Fix link flaps in ixgbe, from Eric W. Multanen.\n\n16) Descriptor writeback fixes in e1000e from Matthew Vick.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n net: fix a race in sock_queue_err_skb()\n netlink: fix races after skb queueing\n doc, net: Update ndo_start_xmit return type and values\n doc, net: Remove instruction to set net_device::trans_start\n doc, net: Update netdev operation names\n doc, net: Update documentation of synchronisation for TX multiqueue\n doc, net: Remove obsolete reference to dev-\u003epoll\n ethtool: Remove exception to the requirement of holding RTNL lock\n MAINTAINERS: update for Marvell Ethernet drivers\n bonding: properly unset current_arp_slave on slave link up\n phonet: Check input from user before allocating\n tcp: tcp_sendpages() should call tcp_push() once\n ipv6: fix array index in ip6_mc_add_src()\n mlx4: allocate just enough pages instead of always 4 pages\n stmmac: re-add IFF_UNICAST_FLT for dwmac1000\n bnx2x: Clear MDC/MDIO warning message\n bnx2x: Fix BCM57711+BCM84823 link issue\n bnx2x: Clear BCM84833 LED after fan failure\n bnx2x: Fix BCM84833 PHY FW version presentation\n bnx2x: Fix link issue for BCM8727 boards.\n ...\n" }, { "commit": "b4f79e5cb2182f27d151da6e223186f287a615d6", "tree": "bde77a721bae8c2fad81d261af0952fa9b0ce8f6", "parents": [ "44c14c1d4cf9b6ef4993c4a69f479d1f13cb8b21" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Apr 05 14:38:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 06 02:43:12 2012 -0400" }, "message": "ethtool: Remove exception to the requirement of holding RTNL lock\n\nCommit e52ac3398c3d772d372b9b62ab408fd5eec96840 (\u0027net: Use device\nmodel to get driver name in skb_gso_segment()\u0027) removed the only\nin-tree caller of ethtool ops that doesn\u0027t hold the RTNL lock.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35f9c09fe9c72eb8ca2b8e89a593e1c151f28fc2", "tree": "6e57508d6633c47b8846cfdbaefc33e6e0128a47", "parents": [ "78d50217baf36093ab320f95bae0d6452daec85c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Apr 05 03:05:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 05 19:04:27 2012 -0400" }, "message": "tcp: tcp_sendpages() should call tcp_push() once\n\ncommit 2f533844242 (tcp: allow splice() to build full TSO packets) added\na regression for splice() calls using SPLICE_F_MORE.\n\nWe need to call tcp_flush() at the end of the last page processed in\ntcp_sendpages(), or else transmits can be deferred and future sends\nstall.\n\nAdd a new internal flag, MSG_SENDPAGE_NOTLAST, acting like MSG_MORE, but\nwith different semantic.\n\nFor all sendpage() providers, its a transparent change. Only\nsock_sendpage() and tcp_sendpages() can differentiate the two different\nflags provided by pipe_to_sendpage()\n\nReported-by: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Nandita Dukkipati \u003cnanditad@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: H.K. Jerry Chu \u003chkchu@google.com\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nCc: Mahesh Bandewar \u003cmaheshb@google.com\u003e\nCc: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail\u003ecom\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d32c88f0b94061b3af2e3ade92422407282eb12", "tree": "2e1f81aa47b2cf59625c8fba17199617e33802e6", "parents": [ "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "dac23b0d0513916498d40412818bd2c581b365f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge batch of fixes from Andrew Morton:\n \"The simple_open() cleanup was held back while I wanted for laggards to\n merge things.\n\n I still need to send a few checkpoint/restore patches. I\u0027ve been\n wobbly about merging them because I\u0027m wobbly about the overall\n prospects for success of the project. But after speaking with Pavel\n at the LSF conference, it sounds like they\u0027re further toward\n completion than I feared - apparently davem is at the \"has stopped\n complaining\" stage regarding the net changes. So I need to go back\n and re-review those patchs and their (lengthy) discussion.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (16 patches)\n memcg swap: use mem_cgroup_uncharge_swap fix\n backlight: add driver for DA9052/53 PMIC v1\n C6X: use set_current_blocked() and block_sigmask()\n MAINTAINERS: add entry for sparse checker\n MAINTAINERS: fix REMOTEPROC F: typo\n alpha: use set_current_blocked() and block_sigmask()\n simple_open: automatically convert to simple_open()\n scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()\n libfs: add simple_open()\n hugetlbfs: remove unregister_filesystem() when initializing module\n drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback\n fs/xattr.c:setxattr(): improve handling of allocation failures\n fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed\n fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()\n sysrq: use SEND_SIG_FORCED instead of force_sig()\n proc: fix mount -t proc -o AAA\n" }, { "commit": "a2bd1140a264b561e38d99e656cd843c2d840e86", "tree": "9c9f19dde5c0213a52de0e77c16059062cc6c8a1", "parents": [ "f26df1a1a9452573af7b6cea9a4723593e838568" ], "author": { "name": "Dave Jiang", "email": "dave.jiang@intel.com", "time": "Wed Apr 04 16:10:46 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Apr 05 15:27:12 2012 -0700" }, "message": "netdma: adding alignment check for NETDMA ops\n\nThis is the fallout from adding memcpy alignment workaround for certain\nIOATDMA hardware. NetDMA will only use DMA engine that can handle byte align\nops.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "dac23b0d0513916498d40412818bd2c581b365f7", "tree": "e758624d444ab8d93f5f38cbcc34de5a8b77248d", "parents": [ "6ede3d832aaa038e7465e677569f7acc96b4dcdf" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Thu Apr 05 14:25:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:51 2012 -0700" }, "message": "memcg swap: use mem_cgroup_uncharge_swap fix\n\nAlthough mem_cgroup_uncharge_swap has an empty placeholder for\n!CONFIG_CGROUP_MEM_RES_CTLR_SWAP the definition is placed in the\nCONFIG_SWAP ifdef block so we are missing the same definition for\n!CONFIG_SWAP which implies !CONFIG_CGROUP_MEM_RES_CTLR_SWAP.\n\nThis has not been an issue before, because mem_cgroup_uncharge_swap was\nnot called from !CONFIG_SWAP context. But Hugh Dickins has a cleanup\npatch to call __mem_cgroup_commit_charge_swapin which is defined also\nfor !CONFIG_SWAP.\n\nLet\u0027s move both the empty definition and declaration outside of the\nCONFIG_SWAP block to avoid the following compilation error:\n\n mm/memcontrol.c: In function \u0027__mem_cgroup_commit_charge_swapin\u0027:\n mm/memcontrol.c:2837: error: implicit declaration of function \u0027mem_cgroup_uncharge_swap\u0027\n\nif CONFIG_SWAP is disabled.\n\nReported-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20955e891d828b2027281fe3295dae6af8e0423b", "tree": "551b8b4a3515f3b99e357e8cef5bc2e5d5051d50", "parents": [ "7563ec4c211ba59c2331dc6b94a068250345c387" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Apr 05 14:25:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:50 2012 -0700" }, "message": "libfs: add simple_open()\n\ndebugfs and a few other drivers use an open-coded version of\nsimple_open() to pass a pointer from the file to the read/write file\nops. Add support for this simple case to libfs so that we can remove\nthe many duplicate copies of this simple function.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "08f10affe45051e18e0d8291c0a53aecef1b8a14", "tree": "0f18aa6f7d3885f695dfe5ad876363afe03ce6a6", "parents": [ "366cddb4028858079a9a8145bd713c13a9edb3dc" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.com", "time": "Wed Apr 04 21:33:30 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 05 05:08:04 2012 -0400" }, "message": "net/dcb: Add an optional max rate attribute\n\nAlthough not specified in 8021Qaz spec, it could be useful to enable drivers\nwhose HW supports setting a rate limit for an ETS TC. This patch adds this\noptional attribute to DCB netlink. To use it, drivers should implement and\nregister the callbacks ieee_setmaxrate and ieee_getmaxrate. The units are 64\nbits long and specified in Kbps to enable usage over both slow and very fast\nnetworks.\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5395e92a470769d67369c002a41e59619f5214b", "tree": "2fd6a4d09c6e4514856f8e4762fe8ed301b8c9b5", "parents": [ "0e98b523c4a4119cbd17e58dff385cc329064694" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.com", "time": "Wed Apr 04 21:33:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 05 05:08:03 2012 -0400" }, "message": "net/mlx4_core: set port QoS attributes\n\nAdding QoS firmware commands:\n- mlx4_en_SET_PORT_PRIO2TC - set UP \u003c\u003d\u003e TC\n- mlx4_en_SET_PORT_SCHEDULER - set promised BW, max BW and PG number\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e98b523c4a4119cbd17e58dff385cc329064694", "tree": "4c16b13b5f118cfcf607195d1683ed01ba508b77", "parents": [ "73a0d907301ece200d32b4e8ba2da2ca296b507f" ], "author": { "name": "Amir Vadai", "email": "amirv@mellanox.com", "time": "Wed Apr 04 21:33:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 05 05:08:03 2012 -0400" }, "message": "net/mlx4_en: Force user priority by QP attribute\n\nInstead of relying on HW to change schedule queue by UP, schedule\nqueue is fixed for a tx_ring, and UP in WQE is ignored in this aspect. This\nresolves two issues with untagged traffic:\n1. untagged traffic has no UP in packet which is needed for QoS. The change\n above allows setting the schedule queue (and by that the UP) of such a stream.\n2. BlueFlame uses the same field used by vlan tag. So forcing UP from QPC\n allows using BF for untagged but prioritized traffic.\n\nIn old firmware that force UP is not supported, untagged traffic will not subject to\nQoS.\n\nBecause UP is set by QP, need to always have a tx ring per UP, even if pfcrx\nmodule paramter is false.\n\nSigned-off-by: Amir Vadai \u003camirv@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9899b81e7ca5c285b825ff10ca9357dd18813d83", "tree": "3319536eed1199cd9785b44361c0f0129bcd3e52", "parents": [ "044a38134a1536536cc4e542ec31a86ef8e294c9" ], "author": { "name": "Mike Sinkovsky", "email": "msink@permonline.ru", "time": "Wed Apr 04 19:33:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 05 01:43:02 2012 -0400" }, "message": "Ethernet driver for the WIZnet W5300 chip\n\nBased on original driver from chip manufacturer, but nearly full rewite.\nTested and used in production with Blackfin BF531 embedded processor.\n\nSigned-off-by: Mike Sinkovsky \u003cmsink@permonline.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "tree": "b279ac78cc010464a8c757f352303511a87b855d", "parents": [ "6c216ec636f75d834461be15f83ec41a6759bd2b", "e4b41fb9dafb9af4fecb602bf73d858ab651eeed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 18:37:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 18:37:09 2012 -0700" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\nPull CIFS fixes from Steve French.\n\n* git://git.samba.org/sfrench/cifs-2.6:\n Fix UNC parsing on mount\n Remove unnecessary check for NULL in password parser\n CIFS: Fix VFS lock usage for oplocked files\n Revert \"CIFS: Fix VFS lock usage for oplocked files\"\n cifs: writing past end of struct in cifs_convert_address()\n cifs: silence compiler warnings showing up with gcc-4.7.0\n CIFS: Fix VFS lock usage for oplocked files\n" }, { "commit": "2615598fc100451c71b83d06bdf5faead619a40e", "tree": "d8df65665fecf7dfd25d42ba862c6f929be43ca3", "parents": [ "bd856615c128c40d189d6dd68dde7afe15ed3446" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Wed Apr 04 12:16:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 20:30:40 2012 -0400" }, "message": "team: add binary option type\n\nFor transfering generic binary data (e.g. BPF code), introduce new\nbinary option type.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c216ec636f75d834461be15f83ec41a6759bd2b", "tree": "505ab410c3208e586fd7db0bb97364d8dac490a1", "parents": [ "58bca4a8fa90fcf9069379653b396b2cec642f7f", "3751d3e85cf693e10e2c47c03c8caa65e171099b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 17:26:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 17:26:08 2012 -0700" }, "message": "Merge tag \u0027for_linus-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb\n\nPull KGDB/KDB regression fixes from Jason Wessel:\n - Fix a Smatch warning that appeared in the 3.4 merge window\n - Fix kgdb test suite with SMP for all archs without HW single stepping\n - Fix kgdb sw breakpoints with CONFIG_DEBUG_RODATA\u003dy limitations on x86\n - Fix oops on kgdb test suite with CONFIG_DEBUG_RODATA\n - Fix kgdb test suite with SMP for all archs with HW single stepping\n\n* tag \u0027for_linus-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:\n x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()\n kgdb,debug_core: pass the breakpoint struct instead of address and memory\n kgdbts: (2 of 2) fix single step awareness to work correctly with SMP\n kgdbts: (1 of 2) fix single step awareness to work correctly with SMP\n kgdbts: Fix kernel oops with CONFIG_DEBUG_RODATA\n kdb: Fix smatch warning on dbg_io_ops-\u003eis_console\n" }, { "commit": "58bca4a8fa90fcf9069379653b396b2cec642f7f", "tree": "483c535136b5b168f36326956453e80ce5aa6543", "parents": [ "64ebe987311853ea857a244439de5b947a4b1b07", "64d70fe5d3640e1a89790ed21120921278f8cb86" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 17:13:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 17:13:43 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull DMA mapping branch from Marek Szyprowski:\n \"Short summary for the whole series:\n\n A few limitations have been identified in the current dma-mapping\n design and its implementations for various architectures. There exist\n more than one function for allocating and freeing the buffers:\n currently these 3 are used dma_{alloc, free}_coherent,\n dma_{alloc,free}_writecombine, dma_{alloc,free}_noncoherent.\n\n For most of the systems these calls are almost equivalent and can be\n interchanged. For others, especially the truly non-coherent ones\n (like ARM), the difference can be easily noticed in overall driver\n performance. Sadly not all architectures provide implementations for\n all of them, so the drivers might need to be adapted and cannot be\n easily shared between different architectures. The provided patches\n unify all these functions and hide the differences under the already\n existing dma attributes concept. The thread with more references is\n available here:\n\n http://www.spinics.net/lists/linux-sh/msg09777.html\n\n These patches are also a prerequisite for unifying DMA-mapping\n implementation on ARM architecture with the common one provided by\n dma_map_ops structure and extending it with IOMMU support. More\n information is available in the following thread:\n\n http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819\n\n More works on dma-mapping framework are planned, especially in the\n area of buffer sharing and managing the shared mappings (together with\n the recently introduced dma_buf interface: commit d15bd7ee445d\n \"dma-buf: Introduce dma buffer sharing mechanism\").\n\n The patches in the current set introduce a new alloc/free methods\n (with support for memory attributes) in dma_map_ops structure, which\n will later replace dma_alloc_coherent and dma_alloc_writecombine\n functions.\"\n\nPeople finally started piping up with support for merging this, so I\u0027m\nmerging it as the last of the pending stuff from the merge window.\nLooks like pohmelfs is going to wait for 3.5 and more external support\nfor merging.\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:\n common: DMA-mapping: add NON-CONSISTENT attribute\n common: DMA-mapping: add WRITE_COMBINE attribute\n common: dma-mapping: introduce mmap method\n common: dma-mapping: remove old alloc_coherent and free_coherent methods\n Hexagon: adapt for dma_map_ops changes\n Unicore32: adapt for dma_map_ops changes\n Microblaze: adapt for dma_map_ops changes\n SH: adapt for dma_map_ops changes\n Alpha: adapt for dma_map_ops changes\n SPARC: adapt for dma_map_ops changes\n PowerPC: adapt for dma_map_ops changes\n MIPS: adapt for dma_map_ops changes\n X86 \u0026 IA64: adapt for dma_map_ops changes\n common: dma-mapping: introduce generic alloc() and free() methods\n" }, { "commit": "18f05d64ec36e27892cc0f55be707762aae053a1", "tree": "2800ef8ec49ef318ffe16b93db4b15cebc1f39ca", "parents": [ "ba1377ffe90a04d9a1d526067909d24e3cf7a3f7" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Wed Apr 04 04:33:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:39:24 2012 -0400" }, "message": "stmmac: extend CSR Clock Range programming\n\nThe CSR Clock Range has been reworked and new macros has\nbeen added in the platform header to allow the CSR Clock\nRange selection in the GMII Address Register.\nThe previous work didn\u0027t add the other fields\nthat can be used to achieve MDC clock of frequency\nhigher than the IEEE 802.3 specified frequency limit\nof 2.5 MHz and program a clock divider of lower value.\nOn such platforms, these are used indeed so this patch\nadds them.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8327eb65e795ba4f922bf7e531cd312875f0dc29", "tree": "a527c090d553ee9df37de620f05e03ee15d905d9", "parents": [ "faeae3fa0f3a243f677cf606aa87d0d99c225165" ], "author": { "name": "Deepak SIKRI", "email": "deepak.sikri@st.com", "time": "Wed Apr 04 04:33:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:39:24 2012 -0400" }, "message": "stmmac: re-work the internal GMAC DMA platf parameters\n\nThis patch re-works the internal GMAC DMA parameters\npassed from the platform.\nIn the past, we only passed the pbl but, with new core,\nother parameters can be passed and are mandatory on some\nplatforms.\n\nNew parameters are documented in stmmac.txt because this\npatch has an impact for many platforms.\n\nSigned-off-by: Shiraz Hashim \u003cshiraz.hashim@st.com\u003e\nSigned-off-by: Vikas Manocha \u003cvikas.manocha@st.com\u003e\nSigned-off-by: Deepak Sikri \u003cdeepak.sikri@st.com\u003e\nHacked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "faeae3fa0f3a243f677cf606aa87d0d99c225165", "tree": "72a644c8bafee340fb190578f25af3de6b6abcd4", "parents": [ "38912bdbde5f39aa00dfc6228ef580ff79b46bd3" ], "author": { "name": "Deepak SIKRI", "email": "deepak.sikri@st.com", "time": "Wed Apr 04 04:33:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:39:23 2012 -0400" }, "message": "stmmac: Define MDC clock selection macros\n\nThe patch adds the macros to be used for MDC clock selection. The MDC clock\nfrequency is based on scaled system clock, and has to be confined to a range\nof 1-2.5 MHz. Based on the input CSR clock, the scaling factor has to be\nselected.\nThe platform specific code will provide the default value of this scaling\nfactor, based on the input CSR clock.\nThere is an option to set MDC clock higher than the IEEE 802.3 specified\nfrequency limit of 2.5 MHz. This applies for the interfacing chips that\nsupport higher MDC clocks. The resultant higher clock of 12.5 MHz requires\nadditional Macros to be defined for the clock divider corresponding to the\nto the following selection.\n-----------------------------------------\n\tSelection\tMDC Clock\n-----------------------------------------\n\t1000 \t\tclk_csr_i/4\n\t1001 \t\tclk_csr_i/6\n\t1010 \t\tclk_csr_i/8\n\t1011 \t\tclk_csr_i/10\n\t1100 \t\tclk_csr_i/12\n\t1101\t \tclk_csr_i/14\n\t1110 \t\tclk_csr_i/16\n\t1111 \t\tclk_csr_i/18\n\nThis support has to be added both in the include file, as well as driver. The\ndriver need to program the registers based on the interfacing chips. This would\nbe more board specific information and needs to be passed through the platform\ncode to the driver. This work would be carried out in the future patch set\nrelease.\n\nSigned-off-by: Deepak Sikri \u003cdeepak.sikri@st.com\u003e\nAcked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55f9a4d6facb35198ddb88a8fe21ca2ee753af7a", "tree": "7d5117dcf6ec24bb4b501d95992d3ce25725ce4b", "parents": [ "f142af2e2064546ac470e8690acbd189b3584e67" ], "author": { "name": "Deepak SIKRI", "email": "deepak.sikri@st.com", "time": "Wed Apr 04 04:33:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 18:39:23 2012 -0400" }, "message": "stmmac: Define CSUM offload engine Types\n\nThis patch explicitly defines the CSUM offload engine type which need\n(not mandatory) to be passed from the platform code.\nSTMMAC core supports two check sum offload engine types- Type-1 \u0026 Type-2.\nAlso, there are STMMAC cores that do not have the check sum offload\ncapabilities.\n\nThe behaviour of Type-1 \u0026 Type-2 cores related to provision of checksum\nincreases the packet length for Type-1 cores by 2, as the checksum is appended\nat the end of data packet and the same is made accountable in the DMA status.\nThe STMMAC cores beyond Version-3.5 provide HW interface registers which allows\nthe user to read the HW capabilities, while to support the previous cores the\ninformation related to HW capabilities has to be provided from the platform\ncode.\n\nThe Type-1 cores which do not have the HW register interface need this\ninformation.\n\nThis patch also updates the driver\u0027s doc.\n\nSigned-off-by: Deepak Sikri \u003cdeepak.sikri@st.com\u003e\nHacked-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "f142af2e2064546ac470e8690acbd189b3584e67" }