)]}' { "log": [ { "commit": "8a8e3d84b1719a56f9151909e80ea6ebc5b8e318", "tree": "be050c259ea5bfc41731ac0581df4f57034cb7a3", "parents": [ "09a8f03197d4799bc9969b35240e5606c026ded6" ], "author": { "name": "Jesper Dangaard Brouer", "email": "brouer@redhat.com", "time": "Wed Aug 14 23:47:11 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 15 01:43:08 2013 -0700" }, "message": "net_sched: restore \"linklayer atm\" handling\n\ncommit 56b765b79 (\"htb: improved accuracy at high rates\")\nbroke the \"linklayer atm\" handling.\n\n tc class add ... htb rate X ceil Y linklayer atm\n\nThe linklayer setting is implemented by modifying the rate table\nwhich is send to the kernel. No direct parameter were\ntransferred to the kernel indicating the linklayer setting.\n\nThe commit 56b765b79 (\"htb: improved accuracy at high rates\")\nremoved the use of the rate table system.\n\nTo keep compatible with older iproute2 utils, this patch detects\nthe linklayer by parsing the rate table. It also supports future\nversions of iproute2 to send this linklayer parameter to the\nkernel directly. This is done by using the __reserved field in\nstruct tc_ratespec, to convey the choosen linklayer option, but\nonly using the lower 4 bits of this field.\n\nLinklayer detection is limited to speeds below 100Mbit/s, because\nat high rates the rtab is gets too inaccurate, so bad that\nseveral fields contain the same values, this resembling the ATM\ndetect. Fields even start to contain \"0\" time to send, e.g. at\n1000Mbit/s sending a 96 bytes packet cost \"0\", thus the rtab have\nbeen more broken than we first realized.\n\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "288a9376371d425edeeea41a0310922c5fb2092d", "tree": "815875620d171112bb635d0d2bfcf6e838985d3f", "parents": [ "d06f5187469eee1b2932c02fd093d113cfc60d5e" ], "author": { "name": "Eliezer Tamir", "email": "eliezer.tamir@linux.intel.com", "time": "Wed Aug 07 11:33:25 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 11:39:08 2013 -0700" }, "message": "net: rename busy poll MIB counter\n\nRename mib counter from \"low latency\" to \"busy poll\"\n\nv1 also moved the counter to the ip MIB (suggested by Shawn Bohrer)\nEric Dumazet suggested that the current location is better.\n\nSo v2 just renames the counter to fit the new naming convention.\n\nSigned-off-by: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22e02a0272e5291a40ca28d2b7aea5231c832077", "tree": "04630aa6452458c643a3af6fd2c296609beef2c6", "parents": [ "b00589af3b04736376f24625ab0b394642e89e29", "11a45820d02ee78ad22bb95d5abb94950a355d8d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 01 14:30:59 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 01 14:30:59 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "9ea7187c53f63e31f2d1b2b1e474e31808565009", "tree": "6357ddd2801bc7c98f3fc613b78b4ecef82d7fa0", "parents": [ "7427b370e0aa6226c763af94fc5c4e3433383543" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Jul 31 01:19:43 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Jul 31 01:19:43 2013 +0200" }, "message": "NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOAD\n\nLoading a firmware into a target is typically called firmware\ndownload, not firmware upload. So we rename the netlink API to\nNFC_CMD_FW_DOWNLOAD in order to avoid any terminology confusion from\nuserspace.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "36f571e9ed0419e73d127e18aa8992ced867268c", "tree": "94fc210322484b5fa082f28dd2bad702c1685ba9", "parents": [ "8027678202d0e51ac2aa08111ec86b5a77777431", "0699a73af3811b66b1ab5650575acee5eea841ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 29 17:08:22 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 29 17:08:22 2013 -0700" }, "message": "Merge tag \u0027firewire-fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394\n\nPull firewire regression fix from Stefan Richter:\n \"This fixes corrupted video capture, seen with IIDC/DCAM video and\n certain buffer settings. (Regression since v3.4 inclusive.)\"\n\n* tag \u0027firewire-fix\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:\n firewire: fix libdc1394/FlyCap2 iso event regression\n" }, { "commit": "0699a73af3811b66b1ab5650575acee5eea841ab", "tree": "a70a65bf5531642f376c9f542ad7d0ec6ec3e29c", "parents": [ "bcabcfd2e09ceb8599a33001e812e7cbad00fc4d" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Mon Jul 22 21:32:09 2013 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jul 27 20:24:36 2013 +0200" }, "message": "firewire: fix libdc1394/FlyCap2 iso event regression\n\nCommit 18d627113b83 (firewire: prevent dropping of completed iso packet\nheader data) was intended to be an obvious bug fix, but libdc1394 and\nFlyCap2 depend on the old behaviour by ignoring all returned information\nand thus not noticing that not all packets have been received yet. The\nresult was that the video frame buffers would be saved before they\ncontained the correct data.\n\nReintroduce the old behaviour for old clients.\n\nTested-by: Stepan Salenikovich \u003cstepan.salenikovich@gmail.com\u003e\nTested-by: Josep Bosch \u003cjep250@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e # 3.4+\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "36ff66db3fb5642906e46e73ca9cf92f1c5974ff", "tree": "69c6dfc6275116e073727d11d8f8febb4e71350a", "parents": [ "39c242704cba38bdf67566589facdd6fb2f2d941" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Thu Jun 27 15:27:07 2013 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Jul 16 15:33:02 2013 -0700" }, "message": "USB: move the definition of USB_MAXCHILDREN\n\nThe USB_MAXCHILDREN symbol is used in include/uapi/linux/usb/ch11.h, a\nuser-mode header, even though it is defined in include/linux/usb.h,\nwhich is kernel-only. This causes compile-time errors when user\nprograms try to #include linux/usb/ch11.h.\n\nThis patch fixes the problem by moving the definition of USB_MAXCHILDREN\ninto ch11.h. It also gets rid of unneeded parentheses.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d1447464789918db1e1a3d0aaf50d3d0f6487a4f", "tree": "490bd5c493cdba742dc90d3731962226838e5f33", "parents": [ "833e68340d108d88f4cb79b7d7223f6859d362ca", "6ac5310e649df5fcd240d764503bf16a1317ea39" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 13 14:52:21 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 13 14:52:21 2013 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS updates from Ralf Baechle:\n \"MIPS updates:\n\n - All the things that didn\u0027t make 3.10.\n - Removes the Windriver PPMC platform. Nobody will miss it.\n - Remove a workaround from kernel/irq/irqdomain.c which was there\n exclusivly for MIPS. Patch by Grant Likely.\n - More small improvments for the SEAD 3 platform\n - Improvments on the BMIPS / SMP support for the BCM63xx series.\n - Various cleanups of dead leftovers.\n - Platform support for the Cavium Octeon-based EdgeRouter Lite.\n\n Two large KVM patchsets didn\u0027t make it for this pull request because\n their respective authors are vacationing\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)\n MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER\n MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions\n MIPS: SEAD3: Disable L2 cache on SEAD-3.\n MIPS: BCM63xx: Enable second core SMP on BCM6328 if available\n MIPS: BCM63xx: Add SMP support to prom.c\n MIPS: define write{b,w,l,q}_relaxed\n MIPS: Expose missing pci_io{map,unmap} declarations\n MIPS: Malta: Update GCMP detection.\n Revert \"MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET\"\n MIPS: APSP: Remove \u003casm/kspd.h\u003e\n SSB: Kconfig: Amend SSB_EMBEDDED dependencies\n MIPS: microMIPS: Fix improper definition of ISA exception bit.\n MIPS: Don\u0027t try to decode microMIPS branch instructions where they cannot exist.\n MIPS: Declare emulate_load_store_microMIPS as a static function.\n MIPS: Fix typos and cleanup comment\n MIPS: Cleanup indentation and whitespace\n MIPS: BMIPS: support booting from physical CPU other than 0\n MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS\n MIPS: GIC: Fix gic_set_affinity infinite loop\n MIPS: Don\u0027t save/restore OCTEON wide multiplier state on syscalls.\n ...\n" }, { "commit": "858655116bfc722837e3aec0909b8e9d08f96996", "tree": "ef9171d51ffcd01e40d1131d62be32e5a7d371dc", "parents": [ "239dab4636f7f5f971ac39b5ca84254cff112cac", "1b2c14b44adcb7836528640bfdc40bf7499d987d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 13 12:09:57 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 13 12:09:57 2013 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media updates from Mauro Carvalho Chehab:\n \"This series contain:\n - new i2c video drivers: ml86v7667 (video decoder),\n ths8200 (video encoder)\n - a new video driver for EasyCap cards based on Fushicai USBTV007\n - Improved support for OF and embedded systems, with V4L2 async\n initialization and a better support for clocks\n - API cleanups on the ioctls used by the v4l2 debug tool\n - Lots of cleanups\n - As usual, several driver improvements and new cards additions\n - Revert two changesets that change the minimal symbol rate for\n stv0399, as request by Manu\n - Update MAINTAINERS and other files to point to my new e-mail\"\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)\n MAINTAINERS \u0026 ABI: Update to point to my new email\n [media] stb0899: restore minimal rate to 5Mbauds\n [media] exynos4-is: Correct colorspace handling at FIMC-LITE\n [media] exynos4-is: Set valid initial format on FIMC.n subdevs\n [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads\n [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev\n [media] exynos4-is: Set valid initial format at FIMC-LITE\n [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs\n [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry\n [media] Documentation: Update driver\u0027s directory in video4linux/fimc.txt\n [media] exynos4-is: Change fimc-is firmware file names\n [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS\n [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver\n [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms\n [media] media: i2c: tvp514x: remove manual setting of subdev name\n [media] media: i2c: tvp7002: remove manual setting of subdev name\n [media] mem2mem: set missing v4l2_dev pointer\n [media] wl128x: add missing struct v4l2_device\n [media] tvp514x: Fix init seqeunce\n [media] saa7134: Fix sparse warnings by adding __user annotation\n ...\n" }, { "commit": "9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e", "tree": "63c907110eac32c31a1786ebff3e7d9257e61c9b", "parents": [ "36805aaea5ae3cf1bb32f1643e0a800bb69f0d5b", "9d0eb0ab432aaa9160cf2675aee73b3900b9bc18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 11 13:05:40 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 11 13:05:40 2013 -0700" }, "message": "Merge tag \u0027dm-3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm\n\nPull device-mapper changes from Alasdair G Kergon:\n \"Add a device-mapper target called dm-switch to provide a multipath\n framework for storage arrays that dynamically reconfigure their\n preferred paths for different device regions.\n\n Fix a bug in the verity target that prevented its use with some\n specific sizes of devices.\n\n Improve some locking mechanisms in the device-mapper core and bufio.\n\n Add Mike Snitzer as a device-mapper maintainer.\n\n A few more clean-ups and fixes\"\n\n* tag \u0027dm-3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:\n dm: add switch target\n dm: update maintainers\n dm: optimize reorder structure\n dm: optimize use SRCU and RCU\n dm bufio: submit writes outside lock\n dm cache: fix arm link errors with inline\n dm verity: use __ffs and __fls\n dm flakey: correct ctr alloc failure mesg\n dm verity: remove pointless comparison\n dm: use __GFP_HIGHMEM in __vmalloc\n dm verity: fix inability to use a few specific devices sizes\n dm ioctl: set noio flag to avoid __vmalloc deadlock\n dm mpath: fix ioctl deadlock when no paths\n" }, { "commit": "83d5e5b0af907d46d241a86d9e44003b3f0accbd", "tree": "46349d07c2090da15c250af3bac40833eb96e9f0", "parents": [ "2480945cd44b50ba8b1646544eec2db21f064f12" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Wed Jul 10 23:41:18 2013 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Wed Jul 10 23:41:18 2013 +0100" }, "message": "dm: optimize use SRCU and RCU\n\nThis patch removes \"io_lock\" and \"map_lock\" in struct mapped_device and\n\"holders\" in struct dm_table and replaces these mechanisms with\nsleepable-rcu.\n\nPreviously, the code would call \"dm_get_live_table\" and \"dm_table_put\" to\nget and release table. Now, the code is changed to call \"dm_get_live_table\"\nand \"dm_put_live_table\". dm_get_live_table locks sleepable-rcu and\ndm_put_live_table unlocks it.\n\ndm_get_live_table_fast/dm_put_live_table_fast can be used instead of\ndm_get_live_table/dm_put_live_table. These *_fast functions use\nnon-sleepable RCU, so the caller must not block between them.\n\nIf the code changes active or inactive dm table, it must call\ndm_sync_table before destroying the old table.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Jun\u0027ichi Nomura \u003cj-nomura@ce.jp.nec.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "5f129721713e099a04c6024015f97faa58562ab1", "tree": "c5a498f217da044eb5ce870bedc95c4bf82cf185", "parents": [ "15a49b9a90c86c6cb7f270a699d2ae7468862c28", "c893c8d763d8a8a757028a48ace7d1bb2dd8373f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 10 14:50:58 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 10 14:50:58 2013 -0700" }, "message": "Merge tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull virtio updates from Rusty Russell:\n \"No real surprises\"\n\n* tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n MAINTAINERS: add tools/virtio/ under virtio\n tools/virtio: move module license stub to module.h\n virtio: include asm/barrier explicitly\n virtio: VIRTIO_F_ANY_LAYOUT feature\n lguest: fix example launcher compilation for broken glibc headers.\n virtio-net: fix the race between channels setting and refill\n tools/lguest: real barriers.\n tools/lguest: fix missing rmb().\n virtio_balloon: leak_balloon(): only tell host if we got pages deflated\n virtio-pci: fix leaks of msix_affinity_masks\n Fix comment typo \"CONFIG_PAE\"\n" }, { "commit": "15a49b9a90c86c6cb7f270a699d2ae7468862c28", "tree": "218fc6bf3ae5beb989cddaede2e4ee0c2e679845", "parents": [ "8d10aae2741ec9ffd53c8d214f7ada6d543b3a46", "8d38ef1948bd415a5cb653a5c0ec16f3402aaca1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 10 14:50:08 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 10 14:50:08 2013 -0700" }, "message": "Merge tag \u0027vfio-v3.11\u0027 of git://github.com/awilliam/linux-vfio\n\nPull vfio updates from Alex Williamson:\n \"Largely hugepage support for vfio/type1 iommu and surrounding cleanups\n and fixes\"\n\n* tag \u0027vfio-v3.11\u0027 of git://github.com/awilliam/linux-vfio:\n vfio/type1: Fix leak on error path\n vfio: Limit group opens\n vfio/type1: Fix missed frees and zero sized removes\n vfio: fix documentation\n vfio: Provide module option to disable vfio_iommu_type1 hugepage support\n vfio: hugepage support for vfio_iommu_type1\n vfio: Convert type1 iommu to use rbtree\n" }, { "commit": "496322bc91e35007ed754184dcd447a02b6dd685", "tree": "f5298d0a74c0a6e65c0e98050b594b8d020904c1", "parents": [ "2e17c5a97e231f3cb426f4b7895eab5be5c5442e", "56e0ef527b184b3de2d7f88c6190812b2b2ac6bf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 18:24:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 18:24:39 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking updates from David Miller:\n \"This is a re-do of the net-next pull request for the current merge\n window. The only difference from the one I made the other day is that\n this has Eliezer\u0027s interface renames and the timeout handling changes\n made based upon your feedback, as well as a few bug fixes that have\n trickeled in.\n\n Highlights:\n\n 1) Low latency device polling, eliminating the cost of interrupt\n handling and context switches. Allows direct polling of a network\n device from socket operations, such as recvmsg() and poll().\n\n Currently ixgbe, mlx4, and bnx2x support this feature.\n\n Full high level description, performance numbers, and design in\n commit 0a4db187a999 (\"Merge branch \u0027ll_poll\u0027\")\n\n From Eliezer Tamir.\n\n 2) With the routing cache removed, ip_check_mc_rcu() gets exercised\n more than ever before in the case where we have lots of multicast\n addresses. Use a hash table instead of a simple linked list, from\n Eric Dumazet.\n\n 3) Add driver for Atheros CQA98xx 802.11ac wireless devices, from\n Bartosz Markowski, Janusz Dziedzic, Kalle Valo, Marek Kwaczynski,\n Marek Puzyniak, Michal Kazior, and Sujith Manoharan.\n\n 4) Support reporting the TUN device persist flag to userspace, from\n Pavel Emelyanov.\n\n 5) Allow controlling network device VF link state using netlink, from\n Rony Efraim.\n\n 6) Support GRE tunneling in openvswitch, from Pravin B Shelar.\n\n 7) Adjust SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF for modern times, from\n Daniel Borkmann and Eric Dumazet.\n\n 8) Allow controlling of TCP quickack behavior on a per-route basis,\n from Cong Wang.\n\n 9) Several bug fixes and improvements to vxlan from Stephen\n Hemminger, Pravin B Shelar, and Mike Rapoport. In particular,\n support receiving on multiple UDP ports.\n\n 10) Major cleanups, particular in the area of debugging and cookie\n lifetime handline, to the SCTP protocol code. From Daniel\n Borkmann.\n\n 11) Allow packets to cross network namespaces when traversing tunnel\n devices. From Nicolas Dichtel.\n\n 12) Allow monitoring netlink traffic via AF_PACKET sockets, in a\n manner akin to how we monitor real network traffic via ptype_all.\n From Daniel Borkmann.\n\n 13) Several bug fixes and improvements for the new alx device driver,\n from Johannes Berg.\n\n 14) Fix scalability issues in the netem packet scheduler\u0027s time queue,\n by using an rbtree. From Eric Dumazet.\n\n 15) Several bug fixes in TCP loss recovery handling, from Yuchung\n Cheng.\n\n 16) Add support for GSO segmentation of MPLS packets, from Simon\n Horman.\n\n 17) Make network notifiers have a real data type for the opaque\n pointer that\u0027s passed into them. Use this to properly handle\n network device flag changes in arp_netdev_event(). From Jiri\n Pirko and Timo Teräs.\n\n 18) Convert several drivers over to module_pci_driver(), from Peter\n Huewe.\n\n 19) tcp_fixup_rcvbuf() can loop 500 times over loopback, just use a\n O(1) calculation instead. From Eric Dumazet.\n\n 20) Support setting of explicit tunnel peer addresses in ipv6, just\n like ipv4. From Nicolas Dichtel.\n\n 21) Protect x86 BPF JIT against spraying attacks, from Eric Dumazet.\n\n 22) Prevent a single high rate flow from overruning an individual cpu\n during RX packet processing via selective flow shedding. From\n Willem de Bruijn.\n\n 23) Don\u0027t use spinlocks in TCP md5 signing fast paths, from Eric\n Dumazet.\n\n 24) Don\u0027t just drop GSO packets which are above the TBF scheduler\u0027s\n burst limit, chop them up so they are in-bounds instead. Also\n from Eric Dumazet.\n\n 25) VLAN offloads are missed when configured on top of a bridge, fix\n from Vlad Yasevich.\n\n 26) Support IPV6 in ping sockets. From Lorenzo Colitti.\n\n 27) Receive flow steering targets should be updated at poll() time\n too, from David Majnemer.\n\n 28) Fix several corner case regressions in PMTU/redirect handling due\n to the routing cache removal, from Timo Teräs.\n\n 29) We have to be mindful of ipv4 mapped ipv6 sockets in\n upd_v6_push_pending_frames(). From Hannes Frederic Sowa.\n\n 30) Fix L2TP sequence number handling bugs, from James Chapman.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1214 commits)\n drivers/net: caif: fix wrong rtnl_is_locked() usage\n drivers/net: enic: release rtnl_lock on error-path\n vhost-net: fix use-after-free in vhost_net_flush\n net: mv643xx_eth: do not use port number as platform device id\n net: sctp: confirm route during forward progress\n virtio_net: fix race in RX VQ processing\n virtio: support unlocked queue poll\n net/cadence/macb: fix bug/typo in extracting gem_irq_read_clear bit\n Documentation: Fix references to defunct linux-net@vger.kernel.org\n net/fs: change busy poll time accounting\n net: rename low latency sockets functions to busy poll\n bridge: fix some kernel warning in multicast timer\n sfc: Fix memory leak when discarding scattered packets\n sit: fix tunnel update via netlink\n dt:net:stmmac: Add dt specific phy reset callback support.\n dt:net:stmmac: Add support to dwmac version 3.610 and 3.710\n dt:net:stmmac: Allocate platform data only if its NULL.\n net:stmmac: fix memleak in the open method\n ipv6: rt6_check_neigh should successfully verify neigh if no NUD information are available\n net: ipv6: fix wrong ping_v6_sendmsg return value\n ...\n" }, { "commit": "a82a729f04232ccd0b59406574ba4cf20027a49d", "tree": "da5912344b00ed60a1a653fc2442db7425db289d", "parents": [ "899dd388853071f5c8848545209d4e2c5d95b1d9", "27daabd9b6a157c34a6e7a7f509fa26866e6420f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 13:33:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 13:33:36 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (updates from Andrew Morton)\n\nMerge second patch-bomb from Andrew Morton:\n - misc fixes\n - audit stuff\n - fanotify/inotify/dnotify things\n - most of the rest of MM. The new cache shrinker code from Glauber and\n Dave Chinner probably isn\u0027t quite stabilized yet.\n - ptrace\n - ipc\n - partitions\n - reboot cleanups\n - add LZ4 decompressor, use it for kernel compression\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (118 commits)\n lib/scatterlist: error handling in __sg_alloc_table()\n scsi_debug: fix do_device_access() with wrap around range\n crypto: talitos: use sg_pcopy_to_buffer()\n lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()\n lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()\n crypto: add lz4 Cryptographic API\n lib: add lz4 compressor module\n arm: add support for LZ4-compressed kernel\n lib: add support for LZ4-compressed kernel\n decompressor: add LZ4 decompressor module\n lib: add weak clz/ctz functions\n reboot: move arch/x86 reboot\u003d handling to generic kernel\n reboot: arm: change reboot_mode to use enum reboot_mode\n reboot: arm: prepare reboot_mode for moving to generic kernel code\n reboot: arm: remove unused restart_mode fields from some arm subarchs\n reboot: unicore32: prepare reboot_mode for moving to generic kernel code\n reboot: x86: prepare reboot_mode for moving to generic kernel code\n reboot: checkpatch.pl the new kernel/reboot.c file\n reboot: move shutdown/reboot related functions to kernel/reboot.c\n reboot: remove -stable friendly PF_THREAD_BOUND define\n ...\n" }, { "commit": "e3a0dd98e1ddfd135b7ef889fcc0269e8c2ca445", "tree": "7f942b10ffe7ea1498e4b1d3a206291692647040", "parents": [ "da89bd213fe719ec3552abbeb8be12d0cc0337ca", "0e267c44c3a402d35111d1935be1167240b5b79f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 12:33:09 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 12:33:09 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs update from Chris Mason:\n \"These are the usual mixture of bugs, cleanups and performance fixes.\n Miao has some really nice tuning of our crc code as well as our\n transaction commits.\n\n Josef is peeling off more and more problems related to early enospc,\n and has a number of important bug fixes in here too\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (81 commits)\n Btrfs: wait ordered range before doing direct io\n Btrfs: only do the tree_mod_log_free_eb if this is our last ref\n Btrfs: hold the tree mod lock in __tree_mod_log_rewind\n Btrfs: make backref walking code handle skinny metadata\n Btrfs: fix crash regarding to ulist_add_merge\n Btrfs: fix several potential problems in copy_nocow_pages_for_inode\n Btrfs: cleanup the code of copy_nocow_pages_for_inode()\n Btrfs: fix oops when recovering the file data by scrub function\n Btrfs: make the chunk allocator completely tree lockless\n Btrfs: cleanup orphaned root orphan item\n Btrfs: fix wrong mirror number tuning\n Btrfs: cleanup redundant code in btrfs_submit_direct()\n Btrfs: remove btrfs_sector_sum structure\n Btrfs: check if we can nocow if we don\u0027t have data space\n Btrfs: stop using try_to_writeback_inodes_sb_nr to flush delalloc\n Btrfs: use a percpu to keep track of possibly pinned bytes\n Btrfs: check for actual acls rather than just xattrs when caching no acl\n Btrfs: move btrfs_truncate_page to btrfs_cont_expand instead of btrfs_truncate\n Btrfs: optimize reada_for_balance\n Btrfs: optimize read_block_for_search\n ...\n" }, { "commit": "6e5b93ee55d401f1619092fb675b57c28c9ed7ec", "tree": "d6d9627ec023d7375d8dc996523509ee45d082bd", "parents": [ "4e80b1880c5a31d051d1e4a7377dec0a20701c23" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Jul 08 16:00:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 09 10:33:25 2013 -0700" }, "message": "fatfs: add FAT_IOCTL_GET_VOLUME_ID\n\nThis patch, originally from Android kernel, adds vfat ioctl command\nFAT_IOCTL_GET_VOLUME_ID, with this command we can get the vfat volume ID\nusing following code:\n\n\tioctl(fd, FAT_IOCTL_GET_VOLUME_ID, \u0026volume_ID)\n\nThis patch is a modified version of the patch by Mike Lockwood, with\nchanges from Dmitry Pervushin, who noticed the original patch makes some\nvolume IDs abiguous with error returns: for example, if volume id is\n0xFFFFFDAD, that matches -ENOIOCTLCMD, we get \"FFFFFFFF\" from the user\nspace.\n\nSo add a parameter to ioctl to get the correct volume ID.\n\nAndroid uses vfat volume ID to identify different sd card, when a new sd\ncard is inserted to device, android can scan the media on it and pop up\nnew contents.\n\nSigned-off-by: Bintian Wang \u003cbintian.wang@linaro.org\u003e\nCc: dmitry pervushin \u003cdpervushin@gmail.com\u003e\nCc: Mike Lockwood \u003clockwood@android.com\u003e\nCc: Colin Cross \u003cccross@android.com\u003e\nAcked-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Sean McNeil \u003csean@mcneil.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "62525a00b87cc967bce9779d63fcc84fb9199130", "tree": "148edbbeec48e48b04bfcfbab2fda3dbcf11ca38", "parents": [ "e6dc0418bcb96e3cccb80571f35934ed72e9c99a" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Jul 08 10:33:37 2013 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Jul 09 10:47:45 2013 +0930" }, "message": "virtio: VIRTIO_F_ANY_LAYOUT feature\n\nAlso known as the \"no really, I read the spec\" bit.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "3366dd9fa887ebbda4872e9554f853eaeda764be", "tree": "d1bb553325b276e9d2a1bce99f3e64834b46866b", "parents": [ "697a067f1ec67f2f8dfafd0a1b95a46997a11f32", "21796b39c9e876a46a353a4a9ff9881766a7c176" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:39:00 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 11:39:00 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID updates from Jiri Kosina:\n - HID battery handling cleanup by David Herrmann\n - ELO 4000/4500 driver, which has been finally ported to be proper HID\n driver by Jiri Slaby\n - ps3remote driver functionality is now provided by generic sony\n driver, by Jiri Kosina\n - PS2/3 Buzz controllers support, by Colin Leitner\n - rework of wiimote driver including full extensions hotpluggin\n support, sub-device modularization and speaker support by David\n Herrmann\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)\n HID: wacom: Intuos4 battery charging changes\n HID: i2c-hid: support sending HID output reports using the output register\n HID: kye: Add report fixup for Genius Gila Gaming mouse\n HID: wiimote: support Nintendo Wii U Pro Controller\n Input: make gamepad API keycodes more clear\n input: document gamepad API and add extra keycodes\n HID: explain out-of-range check better\n HID: fix false positive out of range values\n HID: wiimote: fix coccinelle warnings\n HID: roccat: check cdev_add return value\n HID: fold ps3remote driver into generic Sony driver\n HID: hyperv: convert alloc+memcpy to memdup\n HID: core: fix reporting of raw events\n HID: wiimote: discard invalid EXT data reports\n HID: wiimote: fix classic controller parsing\n HID: wiimote: init EXT/MP during device detection\n HID: wiimote: fix DRM debug-attr to correctly parse input\n HID: wiimote: add MP quirks\n HID: wiimote: remove old static extension support\n HID: wiimote: add \"bboard_calib\" attribute\n ...\n" }, { "commit": "65b97fb7303050fc826e518cf67fc283da23314f", "tree": "595e7f04d65d95a39d65bd2dcf2385b3b6ea7969", "parents": [ "ddcf6600b133697adbafd96e080818bdc0dfd028", "1d8b368ab4aacfc3f864655baad4d31a3028ec1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 10:29:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 04 10:29:23 2013 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc updates from Ben Herrenschmidt:\n \"This is the powerpc changes for the 3.11 merge window. In addition to\n the usual bug fixes and small updates, the main highlights are:\n\n - Support for transparent huge pages by Aneesh Kumar for 64-bit\n server processors. This allows the use of 16M pages as transparent\n huge pages on kernels compiled with a 64K base page size.\n\n - Base VFIO support for KVM on power by Alexey Kardashevskiy\n\n - Wiring up of our nvram to the pstore infrastructure, including\n putting compressed oopses in there by Aruna Balakrishnaiah\n\n - Move, rework and improve our \"EEH\" (basically PCI error handling\n and recovery) infrastructure. It is no longer specific to pseries\n but is now usable by the new \"powernv\" platform as well (no\n hypervisor) by Gavin Shan.\n\n - I fixed some bugs in our math-emu instruction decoding and made it\n usable to emulate some optional FP instructions on processors with\n hard FP that lack them (such as fsqrt on Freescale embedded\n processors).\n\n - Support for Power8 \"Event Based Branch\" facility by Michael\n Ellerman. This facility allows what is basically \"userspace\n interrupts\" for performance monitor events.\n\n - A bunch of Transactional Memory vs. Signals bug fixes and HW\n breakpoint/watchpoint fixes by Michael Neuling.\n\n And more ... I appologize in advance if I\u0027ve failed to highlight\n something that somebody deemed worth it.\"\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)\n pstore: Add hsize argument in write_buf call of pstore_ftrace_call\n powerpc/fsl: add MPIC timer wakeup support\n powerpc/mpic: create mpic subsystem object\n powerpc/mpic: add global timer support\n powerpc/mpic: add irq_set_wake support\n powerpc/85xx: enable coreint for all the 64bit boards\n powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx\n powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig\n powerpc/mpic: Add get_version API both for internal and external use\n powerpc: Handle both new style and old style reserve maps\n powerpc/hw_brk: Fix off by one error when validating DAWR region end\n powerpc/pseries: Support compression of oops text via pstore\n powerpc/pseries: Re-organise the oops compression code\n pstore: Pass header size in the pstore write callback\n powerpc/powernv: Fix iommu initialization again\n powerpc/pseries: Inform the hypervisor we are using EBB regs\n powerpc/perf: Add power8 EBB support\n powerpc/perf: Core EBB support for 64-bit book3s\n powerpc/perf: Drop MMCRA from thread_struct\n powerpc/perf: Don\u0027t enable if we have zero events\n ...\n" }, { "commit": "21796b39c9e876a46a353a4a9ff9881766a7c176", "tree": "119e93184ba04e6cee5798cfd28686100899db1e", "parents": [ "08ec2dcc3527a20c619aca2fb36f800908256bac", "9d157624035214793c6d06b0512c6ab1a7b39e05", "b8e0fe31a7c8623741f91bc27f925220341fdf81" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 04 15:05:02 2013 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 04 15:05:02 2013 +0200" }, "message": "Merge branches \u0027for-3.11/wacom-fixed\u0027 and \u0027for-3.11/wiimote\u0027 into for-linus\n" }, { "commit": "7f0ef0267e20d62d45d527911a993b1e998f4968", "tree": "de51abc7da5903f59d83e23937f22420164c9477", "parents": [ "862f0012549110d6f2586bf54b52ed4540cbff3a", "9307c29524502c21f0e8a6d96d850b2f5bc0bd9a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 17:12:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 17:12:13 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (updates from Andrew Morton)\n\nMerge first patch-bomb from Andrew Morton:\n - various misc bits\n - I\u0027m been patchmonkeying ocfs2 for a while, as Joel and Mark have been\n distracted. There has been quite a bit of activity.\n - About half the MM queue\n - Some backlight bits\n - Various lib/ updates\n - checkpatch updates\n - zillions more little rtc patches\n - ptrace\n - signals\n - exec\n - procfs\n - rapidio\n - nbd\n - aoe\n - pps\n - memstick\n - tools/testing/selftests updates\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (445 commits)\n tools/testing/selftests: don\u0027t assume the x bit is set on scripts\n selftests: add .gitignore for kcmp\n selftests: fix clean target in kcmp Makefile\n selftests: add .gitignore for vm\n selftests: add hugetlbfstest\n self-test: fix make clean\n selftests: exit 1 on failure\n kernel/resource.c: remove the unneeded assignment in function __find_resource\n aio: fix wrong comment in aio_complete()\n drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode\n drivers/memstick/host/r592.c: convert to module_pci_driver\n drivers/memstick/host/jmb38x_ms: convert to module_pci_driver\n pps-gpio: add device-tree binding and support\n drivers/pps/clients/pps-gpio.c: convert to module_platform_driver\n drivers/pps/clients/pps-gpio.c: convert to devm_* helpers\n drivers/parport/share.c: use kzalloc\n Documentation/accounting/getdelays.c: avoid strncpy in accounting tool\n aoe: update internal version number to v83\n aoe: update copyright date\n aoe: perform I/O completions in parallel\n ...\n" }, { "commit": "862f0012549110d6f2586bf54b52ed4540cbff3a", "tree": "83d29a684b885b1f58af76e0cd29b8552fd480ea", "parents": [ "f991fae5c6d42dfc5029150b05a78cf3f6c18cc9", "a0f75f9d495b3905b4c658c1d813a127f558a350" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:31:35 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:31:35 2013 -0700" }, "message": "Merge tag \u0027pci-v3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI changes from Bjorn Helgaas:\n \"PCI device hotplug\n - Add pci_alloc_dev() interface (Gu Zheng)\n - Add pci_bus_get()/put() for reference counting (Jiang Liu)\n - Fix SR-IOV reference count issues (Jiang Liu)\n - Remove unused acpi_pci_roots list (Jiang Liu)\n\n MSI\n - Conserve interrupt resources on x86 (Alexander Gordeev)\n\n AER\n - Force fatal severity when component has been reset (Betty Dall)\n - Reset link below Root Port as well as Downstream Port (Betty Dall)\n - Fix \"Firmware first\" flag setting (Bjorn Helgaas)\n - Don\u0027t parse HEST for non-PCIe devices (Bjorn Helgaas)\n\n ASPM\n - Warn when we can\u0027t disable ASPM as driver requests (Bjorn Helgaas)\n\n Miscellaneous\n - Add CircuitCo PCI IDs (Darren Hart)\n - Add AMD CZ SATA and SMBus PCI IDs (Shane Huang)\n - Work around Ivytown NTB BAR size issue (Jon Mason)\n - Detect invalid initial BAR values (Kevin Hao)\n - Add pcibios_release_device() (Sebastian Ott)\n - Fix powerpc \u0026 sparc PCI_UNKNOWN power state usage (Bjorn Helgaas)\"\n\n* tag \u0027pci-v3.11-changes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)\n MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci\n PCI: Add CircuitCo vendor ID and subsystem ID\n PCI: Use pdev-\u003epm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)\n PCI: Return early on allocation failures to unindent mainline code\n PCI: Simplify IOV implementation and fix reference count races\n PCI: Drop redundant setting of bus-\u003eis_added in virtfn_add_bus()\n unicore32/PCI: Remove redundant call of pci_bus_add_devices()\n m68k/PCI: Remove redundant call of pci_bus_add_devices()\n PCI / ACPI / PM: Use correct power state strings in messages\n PCI: Fix comment typo for pcie_pme_remove()\n PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()\n PCI: Fix refcount issue in pci_create_root_bus() error recovery path\n ia64/PCI: Clean up pci_scan_root_bus() usage\n PCI/AER: Reset link for devices below Root Port or Downstream Port\n ACPI / APEI: Force fatal AER severity when component has been reset\n PCI/AER: Remove \"extern\" from function declarations\n PCI/AER: Move AER severity defines to aer.h\n PCI/AER: Set dev-\u003e__aer_firmware_first only for matching devices\n PCI/AER: Factor out HEST device type matching\n PCI/AER: Don\u0027t parse HEST table for non-PCIe devices\n ...\n" }, { "commit": "29000caecbe87b6b66f144f72111f0d02fbbf0c1", "tree": "91d178abd9543a49c087af857a3cfabececfd71e", "parents": [ "37f07655522042399db7a4b54aee830bdb52ce2c" ], "author": { "name": "Andrey Vagin", "email": "avagin@openvz.org", "time": "Wed Jul 03 15:08:12 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 16:08:01 2013 -0700" }, "message": "ptrace: add ability to get/set signal-blocked mask\n\ncrtools uses a parasite code for dumping processes. The parasite code is\ninjected into a process with help PTRACE_SEIZE.\n\nCurrently crtools blocks signals from a parasite code. If a process has\npending signals, crtools wait while a process handles these signals.\n\nThis method is not suitable for stopped tasks. A stopped task can have a\nfew pending signals, when we will try to execute a parasite code, we will\nneed to drop SIGSTOP, but all other signals must remain pending, because a\nstate of processes must not be changed during checkpointing.\n\nThis patch adds two ptrace commands to set/get signal-blocked mask.\n\nI think gdb can use this commands too.\n\n[akpm@linux-foundation.org: be consistent with brace layout]\nSigned-off-by: Andrey Vagin \u003cavagin@openvz.org\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0c1072ae0242fbdffd9a0bba36e7a7033d287f9c", "tree": "e0f4dbdbf5078d4a707911177e7bdc17a70bdce5", "parents": [ "c50cd357887acf9fd7af3a5d492911bd825555a2", "8bb495e3f02401ee6f76d1b1d77f3ac9f079e376" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 03 14:50:41 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 03 14:55:13 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/freescale/fec_main.c\n\tdrivers/net/ethernet/renesas/sh_eth.c\n\tnet/ipv4/gre.c\n\nThe GRE conflict is between a bug fix (kfree_skb --\u003e kfree_skb_list)\nand the splitting of the gre.c code into seperate files.\n\nThe FEC conflict was two sets of changes adding ethtool support code\nin an \"!CONFIG_M5272\" CPP protected block.\n\nFinally the sh_eth.c conflict was between one commit add bits set\nin the .eesr_err_check mask whilst another commit removed the\n.tx_error_check member and assignments.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "baa6f8209312f9734434b89c12497774eea1cbe1", "tree": "9cddd941d7cb829c2baf2df6980e2410e866d604", "parents": [ "76f7a102c0290d3e24703b6cd3716d5a594d6173", "06df44ee41442d83be061c5fd1b1de4f5fc6fbbf", "b3087e48ce20be784fae1dbabc2e42e2ad0f21bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:09:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 13:09:06 2013 -0700" }, "message": "Merge tags \u0027modules-next-for-linus\u0027 and \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux\n\nPull trivial module and virtio fixes from Rusty Russell.\n\nApparently these were meant for 3.10, but came in after the release.\n\n* tag \u0027modules-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n modpost.c: Add .text.unlikely to TEXT_SECTIONS\n\n* tag \u0027virtio-next-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:\n virtio: remove virtqueue_add_buf().\n lguest: rename i386_head.S\n virtio_blk: Add missing \u0027static\u0027 qualifiers\n virtio: console: Add emergency writeonly register to config space\n virtio_pci: better macro exported in uapi\n" }, { "commit": "1873e50028ce87dd9014049c86d71a898fa02166", "tree": "046d37339278c3b88f0c248e9e6ff5fed804fe62", "parents": [ "fb2af0020a51709ad87ea8055c325d3fbde04158", "aa729dccb5e8dfbc78e2e235b8754d6acccee731" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 10:31:38 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 03 10:31:38 2013 -0700" }, "message": "Merge tag \u0027arm64-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull ARM64 updates from Catalin Marinas:\n \"Main features:\n - KVM and Xen ports to AArch64\n - Hugetlbfs and transparent huge pages support for arm64\n - Applied Micro X-Gene Kconfig entry and dts file\n - Cache flushing improvements\n\n For arm64 huge pages support, there are x86 changes moving part of\n arch/x86/mm/hugetlbpage.c into mm/hugetlb.c to be re-used by arm64\"\n\n* tag \u0027arm64-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (66 commits)\n arm64: Add initial DTS for APM X-Gene Storm SOC and APM Mustang board\n arm64: Add defines for APM ARMv8 implementation\n arm64: Enable APM X-Gene SOC family in the defconfig\n arm64: Add Kconfig option for APM X-Gene SOC family\n arm64/Makefile: provide vdso_install target\n ARM64: mm: THP support.\n ARM64: mm: Raise MAX_ORDER for 64KB pages and THP.\n ARM64: mm: HugeTLB support.\n ARM64: mm: Move PTE_PROT_NONE bit.\n ARM64: mm: Make PAGE_NONE pages read only and no-execute.\n ARM64: mm: Restore memblock limit when map_mem finished.\n mm: thp: Correct the HPAGE_PMD_ORDER check.\n x86: mm: Remove general hugetlb code from x86.\n mm: hugetlb: Copy general hugetlb code from x86 to mm.\n x86: mm: Remove x86 version of huge_pmd_share.\n mm: hugetlb: Copy huge_pmd_share from x86 to mm.\n arm64: KVM: document kernel object mappings in HYP\n arm64: KVM: MAINTAINERS update\n arm64: KVM: userspace API documentation\n arm64: KVM: enable initialization of a 32bit vcpu\n ...\n" }, { "commit": "002e44bfb596665178cbf83586faeb8349ea6b9b", "tree": "a33b3f3a3b8709d0ba32c57a7ec62d018bd528af", "parents": [ "e13053f50664d3d614bbc9b8c83abdad979ac7c9", "a3d7b7dddcc38c19aa46509c7282e8def80384a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:21:45 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:21:45 2013 -0700" }, "message": "Merge branch \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull asm/x86 changes from Ingo Molnar:\n \"Misc changes, with a bigger processor-flags cleanup/reorganization by\n Peter Anvin\"\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, asm, cleanup: Replace open-coded control register values with symbolic\n x86, processor-flags: Fix the datatypes and add bit number defines\n x86: Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE\n x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED\n linux/const.h: Add _BITUL() and _BITULL()\n x86/vdso: Convert use of typedef ctl_table to struct ctl_table\n x86: __force_order doesn\u0027t need to be an actual variable\n" }, { "commit": "f0bb4c0ab064a8aeeffbda1cee380151a594eaab", "tree": "14d55a89c5db455aa10ff9a96ca14c474a9c4d55", "parents": [ "a4883ef6af5e513a1e8c2ab9aab721604aa3a4f5", "983433b5812c5cf33a9008fa38c6f9b407fedb76" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:15:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 16:15:23 2013 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf updates from Ingo Molnar:\n \"Kernel improvements:\n\n - watchdog driver improvements by Li Zefan\n - Power7 CPI stack events related improvements by Sukadev Bhattiprolu\n - event multiplexing via hrtimers and other improvements by Stephane\n Eranian\n - kernel stack use optimization by Andrew Hunter\n - AMD IOMMU uncore PMU support by Suravee Suthikulpanit\n - NMI handling rate-limits by Dave Hansen\n - various hw_breakpoint fixes by Oleg Nesterov\n - hw_breakpoint overflow period sampling and related signal handling\n fixes by Jiri Olsa\n - Intel Haswell PMU support by Andi Kleen\n\n Tooling improvements:\n\n - Reset SIGTERM handler in workload child process, fix from David\n Ahern.\n - Makefile reorganization, prep work for Kconfig patches, from Jiri\n Olsa.\n - Add automated make test suite, from Jiri Olsa.\n - Add --percent-limit option to \u0027top\u0027 and \u0027report\u0027, from Namhyung\n Kim.\n - Sorting improvements, from Namhyung Kim.\n - Expand definition of sysfs format attribute, from Michael Ellerman.\n\n Tooling fixes:\n\n - \u0027perf tests\u0027 fixes from Jiri Olsa.\n - Make Power7 CPI stack events available in sysfs, from Sukadev\n Bhattiprolu.\n - Handle death by SIGTERM in \u0027perf record\u0027, fix from David Ahern.\n - Fix printing of perf_event_paranoid message, from David Ahern.\n - Handle realloc failures in \u0027perf kvm\u0027, from David Ahern.\n - Fix divide by 0 in variance, from David Ahern.\n - Save parent pid in thread struct, from David Ahern.\n - Handle JITed code in shared memory, from Andi Kleen.\n - Fixes for \u0027perf diff\u0027, from Jiri Olsa.\n - Remove some unused struct members, from Jiri Olsa.\n - Add missing liblk.a dependency for python/perf.so, fix from Jiri\n Olsa.\n - Respect CROSS_COMPILE in liblk.a, from Rabin Vincent.\n - No need to do locking when adding hists in perf report, only \u0027top\u0027\n needs that, from Namhyung Kim.\n - Fix alignment of symbol column in in the hists browser (top,\n report) when -v is given, from NAmhyung Kim.\n - Fix \u0027perf top\u0027 -E option behavior, from Namhyung Kim.\n - Fix bug in isupper() and islower(), from Sukadev Bhattiprolu.\n - Fix compile errors in bp_signal \u0027perf test\u0027, from Sukadev\n Bhattiprolu.\n\n ... and more things\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (102 commits)\n perf/x86: Disable PEBS-LL in intel_pmu_pebs_disable()\n perf/x86: Fix shared register mutual exclusion enforcement\n perf/x86/intel: Support full width counting\n x86: Add NMI duration tracepoints\n perf: Drop sample rate when sampling is too slow\n x86: Warn when NMI handlers take large amounts of time\n hw_breakpoint: Introduce \"struct bp_cpuinfo\"\n hw_breakpoint: Simplify *register_wide_hw_breakpoint()\n hw_breakpoint: Introduce cpumask_of_bp()\n hw_breakpoint: Simplify the \"weight\" usage in toggle_bp_slot() paths\n hw_breakpoint: Simplify list/idx mess in toggle_bp_slot() paths\n perf/x86/intel: Add mem-loads/stores support for Haswell\n perf/x86/intel: Support Haswell/v4 LBR format\n perf/x86/intel: Move NMI clearing to end of PMI handler\n perf/x86/intel: Add Haswell PEBS support\n perf/x86/intel: Add simple Haswell PMU support\n perf/x86/intel: Add Haswell PEBS record support\n perf/x86/intel: Fix sparse warning\n perf/x86/amd: AMD IOMMU Performance Counter PERF uncore PMU implementation\n perf/x86/amd: Add IOMMU Performance Counter resource management\n ...\n" }, { "commit": "42daabf62bfa3c00974b43f030dadcf704c0db59", "tree": "255f279cad48557227d974d67cbbc8390d057404", "parents": [ "0bf6a210a43f7118d858806200127e421649fc4e", "8c3d913888cfb0066d62831969c3a992f7e4aba5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 14:42:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 14:42:51 2013 -0700" }, "message": "Merge tag \u0027late-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC late changes from Arnd Bergmann:\n \"These are changes that arrived a little late before the merge window\n or that have multiple dependencies on previous branches so they did\n not fit into one of the earlier ones. There are 10 branches merged\n here, a total of 39 non-merge commits. Contents are a mixed bag for\n the above reasons:\n\n * Two new SoC platforms: ST microelectronics stixxxx and the TI\n \u0027Nspire\u0027 graphing calculator. These should have been in the \u0027soc\u0027\n branch but were a little late\n * Support for the Exynos 5420 variant in mach-exynos, which is based\n on the other exynos branches to avoid conflicts.\n * Various small changes for sh-mobile, ux500 and davinci\n * Common clk support for MSM\"\n\n* tag \u0027late-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)\n ARM: ux500: bail out on alien cpus\n ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins\n serial: sh-sci: Initialise variables before access in sci_set_termios()\n ARM: stih41x: Add B2020 board support\n ARM: stih41x: Add B2000 board support\n ARM: sti: Add DEBUG_LL console support\n ARM: sti: Add STiH416 SOC support\n ARM: sti: Add STiH415 SOC support\n ARM: msm: Migrate to common clock framework\n ARM: msm: Make proc_comm clock control into a platform driver\n ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver\n ARM: msm: Remove clock-7x30.h include file\n ARM: msm: Remove custom clk_set_{max,min}_rate() API\n ARM: msm: Remove custom clk_set_flags() API\n msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()\n msm: iommu: Convert to clk_prepare/unprepare\n msm_sdcc: Convert to clk_prepare/unprepare\n usb: otg: msm: Convert to clk_prepare/unprepare\n msm_serial: Use devm_clk_get() and properly return errors\n msm_serial: Convert to clk_prepare/unprepare\n ...\n" }, { "commit": "0de10f9ea67d1046b1e16c91fa26accf23939aab", "tree": "1255e106529d0c708b3744dfd10367a535bda6f9", "parents": [ "a84270189e2afc7028b1123415a66d444f460977", "828c6a102b1f2b8583fadc0e779c46b31d448f0b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 11:32:06 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 02 11:32:06 2013 -0700" }, "message": "Merge tag \u0027tty-3.11-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty/serial updates from Greg KH:\n \"Here is the big TTY / Serial driver merge for 3.11-rc1.\n\n It\u0027s not all that big, nothing major changed in the tty api, which is\n a nice change, just a number of serial driver fixes and updates and\n new drivers, along with some n_tty fixes to help resolve some reported\n issues.\n\n All of these have been in the linux-next releases for a while, with\n the exception of the last revert patch, which was reported this past\n weekend by two different people as being needed.\"\n\n* tag \u0027tty-3.11-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (51 commits)\n Revert \"serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller\"\n pch_uart: Add uart_clk selection for the MinnowBoard\n tty: atmel_serial: prepare clk before calling enable\n tty: Reset itty for other pty\n n_tty: Buffer work should not reschedule itself\n n_tty: Fix unsafe update of available buffer space\n n_tty: Untangle read completion variables\n n_tty: Encapsulate minimum_to_wake within N_TTY\n serial: omap: Fix device tree based PM runtime\n serial: imx: Fix serial clock unbalance\n serial/mpc52xx_uart: fix kernel panic when system reboot\n serial: mfd: Add sysrq support\n serial: imx: enable the clocks for console\n tty: serial: add Freescale lpuart driver support\n serial: imx: Improve Kconfig text\n serial: imx: Allow module build\n serial: imx: Fix warning when !CONFIG_SERIAL_IMX_CONSOLE\n tty/serial/sirf: fix error propagation in sirfsoc_uart_probe()\n serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend()\n tty: serial: Enable uartlite for ARM zynq\n ...\n" }, { "commit": "b1a5a34bd0b8767ea689e68f8ea513e9710b671e", "tree": "f2ab776e9104f5d0b12e275c5f409b31fd27b86d", "parents": [ "4ccb93ce7439b63c31bc7597bfffd13567fa483d" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jun 29 00:15:51 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 01 18:20:33 2013 -0700" }, "message": "net: Swap ver and type in pppoe_hdr\n\nVer and type in pppoe_hdr should be swapped as defined by RFC2516\nsection-4.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e62bc9e55f75ecb41dac3e68cd4b61f9d9501f72", "tree": "0437bf3c50de5e1b1ef2b9d73cd802223158232a", "parents": [ "fb825a550a1af75323cee9d62d6fb818384c8c95", "57ed5cd695d7373b8ae0ae9f10fe945e774d58f0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 01 13:21:17 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 01 13:21:17 2013 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nYet one more pull request for wireless updates intended for 3.11...\n\nFor the mac80211 bits, Johannes says:\n\n\"Here we have a few memory leak fixes related to BSS struct handling\nmostly from Ben, including a fix for a more theoretical problem\n(associating while a BSS struct times out) from myself, a compilation\nwarning fix from Arend, mesh fixes from Thomas, tracking the beacon\nbitrate (Alex), a bandwidth change event fix (Ilan) and some initial\nwork for 5/10 MHz channels from Simon.\"\n\nRegarding the iwlwifi bits, Johannes says:\n\n\"Emmanuel removed some unneeded/unsupported module parameters and adds a\nBluetooth 1x1 lookup-table for some upcoming products. From Alex I have\nan older patch to add low-power receive support, this depended on a\nmac80211 commit that only just came in with the merge from wireless-next\nI did. Ilan made beacon timings better, and Eytan added some debug\nstatements for thermal throttling. I have a few cleanups, a fix for a\nlong-standing but rare warning, and, arguably the most important patch\nhere, the firmware API version bump for the 7260/3160 devices.\"\n\nAlso included is a Bluetooth pull -- Gustavo says:\n\n\"Here goes a set of patches to 3.11. The biggest work here is from Andre Guedes\non the move of the Discovery to use the new request framework. Other than that\nJohan provided a bunch of fixes to the L2CAP code. The rest are just small\nfixes and clean ups.\"\n\nOn top of all that, there are a variety of updates and fixes to\nbrcmfmac, rt2x00, wil6210, ath9k, ath10k, and a few others here and\nthere. This also includes a pull of the wireless tree, in order to\nprevent some merge conflicts.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d753601a2a5ff67bbc96ce6512a16305bfd293e7", "tree": "c1c0b4822966bedbafe90df2876123085905e470", "parents": [ "7b9334215f53135fb9cbdf0b44833cbc8e7d57b2" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Tue Jun 18 16:55:41 2013 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jul 01 15:10:53 2013 +0200" }, "message": "MIPS: BCM63XX: recognize Cable Modem firmware format\n\nAdd the firmware header format which is used by Broadcom Cable Modem\nSoCs such as the BCM3368 SoC. We export the bcm_hcs firmware format\nstructure because it is used by user-land tools to create firmware\nimages for these SoCs and will later be used by a corresponding MTD\nparser.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nCc: linux-mips@linux-mips.org\nCc: cernekee@gmail.com\nCc: jogo@openwrt.org\nPatchwork: https://patchwork.linux-mips.org/patch/5496/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "24a72acac155576d630cf4304fa9cefb9b62ea1f", "tree": "84d09427b319c613512316c658a3f6d6d8fe3dd1", "parents": [ "6e0b8bc965d25a8e0701eaca3fca5941b4f4b2b2", "8bb495e3f02401ee6f76d1b1d77f3ac9f079e376" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jul 01 17:57:25 2013 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jul 01 17:57:25 2013 +1000" }, "message": "Merge tag \u0027v3.10\u0027 into next\n\nMerge 3.10 in order to get some of the last minute powerpc\nchanges, resolve conflicts and add additional fixes on top\nof them.\n" }, { "commit": "4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3", "tree": "7780ce6a8c84068820f8bbcc5116db6430db3d3b", "parents": [ "008aebde9be37e7e1248332b1983976e354327ea", "496e4ae7dc944faa1721bfda7e9d834d5611a874" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 30 17:35:13 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 30 17:35:13 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following batch contains Netfilter/IPVS updates for net-next,\nthey are:\n\n* Enforce policy to several nfnetlink subsystem, from Daniel\n Borkmann.\n\n* Use xt_socket to match the third packet (to perform simplistic\n socket-based stateful filtering), from Eric Dumazet.\n\n* Avoid large timeout for picked up from the middle TCP flows,\n from Florian Westphal.\n\n* Exclude IPVS from struct net if IPVS is disabled and removal\n of unnecessary included header file, from JunweiZhang.\n\n* Release SCTP connection immediately under load, to mimic current\n TCP behaviour, from Julian Anastasov.\n\n* Replace and enhance SCTP state machine, from Julian Anastasov.\n\n* Add tweak to reduce sync traffic in the presence of persistence,\n also from Julian Anastasov.\n\n* Add tweak for the IPVS SH scheduler not to reject connections\n directed to a server, choose a new one instead, from Alexander\n Frolkin.\n\n* Add support for sloppy TCP and SCTP modes, that creates state\n information on any packet, not only initial handshake packets,\n from Alexander Frolkin.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "496e4ae7dc944faa1721bfda7e9d834d5611a874", "tree": "7543efa6dbd1432ac7afa0ad641773bc3737e722", "parents": [ "8b4d14d8eb36874daf159d33dcccd4746a6f3189" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Sat Jun 29 14:15:47 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Jun 30 18:15:48 2013 +0200" }, "message": "netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag\n\nThe common case is that TCP/IP checksums have already been\nverified, e.g. by hardware (rx checksum offload), or conntrack.\n\nUserspace can use this flag to determine when the checksum\nhas not been validated yet.\n\nIf the flag is set, this doesn\u0027t necessarily mean that the packet has\nan invalid checksum, e.g. if NIC doesn\u0027t support rx checksum.\n\nUserspace that sucessfully enabled NFQA_CFG_F_GSO queue feature flag can\ninfer that IP/TCP checksum has already been validated if either the\nSKB_INFO attribute is not present or the NFQA_SKB_CSUM_NOTVERIFIED\nflag is unset.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "5a1d3e9f18ceb8d791bdc9a78d8ee10ddc80a6e8", "tree": "eb574c04a88f5819ce9f3ec0cd0067d36bc74be6", "parents": [ "fe653786ff9027216d841470b140593f3bf3a695" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Jun 21 02:05:34 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jun 28 15:07:16 2013 -0300" }, "message": "[media] v4l2-controls.h: fix copy-and-paste error in comment\n\nThe comment for the FM_RX class was copied from the DV class unchanged.\nFixed.\nAlso made the FM_TX comment consistent with the others.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "57ed5cd695d7373b8ae0ae9f10fe945e774d58f0", "tree": "7ee6244ea7c0be81a541d4e57783f83c4dfd7d66", "parents": [ "5e6700b3bf98fe98d630bf9c939ad4c85ce95592", "0f817ed52d07873cd39c9d3f6d87fae962dc742f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 28 13:18:21 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 28 13:18:21 2013 -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\tnet/wireless/nl80211.c\n" }, { "commit": "0ad578ef25be566aa80b28115c9d696e511bc6be", "tree": "b9906c7536a92972c20950b08ced3c31c516546c", "parents": [ "4022acdb5b2b65ad2fe078be39bda9c5377c4e04", "d4759ded3bdf3eb004d583011707fdc21aeda94e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 27 14:26:33 2013 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jun 27 14:26:33 2013 +0200" }, "message": "Merge tag \u0027renesas-sh-sci-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/late\n\nRenesas sh-sci updates for v3.11\n\nHSCIF support by Ulrich Hecht.\n\n* tag \u0027renesas-sh-sci-for-v3.11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:\n serial: sh-sci: Initialise variables before access in sci_set_termios()\n ARM: shmobile: r8a7790: don\u0027t use external clock for SCIFs\n ARM: shmobile: r8a7790: HSCIF support\n serial: sh-sci: HSCIF support\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "701ba533f6587aaf402a9bb732548503263d2b23", "tree": "faa421e067cd7b915c99d6c19685e568a356aebc", "parents": [ "d09bbfd2a8408a995419dff0d2ba906013cf4cc9" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jun 27 11:54:51 2013 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jun 27 11:54:51 2013 +0200" }, "message": "Input: make gamepad API keycodes more clear\n\nShuffle the defines around so that it is clear that BTN_A, BTN_B, etc are\nlegacy definitions and not an accidental typos that need their own key codes.\n\nSuggested-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d09bbfd2a8408a995419dff0d2ba906013cf4cc9", "tree": "b32c7cbbf0757e8cc228ca4d96268edcaf5e0ed8", "parents": [ "5b22b91ab666634cab7fc4a7e0439d0bbbefb32e" ], "author": { "name": "David Herrmann", "email": "dh.herrmann@gmail.com", "time": "Sat Jun 15 15:32:44 2013 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jun 27 11:51:31 2013 +0200" }, "message": "input: document gamepad API and add extra keycodes\n\nUntil today all gamepad input drivers report their data differently. It is\nnearly impossible to write applications for more than one device in a\ngeneric way. Therefore, this patch introduces a uniform gamepad API which\nwill be used for all new drivers.\n\nInstead of mapping buttons by their labels, we now map them by position.\nThis allows applications to work with any gamepad regardless of the labels\non the buttons. Furthermore, we standardize the ABS_* codes for analog\ntriggers and sticks.\n\nFor D-Pads the long overdue BTN_DPAD_* codes are introduced. They should\nbe fairly obvious how to use. To avoid confusion, the action buttons now\nhave BTN_EAST/SOUTH/WEST/NORTH aliases.\n\nReported-by: Todd Showalter \u003ctodd@electronjump.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nSigned-off-by: David Herrmann \u003cdh.herrmann@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a77471ff7069eac4f9b408509dc4c6cb61461a56", "tree": "fb8ca76be227f2e7a4045a8939951be8c3b04250", "parents": [ "a4a1139b242f03dfb8a5d7a86fa674bda1cf60b2", "4c4d41f200db375b2d2cc6d0a1de0606c8266398" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 13:23:13 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 26 13:23:13 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next\n\nSteffen Klassert says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nJust one patch this time.\n\n1) Drop packets when the matching SA is in larval state and add a\n statistic counter for that. From Fan Du.\n\nPlease pull or let me know if there are problems.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eba3b5a78799d21dea05118b294524958f0ab592", "tree": "2f84838b89f17c7b10cee8fa618f232c64e9fc1d", "parents": [ "acaac5d8bbedf6bd96f53960780942e1ad90d70e" ], "author": { "name": "Alexander Frolkin", "email": "avf@eldamar.org.uk", "time": "Wed Jun 19 10:54:25 2013 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Wed Jun 26 18:01:46 2013 +0900" }, "message": "ipvs: SH fallback and L4 hashing\n\nBy default the SH scheduler rejects connections that are hashed onto a\nrealserver of weight 0. This patch adds a flag to make SH choose a\ndifferent realserver in this case, instead of rejecting the connection.\n\nThe patch also adds a flag to make SH include the source port (TCP, UDP,\nSCTP) in the hash as well as the source address. This basically allows\nfor deterministic round-robin load balancing (i.e., where any director\nin a cluster of directors with identical config will send the same\npacket the same way).\n\nThe flags are service flags (IP_VS_SVC_F_SCHED*) so that these options\ncan be set per service. They are set using a new option to ipvsadm.\n\nSigned-off-by: Alexander Frolkin \u003cavf@eldamar.org.uk\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "2fc016c5bd8aad2e201cdf71b9fb4573f94775bd", "tree": "14da7d26a56b2f372e7d4a28422982efbabe9a7c", "parents": [ "f07d91ede6f346cbe31bb814cefe2584940b96f3" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Sat Apr 27 16:07:49 2013 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Tue Jun 25 15:50:04 2013 -0700" }, "message": "linux/const.h: Add _BITUL() and _BITULL()\n\nAdd macros for single bit definitions of a specific type. These are\nsimilar to the BIT() macro that already exists, but with a few\nexceptions:\n\n1. The namespace is such that they can be used in uapi definitions.\n2. The type is set with the _AC() macro to allow it to be used in\n assembly.\n3. The type is explicitly specified to be UL or ULL.\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\nLink: http://lkml.kernel.org/n/tip-nbca8p7cg6jyjoit7klh3o91@git.kernel.org\n" }, { "commit": "77e2af0312b12dccd5043a7cc9cd49ab6a212996", "tree": "81eceb3fcaf8bfaa1c15d5fdd45f669a0dc01c0e", "parents": [ "d3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Fri Jun 21 19:38:06 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 24 16:39:05 2013 -0700" }, "message": "net: if_arp: add ARPHRD_NETLINK type\n\nThis small patch adds the definition of ARPHRD_NETLINK which can for\nexample be used by netlink monitoring devices as device type. So that\nsockaddr_ll can pick it up and based on that choose the correct packet\ndissector.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66ba271ab90424ba5a895662b6783c4837a96e0a", "tree": "5ae7ebd942fe3f2246a52d18f35f67d3db4e4b5c", "parents": [ "2b5e54e22f596bcd9ec0018f228a2606e016a108", "6c7c4cbfd5f59c04a40af67ad72d14e19215ef36" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 14:44:59 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 24 14:44:59 2013 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "7d2a47aab2a511c87a96238977e04e6378969d45", "tree": "e3765af6d4b292d8f3c013a5962324eab683a931", "parents": [ "fedaf4ffc224a194e2d13a3ec2abe5df0bc94258", "b887664d882ee4f6a67e0bf05e5f141d32fcc067" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 21 15:42:30 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 21 15:42:30 2013 -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\tnet/wireless/nl80211.c\n" }, { "commit": "166fd7d94afdac040b28c473e45241820ca522a2", "tree": "044cd4540cb2a949ed8a55949cc39471b05a73b3", "parents": [ "cd9b22685e4ccd728550d51fbe108c473f89df4f" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Fri Jun 21 09:38:02 2013 -0600" }, "committer": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Fri Jun 21 09:38:02 2013 -0600" }, "message": "vfio: hugepage support for vfio_iommu_type1\n\nWe currently send all mappings to the iommu in PAGE_SIZE chunks,\nwhich prevents the iommu from enabling support for larger page sizes.\nWe still need to pin pages, which means we step through them in\nPAGE_SIZE chunks, but we can batch up contiguous physical memory\nchunks to allow the iommu the opportunity to use larger pages. The\napproach here is a bit different that the one currently used for\nlegacy KVM device assignment. Rather than looking at the vma page\nsize and using that as the maximum size to pass to the iommu, we\ninstead simply look at whether the next page is physically\ncontiguous. This means we might ask the iommu to map a 4MB region,\nwhile legacy KVM might limit itself to a maximum of 2MB.\n\nSplitting our mapping path also allows us to be smarter about locked\nmemory because we can more easily unwind if the user attempts to\nexceed the limit. Therefore, rather than assuming that a mapping\nwill result in locked memory, we test each page as it is pinned to\ndetermine whether it locks RAM vs an mmap\u0027d MMIO region. This should\nresult in better locking granularity and less locked page fudge\nfactors in userspace.\n\nThe unmap path uses the same algorithm as legacy KVM. We don\u0027t want\nto track the pfn for each mapping ourselves, but we need the pfn in\norder to unpin pages. We therefore ask the iommu for the iova to\nphysical address translation, ask it to unpin a page, and see how many\npages were actually unpinned. iommus supporting large pages will\noften return something bigger than a page here, which we know will be\nphysically contiguous and we can unpin a batch of pfns. iommus not\nsupporting large mappings won\u0027t see an improvement in batching here as\nthey only unmap a page at a time.\n\nWith this change, we also make a clarification to the API for mapping\nand unmapping DMA. We can only guarantee unmaps at the same\ngranularity as used for the original mapping. In other words,\nunmapping a subregion of a previous mapping is not guaranteed and may\nresult in a larger or smaller unmapping than requested. The size\nfield in the unmapping structure is updated to reflect this.\nPreviously this was unmodified on mapping, always returning the the\nrequested unmap size. This is now updated to return the actual unmap\nsize on success, allowing userspace to appropriately track mappings.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\n" }, { "commit": "b71c99801e18eb172ae34851daf25044a3bf644a", "tree": "bf269d9d56c7a472022866e8cb186d6be6f060f4", "parents": [ "12869145718571ffa4f6e650a6f759934eeca0d9" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Sun May 26 10:03:01 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jun 21 10:46:44 2013 -0300" }, "message": "[media] v4l2-core: remove support for obsolete VIDIOC_DBG_G_CHIP_IDENT\n\nThis has been replaced by the new and much better VIDIOC_DBG_G_CHIP_INFO.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "681f130f39e10087475383e6771b9366e26bab0c", "tree": "45f06119d209eb5031c0f80425664c7ad5e9c96e", "parents": [ "6547a221871f139cc56328a38105d47c14874cbe" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Jun 20 05:52:22 2013 -0700" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jun 20 20:28:49 2013 +0200" }, "message": "netfilter: xt_socket: add XT_SOCKET_NOWILDCARD flag\n\nxt_socket module can be a nice replacement to conntrack module\nin some cases (SYN filtering for example)\n\nBut it lacks the ability to match the 3rd packet of TCP\nhandshake (ACK coming from the client).\n\nAdd a XT_SOCKET_NOWILDCARD flag to disable the wildcard mechanism.\n\nThe wildcard is the legacy socket match behavior, that ignores\nLISTEN sockets bound to INADDR_ANY (or ipv6 equivalent)\n\niptables -I INPUT -p tcp --syn -j SYN_CHAIN\niptables -I INPUT -m socket --nowildcard -j ACCEPT\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "37c1d2e4098e48d9107858246027510efcfd7774", "tree": "fd676992f6b27f2576420bbc7b25028d05125940", "parents": [ "414abbd2cd4c2618895f02ed3a76ec6647281436", "aad760136537fdfa10e5ac76bd3c79bde2100863" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jun 20 05:19:09 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jun 20 05:19:09 2013 -0300" }, "message": "Merge branch \u0027linus\u0027 into patchwork\n\n* linus: (1465 commits)\n ARM: tegra30: clocks: Fix pciex clock registration\n lseek(fd, n, SEEK_END) does *not* go to eof - n\n Linux 3.10-rc6\n smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().\n powerpc: Fix missing/delayed calls to irq_work\n powerpc: Fix emulation of illegal instructions on PowerNV platform\n powerpc: Fix stack overflow crash in resume_kernel when ftracing\n snd_pcm_link(): fix a leak...\n use can_lookup() instead of direct checks of -\u003ei_op-\u003elookup\n move exit_task_namespaces() outside of exit_notify()\n fput: task_work_add() can fail if the caller has passed exit_task_work()\n xfs: don\u0027t shutdown log recovery on validation errors\n xfs: ensure btree root split sets blkno correctly\n xfs: fix implicit padding in directory and attr CRC formats\n xfs: don\u0027t emit v5 superblock warnings on write\n mei: me: clear interrupts on the resume path\n mei: nfc: fix nfc device freeing\n mei: init: Flush scheduled work before resetting the device\n sctp: fully initialize sctp_outq in sctp_outq_init\n netiucv: Hold rtnl between name allocation and device registration.\n ...\n" }, { "commit": "5ffd229c02731a91d08ca21e76b503c5bbb5c095", "tree": "ed5f684cb6a5b683846d6b3d97fa2c0999835c24", "parents": [ "4e13c1ac6baa1d6c2b650d66ca89e1e12727ec19" ], "author": { "name": "Alexey Kardashevskiy", "email": "aik@ozlabs.ru", "time": "Tue May 21 13:33:10 2013 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jun 20 16:55:14 2013 +1000" }, "message": "powerpc/vfio: Implement IOMMU driver for VFIO\n\nVFIO implements platform independent stuff such as\na PCI driver, BAR access (via read/write on a file descriptor\nor direct mapping when possible) and IRQ signaling.\n\nThe platform dependent part includes IOMMU initialization\nand handling. This implements an IOMMU driver for VFIO\nwhich does mapping/unmapping pages for the guest IO and\nprovides information about DMA window (required by a POWER\nguest).\n\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nSigned-off-by: Alexey Kardashevskiy \u003caik@ozlabs.ru\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nAcked-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "bcefe17cffd06efdda3e7ad679ea743236e6271a", "tree": "5a21d15192afc50529274bc614541cacbf4fa73f", "parents": [ "2c0740e4e122239bcf6127fd2063733c5fb20c93" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Jun 15 09:39:18 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 23:06:51 2013 -0700" }, "message": "tcp: introduce a per-route knob for quick ack\n\nIn previous discussions, I tried to find some reasonable heuristics\nfor delayed ACK, however this seems not possible, according to Eric:\n\n\t\"ACKS might also be delayed because of bidirectional\n\ttraffic, and is more controlled by the application\n\tresponse time. TCP stack can not easily estimate it.\"\n\n\t\"ACK can be incredibly useful to recover from losses in\n\ta short time.\n\n\tThe vast majority of TCP sessions are small lived, and we\n\tsend one ACK per received segment anyway at beginning or\n\tretransmits to let the sender smoothly increase its cwnd,\n\tso an auto-tuning facility wont help them that much.\"\n\nand according to David:\n\n\t\"ACKs are the only information we have to detect loss.\n\n\tAnd, for the same reasons that TCP VEGAS is fundamentally\n\tbroken, we cannot measure the pipe or some other\n\treceiver-side-visible piece of information to determine\n\twhen it\u0027s \"safe\" to stretch ACK.\n\n\tAnd even if it\u0027s \"safe\", we should not do it so that losses are\n\taccurately detected and we don\u0027t spuriously retransmit.\n\n\tThe only way to know when the bandwidth increases is to\n\t\"test\" it, by sending more and more packets until drops happen.\n\tThat\u0027s why all successful congestion control algorithms must\n\toperate on explicited tested pieces of information.\n\n\tSimilarly, it\u0027s not really possible to universally know if\n\tit\u0027s safe to stretch ACK or not.\"\n\nIt still makes sense to enable or disable quick ack mode like\nwhat TCP_QUICK_ACK does.\n\nSimilar to TCP_QUICK_ACK option, but for people who can\u0027t\nmodify the source code and still wants to control\nTCP delayed ACK behavior. As David suggested, this should belong\nto per-path scope, since different pathes may want different\nbehaviors.\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Rick Jones \u003crick.jones2@hp.com\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Thomas Graf \u003ctgraf@suug.ch\u003e\nCC: David Laight \u003cDavid.Laight@ACULAB.COM\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2bd470fc08cbbfd4f2e53a620362806620d217ed", "tree": "db269607c024ef4bd4dd22f5a6a2167d3f242f9c", "parents": [ "d13919301d9a34cd4d3cc5ac73b89012c48cad71" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Wed Jun 19 18:06:54 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 18:30:27 2013 -0700" }, "message": "netlink: export netlink_diag.h header\n\nThe netlink_diag.h is in include/uapi/linux but not in the Kbuild necessary\nto cause it to be exported by make headers_install.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa310701e787087dbfbccf1409982a96e16c57a6", "tree": "f426945de6694203f2c34218b4e4b06913b8f58c", "parents": [ "a3e82996a8874c4cfe8c7f1be4d552018d8cba7e" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon Jun 17 17:50:33 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 18:07:42 2013 -0700" }, "message": "openvswitch: Add gre tunnel support.\n\nAdd gre vport implementation. Most of gre protocol processing\nis pushed to gre module. It make use of gre demultiplexer\ntherefore it can co-exist with linux device based gre tunnels.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d5437c709ded4f152cb8b305d17972d6707f20c", "tree": "d69da5004c4a65a0d4f60f5f8884f2aad120698f", "parents": [ "74f84a5726c7d08c27745305e67474b8645c541d" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon Jun 17 17:50:18 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 18:07:41 2013 -0700" }, "message": "openvswitch: Add tunneling interface.\n\nAdd ovs tunnel interface for set tunnel action for userspace.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d98cae64e4a733ff377184d78aa0b1f2b54faede", "tree": "e973e3c93fe7e17741567ac3947f5197bc9d582d", "parents": [ "646093a29f85630d8efe2aa38fa585d2c3ea2e46", "4067c666f2dccf56f5db5c182713e68c40d46013" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 16:49:39 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 19 16:49:39 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/Kconfig\n\tdrivers/net/xen-netback/netback.c\n\tnet/batman-adv/bat_iv_ogm.c\n\tnet/wireless/nl80211.c\n\nThe ath9k Kconfig conflict was a change of a Kconfig option name right\nnext to the deletion of another option.\n\nThe xen-netback conflict was overlapping changes involving the\nhandling of the notify list in xen_netbk_rx_action().\n\nBatman conflict resolution provided by Antonio Quartulli, basically\nkeep everything in both conflict hunks.\n\nThe nl80211 conflict is a little more involved. In \u0027net\u0027 we added a\ndynamic memory allocation to nl80211_dump_wiphy() to fix a race that\nLinus reported. Meanwhile in \u0027net-next\u0027 the handlers were converted\nto use pre and post doit handlers which use a flag to determine\nwhether to hold the RTNL mutex around the operation.\n\nHowever, the dump handlers to not use this logic. Instead they have\nto explicitly do the locking. There were apparent bugs in the\nconversion of nl80211_dump_wiphy() in that we were not dropping the\nRTNL mutex in all the return paths, and it seems we very much should\nbe doing so. So I fixed that whilst handling the overlapping changes.\n\nTo simplify the initial returns, I take the RTNL mutex after we try\nto allocate \u0027tb\u0027.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "135c5612c460f89657c4698fe2ea753f6f667963", "tree": "0f191e399ad6f07a150944e33c4c7f6dfcba8c3f", "parents": [ "72db55964695dcd4aa15950f3b2fb7c09ad79829" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Mon Jun 17 17:36:51 2013 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Wed Jun 19 14:43:35 2013 +0200" }, "message": "perf/x86/intel: Support Haswell/v4 LBR format\n\nHaswell has two additional LBR from flags for TSX: in_tx and\nabort_tx, implemented as a new \"v4\" version of the LBR format.\n\nHandle those in and adjust the sign extension code to still\ncorrectly extend. The flags are exported similarly in the LBR\nrecord to the existing misprediction flag\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Andi Kleen \u003cak@linux.jf.intel.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1371515812-9646-6-git-send-email-andi@firstfloor.org\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "2f301ab29e4656af824592363039d8f6bd5a9f68", "tree": "9f433169001a6d349e7f6b923d278327483cb08a", "parents": [ "f81a9dedaff434604c7fc3d9c299d277b76db0a8" ], "author": { "name": "Simon Wunderlich", "email": "simon.wunderlich@s2003.tu-chemnitz.de", "time": "Thu May 16 13:00:28 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jun 18 16:06:50 2013 +0200" }, "message": "nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flag\n\nAdd defines for 5 and 10 MHz channel width and fix channel\nhandling functions accordingly.\n\nAlso check for and report the WIPHY_FLAG_SUPPORTS_5_10_MHZ\ncapability.\n\nSigned-off-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: Mathias Kretschmer \u003cmathias.kretschmer@fokus.fraunhofer.de\u003e\n[fix spelling in comment]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "8941bbcd572a8860ad03c76e2f3d1dafa820b842", "tree": "47c0a823687b67ac98e706da7c61836fa0e0d37c", "parents": [ "dafcc4380deec21d160c31411f33c8813f67f517" ], "author": { "name": "Ying Xue", "email": "ying.xue@windriver.com", "time": "Mon Jun 17 10:54:36 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 17 15:53:00 2013 -0700" }, "message": "tipc: update code comments to reflect new uapi header path\n\nFiles tipc.h and tipc_config.h were moved to uapi directory, but\nthe corresponding comments were not updated at the same time.\n\nSigned-off-by: Ying Xue \u003cying.xue@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf32d52c455d933cc9a459bb94af9ea8b5850af9", "tree": "0d6af119b141e46e120ad06c867fe82ac3c00f1c", "parents": [ "0c375501be6e6dc23c11ebfa394434517444e62d", "7d132055814ef17a6c7b69f342244c410a5e000f" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Jun 17 12:00:22 2013 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Jun 17 12:00:22 2013 -0700" }, "message": "Merge 3.10-rc6 into tty-next\n\nWe want the changes in here as well.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "f303b364b41d3fc5bf879799128958400b7859aa", "tree": "b1051eddd6e6907d263083dd86f603f93b0ce85f", "parents": [ "018222f5d32bc5ca9fd830aebfeed10f1be96c93" ], "author": { "name": "Ulrich Hecht", "email": "ulrich.hecht@gmail.com", "time": "Fri May 31 17:57:01 2013 +0200" }, "committer": { "name": "Simon Horman", "email": "horms+renesas@verge.net.au", "time": "Mon Jun 17 18:09:53 2013 +0900" }, "message": "serial: sh-sci: HSCIF support\n\nAdds support for \"High Speed Serial Communications Interface with FIFO\",\nessentially a SCIF with 128-byte FIFOs and more accurate baud rate\ngenerator.\n\nSigned-off-by: Ulrich Hecht \u003culrich.hecht@gmail.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Simon Horman \u003chorms+renesas@verge.net.au\u003e\n" }, { "commit": "09ce069dff607f86dcdeb541d20734a8f42478c5", "tree": "03c7e9dc78d4dbfc2b3687053bbbd1680789934d", "parents": [ "948e306d7d645af80ea331b60495710fe4fe12bb", "93d8fd1514b6862c3370ea92be3f3b4216e0bf8f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 14 15:31:22 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 14 15:31:22 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n\nJesse Gross says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nA few miscellaneous improvements and cleanups before the GRE tunnel\nintegration series. Intended for net-next/3.11.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "45bfa52e36ef016b789eca73c7847db3f7b4742d", "tree": "3d8df67f8162d832e71f2e7816eb850c8c834718", "parents": [ "af7841636bb29575fe27faaeb351146e87217717" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Wed Jun 12 15:57:10 2013 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Fri Jun 14 15:09:11 2013 -0700" }, "message": "openvswitch: Fix struct comment.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "183860f6a0646b876645ecce0553a7ef2dd71254", "tree": "252059667b87d7f83487f444dd0efa36c97e075c", "parents": [ "c73e293678fc3ec8ee9e5e275ee77dec98c4f2f1" ], "author": { "name": "Anand Jain", "email": "Anand.Jain@oracle.com", "time": "Fri May 17 10:52:45 2013 +0000" }, "committer": { "name": "Josef Bacik", "email": "jbacik@fusionio.com", "time": "Fri Jun 14 11:29:53 2013 -0400" }, "message": "btrfs: device delete to get errors from the kernel\n\nwhen user runs command btrfs dev del the raid requisite error if any\ngoes to the /var/log/messages, its not good idea to clutter messages\nwith these user (knowledge) errors, further user don\u0027t have to review\nthe system messages to know problem with the cli it should be dropped\nto the user as part of the cli return.\n\nto bring this feature created a set of the ERROR defined\nBTRFS_ERROR_DEV* error codes and created their error string.\n\nI expect this enum to be added with other error which we might\nwant to communicate to the user land\n\nv3:\nmoved the code with in the file no logical change\n\nv1-\u003ev2:\nintroduce error codes for the device mgmt usage\n\nv1:\nadds a parameter in the ioctl arg struct to carry the error string\n\nSigned-off-by: Anand Jain \u003canand.jain@oracle.com\u003e\nSigned-off-by: Josef Bacik \u003cjbacik@fusionio.com\u003e\n" }, { "commit": "57254b6ebce4ceca02d9c8b615f6059c56c19238", "tree": "a90b04313e8671e6846d09c0c14c7b08e16d0e65", "parents": [ "1e8f915868c59be4d6e49d9aff928454a5d5d569" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Mon May 06 19:14:17 2013 +0000" }, "committer": { "name": "Josef Bacik", "email": "jbacik@fusionio.com", "time": "Fri Jun 14 11:29:22 2013 -0400" }, "message": "Btrfs: add ioctl to wait for qgroup rescan completion\n\nbtrfs_qgroup_wait_for_completion waits until the currently running qgroup\noperation completes. It returns immediately when no rescan process is in\nprogress. This is useful to automate things around the rescan process (e.g.\ntesting).\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\nSigned-off-by: Josef Bacik \u003cjbacik@fusionio.com\u003e\n" }, { "commit": "2757c3723c3d2b13e3a8bfaa034826f64e9cca43", "tree": "05a2c978fc9edbc973f1f6b55afbddf6ccb79f55", "parents": [ "fed7c25ec0d4894edfc36bbe5c5231e52f45483a" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 10 15:47:37 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jun 14 13:44:59 2013 +0200" }, "message": "NFC: Send netlink events for secure elements additions and removals\n\nWhen an NFC driver or host controller stack discovers a secure element,\nit will call nfc_add_se(). In order for userspace applications to use\nthese secure elements, a netlink event will then be sent with the SE\nindex and its type. With that information userspace applications can\ndecide wether or not to enable SEs, through their indexes.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "fed7c25ec0d4894edfc36bbe5c5231e52f45483a", "tree": "f481af4d3a05bd2f1b707a074cc49cf2d4a9f93b", "parents": [ "0a946301c2d3eac8673e556df820c0b6023ac6c3" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 10 15:28:38 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jun 14 13:44:58 2013 +0200" }, "message": "NFC: Add secure elements addition and removal API\n\nThis API will allow NFC drivers to add and remove the secure elements\nthey know about or detect. Typically this should be called (asynchronously\nor not) from the driver or the host interface stack detect_se hook.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "322bce957e9b0e30ef7147dae0414ad8f3f558c8", "tree": "83791eb96720eb16127f7820202935268a09db36", "parents": [ "31c44464acb8152db5745da700be58ac95ba0a83" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon May 27 15:29:11 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jun 14 13:44:18 2013 +0200" }, "message": "NFC: pn533: Copy NFCID2 through ATR_REQ\n\nWhen using NFC-F we should copy the NFCID2 buffer that we got from\nSENSF_RES through the ATR_REQ NFCID3 buffer. Not doing so violates\nNFC Forum digital requirement #189.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "1d8faf48c74b8329a0322dc4b2a2030ae5003c86", "tree": "63471c7ee9379f70e30b27b82cf6f155683b4468", "parents": [ "3dc6475c0c9e55ac7f053ad6b8b398e779954545" ], "author": { "name": "Rony Efraim", "email": "ronye@mellanox.com", "time": "Thu Jun 13 13:19:10 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 13 17:51:04 2013 -0700" }, "message": "net/core: Add VF link state control\n\nAdd netlink directives and ndo entry to allow for controling\nVF link, which can be in one of three states:\n\nAuto - VF link state reflects the PF link state (default)\n\nUp - VF link state is up, traffic from VF to VF works even if\nthe actual PF link is down\n\nDown - VF link state is down, no traffic from/to this VF, can be of\nuse while configuring the VF\n\nSigned-off-by: Rony Efraim \u003cronye@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9674da8759df0d6c0d24e1ede6e2a1acdef91e3c", "tree": "97363dfcf38f1e7c6bfb8a9abd76302c617eb705", "parents": [ "1095e69f47926db6f1350a9d6a38626521580e87" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Mon Apr 29 17:13:27 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jun 14 00:26:08 2013 +0200" }, "message": "NFC: Add firmware upload netlink command\n\nAs several NFC chipsets can have their firmwares upgraded and\nreflashed, this patchset adds a new netlink command to trigger\nthat the driver loads or flashes a new firmware. This will allows\nuserspace triggered firmware upgrade through netlink.\nThe firmware name or hint is passed as a parameter, and the driver\nwill eventually fetch the firmware binary through the request_firmware\nAPI.\nThe cmd can only be executed when the nfc dev is not in use. Actual\nfirmware loading/flashing is an asynchronous operation. Result of the\noperation shall send a new event up to user space through the nfc dev\nmulticast socket. During operation, the nfc dev is not openable and\nthus not usable.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "274038f8c94c493e2977983e2aecb5f5f0778479", "tree": "59c639c040acb5af3eafe2a2eb7787c03dd5bfbf", "parents": [ "7c0cadc69ca2ac8893aa162ee80d92a805840909" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Jun 11 14:41:24 2013 +0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 12 15:07:21 2013 -0700" }, "message": "tun: Report \"persist\" flag to userspace\n\nThe TUN_PERSIST flag is not reported at all -- both TUNGETIFF, and sysfs\n\"flags\" attribute skip one. Knowing whether a device is persistent or not\nis critical for checkpoint-restore, thus I propose to add the read-only\nIFF_PERSIST one for this.\n\nSetting this new IFF_PERSIST is hardly possible, as TUNSETIFF doesn\u0027t check\nfor unknown flags being zero and thus there can be trash.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d854a60b1d7d39a37b25dd28f63cfa0df637b91", "tree": "ff120873a6046e586e135aadae9c83510910e8e5", "parents": [ "e82e030556e42e823e174e0c3bd97988d1a09d1f" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Thu Feb 07 10:46:46 2013 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Wed Jun 12 16:42:18 2013 +0100" }, "message": "arm64: KVM: enable initialization of a 32bit vcpu\n\nWire the init of a 32bit vcpu by allowing 32bit modes in pstate,\nand providing sensible defaults out of reset state.\n\nThis feature is of course conditioned by the presence of 32bit\ncapability on the physical CPU, and is checked by the KVM_CAP_ARM_EL1_32BIT\ncapability.\n\nReviewed-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "3899ba90a4ab2f3cab8e0f91a76c14ff131c8293", "tree": "ae82b469f8a7ceb42547d11dd1fe5c73abc8635b", "parents": [ "45203a3b380cee28f570475c0d28c169f908c209", "8b3e7be437a6b62118d0485ad971e724afe23fdf" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 11 14:48:32 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 11 14:48:32 2013 -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/ath/ath9k/debug.c\n\tnet/mac80211/iface.c\n" }, { "commit": "8e7c053853b7d299e8a2b8733659b0df8eee51f7", "tree": "eec28175ba2437205a7376db82cb0eeafdced0a7", "parents": [ "a0a2af765543a96bdf188ec57dd201e708195302" ], "author": { "name": "Colleen Twitty", "email": "colleen@cozybit.com", "time": "Mon Jun 03 09:53:39 2013 -0700" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jun 11 14:16:29 2013 +0200" }, "message": "{nl,cfg}80211: make peer link expiration time configurable\n\nIf a STA has a peer that it hasn\u0027t seen any tx activity\nfrom for a certain length of time, the peer link is\nexpired. This means the inactive STA is removed from the\nlist of peers and that STA is not considered a peer again\nunless it re-peers. Previously, this inactivity time was\nalways 30 minutes. Now, add it to the mesh configuration\nand allow it to be configured. Retain 30 minutes as a\ndefault value.\n\nSigned-off-by: Colleen Twitty \u003ccolleen@cozybit.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "a0a2af765543a96bdf188ec57dd201e708195302", "tree": "c444325ffcd9e6d5cff3d294965832134d6eca68", "parents": [ "ecccd072b07e7fd09c54d0f86f9374e2645cde97" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Jun 03 18:10:45 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jun 11 14:14:32 2013 +0200" }, "message": "nl80211: add kernel-doc for NL80211_FEATURE_ACTIVE_MONITOR\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "45203a3b380cee28f570475c0d28c169f908c209", "tree": "9d9b00da9accbc0ea01c91c206cb86a2f9dd7609", "parents": [ "b41abb42bf62a85a32c41dab873220598a6ee266" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Jun 06 08:43:22 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 11 02:51:03 2013 -0700" }, "message": "net_sched: add 64bit rate estimators\n\nstruct gnet_stats_rate_est contains u32 fields, so the bytes per second\nfield can wrap at 34360Mbit.\n\nAdd a new gnet_stats_rate_est64 structure to get 64bit bps/pps fields,\nand switch the kernel to use this structure natively.\n\nThis structure is dumped to user space as a new attribute :\n\nTCA_STATS_RATE_EST64\n\nOld tc command will now display the capped bps (to 34360Mbit), instead\nof wrapped values, and updated tc command will display correct\ninformation.\n\nOld tc command output, after patch :\n\neric:~# tc -s -d qd sh dev lo\nqdisc pfifo 8001: root refcnt 2 limit 1000p\n Sent 80868245400 bytes 1978837 pkt (dropped 0, overlimits 0 requeues 0)\n rate 34360Mbit 189696pps backlog 0b 0p requeues 0\n\nThis patch carefully reorganizes \"struct Qdisc\" layout to get optimal\nperformance on SMP.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "867a59436fc35593ae0e0efcd56cc6d2f8506586", "tree": "8b5aafe092cf6212894fc2f0176833be9b9e22ed", "parents": [ "9ba18891f75535eca3ef53138b48970eb60f5255" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Wed Jun 05 10:08:01 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 11 02:04:32 2013 -0700" }, "message": "bridge: Add a flag to control unicast packet flood.\n\nAdd a flag to control flood of unicast traffic. By default, flood is\non and the bridge will flood unicast traffic if it doesn\u0027t know\nthe destination. When the flag is turned off, unicast traffic\nwithout an FDB will not be forwarded to the specified port.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nReviewed-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9ba18891f75535eca3ef53138b48970eb60f5255", "tree": "cdd724cc45f489ae601d22f3ffdd64be02b5c049", "parents": [ "30f3a40f9a2a2869a560a9cb9ef488d10c803e14" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Wed Jun 05 10:08:00 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 11 02:04:32 2013 -0700" }, "message": "bridge: Add flag to control mac learning.\n\nAllow user to control whether mac learning is enabled on the port.\nBy default, mac learning is enabled. Disabling mac learning will\ncause new dynamic FDB entries to not be created for a particular port.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a8fedd0c142d4328ab4667847e05afe17c3295c", "tree": "d00e1487e2f19b6fb12b28c39be07b0db7df7225", "parents": [ "066a1a5fca0e188c41636d0874ab7495f24f595b" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Mon Jun 10 12:33:47 2013 -0700" }, "committer": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Tue Jun 11 11:06:34 2013 +0300" }, "message": "kvm: Add definition of KVM_REG_MIPS\n\nWe use 0x7000000000000000ULL as 0x6000000000000000ULL is reserved for\nARM64.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\n" }, { "commit": "060212928670593fb89243640bf05cf89560b023", "tree": "32ae5c7be094983fb06430dbe09d36e2b317ca9c", "parents": [ "af12fa6e46aa651e7b86a4c4117b562518fef184" ], "author": { "name": "Eliezer Tamir", "email": "eliezer.tamir@linux.intel.com", "time": "Mon Jun 10 11:39:50 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 10 21:22:35 2013 -0700" }, "message": "net: add low latency socket poll\n\nAdds an ndo_ll_poll method and the code that supports it.\nThis method can be used by low latency applications to busy-poll\nEthernet device queues directly from the socket code.\nsysctl_net_ll_poll controls how many microseconds to poll.\nDefault is zero (disabled).\nIndividual protocol support will be added by subsequent patches.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nTested-by: Willem de Bruijn \u003cwillemb@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9e2e946fb0ba5d2398feb89558f98c5c28e23e3", "tree": "c2cebc2606be1bd35623147381de3dbab3a11802", "parents": [ "1ba7055af26f008e8fc8dab9dcb1701534afbe16" ], "author": { "name": "Jingchang Lu", "email": "b35083@freescale.com", "time": "Fri Jun 07 09:20:40 2013 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sat Jun 08 22:30:44 2013 -0700" }, "message": "tty: serial: add Freescale lpuart driver support\n\nAdd Freescale lpuart driver support. The lpuart device\ncan be found on Vybrid VF610 and Layerscape LS-1 SoCs.\n\nSigned-off-by: Jingchang Lu \u003cb35083@freescale.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7c8c5e6a9101ea57a1c2c9faff0917e79251a21e", "tree": "9cfd6c3a7f2c1235911b0473bec8ce00b4f3fca0", "parents": [ "54f81d0eb93896da73d1636bca84cf90f52cabdf" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Mon Dec 10 16:15:34 2012 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Fri Jun 07 14:03:36 2013 +0100" }, "message": "arm64: KVM: system register handling\n\nProvide 64bit system register handling, modeled after the cp15\nhandling for ARM.\n\nReviewed-by: Christopher Covington \u003ccov@codeaurora.org\u003e\nReviewed-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "4c4d41f200db375b2d2cc6d0a1de0606c8266398", "tree": "5ee1e98ef87828b95039fe2bf46e3195add1d13b", "parents": [ "5865fc1b6a99bc7dcf245770c2735577b8596b6e" ], "author": { "name": "Fan Du", "email": "fan.du@windriver.com", "time": "Thu Jun 06 10:15:54 2013 +0800" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Thu Jun 06 06:45:55 2013 +0200" }, "message": "xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter\n\nWhen host ping its peer, ICMP echo request packet triggers IPsec\npolicy, then host negotiates SA secret with its peer. After IKE\ninstalled SA for OUT direction, but before SA for IN direction\ninstalled, host get ICMP echo reply from its peer. At the time\nbeing, the SA state for IN direction could be XFRM_STATE_ACQ,\nthen the received packet will be dropped after adding\nLINUX_MIB_XFRMINSTATEINVALID statistic.\n\nAdding a LINUX_MIB_XFRMACQUIREERROR statistic counter for such\nscenario when SA in larval state is much clearer for user than\nLINUX_MIB_XFRMINSTATEINVALID which indicates the SA is totally\nbad.\n\nSigned-off-by: Fan Du \u003cfan.du@windriver.com\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "cb93b1864088eb833ea9cef2c20f07d1961241b0", "tree": "da800c7af24ebee15ab99dab319978e3f88b4bcc", "parents": [ "e7d4515209db5246245eb5667a94ad86ba9a12cc" ], "author": { "name": "Yijing Wang", "email": "wangyijing@huawei.com", "time": "Wed May 29 17:01:52 2013 +0800" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Wed May 29 14:46:24 2013 -0600" }, "message": "PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM\n\nFix trivial typo for PCI_EXP_LNKCAP_CLKPM comment.\n\nSigned-off-by: Yijing Wang \u003cwangyijing@huawei.com\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e" }, { "commit": "e057d3c31bdf87616b415c4b2cbf7310f54b9219", "tree": "ae87f09df131d03baf389b3179083a06bac039fe", "parents": [ "6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Tue May 28 13:01:52 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed May 29 09:11:44 2013 +0200" }, "message": "cfg80211: support an active monitor interface flag\n\nAn active monitor interface is one that is used for communication (via\ninjection). It is expected to ACK incoming unicast packets. This is\nuseful for running various 802.11 testing utilities that associate to an\nAP via injection and manage the state in user space.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "7ec872114251b618adf5a2688de0ca00de63635d", "tree": "ec96fdf9f4b8d810d5d5895afd255ab7cc0072dd", "parents": [ "1010dcceed9d45dc8a07c50ec93e5d0c1ef7cc24" ], "author": { "name": "Florian Fainelli", "email": "f.fainelli@gmail.com", "time": "Thu May 23 01:11:11 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 27 22:42:50 2013 -0700" }, "message": "net: ethtool: disambiguate XCVR_* meaning\n\nAdd a comment which explains the real meaning of XCVR_INTERNAL (PHY and\nEthernet MAC in the same package/die) and XCVR_EXTERNAL (PHY and\nEthernet MAC in a different package/die). Most if not all of the drivers\nsetting their transceiver type already do it the way the comment\ndescribes it.\n\nSigned-off-by: Florian Fainelli \u003cf.fainelli@gmail.com\u003e\nReviewed-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff29feb9146d1c0020f2ccbb25369582c6a16681", "tree": "d87c0ead03f6195b40dab2a2d9c4ef7749784f24", "parents": [ "5c75a55e3c2820f2fd7e256e577c1b528567f3ae" ], "author": { "name": "Lad, Prabhakar", "email": "prabhakar.csengg@gmail.com", "time": "Mon May 20 06:02:40 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon May 27 08:51:49 2013 -0300" }, "message": "[media] videodev2.h: fix typos\n\nThis patch fixes several typos in videodev2.h file\n\nSigned-off-by: Lad, Prabhakar \u003cprabhakar.csengg@gmail.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5e4b6f5698421d94226cc2f80eae6d613c9acef8", "tree": "7d8c8c5907eb455bae01a6b741dace9992a9d5ad", "parents": [ "786677d100600b7f6089bae0d3967c1b901a6141" ], "author": { "name": "Jouni Malinen", "email": "jouni@qca.qualcomm.com", "time": "Thu May 16 20:11:08 2013 +0300" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri May 24 22:36:28 2013 +0200" }, "message": "cfg80211: Allow TDLS peer AID to be configured for VHT\n\nVHT uses peer AID in the PARTIAL_AID field in TDLS frames. The current\ndesign for TDLS is to first add a dummy STA entry before completing TDLS\nSetup and then update information on this STA entry based on what was\nreceived from the peer during the setup exchange.\n\nIn theory, this could use NL80211_ATTR_STA_AID to set the peer AID just\nlike this is used in AP mode to set the AID of an association station.\nHowever, existing cfg80211 validation rules prevent this attribute from\nbeing used with set_station operation. To avoid interoperability issues\nbetween different kernel and user space version combinations, introduce\na new nl80211 attribute for the purpose of setting TDLS peer AID. This\nattribute can be used in both the new_station and set_station\noperations. It is not supposed to be allowed to change the AID value\nduring the lifetime of the STA entry, but that validation is left for\ndrivers to do in the change_station callback.\n\nSigned-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "adf6271281a811dbcf2cb090b2a99a8520f7852b", "tree": "3c9fcdd1e96b6cda1fd7cf4f374ec5fcb9dc325c", "parents": [ "ba9948fb9c3bd220b4766f19aff82c2776a7eb4c" ], "author": { "name": "Ismael Luceno", "email": "ismael.luceno@corp.bluecherry.net", "time": "Thu Apr 18 08:16:08 2013 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Tue May 21 08:13:16 2013 -0300" }, "message": "[media] videodev2.h: Make V4L2_PIX_FMT_MPEG4 comment more specific about its usage\n\nSigned-off-by: Ismael Luceno \u003cismael.luceno@corp.bluecherry.net\u003e\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "1c6264cc67ac8712d84392fbc9293289011407c0", "tree": "999a41ce5d955faab99dd16cdd1db1235324fc39", "parents": [ "8b21ab140ec581caf3340a51cdbe91a76c36d9d8" ], "author": { "name": "Pranavkumar Sawargaonkar", "email": "pranavkumar@linaro.org", "time": "Mon May 20 10:25:38 2013 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 20 12:09:03 2013 +0930" }, "message": "virtio: console: Add emergency writeonly register to config space\n\nThis patch adds an emerg_wr register (writeonly) in config space\nof virtio console device which can be used for debugging.\n\nSigned-off-by: Pranavkumar Sawargaonkar \u003cpranavkumar@linaro.org\u003e\nSigned-off-by: Anup Patel \u003canup.patel@linaro.org\u003e\nAcked-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "8b21ab140ec581caf3340a51cdbe91a76c36d9d8", "tree": "b0439dd85d548bddfc710857791812346e37d634", "parents": [ "d5fe85af85367d5892e4308f596de4e2a5fb9017" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon May 20 10:27:00 2013 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 20 12:08:09 2013 +0930" }, "message": "virtio_pci: better macro exported in uapi\n\nMacro VIRTIO_PCI_CONFIG assumes that userspace actually has a structure\nwith a field named msix_enabled. Add VIRTIO_PCI_CONFIG_OFF that gets\nthe msix_enabled by value instead, to make it useful for userspace. We\nstill keep VIRTIO_PCI_CONFIG around for now, in case some userspace uses\nit.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6407d75afd08545f2252bb39806ffd3f10c7faac", "tree": "ff52e0c954bcc2a221d95dbaea83e3e1d03c854f", "parents": [ "d2f83e9078b8114e3b9d09082856c1aac299aa37" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 17 10:44:15 2013 +0930" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 20 10:25:28 2013 +0930" }, "message": "virtio_console: fix uapi header\n\nuapi should use __u32 not u32.\nFix a macro in virtio_console.h which uses u32.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: stable@kernel.org\n" }, { "commit": "6e16d90b5218307db805e6b3e0b06d3946eb8c4c", "tree": "bbd37b170d3657f7df53475f8f9d4d6f73b7260e", "parents": [ "7ade7036043e2e8e2831ae189ce5c248386062f1" ], "author": { "name": "Colleen Twitty", "email": "colleen@cozybit.com", "time": "Wed May 08 11:45:59 2013 -0700" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu May 16 22:39:43 2013 +0200" }, "message": "cfg80211: Userspace may inform kernel of mesh auth method.\n\nAuthentication takes place in userspace, but the beacon is\ngenerated in the kernel. Allow userspace to inform the\nkernel of the authentication method so the appropriate\nmesh config IE can be set prior to beacon generation when\njoining the MBSS.\n\nSigned-off-by: Colleen Twitty \u003ccolleen@cozybit.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "fb4e156886ce6e8309e912d8b370d192330d19d3", "tree": "bc4f6953b1a2983b93d5a0bd7d83669369e2503d", "parents": [ "55300a13d2ca1d59f659cf00b9d8dc93ea225882" ], "author": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Sun Apr 28 16:22:06 2013 -0700" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu May 16 22:39:39 2013 +0200" }, "message": "nl80211: Add generic netlink module alias for cfg80211/nl80211\n\nTo support auto-loading of wireless modules from netlink users, add module\nalias for nl80211 family.\n\nThis also adds NL80211_GENL_NAME constant to define the \"nl80211\" netlink\nfamily name as part of uapi.\n\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "119363c7dc2bcc0c33c255a7b4979c8c0fdc1896", "tree": "85c7eb2b9104968d017eee14065a2d93ce0150a7", "parents": [ "f722406faae2d073cc1d01063d1123c35425939e" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Apr 22 16:29:30 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu May 16 22:39:37 2013 +0200" }, "message": "cfg80211: add support for per-chain signal strength reporting\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "c4cc75c3321cad6f20d1e5325293890255c8a663", "tree": "f515d034c9d6947bed0467840678aff823747596", "parents": [ "2dbd3cac87250a0d44e07acc86c4224a08522709", "2a0b4be6dd655e24990da1d0811e28b9277f8b12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 14:29:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 11 14:29:11 2013 -0700" }, "message": "Merge git://git.infradead.org/users/eparis/audit\n\nPull audit changes from Eric Paris:\n \"Al used to send pull requests every couple of years but he told me to\n just start pushing them to you directly.\n\n Our touching outside of core audit code is pretty straight forward. A\n couple of interface changes which hit net/. A simple argument bug\n calling audit functions in namei.c and the removal of some assembly\n branch prediction code on ppc\"\n\n* git://git.infradead.org/users/eparis/audit: (31 commits)\n audit: fix message spacing printing auid\n Revert \"audit: move kaudit thread start from auditd registration to kaudit init\"\n audit: vfs: fix audit_inode call in O_CREAT case of do_last\n audit: Make testing for a valid loginuid explicit.\n audit: fix event coverage of AUDIT_ANOM_LINK\n audit: use spin_lock in audit_receive_msg to process tty logging\n audit: do not needlessly take a lock in tty_audit_exit\n audit: do not needlessly take a spinlock in copy_signal\n audit: add an option to control logging of passwords with pam_tty_audit\n audit: use spin_lock_irqsave/restore in audit tty code\n helper for some session id stuff\n audit: use a consistent audit helper to log lsm information\n audit: push loginuid and sessionid processing down\n audit: stop pushing loginid, uid, sessionid as arguments\n audit: remove the old depricated kernel interface\n audit: make validity checking generic\n audit: allow checking the type of audit message in the user filter\n audit: fix build break when AUDIT_DEBUG \u003d\u003d 2\n audit: remove duplicate export of audit_enabled\n Audit: do not print error when LSMs disabled\n ...\n" }, { "commit": "983a5f84a4a11c8706ca70615125db711336b684", "tree": "bbf16b836903aaf523e7c637a0d7191ba8fa172d", "parents": [ "8769e078a9a2bce13d39c08e0e5a513f5320e1de", "667e7d94a1683661cff5fe9a0fa0d7f8fdd2c007" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 09 13:07:40 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 09 13:07:40 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs update from Chris Mason:\n \"These are mostly fixes. The biggest exceptions are Josef\u0027s skinny\n extents and Jan Schmidt\u0027s code to rebuild our quota indexes if they\n get out of sync (or you enable quotas on an existing filesystem).\n\n The skinny extents are off by default because they are a new variation\n on the extent allocation tree format. btrfstune -x enables them, and\n the new format makes the extent allocation tree about 30% smaller.\n\n I rebased this a few days ago to rework Dave Sterba\u0027s crc checks on\n the super block, but almost all of these go back to rc6, since I\n though 3.9 was due any minute.\n\n The biggest missing fix is the tracepoint bug that was hit late in\n 3.9. I ran into problems with that in overnight testing and I\u0027m still\n tracking it down. I\u0027ll definitely have that fixed for rc2.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (101 commits)\n Btrfs: allow superblock mismatch from older mkfs\n btrfs: enhance superblock checks\n btrfs: fix misleading variable name for flags\n btrfs: use unsigned long type for extent state bits\n Btrfs: improve the loop of scrub_stripe\n btrfs: read entire device info under lock\n btrfs: remove unused gfp mask parameter from release_extent_buffer callchain\n btrfs: handle errors returned from get_tree_block_key\n btrfs: make static code static \u0026 remove dead code\n Btrfs: deal with errors in write_dev_supers\n Btrfs: remove almost all of the BUG()\u0027s from tree-log.c\n Btrfs: deal with free space cache errors while replaying log\n Btrfs: automatic rescan after \"quota enable\" command\n Btrfs: rescan for qgroups\n Btrfs: split btrfs_qgroup_account_ref into four functions\n Btrfs: allocate new chunks if the space is not enough for global rsv\n Btrfs: separate sequence numbers for delayed ref tracking and tree mod log\n btrfs: move leak debug code to functions\n Btrfs: return free space in cow error path\n Btrfs: set UUID in root_item for created trees\n ...\n" }, { "commit": "4f924b2aa4d3cb30f07e57d6b608838edcbc0d88", "tree": "772490a2ae3eb3b0c8b0e312349801e04e8bfebf", "parents": [ "19acc327258ac5bcd0f31c07853e6d9784010fb4" ], "author": { "name": "Josh Boyer", "email": "jwboyer@redhat.com", "time": "Wed May 08 09:45:47 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 08 13:13:30 2013 -0700" }, "message": "if_cablemodem.h: Add parenthesis around ioctl macros\n\nProtect the SIOCGCM* ioctl macros with parenthesis.\n\nReported-by: Paul Wouters \u003cpwouters@redhat.com\u003e\nSigned-off-by: Josh Boyer \u003cjwboyer@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "780a7654cee8d61819512385e778e4827db4bfbc" }