)]}' { "log": [ { "commit": "f8965467f366fd18f01feafb5db10512d7b4422c", "tree": "3706a9cd779859271ca61b85c63a1bc3f82d626e", "parents": [ "a26272e5200765691e67d6780e52b32498fdb659", "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)\n qlcnic: adding co maintainer\n ixgbe: add support for active DA cables\n ixgbe: dcb, do not tag tc_prio_control frames\n ixgbe: fix ixgbe_tx_is_paused logic\n ixgbe: always enable vlan strip/insert when DCB is enabled\n ixgbe: remove some redundant code in setting FCoE FIP filter\n ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp\n ixgbe: fix header len when unsplit packet overflows to data buffer\n ipv6: Never schedule DAD timer on dead address\n ipv6: Use POSTDAD state\n ipv6: Use state_lock to protect ifa state\n ipv6: Replace inet6_ifaddr-\u003edead with state\n cxgb4: notify upper drivers if the device is already up when they load\n cxgb4: keep interrupts available when the ports are brought down\n cxgb4: fix initial addition of MAC address\n cnic: Return SPQ credit to bnx2x after ring setup and shutdown.\n cnic: Convert cnic_local_flags to atomic ops.\n can: Fix SJA1000 command register writes on SMP systems\n bridge: fix build for CONFIG_SYSFS disabled\n ARCNET: Limit com20020 PCI ID matches for SOHARD cards\n ...\n\nFix up various conflicts with pcmcia tree drivers/net/\n{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and\nwireless/orinoco/spectrum_cs.c} and feature removal\n(Documentation/feature-removal-schedule.txt).\n\nAlso fix a non-content conflict due to pm_qos_requirement getting\nrenamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c\n" }, { "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6", "tree": "62e3c413b084c106d750cf6cc0701709cde30100", "parents": [ "21ce849ba5cc178740c6532ba3dded852296ad91" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 00:19:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 00:19:28 2010 -0700" }, "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1", "tree": "d1955a7639e99832590df26466a34d5786a880ae", "parents": [ "2b0b05ddc04b6d45e71cd36405df512075786f1e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 10 05:01:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 10 05:01:31 2010 -0700" }, "message": "net: trans_start cleanups\n\nNow that core network takes care of trans_start updates, dont do it\nin drivers themselves, if possible. Drivers can avoid one cache miss\n(on dev-\u003etrans_start) in their start_xmit() handler.\n\nExceptions are NETIF_F_LLTX drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b49291aca7ea60a3da645c8f9fa8b2d6efee120", "tree": "c8e34980846d4091b375f2440aed768a730c123e", "parents": [ "cf26e8dc419424786575990aa133e76f5fb38657" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 20 14:06:24 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:20 2010 +0200" }, "message": "pcmcia: remove unused mem_op.h\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "c7c2fa079073ab92b0736a161b4cf1051a3e631f", "tree": "c23bb2e89f68601e5c37a1a0df9e83c9e71f9dd6", "parents": [ "ded6a1a341cb38c4cfeb09d3d01ffe16b5c804b3" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 20 19:39:26 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:16 2010 +0200" }, "message": "pcmcia: dev_node removal (drivers with unregister_netdev check)\n\nAs a third step, remove any usage of dev_node_t from drivers which\nonly wrote to this typedef/struct, except to determine whether\nregister_netdev() succeeded previously. However, the function calling\nunregister_netdev() was only ever called by the PCMCIA core if\nregister_netdev() succeeded previously. The lonely exception was\neasily fixed.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "eb14120f743d29744d9475bffec56ff4ad43a749", "tree": "56857094d2b0cfc0ecbd1685f18d6edbe78e140f", "parents": [ "a7debe789dfcaee9c4d81e5738b0be8c5d93930b" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Mar 07 12:21:16 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:13 2010 +0200" }, "message": "pcmcia: re-work pcmcia_request_irq()\n\nInstead of the old pcmcia_request_irq() interface, drivers may now\nchoose between:\n\n- calling request_irq/free_irq directly. Use the IRQ from *p_dev-\u003eirq.\n\n- use pcmcia_request_irq(p_dev, handler_t); the PCMCIA core will\n clean up automatically on calls to pcmcia_disable_device() or\n device ejection.\n\n- drivers still not capable of IRQF_SHARED (or not telling us so) may\n use the deprecated pcmcia_request_exclusive_irq() for the time\n being; they might receive a shared IRQ nonetheless.\n\nCC: linux-bluetooth@vger.kernel.org\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: linux-usb@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7ef527377b88ff05fb122a47619ea506c631c914", "tree": "2c2e774527d5f591b975834f43e8c6fd12fb38f2", "parents": [ "47d29646a2c1c147d8a7598aeac2c87dd71ed638", "1183f3838c588545592c042c0ce15015661ce7f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 21:43:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 22:02:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "2a9151572224ad5fe808058097be94106470a6dc", "tree": "92d51011729fb28f375eccbbae821268c6e6715e", "parents": [ "dacf4fc85bbd063b8108b6c21275ae4a4fcce908" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Apr 24 10:37:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 14:47:45 2010 -0700" }, "message": "smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt()\n\nsmc91c92_cs:\n * spin_unlock_irqrestore before calling smc_interrupt() in media_check()\n to avoid lockup.\n * use spin_lock_irqsave for ethtool function.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1703b36c358dde24ececba4fd609ecd91433ba3", "tree": "d59c333d0ad5bf72f165264eba6048c87fdc4e0f", "parents": [ "7ec75c582e639d956ce3afd499f67febe6f902a4", "e95ef5d3f6bc60433883e1ef65dac747acd0bf1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e100.c\n\tdrivers/net/e1000e/netdev.c\n" }, { "commit": "df245dce572bc22b230a05532a3f9daee50effb5", "tree": "ae2dbed36263a6e42bc671c42efd15bf0531c342", "parents": [ "bc8e4b954e463716a57d8113dd50ae9d47b682a7" ], "author": { "name": "Alexander Kurz", "email": "akurz@blala.de", "time": "Fri Apr 16 03:01:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 16:27:55 2010 -0700" }, "message": "net: 3c574_cs fix stats.tx_bytes counter\n\nUpdate the stats counter calculation in 3c574_cs, similar\nto the method used in 3c589_cs. This corrects the contents\nof the counter on tests using a \"Megahertz 574B\" card.\n\n[linux@dominikbrodowski.net: clean up commit message]\nSigned-off-by: Alexander Kurz \u003clinux@kbdbabel.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dad1e54b121d93ed47690d77736af63d3f11d657", "tree": "36fdd29537e43bbb4f36252e010a591ae6fe20bc", "parents": [ "1253332f75f3774cc84d0b7693152656848901f9", "0110d6f22f392f976e84ab49da1b42f85b64a3c5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 05:01:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 05:01:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/pcmcia/smc91c92_cs.c\n\tdrivers/net/virtio_net.c\n" }, { "commit": "a6d37024de02e7cb2b2333e438e71355a9c32a0a", "tree": "853b95d30667255020ba6461ffc9eb10492d1c8f", "parents": [ "4ffa87012efd7b664762b579213d4663560ef4a3" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Apr 10 12:50:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 03:03:16 2010 -0700" }, "message": "smc91c92_cs: define multicast_table as unsigned char\n\nsmc91c92_cs:\n * define multicast_table as unsigned char\n * remove unnecessary \"#ifndef final_version\"\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "cb4361c1dc29cd870f664c004b1817106fbce0fa", "tree": "c31533210d738c9074b21b8f31fe0399b39545f0", "parents": [ "309361e09ca9e9670dc8664e5d14125bf82078af", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 06 08:34:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 06 08:34:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)\n smc91c92_cs: fix the problem of \"Unable to find hardware address\"\n r8169: clean up my printk uglyness\n net: Hook up cxgb4 to Kconfig and Makefile\n cxgb4: Add main driver file and driver Makefile\n cxgb4: Add remaining driver headers and L2T management\n cxgb4: Add packet queues and packet DMA code\n cxgb4: Add HW and FW support code\n cxgb4: Add register, message, and FW definitions\n netlabel: Fix several rcu_dereference() calls used without RCU read locks\n bonding: fix potential deadlock in bond_uninit()\n net: check the length of the socket address passed to connect(2)\n stmmac: add documentation for the driver.\n stmmac: fix kconfig for crc32 build error\n be2net: fix bug in vlan rx path for big endian architecture\n be2net: fix flashing on big endian architectures\n be2net: fix a bug in flashing the redboot section\n bonding: bond_xmit_roundrobin() fix\n drivers/net: Add missing unlock\n net: gianfar - align BD ring size console messages\n net: gianfar - initialize per-queue statistics\n ...\n" }, { "commit": "fb9e2d887243499b8d28efcf80821c4f6a092395", "tree": "d5b7e9411e7a06dc1d599e9a4e0961db5125d3ca", "parents": [ "93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Apr 03 15:07:10 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 15:07:10 2010 -0700" }, "message": "smc91c92_cs: fix the problem of \"Unable to find hardware address\"\n\n\nsmc91c92_cs:\n *cvt_ascii_address returns 0, if success.\n *call free_netdev, if we can\u0027t find hardware address.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22bedad3ce112d5ca1eaf043d4990fa2ed698c87", "tree": "b6fba5688d48b1396f01d13ee53610dea7749c15", "parents": [ "a748ee2426817a95b1f03012d8f339c45c722ae1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Apr 01 21:22:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 14:22:15 2010 -0700" }, "message": "net: convert multicast list to list_head\n\nConverts the list and the core manipulating with it to be the same as uc_list.\n\n+uses two functions for adding/removing mc address (normal and \"global\"\n variant) instead of a function parameter.\n+removes dev_mcast.c completely.\n+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for\n manipulation with lists on a sandbox (used in bonding and 80211 drivers)\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f64e96973a1fa885ce6e4f7e3fdbae83de98fcab", "tree": "a71e26ab65b5a43b8dfdade00cd3903544c92243", "parents": [ "e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8" ], "author": { "name": "Alexander Kurz", "email": "linux@kbdbabel.org", "time": "Wed Mar 31 02:42:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 01 19:53:13 2010 -0700" }, "message": "net/pcmcia/3c589_cs: using netdev_info and friends where appropriate\n\nSigned-off-by: Alexander Kurz \u003clinux@kbdbabel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "1546a713ae1f066f83469cdd99ebdf500d6a65e4", "tree": "051a925bfe5bef3ef660ed49db5201850fd6906e", "parents": [ "a2fd940f4cff74b932728bd6ca12848da21a0234" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Mar 27 10:55:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 27 16:41:28 2010 -0700" }, "message": "pcnet_cs: add new id\n\npcnet_cs:\n *add new id (Allied Telesis LM33-PCM-T Lan\u0026Modem multifunction card)\n *use PROD_ID for LA-PCM.(because LA-PCM and LM33-PCM-T use the same MANF_ID).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47871889c601d8199c51a4086f77eebd77c29b0b", "tree": "40cdcac3bff0ee40cc33dcca61d0577cdf965f77", "parents": [ "c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3", "30ff056c42c665b9ea535d8515890857ae382540" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tdrivers/firmware/iscsi_ibft.c\n" }, { "commit": "60bbc725b5b3009bb1bf2628ce5033d9bc108881", "tree": "31ceade401c813052cd6d42570d54d90b62e51a6", "parents": [ "46976c042ba1ff59253f2f7a513099175c24794e" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Feb 27 13:34:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 01:03:05 2010 -0800" }, "message": "axnet_cs: add new id\n\naxnet_cs:\n add new id (corega PCC-TXM)\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d37a371b6869920e6c40c495c68eabba1ef3909", "tree": "dad784512b13832f4f5494cfe0791965c6a2b0f6", "parents": [ "ef1a8de8ea004a689b2aa9f5cefcba2b1a0262f2", "7b4884ca8853a638df0eb5d251d80d67777b8b1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:18:30 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:18:30 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)\n pcmcia: validate late-added resources\n pcmcia: allow for extension of resource interval\n pcmcia: remove useless msleep in ds.c\n pcmcia: use read_cis_mem return value\n pcmcia: handle error in serial_cs config calls\n pcmcia: add locking to pcmcia_{read,write}_cis_mem\n pcmcia: avoid prod_id memleak\n pcmcia: avoid sysfs-related lockup for cardbus\n pcmcia: use state machine for extended requery\n pcmcia: delay re-scanning and re-querying of PCMCIA bus\n pcmcia: use pccardd to handle eject, insert, suspend and resume requests\n pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking\n pcmcia: use mutex for dynid lock\n pcmcia: assert locking to struct pcmcia_device\n pcmcia: add locking documentation\n pcmcia: simplify locking\n pcmcia: add locking to struct pcmcia_socket-\u003epcmcia_state()\n pcmcia: protect s-\u003edevice_count\n pcmcia: properly lock skt-\u003eirq, skt-\u003eirq_mask\n pcmcia: lock ops-\u003eset_socket\n ...\n" }, { "commit": "91fea5858418127ad33e0060f726c62be0047eaf", "tree": "3630384b91fe22565ac4eadc7dddd0d7720bf958", "parents": [ "2f1eb65f366b81aa3c22c31e6e8db26168777ec5" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Fri Feb 19 08:48:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 19 13:15:50 2010 -0800" }, "message": "net/pcmcia: convert to use netdev_for_each_mc_addr\n\nremoved fill_multicast_tbl function in smc91c92_cs and do the work inline\n\nrewritten set_addresses function in xirc2ps_cs. This was kinda headache.\nSimulated the original and new functions and they bahave the same.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5", "tree": "99f57f6374a58022e1e5ed1cbc12699288c7eae1", "parents": [ "8e5574211d96c0552f84c757718475fdb4021be7" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Feb 08 04:30:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 11:38:58 2010 -0800" }, "message": "net: use netdev_mc_count and netdev_mc_empty when appropriate\n\nThis patch replaces dev-\u003emc_count in all drivers (hopefully I didn\u0027t miss\nanything). Used spatch and did small tweaks and conding style changes when\nit was suitable.\n\nJirka\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2", "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf", "parents": [ "257ddbdad13cd3c4f7d03b85af632c508aa8abc9", "b473946a0853860e13b51c28add5524741117786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d", "tree": "ebe69072c18645f4e9aa5bac33e61140910f8ebc", "parents": [ "fa4281bbbcb44d1f8bdac894ad0696535272cc43" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Fri Jan 22 11:56:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:52 2010 -0800" }, "message": "fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n\nfmvj18x_cs, serial_cs:\n add new id\n Panasonic lan \u0026 modem card (model name:AL-VML101)\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cd2e18fe785082b132d960063df83a02acc9a4f2", "tree": "1f0e9400e87f0c97ca89051bfc46bbf6d3cf81fe", "parents": [ "933a838aa1aae8388438bb002fbdaf6fca519a5c" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jan 01 17:43:08 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Jan 17 18:30:06 2010 +0100" }, "message": "pcmcia: remove remaining unused IRQ_FIRST_SHARED parameter\n\nKomuro pointed out correctly that I missed one IRQ_FIRST_SHARED\nparameter in smc91c92_cs.c, and that another line could be writter\nmore beautifully.\n\nCC: netdev@vger.kernel.org\nCC: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "597d8c717856f6094837850f3eb4850820b36451", "tree": "44c1b1115df6a80f6cee3684a01cdbc18b034134", "parents": [ "682137f7e6bc78e3c324874c0c213123ddc5e261", "9db2f1bec36805e57a003f7bb90e003815d96de8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)\n sky2: Fix oops in sky2_xmit_frame() after TX timeout\n Documentation/3c509: document ethtool support\n af_packet: Don\u0027t use skb after dev_queue_xmit()\n vxge: use pci_dma_mapping_error to test return value\n netfilter: ebtables: enforce CAP_NET_ADMIN\n e1000e: fix and commonize code for setting the receive address registers\n e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value\n e1000e: perform 10/100 adaptive IFS only on parts that support it\n e1000e: don\u0027t accumulate PHY statistics on PHY read failure\n e1000e: call pci_save_state() after pci_restore_state()\n netxen: update version to 4.0.72\n netxen: fix set mac addr\n netxen: fix smatch warning\n netxen: fix tx ring memory leak\n tcp: update the netstamp_needed counter when cloning sockets\n TI DaVinci EMAC: Handle emac module clock correctly.\n dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips\n ixgbe: Fix compiler warning about variable being used uninitialized\n netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()\n mv643xx_eth: don\u0027t include cache padding in rx desc buffer size\n ...\n\nFix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c\n" }, { "commit": "d4a66e752d0b19934dd208884f8605fe385aaaa9", "tree": "72fb727be1d7636aae9cddfe9aa93ac9dec75daf", "parents": [ "bdbec4b86ee99b020e159f9bd604003a3ae3b0ab", "fa15e99b6bb44aa86b241a43ca8c509e91f80153" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/benet/be_cmds.h\n\tinclude/linux/sysctl.h\n" }, { "commit": "c91aa55e7e65be11d68dffb66be5f7a44506fb54", "tree": "9187c48ff5b625a603762fe20052a95375a95d57", "parents": [ "569b7892fe09dd6502bdadb7cf5e7acce907c1a1" ], "author": { "name": "Alexander Beregalov", "email": "a.beregalov@gmail.com", "time": "Wed Jan 06 13:05:46 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 07 01:07:30 2010 -0800" }, "message": "pcmcia: ncmlan_cs: remove odd bracket\n\nSigned-off-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abe8806901086b6cb29b4d4d4c616bbff3f0e7e1", "tree": "761b006fa598ceb3a093068b6bfa3621f5ab6088", "parents": [ "7ad6848c7e81a603605fad3f3575841aab004eea" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Wed Jan 06 20:37:58 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 06 20:37:58 2010 -0800" }, "message": "pcnet_cs: add cis of KTI PE520 pcmcia network card\n\npcnet_cs,serial_cs:\n\nadd cis of KTI PE520 pcmcia network card,\nand serial card(Sierra Wireless AC860).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ceba0b29e002e6151b6b5ead8db9c664b58d8d21", "tree": "72b05dd8d1764e86a938ced330c6cbff84dfb2ae", "parents": [ "ee983ac76865797a5553597a9412c835c2710f51" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Mon Dec 28 15:17:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 21:52:44 2010 -0800" }, "message": "axnet_cs: remove unnecessary spin_unlock_irqrestore\n\naxnet_cs:\n remove unnecessary spin_unlock_irqrestore,spin_lock_irqsave.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59be2e04e50ac9947e4356c10099f49977f5f74d", "tree": "56aa00a4499a1543da8728cb84b10bec5b211280", "parents": [ "e69381b4175ba162229646f6753ff1d87c24d468", "503914cf4a4b5dbe3f844e0a92f412ae99fde70e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:33:18 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:33:18 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)\n net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2\n ixgbe: allow tx of pre-formatted vlan tagged packets\n ixgbe: Fix 82598 premature copper PHY link indicatation\n ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters\n bcm63xx_enet: fix compilation failure after get_stats_count removal\n packet: dont call sleeping functions while holding rcu_read_lock()\n tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.\n ipvs: zero usvc and udest\n netfilter: fix crashes in bridge netfilter caused by fragment jumps\n ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery\n sky2: leave PCI config space writeable\n sky2: print Optima chip name\n x25: Update maintainer.\n ipvs: fix synchronization on connection close\n netfilter: xtables: document minimal required version\n drivers/net/bonding/: : use pr_fmt\n can: CAN_MCP251X should depend on HAS_DMA\n drivers/net/usb: Correct code taking the size of a pointer\n drivers/net/cpmac.c: Correct code taking the size of a pointer\n drivers/net/sfc: Correct code taking the size of a pointer\n ...\n" }, { "commit": "fb1beb29b5c531b12485d7c32174a77120590481", "tree": "cb7d1d9733d351ae0ec7acda4851b27acd10abca", "parents": [ "478e4e9d7a618379676b17e64583ff3622f2fec5", "9fea84f46a821aa1ff2d034ffda8ad33bff48015" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 12:33:02 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 12:33:02 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: CodingStyle fixes\n pcmcia: remove unused IRQ_FIRST_SHARED\n" }, { "commit": "671c8806c25d06407e348690c09d7c37521eda32", "tree": "dac56b7f12e713ad149c35f7d1e1a866c627b1d7", "parents": [ "e0802793f6f65242760089d8d85a50098706dd26" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Dec 12 14:44:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 13 19:47:43 2009 -0800" }, "message": "3c574_cs: disable irq before calling el3_interrupt\n\n3c574_cs, 3c589_cs:\n\tdisable irq before calling el3_interrupt\n\tin the media_check function.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e15c1c1f3f903f679c9782b540f9d52c80c99610", "tree": "dc7c18f9f783b0f1c689e5ddd3ae7873421912eb", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:12:06 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Dec 07 22:23:24 2009 +0100" }, "message": "pcmcia: remove unused IRQ_FIRST_SHARED\n\nKomuro pointed out that IRQ_FIRST_SHARED is not used at all in the\nPCMCIA subsystem, so remove it. Also, remove two bogus assignments.\n\nCC: Karsten Keil \u003ckeil@b1-systems.de\u003e\nCC: netdev@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "28b4d5cc17c20786848cdc07b7ea237a309776bb", "tree": "bae406a4b17229dcce7c11be5073f7a67665e477", "parents": [ "d29cecda036f251aee4947f47eea0fe9ed8cc931", "96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 05 15:22:26 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 05 15:22:26 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tdrivers/net/pcmcia/fmvj18x_cs.c\n\tdrivers/net/pcmcia/nmclan_cs.c\n\tdrivers/net/pcmcia/xirc2ps_cs.c\n\tdrivers/net/wireless/ray_cs.c\n" }, { "commit": "d9b2c4d0b03c721808c0d259e43a27f1e80205bc", "tree": "f17a4166f62ee14faa1401a6cbd353a4ab8c77cb", "parents": [ "27d16d08717faeaa8afd1b736a096dbaab90f08e", "5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)\n pcmcia: rework the irq_req_t typedef\n pcmcia: remove deprecated handle_to_dev() macro\n pcmcia: pcmcia_request_window() doesn\u0027t need a pointer to a pointer\n pcmcia: remove unused \"window_t\" typedef\n pcmcia: move some window-related code to pcmcia_ioctl.c\n pcmcia: Change window_handle_t logic to unsigned long\n pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_release_window()\n drivers/pcmcia: remove unnecessary kzalloc\n pcmcia: correct handling for Zoomed Video registers in topic.h\n pcmcia: fix printk formats\n pcmcia: autoload module pcmcia\n pcmcia/staging: update comedi drivers\n PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket\n PCMCIA: ss: allow PCI IRQs \u003e 255\n PCMCIA: soc_common: remove \u0027dev\u0027 member from soc_pcmcia_socket\n PCMCIA: soc_common: constify soc_pcmcia_socket ops member\n PCMCIA: sa1111: remove duplicated initializers\n PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data\n ...\n" }, { "commit": "8e95a2026f3b43f7c3d676adaccd2de9532e8dcc", "tree": "3733318168cd512480b6db58c5c16d1c8847f0b7", "parents": [ "3454f835837609d60b29a266e3bd9d701073b060" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Dec 03 07:58:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 03 13:18:01 2009 -0800" }, "message": "drivers/net: Move \u0026\u0026 and || to end of previous line\n\nOnly files where David Miller is the primary git-signer.\nwireless, wimax, ixgbe, etc are not modified.\n\nCompile tested x86 allyesconfig only\nNot all files compiled (not x86 compatible)\n\nAdded a few \u003e 80 column lines, which I ignored.\nExisting checkpatch complaints ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044", "tree": "2bf23e13308ef683302ff5a92af0ae8bc37c1b60", "parents": [ "dd2e5a156525f11754d9b1e0583f6bb49c253d62" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 17:24:46 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:03:14 2009 +0100" }, "message": "pcmcia: rework the irq_req_t typedef\n\nMost of the irq_req_t typedef\u0027d struct can be re-worked quite\neasily:\n\n(1) IRQInfo2 was unused in any case, so drop it.\n\n(2) IRQInfo1 was used write-only, so drop it.\n\n(3) Instance (private data to be passed to the IRQ handler):\n\tMost PCMCIA drivers using pcmcia_request_irq() to actually\n\tregister an IRQ handler set the \"dev_id\" to the same pointer\n\tas the \"priv\" pointer in struct pcmcia_device. Modify the two\n\texceptions (ipwireless, ibmtr_cs) to also work this waym and\n\tset the IRQ handler\u0027s \"dev_id\" to p_dev-\u003epriv unconditionally.\n\n(4) Handler is to be of type irq_handler_t.\n\n(5) Handler !\u003d NULL already tells whether an IRQ handler is present.\n\tTherefore, we do not need the IRQ_HANDLER_PRESENT flag in\n\tirq_req_t.Attributes.\n\nCC: netdev@vger.kernel.org\nCC: linux-bluetooth@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: Jaroslav Kysela \u003cperex@perex.cz\u003e\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: Karsten Keil \u003cisdn@linux-pingi.de\u003e\nfor the Bluetooth parts: Acked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "dd2e5a156525f11754d9b1e0583f6bb49c253d62", "tree": "f64b680eec9c4ca7da4fe635031a94a3bbf5ebee", "parents": [ "6838b03fc6564ea07d0cd87ea6e198d90ab1fc3e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Nov 03 10:27:34 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:03:10 2009 +0100" }, "message": "pcmcia: remove deprecated handle_to_dev() macro\n\nUpdate remaining users and remove deprecated handle_to_dev() macro\n\nCC: Harald Welte \u003claforge@gnumonks.org\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "6838b03fc6564ea07d0cd87ea6e198d90ab1fc3e", "tree": "bf14e1ea71482dacfdad97ac9d3f895050946406", "parents": [ "82f88e36004162f49a9340ffbbaebe89016e4835" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Nov 03 01:31:52 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:02:58 2009 +0100" }, "message": "pcmcia: pcmcia_request_window() doesn\u0027t need a pointer to a pointer\n\npcmcia_request_window() only needs a pointer to struct pcmcia_device, not\na pointer to a pointer.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Karsten Keil \u003ckeil@b1-systems.de\u003e (for ISDN)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "0bdf9b3dd3cfa5cbd5d55172c19f5dd166208e17", "tree": "a7af14eb0601a443343240cbb11d7693db9de352", "parents": [ "16456ebabfec3f8f509fc18b45f256d066a1b360" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Dec 13 19:46:53 2006 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:02:50 2009 +0100" }, "message": "pcmcia: Change window_handle_t logic to unsigned long\n\nLogic changes based on top of the other patches:\n\nThis set of patches changed window_handle_t from being a pointer to an\nunsigned long. The unsigned long is now a simple index into socket-\u003ewin[].\nGoing from a pointer to unsigned long should leave the user space interface\nunchanged unless I\u0027m mistaken.\n\nThis change results in code that is less error prone and a user space\ninterface which is much cleaner and safer. A nice side effect is that we\nare also are able to remove all members except one from window_t.\n\n[ linux@dominikbrodowski.net:\n\tUpdate to 2.6.31. Also, a plain \"index\" to socket-\u003ewin[] does not\n\twork, as several codepaths rely on \"window_handle_t\" being\n\tnon-zero if used. Therefore, set the window_handle_t to the\n\tsocket-\u003ewin[] index + 1. ]\n\nCC: netdev@vger.kernel.org\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "868575d1e87ff2091800aea816972ddb46de60d5", "tree": "95c50968098815dfe066e960922c4be3b003b27f", "parents": [ "f5560da549ea2e32dd41e36548c0e7dee3d4aabb" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Dec 13 19:46:43 2006 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:02:13 2009 +0100" }, "message": "pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()\n\nNo logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page()\n\n[linux@dominikbrodowski.net: update to 2.6.31]\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Karsten Keil \u003ckeil@b1-systems.de\u003e (for ISDN)\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "f5560da549ea2e32dd41e36548c0e7dee3d4aabb", "tree": "604c41db48ba2e497857ceb2137099d2f0d96d3b", "parents": [ "78a14e273d93dfbea9673f9b10398c538096302d" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Dec 13 19:46:38 2006 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:01:26 2009 +0100" }, "message": "pcmcia: Pass struct pcmcia_device to pcmcia_release_window()\n\nNo logic changes, just pass struct pcmcia_device to pcmcia_release_window().\n\n[linux@dominikbrodowski.net: update to 2.6.31]\nCC: netdev@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "dddcb445a33c80bca11a6566364935e681c85809", "tree": "cf20ac36ff41adab8e8253fdd754a4eaa3344614", "parents": [ "4c9ba61e9e0212fd79da9a26f7b3d47de4a56a24" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Nov 18 08:21:04 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 10:48:38 2009 -0800" }, "message": "drivers/net: remove exceptional \u0026 on function name\n\nIn this file, function names are otherwise used as pointers without \u0026.\n\nA simplified version of the semantic patch that makes this change is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r@\nidentifier f;\n@@\n\nf(...) { ... }\n\n@@\nidentifier r.f;\n@@\n\n- \u0026f\n+ f\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8489992e723b5def1a807e615854f51b75d10600", "tree": "98bed4e92e417583b7b55cf3e49ff89e0c5e4c9f", "parents": [ "b3ccbb24e8914973be0d2ee7b66e44cecaed9bf5" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sat Nov 07 12:04:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 10 20:28:53 2009 -0800" }, "message": "pcnet-cs: declare MODULE_FIRMWARE\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dd0fab5b940c0b65f26ac5b01485bac1f690ace6", "tree": "5730c0c243949e935ea982efa79ed1cd06cc2297", "parents": [ "e773cfe167c320d07b9423bc51fc4ab0221775a4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Oct 24 15:51:05 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Nov 09 08:30:00 2009 +0100" }, "message": "pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (net)\n\nConvert PCMCIA drivers to use the dynamic debug infrastructure, instead of\nrequiring manual settings of PCMCIA_DEBUG. Only some rare debug checks are\nnow hidden behind \"#ifdef DEBUG\" or \"#if 0\".\n\nAlso, remove all usages of the CS_CHECK macro and replace them with proper\nLinux style calling and return value checking. The extra error reporting may\nbe dropped, as the PCMCIA core already complains about any (non-driver-author)\nerrors.\n\nCC: netdev@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "dddfbd824b96a25da0b2f1cf35c0be33ef2422fe", "tree": "0f48f2883bd00ec5f15d8d32a3c826a3184f47ba", "parents": [ "91284224da5b15ec6c2b45e10fa5eccd1c92a204" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 23:54:24 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 18:23:05 2009 +0100" }, "message": "pcmcia: convert net pcmcia drivers to use new CIS helpers\n\nUse the new CIS helpers in net pcmcia drivers, which allows for\na few code cleanups.\n\nThis revision does not remove the phys_addr assignment in\n3c589_cs.c -- a bug noted by Komuro \u003ckomurojun-mbn@nifty.com\u003e\n\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: netdev@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "aaa8cfdada648a6bae32f62df76cc60137a2b323", "tree": "c610da3b895ed6fdcda058dc08962b0248624c98", "parents": [ "7d2e8d00b47b973c92db4df7444d5e6d3bb945f9" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 18:28:39 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 18:06:53 2009 +0100" }, "message": "pcmcia: use pcmcia_loop_config in misc pcmcia drivers\n\nUse pcmcia_loop_config() in a few drivers missed during the first\nround. On fmvj18x_cs.c it -- strangely -- only requries us to set\nconf.ConfigIndex, which is done by the core, so include an empty\nloop function which returns 0 unconditionally.\n\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: David Sterba \u003cdsterba@suse.cz\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nFor the ipwireless part: Acked-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7d2e8d00b47b973c92db4df7444d5e6d3bb945f9", "tree": "22286fa095d0340245e83ca9c7695f42f65c141a", "parents": [ "6ae3b84d979308671bf6f6a2123c258a8603d61c" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 18:22:32 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 18:06:32 2009 +0100" }, "message": "pcmcia: use pre-determined values\n\nA few PCMCIA network drivers can make use of values provided by the pcmcia\ncore, instead of tedious, independent CIS parsing.\n\nxirc32ps_cs.c: manf_id\n\nhostap_cs.c: multifunction count\n\nb43/pcmcia.c: ConfigBase address and \"Present\"\n\nsmc91c92_cs.c: By default, mhz_setup() can use VERS_1 as it is stored\nin struct pcmcia_device. Only some cards require workarounds, such as\nreading out VERS_1 twice.\n\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nAcked-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "63ca2d74ea4f9c7a7ac082c915609a7b224908e7", "tree": "46694f40b10e22eed907a23df5303a754e04d9c7", "parents": [ "207d6e8760c6a3323bf5ab098dbaa5c9d03bda83" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Oct 17 15:39:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 22:51:25 2009 -0700" }, "message": "pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card\n\npcnet_cs,serial_cs:\n\nadd cis of PreMax ethernet pcmcia card,\nand some Sierra Wireless serial card(AC555, AC7xx, AC8xx).\n\nuse PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3eef534c50ad39654e247f88dc01e6a3f76b6b4", "tree": "c643c196e032261c55c0095f7cf04822cce7442d", "parents": [ "ab854b24a2113ec0c17343e72d22b8876930d0a3" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Tue Oct 13 00:32:55 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 00:35:55 2009 -0700" }, "message": "3c574_cs: spin_lock the set_multicast_list function\n\n3c574_cs:\n spin_lock the set_multicast_list function.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf6fda63c452205f0e240ed8c511db5693857e93", "tree": "9a7100c35267907ec372d1918ad888328d833fee", "parents": [ "9c501935a3cdcf6b1d35aaee3aa11c7a7051a305" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Mon Oct 05 00:40:03 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 05 00:40:03 2009 -0700" }, "message": "pcnet_cs: add cis of National Semicondoctor\u0027s multifunction pcmcia card\n\npcnet_cs,serial_cs:\n \nadd cis of National Semicondoctor\u0027s lan\u0026modem mulitifunction pcmcia card,\nNE2K, tamarack ethernet card,\nand some serial card(COMpad2, COMpad4).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03b88a66c040acb4b770221ca24a609527b47fc5", "tree": "0cae69a39246db005e048960d74c1e273434d20a", "parents": [ "44c852ead55b7450c8cff0dc90a3d48310300210" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Sat Sep 12 09:08:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 22 13:59:59 2009 -0700" }, "message": "pcmcia: pcnet_cs.c removing useless condition\n\n\u0027if (i \u003c NR_INFO)\u0027 will only true if we breaks from \u0027for (i \u003d 0; i \u003c NR_INFO; i++)\u0027\nSo removing useless \u0027if (i \u003c NR_INFO)\u0027\n\nThis also fixed following compilation warning :\n\n CC [M] drivers/net/pcmcia/pcnet_cs.o\ndrivers/net/pcmcia/pcnet_cs.c: In function ‘get_hwinfo’:\ndrivers/net/pcmcia/pcnet_cs.c:321: warning: ‘base’ may be used uninitialized in this function\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "531afd64d027e3d798c416b2b37b3cfb1de417d9", "tree": "112e6ad542a7e44fac465261afa693dcd95b8a8c", "parents": [ "29a020d35f629619c67fa5e32acaaac3f8a1ba90" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Tue Sep 15 02:42:25 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 15 02:42:25 2009 -0700" }, "message": "pcnet_cs: add cis of Linksys multifunction pcmcia card\n\npcnet_cs,serial_cs:\n \nadd cis of Linksys lan\u0026modem mulitifunction pcmcia card\nand some modem card(MT5634ZLX, RS-COM-2P).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0fa0ee053aaa53939306376719450cfe56e33e3b", "tree": "dcfa68400c09f079f260d1df9db2e47e4be2f2ea", "parents": [ "7ab0f2736bfe137a82a7084bbfb5f809da95cabd" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Sep 03 10:41:17 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 03 20:02:12 2009 -0700" }, "message": "netdev: Convert MDIO ioctl implementation to use struct mii_ioctl_data\n\nA few drivers still access the arguments to MDIO ioctls as an array of\nu16. Convert them to use struct mii_ioctl_data.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ab0f2736bfe137a82a7084bbfb5f809da95cabd", "tree": "e305ec96eceebb285efee4b6fd307822ab257fe6", "parents": [ "aae5e7c30fc660c50dfecbdd745799b05af90f01" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Sep 03 10:39:43 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 03 20:02:11 2009 -0700" }, "message": "netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations\n\ndev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the\ndriver\u0027s implementation of MDIO ioctls.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbf02fae406daf4d583a279743869c686024c341", "tree": "38e926bdd4b445d1b51f263b2f5c7d3d749e6e43", "parents": [ "4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:13:34 2009 -0700" }, "message": "netdev: convert pcmcia drivers to netdev_tx_t\n\nUpdate all the pcmcia network drivers for netdev_tx_t.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bdf50d7346588b22fd66367ae2890e2cbf574172", "tree": "02ff2f4405a85da65528545da751b33be742ca88", "parents": [ "ab4c0c77b566bbac25e28c7ae487dc02bdd8f343" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Sun Aug 09 03:05:25 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 21:54:57 2009 -0700" }, "message": "net: pcmcia/axnet_cs: includecheck fix axnet_cs.c\n\nfix the following \u0027make includecheck\u0027 warning:\n\n drivers/net/pcmcia/axnet_cs.c: linux/etherdevice.h is included more than once.\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa11d958d1a6572eda08214d7c6a735804fe48a5", "tree": "d025b05270ad1e010660d17eeadc6ac3c1abbd7d", "parents": [ "07f6642ee9418e962e54cbc07471cfe2e559c568", "9799218ae36910af50f002a5db1802d576fffb43" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tarch/microblaze/include/asm/socket.h\n" }, { "commit": "74d154189d597b91da4322996dbf4f5c3d1544ab", "tree": "6f09861b5e2f875d2d8ea2127b16add9103221c6", "parents": [ "5a6338db37885af06760d40cad589316e48431e9", "ffafa60d496f80c250f2ae0340ae94434c0b0b4d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwmc3200wifi/netdev.c\n\tnet/wireless/scan.c\n" }, { "commit": "402168cee1a0b791c54c54a68ae21bb26880f40b", "tree": "127b1bd8f2d06b18449998022eaab1c20baab950", "parents": [ "12e8ffe35eaca1411afc1f3124478f8e2b65eedc", "a947a39d52f5b647a2fd5eca55d39e722a2fa90f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 09:49:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 09:49:58 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)\n sky2: Avoid races in sky2_down\n drivers/net/mlx4: Adjust constant\n drivers/net: Move a dereference below a NULL test\n drivers/net: Move a dereference below a NULL test\n connector: maintainer/mail update.\n USB host CDC Phonet network interface driver\n macsonic, jazzsonic: fix oops on module unload\n macsonic: move probe function to .devinit.text\n can: switch carrier on if device was stopped while in bus-off state\n can: restart device even if dev_alloc_skb() fails\n can: sja1000: remove duplicated includes\n New device ID for sc92031 [1088:2031]\n 3c589_cs: re-initialize the multicast in the tc589_reset\n Fix error return for setsockopt(SO_TIMESTAMPING)\n netxen: fix thermal check and shutdown\n netxen: fix deadlock on dev close\n netxen: fix context deletion sequence\n net: Micrel KS8851 SPI network driver\n tcp: Use correct peer adr when copying MD5 keys\n tcp: Fix MD5 signature checking on IPv4 mapped sockets\n ...\n" }, { "commit": "e445bb4ed677f8df0d4f8c1abc15c668bd182f28", "tree": "9f4499b3b0d5273915d9f4ad6c72adb28345b635", "parents": [ "f249fb783092471a4808e5fc5bda071d2724810d" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sun Jul 19 13:08:12 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 08:26:55 2009 -0700" }, "message": "3c589_cs: re-initialize the multicast in the tc589_reset\n\n3c589_cs:\nre-initialize the multicast in the tc589_reset,\nand spin_lock the set_multicast_list function.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad361c9884e809340f6daca80d56a9e9c871690a", "tree": "7ec02c9934964fecdc791a0df0fc722d3bda5c53", "parents": [ "e3288775ff63900fbb7db505f2b9a1bee98f07df" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 06 13:05:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 10:30:03 2009 -0700" }, "message": "Remove multiple KERN_ prefixes from printk formats\n\nCommit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f (\"printk: clean up\nhandling of log-levels and newlines\") changed printk semantics. printk\nlines with multiple KERN_\u003clevel\u003e prefixes are no longer emitted as\nbefore the patch.\n\n\u003clevel\u003e is now included in the output on each additional use.\n\nRemove all uses of multiple KERN_\u003clevel\u003es in formats.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6ed106549d17474ca17a16057f4c0ed4eba5a7ca", "tree": "b98c09081509b3a9757339b6b66779e4126dfa29", "parents": [ "0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 23 06:03:08 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 05 19:16:04 2009 -0700" }, "message": "net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions\n\nThis patch is the result of an automatic spatch transformation to convert\nall ndo_start_xmit() return values of 0 to NETDEV_TX_OK.\n\nSome occurences are missed by the automatic conversion, those will be\nhandled in a seperate patch.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c3dd308adbda61f2ab46a14a0adcca8e1338ea5", "tree": "1d0db5b9d98bc52ee9dba85b08419a77de2dc345", "parents": [ "1e9d9987598fa58f4bd8e72ee152c879136d6723" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Jul 04 14:17:10 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 05 18:03:27 2009 -0700" }, "message": "pcnet_cs: add new id\n\nadd new id (RIOS System PC CARD3 ETHERNET).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b548140225c6bbbbd560551dd1048b2c0ce58be", "tree": "9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8", "parents": [ "5b2c4b972c0226406361f83b747eb5cdab51e68e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 06:22:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:50 2009 -0700" }, "message": "net: use symbolic values for ndo_start_xmit() return codes\n\nConvert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.\n\n0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases\nwhere its in direct proximity to one of the other values.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0a3a1538d57dfb51c73d012cbb72f985cd419aa", "tree": "660d030b3d55a98f0500d45fa4c678a9508e5f46", "parents": [ "88d7d8b00cdc3117150faab4c4ace6d464b71c22" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Fri May 01 19:21:26 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 01 19:21:26 2009 -0700" }, "message": "3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card\n\n3c589_cs,3c574_cs,serial_cs:\n\n (1)add cis(firmware) of 3Com lan\u0026modem mulitifunction pcmcia card.\n (2)load correct configuration register for 3Com card\n \nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99b28c47091db2bb7f594a5088831d341a800a33", "tree": "2b45cc65298ec8ac7d60927760b089e7794383c3", "parents": [ "1a44cc3778f63dca5795708da2a2a7696da7fd61" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Apr 18 13:44:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 21 02:06:14 2009 -0700" }, "message": "pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM\n\npcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad3620a072bc1ba93b0146f6f5467ae928b449a6", "tree": "4fcde271fe0a8c55d31ca2eacff822bfd88c3e7c", "parents": [ "57579f7629a3d46c307405fbd2ea6bdb650d692f" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Apr 04 14:49:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 06 17:07:54 2009 -0700" }, "message": "axnet_cs: fix phy_id detection for bogus Asix chip.\n\naxnet_cs:\n\n(1) Some Asix phy return bogus value except 0 or 0xffff.\n Skip this phy_id.\n\n(2) Some Asix chip need to set \"select Internal PHY\" bit\n at AX88190_init.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75bf758f906315820cada99c169bd89bab3f4ba2", "tree": "88086747f64b17e412dfc3dc3fb43f13ae5906bf", "parents": [ "4b6ece97e0b61306d4b8de6820f602e4cf5d8d6b" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinderrajput@gmail.com", "time": "Mon Mar 30 20:19:54 2009 +0530" }, "committer": { "name": "Jaswinder Singh Rajput", "email": "jaswinderrajput@gmail.com", "time": "Mon Mar 30 20:25:13 2009 +0530" }, "message": "smc91c92_cs: use request_firmware\n\nAdded osi_load_firmware() instead of copying same thing twice\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\n" }, { "commit": "3dd205165e076eacf09575f0c90031e7c52bc5e1", "tree": "5057f55e9389d3484c490f15317b8fad17f99678", "parents": [ "9b31b6971f448796768860e3c9ee2d22f4511731" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 22:37:56 2009 -0700" }, "message": "axnet: convert to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b31b6971f448796768860e3c9ee2d22f4511731", "tree": "ee3db16d639da5383a1a746d72a222539b977704", "parents": [ "6fb7298cdbe200b3b19cd59046785aecb0844198" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:10 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 22:37:56 2009 -0700" }, "message": "smc91c92: convert to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fb7298cdbe200b3b19cd59046785aecb0844198", "tree": "fb8d6a01f90781f42de99aca14ea914c8426b2e0", "parents": [ "0cd6e828a3cfb9c5bb71827ae6ee1564bf465f48" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 22:37:55 2009 -0700" }, "message": "smc91c92: convert to internal net_device_stats\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0cd6e828a3cfb9c5bb71827ae6ee1564bf465f48", "tree": "e24b513a9ff85639ab7ea656f177316baf8c00fd", "parents": [ "6394d7c9a2c4c5d729c1cdb69f96f9fff16ec232" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:08 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 22:37:55 2009 -0700" }, "message": "xirc2ps: convert to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6394d7c9a2c4c5d729c1cdb69f96f9fff16ec232", "tree": "ecfe45bff3383a0d1d918ee9926d4f0c8c450957", "parents": [ "23169a402d6a2d55992e6b7f6157ae04b636545a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:39 2009 -0700" }, "message": "xir2cps: convert to internal net_device stats\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23169a402d6a2d55992e6b7f6157ae04b636545a", "tree": "e0b2f62e649ecdb701c2cff3213985e14ab28781", "parents": [ "28b1801d5a367adaf3d02605c762a59781d99664" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:39 2009 -0700" }, "message": "pcnet: convert driver to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28b1801d5a367adaf3d02605c762a59781d99664", "tree": "7f360248baffdbe5fb77f790f057525acab961dc", "parents": [ "496f98cd5687770f4cb463c300510016dfbc81f6" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:38 2009 -0700" }, "message": "pcmcia: convert nmclan driver to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "496f98cd5687770f4cb463c300510016dfbc81f6", "tree": "dce64778ce5514273928be68d48f47d6257a139e", "parents": [ "d63cd426ba55a9e02ab745612357ee00158824a5" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:04 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:38 2009 -0700" }, "message": "pcmcia: convert fmvj18x driver to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d63cd426ba55a9e02ab745612357ee00158824a5", "tree": "85e56a481b0f13cf1a6529961414197d1c58df15", "parents": [ "fb72e2ff356e55b6a60c5883d4506175652c3e9d" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:03 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:36 2009 -0700" }, "message": "pcmcia: convert fmvj18x driver to internal net_device_stats\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fb72e2ff356e55b6a60c5883d4506175652c3e9d", "tree": "d7fd4323f82ced410f013701a05407aba0b60e69", "parents": [ "97161d4b2a28857f217b2035b2141cbb36f22f8b" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:36 2009 -0700" }, "message": "pcmcia: convert 3c574 to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97161d4b2a28857f217b2035b2141cbb36f22f8b", "tree": "bb28ed816f4f92384b789a8b21d3acae77df1b75", "parents": [ "0f2166dff6440bb6fb39e4fbe7bfca7cde95d650" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri Mar 20 19:36:01 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 19:55:35 2009 -0700" }, "message": "pcmcia: convert 3c589 to net_device_ops\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "508827ff0ac3981d420edac64a70de7f4e304d38", "tree": "b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5", "parents": [ "2c3c3d02f28801d7ad2da4952b2c7ca6621ef221", "72e2240f181871675d3a979766330c91d48a1673" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/tokenring/tmspci.c\n\tdrivers/net/ucc_geth_mii.c\n" }, { "commit": "b9bdcd9bd78d253dcc8e13c29f0acd67e080e7c1", "tree": "6ee1908315df4e2347c16eb63fee6bd2762a749b", "parents": [ "858b9ced6e73a0f087294c398a1ae70a7eeed94f" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Mar 04 00:05:56 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 04 00:11:52 2009 -0800" }, "message": "net pcmcia: worklimit reaches -1\n\nwith while (--worklimit \u003e\u003d 0); worklimit reaches -1 after the loop. In\n3c589_cs.c this caused a warning not to be printed.\n\nIn 3c574_cs.c contrastingly, el3_rx() treats worklimit differently:\n\nstatic int el3_rx(struct net_device *dev, int worklimit)\n{\n\twhile (--worklimit \u003e\u003d 0) { ... }\n\treturn worklimit;\n}\n\nel3_rx() is only called by function el3_interrupt(): twice:\n\nstatic irqreturn_t el3_interrupt(int irq, void *dev_id)\n{\n int work_budget \u003d max_interrupt_work;\n\twhile(...) {\n\t\tif (...)\n\t\t\twork_budget \u003d el3_rx(dev, work_budget);\n\t\tif (...)\n\t\t\twork_budget \u003d el3_rx(dev, work_budget);\n\t\tif (--work_budget \u003c 0) {\n\t\t ...\n\t\t break;\n\t\t}\n\t}\n}\nThe error path can occur 2 too early.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ae038512ced0f179abd4d2387786cc69d2fb801", "tree": "eb14a97d47ef6c137ea9b82332adb659d808f31a", "parents": [ "1aef47c411f4b4b6bb9c8ebcdb703d3a20de1551" ], "author": { "name": "Hannes Eder", "email": "hannes@hanneseder.net", "time": "Sat Feb 14 11:39:23 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 17 17:37:58 2009 -0800" }, "message": "drivers/net/pcmcia: fix warning: format not a string literal and no ...\n\nImpact: Use \u0027static const char[]\u0027 instead of \u0027static char[]\u0027 and while\nbeing at it prefix the message with KERN_INFO.\n\nFix this warnings:\n drivers/net/pcmcia/axnet_cs.c:1716: warning: format not a string literal and no format arguments\n\nSigned-off-by: Hannes Eder \u003channes@hanneseder.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a9d3a146923d374b945aa388dc884df69564a818", "tree": "a01e1faec249543330b905d878dbb92536974b56", "parents": [ "67dd82462d553c35bef14de1bf8afcb1095e041d" ], "author": { "name": "Cord Walter", "email": "qord@cwalter.net", "time": "Tue Feb 03 15:14:05 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 03 15:14:05 2009 -0800" }, "message": "pcnet_cs: Fix misuse of the equality operator.\n\nSigned-off-by: Cord Walter \u003cqord@cwalter.net\u003e\nSigned-off-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa2ba5f1082dc705745899584aac8416d710c056", "tree": "bde0bf4aff036c6bac19a0212194ae1092afb3c9", "parents": [ "68024541e2e5a8f35e281daaa5068a29e2a538a5", "f6f7b52e2f6149d2ee365717afff315b05720162" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 02 19:50:27 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 02 19:50:27 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/ixgbe/ixgbe_main.c\n\tdrivers/net/smc91x.c\n" }, { "commit": "e1825e7515010053e44287e6e78f9078cd1916a9", "tree": "6c0a2a64926b8063ba934b7083f5f43011b43990", "parents": [ "5d279dcf98350ac3cbfa43c6aa62f4305408f2df", "44ae98b53961e7c8c1d47bbffaf08c4f7bf29249" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 02 15:55:05 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 02 15:55:05 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)\n MAINTAINERS: add netdev to ATM\n ATM: horizon, fix hrz_probe fail path\n pppol2tp: Add missing sock_put() in pppol2tp_release()\n net: Fix soft lockups/OOM issues w/ unix garbage collector\n macvlan: don\u0027t broadcast PAUSE frames to macvlan devices\n Phonet: fix oops in phonet_address_del() on non-Phonet device\n netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock\n sungem: Fix PCS_MIICTRL register write in gem_init_phy().\n net: make skb_truesize_bug() call WARN()\n net: hp-plus uses eip_poll\n net/wireless/reg.c: fix bad WARN_ON in if statement\n ath5k: disable beacon filter when station is not associated\n ath5k: fix Security issue in DebugFS part of ath5k\n ath9k: correct expected max RX buffer size\n ath9k: Fix SW-IOMMU bounce buffer starvation\n mac80211 : Fix setting ad-hoc mode and non-ibss channel\n iwlagn: fix DMA sync\n phylib: Add Vitesse VSC8221 SGMII PHY\n rose: zero length frame filtering in af_rose.c\n bridge: netfilter: fix update_pmtu crash with GRE\n ...\n" }, { "commit": "8814b5050d183f00a25a087b550841797c0c2775", "tree": "89239332c224f222e1ebea2cbe8609a2624592e9", "parents": [ "43ced651d1272ced02ed5f1c2abc79e3354187f6" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sat Nov 22 17:35:44 2008 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 30 10:03:37 2008 -0800" }, "message": "section misannotation in ibmtr_cs\n\nibmtr_resume() is calling ibmtr_probe(), which is devinit. Whether\nthat\u0027s the right thing to do there is a separate question, but\nsince it\u0027s PCMCIA and thus will never compile without HOTPLUG...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5b9ab2ec04ec1e1e53939768805612ac191d7ba2", "tree": "22d29905c148d2d743b3eccb585fbe60fb91e25a", "parents": [ "851fd7bd88524bb4e20f3def3127cd9167d6d0cf", "3ec192559033ed457f0d7856838654c100fc659f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 26 23:48:40 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 26 23:48:40 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/hp-plus.c\n\tdrivers/net/wireless/ath5k/base.c\n\tdrivers/net/wireless/ath9k/recv.c\n\tnet/wireless/reg.c\n" }, { "commit": "70eb1bfd52e97120eddf9b5aaabfe1ecdf4eb663", "tree": "e0123387eaea3111876c793da672e96bc09592a1", "parents": [ "6f756a8c36bf54d0afb1d457082b3e3033d951a7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 23 20:01:59 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 23 20:01:59 2008 -0800" }, "message": "axnet_cs: Fix build after net device ops ne2k conversion.\n\nCommit 4e4fd4e485ad63a9074ff09a9b53ffc7a5c594ec (\"ne2k: convert to\nnet_device_ops\") exported some ei_* symbols from the 8390 library,\nbut the axnet_cs driver defines local static versions of the same\nfunctions.\n\nRename them to avoid the namespace conflict.\n\nReported by Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ece4af18e07a5cea592ca095844783db4a349cb2", "tree": "fa255d783be2026f94bb88cfe989dd9956bcbb24", "parents": [ "7e56b5d698707a9934833c47b24d78fb0bcaf764" ], "author": { "name": "Qinghuang Feng", "email": "qhfeng.kernel@gmail.com", "time": "Sun Nov 23 15:46:55 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 23 15:46:55 2008 -0800" }, "message": "driver/net/*: remove redundant argument comments\n\nremove redundant argument comments in files of drivers/net/*\n\nSigned-off-by: Qinghuang Feng \u003cqhfeng.kernel@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "208fbec5bec1de4fce48aab41efde11ba25ab04c", "tree": "4b196bce4edcd353aafc244681c696b9a861e5ea", "parents": [ "6436cbcd735a11fc93bf3353c68914bc545e6d1e" ], "author": { "name": "Cord Walter", "email": "cord.walter@gmx.de", "time": "Thu Nov 20 13:46:57 2008 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 21 16:06:12 2008 -0800" }, "message": "axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411\n\nHi,\n\nafter noticing that my Netgear FA411 (PCMCIA-NIC) [1] stopped working with\nthe release of the 2.6.25 kernel (sidux-version), I checked the\nrespective driver sources and noticed that the pcnet_cs driver bailed\nout with \"use axnet_cs instead\" for the Netgear FA411, but axnet_cs\ndoesn\u0027t claim this ID.\n\nI compiled a kernel with the PCMCIA-ID for the netgear card moved to\naxnet_cs from pcnet_cs which worked. I then contacted sidux-kernel\nmaintainer Stefan Lippers-Hollmann who turned the info into this patch\nand integrated it into the kernel:\n\n\u003chttp://svn.berlios.de/svnroot/repos/fullstory/linux-sidux-2.6/trunk/debian/patches/features/2.6.27.4_PCMCIA_move-PCMCIA-ID-for-Netgear-FA411-from-pcnet_cs-to-axnet_cs.patch\u003e\n\nThis works for me and AFAIK there were no reports of any breakage for\nother devices on sidux-support.\n\nThis looks like a trivial patch, but since I have very limited\nexperience with kernel modifications I might be woefully wrong there.\nBut if there are no side effects of this patch, is it possible to get it\ninto the official kernel?\n\nI can provide more detailed information on the affected hardware if\nnecessary.\n\n-cord\n\n[1]\nSocket 1 Device 0: [axnet_cs] (bus ID: 1.0)\n Configuration: state: on\n Product Name: NETGEAR FA411 Fast Ethernet\n Identification: manf_id: 0x0149 card_id: 0x0411\n function: 6 (network)\n prod_id(1): \"NETGEAR\" (0x9aa79dc3)\n prod_id(2): \"FA411\" (0x40fad875)\n prod_id(3): \"Fast Ethernet\" (0xb4be14e3)\n prod_id(4): --- (---)\n\nFrom: Stefan Lippers-Hollmann \u003cs.l-h@gmx.de\u003e\nDate: Sat, 1 Nov 2008 23:53:04 +0000\nSubject: PCMCIA: move PCMCIA ID for Netgear FA411 from pcnet_cs to axnet_cs:\n\nSince kernel 2.6.25, commit 61da96be07ec860e260ca4af0199b9d48d000b80\n(pcnet_cs: if AX88190-based card, printk \"use axnet_cs instead\" message.),\npcnet_cs bails out with \"use axnet_cs instead\" for the Netgear FA411, but\naxnet_cs doesn\u0027t claim this ID.\n\nSocket 1 Device 0: [axnet_cs] (bus ID: 1.0)\n Configuration: state: on\n Product Name: NETGEAR FA411 Fast Ethernet\n Identification: manf_id: 0x0149 card_id: 0x0411\n function: 6 (network)\n prod_id(1): \"NETGEAR\" (0x9aa79dc3)\n prod_id(2): \"FA411\" (0x40fad875)\n prod_id(3): \"Fast Ethernet\" (0xb4be14e3)\n prod_id(4): --- (---)\n\nCc: stable \u003cstable@kernel.org\u003e [2.6.25, 2.6.26, 2.6.27]\nSigned-off-by: Stefan Lippers-Hollmann \u003cs.l-h@gmx.de\u003e\nSigned-off-by: Cord Walter \u003cqord@cwalter.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4cf1653aa90c6320dc8032443b5e322820aa28b1", "tree": "7920008d3f953defdcda8c81d39da963290d93ad", "parents": [ "454d7c9b14e20fd1949e2686e9de4a2926e01476" ], "author": { "name": "Wang Chen", "email": "wangchen@cn.fujitsu.com", "time": "Wed Nov 12 23:38:14 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 12 23:38:14 2008 -0800" }, "message": "netdevice: safe convert to netdev_priv() #part-2\n\nWe have some reasons to kill netdev-\u003epriv:\n1. netdev-\u003epriv is equal to netdev_priv().\n2. netdev_priv() wraps the calculation of netdev-\u003epriv\u0027s offset, obviously\n netdev_priv() is more flexible than netdev-\u003epriv.\nBut we cann\u0027t kill netdev-\u003epriv, because so many drivers reference to it\ndirectly.\n\nThis patch is a safe convert for netdev-\u003epriv to netdev_priv(netdev).\nSince all of the netdev-\u003epriv is only for read.\nBut it is too big to be sent in one mail.\nI split it to 4 parts and make every part smaller than 100,000 bytes,\nwhich is max size allowed by vger.\n\nSigned-off-by: Wang Chen \u003cwangchen@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8272061fe533f6d0261b38c58c93bd0855baebe", "tree": "e24d9f60cc726dd9ea1316ddae0b826c1279b07c", "parents": [ "fd9abb3d97c2ab883e4732ec1214fe64190236e7" ], "author": { "name": "Komuro", "email": "komurojun-mbn@nifty.com", "time": "Mon Nov 03 10:56:04 2008 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Fri Nov 07 03:21:10 2008 -0500" }, "message": "fmvj18x_cs: write interrupt ack bit for lan and modem to work simultaneously.\n\nWrite interrupt ack bit in fjn_interrupt for lan and modem to work\nsimultaneously.\n\nSigned-off-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "babcda74e9d96bb58fd9c6c5112dbdbff169e695", "tree": "fcbe5e70f1fff01ad49504171e964c387a5ad7f8", "parents": [ "ab2910921064b657610a3b501358a305e13087ea" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 03 21:11:17 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 03 21:11:17 2008 -0800" }, "message": "drivers/net: Kill now superfluous -\u003elast_rx stores.\n\nThe generic packet receive code takes care of setting\nnetdev-\u003elast_rx when necessary, for the sake of the\nbonding ARP monitor.\n\nDrivers need not do it any more.\n\nSome cases had to be skipped over because the drivers\nwere making use of the -\u003elast_rx value themselves.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e174961ca1a0b28f7abf0be47973ad57cb74e5f0", "tree": "e8f74ecd420a0e380a71670e5aec5c2a0c15640a", "parents": [ "0c68ae2605dbcf67414d8d1f19af93be44b355fb" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Mon Oct 27 15:59:26 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 27 17:06:18 2008 -0700" }, "message": "net: convert print_mac to %pM\n\nThis converts pretty much everything to print_mac. There were\na few things that had conflicts which I have just dropped for\nnow, no harm done.\n\nI\u0027ve built an allyesconfig with this and looked at the files\nthat weren\u0027t built very carefully, but it\u0027s a huge patch.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b225ee5bed70254a100896c473e6dd8c2be45c18", "tree": "2f044d5898d15edcff858f624618c788d5b58760", "parents": [ "2e532d68a2b3e2aa6b19731501222069735c741c", "95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 17 08:58:52 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 17 08:58:52 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)\n ipv4: Add a missing rcu_assign_pointer() in routing cache.\n [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit\n xen-netfront: Avoid unaligned accesses to IP header\n lmc: copy_*_user under spinlock\n [netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA\n" } ], "next": "dc976c09da4e13b2b3fda23cca9d0682d1de7213" }