)]}' { "log": [ { "commit": "70c33eaae79e53f9e48324736c0cb85534d3f093", "tree": "103c59d0356e55341052adca0624b6256525ddbb", "parents": [ "b91e64aad2c78b0477b9eb3a26335668b4032002" ], "author": { "name": "Ashok Nagarajan", "email": "ashok@cozybit.com", "time": "Mon Apr 30 14:20:32 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 08 21:53:59 2012 -0400" }, "message": "{nl,cfg,mac}80211: Allow user to see/configure HT protection mode\n\nThis patch introduces a new mesh configuration parameter \"ht_opmode\" and will\nallow user to check the current HT protection mode selected. Users could\nconfigure the protection mode by the command \"iw mesh_iface set mesh_param\nmesh_ht_protection_mode\u003d2\". The default protection mode of mesh is set to\nnon-HT mixed mode.\n\nSigned-off-by: Ashok Nagarajan \u003cashok@cozybit.com\u003e\nReviewed-by: Thomas Pedersen \u003cthomas@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9bb862beb6e5839e92f709d33fda07678f062f20", "tree": "a2c396712c5a2cda380034173fd07a67bfa0489f", "parents": [ "b44907e64cc1987153f6577306108379be1523b7", "d16cf20e2f2f13411eece7f7fb72c17d141c4a84" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 14:40:21 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 14:40:21 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-next\n" }, { "commit": "d16cf20e2f2f13411eece7f7fb72c17d141c4a84", "tree": "8154b3db8cdbb4b8d9f35d4c407cfe961253f0b4", "parents": [ "6714cf5465d2803a21c6a46c1ea747795a8889fa" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:45:28 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 20:25:42 2012 +0200" }, "message": "netfilter: remove ip_queue support\n\nThis patch removes ip_queue support which was marked as obsolete\nyears ago. The nfnetlink_queue modules provides more advanced\nuser-space packet queueing mechanism.\n\nThis patch also removes capability code included in SELinux that\nrefers to ip_queue. Otherwise, we break compilation.\n\nSeveral warning has been sent regarding this to the mailing list\nin the past month without anyone rising the hand to stop this\nwith some strong argument.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "6714cf5465d2803a21c6a46c1ea747795a8889fa", "tree": "eccfd714c4d320f4724e15e59b964ddd487e8f09", "parents": [ "9768e1ace458fa4ebf88bc3943fd8fb77113ed9c" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu May 03 02:17:45 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:44:42 2012 +0200" }, "message": "netfilter: nf_conntrack: fix explicit helper attachment and NAT\n\nExplicit helper attachment via the CT target is broken with NAT\nif non-standard ports are used. This problem was hidden behind\nthe automatic helper assignment routine. Thus, it becomes more\nnoticeable now that we can disable the automatic helper assignment\nwith Eric Leblond\u0027s:\n\n9e8ac5a netfilter: nf_ct_helper: allow to disable automatic helper assignment\n\nBasically, nf_conntrack_alter_reply asks for looking up the helper\nup if NAT is enabled. Unfortunately, we don\u0027t have the conntrack\ntemplate at that point anymore.\n\nSince we don\u0027t want to rely on the automatic helper assignment,\nwe can skip the second look-up and stick to the helper that was\nattached by iptables. With the CT target, the user is in full\ncontrol of helper attachment, thus, the policy is to trust what\nthe user explicitly configures via iptables (no automatic magic\nanymore).\n\nInterestingly, this bug was hidden by the automatic helper look-up\ncode. But it can be easily trigger if you attach the helper in\na non-standard port, eg.\n\niptables -I PREROUTING -t raw -p tcp --dport 8888 \\\n\t-j CT --helper ftp\n\nAnd you disabled the automatic helper assignment.\n\nI added the IPS_HELPER_BIT that allows us to differenciate between\na helper that has been explicitly attached and those that have been\nautomatically assigned. I didn\u0027t come up with a better solution\n(having backward compatibility in mind).\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "cdcc5e905d59026fbf2e7f74f9cc834203b6207b", "tree": "3f8c6440384a2d0e753d35f51e344269953a986a", "parents": [ "882a844bd5b3ffa35e059f21ee920cc113985a89" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Tue Apr 24 23:46:38 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 08 19:38:31 2012 +0200" }, "message": "ipvs: always update some of the flags bits in backup\n\n\tAs the goal is to mirror the inactconns/activeconns\ncounters in the backup server, make sure the cp-\u003eflags are\nupdated even if cp is still not bound to dest. If cp-\u003eflags\nare not updated ip_vs_bind_dest will rely only on the initial\nflags when updating the counters. To avoid mistakes and\ncomplicated checks for protocol state rely only on the\nIP_VS_CONN_F_INACTIVE bit when updating the counters.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nTested-by: Aleksey Chudov \u003caleksey.chudov@gmail.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "b44907e64cc1987153f6577306108379be1523b7", "tree": "09ec9814903e61a85f51de0249f65e1a25f40aa4", "parents": [ "97138a1ca7917c11431293e668457f916a610ca5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue May 08 06:44:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 13:06:16 2012 -0400" }, "message": "etherdev.h: Convert int is_\u003cfoo\u003e_ether_addr to bool\n\nMake the return value explicitly true or false.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d6c4a2e4641bbc556dd74d3aa158c413a972492", "tree": "da944af17682659bb433dc2282dcb48380c14cd1", "parents": [ "6e06c0e2347ec79d0bd5702b2438fe883f784545", "1c430a727fa512500a422ffe4712166c550ea06a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:35:40 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 23:35:40 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/intel/e1000e/param.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn-rx.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans.h\n\nResolved the iwlwifi conflict with mainline using 3-way diff posted\nby John Linville and Stephen Rothwell. In \u0027net\u0027 we added a bug\nfix to make iwlwifi report a more accurate skb-\u003etruesize but this\nconflicted with RX path changes that happened meanwhile in net-next.\n\nIn e1000e a conflict arose in the validation code for settings of\nadapter-\u003eitr. \u0027net-next\u0027 had more sophisticated logic so that\nlogic was used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ca2997d145268e6b4ef000692061849cdab8348", "tree": "deeca7985f029cae477945e988816889c986e263", "parents": [ "251060220021283eef3652145a41f5b26db97ce5" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: Add MDIO bus multiplexer support.\n\nThis patch adds a somewhat generic framework for MDIO bus\nmultiplexers. It is modeled on the I2C multiplexer.\n\nThe multiplexer is needed if there are multiple PHYs with the same\naddress connected to the same MDIO bus adepter, or if there is\ninsufficient electrical drive capability for all the connected PHY\ndevices.\n\nConceptually it could look something like this:\n\n ------------------\n | Control Signal |\n --------+---------\n |\n --------------- --------+------\n | MDIO MASTER |---| Multiplexer |\n --------------- --+-------+----\n | |\n C C\n h h\n i i\n l l\n d d\n | |\n --------- A B ---------\n | | | | | |\n | PHY@1 +-------+ +---+ PHY@1 |\n | | | | | |\n --------- | | ---------\n --------- | | ---------\n | | | | | |\n | PHY@2 +-------+ +---+ PHY@2 |\n | | | |\n --------- ---------\n\nThis framework configures the bus topology from device tree data. The\nmechanics of switching the multiplexer is left to device specific\ndrivers.\n\nThe follow-on patch contains a multiplexer driven by GPIO lines.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "251060220021283eef3652145a41f5b26db97ce5", "tree": "e04d2a1695e19e959873cf8a6d571a925ca59cc5", "parents": [ "7dc2ce5f12cb5d166140820d5063027dc2449ac1" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: New function: of_mdio_find_bus().\n\nAdd of_mdio_find_bus() which allows an mii_bus to be located given its\nassociated the device tree node.\n\nThis is needed by the follow-on patch to add a driver for MDIO bus\nmultiplexers.\n\nThe of_mdiobus_register() function is modified so that the device tree\nnode is recorded in the mii_bus. Then we can find it again by\niterating over all mdio_bus_class devices.\n\nBecause the OF device tree has now become an integral part of the\nkernel, this can live in mdio_bus.c (which contains the needed\nmdio_bus_class structure) instead of of_mdio.c.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c430a727fa512500a422ffe4712166c550ea06a", "tree": "5027e4edc9c66a9e49e0e73ba866f5bb326fadcd", "parents": [ "6eddcb4c82883451aec3be1240f17793370fa62f" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon May 07 15:39:06 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 19:21:29 2012 -0400" }, "message": "net: compare_ether_addr[_64bits]() has no ordering\n\nNeither compare_ether_addr() nor compare_ether_addr_64bits()\n(as it can fall back to the former) have comparison semantics\nlike memcmp() where the sign of the return value indicates sort\norder. We had a bug in the wireless code due to a blind memcmp\nreplacement because of this.\n\nA cursory look suggests that the wireless bug was the only one\ndue to this semantic difference.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec47ea82477404631d49b8e568c71826c9b663ac", "tree": "8b7890f23ad078d9eccbd4571e0b2da86b04a6a0", "parents": [ "3e24591a19bbda6fcb2cbe383b41b4ba794501bf" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Fri May 04 14:26:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 06 13:13:19 2012 -0400" }, "message": "skb: Add inline helper for getting the skb end offset from head\n\nWith the recent changes for how we compute the skb truesize it occurs to me\nwe are probably going to have a lot of calls to skb_end_pointer -\nskb-\u003ehead. Instead of running all over the place doing that it would make\nmore sense to just make it a separate inline skb_end_offset(skb) that way\nwe can return the correct value without having gcc having to do all the\noptimization to cancel out skb-\u003ehead - skb-\u003ehead.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f45ebf3a6be9da051f078b30e7309b6788932189", "tree": "539bb636aec1ec8542218c54866f724b39164182", "parents": [ "1ea52fbda1629216182a0b0fbee9d65e8bcedd1e" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:56:19 2012 -0400" }, "message": "mISDN: Help to identify the card\n\nWith multiple cards is hard to figure out which port caused trouble\nint the layer2 routines (e.g. got a timeout).\nNow we have the informations in the log output.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c626c127279b265ab293348763e043864d58d42c", "tree": "476fa67d42bff3a1a27d97818fa66d16bf501a88", "parents": [ "8423e6b212a19d5f02232855dec73196297b5ee9" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:55:05 2012 -0400" }, "message": "mISDN: Make layer1 timer 3 value configurable\n\nFor certification test it is very useful to change the layer1\ntimer3 value on runtime.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8423e6b212a19d5f02232855dec73196297b5ee9", "tree": "bb244d8d7743d2c078fe817d25a3ae4a37ca3d39", "parents": [ "7ed80fe45d42678fb234bf9d18de6a98cfa9830d" ], "author": { "name": "Karsten Keil", "email": "isdn@linux-pingi.de", "time": "Fri May 04 04:15:32 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 04 11:54:27 2012 -0400" }, "message": "mISDN: L2 timeouts need to be queued as L2 event\n\nTo be full preemptiv safe, we cannot handle a L2 timeout in the timer\ncontext itself, we should do all actions via the D-channel thread.\n\nSigned-off-by: Karsten Keil \u003ckkeil@linux-pingi.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "tree": "8322c9c14b0c7055ce924d12c1150d2acb0ea95e", "parents": [ "913a90416918a591e6d5ece036b795c58a08131d", "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Transfer padding was wrong for full-speed USB in ASIX driver, fix\n from Ingo van Lil.\n\n 2) Propagate the negative packet offset fix into the PowerPC BPF JIT.\n From Jan Seiffert.\n\n 3) dl2k driver\u0027s private ioctls were letting unprivileged tasks make\n MII writes and other ugly bits like that. Fix from Jeff Mahoney.\n\n 4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.\n\n 5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and\n Julian Anastasov.\n\n 6) Fix races and sleeping in locked context bugs in drop_monitor, from\n Neil Horman.\n\n 7) Fix link status indication in smsc95xx driver, from Paolo Pisati.\n\n 8) Fix bridge netfilter OOPS, from Peter Huang.\n\n 9) L2TP sendmsg can return on error conditions with the socket lock\n held, oops. Fix from Sasha Levin.\n\n10) udp_diag should return meaningful values for socket memory usage,\n from Shan Wei.\n\n11) Eric Dumazet is so awesome he gets his own section:\n\n Socket memory cgroup code (I never should have applied those\n patches, grumble...) made erroneous changes to\n sk_sockets_allocated_read_positive(). It was changed to\n use percpu_counter_sum_positive (which requires BH disabling)\n instead of percpu_counter_read_positive (which does not).\n Revert back to avoid crashes and lockdep warnings.\n\n Adjust the default tcp_adv_win_scale and tcp_rmem[2] values\n to fix throughput regressions. This is necessary as a result\n of our more precise skb-\u003etruesize tracking.\n\n Fix SKB leak in netem packet scheduler.\n\n12) New device IDs for various bluetooth devices, from Manoj Iyer,\n AceLan Kao, and Steven Harms.\n\n13) Fix command completion race in ipw2200, from Stanislav Yakovlev.\n\n14) Fix rtlwifi oops on unload, from Larry Finger.\n\n15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.\n From Stephane Fillod.\n\n16) ehea driver registers it\u0027s IRQ before all the necessary state is\n setup, resulting in crashes. Fix from Thadeu Lima de Souza\n Cascardo.\n\n17) Fix PHY connection failures in davinci_emac driver, from Anatolij\n Gustschin.\n\n18) Missing break; in switch statement in bluetooth\u0027s\n hci_cmd_complete_evt(). Fix from Szymon Janc.\n\n19) Fix queue programming in iwlwifi, from Johannes Berg.\n\n20) Interrupt throttling defaults not being actually programmed into the\n hardware, fix from Jeff Kirsher and Ying Cai.\n\n21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from\n Benjamin Poirier.\n\n22) Fix blind status block RX producer pointer deref in TG3 driver, from\n Matt Carlson.\n\n23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de\n Souza Cascardo.\n\n24) Fix crashes in 6lowpan, from Alexander Smirnov.\n\n25) tcp_complete_cwr() needs to be careful to not rewind the CWND to\n ssthresh if ssthresh has the \"infinite\" value. Fix from Yuchung\n Cheng.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)\n sungem: Fix WakeOnLan\n tcp: change tcp_adv_win_scale and tcp_rmem[2]\n net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n drop_monitor: prevent init path from scheduling on the wrong cpu\n usbnet: fix failure handling in usbnet_probe\n usbnet: fix leak of transfer buffer of dev-\u003einterrupt\n ucc_geth: Add 16 bytes to max TX frame for VLANs\n net: ucc_geth, increase no. of HW RX descriptors\n netem: fix possible skb leak\n sky2: fix receive length error in mixed non-VLAN/VLAN traffic\n sky2: propogate rx hash when packet is copied\n net: fix two typos in skbuff.h\n cxgb3: Don\u0027t call cxgb_vlan_mode until q locks are initialized\n ixgbe: fix calling skb_put on nonlinear skb assertion bug\n ixgbe: Fix a memory leak in IEEE DCB\n igbvf: fix the bug when initializing the igbvf\n smsc75xx: enable mac to detect speed/duplex from phy\n smsc75xx: declare smsc75xx\u0027s MII as GMII capable\n smsc75xx: fix phy interrupt acknowledge\n smsc75xx: fix phy init reset loop\n ...\n" }, { "commit": "3a7c1ee4ab89f9250b8f82656a7be0ae14aa3691", "tree": "9dc10e067f2364fd3590b38cd5db495cd09c32e6", "parents": [ "715dc1f342713816d1be1c37643a2c9e6ee181a7" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Thu May 03 01:09:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 03 13:18:37 2012 -0400" }, "message": "skb: Add skb_head_is_locked helper function\n\nThis patch adds support for a skb_head_is_locked helper function. It is\nmeant to be used any time we are considering transferring the head from\nskb-\u003ehead to a paged frag. If the head is locked it means we cannot remove\nthe head from the skb so it must be copied or we must take the skb as a\nwhole.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "750ea2bafa55aaed208b2583470ecd7122225634", "tree": "7656d7697566b0cecc7fbbdd8dbae288bca6d7e3", "parents": [ "eed530b6c67624db3f2cf477bac7c4d005d8f7ba" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Wed May 02 13:30:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 20:56:10 2012 -0400" }, "message": "tcp: early retransmit: delayed fast retransmit\n\nImplementing the advanced early retransmit (sysctl_tcp_early_retrans\u003d\u003d2).\nDelays the fast retransmit by an interval of RTT/4. We borrow the\nRTO timer to implement the delay. If we receive another ACK or send\na new packet, the timer is cancelled and restored to original RTO\nvalue offset by time elapsed. When the delayed-ER timer fires,\nwe enter fast recovery and perform fast retransmit.\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": "eed530b6c67624db3f2cf477bac7c4d005d8f7ba", "tree": "c07096807ead2adb9d85e85d1a9cd1ada85755ac", "parents": [ "1fbc340514fc3003514bd681b372e1f47ae6183f" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Wed May 02 13:30:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 20:56:10 2012 -0400" }, "message": "tcp: early retransmit\n\nThis patch implements RFC 5827 early retransmit (ER) for TCP.\nIt reduces DUPACK threshold (dupthresh) if outstanding packets are\nless than 4 to recover losses by fast recovery instead of timeout.\n\nWhile the algorithm is simple, small but frequent network reordering\nmakes this feature dangerous: the connection repeatedly enter\nfalse recovery and degrade performance. Therefore we implement\na mitigation suggested in the appendix of the RFC that delays\nentering fast recovery by a small interval, i.e., RTT/4. Currently\nER is conservative and is disabled for the rest of the connection\nafter the first reordering event. A large scale web server\nexperiment on the performance impact of ER is summarized in\nsection 6 of the paper \"Proportional Rate Reduction for TCP”,\nIMC 2011. http://conferences.sigcomm.org/imc/2011/docs/p155.pdf\n\nNote that Linux has a similar feature called THIN_DUPACK. The\ndifferences are THIN_DUPACK do not mitigate reorderings and is only\nused after slow start. Currently ER is disabled if THIN_DUPACK is\nenabled. I would be happy to merge THIN_DUPACK feature with ER if\npeople think it\u0027s a good idea.\n\nER is enabled by sysctl_tcp_early_retrans:\n 0: Disables ER\n\n 1: Reduce dupthresh to packets_out - 1 when outstanding packets \u003c 4.\n\n 2: (Default) reduce dupthresh like mode 1. In addition, delay\n entering fast recovery by RTT/4.\n\nNote: mode 2 is implemented in the third part of this patch series.\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": "d961949660fa1c1b7eb0c3a3c157989c90f14e8e", "tree": "399d4b607366367f9dcf9d9d04c132a34a3a6d21", "parents": [ "60158e64641fd8c780a6d14de2bf42aabc419916" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 30 21:29:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:40:19 2012 -0400" }, "message": "net: fix two typos in skbuff.h\n\nfix kernel doc typos in function names\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4ae004b84b315dd4b762e474f97403eac70f76a", "tree": "c1f514987070e02c4792a84d0d5417dfa288a8cb", "parents": [ "18d0700024d68a075c507b845d85eda2abb5aee7" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 30 23:11:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:39:48 2012 -0400" }, "message": "netem: add ECN capability\n\nAdd ECN (Explicit Congestion Notification) marking capability to netem\n\ntc qdisc add dev eth0 root netem drop 0.5 ecn\n\nInstead of dropping packets, try to ECN mark them.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "18d0700024d68a075c507b845d85eda2abb5aee7", "tree": "bc733355c1aa30aa3e24cadf26747413ca74a207", "parents": [ "e4cbb02a1070ebf0185f67a8887cc05f8a183d71" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 30 16:31:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:39:48 2012 -0400" }, "message": "net: skb_peek()/skb_peek_tail() cleanups\n\nremove useless casts and rename variables for less confusion.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a32e0eec7042b21ccb52896cf715e3e2641fed93", "tree": "12880271e8f5fb4c5e48a0633e9a38d5a67a3448", "parents": [ "a495f8364efe11f4813914b09cf0d026364d6969" ], "author": { "name": "Chris Elston", "email": "celston@katalix.com", "time": "Sun Apr 29 21:48:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:30:55 2012 -0400" }, "message": "l2tp: introduce L2TPv3 IP encapsulation support for IPv6\n\nL2TPv3 defines an IP encapsulation packet format where data is carried\ndirectly over IP (no UDP). The kernel already has support for L2TP IP\nencapsulation over IPv4 (l2tp_ip). This patch introduces support for\nL2TP IP encapsulation over IPv6.\n\nThe implementation is derived from ipv6/raw and ipv4/l2tp_ip.\n\nSigned-off-by: Chris Elston \u003ccelston@katalix.com\u003e\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9bac8df908d7c0a36960265c92f3445623b19d1", "tree": "58bc4af4f65eed62a01027d2358b713b1a060e37", "parents": [ "2121c3f571f08bd723f449f2477f1582709f5a2a" ], "author": { "name": "Chris Elston", "email": "celston@katalix.com", "time": "Sun Apr 29 21:48:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:30:55 2012 -0400" }, "message": "l2tp: netlink api for l2tpv3 ipv6 unmanaged tunnels\n\nThis patch adds support for unmanaged L2TPv3 tunnels over IPv6 using\nthe netlink API. We already support unmanaged L2TPv3 tunnels over\nIPv4. A patch to iproute2 to make use of this feature will be\nsubmitted separately.\n\nSigned-off-by: Chris Elston \u003ccelston@katalix.com\u003e\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d4ec1aeda4a2754681a93029adf89f8f41b9a4d", "tree": "a2eb7e9a142b57c77638995f5635402e404e296c", "parents": [ "c8657fd50a7553a4a9cb4b04cdc11419c9d93d9b" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Sun Apr 29 21:48:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 09:30:55 2012 -0400" }, "message": "pppox: Replace __attribute__((packed)) in if_pppox.h\n\nCheckpatch warns about the use of __attribute__((packed)). So use the\nrecommended __packed syntax instead.\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7e8883cfcf4851afe74fb380cc62b7fa9cf66ba", "tree": "1b513349c4f1c7edf7991de2016b3a2ed1083deb", "parents": [ "8d4057a938481351dc690fbe23e8c72af08d5890" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 30 08:10:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 21:35:49 2012 -0400" }, "message": "net: make GRO aware of skb-\u003ehead_frag\n\nGRO can check if skb to be merged has its skb-\u003ehead mapped to a page\nfragment, instead of a kmalloc() area.\n\nWe \u0027upgrade\u0027 skb-\u003ehead as a fragment in itself\n\nThis avoids the frag_list fallback, and permits to build true GRO skb\n(one sk_buff and up to 16 fragments), using less memory.\n\nThis reduces number of cache misses when user makes its copy, since a\nsingle sk_buff is fetched.\n\nThis is a followup of patch \"net: allow skb-\u003ehead to be a page fragment\"\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nCc: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3836f21b0af5513ef55701dd3f50b8c42e44c7a", "tree": "69a471411b1dbbc2bb0997dd5f9f53fce6c74a7e", "parents": [ "49cbb1c1e6fd8fb069ef9fbfadc97042168f93bf" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri Apr 27 00:33:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 21:35:11 2012 -0400" }, "message": "net: allow skb-\u003ehead to be a page fragment\n\nskb-\u003ehead is currently allocated from kmalloc(). This is convenient but\nhas the drawback the data cannot be converted to a page fragment if\nneeded.\n\nWe have three spots were it hurts :\n\n1) GRO aggregation\n\n When a linear skb must be appended to another skb, GRO uses the\nfrag_list fallback, very inefficient since we keep all struct sk_buff\naround. So drivers enabling GRO but delivering linear skbs to network\nstack aren\u0027t enabling full GRO power.\n\n2) splice(socket -\u003e pipe).\n\n We must copy the linear part to a page fragment.\n This kind of defeats splice() purpose (zero copy claim)\n\n3) TCP coalescing.\n\n Recently introduced, this permits to group several contiguous segments\ninto a single skb. This shortens queue lengths and save kernel memory,\nand greatly reduce probabilities of TCP collapses. This coalescing\ndoesnt work on linear skbs (or we would need to copy data, this would be\ntoo slow)\n\nGiven all these issues, the following patch introduces the possibility\nof having skb-\u003ehead be a fragment in itself. We use a new skb flag,\nskb-\u003ehead_frag to carry this information.\n\nbuild_skb() is changed to accept a frag_size argument. Drivers willing\nto provide a page fragment instead of kmalloc() data will set a non zero\nvalue, set to the fragment size.\n\nThen, on situations we need to convert the skb head to a frag in itself,\nwe can check if skb-\u003ehead_frag is set and avoid the copies or various\nfallbacks we have.\n\nThis means drivers currently using frags could be updated to avoid the\ncurrent skb-\u003ehead allocation and reduce their memory footprint (aka skb\ntruesize). (thats 512 or 1024 bytes saved per skb). This also makes\nbpf/netfilter faster since the \u0027first frag\u0027 will be part of skb linear\npart, no need to copy data.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nCc: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7a7c9ab415874f4ad78a0352ca0ec6711092017", "tree": "db86f0bf794a33cc4cb6f3cdb06b9d8fae001b9d", "parents": [ "fec6c20b570bcf541e581fc97f2e0cbdb9725b98", "93f90e5186053611fe93d889e99ee2852f4da250" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 30 15:33:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 30 15:33:50 2012 -0700" }, "message": "Merge tag \u0027scsi-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi\n\nPull SCSI fixes from James Bottomley:\n \"This is a set of SAS and SATA fixes; there are one or two longstanding\n bug fixes, but most of this is regression fixes.\"\n\n* tag \u0027scsi-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:\n [SCSI] libfc: update mfs boundry checking\n [SCSI] Revert \"[SCSI] libsas: fix sas port naming\"\n [SCSI] libsas: fix false positive \u0027device attached\u0027 conditions\n [SCSI] libsas, libata: fix start of life for a sas ata_port\n [SCSI] libsas: fix ata_eh clobbering ex_phys via smp_ata_check_ready\n [SCSI] libsas: unify domain_device sas_rphy lifetimes\n [SCSI] libsas: fix sas_get_port_device regression\n [SCSI] libsas: fix sas_find_bcast_phy() in the presence of \u0027vacant\u0027 phys\n [SCSI] libsas: introduce sas_work to fix sas_drain_work vs sas_queue_work\n [SCSI] libata: Pass correct DMA device to scsi host\n [SCSI] scsi_lib: use correct DMA device in __scsi_alloc_queue\n" }, { "commit": "41b3254c93acc56adc3c4477fef7c9512d47659e", "tree": "2a8fed385a37a70551cb11c8694301b686a6ebd1", "parents": [ "8a7dc4b04b22be285ea5bef7d01a02f91e30d562" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon Apr 30 16:11:29 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 30 15:30:18 2012 -0700" }, "message": "efi: Add new variable attributes\n\nMore recent versions of the UEFI spec have added new attributes for\nvariables. Add them.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9883035ae7edef3ec62ad215611cb8e17d6a1a5d", "tree": "ab4afff1603e0f1e85e349b8a1fdb8415cc457cf", "parents": [ "de9e24eda331bbefb9195a4d646c786bdcbba7d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "message": "pipes: add a \"packetized pipe\" mode for writing\n\nThe actual internal pipe implementation is already really about\nindividual packets (called \"pipe buffers\"), and this simply exposes that\nas a special packetized mode.\n\nWhen we are in the packetized mode (marked by O_DIRECT as suggested by\nAlan Cox), a write() on a pipe will not merge the new data with previous\nwrites, so each write will get a pipe buffer of its own. The pipe\nbuffer is then marked with the PIPE_BUF_FLAG_PACKET flag, which in turn\nwill tell the reader side to break the read at that boundary (and throw\naway any partial packet contents that do not fit in the read buffer).\n\nEnd result: as long as you do writes less than PIPE_BUF in size (so that\nthe pipe doesn\u0027t have to split them up), you can now treat the pipe as a\npacket interface, where each read() system call will read one packet at\na time. You can just use a sufficiently big read buffer (PIPE_BUF is\nsufficient, since bigger than that doesn\u0027t guarantee atomicity anyway),\nand the return value of the read() will naturally give you the size of\nthe packet.\n\nNOTE! We do not support zero-sized packets, and zero-sized reads and\nwrites to a pipe continue to be no-ops. Also note that big packets will\ncurrently be split at write time, but that the size at which that\nhappens is not really specified (except that it\u0027s bigger than PIPE_BUF).\nCurrently that limit is the system page size, but we might want to\nexplicitly support bigger packets some day.\n\nThe main user for this is going to be the autofs packet interface,\nallowing us to stop having to care so deeply about exact packet sizes\n(which have had bugs with 32/64-bit compatibility modes). But user\nspace can create packetized pipes with \"pipe2(fd, O_DIRECT)\", which will\nfail with an EINVAL on kernels that do not support this interface.\n\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: stable@kernel.org # needed for systemd/autofs interaction fix\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d7d1adcd77ffa2e0edec79d4e48a7b1a1943c47", "tree": "45d2f7fc7588306fd9eb19415d3ee541698a1289", "parents": [ "f7b006931751f029620ad2f8310ac7a1484fbdb4", "41c8a48aa8de88ff56ed2f657b93d2446dd7882c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:17:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:17:54 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of small USB fixes for 3.4-rc5.\n\n Nothing major, as before, some USB gadget fixes. There\u0027s a crash fix\n for a number of ASUS laptops on resume that had been reported by a\n number of different people. We think the fix might also pertain to\n other machines, as this was a BIOS bug, and they seem to travel to\n different models and manufacturers quite easily. Other than that,\n some other reported problems fixed as well.\"\n\n* tag \u0027usb-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n usb: gadget: udc-core: fix incompatibility with dummy-hcd\n usb: gadget: udc-core: fix wrong call order\n USB: cdc-wdm: fix race leading leading to memory corruption\n USB: EHCI: fix crash during suspend on ASUS computers\n usb gadget: uvc: uvc_request_data::length field must be signed\n usb: gadget: dummy: do not call pullup() on udc_stop()\n usb: musb: davinci.c: add missing unregister\n usb: musb: drop __deprecated flag\n USB: gadget: storage gadgets send wrong error code for unknown commands\n usb: otg: gpio_vbus: Add otg transceiver events and notifiers\n" }, { "commit": "d2cf3361677e5bb5d01d45052212b7050a9aa8c4", "tree": "a0239e574876ca385c8578c7cbffb783bf951e51", "parents": [ "d7f3f62167bc2299d9669888b493b6e6ba561c35" ], "author": { "name": "Benjamin LaHaise", "email": "bcrl@kvack.org", "time": "Fri Apr 27 08:24:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 22:21:51 2012 -0400" }, "message": "net/l2tp: add support for L2TP over IPv6 UDP\n\nNow that encap_rcv() works on IPv6 UDP sockets, wire L2TP up to IPv6.\nSupport has been tested with and without hardware offloading. This\nversion fixes the L2TP over localhost issue with incorrect checksums\nbeing reported.\n\nSigned-off-by: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b990f9b3cb068578b8aefd3a34f8c8555661ef95", "tree": "091e7f7d62bcc75c244f9cc4615eaab2da6b9991", "parents": [ "cd88e3a61683d3d13276dda9d0debe5dc43c0727", "6e76538b9ef2b2a14ad9b57d65dc35d151765917" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:28:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:28:43 2012 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Nothing controversial, just another batch of fixes:\n\n - Samsung/exynos fixes for more merge window fallout: build errors\n and warnings mostly, but also some clock/device setup issues on\n exynos4/5\n - PXA bug and warning fixes related to gpio and pinmux\n - IRQ domain conversion bugfixes for U300 and MSM\n - A regulator setup fix for U300\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: PXA2xx: MFP: fix potential direction bug\n ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT\n arm/sa1100: fix sa1100-rtc memory resource\n ARM: pxa: fix gpio wakeup setting\n ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability\n ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined\n ARM: EXYNOS: Fix resource on dev-dwmci.c\n ARM: S3C24XX: Fix build warning for S3C2410_PM\n ARM: mini2440_defconfig: Fix build error\n ARM: msm: Fix gic irqdomain support\n ARM: EXYNOS: Fix incorrect initialization of GIC\n ARM: EXYNOS: use \u0027exynos4-sdhci\u0027 as device name for sdhci controllers\n ARM: u300: bump all IRQ numbers by one\n ARM: ux300: Fix unimplementable regulation constraints\n" }, { "commit": "84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5", "tree": "cd2e0ccf78d2226fcc969539594d392088dddac9", "parents": [ "9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44", "2431a8154634027ce3915200699f26fb3725a1f2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:52:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:52:30 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull misc SPI device driver bug fixes from Grant Likely.\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/spi-bfin5xx: Fix flush of last bit after each spi transfer\n spi/spi-bfin5xx: fix reversed if condition in interrupt mode\n spi/spi_bfin_sport: drop bits_per_word from client data\n spi/bfin_spi: drop bits_per_word from client data\n spi/spi-bfin-sport: move word length setup to transfer handler\n spi/bfin5xx: rename config macro name for bfin5xx spi controller driver\n spi/pl022: Allow request for higher frequency than maximum possible\n spi/bcm63xx: set master driver mode_bits.\n spi/bcm63xx: don\u0027t use the stopping state\n spi/bcm63xx: convert to the pump message infrastructure\n spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction\n spi: fix spi.h kernel-doc warning\n spi/pl022: Fix calculate_effective_freq()\n spi/pl022: Fix range checking for bits per word\n" }, { "commit": "dbabe0d659d3cfe42830a779909ab3cd42f7b027", "tree": "bc058a8d9f92df91064e0dc458a145be448a194f", "parents": [ "5eb806a3a68920a9f373f18b03fa14852047e62b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Tue Apr 17 17:03:50 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:03:38 2012 -0600" }, "message": "spi: fix spi.h kernel-doc warning\n\nFix kernel-doc warning in spi.h (copy/paste):\n\nWarning(include/linux/spi/spi.h:365): No description found for parameter \u0027unprepare_transfer_hardware\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "b95ace54a23e2f8ebb032744cebb17c9f43bf651", "tree": "7c7053a33426848bd27edabc977b7d5cfd1b84a7", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Robert Jarzmik", "email": "robert.jarzmik@free.fr", "time": "Sun Apr 22 13:37:24 2012 +0200" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Apr 27 10:46:45 2012 +0800" }, "message": "ARM: pxa: fix gpio wakeup setting\n\nIn 3.3, gpio wakeup setting was broken. The call\nenable_irq_wake() didn\u0027t set up the PXA gpio registers\n(PWER, ...) anymore.\n\nFix it at least for pxa27x. The driver doesn\u0027t seem to be\nused in pxa25x (weird ...), and the fix doesn\u0027t extend to\npxa3xx and pxa95x (which don\u0027t have a gpio_set_wake()\navailable).\n\nSigned-off-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "110a5c8b389407e1e859c43293179f9089671a60", "tree": "83245c842a809ecd728f12814a344e7224109d7a", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc", "6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton:\n \"13 fixes. The acerhdf patches aren\u0027t (really) fixes. But they\u0027ve\n been stuck in my tree for up to two years, sent to Matthew multiple\n times and the developers are unhappy.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (13 patches)\n mm: fix NULL ptr dereference in move_pages\n mm: fix NULL ptr dereference in migrate_pages\n revert \"proc: clear_refs: do not clear reserved pages\"\n drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled\n arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file\n hugetlbfs: lockdep annotate root inode properly\n acerhdf: lowered default temp fanon/fanoff values\n acerhdf: add support for new hardware\n acerhdf: add support for Aspire 1410 BIOS v1.3314\n fs/buffer.c: remove BUG() in possible but rare condition\n mm: fix up the vmscan stat in vmstat\n epoll: clear the tfile_check_list on -ELOOP\n mm/hugetlb: fix warning in alloc_huge_page/dequeue_huge_page_vma\n" }, { "commit": "de248a75c35e0208294cf304b112916254b69184", "tree": "0d00a02fdb994f8b1cbf239c11080fec86977639", "parents": [ "2d319508a3551d2995e5cd12d649821b3be00e5b" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Wed Apr 25 23:43:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 06:13:51 2012 -0400" }, "message": "tcp repair: Fix unaligned access when repairing options (v2)\n\nDon\u0027t pick __u8/__u16 values directly from raw pointers, but instead use\nan array of structures of code:value pairs. This is OK, since the buffer\nwe take options from is not an skb memory, but a user-to-kernel one.\n\nFor those options which don\u0027t require any value now, require this to be\nzero (for potential future extension of this API).\n\nv2: Changed tcp_repair_opt to use two __u32-s as spotted by David Laight.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2300fd67b4f29eec19addb15a8571837228f63fc", "tree": "5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76", "parents": [ "86ec090e58fca1025676e775093a87ab699f7f4d", "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix NFSv4 infinite loops on open(O_TRUNC)\n - Fix an Oops and an infinite loop in the NFSv4 flock code\n - Don\u0027t register the PipeFS filesystem until it has been set up\n - Fix an Oops in nfs_try_to_update_request\n - Don\u0027t reuse NFSv4 open owners: fixes a bad sequence id storm.\n\n* tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Keep dropped state owners on the LRU list for a while\n NFSv4: Ensure that we don\u0027t drop a state owner more than once\n NFSv4: Ensure we do not reuse open owner names\n nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n NFS: put open context on error in nfs_flush_multi\n NFS: put open context on error in nfs_pagein_multi\n NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n NFSv4: Ensure that we check lock exclusive/shared type against open modes\n NFSv4: Ensure that the LOCK code sets exception-\u003einode\n NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n SUNRPC: register PipeFS file system after pernet sybsystem\n" }, { "commit": "904249aa68010c8e223263c922fcbb840a3f42e4", "tree": "5476bdf728cd77ac6fcaaeb986df1ddd5c9527d7", "parents": [ "13d518074a952d33d47c428419693f63389547e9" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Wed Apr 25 16:01:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "mm: fix up the vmscan stat in vmstat\n\nThe \"pgsteal\" stat is confusing because it counts both direct reclaim as\nwell as background reclaim. However, we have \"kswapd_steal\" which also\ncounts background reclaim value.\n\nThis patch fixes it and also makes it match the existng \"pgscan_\" stats.\n\nTest:\npgsteal_kswapd_dma32 447623\npgsteal_kswapd_normal 42272677\npgsteal_kswapd_movable 0\npgsteal_direct_dma32 2801\npgsteal_direct_normal 44353270\npgsteal_direct_movable 0\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nReviewed-by: Minchan Kim \u003cminchan@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": "8dcf01fc009d12d01fd195ed95eaaee61178f21a", "tree": "daa9665ec6c4fe8ca17232242c8b3126e7b14076", "parents": [ "808db80a7eeff8314ac51654bfefc864582eea13" ], "author": { "name": "Shan Wei", "email": "davidshan@tencent.com", "time": "Tue Apr 24 18:21:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 25 20:46:59 2012 -0400" }, "message": "net: sock_diag_handler structs can be const\n\nread only, so change it to const.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "151b61284776be2d6f02d48c23c3625678960b97", "tree": "db1924a65d3f4416122ab4bb0600f750a6f9dd00", "parents": [ "6f6543f53f9ce136e01d7114bf6f0818ca54fb41" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Apr 24 14:07:22 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Apr 24 13:55:43 2012 -0700" }, "message": "USB: EHCI: fix crash during suspend on ASUS computers\n\nThis patch (as1545) fixes a problem affecting several ASUS computers:\nThe machine crashes or corrupts memory when going into suspend if the\nehci-hcd driver is bound to any controllers. Users have been forced\nto unbind or unload ehci-hcd before putting their systems to sleep.\n\nAfter extensive testing, it was determined that the machines don\u0027t\nlike going into suspend when any EHCI controllers are in the PCI D3\npower state. Presumably this is a firmware bug, but there\u0027s nothing\nwe can do about it except to avoid putting the controllers in D3\nduring system sleep.\n\nThe patch adds a new flag to indicate whether the problem is present,\nand avoids changing the controller\u0027s power state if the flag is set.\nRuntime suspend is unaffected; this matters only for system suspend.\nHowever as a side effect, the controller will not respond to remote\nwakeup requests while the system is asleep. Hence USB wakeup is not\nfunctional -- but of course, this is already true in the current state\nof affairs.\n\nThis fixes Bugzilla #42728.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nTested-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nTested-by: Andrey Rahmatullin \u003cwrar@wrar.name\u003e\nTested-by: Oleksij Rempel (fishor) \u003cbug-track@fisher-privat.net\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "423b40e194a8ad8f7cc15cc38bd18633891a04ad", "tree": "c2252ac61f575576d6ffa50689cb5b08876afff0", "parents": [ "95f714727436836bb46236ce2bcd8ee8f9274aed", "24b7099af71232b7568acd74770e6eb8f174f5d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 24 08:20:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 24 08:20:28 2012 -0700" }, "message": "Merge tag \u0027hsi_fixes_for_3.4\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi\n\nPull HSI fixes and ABI documentation from Carlos Chinea\n\n* tag \u0027hsi_fixes_for_3.4\u0027 of git://gitorious.org/kernel-hsi/kernel-hsi:\n HSI: Add HSI ABI documentation\n HSI: hsi_char: Remove max_data_size from sysfs\n HSI: hsi: Rework hsi_event interface\n HSI: hsi: Remove controllers and ports from the bus\n HSI: hsi: Fix error path cleanup on client registration\n HSI: hsi: Rework hsi_controller release\n" }, { "commit": "38ba0a65faf451dd46c7860b4fade84c0b8e444f", "tree": "30689f565d6ff6a0b046e0c8b05a5aa7544144dd", "parents": [ "783c175f902b1ae011f12de45770e7912638ea1a" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 23 17:48:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 24 00:18:02 2012 -0400" }, "message": "net: skb_can_coalesce returns a boolean\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a881e963c7fe1f226e991ee9bbe8907acda93294", "tree": "5d2b2c01097300377821132f743cddd4fc90fed6", "parents": [ "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "Peter Huang (Peng)", "email": "peter.huangpeng@huawei.com", "time": "Thu Apr 19 20:12:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 24 00:16:24 2012 -0400" }, "message": "set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nbridge: set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nwhen bridge is deleted before tap/vif device\u0027s delete, kernel may\nencounter an oops because of NULL reference to fake_rtable\u0027s dst.\nSet fake_rtable\u0027s dst to NULL before sending packets out can solve\nthis problem.\n\nv4 reformat, change br_drop_fake_rtable(skb) to {}\n\nv3 enrich commit header\n\nv2 introducing new flag DST_FAKE_RTABLE to dst_entry struct.\n\n[ Use \"do { } while (0)\" for nop br_drop_fake_rtable()\n implementation -DaveM ]\n\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Peter Huang \u003cpeter.huangpeng@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f24001941c99776f41bd3f09c07d91205c2ad9d4", "tree": "0ab31480ccdf343b61db045e195d096068ef7c73", "parents": [ "a108d5f35adc5c5d5cdc882dc0bb920565551bff", "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:14:36 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:15:17 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nFix merge between commit 3adadc08cc1e (\"net ax25: Reorder ax25_exit to\nremove races\") and commit 0ca7a4c87d27 (\"net ax25: Simplify and\ncleanup the ax25 sysctl handling\")\n\nThe former moved around the sysctl register/unregister calls, the\nlater simply removed them.\n\nWith help from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec1c56ff813a198d656d4aa42e5de03e45751bf8", "tree": "b066f0a692454be661907d6ab91b4194f09c0fca", "parents": [ "6f02b9e9b44a3bfc0046da3ff2707dae0b5e2f30" ], "author": { "name": "Carlos Chinea", "email": "carlos.chinea@nokia.com", "time": "Wed Apr 11 10:55:53 2012 +0300" }, "committer": { "name": "Carlos Chinea", "email": "carlos.chinea@nokia.com", "time": "Mon Apr 23 14:23:32 2012 +0300" }, "message": "HSI: hsi: Rework hsi_event interface\n\nRemove custom hack and make use of the notifier chain interfaces for\ndelivering events from the ports to their associated clients.\nClients that want to receive port events need to register their callbacks\nusing hsi_register_port_event(). The callbacks can be called in interrupt\ncontext. Use hsi_unregestier_port_event() to undo the registration.\n\nSigned-off-by: Carlos Chinea \u003ccarlos.chinea@nokia.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "5a218ceba7b64f506bf4f004b04bb457c1805a62", "tree": "f1f123391bbebd8c6136e9118bf8a2f6b0c49734", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Carlos Chinea", "email": "carlos.chinea@nokia.com", "time": "Wed Apr 04 14:11:45 2012 +0300" }, "committer": { "name": "Carlos Chinea", "email": "carlos.chinea@nokia.com", "time": "Mon Apr 23 14:23:31 2012 +0300" }, "message": "HSI: hsi: Rework hsi_controller release\n\nUse the proper release mechanism for hsi_controller and\nhsi_ports structures. Free the structures through their\nassociated device release callbacks.\n\nSigned-off-by: Carlos Chinea \u003ccarlos.chinea@nokia.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "b2024459252a9d2d312ee562f86f332a1498f412", "tree": "751987779eee44a601a68c766ba2ff258b77d25a", "parents": [ "0f3fce5cc77e1f35758ef0e46a989e76e5046a7b" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 21 21:09:07 2012 -0700" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Mon Apr 23 12:11:47 2012 +0100" }, "message": "[SCSI] libsas, libata: fix start of life for a sas ata_port\n\nThis changes the ordering of initialization and probing events from:\n 1/ allocate rphy in PORTE_BYTES_DMAED, DISCE_REVALIDATE_DOMAIN\n 2/ allocate ata_port and schedule port probe in DISCE_PROBE\n...to:\n 1/ allocate ata_port in PORTE_BYTES_DMAED, DISCE_REVALIDATE_DOMAIN\n 2/ allocate rphy in PORTE_BYTES_DMAED, DISCE_REVALIDATE_DOMAIN\n 3/ schedule port probe in DISCE_PROBE\n\nThis ordering prevents PHYE_SIGNAL_LOSS_EVENTS from sneaking in to\ndestrory ata devices before they have been fully initialized:\n\n BUG: unable to handle kernel paging request at 0000000000003b10\n IP: [\u003cffffffffa0053d7e\u003e] sas_ata_end_eh+0x12/0x5e [libsas]\n ...\n [\u003cffffffffa004d1af\u003e] sas_unregister_common_dev+0x78/0xc9 [libsas]\n [\u003cffffffffa004d4d4\u003e] sas_unregister_dev+0x4f/0xad [libsas]\n [\u003cffffffffa004d5b1\u003e] sas_unregister_domain_devices+0x7f/0xbf [libsas]\n [\u003cffffffffa004c487\u003e] sas_deform_port+0x61/0x1b8 [libsas]\n [\u003cffffffffa004bed0\u003e] sas_phye_loss_of_signal+0x29/0x2b [libsas]\n\n...and kills the awkward \"sata domain_device briefly existing in the\ndomain without an ata_port\" state.\n\nReported-by: Michal Kosciowski \u003cmichal.kosciowski@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\n" }, { "commit": "205b9c9c6eb9c309759ff1e52ffa85ae8965b382", "tree": "4ca6761d0fd5bc5b04bd2b059bfe8cbd59c067f6", "parents": [ "7e296295437d3e54662e9e217fb20330e3c38f6f", "446f6d06fab0b49c61887ecbe8286d6aaa796637" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:07:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:07:51 2012 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc fixes from Benjamin Herrenschmidt:\n \"Here are a few fixes for powerpc. Note the addition to the generic\n irq.h. This is part of a 3-patches regression fix for mpic due to\n changes in how IRQ_TYPE_NONE is being handled. Thomas agreed to the\n addition of the new IRQ_TYPE_DEFAULT contant, however he hasn\u0027t\n replied with an Ack to the actual patch yet. I don\u0027t to wait much\n longer with these patches tho.\"\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/mpic: Properly set default triggers\n irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers\n powerpc/mpic: Fix confusion between hw_irq and virq\n powerpc/pmac: Don\u0027t add_timer() twice\n powerpc/eeh: Fix crash caused by null eeh_dev\n powerpc/mpc85xx: add MPIC message dts node\n powerpc/mpic_msgr: fix offset error when setting mer register\n powerpc/mpic_msgr: add lock for MPIC message global variable\n powerpc/mpic_msgr: fix compile error when SMP disabled\n powerpc: fix build when CONFIG_BOOKE_WDT is enabled\n powerpc/85xx: don\u0027t call of_platform_bus_probe() twice\n" }, { "commit": "7e296295437d3e54662e9e217fb20330e3c38f6f", "tree": "ff3385c8a7615f9fa1c8fe1b6bc0406559afe62f", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c", "d135c522f1234f62e81be29cebdf59e9955139ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:02:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 22 21:02:57 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix namespace init and cleanup in phonet to fix some oopses, from\n Eric W. Biederman.\n\n 2) Missing kfree_skb() in AF_KEY, from Julia Lawall.\n\n 3) Refcount leak and source address handling fix in l2tp from James\n Chapman.\n\n 4) Memory leak fix in CAIF from Tomasz Gregorek.\n\n 5) When routes are cloned from ipv6 addrconf routes, we don\u0027t process\n expirations properly. Fix from Gao Feng.\n\n 6) Fix panic on DMA errors in atl1 driver, from Tony Zelenoff.\n\n 7) Only enable interrupts in 8139cp driver after we\u0027ve registered the\n IRQ handler. From Jason Wang.\n\n 8) Fix too many reads of KS_CIDER register in ks8851 during probe,\n fixing crashes on spurious interrupts. From Matt Renzelmann.\n\n 9) Missing include in ath5k driver and missing iounmap on probe\n failure, from Jonathan Bither.\n\n10) Fix RX packet handling in smsc911x driver, from Will Deacon.\n\n11) Fix ixgbe WoL on fiber by leaving the laser on during shutdown.\n\n12) ks8851 needs MAX_RECV_FRAMES increased otherwise the internal MAC\n buffers are easily overflown. Fix from Davide Cimingahi.\n\n13) Fix memory leaks in peak_usb CAN driver, from Jesper Juhl.\n\n14) gred packet scheduler can dump in WRED more when doing a netlink\n dump. Fix from David Ward.\n\n15) Fix MTU in USB smsc75xx driver, from Stephane Fillod.\n\n16) Dummy device needs -\u003endo_uninit handler to properly handle\n -\u003endo_init failures. From Hiroaki SHIMODA.\n\n17) Fix TX fragmentation in ath9k driver, from Sujith Manoharan.\n\n18) Missing RTNL lock in ixgbe PM resume, from Benjamin Poirier.\n\n19) Missing iounmap in farsync WAN driver, from Julia Lawall.\n\n20) With LRO/GRO, tcp_grow_window() is easily tricked into not growing\n the receive window properly, and this hurts performance. Fix from\n Eric Dumazet.\n\n21) Network namespace init failure can leak net_generic data, fix from\n Julian Anastasov.\n\n22) Fix skb_over_panic due to mis-accounting in TCP for partially ACK\u0027d\n SKBs. From Eric Dumazet.\n\n23) New IDs for qmi_wwan driver, from Bjørn Mork.\n\n24) Fix races in ax25_exit(), from Eric W. Biederman.\n\n25) IPV6 TCP doesn\u0027t handle TCP_MAXSEG socket option properly, copy over\n logic from the IPV4 side. From Neal Cardwell.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)\n tcp: fix TCP_MAXSEG for established IPv6 passive sockets\n drivers/net: Do not free an IRQ if its request failed\n drop_monitor: allow more events per second\n ks8851: Fix request_irq/free_irq mismatch\n net/hyperv: Adding cancellation to ensure rndis filter is closed\n ks8851: Fix mutex deadlock in ks8851_net_stop()\n net ax25: Reorder ax25_exit to remove races.\n icplus: fix interrupt for IC+ 101A/G and 1001LF\n net: qmi_wwan: support Sierra Wireless MC77xx devices in QMI mode\n bnx2x: off by one in bnx2x_ets_e3b0_sp_pri_to_cos_set()\n ksz884x: don\u0027t copy too much in netdev_set_mac_address()\n tcp: fix retransmit of partially acked frames\n netns: do not leak net_generic data on failed init\n net/sock.h: fix sk_peek_off kernel-doc warning\n tcp: fix tcp_grow_window() for large incoming frames\n drivers/net/wan/farsync.c: add missing iounmap\n davinci_mdio: Fix MDIO timeout check\n ipv6: clean up rt6_clean_expires\n ipv6: fix rt6_update_expires\n arcnet: rimi: Fix device name in debug output\n ...\n" }, { "commit": "3fca40c704dd013797f2c0c518f37cd2cc8e19fe", "tree": "250169398a74aca872c11717135f84826cbfbdad", "parents": [ "3a2b4f7c355ff1c97e4adebadf0a1aefd7c4518a" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Apr 19 17:29:42 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Apr 23 11:04:29 2012 +1000" }, "message": "irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers\n\nThis is meant typically to allow a PIC driver\u0027s irq domain map() callback\nto establish sane defaults for the interrupt (and make sure that the HW\nand the irq_desc are in sync as far as the trigger is concerned).\n\nThe irq core may not call the set_trigger callback if it thinks the\ntrigger is already set to the right setting, so we need to ensure new\ndescriptors are properly synchronized with the hardware.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "19a0b58e506b06fd41659d8734bba6a3e87980f4", "tree": "f9844eaf9d1471c6fcd98c850b1ed6cd57f2bce3", "parents": [ "4c78bb845bd2aaf1f7136e75314c7d034cfd120f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Fri Apr 20 04:42:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 16:26:33 2012 -0400" }, "message": "team: allow to enable/disable ports\n\nThis patch changes content of hashlist (used to get port struct by\ncomputed index (0...en_port_count-1)). Now the hash list contains only\nenabled ports so userspace will be able to say what ports can be used\nfor tx/rx. This becomes handy when userspace will need to disable ports\nwhich does not belong to active aggregator. By default, newly added port\nis enabled.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b139ba4e90dccbf4cd4efb112af96a5c9e0b098c", "tree": "c955ff09255e74b8cc991dfa6f67853668a3b3c4", "parents": [ "5e6a3ce6573f0c519d1ff57df60e3877bb2d3151" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Apr 19 03:41:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 15:52:25 2012 -0400" }, "message": "tcp: Repair connection-time negotiated parameters\n\nThere are options, which are set up on a socket while performing\nTCP handshake. Need to resurrect them on a socket while repairing.\nA new sockoption accepts a buffer and parses it. The buffer should\nbe CODE:VALUE sequence of bytes, where CODE is standard option\ncode and VALUE is the respective value.\n\nOnly 4 options should be handled on repaired socket.\n\nTo read 3 out of 4 of these options the TCP_INFO sockoption can be\nused. An ability to get the last one (the mss_clamp) was added by\nthe previous patch.\n\nNow the restore. Three of these options -- timestamp_ok, mss_clamp\nand snd_wscale -- are just restored on a coket.\n\nThe sack_ok flags has 2 issues. First, whether or not to do sacks\nat all. This flag is just read and set back. No other sack info is\nsaved or restored, since according to the standart and the code\ndropping all sack-ed segments is OK, the sender will resubmit them\nagain, so after the repair we will probably experience a pause in\nconnection. Next, the fack bit. It\u0027s just set back on a socket if\nthe respective sysctl is set. No collected stats about packets flow\nis preserved. As far as I see (plz, correct me if I\u0027m wrong) the\nfack-based congestion algorithm survives dropping all of the stats\nand repairs itself eventually, probably losing the performance for\nthat period.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee9952831cfd0bbe834f4a26489d7dce74582e37", "tree": "64c195fa45e1a200f38d68751161d8e06dfb5a6c", "parents": [ "370816aef0c5436c2adbec3966038f36ca326933" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Apr 19 03:40:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 15:52:25 2012 -0400" }, "message": "tcp: Initial repair mode\n\nThis includes (according the the previous description):\n\n* TCP_REPAIR sockoption\n\nThis one just puts the socket in/out of the repair mode.\nAllowed for CAP_NET_ADMIN and for closed/establised sockets only.\nWhen repair mode is turned off and the socket happens to be in\nthe established state the window probe is sent to the peer to\n\u0027unlock\u0027 the connection.\n\n* TCP_REPAIR_QUEUE sockoption\n\nThis one sets the queue which we\u0027re about to repair. The\n\u0027no-queue\u0027 is set by default.\n\n* TCP_QUEUE_SEQ socoption\n\nSets the write_seq/rcv_nxt of a selected repaired queue.\nAllowed for TCP_CLOSE-d sockets only. When the socket changes\nits state the other seq-s are changed by the kernel according\nto the protocol rules (most of the existing code is actually\nreused).\n\n* Ability to forcibly bind a socket to a port\n\nThe sk-\u003esk_reuse is set to SK_FORCE_REUSE.\n\n* Immediate connect modification\n\nThe connect syscall initializes the connection, then directly jumps\nto the code which finalizes it.\n\n* Silent close modification\n\nThe close just aborts the connection (similar to SO_LINGER with 0\ntime) but without sending any FIN/RST-s to peer.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "126a3483d6e3c3370a2c7976073a0f4a5c942318", "tree": "1c176fe1ed331b93463440c50c249a9eb7ef2496", "parents": [ "8898159650093e9eee8829e30a9139b4273a0ac4", "7c5709194096beea1ab6e6db46768d70a068efb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:44:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:44:37 2012 -0700" }, "message": "Merge tag \u0027mmc-fixes-for-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC fixes from Chris Ball:\n - Build fix for omap_hsmmc with OF against 3.4-rc1.\n - Fix CONFIG_MMC_UNSAFE_RESUME semantics regression against 3.3, which\n broke hotplug card detection when UNSAFE_RESUME is set.\n - Fix a race condition in omap_hsmmc with runtime PM.\n - Fix two libertas SDIO-powered-resume regressions.\n - Small fixes for discard/sanitize, dw_mmc, cd-gpio and esdhc-imx.\n\n* tag \u0027mmc-fixes-for-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: core: Do not pre-claim host in suspend\n mmc: dw_mmc: prevent NULL dereference for dma_ops\n mmc: unbreak sdhci-esdhc-imx on i.MX25\n mmc: cd-gpio: Include header to pickup exported symbol prototypes\n mmc: sdhci: refine non-removable card checking for card detection\n mmc: dw_mmc: Fix switch from DMA to PIO\n mmc: remove MMC bus legacy suspend/resume method\n mmc: omap_hsmmc: Get rid of of_have_populated_dt() usage\n mmc: omap_hsmmc: build fix for CONFIG_OF\u003dy and CONFIG_MMC_OMAP_HS\u003dm\n mmc: fixes for eMMC v4.5 sanitize operation\n mmc: fixes for eMMC v4.5 discard operation\n" }, { "commit": "9f24ff6f4236f117729bdb2fe8b0c202ce86098f", "tree": "103ac64430efbb0340940fa95d5ad336b29b01de", "parents": [ "bfce281c287a427d0841fadf5d59242757b4e620", "82ea267f7dc853a5e6a724916a70a10656efdfc2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:42:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 21 12:42:12 2012 -0700" }, "message": "Merge tag \u0027mfd-for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull MFD fixes from Samuel Ortiz:\n \"We have 3 build fixes, a OMAP USB host PHY reset fix and the twl6040\n conversion to an i2c driver. The latter may not sound like a fix but\n the twl6040 MFD driver won\u0027t probe without it, triggering an OMAP4\n audio regression.\"\n\n* tag \u0027mfd-for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Fix modular builds of rc5t583 regulator support\n mfd: Fix asic3_gpio_to_irq\n ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue\n mfd: Convert twl6040 to i2c driver, and separate it from twl core\n mfd : Fix dbx500 compilation error\n" }, { "commit": "bfce281c287a427d0841fadf5d59242757b4e620", "tree": "abca9ebeef4c668021e85e4d54e6e779121e92cc", "parents": [ "9f3a4afb276e4d8b3be7f3e678d4dbd11470416f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 20 21:57:04 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 21 01:58:20 2012 -0400" }, "message": "kill mm argument of vm_munmap()\n\nit\u0027s always current-\u003emm\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "95b72eb0bdef6476b7e73061f0382adf46c5495a", "tree": "db1cbb01793ac5f744defb73e869373fefb7d0ce", "parents": [ "98a2139f4f4d7b5fcc3a54c7fddbe88612abed20" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 19:24:51 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 23:14:28 2012 -0400" }, "message": "NFSv4: Ensure we do not reuse open owner names\n\nThe NFSv4 spec is ambiguous about whether or not it is permissible\nto reuse open owner names, so play it safe. This patch adds a timestamp\nto the state_owner structure, and combines that with the IDA based\nuniquifier.\nFixes a regression whereby the Linux server returns NFS4ERR_BAD_SEQID.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a5347fe36b313c07d59b065d00a8fa56362c5f97", "tree": "8778711b514baca6f5686777c0dea245a8874711", "parents": [ "ec8f23ce0f4005b74013d4d122e0d540397a93c9" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Apr 19 13:45:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 20 21:22:30 2012 -0400" }, "message": "net: Delete all remaining instances of ctl_path\n\nWe don\u0027t use struct ctl_path anymore so delete the exported constants.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32d317c60e56c2a34463b51fc0336cc96b3e1735", "tree": "170c8d9ee71358a242fa1f7edb3fa073714eaacc", "parents": [ "4d048f915f32c8455605b106aa0de2cf68a71903" ], "author": { "name": "Chuanxiao Dong", "email": "chuanxiao.dong@intel.com", "time": "Wed Apr 11 19:54:38 2012 +0800" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Fri Apr 20 20:30:19 2012 -0400" }, "message": "mmc: remove MMC bus legacy suspend/resume method\n\nMMC bus is using legacy suspend/resume method, which is not compatible if\nruntime pm callbacks are used. In this scenario, MMC bus suspend/resume\ncallbacks cannot be called when system entering S3. So change to use the\nnew defined dev_pm_ops for system sleeping mode.\n\nTested on AM335x Platform. Solves major issue/crash reported at\nhttp://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html\n\nSigned-off-by: Chuanxiao Dong \u003cchuanxiao.dong@intel.com\u003e\nTested-by: Hebbar, Gururaja \u003cgururaja.hebbar@ti.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Ulf Hansson \u003culf.hansson@stericsson.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "6be5ceb02e98eaf6cfc4f8b12a896d04023f340d", "tree": "f34de1392300bbf63549f4eeb20f7606d6f7b1f9", "parents": [ "a46ef99d80817a167477ed1c8b4d90ee0c2e726f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:13:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_mmap()\" helper function\n\nThis continues the theme started with vm_brk() and vm_munmap():\nvm_mmap() does the same thing as do_mmap(), but additionally does the\nrequired VM locking.\n\nThis uninlines (and rewrites it to be clearer) do_mmap(), which sadly\nduplicates it in mm/mmap.c and mm/nommu.c. But that way we don\u0027t have\nto export our internal do_mmap_pgoff() function.\n\nSome day we hopefully don\u0027t have to export do_mmap() either, if all\nmodular users can become the simpler vm_mmap() instead. We\u0027re actually\nvery close to that already, with the notable exception of the (broken)\nuse in i810, and a couple of stragglers in binfmt_elf.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a46ef99d80817a167477ed1c8b4d90ee0c2e726f", "tree": "3d8c980c627e8b9c009dbf63628a9be8b8d1069f", "parents": [ "e4eb1ff61b323d6141614e5458a1f53c7046ff8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 16:20:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_munmap()\" helper function\n\nLike the vm_brk() function, this is the same as \"do_munmap()\", except it\ndoes the VM locking for the caller.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4eb1ff61b323d6141614e5458a1f53c7046ff8e", "tree": "7a0251509c169b0df1a6bf4bc47c5bca709e06da", "parents": [ "3b422e9c2c020a1137349c614da7f9c9761a0922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 15:35:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:28:17 2012 -0700" }, "message": "VM: add \"vm_brk()\" helper function\n\nIt does the same thing as \"do_brk()\", except it handles the VM locking\ntoo.\n\nIt turns out that all external callers want that anyway, so we can make\ndo_brk() static to just mm/mmap.c while at it.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b422e9c2c020a1137349c614da7f9c9761a0922", "tree": "0bbcfa6ca3cbee25b1ef624d908704c2773d24dc", "parents": [ "3a5374303923a543ff3e5f491030b21836d288f5", "f84cc342b1999db11ece939e1d2bf0743eb4578b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 12:28:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 12:28:06 2012 -0700" }, "message": "Merge tag \u0027for-torvalds-20120418\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl fixes from Linus Walleij:\n - Fixed compilation errors and warnings\n - Stricter checks on the ops vtable\n\n* tag \u0027for-torvalds-20120418\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl: implement pinctrl_check_ops\n pinctrl: include \u003clinux/bug.h\u003e to prevent compile errors\n pinctrl: fix compile error if not select PINMUX support\n" }, { "commit": "1cd653a665b08a3920e320a71b4ac5b80d36953c", "tree": "f600a1885faeb16ddb54445235480ae56941a3e7", "parents": [ "c1acb0ba330b3bcf4b110c4ae538f4f80b991fda", "2d5733fcd33dd451022d197cb6b476e970519ca7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 11:38:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 11:38:02 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of tiny USB fixes for 3.4-rc4.\n\n Most of them are in the USB gadget area, but a few other minor USB\n driver and core fixes are here as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (36 commits)\n USB: serial: cp210x: Fixed usb_control_msg timeout values\n USB: ehci-tegra: don\u0027t call set_irq_flags(IRQF_VALID)\n USB: yurex: Fix missing URB_NO_TRANSFER_DMA_MAP flag in urb\n USB: yurex: Remove allocation of coherent buffer for setup-packet buffer\n drivers/usb/misc/usbtest.c: add kfrees\n USB: ehci-fsl: Fix kernel crash on mpc5121e\n uwb: fix error handling\n uwb: fix use of del_timer_sync() in interrupt\n EHCI: always clear the STS_FLR status bit\n EHCI: fix criterion for resuming the root hub\n USB: sierra: avoid QMI/wwan interface on MC77xx\n usb: usbtest: avoid integer overflow in alloc_sglist()\n usb: usbtest: avoid integer overflow in test_ctrl_queue()\n USB: fix deadlock in bConfigurationValue attribute method\n usb: gadget: eliminate NULL pointer dereference (bugfix)\n usb: gadget: uvc: Remove non-required locking from \u0027uvc_queue_next_buffer\u0027 routine\n usb: gadget: rndis: fix Missing req-\u003econtext assignment\n usb: musb: omap: fix the error check for pm_runtime_get_sync\n usb: gadget: udc-core: fix asymmetric calls in remove_driver\n usb: musb: omap: fix crash when musb glue (omap) gets initialized\n ...\n" }, { "commit": "3256251f9850d00c8e4a4fd82440092bb0f1fd7d", "tree": "8326e0a296ed075a78182a19b8e8a4391b72e538", "parents": [ "a104104fd70b5a8d03162468701f499901e250d2" ], "author": { "name": "Francesco Virlinzi", "email": "francesco.virlinzi@st.com", "time": "Wed Apr 18 19:48:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 20:08:44 2012 -0400" }, "message": "stmmac: use custom init/exit functions in pm ops\n\nFreeze and restore can call the custom init/exit functions.\nAlso the patch adds a custom data field that can be used\nfor storing platform data useful on restore the embedded\nsetup (e.g. GPIO, SYSCFG).\n\nSigned-off-by: Francesco Virlinzi \u003cfrancesco.virlinzi@st.com\u003e\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c6f5c93098f5577210f8f3ea22209b3f266c66af", "tree": "bc641dfb6f71b6584cedde4b6721ca716f8bf3d0", "parents": [ "19853301ef3289bda2d5264c1093e74efddaeab9", "d22053cdbd914a6c97ea101adf411a8fd7e282ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd bugfixes from J. Bruce Fields:\n \"One bugfix, and one minor header fix from Jeff Layton while we\u0027re\n here\"\n\n* \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd: include cld.h in the headers_install target\n nfsd: don\u0027t fail unchecked creates of non-special files\n" }, { "commit": "bf1ac5ca6f0dede02635588704d216da474b4baa", "tree": "c231d5e4baed611d37d70aa34a732c41797e18ff", "parents": [ "cbf8f7bb200f5dbdc9ce11243431440720db03dc" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Apr 18 23:19:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 15:18:50 2012 -0400" }, "message": "nf_bridge: remove holes in struct nf_bridge_info\n\nPut use \u0026 mask on same location to avoid two holes on 64bit arches\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e01297ee1ada71e621c8b58a80a28a421a00471", "tree": "b62959354c0b514d95b9829b8395aae12869d3e0", "parents": [ "9b7f43afd417a6feb80841d30ced4051c362eb5d", "21a1416a1c945c5aeaeaf791b63c64926018eb77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 10:28:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 10:28:59 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM updates from Marcelo Tosatti.\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: lock slots_lock around device assignment\n KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context\n KVM: unmap pages from the iommu when slots are removed\n KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset\n" }, { "commit": "dbfad21422f8d2c0866185b3e449c4a6ebaec4e2", "tree": "a30de27f59ddce92ba9b950d5bb1b20ff23191b4", "parents": [ "743e89ebc0215900040b1c2d1563d70a22ac2cb0", "c628ee67fb15a0d8d48351aa2e487c5f14779785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse updates from Miklos Szeredi.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: use flexible array in fuse.h\n fuse: allow nanosecond granularity\n fuse: O_DIRECT support for files\n fuse: fix nlink after unlink\n" }, { "commit": "59ef43e681d103a51c3727dad0315e093f07ec61", "tree": "87f6320f1440ce3ce6c0c15ad3cef8bc98186f88", "parents": [ "91fbe33034c184c6a60e31c2207a2f7ec2f180dc", "b5abcf0219263f4e961dca71cbe26e06c5b0ee68" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 14:17:13 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 14:27:48 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-testmode.c\n\tinclude/net/nfc/nfc.h\n\tnet/nfc/netlink.c\n\tnet/wireless/nl80211.c\n" }, { "commit": "82ea267f7dc853a5e6a724916a70a10656efdfc2", "tree": "74a0377dbdfc759f813f2ac5d0bef4c5727a0765", "parents": [ "02269ab10f1130d35dc35db72ab026d16ba31abf" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Apr 16 21:24:32 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 21:27:07 2012 +0200" }, "message": "mfd: Fix modular builds of rc5t583 regulator support\n\nThe combination of commit 1b1247dd75aa5cf5fae54a3bec7280046e9c7957\n\n \"mfd: Add support for RICOH PMIC RC5T583\"\n\nand commit 6ffc3270210efa2bea526953a142ffc908f5bd86\n\n \"regulator: Add support for RICOH PMIC RC5T583 regulator\"\n\nare causing the i386 allmodconfig builds to fail with this:\n\n ERROR: \"rc5t583_update\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_set_bits\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_clear_bits\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n ERROR: \"rc5t583_read\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n\nand this:\n\n ERROR: \"rc5t583_ext_power_req_config\" [drivers/regulator/rc5t583-regulator.ko] undefined!\n\nFor the 1st four, make the simple ops static inline, instead of\npolluting the namespace with trivial exports. For the last one,\nadd an EXPORT_SYMBOL.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "d22053cdbd914a6c97ea101adf411a8fd7e282ad", "tree": "a4d1f1e7b431169c8d06ad55a9ad5cf9ae4d5d11", "parents": [ "9dc4e6c4d1182d34604ea40fef641775f5b15456" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Mon Apr 16 12:07:02 2012 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Mon Apr 16 15:19:12 2012 -0400" }, "message": "nfsd: include cld.h in the headers_install target\n\nThe cld.h file contains the definition of the upcall format to talk\nwith nfsdcld. When I added the file though, I neglected to add it\nto the headers-y target, so make headers_install wasn\u0027t installing it.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "dcca1cfc0978fa084245937ec1472b870edde97d", "tree": "c72d7bb892a106517416f5c30b1e8e3a88c789a6", "parents": [ "b381fa3229a30f6d7b0e6053314c4a5378c9389d" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Thu Apr 12 14:32:20 2012 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 16 14:19:29 2012 -0400" }, "message": "mac80211: Set the correct values for hwmp (1) and airtimeLinkMetric (1)\n\nPer sections 8.4.2.100.2 and 8.4.2.100.3 of Std 802.11-2012\n\nReported-by: Shinichi Hotori \u003chotorinn@gmail.com\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "edffaa031e50f913f0272516b39dd1cad7aa4aea", "tree": "7addb06d0f2259834cb2bc2b2d007c03752d21a6", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015", "92b0abf80c5c5f0e0d71d1309688a330fd74731b" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 16 08:35:33 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Apr 16 08:35:33 2012 -0700" }, "message": "Merge tag \u0027fixes-for-v3.4-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus\n\nusb: fixes for v3.4-rc cycle\n\nHere are the fixes I have queued for v3.4-rc cycle so far.\n\nIt includes fixes on many of the gadget drivers and a few\nof the UDC controller drivers.\n\nFor musb we have a fix for a kernel oops when unloading\nomap2430.ko glue layer, proper error checking for pm_runtime_*,\nfix for the ULPI transfer block, and a bug fix in musb_cleanup_urb\nroutine.\n\nFor s3c-hsotg we have mostly FIFO-related fixes (proper TX FIFO\nallocation, TX FIFO corruption fix in DMA mode) but also a couple\nof minor fixes (fixing maximum packet size for ep0 and fix for\nbig transfers with DMA).\n\nFor the dwc3 driver we have a memory leak fix, a very important\nfix for USB30CV with SetFeature tests and the hability to handle\nep0 requests bigger than wMaxPacketSize.\n\nOn top of that there\u0027s a bunch of gadget driver minor fixes adding\nproper section annotations, and fixing up the sysfs interface for\ndoing device-initiated connect/disconnect and so on.\n\nAll patches have been pending on the mailing list for quite a while\nand look good for your for-linus branch.\n" }, { "commit": "8eaeb9393397be8eb700ab38a69c450975463b77", "tree": "1f6b9d8d8197b16c19ed0ed03d55886e0c519ba5", "parents": [ "4accdff7a3e397b43e50f605ee561ba7994745c7" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue Apr 03 11:56:51 2012 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 16:45:34 2012 +0200" }, "message": "mfd: Convert twl6040 to i2c driver, and separate it from twl core\n\nComplete the separation of the twl6040 from the twl core since\nit is a separate chip, not part of the twl6030 PMIC.\n\nMake the needed Kconfig changes for the depending drivers at the\nsame time to avoid breaking the kernel build (vibra, ASoC components).\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nReviewed-by: Mark Brown \u003cbroonie@opensource.wolfsonicro.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "4accdff7a3e397b43e50f605ee561ba7994745c7", "tree": "2d47d3fdb69cf2cc01298331cbb883a62bb6674a", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Daniel Lezcano", "email": "daniel.lezcano@linaro.org", "time": "Mon Apr 02 17:55:48 2012 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Apr 16 16:42:43 2012 +0200" }, "message": "mfd : Fix dbx500 compilation error\n\nThe ux500 default config enables the db5500 and the db8500.\nThe incoming cpuidle driver uses the \u0027prcmu_enable_wakeups\u0027\nand the \u0027prcmu_set_power_state\u0027 functions but these ones\nare defined but not implemented for the db5500, leading to\nan unresolved symbol error at link time. In order to compile,\nwe have to disable the db5500 support which is not acceptable\nfor the default config.\n\nI noticed there are also some other functions which are\ndefined but not implemented.\n\nThis patch fix this by removing the functions definitions\nand move out of the config section the empty functions which\nare normally used when the DB550 config is disabled.\nOnly the functions which are not implemented are concerned\nby this modification.\n\nSigned-off-by: Daniel Lezcano \u003cdaniel.lezcano@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "9a8e5d41124a7352e554581333d4d9689dc1526b", "tree": "88e74fe2cdca5ca2d1d5424a728ade00a12f05d3", "parents": [ "12e993b89464707398e4209bd99983e376454985", "708e5978dfee0090a27c5531ce3b017dd6d190a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 15 17:35:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 15 17:35:19 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Nothing too disasterous, the biggest thing being the removal of the\n regulator support for vcore in the AMBA driver; only one SoC was using\n this and it got broken during the last merge window, which then\n started causing problems for other people. Mutual agreement was\n reached for it to be removed.\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7386/1: jump_label: fixup for rename to static_key\n ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE\n ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU\n ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus\n ARM: 7383/1: nommu: populate vectors page from paging_init\n ARM: 7381/1: nommu: fix typo in mm/Kconfig\n ARM: 7380/1: DT: do not add a zero-sized memory property\n ARM: 7379/1: DT: fix atags_to_fdt() second call site\n ARM: 7366/3: amba: Remove AMBA level regulator support\n ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler\n ARM: 7368/1: fault.c: correct how the tsk-\u003e[maj|min]_flt gets incremented\n" }, { "commit": "56845d78cee8576a8160cee8aeac62efdb561ae2", "tree": "f891afed5324d359da1713a80a7131968373acc4", "parents": [ "df8ef8f3aaa6692970a436204c4429210addb23a", "8a9a0ea6032186e3030419262678d652b88bf6a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:19:04 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:19:04 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/atheros/atlx/atl1.c\n\tdrivers/net/ethernet/atheros/atlx/atl1.h\n\nResolved a conflict between a DMA error bug fix and NAPI\nsupport changes in the atl1 driver.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "df8ef8f3aaa6692970a436204c4429210addb23a", "tree": "e214674aeafc01e140cc9d2eb24e5d6fb37b422a", "parents": [ "2b2027124ff1bc420d4a86e37a57feae5e356d2d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:44:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:05 2012 -0400" }, "message": "macvlan: add FDB bridge ops and macvlan flags\n\nThis adds FDB bridge ops to the macvlan device passthru mode.\nAdditionally a flags field was added and a NOPROMISC bit to\nallow users to use passthru mode without the driver calling\ndev_set_promiscuity(). The flags field is a u16 placed in a\n4 byte hole (consuming 2 bytes) of the macvlan_dev struct.\n\nWe want to do this so that the macvlan driver or stack\nabove the macvlan driver does not have to process every\npacket. For the use case where we know all the MAC addresses\nof the endstations above us this works well.\n\nThis patch is a result of Roopa Prabhu\u0027s work. Follow up\npatches are needed for VEPA and VEB macvlan modes.\n\nv2: Change from distinct nopromisc mode to a flags field to\n configure this. This avoids the tendency to add a new\n mode every time we need some slightly different behavior.\nv3: fix error in dev_set_promiscuity and add change and get\n link attributes for flags.\n\nCC: Roopa Prabhu \u003croprabhu@cisco.com\u003e\nCC: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12a94634453c61fd9a11c4702002e3db6d4feb70", "tree": "1131fded53fdab8b912cd14d8240def52166d2f2", "parents": [ "77162022ab26a1f99d3af30c03760a76f86e193d" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:44:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:04 2012 -0400" }, "message": "net: addr_list: add exclusive dev_uc_add and dev_mc_add\n\nThis adds a dev_uc_add_excl() and dev_mc_add_excl() calls\nsimilar to the original dev_{uc|mc}_add() except it sets\nthe global bit and returns -EEXIST for duplicat entires.\n\nThis is useful for drivers that support SR-IOV, macvlan\ndevices and any other devices that need to manage the\nunicast and multicast lists.\n\nv2: fix typo UNICAST should be MULTICAST in dev_mc_add_excl()\n\nCC: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "77162022ab26a1f99d3af30c03760a76f86e193d", "tree": "dabae13dc00b91198c5bed91ebb790942d456081", "parents": [ "136cd14e1ea2bfde66d212d8e18e81552c94e4e3" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Apr 15 06:43:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 13:06:04 2012 -0400" }, "message": "net: add generic PF_BRIDGE:RTM_ FDB hooks\n\nThis adds two new flags NTF_MASTER and NTF_SELF that can\nnow be used to specify where PF_BRIDGE netlink commands should\nbe sent. NTF_MASTER sends the commands to the \u0027dev-\u003emaster\u0027\ndevice for parsing. Typically this will be the linux net/bridge,\nor open-vswitch devices. Also without any flags set the command\nwill be handled by the master device as well so that current user\nspace tools continue to work as expected.\n\nThe NTF_SELF flag will push the PF_BRIDGE commands to the\ndevice. In the basic example below the commands are then parsed\nand programmed in the embedded bridge.\n\nNote if both NTF_SELF and NTF_MASTER bits are set then the\ncommand will be sent to both \u0027dev-\u003emaster\u0027 and \u0027dev\u0027 this allows\nuser space to easily keep the embedded bridge and software bridge\nin sync.\n\nThere is a slight complication in the case with both flags set\nwhen an error occurs. To resolve this the rtnl handler clears\nthe NTF_ flag in the netlink ack to indicate which sets completed\nsuccessfully. The add/del handlers will abort as soon as any\nerror occurs.\n\nTo support this new net device ops were added to call into\nthe device and the existing bridging code was refactored\nto use these. There should be no required changes in user space\nto support the current bridge behavior.\n\nA basic setup with a SR-IOV enabled NIC looks like this,\n\n veth0 veth2\n | |\n ------------\n | bridge0 | \u003c---- software bridging\n ------------\n /\n /\n ethx.y ethx\n VF PF\n \\ \\ \u003c---- propagate FDB entries to HW\n \\ \\\n --------------------\n | Embedded Bridge | \u003c---- hardware offloaded switching\n --------------------\n\nIn this case the embedded bridge must be managed to allow \u0027veth0\u0027\nto communicate with \u0027ethx.y\u0027 correctly. At present drivers managing\nthe embedded bridge either send frames onto the network which\nthen get dropped by the switch OR the embedded bridge will flood\nthese frames. With this patch we have a mechanism to manage the\nembedded bridge correctly from user space. This example is specific\nto SR-IOV but replacing the VF with another PF or dropping this\ninto the DSA framework generates similar management issues.\n\nExamples session using the \u0027br\u0027[1] tool to add, dump and then\ndelete a mac address with a new \"embedded\" option and enabled\nixgbe driver:\n\n# br fdb add 22:35:19:ac:60:59 dev eth3\n# br fdb\nport mac addr flags\nveth0 22:35:19:ac:60:58 static\nveth0 9a:5f:81:f7:f6:ec local\neth3 00:1b:21:55:23:59 local\neth3 22:35:19:ac:60:59 static\nveth0 22:35:19:ac:60:57 static\n#br fdb add 22:35:19:ac:60:59 embedded dev eth3\n#br fdb\nport mac addr flags\nveth0 22:35:19:ac:60:58 static\nveth0 9a:5f:81:f7:f6:ec local\neth3 00:1b:21:55:23:59 local\neth3 22:35:19:ac:60:59 static\nveth0 22:35:19:ac:60:57 static\neth3 22:35:19:ac:60:59 local embedded\n#br fdb del 22:35:19:ac:60:59 embedded dev eth3\n\nI added a couple lines to \u0027br\u0027 to set the flags correctly is all. It\nis my opinion that the merit of this patch is now embedded and SW\nbridges can both be modeled correctly in user space using very nearly\nthe same message passing.\n\n[1] \u0027br\u0027 tool was published as an RFC here and will be renamed \u0027bridge\u0027\n http://patchwork.ozlabs.org/patch/117664/\n\nThanks to Jamal Hadi Salim, Stephen Hemminger and Ben Hutchings for\nvaluable feedback, suggestions, and review.\n\nv2: fixed api descriptions and error case with both NTF_SELF and\n NTF_MASTER set plus updated patch description.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95c961747284a6b83a5e2d81240e214b0fa3464d", "tree": "c7be86a00db3605a48a03109fafcbe31039ca2e0", "parents": [ "5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Apr 15 05:58:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 12:44:40 2012 -0400" }, "message": "net: cleanup unsigned to unsigned int\n\nUse of \"unsigned int\" is preferred to bare \"unsigned\" in net tree.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "586d17c5a01bf1ae4e215adc6c48457eee5482bc", "tree": "20738485061d7965712bc711035883501d02bcc5", "parents": [ "8831a3f2c9ee7d952e6d7a018d11c0c9c5b56749" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Wed Apr 11 20:43:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 15 03:23:31 2012 -0400" }, "message": "virtio-net: send gratuitous packets when needed\n\nAs hypervior does not have the knowledge of guest network configuration, it\u0027s\nbetter to ask guest to send gratuitous packets when needed.\n\nThis patch implements VIRTIO_NET_F_GUEST_ANNOUNCE feature: hypervisor would\nnotice the guest when it thinks it\u0027s time for guest to announce the link\npresnece. Guest tests VIRTIO_NET_S_ANNOUNCE bit during config change interrupt\nand woule send gratuitous packets through netif_notify_peers() and ack the\nnotification through ctrl vq.\n\nWe need to make sure the atomicy of read and ack in guest otherwise we may ack\nmore times than being notified. This is done through handling the whole config\nchange interrupt in an non-reentrant workqueue.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c72e118334a2590f4f07d9e51490b902c33f5280", "tree": "d8974faaaf6afa5afe2b771e3a5390ee6ec97c21", "parents": [ "fd4f2cead6983735a4e6283126b9276873d7ff09" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Apr 12 22:16:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 14 15:24:26 2012 -0400" }, "message": "inet: makes syn_ack_timeout mandatory\n\nThere are two struct request_sock_ops providers, tcp and dccp.\n\ninet_csk_reqsk_queue_prune() can avoid testing syn_ack_timeout being\nNULL if we make it non NULL like syn_ack_timeout\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\nCc: dccp@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2084c24a81413b75bc97e4bee56b32ffece70460", "tree": "299c0e84719c352eea4c79db560912f858b08b33", "parents": [ "668ce0ac707719d866af7e432e518af7b4c575ad" ], "author": { "name": "Lubos Lunak", "email": "l.lunak@suse.cz", "time": "Wed Mar 21 14:08:24 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 14 07:47:49 2012 -0700" }, "message": "do not export kernel\u0027s NULL #define to userspace\n\nGCC\u0027s NULL is actually __null, which allows detecting some questionable\nNULL usage and warn about it. Moreover each platform/compiler should\nhave its own stddef.h anyway (which is different from linux/stddef.h).\n\nSo there\u0027s no good reason to leak kernel\u0027s NULL to userspace and\noverride what the compiler provides.\n\nSigned-off-by: Luboš Luňák \u003cl.lunak@suse.cz\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8dd0b6d4836bce81cece60509ef3b157a420776", "tree": "7a28f327a15443d6c9d091f3d272abd107251ab7", "parents": [ "2d59dcfb54ade45cacc59a6e7bd96b8c19088c3d", "1b2e19f17ed327af6add02978efdf354e4f8e4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 18:07:19 2012 -0700" }, "message": "Merge branch \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block\n\nPull block core bits from Jens Axboe:\n \"It\u0027s a nice and quiet round this time, since most of the tricky stuff\n has been pushed to 3.5 to give it more time to mature. After a few\n hectic block IO core changes for 3.3 and 3.2, I\u0027m quite happy with a\n slow round.\n\n Really minor stuff in here, the only real functional change is making\n the auto-unplug threshold a per-queue entity. The threshold is set so\n that it\u0027s low enough that we don\u0027t hold off IO for too long, but still\n big enough to get a nice benefit from the batched insert (and hence\n queue lock cost reduction). For raid configurations, this currently\n breaks down.\"\n\n* \u0027for-3.4/core\u0027 of git://git.kernel.dk/linux-block:\n block: make auto block plug flush threshold per-disk based\n Documentation: Add sysfs ABI change for cfq\u0027s target latency.\n block: Make cfq_target_latency tunable through sysfs.\n block: use lockdep_assert_held for queue locking\n block: blk_alloc_queue_node(): use caller\u0027s GFP flags instead of GFP_KERNEL\n" }, { "commit": "cf7d8a5550779486524f775c8cf4be9b91365d23", "tree": "0be1d7e7aebcedcd97e1ec9a1af3a190f45a20b4", "parents": [ "4166fb64593514ad920b7dbd290e0a934b37d24a", "39ec0d38141b198f94fd19c2bb10fd7c616510d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 13 12:17:45 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI bug fixes from Grant Likely:\n \"Miscellaneous driver bug fixes. No major changes in this branch.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/imx: prevent NULL pointer dereference in spi_imx_probe()\n spi/imx: mark base member in spi_imx_data as __iomem\n spi/mpc83xx: fix NULL pdata dereference bug\n spi/davinci: Fix DMA API usage in davinci\n spi/pL022: include types.h to remove compilation warnings\n" }, { "commit": "ca8f4fb21d08747013cce9cf1840aa5bfc31f2d8", "tree": "f18de0412ec64d7aa4a26ff85d0ad1c57263dbff", "parents": [ "9a5d2bd99e0dfe9a31b3c160073ac445ba3d773f" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Mon Apr 09 00:24:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 13:09:19 2012 -0400" }, "message": "skbuff: struct ubuf_info callback type safety\n\nThe skb struct ubuf_info callback gets passed struct ubuf_info\nitself, not the arg value as the field name and the function signature\nseem to imply. Rename the arg field to ctx to match usage,\nadd documentation and change the callback argument type\nto make usage clear and to have compiler check correctness.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1e45860f541497d73162305d48b638d9b87e1ae3", "tree": "06b324a3a99a278810c5403af84cf106afea19b4", "parents": [ "34af657916332e89564566bc8d35e3e06cc0c236" ], "author": { "name": "Mark Brown", "email": "broonie@sirena.org.uk", "time": "Fri Apr 13 13:11:50 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Apr 13 14:04:08 2012 +0100" }, "message": "ARM: 7366/3: amba: Remove AMBA level regulator support\n\nThe AMBA bus regulator support is being used to model on/off switches\nfor power domains which isn\u0027t terribly idiomatic for modern kernels with\nthe generic power domain code and creates integration problems on platforms\nwhich don\u0027t use regulators for their power domains as it\u0027s hard to tell\nthe difference between a regulator that is needed but failed to be provided\nand one that isn\u0027t supposed to be there (though DT does make that easier).\n\nPlatforms that wish to use the regulator API to manage their power domains\ncan indirect via the power domain interface.\n\nThis feature is only used with the vape supply of the db8500 PRCMU\ndriver which supplies the UARTs and MMC controllers, none of which have\nsupport for managing vcore at runtime in mainline (only pl022 SPI\ncontroller does). Update that supply to have an always_on constraint\nuntil the power domain support for the system is updated so that it is\nenabled for these users, this is likely to have no impact on practical\nsystems as probably at least one of these devices will be active and\ncause AMBA to hold the supply on anyway.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "69349c2dc01c489eccaa4c472542c08e370c6d7e", "tree": "2422ef07a511d51714e0e16da1ac65c7256e9add", "parents": [ "7c427f45503f77f148cc2b66864e0684c60fa3a0" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 12 19:46:32 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 18:35:58 2012 -0700" }, "message": "kconfig: fix IS_ENABLED to not require all options to be defined\n\nUsing IS_ENABLED() within C (vs. within CPP #if statements) in its\ncurrent form requires us to actually define every possible bool/tristate\nKconfig option twice (__enabled_* and __enabled_*_MODULE variants).\n\nThis results in a huge autoconf.h file, on the order of 16k lines for a\nx86_64 defconfig.\n\nFixing IS_ENABLED to be able to work on the smaller subset of just\nthings that we really have defined is step one to fixing this. Which\nmeans it has to not choke when fed non-enabled options, such as:\n\n include/linux/netdevice.h:964:1: warning: \"__enabled_CONFIG_FCOE_MODULE\" is not defined [-Wundef]\n\nThe original prototype of how to implement a C and preprocessor\ncompatible way of doing this came from the Google+ user \"comex .\" in\nresponse to Linus\u0027 crowdsourcing challenge for a possible improvement on\nhis earlier C specific solution:\n\n\t#define config_enabled(x) (__stringify(x)[0] \u003d\u003d \u00271\u0027)\n\nIn this implementation, I\u0027ve chosen variable names that hopefully make\nhow it works more understandable.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "816a7854d56f19aeba3c83e1ed8c2c0ef275365a", "tree": "c3b82ad98006fc5fa7b408c142e75a6053195dfa", "parents": [ "011e3c63251be832d23df9f0697626ab7b354d02", "7eab0f64a9eba5405222fdef0ede2468bf495efd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 20:12:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 20:12:31 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n" }, { "commit": "011e3c63251be832d23df9f0697626ab7b354d02", "tree": "2cad5b58c274c93ae49d9b58fb15d784d4dfd78f", "parents": [ "c1412fce7eccae62b4de22494f6ab3ff8a90c0c6", "ecca5c3acc0d0933d89abc44e60afb0cc8170e35" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 19:41:23 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 12 19:41:23 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "7c427f45503f77f148cc2b66864e0684c60fa3a0", "tree": "5cd354211d9b926bc16dcf0a02e21911e6d46039", "parents": [ "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "9de29225bdd25958c1fa82521ff02726f1cab953" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:37:21 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg KH:\n \"Here are a number of fixes for the USB core and drivers for 3.4-rc2\n\n Lots of tiny xhci fixes here, a few usb-serial driver fixes and new\n device ids, and a smattering of other minor fixes in different USB\n drivers.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027usb-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (30 commits)\n USB: update usbtmc api documentation\n xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI\n xHCI: use gfp flags from caller instead of GFP_ATOMIC\n xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host\n USB: fix bug of device descriptor got from superspeed device\n xhci: Fix register save/restore order.\n xhci: Restore event ring dequeue pointer on resume.\n xhci: Don\u0027t write zeroed pointers to xHC registers.\n xhci: Warn when hosts don\u0027t halt.\n xhci: don\u0027t re-enable IE constantly\n usb: xhci: fix section mismatch in linux-next\n xHCI: correct to print the true HSEE of USBCMD\n USB: serial: fix race between probe and open\n UHCI: hub_status_data should indicate if ports are resuming\n EHCI: keep track of ports being resumed and indicate in hub_status_data\n USB: fix race between root-hub suspend and remote wakeup\n USB: sierra: add support for Sierra Wireless MC7710\n USB: ftdi_sio: fix race condition in TIOCMIWAIT, and abort of TIOCMIWAIT when the device is removed\n USB: ftdi_sio: fix status line change handling for TIOCMIWAIT and TIOCGICOUNT\n USB: don\u0027t ignore suspend errors for root hubs\n ...\n" }, { "commit": "f4f9c1ac78c5c20150f03c370c2bd7eca44f5127", "tree": "92719848d035ddf5233a297dabb587f95652a975", "parents": [ "3dbc35a339d7c8c756cb159b9ba076fac4e7faeb", "11bbd5b6dae49fd7072ebf5eb63735827bd72f42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 15:36:33 2012 -0700" }, "message": "Merge tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull tty and serial fixes from Greg KH:\n \"Here are some tty and serial fixes for 3.4-rc2.\n\n Most important here is the pl011 fix, which has been reported by about\n 100 different people, which means more people use it than I expected\n :)\n\n There are also some 8250 driver reverts due to some problems reported\n by them. And other minor fixes as well.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.4-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n pch_uart: Add Kontron COMe-mTT10 uart clock quirk\n pch_uart: Fix MSI setting issue\n serial/8250_pci: add a \"force background timer\" flag and use it for the \"kt\" serial port\n Revert \"serial/8250_pci: setup-quirk workaround for the kt serial controller\"\n Revert \"serial/8250_pci: init-quirk msi support for kt serial controller\"\n tty/serial/omap: console can only be built-in\n serial: samsung: fix omission initialize ulcon in reset port fn()\n printk(): add KERN_CONT where needed in hpet and vt code\n tty/serial: atmel_serial: fix RS485 half-duplex problem\n tty: serial: altera_uart: Check for NULL platform_data in probe.\n isdn/gigaset: use gig_dbg() for debugging output\n omap-serial: Fix the error handling in the omap_serial probe\n serial: PL011: move interrupt clearing\n" }, { "commit": "174808af90a06ee59ffedd60c00c252f1f887f25", "tree": "5e026fdc0d2b4d66c0a79267e5755e10d6d04bd8", "parents": [ "778c2dee6f134bf0472ed45eedaee53b4f336afb", "5d949944229b0a08e218723be231731cd86b94f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix bluetooth userland regression reported by Keith Packard, from\n Gustavo Padovan.\n\n 2) Revert ath9k PS idle change, from Sujith Manoharan.\n\n 3) Correct default TCP memory limits (again), from Eric Dumazet.\n\n 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal\n Cardwell.\n\n 5) We made a facility for layers like wireless to say how much tailroom\n they need in the SKB for link layer stuff such as wireless\n encryption etc., but TCP works hard to fill every SKB out to the end\n defeating this specification.\n\n This leads to every TCP packet getting reallocated by the wireless\n code in order to have the right amount of tailroom available.\n\n Fix TCP to only fill SKBs out to the real amount of data area it\n asked for during the allocation, this way it won\u0027t eat into the\n slack added for the device\u0027s tailroom needs.\n\n Reported by Marc Merlin and fixed by Eric Dumazet.\n\n 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh\n Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,\n AceLan Kao, and Andrei Emeltchenko.\n\n 7) OOPS on tty_close fix in bluetooth\u0027s hci_ldisc from Johan Hovold.\n\n 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.\n\n 9) Memleak fix in wext-core from Julia Lawall.\n\n10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,\n from Jozsef Kadlecsik.\n\n11) Validate IP header length properly in netfilter conntrack\u0027s\n ipv4_get_l4proto().\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)\n NFC: Fix the LLCP Tx fragmentation loop\n rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n tcp: avoid order-1 allocations on wifi and tx path\n net: allow pskb_expand_head() to get maximum tailroom\n bridge: Do not send queries on multicast group leaves\n MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n tcp: restore correct limit\n Revert \"ath9k: fix going to full-sleep on PS idle\"\n rt2x00: Fix rfkill_polling register function.\n bcma: fix build error on MIPS; implicit pcibios_enable_device\n netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n net/wireless/wext-core.c: add missing kfree\n rtlwifi: Fix oops on rate-control failure\n mac80211: Convert WARN_ON to WARN_ON_ONCE\n rtlwifi: rtl8192de: Fix firmware initialization\n nl80211: ensure interface is up in various APIs\n ...\n" }, { "commit": "778c2dee6f134bf0472ed45eedaee53b4f336afb", "tree": "8f2d50f1876aeb142f0642ebfc2c39bf877cb222", "parents": [ "e42bd6e4a666709fc3a56cf4577c1f6fdb1c193f", "173fa4eccc39b04fbc0b569fabac6dbcec33507a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 13:58:23 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Mostly exynos and intel.\n\n Intel has 3 regression fixers (more info in intel merge commit), along\n with some other make hw work fixes, exynos has some cleanups and an\n ioctl fix.\n\n A couple of radeon fixes, couple of build fixes, and a savage\n userspace interface possible overflow fix.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (23 commits)\n drm/exynos: fixed exynos broken ioctl\n drm/i915: clear fencing tracking state when retiring requests\n drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv\n drm/exynos: fix struct for operation callback functions to driver name\n drm/exynos: use define instead of default_win member in struct mixer_context\n drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR\n drm/exynos: remove unused codes in hdmi and mixer\n drm/exynos: remove unnecessary type conversion of hdmi and mixer\n drm/i915: make rc6 module parameter read-only\n drm/i915: implement ColorBlt w/a\n drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g\n Revert \"drm/i915: reenable gmbus on gen3+ again\"\n drm/radeon: only add the mm i2c bus if the hw_i2c module param is set\n vgaarb.h: fix build warnings\n drm/i915: properly compute dp dithering for user-created modes\n drm/radeon/kms: fix DVO setup on some r4xx chips\n drm/savage: fix integer overflows in savage_bci_cmdbuf()\n drm/radeon: replace udelay with mdelay for long timeouts\n drm/i915: Finish any pending operations on the framebuffer before disabling\n drm/i915: Removed IVB forced enable of sprite dest key.\n ...\n" }, { "commit": "7e066489726b52bea419085e5b8929e1e89f57a8", "tree": "b144712e5200002b55b45f362ffa1fd53d0389c6", "parents": [ "4abb663b641ee21024906dae45af7de50ebad2d8", "6fa6c8e25e95bdc73e92e4c96b8e3299169b616e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 12:49:56 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irqdomain bug fixes from Grant Likely:\n \"This branch fixes a bug in irq_create_mapping() where an error return\n from irq_alloc_desc_from() gets ignored.\n\n It also removes irq_virq_count to fix a bug on powerpc where the\n irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS\n boundary.\n\n The remaining patches get rid of an completely pointless export and\n fix some minor bugs in the irqdomain debug output.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n irq_domain: Move irq_virq_count into NOMAP revmap\n irqdomain: Fix debugfs formatting\n irq_domain: correct the debugfs file name\n irq: Kill pointless irqd_to_hw export\n irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().\n" }, { "commit": "8112a5c91d781a22d2b631f3295386b0b70de7c8", "tree": "d4239b5d7b2dff9d24b8db793cb6729c23f901c9", "parents": [ "997002785e3f932fd26a0f9c3cd91d4b4861ed29" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 10 19:43:04 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 15:10:33 2012 -0400" }, "message": "NFC: Add a target lost netlink event\n\nSome chips are capable of detecting when a tag is out of the field, so\nthey could send a netlink event about it to userspace.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7eab0f64a9eba5405222fdef0ede2468bf495efd", "tree": "ec99640b8d0b12adbfacb85c27683125debd14f2", "parents": [ "cade455596504fae8e134a27189713ddf7c6d04d", "8065248069097dddf9945acfb2081025e9618c16" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 14:25:14 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 14:41:59 2012 -0400" }, "message": "Merge branch \u0027master\u0027 into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-testmode.c\n\tnet/wireless/nl80211.c\n" } ], "next": "8065248069097dddf9945acfb2081025e9618c16" }