)]}' { "log": [ { "commit": "efec22b4689bbfdbed26367219e981fcc946b9a6", "tree": "eee6bb1c6109dd52e4bb6113ab61ad8d5dfa8047", "parents": [ "f89ff6441df06abc2d95f3ef67525923032d6283", "6dbda2d00d466225f9db1dc695ff852443f28832" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:14:48 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 29 14:14:48 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211\n" }, { "commit": "9b395bc3be1cebf0144a127c7e67d56dbdac0930", "tree": "9cbe0d8566b890f43cd8d9f884f8b78104775f29", "parents": [ "4a4f1a5808c8bb0b72a4f6e5904c53fb8c9cd966" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Oct 26 00:36:40 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Oct 26 22:52:42 2012 +0200" }, "message": "mac80211: verify that skb data is present\n\nA number of places in the mesh code don\u0027t check that\nthe frame data is present and in the skb header when\ntrying to access. Add those checks and the necessary\npskb_may_pull() calls. This prevents accessing data\nthat doesn\u0027t actually exist.\n\nTo do this, export ieee80211_get_mesh_hdrlen() to be\nable to use it in mac80211.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "290eddc4b3661dc4dfa95d199e0be5788928b3b1", "tree": "2130a4aab73e43e08b6566b06211069a96a2ff22", "parents": [ "8f7b8db6e0557c8437adf9371e020cd89a7e85dc", "3a40414f826a8f1096d9b94c4a53ef91b25ba28d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Oct 17 16:23:33 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Oct 17 16:23:33 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211\n" }, { "commit": "6863255bd0e48bc41ae5a066d5c771801e92735a", "tree": "9bb64e599fb14c424480f7b4cda6abc5c7754c04", "parents": [ "df9b42963f2d010ae3163a894ce22cf6b27cd344" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Mon Oct 15 14:52:41 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Oct 15 17:21:34 2012 +0200" }, "message": "cfg80211/mac80211: avoid state mishmash on deauth\n\nAvoid situation when we are on associate state in mac80211 and\non disassociate state in cfg80211. This can results on crash\nduring modules unload (like showed on this thread:\nhttp://marc.info/?t\u003d134373976300001\u0026r\u003d1\u0026w\u003d2) and possibly other\nproblems.\n\nReported-by: Pedro Francisco \u003cpedrogfrancisco@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "c92b96553a80c1dbe2ebe128bbe37c8f98f148bf", "tree": "2c08aaddff418e7be5c0674aeb9e4b94ec538179", "parents": [ "155e8336c373d14d87a7f91e356d85ef4b93b8f9" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:36 2012 -0400" }, "message": "ipv4: Add FLOWI_FLAG_KNOWN_NH\n\nAdd flag to request that output route should be\nreturned with known rt_gateway, in case we want to use\nit as nexthop for neighbour resolving.\n\n\tThe returned route can be cached as follows:\n\n- in NH exception: because the cached routes are not shared\n\twith other destinations\n- in FIB NH: when using gateway because all destinations for\n\tNH share same gateway\n\n\tAs last option, to return rt_gateway!\u003d0 we have to\nset DST_NOCACHE.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "155e8336c373d14d87a7f91e356d85ef4b93b8f9", "tree": "5d31e9d9c197129fcf26fd8ae9d54da770503a6c", "parents": [ "f8a17175c63fd3e8b573719f7538816f8c96abf4" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Oct 08 11:41:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 08 17:42:36 2012 -0400" }, "message": "ipv4: introduce rt_uses_gateway\n\nAdd new flag to remember when route is via gateway.\nWe will use it to allow rt_gateway to contain address of\ndirectly connected host for the cases when DST_NOCACHE is\nused or when the NH exception caches per-destination route\nwithout DST_NOCACHE flag, i.e. when routes are not used for\nother destinations. By this way we force the neighbour\nresolving to work with the routed destination but we\ncan use different address in the packet, feature needed\nfor IPVS-DR where original packet for virtual IP is routed\nvia route to real IP.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "283dbd82055eb70ff3b469f812d9c695f18c9641", "tree": "0a97e7b60b79bc48de9276c4da0f9472a202b130", "parents": [ "11126c611e10abb18b6f1ed0300c0548c3906b54", "6825a26c2dc21eb4f8df9c06d3786ddec97cf53b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:11:59 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:11:59 2012 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking changes from David Miller:\n \"The most important bit in here is the fix for input route caching from\n Eric Dumazet, it\u0027s a shame we couldn\u0027t fully analyze this in time for\n 3.6 as it\u0027s a 3.6 regression introduced by the routing cache removal.\n\n Anyways, will send quickly to -stable after you pull this in.\n\n Other changes of note:\n\n 1) Fix lockdep splats in team and bonding, from Eric Dumazet.\n\n 2) IPV6 adds link local route even when there is no link local\n address, from Nicolas Dichtel.\n\n 3) Fix ixgbe PTP implementation, from Jacob Keller.\n\n 4) Fix excessive stack usage in cxgb4 driver, from Vipul Pandya.\n\n 5) MAC length computed improperly in VLAN demux, from Antonio\n Quartulli.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)\n ipv6: release reference of ip6_null_entry\u0027s dst entry in __ip6_del_rt\n Remove noisy printks from llcp_sock_connect\n tipc: prevent dropped connections due to rcvbuf overflow\n silence some noisy printks in irda\n team: set qdisc_tx_busylock to avoid LOCKDEP splat\n bonding: set qdisc_tx_busylock to avoid LOCKDEP splat\n sctp: check src addr when processing SACK to update transport state\n sctp: fix a typo in prototype of __sctp_rcv_lookup()\n ipv4: add a fib_type to fib_info\n can: mpc5xxx_can: fix section type conflict\n can: peak_pcmcia: fix error return code\n can: peak_pci: fix error return code\n cxgb4: Fix build error due to missing linux/vmalloc.h include.\n bnx2x: fix ring size for 10G functions\n cxgb4: Dynamically allocate memory in t4_memory_rw() and get_vpd_params()\n ixgbe: add support for X540-AT1\n ixgbe: fix poll loop for FDIRCTRL.INIT_DONE bit\n ixgbe: fix PTP ethtool timestamping function\n ixgbe: (PTP) Fix PPS interrupt code\n ixgbe: Fix PTP X540 SDP alignment code for PPS signal\n ...\n" }, { "commit": "04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa", "tree": "d9fb34c24277a6eec6f5da9aeff450aedb8e387c", "parents": [ "6299b669b1340b9f7de2bc2bd565921a1494e7f7" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Oct 04 17:12:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 06 03:04:45 2012 +0900" }, "message": "sections: fix section conflicts in net\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "edfee0339e681a784ebacec7e8c2dc97dc6d2839", "tree": "ec4c3953956d2de79ee326d08e46c6d9736a1068", "parents": [ "575659936f9d392b93b03ce97a58dbd4fce18abd" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Oct 03 05:43:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 15:53:48 2012 -0400" }, "message": "sctp: check src addr when processing SACK to update transport state\n\nSuppose we have an SCTP connection with two paths. After connection is\nestablished, path1 is not available, thus this path is marked as inactive. Then\ntraffic goes through path2, but for some reasons packets are delayed (after\nrto.max). Because packets are delayed, the retransmit mechanism will switch\nagain to path1. At this time, we receive a delayed SACK from path2. When we\nupdate the state of the path in sctp_check_transmitted(), we do not take into\naccount the source address of the SACK, hence we update the wrong path.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f4ef85bbda96324785097356336bc79cdd37db0a", "tree": "7a91ea1839d96ccb43d322f88a725f5a76b4be79", "parents": [ "c0b8b99287235626a5850ef7e5bfc842d1ebcecd" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Oct 04 01:25:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 04 13:58:26 2012 -0400" }, "message": "ipv4: add a fib_type to fib_info\n\ncommit d2d68ba9fe8 (ipv4: Cache input routes in fib_info nexthops.)\nintroduced a regression for forwarding.\n\nThis was hard to reproduce but the symptom was that packets were\ndelivered to local host instead of being forwarded.\n\nDavid suggested to add fib_type to fib_info so that we dont\ninadvertently share same fib_info for different purposes.\n\nWith help from Julian Anastasov who provided very helpful\nhints, reproduced here :\n\n\u003cquote\u003e\n Can it be a problem related to fib_info reuse\nfrom different routes. For example, when local IP address\nis created for subnet we have:\n\nbroadcast 192.168.0.255 dev DEV proto kernel scope link src\n192.168.0.1\n192.168.0.0/24 dev DEV proto kernel scope link src 192.168.0.1\nlocal 192.168.0.1 dev DEV proto kernel scope host src 192.168.0.1\n\n The \"dev DEV proto kernel scope link src 192.168.0.1\" is\na reused fib_info structure where we put cached routes.\nThe result can be same fib_info for 192.168.0.255 and\n192.168.0.0/24. RTN_BROADCAST is cached only for input\nroutes. Incoming broadcast to 192.168.0.255 can be cached\nand can cause problems for traffic forwarded to 192.168.0.0/24.\nSo, this patch should solve the problem because it\nseparates the broadcast from unicast traffic.\n\n And the ip_route_input_slow caching will work for\nlocal and broadcast input routes (above routes 1 and 3) just\nbecause they differ in scope and use different fib_info.\n\n\u003c/quote\u003e\n\nMany thanks to Chris Clayton for his patience and help.\n\nReported-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nBisected-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aecdc33e111b2c447b622e287c6003726daa1426", "tree": "3e7657eae4b785e1a1fb5dfb225dbae0b2f0cfc6", "parents": [ "a20acf99f75e49271381d65db097c9763060a1e8", "a3a6cab5ea10cca64d036851fe0d932448f2fe4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n 1) GRE now works over ipv6, from Dmitry Kozlov.\n\n 2) Make SCTP more network namespace aware, from Eric Biederman.\n\n 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.\n\n 4) Make openvswitch network namespace aware, from Pravin B Shelar.\n\n 5) IPV6 NAT implementation, from Patrick McHardy.\n\n 6) Server side support for TCP Fast Open, from Jerry Chu and others.\n\n 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel\n Borkmann.\n\n 8) Increate the loopback default MTU to 64K, from Eric Dumazet.\n\n 9) Use a per-task rather than per-socket page fragment allocator for\n outgoing networking traffic. This benefits processes that have very\n many mostly idle sockets, which is quite common.\n\n From Eric Dumazet.\n\n10) Use up to 32K for page fragment allocations, with fallbacks to\n smaller sizes when higher order page allocations fail. Benefits are\n a) less segments for driver to process b) less calls to page\n allocator c) less waste of space.\n\n From Eric Dumazet.\n\n11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.\n\n12) VXLAN device driver, one way to handle VLAN issues such as the\n limitation of 4096 VLAN IDs yet still have some level of isolation.\n From Stephen Hemminger.\n\n13) As usual there is a large boatload of driver changes, with the scale\n perhaps tilted towards the wireless side this time around.\n\nFix up various fairly trivial conflicts, mostly caused by the user\nnamespace changes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)\n hyperv: Add buffer for extended info after the RNDIS response message.\n hyperv: Report actual status in receive completion packet\n hyperv: Remove extra allocated space for recv_pkt_list elements\n hyperv: Fix page buffer handling in rndis_filter_send_request()\n hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n hyperv: Fix the max_xfer_size in RNDIS initialization\n vxlan: put UDP socket in correct namespace\n vxlan: Depend on CONFIG_INET\n sfc: Fix the reported priorities of different filter types\n sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n sfc: Fix loopback self-test with separate_tx_channels\u003d1\n sfc: Fix MCDI structure field lookup\n sfc: Add parentheses around use of bitfield macro arguments\n sfc: Fix null function pointer in efx_sriov_channel_type\n vxlan: virtual extensible lan\n igmp: export symbol ip_mc_leave_group\n netlink: add attributes to fdb interface\n tg3: unconditionally select HWMON support when tg3 is enabled.\n Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n gre: fix sparse warning\n ...\n" }, { "commit": "437589a74b6a590d175f86cf9f7b2efcee7765e7", "tree": "37bf8635b1356d80ef002b00e84f3faf3d555a63", "parents": [ "68d47a137c3bef754923bccf73fb639c9b0bbd5e", "72235465864d84cedb2d9f26f8e1de824ee20339" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace changes from Eric Biederman:\n \"This is a mostly modest set of changes to enable basic user namespace\n support. This allows the code to code to compile with user namespaces\n enabled and removes the assumption there is only the initial user\n namespace. Everything is converted except for the most complex of the\n filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,\n nfs, ocfs2 and xfs as those patches need a bit more review.\n\n The strategy is to push kuid_t and kgid_t values are far down into\n subsystems and filesystems as reasonable. Leaving the make_kuid and\n from_kuid operations to happen at the edge of userspace, as the values\n come off the disk, and as the values come in from the network.\n Letting compile type incompatible compile errors (present when user\n namespaces are enabled) guide me to find the issues.\n\n The most tricky areas have been the places where we had an implicit\n union of uid and gid values and were storing them in an unsigned int.\n Those places were converted into explicit unions. I made certain to\n handle those places with simple trivial patches.\n\n Out of that work I discovered we have generic interfaces for storing\n quota by projid. I had never heard of the project identifiers before.\n Adding full user namespace support for project identifiers accounts\n for most of the code size growth in my git tree.\n\n Ultimately there will be work to relax privlige checks from\n \"capable(FOO)\" to \"ns_capable(user_ns, FOO)\" where it is safe allowing\n root in a user names to do those things that today we only forbid to\n non-root users because it will confuse suid root applications.\n\n While I was pushing kuid_t and kgid_t changes deep into the audit code\n I made a few other cleanups. I capitalized on the fact we process\n netlink messages in the context of the message sender. I removed\n usage of NETLINK_CRED, and started directly using current-\u003etty.\n\n Some of these patches have also made it into maintainer trees, with no\n problems from identical code from different trees showing up in\n linux-next.\n\n After reading through all of this code I feel like I might be able to\n win a game of kernel trivial pursuit.\"\n\nFix up some fairly trivial conflicts in netfilter uid/git logging code.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)\n userns: Convert the ufs filesystem to use kuid/kgid where appropriate\n userns: Convert the udf filesystem to use kuid/kgid where appropriate\n userns: Convert ubifs to use kuid/kgid\n userns: Convert squashfs to use kuid/kgid where appropriate\n userns: Convert reiserfs to use kuid and kgid where appropriate\n userns: Convert jfs to use kuid/kgid where appropriate\n userns: Convert jffs2 to use kuid and kgid where appropriate\n userns: Convert hpfs to use kuid and kgid where appropriate\n userns: Convert btrfs to use kuid/kgid where appropriate\n userns: Convert bfs to use kuid/kgid where appropriate\n userns: Convert affs to use kuid/kgid wherwe appropriate\n userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids\n userns: On ia64 deal with current_uid and current_gid being kuid and kgid\n userns: On ppc convert current_uid from a kuid before printing.\n userns: Convert s390 getting uid and gid system calls to use kuid and kgid\n userns: Convert s390 hypfs to use kuid and kgid where appropriate\n userns: Convert binder ipc to use kuids\n userns: Teach security_path_chown to take kuids and kgids\n userns: Add user namespace support to IMA\n userns: Convert EVM to deal with kuids and kgids in it\u0027s hmac computation\n ...\n" }, { "commit": "c0e8a139a5bb8add02b4111e9e1957d810d7285e", "tree": "f5f0695c7553c0f651ea3c714191dedf76e06c78", "parents": [ "033d9959ed2dc1029217d4165f80a71702dc578e", "a6f00298b2ceaf50b4ab00e6ee3eb0206ac72fac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n\n - xattr support added. The implementation is shared with tmpfs. The\n usage is restricted and intended to be used to manage per-cgroup\n metadata by system software. tmpfs changes are routed through this\n branch with Hugh\u0027s permission.\n\n - cgroup subsystem ID handling simplified.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Define CGROUP_SUBSYS_COUNT according the configuration\n cgroup: Assign subsystem IDs during compile time\n cgroup: Do not depend on a given order when populating the subsys array\n cgroup: Wrap subsystem selection macro\n cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT\n cgroup: net_prio: Do not define task_netpioidx() when not selected\n cgroup: net_cls: Do not define task_cls_classid() when not selected\n cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h\n cgroup: trivial fixes for Documentation/cgroups/cgroups.txt\n xattr: mark variable as uninitialized to make both gcc and smatch happy\n fs: add missing documentation to simple_xattr functions\n cgroup: add documentation on extended attributes usage\n cgroup: rename subsys_bits to subsys_mask\n cgroup: add xattr support\n cgroup: revise how we re-populate root directory\n xattr: extract simple_xattr code from tmpfs\n" }, { "commit": "60769a5dcd8755715c7143b4571d5c44f01796f1", "tree": "913951cd23fa8aaaac5de4585484becaaead41ff", "parents": [ "c9e6bc644e557338221e75c242ab12c275a67d1b" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Sep 27 02:48:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:01:57 2012 -0400" }, "message": "ipv4: gre: add GRO capability\n\nAdd GRO capability to IPv4 GRE tunnels, using the gro_cells\ninfrastructure.\n\nTested using IPv4 and IPv6 TCP traffic inside this tunnel, and\nchecking GRO is building large packets.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9e6bc644e557338221e75c242ab12c275a67d1b", "tree": "dea44a1edd85dccafc2d0973280d3a608d69eb02", "parents": [ "861b650101eb0c627d171eb18de81dddb93d395e" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Sep 27 19:29:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:01:46 2012 -0400" }, "message": "net: add gro_cells infrastructure\n\nThis adds a new include file (include/net/gro_cells.h), to bring GRO\n(Generic Receive Offload) capability to tunnels, in a modular way.\n\nBecause tunnels receive path is lockless, and GRO adds a serialization\nusing a napi_struct, I chose to add an array of up to\nDEFAULT_MAX_NUM_RSS_QUEUES cells, so that multi queue devices wont be\nslowed down because of GRO layer.\n\nskb_get_rx_queue() is used as selector.\n\nIn the future, we might add optional fanout capabilities, using rxhash\nfor example.\n\nWith help from Ben Hutchings who reminded me\nnetif_get_num_default_rss_queues() function.\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": "3498d13b8090c0b0ef911409fbc503a7c4cca6ef", "tree": "254ca00276e863d9fba25707690c66b2a04c49e9", "parents": [ "def7cb8cd4e3258db88050eaaca5438bcc3dafca", "0c57dfcc6c1d037243c2f8fbf62eab3633326ec0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "message": "Merge tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY changes from Greg Kroah-Hartman:\n \"As we skipped the merge window for 3.6-rc1 for the tty tree,\n everything is now settled down and working properly, so we are ready\n for 3.7-rc1. Here\u0027s the patchset, it\u0027s big, but the large changes are\n removing a firmware file and adding a staging tty driver (it depended\n on the tty core changes, so it\u0027s going through this tree instead of\n the staging tree.)\n\n All of these patches have been in the linux-next tree for a while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up more-or-less trivial conflicts in\n - drivers/char/pcmcia/synclink_cs.c:\n tty NULL dereference fix vs tty_port_cts_enabled() helper function\n - drivers/staging/{Kconfig,Makefile}:\n add-add conflict (dgrp driver added close to other staging drivers)\n - drivers/staging/ipack/devices/ipoctal.c:\n \"split ipoctal_channel from iopctal\" vs \"TTY: use tty_port_register_device\"\n\n* tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)\n tty/serial: Add kgdb_nmi driver\n tty/serial/amba-pl011: Quiesce interrupts in poll_get_char\n tty/serial/amba-pl011: Implement poll_init callback\n tty/serial/core: Introduce poll_init callback\n kdb: Turn KGDB_KDB\u003dn stubs into static inlines\n kdb: Implement disable_nmi command\n kernel/debug: Mask KGDB NMI upon entry\n serial: pl011: handle corruption at high clock speeds\n serial: sccnxp: Make \u0027default\u0027 choice in switch last\n serial: sccnxp: Remove mask termios caps for SW flow control\n serial: sccnxp: Report actual baudrate back to core\n serial: samsung: Add poll_get_char \u0026 poll_put_char\n Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate\n Powerpc 8xx CPM_UART maxidl should not depend on fifo size\n Powerpc 8xx CPM_UART too many interrupts\n Powerpc 8xx CPM_UART desynchronisation\n serial: set correct baud_base for EXSYS EX-41092 Dual 16950\n serial: omap: fix the reciever line error case\n 8250: blacklist Winbond CIR port\n 8250_pnp: do pnp probe before legacy probe\n ...\n" }, { "commit": "a248afdc1b5916c2bfd007233112333d85aa28f6", "tree": "49d4a0b8fdcf7624ea6b0bdf0af2567d7392210e", "parents": [ "d379142bc4d9b78cdd9fc5aa696ca1ea083fb7d4", "c487606f835a93a725bac1aefd536be98f22474d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 30 02:30:16 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 30 02:30:16 2012 -0400" }, "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\nHere is another batch of updates intended for 3.7...\n\nHighlights include an hci_connect re-write in Bluetooth, HCI/LLC\nlayer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP\nraw sockets support, improved IBSS auth frame handling in mac80211,\nfull-MAC AP mode notification support in mac80211, a lot of attention\npaid to brcmfmac, and the usual level of updates to iwlwifi, ath9k,\nmwifiex, and rt2x00, and various other updates.\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": "6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db", "tree": "8faea23112a11f52524eb413f71b7b02712d8b53", "parents": [ "d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1", "6672d90fe779dc0dfffe027c3ede12609df091c2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 28 14:40:49 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 28 14:40:49 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/team/team.c\n\tdrivers/net/usb/qmi_wwan.c\n\tnet/batman-adv/bat_iv_ogm.c\n\tnet/ipv4/fib_frontend.c\n\tnet/ipv4/route.c\n\tnet/l2tp/l2tp_netlink.c\n\nThe team, fib_frontend, route, and l2tp_netlink conflicts were simply\noverlapping changes.\n\nqmi_wwan and bat_iv_ogm were of the \"use HEAD\" variety.\n\nWith help from Antonio Quartulli.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c487606f835a93a725bac1aefd536be98f22474d", "tree": "c77571a519905945e24a9ea6e4e44d9032fd527d", "parents": [ "d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1", "97ea6d0f3eb019891038cd2dfddb749d6bf219be" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 28 11:11:16 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 28 11:11:16 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tnet/nfc/netlink.c\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e2bcabec6ea5ba30dd2097dc1566e9957d14117c", "tree": "73c09343cd7302aea199bd1e991b81897f8ca5d7", "parents": [ "f54ba7798848ce1385a71b36a2c997422c82220a" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Tue Sep 25 11:32:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:42:00 2012 -0400" }, "message": "net: remove sk_init() helper\n\nIt seems sk_init() has no value today and even does strange things :\n\n# grep . /proc/sys/net/core/?mem_*\n/proc/sys/net/core/rmem_default:212992\n/proc/sys/net/core/rmem_max:131071\n/proc/sys/net/core/wmem_default:212992\n/proc/sys/net/core/wmem_max:131071\n\nWe can remove it completely.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nReviewed-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eccc1bb8d4b4cf68d3c9becb083fa94ada7d495c", "tree": "b0be7efd0c4a4eed26ffd63863dc372d3b1f2ca0", "parents": [ "b0558ef24a792906914fcad277f3befe2420e618" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Sep 25 11:02:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 27 18:12:37 2012 -0400" }, "message": "tunnel: drop packet if ECN present with not-ECT\n\nLinux tunnels were written before RFC6040 and therefore never\nimplemented the corner case of ECN getting set in the outer header\nand the inner header not being ready for it.\n\nSection 4.2. Default Tunnel Egress Behaviour.\n o If the inner ECN field is Not-ECT, the decapsulator MUST NOT\n propagate any other ECN codepoint onwards. This is because the\n inner Not-ECT marking is set by transports that rely on dropped\n packets as an indication of congestion and would not understand or\n respond to any other ECN codepoint [RFC4774]. Specifically:\n\n * If the inner ECN field is Not-ECT and the outer ECN field is\n CE, the decapsulator MUST drop the packet.\n\n * If the inner ECN field is Not-ECT and the outer ECN field is\n Not-ECT, ECT(0), or ECT(1), the decapsulator MUST forward the\n outgoing packet with the ECN field cleared to Not-ECT.\n\nThis patch moves the ECN decap logic out of the individual tunnels\ninto a common place.\n\nIt also adds logging to allow detecting broken systems that\nset ECN bits incorrectly when tunneling (or an intermediate\nrouter might be changing the header).\n\nOverloads rx_frame_error to keep track of ECN related error.\n\nThanks to Chris Wright who caught this while reviewing the new VXLAN\ntunnel.\n\nThis code was tested by injecting faulty logic in other end GRE\nto send incorrectly encapsulated packets.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5419575e838cd2cd11a1b30449eb58decdf51f9f", "tree": "36b20c033f58751fe11b71938738ad2cb39b20d0", "parents": [ "0c49b69931a0001912bb4e48c415d33031ddb217", "64629b9d412544b0ed744405944fd6edf79d7e0d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Sep 25 15:54:32 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Sep 25 15:54:32 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "96e324024b421b3753eb142d5d92fbe4ac5e7519", "tree": "c05ff22fb3bda8511ec18ffc997c31e074e1d0c3", "parents": [ "5adf54de97270256f6ec0e368ddde68ac516b692" ], "author": { "name": "Waldemar Rymarkiewicz", "email": "waldemar.rymarkiewicz@tieto.com", "time": "Thu Sep 20 08:59:10 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:27 2012 +0200" }, "message": "NFC: xmit from hci ops must return 0 or negative\n\nxmit callback provided by a driver encapsulates upper layers\ndata and sends it to the hardware. So, HCI does not know the\nexact amount of data being sent and thus can\u0027t handle partially\nsent frames properly.\n\nTherefore, the driver must return 0 for completely sent frame or\nnegative for failure.\n\nSigned-off-by: Waldemar Rymarkiewicz \u003cwaldemar.rymarkiewicz@tieto.com\u003e\nAcked-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "412fda538f4b1317ecd0fbe6e5bc9124792bea88", "tree": "afd09c49880919110dd1dc25027b75a63f8dd169", "parents": [ "4a61cd6687fc6348d08724676d34e38160d6cf9b" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Tue Sep 18 19:45:48 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:26 2012 +0200" }, "message": "NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core\n\nThe previous shdlc HCI driver and its header are removed from the tree.\nPN544 now registers directly with HCI and passes the name of the llc it\nrequires (shdlc).\nHCI instantiation now allocates the required llc instance. The llc is\nstarted when the HCI device is brought up.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "4a61cd6687fc6348d08724676d34e38160d6cf9b", "tree": "9bfcd0af9ad2e7c085c0542f2565467659823789", "parents": [ "8af00d48dc929442644bf68e9cd3d951d9697296" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Thu Sep 13 17:11:37 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:25 2012 +0200" }, "message": "NFC: Add an shdlc llc module to llc core\n\nThis is used by HCI drivers such as the one for the pn544 which require\ncommunications between HCI and the chip to use shdlc.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "8af00d48dc929442644bf68e9cd3d951d9697296", "tree": "4ed4b580674856dd204dccc6b5c769f5a262c00c", "parents": [ "67cccfe17d1b3da1ed6c79e643c9be95ebde9642" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Thu Sep 13 17:10:48 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:25 2012 +0200" }, "message": "NFC: Add a nop (passthrough) llc module to llc core\n\nThis is a passthrough llc. It can be used by HCI drivers that don\u0027t\nneed link layer control. HCI will then write directly to the driver, and\ndriver will deliver incoming frames directly to HCI without any\nprocessing.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "67cccfe17d1b3da1ed6c79e643c9be95ebde9642", "tree": "ec08617b50bbb6dce81fd3436b582e3cf55b231a", "parents": [ "f3e8fb552789f4845e60b11c47b676d14b9488e5" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Thu Sep 13 17:10:00 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:25 2012 +0200" }, "message": "NFC: Add an LLC Core layer to HCI\n\nThe LLC layer manages modules that control the link layer protocol (such\nas shdlc) between HCI and an HCI driver. The driver must simply specify\nthe required llc when it registers with HCI.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "f3e8fb552789f4845e60b11c47b676d14b9488e5", "tree": "8fde55db141d361952cbb190d9e59231e143157b", "parents": [ "e4c4789e55327e5f2bd6cafcccd46f9b6251bbc3" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Tue Sep 11 10:43:50 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:25 2012 +0200" }, "message": "NFC: Modified hci_transceive to become an asynchronous operation\n\nThis enables the completion callback to be called from a different\ncontext, preventing a possible deadlock if the callback resulted in the\ninvocation of a nested call to the currently locked nfc_dev.\nThis is also more in line with the im_transceive nfc_ops for NFC Core or\nNCI drivers which already behave asynchronously.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "e4c4789e55327e5f2bd6cafcccd46f9b6251bbc3", "tree": "e143a6128fb46578b9634300accece0c9277b56b", "parents": [ "b5faa648faf974b58e5a79eafa9a97e1deed7a8a" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Tue Sep 11 10:42:54 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:25 2012 +0200" }, "message": "NFC: Add a public nfc_hci_send_cmd_async method\n\nThis method initiates execution of an HCI cmd. Result will be delivered\nthrough an asynchronous callback.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "474fee3db16c63bc440bfb93b57f72ecfc4246f0", "tree": "f5fed7f3b40408f21fa3b9edc67d5ac0b869149f", "parents": [ "5db327f96daa2401b9afec6cd80cebe6c6475bb1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Aug 22 16:22:16 2012 -0700" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:23 2012 +0200" }, "message": "NFC: Use system_nrt_wq instead of custom ones\n\nNFC is using a number of custom ordered workqueues w/ WQ_MEM_RECLAIM.\nWQ_MEM_RECLAIM is unnecessary unless NFC is gonna be used as transport\nfor storage device, and all use cases match one work item to one\nordered workqueue - IOW, there\u0027s no actual ordering going on at all\nand using system_nrt_wq gives the same behavior.\n\nThere\u0027s nothing to be gained by using custom workqueues. Use\nsystem_nrt_wq instead and drop all the custom ones.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "767f19ae698e535f308663c48245fa951abebe20", "tree": "98c9353741a371d9c812f81c577fa36e0c4e5451", "parents": [ "ac206838403411e617dbe0e7df1891ee957f1f9a" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Aug 15 11:46:24 2012 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:23 2012 +0200" }, "message": "NFC: Implement NCI dep_link_up and dep_link_down\n\nDuring NFC-DEP target activation, store the remote\ngeneral bytes to be used later in dep_link_up.\nWhen dep_link_up is called, activate the NFC-DEP target,\nand forward the remote general bytes.\nWhen dep_link_down is called, deactivate the target.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ac206838403411e617dbe0e7df1891ee957f1f9a", "tree": "c71cced20fcdac75ae4d0e2f7925965f54289485", "parents": [ "7e0352306f6869b442a574a8e691f126c9fe930a" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Aug 15 11:46:23 2012 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:23 2012 +0200" }, "message": "NFC: Parse NCI NFC-DEP activation params\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "7e0352306f6869b442a574a8e691f126c9fe930a", "tree": "3ceccb1a7f1467ebfbd83289c7df3ad020ac2906", "parents": [ "5d50b364e61e85eb41938d25770db3aab5e07d82" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Wed Aug 15 11:46:22 2012 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Sep 25 00:17:23 2012 +0200" }, "message": "NFC: Set local general bytes in nci_start_poll\n\nIf initiator protocol is NFC-DEP, set the local general bytes\nin nci_start_poll.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "5640f7685831e088fe6c2e1f863a6805962f8e81", "tree": "fb7660173338a45c27d610eb59ba20cf5c2b91b8", "parents": [ "b98b8babd6e3370fadb7c6eaacb00eb2f6344a6c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Sep 23 23:04:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 16:31:37 2012 -0400" }, "message": "net: use a per task frag allocator\n\nWe currently use a per socket order-0 page cache for tcp_sendmsg()\noperations.\n\nThis page is used to build fragments for skbs.\n\nIts done to increase probability of coalescing small write() into\nsingle segments in skbs still in write queue (not yet sent)\n\nBut it wastes a lot of memory for applications handling many mostly\nidle sockets, since each socket holds one page in sk-\u003esk_sndmsg_page\n\nIts also quite inefficient to build TSO 64KB packets, because we need\nabout 16 pages per skb on arches where PAGE_SIZE \u003d 4096, so we hit\npage allocator more than wanted.\n\nThis patch adds a per task frag allocator and uses bigger pages,\nif available. An automatic fallback is done in case of memory pressure.\n\n(up to 32768 bytes per frag, thats order-3 pages on x86)\n\nThis increases TCP stream performance by 20% on loopback device,\nbut also benefits on other network devices, since 8x less frags are\nmapped on transmit and unmapped on tx completion. Alexander Duyck\nmentioned a probable performance win on systems with IOMMU enabled.\n\nIts possible some SG enabled hardware cant cope with bigger fragments,\nbut their ndo_start_xmit() should already handle this, splitting a\nfragment in sub fragments, since some arches have PAGE_SIZE\u003d65536\n\nSuccessfully tested on various ethernet devices.\n(ixgbe, igb, bnx2x, tg3, mellanox mlx4)\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a6c8c7998f95b140f3d3c7ac5dce2fbd6d403e3", "tree": "b0821a3dca420ac789627bb994ef82ca4462bfa9", "parents": [ "5889335c506bc50b03266251ac3c8711b674ba7a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 15:52:33 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 15:52:33 2012 -0400" }, "message": "net: Remove unnecessary NULL check in scm_destroy().\n\nAll callers provide a non-NULL scm argument.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "791ef39cd18ae2745a63c51a5dbbd23312be0744", "tree": "195a547ce1bde51ba3f37cd771648c18d84cc947", "parents": [ "e5a876250d05d9708895da3d5408bdf67f1180f3", "0c1abbd1aa0416258881c303a88e618cbca0759c" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 24 14:39:16 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 24 14:39:16 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next\n" }, { "commit": "9b4e9e756541fd5d1223b323ed5a8a8545dd11cd", "tree": "3eed3a2582532bd1fd890b58eadd472fcd2b1dc7", "parents": [ "7a5f799becc51c842ec1a3aeb8dd82651aea7036", "9385d04f2872057a2029901190391fe192b18693" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 24 14:34:40 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 24 14:34:40 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "016818d076871c4ee34db1e8d74dc17ac1de626a", "tree": "60d0f20afb0937f61b5fc4611e53a2ac411a0646", "parents": [ "623df484a777f3c00c1ea3d6a7565b8d8ac688a1" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sat Sep 22 04:18:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Sep 22 15:47:10 2012 -0400" }, "message": "tcp: TCP Fast Open Server - take SYNACK RTT after completing 3WHS\n\nWhen taking SYNACK RTT samples for servers using TCP Fast Open, fix\nthe code to ensure that we only call tcp_valid_rtt_meas() after we\nreceive the ACK that completes the 3-way handshake.\n\nPreviously we were always taking an RTT sample in\ntcp_v4_syn_recv_sock(). However, for TCP Fast Open connections\ntcp_v4_conn_req_fastopen() calls tcp_v4_syn_recv_sock() at the time we\nreceive the SYN. So for TFO we must wait until tcp_rcv_state_process()\nto take the RTT sample.\n\nTo fix this, we wait until after TFO calls tcp_v4_syn_recv_sock()\nbefore we set the snt_synack timestamp, since tcp_synack_rtt_meas()\nalready ensures that we only take a SYNACK RTT sample if snt_synack is\nnon-zero. To be careful, we only take a snt_synack timestamp when\na SYNACK transmit or retransmit succeeds.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "623df484a777f3c00c1ea3d6a7565b8d8ac688a1", "tree": "6394f6b3bac15a274dbaecc4c5d46761f838f2ca", "parents": [ "de46584675fad02b7f8255f31be0ea1be5cd185b" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sat Sep 22 04:18:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Sep 22 15:47:10 2012 -0400" }, "message": "tcp: extract code to compute SYNACK RTT\n\nIn preparation for adding another spot where we compute the SYNACK\nRTT, extract this code so that it can be shared.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abef3bd71029b80ec1bdd6c6244b5b0b99f56633", "tree": "5645e6f4eb637fa8e290a1eab1f40436deb15338", "parents": [ "6219844e72ecc7a7c9efed8b4e41a6c6064a4967", "a630844d898ae8a0b4a3db84af061150682e0d3c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:32:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 21 14:32:55 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n \"More bug fixes, nothing gets past these guys\"\n\n 1) More kernel info leaks found by Mathias Krause, this time in the\n IPSEC configuration layers.\n\n 2) When IPSEC policies change, we do not properly make sure that cached\n routes (which could now be stale) throughout the system will be\n revalidated. Fix this by generalizing the generation count\n invalidation scheme used by ipv4. From Nicolas Dichtel.\n\n 3) When repairing TCP sockets, we need to allow to restore not just the\n send window scale, but the receive one too. Extend the existing\n interface to achieve this in a backwards compatible way. From\n Andrey Vagin.\n\n 4) A fix for FCOE scatter gather feature validation erroneously caused\n scatter gather to be disabled for things like AOE too. From Ed L\n Cashin.\n\n 5) Several cases of mishandling of error pointers, from Mathias Krause,\n Wei Yongjun, and Devendra Naga.\n\n 6) Fix gianfar build, from Richard Cochran.\n\n 7) CAP_NET_* failures should return -EPERM not -EACCES, from Zhao\n Hongjiang.\n\n 8) Hardware reset fix in janz-ican3 CAN driver, from Ira W Snyder.\n\n 9) Fix oops during rmmod in ti_hecc CAN driver, from Marc Kleine-Budde.\n\n10) The removal of the conditional compilation of the clk support code\n in the stmmac driver broke things. This is because the interfaces\n used are the ones that don\u0027t also perform the enable/disable of the\n clk. Fix from Stefan Roese.\n\n11) The QFQ packet scheduler can record out of range virtual start\n times, resulting later in misbehavior and even crashes. Fix from\n Paolo Valente.\n\n12) If MSG_WAITALL is used with IOAT DMA under TCP, we can wedge the\n receiver when the advertised receive window goes to zero. Detect\n this case and force the processing of the IOAT DMA queue when it\n happens to avoid getting stuck. Fix from Michal Kubecek.\n\n13) batman-adv assumes that test_bit() returns only 0 or 1, but this is\n not true for x86 (which returns -1 or 0, via the \u0027sbb\u0027 instruction).\n Fix from Linus Lussing.\n\n14) Fix small packet corruption in e1000, from Tushar Dave.\n\n15) make_blackhole() in the IPSEC policy code can do one read unlock too\n many, fix from Li RongQing.\n\n16) The new tcp_try_coalesce() code introduced a bug in TCP URG\n handling, fix from Eric Dumazet.\n\n17) Fix memory leak in __netif_receive_skb() when doing zerocopy and\n when hit an OOM condition. From Michael S Tsirkin.\n\n18) netxen blindly deferences pdev-\u003ebus-\u003eself, which is not guarenteed\n to be non-NULL. Fix from Nikolay Aleksandrov.\n\n19) Fix a performance regression caused by mistakes in ipv6 checksum\n validation in the bnx2x driver, fix from Michal Schmidt.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)\n net/stmmac: Use clk_prepare_enable and clk_disable_unprepare\n net: change return values from -EACCES to -EPERM\n net/irda: sh_sir: fix return value check in sh_sir_set_baudrate()\n stmmac: fix return value check in stmmac_open_ext_timer()\n gianfar: fix phc index build failure\n ipv6: fix return value check in fib6_add()\n bnx2x: remove false warning regarding interrupt number\n can: ti_hecc: fix oops during rmmod\n can: janz-ican3: fix support for older hardware revisions\n net: do not disable sg for packets requiring no checksum\n aoe: assert AoE packets marked as requiring no checksum\n at91ether: return PTR_ERR if call to clk_get fails\n xfrm_user: don\u0027t copy esn replay window twice for new states\n xfrm_user: ensure user supplied esn replay window is valid\n xfrm_user: fix info leak in copy_to_user_tmpl()\n xfrm_user: fix info leak in copy_to_user_policy()\n xfrm_user: fix info leak in copy_to_user_state()\n xfrm_user: fix info leak in copy_to_user_auth()\n net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200\n tcp: restore rcv_wscale in a repair mode (v2)\n ...\n" }, { "commit": "6b102865e7ba9ff1e3c49c32c7187bb427d91798", "tree": "21a7f917457ab79f40d5bd579e547a030b2f0610", "parents": [ "d4915c087f7c2457c580efc16fe0bfa1a576274d" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Sep 18 16:50:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 19 17:23:28 2012 -0400" }, "message": "ipv6: unify fragment thresh handling code\n\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Michal Kubeček \u003cmkubecek@suse.cz\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4915c087f7c2457c580efc16fe0bfa1a576274d", "tree": "3502caff41521db74f97a9e13e09f43cc03eb0c1", "parents": [ "b836c99fd6c9dfe52a69fa0ba36ec918f80ce02a" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Sep 18 16:50:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 19 17:23:28 2012 -0400" }, "message": "ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline\n\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Michal Kubeček \u003cmkubecek@suse.cz\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b836c99fd6c9dfe52a69fa0ba36ec918f80ce02a", "tree": "cb3459103371712b73c8b7695cf05d8f936480a2", "parents": [ "c038a767cd697238b09f7a4ea5a504b4891774e9" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Sep 18 16:50:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 19 17:23:28 2012 -0400" }, "message": "ipv6: unify conntrack reassembly expire code with standard one\n\nTwo years ago, Shan Wei tried to fix this:\nhttp://patchwork.ozlabs.org/patch/43905/\n\nThe problem is that RFC2460 requires an ICMP Time\nExceeded -- Fragment Reassembly Time Exceeded message should be\nsent to the source of that fragment, if the defragmentation\ntimes out.\n\n\"\n If insufficient fragments are received to complete reassembly of a\n packet within 60 seconds of the reception of the first-arriving\n fragment of that packet, reassembly of that packet must be\n abandoned and all the fragments that have been received for that\n packet must be discarded. If the first fragment (i.e., the one\n with a Fragment Offset of zero) has been received, an ICMP Time\n Exceeded -- Fragment Reassembly Time Exceeded message should be\n sent to the source of that fragment.\n\"\n\nAs Herbert suggested, we could actually use the standard IPv6\nreassembly code which follows RFC2460.\n\nWith this patch applied, I can see ICMP Time Exceeded sent\nfrom the receiver when the sender sent out 3/4 fragmented\nIPv6 UDP packet.\n\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Michal Kubeček \u003cmkubecek@suse.cz\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nCc: netfilter-devel@vger.kernel.org\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c038a767cd697238b09f7a4ea5a504b4891774e9", "tree": "c6cbe9f5b641a7f5cc4e1fb520724b77682e9810", "parents": [ "8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Sep 18 16:50:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 19 17:23:28 2012 -0400" }, "message": "ipv6: add a new namespace for nf_conntrack_reasm\n\nAs pointed by Michal, it is necessary to add a new\nnamespace for nf_conntrack_reasm code, this prepares\nfor the second patch.\n\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Michal Kubeček \u003cmkubecek@suse.cz\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nCc: netfilter-devel@vger.kernel.org\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "552bff0c2fec8953ba3793d75ee335032cc0b47c", "tree": "266f60e039d9869b408275384392c9643e35528b", "parents": [ "2ad4814fb6ddc78ec17079b5dec9e2cd313a944c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Sep 19 09:26:06 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Sep 19 09:32:59 2012 +0200" }, "message": "cfg80211: constify name parameter to add_virtual_intf\n\nThe name can\u0027t be modified by the driver,\nmake it const.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "92a25256f142d55e25f9959441cea6ddeabae57e", "tree": "eb276a7076d59e7d29f14139b3993d441c3ea0fd", "parents": [ "5ad777958621524b48d1bdf4aaf3b26a363d4553" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Thu Sep 06 18:39:26 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Tue Sep 18 22:27:29 2012 -0300" }, "message": "Bluetooth: mgmt: Implement support for passkey notification\n\nThis patch adds support for Secure Simple Pairing with devices that have\nKeyboardOnly as their IO capability. Such devices will cause a passkey\nnotification on our side and optionally also keypress notifications.\nWithout this patch some keyboards cannot be paired using the mgmt\ninterface.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nCc: stable@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "6f3118b571b8a4c06c7985dc3172c3526cb86253", "tree": "4b42d48f7346850618756ee4c26a179c5f7c7c3b", "parents": [ "ee8372dd1989287c5eedb69d44bac43f69e496f1" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 10 22:09:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 18 15:57:03 2012 -0400" }, "message": "ipv6: use net-\u003ert_genid to check dst validity\n\nIPv6 dst should take care of rt_genid too. When a xfrm policy is inserted or\ndeleted, all dst should be invalidated.\nTo force the validation, dst entries should be created with -\u003eobsolete set to\nDST_OBSOLETE_FORCE_CHK. This was already the case for all functions calling\nip6_dst_alloc(), except for ip6_rt_copy().\n\nAs a consequence, we can remove the specific code in inet6_connection_sock.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b42664f898c976247f7f609b8bb9c94d7475ca10", "tree": "b98e4d5d57b21d0a9dc8882bdc29e7cc7c6beccf", "parents": [ "2885da72966fcb89f48d554339d347fb02b5ea78" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 10 22:09:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 18 15:57:03 2012 -0400" }, "message": "netns: move net-\u003eipv4.rt_genid to net-\u003ert_genid\n\nThis commit prepares the use of rt_genid by both IPv4 and IPv6.\nInitialization is left in IPv4 part.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bafa6d9d89072c1a18853afe9ee5de05c491c13a", "tree": "d20837ee56043d318a8d9ea4f10085f0c46f81a9", "parents": [ "a1f6d8f771d80ab0beea787aa4f1d02d2eacf22c" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Sep 07 00:45:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 18 15:44:34 2012 -0400" }, "message": "ipv4/route: arg delay is useless in rt_cache_flush()\n\nSince route cache deletion (89aef8921bfbac22f), delay is no\nmore used. Remove it.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed44a951c72ab409f932b1c15914488308e86da2", "tree": "74ee8c115663e2d48d610401dd7f95a8bcd05898", "parents": [ "30d08a46ea2a4e44bc1a1f15f243af29c9150282" ], "author": { "name": "Pandiyarajan Pitchaimuthu", "email": "c_ppitch@qca.qualcomm.com", "time": "Tue Sep 18 16:50:49 2012 +0530" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Sep 18 19:54:06 2012 +0200" }, "message": "cfg80211/nl80211: Notify connection request failure in AP mode\n\nIn AP mode, when a station requests connection to an AP and if the\nrequest is failed for particular reason, userspace is notified about the\nfailure through NL80211_CMD_CONN_FAILED command. Reason for the failure\nis sent through the attribute NL80211_ATTR_CONN_FAILED_REASON.\n\nSigned-off-by: Pandiyarajan Pitchaimuthu \u003cc_ppitch@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "30d08a46ea2a4e44bc1a1f15f243af29c9150282", "tree": "b9090c5281bd2dfedeca405ae1d76d5e7594ec37", "parents": [ "f3baed51f44dd6b6c7076d2de24d8aed291d8130" ], "author": { "name": "Arend van Spriel", "email": "arend@broadcom.com", "time": "Tue Sep 18 10:59:59 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Sep 18 19:54:05 2012 +0200" }, "message": "cfg80211: remove obsolete comment for .sched_scan_stop() callback\n\nThe kerneldoc comment for .sched_scan_stop() callback describes a\ndriver_initiated flag, but the interface does not hold such a flag.\n\nReviewed-by: Franky (Zhenhui) Lin \u003cfrankyl@broadcom.com\u003e\nReviewed-by: Hante Meuleman \u003cmeuleman@broadcom.com\u003e\nSigned-off-by: Arend van Spriel \u003carend@broadcom.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "e1760bd5ffae8cb98cffb030ee8e631eba28f3d8", "tree": "4694a60b407c418bf7de4b97355dc3bd0e6c6559", "parents": [ "ca57ec0f00c3f139c41bf6b0a5b9bcc95bbb2ad7" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Sep 10 22:39:43 2012 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Sep 17 18:08:54 2012 -0700" }, "message": "userns: Convert the audit loginuid to be a kuid\n\nAlways store audit loginuids in type kuid_t.\n\nPrint loginuids by converting them into uids in the appropriate user\nnamespace, and then printing the resulting uid.\n\nModify audit_get_loginuid to return a kuid_t.\n\nModify audit_set_loginuid to take a kuid_t.\n\nModify /proc/\u003cpid\u003e/loginuid on read to convert the loginuid into the\nuser namespace of the opener of the file.\n\nModify /proc/\u003cpid\u003e/loginud on write to convert the loginuid\nrom the user namespace of the opener of the file.\n\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Paul Moore \u003cpaul@paul-moore.com\u003e ?\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "35c448a8a3471b95ebc0ebcf91eb1183401b4274", "tree": "be99b30b7ad761c1bf77e8b6132a98b1959b3c5c", "parents": [ "8ba00bb68a067c221cc3ea3a0293e8fcbdcb7ba1" ], "author": { "name": "Chuck Lever", "email": "chuck.lever@oracle.com", "time": "Mon Sep 17 14:09:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 17 15:00:38 2012 -0700" }, "message": "include/net/sock.h: squelch compiler warning in sk_rmem_schedule()\n\nThis warning:\n\n In file included from linux/include/linux/tcp.h:227:0,\n from linux/include/linux/ipv6.h:221,\n from linux/include/net/ipv6.h:16,\n from linux/include/linux/sunrpc/clnt.h:26,\n from linux/net/sunrpc/stats.c:22:\n linux/include/net/sock.h: In function `sk_rmem_schedule\u0027:\n linux/nfs-2.6/include/net/sock.h:1339:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]\n\nis seen with gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) using the\n-Wextra option.\n\nCommit c76562b6709f (\"netvm: prevent a stream-specific deadlock\")\naccidentally replaced the \"size\" parameter of sk_rmem_schedule() with an\nunsigned int. This changes the semantics of the comparison in the\nreturn statement.\n\nIn sk_wmem_schedule we have syntactically the same comparison, but\n\"size\" is a signed integer. In addition, __sk_mem_schedule() takes a\nsigned integer for its \"size\" parameter, so there is an implicit type\nconversion in sk_rmem_schedule() anyway.\n\nRevert the \"size\" parameter back to a signed integer so that the\nsemantics of the expressions in both sk_[rw]mem_schedule() are exactly\nthe same.\n\nSigned-off-by: Chuck Lever \u003cchuck.lever@oracle.com\u003e\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Joonsoo Kim \u003cjs1304@gmail.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b4516a288e71c64d7e214902250baf78b7b3cdcf", "tree": "2cd3eab88ddd9a5f44c9d88c704a2724f031d7a7", "parents": [ "12ebc8b9af7e29ff4dc77ee0e73a6b1de513d659" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 17 13:13:24 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 17 13:13:24 2012 -0400" }, "message": "llc: Remove stray reference to sysctl_llc_station_ack_timeout.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba01dfe18241bf89b058fd8a60218b218ad2bb30", "tree": "3fabfae4ae740e335c545c8967542f61ed4fd750", "parents": [ "e97563989a609296c3cbf5b6d8c8dc0a3e47b00b", "9316f0e3c6ba524d8fa14bfded048b252891931a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 17 00:57:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 17 00:57:32 2012 -0400" }, "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\nThis is another batch of updates intended for the 3.7 stream.\n\nThere are not a lot of large items, but iwlwifi, mwifiex, rt2x00,\nath9k, and brcmfmac all get some attention. Wei Yongjun also provides\na series of small maintenance fixes.\n\nThis also includes a pull of the wireless tree in order to satisfy\nsome prerequisites for later patches.\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": "7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5", "tree": "08b949c872aefbc0f8e12bdcc4dc82297bdd0f2e", "parents": [ "23666a74c9f552bc9cfef20ded1b8b29bedb80c6", "5698bd757d55b1bb87edd1a9744ab09c142abfc2" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Sep 16 17:31:36 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Sep 16 17:31:36 2012 -0700" }, "message": "Merge 3.6-rc6 into tty-next\n\nThis pulls in the fixes in 3.6-rc6\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "b48b63a1f6e26b0dec2c9f1690396ed4bcb66903", "tree": "8d9ad227c3a7d35cd78d40ecaf9bf59375dbd21a", "parents": [ "7f2e6a5d8608d0353b017a0fe15502307593734e", "3f0c3c8fe30c725c1264fb6db8cc4b69db3a658a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Sep 15 11:43:53 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Sep 15 11:43:53 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/netfilter/nfnetlink_log.c\n\tnet/netfilter/xt_LOG.c\n\nRather easy conflict resolution, the \u0027net\u0027 tree had bug fixes to make\nsure we checked if a socket is a time-wait one or not and elide the\nlogging code if so.\n\nWhereas on the \u0027net-next\u0027 side we are calculating the UID and GID from\nthe creds using different interfaces due to the user namespace changes\nfrom Eric Biederman.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9316f0e3c6ba524d8fa14bfded048b252891931a", "tree": "60326e5943997bb72aaf2a375f8a20c61ec7bbcd", "parents": [ "7f2e6a5d8608d0353b017a0fe15502307593734e", "7a5f799becc51c842ec1a3aeb8dd82651aea7036" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 14 13:53:49 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 14 13:53:49 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "8a8e04df4747661daaee77e98e102d99c9e09b98", "tree": "8ecd4288cfad84ed2bfc1820331b2483e70abfd3", "parents": [ "80f4c87774721e864d5a5a1f7aca3e95fd90e194" ], "author": { "name": "Daniel Wagner", "email": "daniel.wagner@bmw-carit.de", "time": "Wed Sep 12 16:12:07 2012 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 14 09:57:43 2012 -0700" }, "message": "cgroup: Assign subsystem IDs during compile time\n\nWARNING: With this change it is impossible to load external built\ncontrollers anymore.\n\nIn case where CONFIG_NETPRIO_CGROUP\u003dm and CONFIG_NET_CLS_CGROUP\u003dm is\nset, corresponding subsys_id should also be a constant. Up to now,\nnet_prio_subsys_id and net_cls_subsys_id would be of the type int and\nthe value would be assigned during runtime.\n\nBy switching the macro definition IS_SUBSYS_ENABLED from IS_BUILTIN\nto IS_ENABLED, all *_subsys_id will have constant value. That means we\nneed to remove all the code which assumes a value can be assigned to\nnet_prio_subsys_id and net_cls_subsys_id.\n\nA close look is necessary on the RCU part which was introduces by\nfollowing patch:\n\n commit f845172531fb7410c7fb7780b1a6e51ee6df7d52\n Author:\tHerbert Xu \u003cherbert@gondor.apana.org.au\u003e Mon May 24 09:12:34 2010\n Committer:\tDavid S. Miller \u003cdavem@davemloft.net\u003e Mon May 24 09:12:34 2010\n\n cls_cgroup: Store classid in struct sock\n\n Tis code was added to init_cgroup_cls()\n\n\t /* We can\u0027t use rcu_assign_pointer because this is an int. */\n\t smp_wmb();\n\t net_cls_subsys_id \u003d net_cls_subsys.subsys_id;\n\n respectively to exit_cgroup_cls()\n\n\t net_cls_subsys_id \u003d -1;\n\t synchronize_rcu();\n\n and in module version of task_cls_classid()\n\n\t rcu_read_lock();\n\t id \u003d rcu_dereference(net_cls_subsys_id);\n\t if (id \u003e\u003d 0)\n\t\t classid \u003d container_of(task_subsys_state(p, id),\n\t\t\t\t\t struct cgroup_cls_state, css)-\u003eclassid;\n\t rcu_read_unlock();\n\nWithout an explicit explaination why the RCU part is needed. (The\nrcu_deference was fixed by exchanging it to rcu_derefence_index_check()\nin a later commit, but that is a minor detail.)\n\nSo here is my pondering why it was introduced and why it safe to\nremove it now. Note that this code was copied over to net_prio the\nreasoning holds for that subsystem too.\n\nThe idea behind the RCU use for net_cls_subsys_id is to make sure we\nget a valid pointer back from task_subsys_state(). task_subsys_state()\nis just blindly accessing the subsys array and returning the\npointer. Obviously, passing in -1 as id into task_subsys_state()\nreturns an invalid value (out of lower bound).\n\nSo this code makes sure that only after module is loaded and the\nsubsystem registered, the id is assigned.\n\nBefore unregistering the module all old readers must have left the\ncritical section. This is done by assigning -1 to the id and issuing a\nsynchronized_rcu(). Any new readers wont call task_subsys_state()\nanymore and therefore it is safe to unregister the subsystem.\n\nThe new code relies on the same trick, but it looks at the subsys\npointer return by task_subsys_state() (remember the id is constant\nand therefore we allways have a valid index into the subsys\narray).\n\nNo precautions need to be taken during module loading\nmodule. Eventually, all CPUs will get a valid pointer back from\ntask_subsys_state() because rebind_subsystem() which is called after\nthe module init() function will assigned subsys[net_cls_subsys_id] the\nnewly loaded module subsystem pointer.\n\nWhen the subsystem is about to be removed, rebind_subsystem() will\ncalled before the module exit() function. In this case,\nrebind_subsys() will assign subsys[net_cls_subsys_id] a NULL pointer\nand then it calls synchronize_rcu(). All old readers have left by then\nthe critical section. Any new reader wont access the subsystem\nanymore. At this point we are safe to unregister the subsystem. No\nsynchronize_rcu() call is needed.\n\nSigned-off-by: Daniel Wagner \u003cdaniel.wagner@bmw-carit.de\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCc: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: netdev@vger.kernel.org\nCc: cgroups@vger.kernel.org\n" }, { "commit": "51e4e7faba786d33e5e33f8776c5027a1c8d6fb7", "tree": "47d935eca61b5cfe12012117e7460f2814c0d10d", "parents": [ "8fb974c937570be38f944986456467b39a2dc252" ], "author": { "name": "Daniel Wagner", "email": "daniel.wagner@bmw-carit.de", "time": "Wed Sep 12 16:12:03 2012 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 14 09:57:28 2012 -0700" }, "message": "cgroup: net_prio: Do not define task_netpioidx() when not selected\n\ntask_netprioidx() should not be defined in case the configuration is\nCONFIG_NETPRIO_CGROUP\u003dn. The reason is that in a following patch the\nnet_prio_subsys_id will only be defined if CONFIG_NETPRIO_CGROUP!\u003dn.\nWhen net_prio is not built at all any callee should only get an empty\ntask_netprioidx() without any references to net_prio_subsys_id.\n\nSigned-off-by: Daniel Wagner \u003cdaniel.wagner@bmw-carit.de\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCc: netdev@vger.kernel.org\nCc: cgroups@vger.kernel.org\n" }, { "commit": "8fb974c937570be38f944986456467b39a2dc252", "tree": "7da095ab6580e0649544799cf7ad0afb77733013", "parents": [ "f3419807716be503c06f399b2bcbc68823be3a78" ], "author": { "name": "Daniel Wagner", "email": "daniel.wagner@bmw-carit.de", "time": "Wed Sep 12 16:12:02 2012 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 14 09:57:25 2012 -0700" }, "message": "cgroup: net_cls: Do not define task_cls_classid() when not selected\n\ntask_cls_classid() should not be defined in case the configuration is\nCONFIG_NET_CLS_CGROUP\u003dn. The reason is that in a following patch the\nnet_cls_subsys_id will only be defined if CONFIG_NET_CLS_CGROUP!\u003dn.\nWhen net_cls is not built at all a callee should only get an empty\ntask_cls_classid() without any references to net_cls_subsys_id.\n\nSigned-off-by: Daniel Wagner \u003cdaniel.wagner@bmw-carit.de\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCc: netdev@vger.kernel.org\nCc: cgroups@vger.kernel.org\n" }, { "commit": "f3419807716be503c06f399b2bcbc68823be3a78", "tree": "2915c206cfd338883247d0a70b1867b5d57d8bd0", "parents": [ "83b061fc09489fb1b827f65cdca014c37ed224bb" ], "author": { "name": "Daniel Wagner", "email": "daniel.wagner@bmw-carit.de", "time": "Wed Sep 12 16:12:01 2012 +0200" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 14 09:55:57 2012 -0700" }, "message": "cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h\n\nThe only user of sock_update_classid() is net/socket.c which happens\nto include cls_cgroup.h directly.\n\ntj: Fix build breakage due to missing cls_cgroup.h inclusion in\n drivers/net/tun.c reported in linux-next by Stephen.\n\nSigned-off-by: Daniel Wagner \u003cdaniel.wagner@bmw-carit.de\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCc: netdev@vger.kernel.org\nCc: cgroups@vger.kernel.org\n" }, { "commit": "15e473046cb6e5d18a4d0057e61d76315230382b", "tree": "893d2df5d46a6ce156933ac57a1398f0ad22b889", "parents": [ "9f00d9776bc5beb92e8bfc884a7e96ddc5589e2e" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Sep 07 20:12:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 10 15:30:41 2012 -0400" }, "message": "netlink: Rename pid to portid to avoid confusion\n\nIt is a frequent mistake to confuse the netlink port identifier with a\nprocess identifier. Try to reduce this confusion by renaming fields\nthat hold port identifiers portid instead of pid.\n\nI have carefully avoided changing the structures exported to\nuserspace to avoid changing the userspace API.\n\nI have successfully built an allyesconfig kernel with this change.\n\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e548c49e6dc6b08b59042930a2e90c69c13c9293", "tree": "76973d2c36413b68fe646fedefd7d58c41645fff", "parents": [ "2cc59e784b54fb95accbd5f5a9d12041eec72dbc" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Sep 04 17:08:23 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Sep 10 11:29:17 2012 +0200" }, "message": "mac80211: add key flag for management keys\n\nMark keys that might be used to receive management\nframes so drivers can fall back on software crypto\nfor them if they don\u0027t support hardware offload.\nAs the new flag is only set correctly for RX keys\nand the existing IEEE80211_KEY_FLAG_SW_MGMT flag\ncan only affect TX, also rename the latter to\nIEEE80211_KEY_FLAG_SW_MGMT_TX.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "376261ae3627b03574994496f70f95d5538795d5", "tree": "3548e4938d2e72a166cd8c06d5d6a5d9f1694810", "parents": [ "93f71941c6d3ead73ca74d447b4007c6908f6eb5" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@intel.com", "time": "Thu Sep 06 15:05:45 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Sat Sep 08 18:06:10 2012 -0300" }, "message": "Bluetooth: debug: Print refcnt for hci_dev\n\nAdd debug output for HCI kref.\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "9472007c62ecc8f21daa2e1e252bf73b67e535fc", "tree": "6e6cd3ff8ba4f9bf4e591a8acc27e13a8ef6031b", "parents": [ "6b536b5e5e1da32f3ba1e3f42c7bf2f80d37dc6b" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@intel.com", "time": "Thu Sep 06 15:05:43 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Sat Sep 08 17:27:18 2012 -0300" }, "message": "Bluetooth: trivial: Make hci_chan_del return void\n\nReturn code is not needed in hci_chan_del\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "6b536b5e5e1da32f3ba1e3f42c7bf2f80d37dc6b", "tree": "3ee798ccf9f41e54a8fd35c30fc63d8388f80f1d", "parents": [ "7923296f3f9eebbe3d7bb4c99d73bd7a226e0146" ], "author": { "name": "Andrei Emeltchenko", "email": "andrei.emeltchenko@intel.com", "time": "Fri Aug 31 16:39:28 2012 +0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Sat Sep 08 16:53:48 2012 -0300" }, "message": "Bluetooth: Remove unneeded zero init\n\nhdev is allocated with kzalloc so zero initialization is not needed.\n\nSigned-off-by: Andrei Emeltchenko \u003candrei.emeltchenko@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "fac805f8c198092de9a2842efd7f5022e2937b18", "tree": "7557809c373f97a343c427d8fded0696060394ce", "parents": [ "2461c7d60f9f3821274e4acf9019cba8b82c94b5", "f10723841e624c0726c70356b31d91befed01dd6" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 07 15:07:55 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 07 15:07:55 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "4a3e12fd7a106bdf092704ea10ff463d2309213a", "tree": "302f2f1c7cd7c370719fe5a69371c1f5a6a87157", "parents": [ "a4881cc45a3fab4488e16c4934e149cfa620f1a9", "768be59f30f2ee8958ba3718101162c694efab12" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 07 14:49:46 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 07 14:49:46 2012 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "4ccfe6d4109252dfadcd6885f33ed600ee03dbf8", "tree": "502f7189a3619ecb464eb523bc877c2329dc7b56", "parents": [ "dbe9a4173ea53b72b2c35d19f676a85b69f1c9fe" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Sep 07 00:45:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 07 14:44:08 2012 -0400" }, "message": "ipv4/route: arg delay is useless in rt_cache_flush()\n\nSince route cache deletion (89aef8921bfbac22f), delay is no\nmore used. Remove it.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbe9a4173ea53b72b2c35d19f676a85b69f1c9fe", "tree": "49952d501032a2bc303d1d646ec6b1f00773b266", "parents": [ "d679c5324d9a87c6295f56c2dea52d5f68834f41" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Sep 06 18:20:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 07 14:42:05 2012 -0400" }, "message": "scm: Don\u0027t use struct ucred in NETLINK_CB and struct scm_cookie.\n\nPassing uids and gids on NETLINK_CB from a process in one user\nnamespace to a process in another user namespace can result in the\nwrong uid or gid being presented to userspace. Avoid that problem by\npassing kuids and kgids instead.\n\n- define struct scm_creds for use in scm_cookie and netlink_skb_parms\n that holds uid and gid information in kuid_t and kgid_t.\n\n- Modify scm_set_cred to fill out scm_creds by heand instead of using\n cred_to_ucred to fill out struct ucred. This conversion ensures\n userspace does not get incorrect uid or gid values to look at.\n\n- Modify scm_recv to convert from struct scm_creds to struct ucred\n before copying credential values to userspace.\n\n- Modify __scm_send to populate struct scm_creds on in the scm_cookie,\n instead of just copying struct ucred from userspace.\n\n- Modify netlink_sendmsg to copy scm_creds instead of struct ucred\n into the NETLINK_CB.\n\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "777bf135b77071672662c67f0abffcf433450d68", "tree": "80cfe20e5ff5a3f1297c2ef86427c9bba93a8bce", "parents": [ "b8dfc6a0a7235aed452c0e376b6feff182a86992", "f10723841e624c0726c70356b31d91befed01dd6" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 07 13:33:27 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 07 14:38:50 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\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\nPlease pull these fixes intended for 3.6. There are more commits\nhere than I would like -- I got a bit behind while I was stalking\nSteven Rostedt in San Diego last week... I\u0027ll slow it down after this!\n\nThere are a couple of pulls here. One is from Johannes:\n\n\"Please pull (according to the below information) to get a few fixes.\n\n * a fix to properly disconnect in the driver when authentication or\n association fails\n * a fix to prevent invalid information about mesh paths being reported\n to userspace\n * a memory leak fix in an nl80211 error path\"\n\nThe other comes via Gustavo:\n\n\"A few updates for the 3.6 kernel. There are two btusb patches to add\nmore supported devices through the new USB_VENDOR_AND_INTEFACE_INFO()\nmacro and another one that add a new device id for a Sony Vaio laptop,\none fix for a user-after-free and, finally, two patches from Vinicius\nto fix a issue in SMP pairing.\"\n\nAlong with those...\n\nArend van Spriel provides a fix for a use-after-free bug in brcmfmac.\n\nDaniel Drake avoids a hang by not trying to touch the libertas hardware\nduing suspend if it is already powered-down.\n\nFelix Fietkau provides a batch of ath9k fixes that adress some\npotential problems with power settings, as well as a fix to avoid a\npotential interrupt storm.\n\nGertjan van Wingerde provides a register-width fix for rt2x00, and\na rt2x00 fix to prevent incorrectly detecting the rfkill status.\nHe also provides a device ID patch.\n\nHante Meuleman gives us three brcmfmac fixes, one that properly\ninitializes a command structure, one that fixes a race condition that\ncould lose usb requests, and one that removes some log spam.\n\nMarc Kleine-Budde offers an rt2x00 fix for a voltage setting on some\nspecific devices.\n\nMohammed Shafi Shajakhan sent an ath9k fix to avoid a crash related to\nusing timers that aren\u0027t allocated when 2 wire bluetooth coexistence\nhardware is in use.\n\nSergei Poselenov changes rt2800usb to do some validity checking for\nreceived packets, avoiding crashes on an ARM Soc.\n\nStone Piao gives us an mwifiex fix for an incorrectly set skb length\nvalue for a command buffer.\n\nAll of these are localized to their specific drivers, and relatively\nsmall. The power-related patches from Felix are bigger than I would\nlike, but I merged them in consideration of their isolation to ath9k\nand the sensitive nature of power settings in wireless devices.\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": "00b14825eead7dd748d15ce6519726d06b3ee0d5", "tree": "e771e6dcde53b65a1d438dfabbe8cb4e7402e334", "parents": [ "882a7c69d3c605bfacf32e19033447dc70204d45", "a4881cc45a3fab4488e16c4934e149cfa620f1a9" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Sep 06 17:05:28 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Sep 06 17:05:28 2012 +0200" }, "message": "Merge remote-tracking branch \u0027wireless-next/master\u0027 into mac80211-next\n" }, { "commit": "944b9e375d89271c39995d363f62cb91734fae5f", "tree": "bd6014bd0be251cdf2b32b12ca8a62e55742c0ee", "parents": [ "a4ed53466a289a4139405bf7190c78a8e9d8debf", "7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Sep 06 15:55:50 2012 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Sep 06 15:56:02 2012 +0200" }, "message": "Merge remote-tracking branch \u0027mac80211/master\u0027 into mac80211-next\n\nPull in mac80211.git to let the next patch apply\nwithout conflicts, also resolving a hwsim conflict.\n\nConflicts:\n\tdrivers/net/wireless/mac80211_hwsim.c\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "ef2c7d7b59708d54213c7556a82d14de9a7e4475", "tree": "ffbcd9a25aeeef8e73faf8650605abb2dcdb6fb4", "parents": [ "d6b6d987787876fd381bfeda310c6682d425c0a2" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Sep 05 02:12:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 05 17:49:28 2012 -0400" }, "message": "ipv6: fix handling of blackhole and prohibit routes\n\nWhen adding a blackhole or a prohibit route, they were handling like classic\nroutes. Moreover, it was only possible to add this kind of routes by specifying\nan interface.\n\nBug already reported here:\n http://bugs.debian.org/cgi-bin/bugreport.cgi?bug\u003d498498\n\nBefore the patch:\n $ ip route add blackhole 2001::1/128\n RTNETLINK answers: No such device\n $ ip route add blackhole 2001::1/128 dev eth0\n $ ip -6 route | grep 2001\n 2001::1 dev eth0 metric 1024\n\nAfter:\n $ ip route add blackhole 2001::1/128\n $ ip -6 route | grep 2001\n blackhole 2001::1 dev lo metric 1024 error -22\n\nv2: wrong patch\nv3: add a field fc_type in struct fib6_config to store RTN_* type\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9a0a3025262c6395ac1464999cade56cddac3d6", "tree": "95353c4687ca2629960a1aa8d76c4decac5ba4fe", "parents": [ "00a9ac4c014e19fb9ceb70a28406fd962df5b8a7" ], "author": { "name": "Robert P. J. Day", "email": "rpjday@crashcourse.ca", "time": "Sun Aug 26 14:21:47 2012 -0400" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Sep 05 15:54:07 2012 +0200" }, "message": "cfg80211: add kerneldoc entry for \"vht_cap\"\n\nSigned-off-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "3b59df46a449ec9975146d71318c4777ad086744", "tree": "8ba7e6186ef90c4bffe553504c33f40054704f94", "parents": [ "37159ef2c1ae1e696b24b260b241209a19f92c60" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Tue Sep 04 00:03:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 04 14:09:45 2012 -0400" }, "message": "xfrm: Workaround incompatibility of ESN and async crypto\n\nESN for esp is defined in RFC 4303. This RFC assumes that the\nsequence number counters are always up to date. However,\nthis is not true if an async crypto algorithm is employed.\n\nIf the sequence number counters are not up to date on sequence\nnumber check, we may incorrectly update the upper 32 bit of\nthe sequence number. This leads to a DOS.\n\nWe workaround this by comparing the upper sequence number,\n(used for authentication) with the upper sequence number\ncomputed after the async processing. We drop the packet\nif these numbers are different.\n\nTo do this, we introduce a recheck function that does this\ncheck in the ESN case.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1e9f0207d3e63fab7a0f8a0e532bdc73ea850baf", "tree": "a5b05cb2371a01d2208ebbae63df63b3e6dcbcc2", "parents": [ "684bad1107571d35610a674c61b3544efb5a5b13", "ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 03 20:26:45 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 03 20:26:45 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/nf-next\n" }, { "commit": "684bad1107571d35610a674c61b3544efb5a5b13", "tree": "aba9dc4a825ac3c454d9058f0bec0829f2b6df69", "parents": [ "fb4d3d1df31907eadd2e2a745e840921888b346a" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Sun Sep 02 17:38:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 03 14:34:02 2012 -0400" }, "message": "tcp: use PRR to reduce cwin in CWR state\n\nUse proportional rate reduction (PRR) algorithm to reduce cwnd in CWR state,\nin addition to Recovery state. Retire the current rate-halving in CWR.\nWhen losses are detected via ACKs in CWR state, the sender enters Recovery\nstate but the cwnd reduction continues and does not restart.\n\nRename and refactor cwnd reduction functions since both CWR and Recovery\nuse the same algorithm:\ntcp_init_cwnd_reduction() is new and initiates reduction state variables.\ntcp_cwnd_reduction() is previously tcp_update_cwnd_in_recovery().\ntcp_ends_cwnd_reduction() is previously tcp_complete_cwr().\n\nThe rate halving functions and logic such as tcp_cwnd_down(), tcp_min_cwnd(),\nand the cwnd moderation inside tcp_enter_cwr() are removed. The unused\nparameter, flag, in tcp_cwnd_reduction() is also removed.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd", "tree": "06c7492a8f3cc65f916768616ca24c6bc7171761", "parents": [ "ce9f3f31efb88841e4df98794b13dbac8c4901da", "a2dc375e12334b3d8f787a48b2fb6172ccfb80ae" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Sep 03 15:28:30 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Sep 03 15:34:51 2012 +0200" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nThis merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling\nof EBUSY for RTCP expectation) to Patrick McHardy\u0027s IPv6 NAT changes.\n" }, { "commit": "84b5ee939eba0115739c19c0e01ea903b029c9da", "tree": "5eeab865d1af6d79f5de6ecb6a86cfc449c2c67a", "parents": [ "236df005614bea6a2f9afa9867e3bdfc206c6291" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Aug 28 00:53:15 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Sep 03 13:33:03 2012 +0200" }, "message": "netfilter: nf_conntrack: add nf_ct_timeout_lookup\n\nThis patch adds the new nf_ct_timeout_lookup function to encapsulate\nthe timeout policy attachment that is called in the nf_conntrack_in\npath.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8336886f786fdacbc19b719c1f7ea91eb70706d4", "tree": "c1fa912f7583ce0ffcb5ae673802da4a7dfb3b19", "parents": [ "1046716368979dee857a2b8a91c4a8833f21b9cb" ], "author": { "name": "Jerry Chu", "email": "hkchu@google.com", "time": "Fri Aug 31 12:29:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 20:02:19 2012 -0400" }, "message": "tcp: TCP Fast Open Server - support TFO listeners\n\nThis patch builds on top of the previous patch to add the support\nfor TFO listeners. This includes -\n\n1. allocating, properly initializing, and managing the per listener\nfastopen_queue structure when TFO is enabled\n\n2. changes to the inet_csk_accept code to support TFO. E.g., the\nrequest_sock can no longer be freed upon accept(), not until 3WHS\nfinishes\n\n3. allowing a TCP_SYN_RECV socket to properly poll() and sendmsg()\nif it\u0027s a TFO socket\n\n4. properly closing a TFO listener, and a TFO socket before 3WHS\nfinishes\n\n5. supporting TCP_FASTOPEN socket option\n\n6. modifying tcp_check_req() to use to check a TFO socket as well\nas request_sock\n\n7. supporting TCP\u0027s TFO cookie option\n\n8. adding a new SYN-ACK retransmit handler to use the timer directly\noff the TFO socket rather than the listener socket. Note that TFO\nserver side will not retransmit anything other than SYN-ACK until\nthe 3WHS is completed.\n\nThe patch also contains an important function\n\"reqsk_fastopen_remove()\" to manage the somewhat complex relation\nbetween a listener, its request_sock, and the corresponding child\nsocket. See the comment above the function for the detail.\n\nSigned-off-by: H.K. Jerry Chu \u003chkchu@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1046716368979dee857a2b8a91c4a8833f21b9cb", "tree": "fdda70278e6fa56c27d242fb1a0ec9b7e3e81d38", "parents": [ "2a35cfa591ac63f17815c2d9432b799e37527980" ], "author": { "name": "Jerry Chu", "email": "hkchu@google.com", "time": "Fri Aug 31 12:29:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 20:02:18 2012 -0400" }, "message": "tcp: TCP Fast Open Server - header \u0026 support functions\n\nThis patch adds all the necessary data structure and support\nfunctions to implement TFO server side. It also documents a number\nof flags for the sysctl_tcp_fastopen knob, and adds a few Linux\nextension MIBs.\n\nIn addition, it includes the following:\n\n1. a new TCP_FASTOPEN socket option an application must call to\nsupply a max backlog allowed in order to enable TFO on its listener.\n\n2. A number of key data structures:\n\"fastopen_rsk\" in tcp_sock - for a big socket to access its\nrequest_sock for retransmission and ack processing purpose. It is\nnon-NULL iff 3WHS not completed.\n\n\"fastopenq\" in request_sock_queue - points to a per Fast Open\nlistener data structure \"fastopen_queue\" to keep track of qlen (# of\noutstanding Fast Open requests) and max_qlen, among other things.\n\n\"listener\" in tcp_request_sock - to point to the original listener\nfor book-keeping purpose, i.e., to maintain qlen against max_qlen\nas part of defense against IP spoofing attack.\n\n3. various data structure and functions, many in tcp_fastopen.c, to\nsupport server side Fast Open cookie operations, including\n/proc/sys/net/ipv4/tcp_fastopen_key to allow manual rekeying.\n\nSigned-off-by: H.K. Jerry Chu \u003chkchu@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c9ff979d1921e9fd05d89e1383121c2503759b9", "tree": "410b5538e913215285e83e88c1392f307e9799d6", "parents": [ "c32f38619af6302da58835fb292b159bdd96d11f" ], "author": { "name": "Alex Bergmann", "email": "alex@linlab.net", "time": "Fri Aug 31 02:48:31 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 15:42:10 2012 -0400" }, "message": "tcp: Increase timeout for SYN segments\n\nCommit 9ad7c049 (\"tcp: RFC2988bis + taking RTT sample from 3WHS for\nthe passive open side\") changed the initRTO from 3secs to 1sec in\naccordance to RFC6298 (former RFC2988bis). This reduced the time till\nthe last SYN retransmission packet gets sent from 93secs to 31secs.\n\nRFC1122 is stating that the retransmission should be done for at least 3\nminutes, but this seems to be quite high.\n\n \"However, the values of R1 and R2 may be different for SYN\n and data segments. In particular, R2 for a SYN segment MUST\n be set large enough to provide retransmission of the segment\n for at least 3 minutes. The application can close the\n connection (i.e., give up on the open attempt) sooner, of\n course.\"\n\nThis patch increases the value of TCP_SYN_RETRIES to the value of 6,\nproviding a retransmission window of 63secs.\n\nThe comments for SYN and SYNACK retries have also been updated to\ndescribe the current settings. The same goes for the documentation file\n\"Documentation/networking/ip-sysctl.txt\".\n\nSigned-off-by: Alexander Bergmann \u003calex@linlab.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c32f38619af6302da58835fb292b159bdd96d11f", "tree": "a5bb4a9c51999557eaa919f27369c70811cd813c", "parents": [ "761743ebc92df72053e736fce953a5d2e90099d5", "0dcd5052c8543ef999bcd252cee50b7ae8111e89" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 15:14:10 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 15:14:18 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nMerge the \u0027net\u0027 tree to get the recent set of netfilter bug fixes in\norder to assist with some merge hassles Pablo is going to have to deal\nwith for upcoming changes.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0dcd5052c8543ef999bcd252cee50b7ae8111e89", "tree": "1b10a35334ec660f8fe021ce9cdeb08bb65fc839", "parents": [ "14a15d618743ebc4936fe03073bf0c75024d3a07", "5b423f6a40a0327f9d40bc8b97ce9be266f74368" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 13:06:37 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 31 13:06:37 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/nf\n" }, { "commit": "5b423f6a40a0327f9d40bc8b97ce9be266f74368", "tree": "f71b7726f6501993bc7be9d4d7e6e69d7cd095b2", "parents": [ "3f509c689a07a4aa989b426893d8491a7ffcc410" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 29 16:25:49 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Aug 31 15:50:28 2012 +0200" }, "message": "netfilter: nf_conntrack: fix racy timer handling with reliable events\n\nExisting code assumes that del_timer returns true for alive conntrack\nentries. However, this is not true if reliable events are enabled.\nIn that case, del_timer may return true for entries that were\njust inserted in the dying list. Note that packets / ctnetlink may\nhold references to conntrack entries that were just inserted to such\nlist.\n\nThis patch fixes the issue by adding an independent timer for\nevent delivery. This increases the size of the ecache extension.\nStill we can revisit this later and use variable size extensions\nto allocate this area on demand.\n\nTested-by: Oliver Smith \u003colipro@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "b3f644fc8232ca761da0b5c5ccb6f30b423c4302", "tree": "6141514d1bb2046c90f66e93234c3494e658e04c", "parents": [ "58a317f1061c894d2344c0b6a18ab4a64b69b815" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:14:14 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Aug 30 03:00:18 2012 +0200" }, "message": "netfilter: ip6tables: add MASQUERADE target\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "58a317f1061c894d2344c0b6a18ab4a64b69b815", "tree": "0e8c4dd2a74cff86cedca36de278e3eb42f939bd", "parents": [ "2cf545e835aae92173ef0b1f4af385e9c40f21e8" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:14:12 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Aug 30 03:00:17 2012 +0200" }, "message": "netfilter: ipv6: add IPv6 NAT support\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "2cf545e835aae92173ef0b1f4af385e9c40f21e8", "tree": "b03bf5a155eed859a9852922a4311340a598c725", "parents": [ "0ad352cb433ed2b05921a32b5ee20410512e2320" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:14:10 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Aug 30 03:00:16 2012 +0200" }, "message": "net: core: add function for incremental IPv6 pseudo header checksum updates\n\nAdd inet_proto_csum_replace16 for incrementally updating IPv6 pseudo header\nchecksums for IPv6 NAT.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7232c9979cba684c50b64c513c4a83c9aa70563", "tree": "dbe0fdac62191d85935f5a3dfe815c1b1add60f9", "parents": [ "051966c0c644a1c96092d4206e00704ade813c9a" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:14:06 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Aug 30 03:00:14 2012 +0200" }, "message": "netfilter: add protocol independent NAT core\n\nConvert the IPv4 NAT implementation to a protocol independent core and\naddress family specific modules.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "051966c0c644a1c96092d4206e00704ade813c9a", "tree": "9ca8005f3e2a91cbd710b1f2eb52f49bf5f19f84", "parents": [ "811927ccfe90fbfcfff5253ba7f95057f6cae692" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:14:04 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Aug 30 03:00:13 2012 +0200" }, "message": "netfilter: nf_nat: add protoff argument to packet mangling functions\n\nFor mangling IPv6 packets the protocol header offset needs to be known\nby the NAT packet mangling functions. Add a so far unused protoff argument\nand convert the conntrack and NAT helpers to use it in preparation of\nIPv6 NAT.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "cc110922da7e902b62d18641a370fec01a9fa794", "tree": "3629d8b4b5197d50604ff0177eb77de96f0a9f99", "parents": [ "1fa6535faf055cd71311ab887e94fc234f04ee18" ], "author": { "name": "Vinicius Costa Gomes", "email": "vinicius.gomes@openbossa.org", "time": "Thu Aug 23 21:32:43 2012 -0300" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Mon Aug 27 08:07:18 2012 -0700" }, "message": "Bluetooth: Change signature of smp_conn_security()\n\nTo make it clear that it may be called from contexts that may not have\nany knowledge of L2CAP, we change the connection parameter, to receive\na hci_conn.\n\nThis also makes it clear that it is checking the security of the link.\n\nSigned-off-by: Vinicius Costa Gomes \u003cvinicius.gomes@openbossa.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "e372dc6c62bf0246a07f3291a26c562cc8659fbd", "tree": "c7039c1d1005b80e427761ba768d7697ae4a0b72", "parents": [ "5d4121c04b3577e37e389b3553d442f44bb346d7", "fea7a08acb13524b47711625eebea40a0ede69a0" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Aug 27 07:13:33 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Aug 27 07:13:33 2012 -0700" }, "message": "Merge 3.6-rc3 into tty-next\n\nThis picks up all of the different fixes in Linus\u0027s tree that we also need here.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "5f2d04f1f9b52604fca6ee08a77972c0df67e082", "tree": "f4caa0aa602f6044f1fc20c6dfa89527183803d1", "parents": [ "0fa7fa98dbcc2789409ed24e885485e645803d7f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:13:55 2012 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Aug 26 19:13:55 2012 +0200" }, "message": "ipv4: fix path MTU discovery with connection tracking\n\nIPv4 conntrack defragments incoming packet at the PRE_ROUTING hook and\n(in case of forwarded packets) refragments them at POST_ROUTING\nindependent of the IP_DF flag. Refragmentation uses the dst_mtu() of\nthe local route without caring about the original fragment sizes,\nthereby breaking PMTUD.\n\nThis patch fixes this by keeping track of the largest received fragment\nwith IP_DF set and generates an ICMP fragmentation required error during\nrefragmentation if that size exceeds the MTU.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6acb384807406c1a6ad3ddc91191f7658e63b7a", "tree": "7906d1bb402ac30e4efaa1bc6451b1c7a4b6e768", "parents": [ "255e87657a84e21986e5d9070f3dee4aa8d1d531", "898132ae76d1aeb52301f10e8795c34fbb54e853" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 24 18:54:37 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 24 18:54:37 2012 -0400" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nThis is an initial merge in of Eric Biederman\u0027s work to start adding\nuser namespace support to the networking.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f20b6213f193f455a62ef9299ceca11f5531dff8", "tree": "737a14af45038252fc0e3863d62dde09432cd779", "parents": [ "e6e94e392fddb8845bdd2e199f55ebf7d76cb58d", "a4881cc45a3fab4488e16c4934e149cfa620f1a9" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 24 12:25:30 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 24 12:25:30 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "f63c45e0e63fd1bccb6d021fe4de20f82114a024", "tree": "cf77ba24a9ddac69f962f9f18ba2fff4c9fae5a2", "parents": [ "748e2d9396a18c3fd3d07d47c1b41320acf1fbf4" ], "author": { "name": "Rami Rosen", "email": "rosenr@marvell.com", "time": "Thu Aug 23 02:55:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 23 09:29:45 2012 -0700" }, "message": "packet: fix broken build.\n\nThis patch fixes a broken build due to a missing header:\n...\n CC net/ipv4/proc.o\nIn file included from include/net/net_namespace.h:15,\n from net/ipv4/proc.c:35:\ninclude/net/netns/packet.h:11: error: field \u0027sklist_lock\u0027 has incomplete type\n...\n\nThe lock of netns_packet has been replaced by a recent patch to be a mutex instead of a spinlock,\nbut we need to replace the header file to be linux/mutex.h instead of linux/spinlock.h as well.\n\nSee commit 0fa7fa98dbcc2789409ed24e885485e645803d7f:\npacket: Protect packet sk list with mutex (v2) patch,\n\nSigned-off-by: Rami Rosen \u003crosenr@marvell.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0fa7fa98dbcc2789409ed24e885485e645803d7f", "tree": "30a9b851fdee3b01a64f5ee07940224d089d31de", "parents": [ "b32607dd47d456b99f0a16f1c37bc8a0975ffb19" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Aug 21 01:06:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 22 22:58:27 2012 -0700" }, "message": "packet: Protect packet sk list with mutex (v2)\n\nChange since v1:\n\n* Fixed inuse counters access spotted by Eric\n\nIn patch eea68e2f (packet: Report socket mclist info via diag module) I\u0027ve\nintroduced a \"scheduling in atomic\" problem in packet diag module -- the\nsocket list is traversed under rcu_read_lock() while performed under it sk\nmclist access requires rtnl lock (i.e. -- mutex) to be taken.\n\n[152363.820563] BUG: scheduling while atomic: crtools/12517/0x10000002\n[152363.820573] 4 locks held by crtools/12517:\n[152363.820581] #0: (sock_diag_mutex){+.+.+.}, at: [\u003cffffffff81a2dcb5\u003e] sock_diag_rcv+0x1f/0x3e\n[152363.820613] #1: (sock_diag_table_mutex){+.+.+.}, at: [\u003cffffffff81a2de70\u003e] sock_diag_rcv_msg+0xdb/0x11a\n[152363.820644] #2: (nlk-\u003ecb_mutex){+.+.+.}, at: [\u003cffffffff81a67d01\u003e] netlink_dump+0x23/0x1ab\n[152363.820693] #3: (rcu_read_lock){.+.+..}, at: [\u003cffffffff81b6a049\u003e] packet_diag_dump+0x0/0x1af\n\nSimilar thing was then re-introduced by further packet diag patches (fanount\nmutex and pgvec mutex for rings) :(\n\nApart from being terribly sorry for the above, I propose to change the packet\nsk list protection from spinlock to mutex. This lock currently protects two\nmodifications:\n\n* sklist\n* prot inuse counters\n\nThe sklist modifications can be just reprotected with mutex since they already\noccur in a sleeping context. The inuse counters modifications are trickier -- the\n__this_cpu_-s are used inside, thus requiring the caller to handle the potential\nissues with contexts himself. Since packet sockets\u0027 counters are modified in two\nplaces only (packet_create and packet_release) we only need to protect the context\nfrom being preempted. BH disabling is not required in this case.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf277b0ccea7d2422b85e232017ce3fddbe9c49c", "tree": "252232255b8a6024eccf2fea668bb89de5ae3073", "parents": [ "bba6ec7e4963e30366359686f34e5bdb00b1a066", "90efbed18a30d78145419cdbd44f9ec152efeb16" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 22 18:48:21 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 22 18:48:52 2012 -0700" }, "message": "Merge git://1984.lsi.us.es/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\nThis is the first batch of Netfilter and IPVS updates for your\nnet-next tree. Mostly cleanups for the Netfilter side. They are:\n\n* Remove unnecessary RTNL locking now that we have support\n for namespace in nf_conntrack, from Patrick McHardy.\n\n* Cleanup to eliminate unnecessary goto in the initialization\n path of several Netfilter tables, from Jean Sacren.\n\n* Another cleanup from Wu Fengguang, this time to PTR_RET instead\n of if IS_ERR then return PTR_ERR.\n\n* Use list_for_each_entry_continue_rcu in nf_iterate, from\n Michael Wang.\n\n* Add pmtu_disc sysctl option to disable PMTU in their tunneling\n transmitter, from Julian Anastasov.\n\n* Generalize application protocol registration in IPVS and modify\n IPVS FTP helper to use it, from Julian Anastasov.\n\n* update Kconfig. The IPVS FTP helper depends on the Netfilter FTP\n helper for NAT support, from Julian Anastasov.\n\n* Add logic to update PMTU for IPIP packets in IPVS, again\n from Julian Anastasov.\n\n* A couple of sparse warning fixes for IPVS and Netfilter from\n Claudiu Ghioc and Patrick McHardy respectively.\n\nPatrick\u0027s IPv6 NAT changes will follow after this batch, I need\nto flush this batch first before refreshing my tree.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "1304a7343b30fc4f16045412efdbb4179a3d9255" }