)]}' { "log": [ { "commit": "fb09bafda67041b74a668dc9d77735e36bd33d3b", "tree": "2dd32b65062a95045468fdcab366ecdb8e4fcac6", "parents": [ "94b5aff4c6f72fee6b0f49d49e4fa8b204e8ded9", "c3c6cc91b0ae7b3d598488ad0b593bafba4a0817" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 16:34:21 2012 -0700" }, "message": "Merge tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree changes from Greg Kroah-Hartman:\n \"Here is the big staging tree pull request for the 3.5-rc1 merge\n window.\n\n Loads of changes here, and we just narrowly added more lines than we\n added:\n 622 files changed, 28356 insertions(+), 26059 deletions(-)\n\n But, good news is that there is a number of subsystems that moved out\n of the staging tree, to their respective \"real\" portions of the\n kernel.\n\n Code that moved out was:\n\t- iio core code\n\t- mei driver\n\t- vme core and bridge drivers\n\n There was one broken network driver that moved into staging as a step\n before it is removed from the tree (pc300), and there was a few new\n drivers added to the tree:\n\t- new iio drivers\n\t- gdm72xx wimax USB driver\n\t- ipack subsystem and 2 drivers\n\n All of the movements around have acks from the various subsystem\n maintainers, and all of this has been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFixed up various trivial conflicts, along with a non-trivial one found\nin -next and pointed out by Olof Johanssen: a clean - but incorrect -\nmerge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually\nas per Stephen Rothwell.\n\n* tag \u0027staging-3.5-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)\n Staging: bcm: Remove two unused variables from Adapter.h\n Staging: bcm: Removes the volatile type definition from Adapter.h\n Staging: bcm: Rename all \"INT\" to \"int\" in Adapter.h\n Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h\n Staging: bcm: Correctly format all comments in Adapter.h\n Staging: bcm: Fix all whitespace issues in Adapter.h\n Staging: bcm: Properly format braces in Adapter.h\n Staging: ipack/bridges/tpci200: remove unneeded casts\n Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant\n Staging: ipack: remove board_name and bus_name fields from struct ipack_device\n Staging: ipack: improve the register of a bus and a device in the bus.\n staging: comedi: cleanup all the comedi_driver \u0027detach\u0027 functions\n staging: comedi: remove all \u0027default N\u0027 in Kconfig\n staging: line6/config.h: Delete unused header\n staging: gdm72xx depends on NET\n staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices\n staging: drm/omap: initial dmabuf/prime import support\n staging: drm/omap: dmabuf/prime mmap support\n pstore/ram: Add ECC support\n pstore/ram: Switch to persistent_ram routines\n ...\n" }, { "commit": "d210267741fb2a8b6d741d9040703683a39087f4", "tree": "bfc1cdf7925644367cec4c82f2a5fb6d4c51a8eb", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a", "5bb196ad29c58c3e69dde8ed34b99a07c0719e7f" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 11:48:07 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed May 02 11:48:07 2012 -0700" }, "message": "Merge 3.4-rc5 into staging-next\n\nThis resolves the conflict in:\n\tdrivers/staging/vt6656/ioctl.c\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\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": "48159f009f5f92ef5962e7c278ac615d74242fa5", "tree": "3594ca5b6e7a47e1822ea27ed4b1201aa930fef7", "parents": [ "5b76d0600b2b08eef77f8e9226938b7b6bde3099" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Mon Apr 16 05:22:12 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:31:59 2012 -0400" }, "message": "drivers/net/wan/farsync.c: add missing iounmap\n\nFree card-\u003emem in the error-handling code since it was successfully\nallocated just above.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd9071ec61db42074a6343427b7999436021ffd2", "tree": "bd62323b94e7fcae0ea54106d843aa12d72082e5", "parents": [ "a8cb05b238e0edfd7c63f496d9ce3e238ea68a16" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Fri Apr 13 04:33:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 14 15:29:02 2012 -0400" }, "message": "net: Fix spelling typo in net\n\nCorrect spelling typo within drivers/net.\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eff98db027c50f1e4ad14f1d9069d55e5f7e4319", "tree": "6688b906abe22d29ff83ac0ac89150fcc80d0abe", "parents": [ "a680b30a53668e299d487117ded7b76a069abc77" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Fri Apr 13 18:41:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 14 15:20:04 2012 -0400" }, "message": "net/wan: use module_pci_driver\n\nThis patch converts the drivers in drivers/net/wan/* to use\nmodule_pci_driver() macro which makes the code smaller and a bit simpler.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91ceae374e1ece88c8f575259ee0ad7da28ae8ab", "tree": "bb348b134a334d4f9ef723bb2d5bfad2ea9ff769", "parents": [ "b330f606ed7591dc078acd856454e3a383299fb3" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Wed Apr 11 11:14:57 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Apr 13 10:57:04 2012 -0700" }, "message": "NET: pc300, move to staging as it is broken\n\nIt was marked as BROKEN back in 2008. It is because the tty handling\nin the driver is really broken.\n\nThere was some activity in January 2012 to fix the driver, but the\npatch was commented to be bogus:\n https://lkml.org/lkml/2012/1/29/160\nand we have not heard back from the author since then:\n https://lkml.org/lkml/2012/3/28/412\n\nSo since nobody stepped in and rewrote the driver, it is time to move\nit out of line now. And drop it some time later if nobody comes up\nwith patches to fix the driver in staging.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Andrea Shepard \u003candrea@persephoneslair.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "970e2486492aa1eb47a436a5a4c81e92558986a9", "tree": "5c321b58b536695b513f21b9b8d5431f0db88ac5", "parents": [ "096015236df46c64be8b86e41fd4e28522e5f7e5" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Fri Mar 30 13:37:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 16:03:15 2012 -0700" }, "message": "Documentation: remove references to /etc/modprobe.conf\n\nUsage of /etc/modprobe.conf file was deprecated by module-init-tools and\nis no longer parsed by new kmod tool. References to this file are\nreplaced in Documentation, comments and Kconfig according to the\ncontext.\n\nThere are also some references to the old /etc/modules.conf from 2.4\nkernels that are being removed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "ac4e016df4bf57cdb100170c5cc057a15a9c96bd", "tree": "78cdfd267a495345d53c5010ec2fa6dd96d39d42", "parents": [ "c2f128a1fed866dca94d52b3f0b1e40726e2352a" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Mar 05 14:52:04 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 11:47:01 2012 -0800" }, "message": "NET: pc300, show version info from module init\n\nAgain, no need to do that from the pci probe function.\n\nHmm, I noticed this driver is marked as BROKEN. Won\u0027t touch it more,\nit has to be converted to dynamic tty driver allocation first.\n\nPerhaps it is time to move it to staging?\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c2f128a1fed866dca94d52b3f0b1e40726e2352a", "tree": "ad1c76107d9ce2d1dc613aa8d5d3ff257b45633d", "parents": [ "ecaa3bda65cefebfce11cc7be4b8d9203f5ce12c" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Mar 05 14:52:03 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 08 11:47:01 2012 -0800" }, "message": "NET: pc300, do not zero global variables\n\nThey are in .bss which is initialized to zeros when the module is\nloaded/kernel booted.\n\nWhat a strange way to do the initialization once in the pci probe\nroutine...\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "f2cedb63df14342ad40a8b5b324fc5d94a60b665", "tree": "bebdbe0f98c216e59849bc3adb85f8abf5aadc2b", "parents": [ "a1e785e02bb53573443c7e58a444cef1a049f6ce" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Wed Feb 15 06:45:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 15 15:34:16 2012 -0500" }, "message": "net: replace random_ether_addr() with eth_hw_addr_random()\n\nReplace usage of random_ether_addr() with eth_hw_addr_random()\nto set addr_assign_type correctly to NET_ADDR_RANDOM.\n\nChange the trivial cases.\n\nv2: adapt to renamed eth_hw_addr_random()\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e404decb0fb017be80552adee894b35307b6c7b4", "tree": "19b2324328eb1f8cef599f9f164dc9ca6e5699c9", "parents": [ "5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jan 29 12:56:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 31 16:20:21 2012 -0500" }, "message": "drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages\n\nalloc failures use dump_stack so emitting an additional\nout-of-memory message is an unnecessary duplication.\n\nRemove the allocation failure messages.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb93992207dadb946a3b5cf4544957dc924a6f58", "tree": "8d840ea0e0e5eb3cf6207a2608d434475a9076b4", "parents": [ "3db1cd5c05f35fb43eb134df6f321de4e63141f2" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Dec 19 14:08:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 22:27:29 2011 -0500" }, "message": "module_param: make bool parameters really bool (net \u0026 drivers/net)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\n(Thanks to Joe Perches for suggesting coccinelle for 0/1 -\u003e true/false).\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d97a077a15ae21e161e74def7762caa99200e4cf", "tree": "2c017dad747ab7d1ddb5fc090d1d3b1038f0c33f", "parents": [ "026359bc6eddfdc2d2e684bf0b51691649b90f33" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Sep 16 11:04:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 16 19:20:20 2011 -0400" }, "message": "wan: make LAPB callbacks const\n\nThis is compile tested only.\nSuggested by dumpster diving in PAX.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8d755b59ae6750150d7f351210b97ad4cce5a51", "tree": "1404f8966112ca6f4c3ba19792117d311b521348", "parents": [ "ca1ba7caa68520864e4b9227e67f3bbc6fed373b" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Aug 22 11:30:38 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 22 11:30:38 2011 -0700" }, "message": "net/wan/hdlc_ppp: use break in switch\n\nWe\u0027ll either hit one of the case labels or the default in the switch\nand in all cases do we then \u0027goto out\u0027 and we also have a \u0027goto out\u0027\nafter the switch that is redundant. Change to just use break in the\ncase statements and leave the \u0027goto out\u0027 after the lop for everyone to\nhit.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afc4b13df143122f99a0eb10bfefb216c2806de0", "tree": "5a90e0a8226ce4173d8d366f5bed0322c9623cdd", "parents": [ "01789349ee52e4a3faf376f1485303d9723c4f1f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Aug 16 06:29:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:22:03 2011 -0700" }, "message": "net: remove use of ndo_set_multicast_list in drivers\n\nreplace it by ndo_set_rx_mode\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "550fd08c2cebad61c548def135f67aba284c6162", "tree": "8aa7c4d20a9faeb42261b75cfa38d8fd27b574ff", "parents": [ "d8873315065f1f527c7c380402cf59b1e1d0ae36" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue Jul 26 06:05:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 27 22:39:30 2011 -0700" }, "message": "net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared\n\nAfter the last patch, We are left in a state in which only drivers calling\nether_setup have IFF_TX_SKB_SHARING set (we assume that drivers touching real\nhardware call ether_setup for their net_devices and don\u0027t hold any state in\ntheir skbs. There are a handful of drivers that violate this assumption of\ncourse, and need to be fixed up. This patch identifies those drivers, and marks\nthem as not being able to support the safe transmission of skbs by clearning the\nIFF_TX_SKB_SHARING flag in priv_flags\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: Karsten Keil \u003cisdn@linux-pingi.de\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nCC: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nCC: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCC: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nCC: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "781223a15c510b4cb11328603bfc41ec8352f015", "tree": "7740c40ddf8bcccaf81788c785781a10c618d545", "parents": [ "ccbae55e1c6dc18e95d72c044cf9345ea08abf7b" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Fri Jul 22 05:50:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:12 2011 -0700" }, "message": "sbni: use pci_dev-\u003esubsystem_device\n\nThe driver reads PCI subsystem ID from the PCI configuration register while it\u0027s\nalready stored by the PCI subsystem in the \u0027subsystem_device\u0027 field of \u0027struct\npci_dev\u0027...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "0311ee2262440b903a81fa38512d12bc2478e66f", "tree": "6fcab3e93874b3ca235db4754f0993fda96e9534", "parents": [ "f82528bc13a157335dc53e78ce801883b26831e2" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue Jun 28 20:29:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 30 22:13:37 2011 -0700" }, "message": "wanxl: remove a stray irq enable\n\nThis is error path calls unlock_irq() where we haven\u0027t disabled the\nIRQs. The comment says that this error path can never happen.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23efcb738ea51befe0674e0685fc6cfe353aa553", "tree": "f5bbf62acc9bfa2b771b8ecb6ece5cbb771e9e98", "parents": [ "c75bb2c6f0cf455c23e60f14d780e841dd47f801" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:47 2011 -0700" }, "message": "wan: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c75bb2c6f0cf455c23e60f14d780e841dd47f801", "tree": "c416c251a79ee27ecf2f33ba450a0f3936536d04", "parents": [ "e8c122f450d0b83d7a15535ba49e55ad21a9e63f" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:47 2011 -0700" }, "message": "ixp4xx_hss: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e8c122f450d0b83d7a15535ba49e55ad21a9e63f", "tree": "9f460dcee9b27110b280fbb5341d4fc436670acd", "parents": [ "09a1732bee89fc31e63b1bd999f93acd58843f35" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:47 2011 -0700" }, "message": "farsync: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09a1732bee89fc31e63b1bd999f93acd58843f35", "tree": "43b223a18d31431646d7297c49f361ea825b2524", "parents": [ "86fb0ccf90cc34642daf6cd902ee26516a0ff0a2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:47 2011 -0700" }, "message": "dscc4: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86fb0ccf90cc34642daf6cd902ee26516a0ff0a2", "tree": "0c83fcb3b5d006cb18a6b645702ddd848dcf48b8", "parents": [ "d6810e1375c9b3b28ed1caccb6fb706945903f49" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:47 2011 -0700" }, "message": "frame relay dlci/frad: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6810e1375c9b3b28ed1caccb6fb706945903f49", "tree": "81222a208cb5f9e1191b37d857b6e8970be49be5", "parents": [ "9cbe50d4231773396f529f51a048770d0ee54ac1" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:46 2011 -0700" }, "message": "cyclom: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9cbe50d4231773396f529f51a048770d0ee54ac1", "tree": "e33de737635fe26c1b8e9f7e6a0300eed7cf0c1e", "parents": [ "12a3bfefc8c1e43ddb50950cb74f8a11d680567a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:46 2011 -0700" }, "message": "cosa: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12a3bfefc8c1e43ddb50950cb74f8a11d680567a", "tree": "ff974d28811618a51ab8dcbef1588a1022cb9c74", "parents": [ "2903dd654d8788425a9523959b02933ea6555229" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 26 19:01:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 00:09:46 2011 -0700" }, "message": "generic_hdlc: Update to current logging forms\n\nUse pr_fmt, pr_\u003clevel\u003e and netdev_\u003clevel\u003e as appropriate.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbc6221be7a2bf556fefe75ac939143d4e82ecaf", "tree": "b30f49bf02c4438b3bff90828fa60f1787a5c150", "parents": [ "e44ba033c5654dbfda53461c9b1f7dd9bd1d198f" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 23 11:39:19 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 24 11:18:57 2011 +0200" }, "message": "treewide: Fix recieve/receive typos\n\nJust spelling fixes.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "43d620c82985b19008d87a437b4cf83f356264f7", "tree": "8ea6d9d1ab5d36e7bc130b5189997e12edb01fb6", "parents": [ "dadbe85ac47f180fa1e3ef93b276ab7938b1a98b" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 16 19:08:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 21 15:48:29 2011 -0700" }, "message": "drivers/net: Remove casts of void *\n\nUnnecessary casts of void * clutter the code.\n\nThese are the remainder casts after several specific\npatches to remove netdev_priv and dev_priv.\n\nDone via coccinelle script (and a little editing):\n\n$ cat cast_void_pointer.cocci\n@@\ntype T;\nT *pt;\nvoid *pv;\n@@\n\n- pt \u003d (T *)pv;\n+ pt \u003d pv;\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nAcked-By: Chris Snook \u003cchris.snook@gmail.com\u003e\nAcked-by: Jon Mason \u003cjdmason@kudzu.us\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: David Dillow \u003cdave@thedillows.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f6ec8d697c08963d83880ccd35c13c5ace716ea", "tree": "ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2", "parents": [ "4aa3a715551c93eda32d79bd52042ce500bd5383", "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -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/iwlwifi/iwl-agn-rxon.c\n\tdrivers/net/wireless/rtlwifi/pci.c\n\tnet/netfilter/ipvs/ip_vs_core.c\n" }, { "commit": "d0fd64c1de437bdf91c32d4f84a53fa4b2150348", "tree": "85ed9777696fae76834a1e546bb1d733a73abc33", "parents": [ "1eddceadb0d6441cd39b2c38705a8f5fec86e770" ], "author": { "name": "Pavel Shved", "email": "shved@ispras.ru", "time": "Fri Jun 17 06:25:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Fri Jun 17 15:27:32 2011 -0400" }, "message": "farsync: add module_put to error path in fst_open()\n\nThe fst_open() function, after a successful try_module_get() may return\nan error code if hdlc_open() returns it. However, it does not put the\nmodule on this error path.\n\nThis patch adds the necessary module_put() call.\n\nFound by Linux Driver Verification project (linuxtesting.org).\n\nSigned-off-by: Pavel Shved \u003cshved@ispras.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "a6b7a407865aab9f849dd99a71072b7cd1175116", "tree": "42995f2e25b777e8930b5ac180599f8d4e655df6", "parents": [ "aedfebbaa7a4883dc568d8d32b7b32a0f9833f41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jun 06 10:43:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 06 22:55:11 2011 -0700" }, "message": "net: remove interrupt.h inclusion from netdevice.h\n\n* remove interrupt.g inclusion from netdevice.h -- not needed\n* fixup fallout, add interrupt.h and hardirq.h back where needed.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55db4c64eddf37e31279ec15fe90314713bc9cfa", "tree": "4bd186333049c5fcc1eacdff0efc82ac8b80ff5e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "message": "Revert \"tty: make receive_buf() return the amout of bytes received\"\n\nThis reverts commit b1c43f82c5aa265442f82dba31ce985ebb7aa71c.\n\nIt was broken in so many ways, and results in random odd pty issues.\n\nIt re-introduced the buggy schedule_work() in flush_to_ldisc() that can\ncause endless work-loops (see commit a5660b41af6a: \"tty: fix endless\nwork loop when the buffer fills up\").\n\nIt also used an \"unsigned int\" return value fo the -\u003ereceive_buf()\nfunction, but then made multiple functions return a negative error code,\nand didn\u0027t actually check for the error in the caller.\n\nAnd it didn\u0027t actually work at all. BenH bisected down odd tty behavior\nto it:\n \"It looks like the patch is causing some major malfunctions of the X\n server for me, possibly related to PTYs. For example, cat\u0027ing a\n large file in a gnome terminal hangs the kernel for -minutes- in a\n loop of what looks like flush_to_ldisc/workqueue code, (some ftrace\n data in the quoted bits further down).\n\n ...\n\n Some more data: It -looks- like what happens is that the\n flush_to_ldisc work queue entry constantly re-queues itself (because\n the PTY is full ?) and the workqueue thread will basically loop\n forver calling it without ever scheduling, thus starving the consumer\n process that could have emptied the PTY.\"\n\nwhich is pretty much exactly the problem we fixed in a5660b41af6a.\n\nMilton Miller pointed out the \u0027unsigned int\u0027 issue.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Stefan Bigler \u003cstefan.bigler@keymile.com\u003e\nCc: Toby Gray \u003ctoby.gray@realvnc.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b7c2f036284452627d793af981877817b37d4351", "tree": "c96bbf7558512b27f4802994c9271ccd0f1c19f3", "parents": [ "14587a2a25447813996e6fb9e48d48627cb75a5d", "8d2c50e3b65c8d48d51088f541c13fde46cc8133" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n gfs2: Drop __TIME__ usage\n isdn/diva: Drop __TIME__ usage\n atm: Drop __TIME__ usage\n dlm: Drop __TIME__ usage\n wan/pc300: Drop __TIME__ usage\n parport: Drop __TIME__ usage\n hdlcdrv: Drop __TIME__ usage\n baycom: Drop __TIME__ usage\n pmcraid: Drop __DATE__ usage\n edac: Drop __DATE__ usage\n rio: Drop __DATE__ usage\n scsi/wd33c93: Drop __TIME__ usage\n scsi/in2000: Drop __TIME__ usage\n aacraid: Drop __TIME__ usage\n media/cx231xx: Drop __TIME__ usage\n media/radio-maxiradio: Drop __TIME__ usage\n nozomi: Drop __TIME__ usage\n cyclades: Drop __TIME__ usage\n" }, { "commit": "772e289862e111ce6b4d387e65cd5b7a8b618705", "tree": "8f503aa00acb0782e50496082f1bfe950c5c53d3", "parents": [ "f1a7ee977df9f5c0f18449a9280d62ba04daed0c" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Apr 01 12:41:20 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu May 26 09:44:43 2011 +0200" }, "message": "wan/pc300: Drop __TIME__ usage\n\nThe kernel already prints its build timestamp during boot, no need to\nrepeat it in random drivers and produce different object files each\ntime.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "99dff5856220a02b8711f2e8746413ea6e53ccf6", "tree": "d8bae7ccdf8f7ad5221b053bb74a6220df996b3a", "parents": [ "bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c", "d9a0fbfd7bc5d2c42f0fa9bcbdab62c4942d0388" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 12:23:20 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)\n serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.\n tty/serial: Fix break handling for PORT_TEGRA\n tty/serial: Add explicit PORT_TEGRA type\n n_tracerouter and n_tracesink ldisc additions.\n Intel PTI implementaiton of MIPI 1149.7.\n Kernel documentation for the PTI feature.\n export kernel call get_task_comm().\n tty: Remove to support serial for S5P6442\n pch_phub: Support new device ML7223\n 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter\n ASoC: Update cx20442 for TTY API change\n pch_uart: Support new device ML7223 IOH\n parport: Use request_muxed_region for IT87 probe and lock\n tty/serial: add support for Xilinx PS UART\n n_gsm: Use print_hex_dump_bytes\n drivers/tty/moxa.c: Put correct tty value\n TTY: tty_io, annotate locking functions\n TTY: serial_core, remove superfluous set_task_state\n TTY: serial_core, remove invalid test\n Char: moxa, fix locking in moxa_write\n ...\n\nFix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and\ndrivers/tty/serial/Makefile.\n\nI did the hci_ldisc thing as an evil merge, cleaning things up.\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "70f23fd66bc821a0e99647f70a809e277cc93c4c", "tree": "3e768b77e63c6364ef32cf257c9449369afd215f", "parents": [ "c719864f15676af92b705589c93ba1468b89cd24" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Tue May 10 10:16:21 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue May 10 10:16:21 2011 +0200" }, "message": "treewide: fix a few typos in comments\n\n- kenrel -\u003e kernel\n- whetehr -\u003e whether\n- ttt -\u003e tt\n- sss -\u003e ss\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "1c5cae815d19ffe02bdfda1260949ef2b1806171", "tree": "d47a73c05afacd21985abb8df9862136385c58f0", "parents": [ "e8920674979705392abc4db4ebbe78feb68a4da1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Apr 30 01:21:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 05 10:57:45 2011 -0700" }, "message": "net: call dev_alloc_name from register_netdevice\n\nForce dev_alloc_name() to be called from register_netdevice() by\ndev_get_valid_name(). That allows to remove multiple explicit\ndev_alloc_name() calls.\n\nThe possibility to call dev_alloc_name in advance remains.\n\nThis also fixes veth creation regresion caused by\n84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1c43f82c5aa265442f82dba31ce985ebb7aa71c", "tree": "8b344d8d5355b30e8deff901180edc708a653227", "parents": [ "e9a470f445271eb157ee860a93b062324402fc3a" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Mon Mar 21 12:25:08 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:31:53 2011 -0700" }, "message": "tty: make receive_buf() return the amout of bytes received\n\nit makes it simpler to keep track of the amount of\nbytes received and simplifies how flush_to_ldisc counts\nthe remaining bytes. It also fixes a bug of lost bytes\non n_tty when flushing too many bytes via the USB\nserial gadget driver.\n\nTested-by: Stefan Bigler \u003cstefan.bigler@keymile.com\u003e\nTested-by: Toby Gray \u003ctoby.gray@realvnc.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "a44f99c7efdb88fa41128065c9a9445c19894e34", "tree": "9d9dc6026b2c0409eca05e360c98b8a688ccdb1e", "parents": [ "b87a2d3e3147bd140da2eae584772c353d11421b", "22942c00a6ad6e9e93b53811a6de72c821c15d22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)\n video: change to new flag variable\n scsi: change to new flag variable\n rtc: change to new flag variable\n rapidio: change to new flag variable\n pps: change to new flag variable\n net: change to new flag variable\n misc: change to new flag variable\n message: change to new flag variable\n memstick: change to new flag variable\n isdn: change to new flag variable\n ieee802154: change to new flag variable\n ide: change to new flag variable\n hwmon: change to new flag variable\n dma: change to new flag variable\n char: change to new flag variable\n fs: change to new flag variable\n xtensa: change to new flag variable\n um: change to new flag variables\n s390: change to new flag variable\n mips: change to new flag variable\n ...\n\nFix up trivial conflict in drivers/hwmon/Makefile\n" }, { "commit": "5a8b7cdc7424d63467cff1d20461acf48ffcb72f", "tree": "c960cba07cad2265476007c6feac315970090bb5", "parents": [ "8ac727c1e65ba98fc2d82bb28288312cc3b7473b" ], "author": { "name": "matt mooney", "email": "mfm@muteddisk.com", "time": "Fri Jan 14 06:12:45 2011 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu Mar 17 14:05:35 2011 +0100" }, "message": "net: change to new flag variable\n\nReplace EXTRA_CFLAGS with ccflags-y.\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "20b9d17715017ae4dd4ec87fabc36d33b9de708e", "tree": "64e9c4ff845844298f9056357d9f4914802207f8", "parents": [ "60b33c133ca0b7c0b6072c87234b63fee6e80558" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Feb 14 16:26:50 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 17 11:52:43 2011 -0800" }, "message": "tiocmset: kill the file pointer argument\n\nDoing tiocmget was such fun we should do tiocmset as well for the same\nreasons\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "60b33c133ca0b7c0b6072c87234b63fee6e80558", "tree": "379340a7ab563df42ddb2907be6f282202244077", "parents": [ "adf9251fe9b87b5a50deebe489db2df8df4715fc" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Feb 14 16:26:14 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 17 11:47:33 2011 -0800" }, "message": "tiocmget: kill off the passing of the struct file\n\nWe don\u0027t actually need this and it causes problems for internal use of\nthis functionality. Currently there is a single use of the FILE * pointer.\nThat is the serial core which uses it to check tty_hung_up_p. However if\nthat is true then IO_ERROR is also already set so the check may be removed.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "17f7f4d9fcce8f1b75b5f735569309dee7665968", "tree": "14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a", "parents": [ "041110a439e21cd40709ead4ffbfa8034619ad77", "d7c1255a3a21e98bdc64df8ccf005a174d7e6289" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 26 22:37:05 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 26 22:37:05 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/fib_frontend.c\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "215faf9c5f6e319e97edea9e178123e07825c14d", "tree": "32fb283f64110ad634a37dc2e133cb91a97988c5", "parents": [ "75a84eb5d144dc761e1bb0f7dcacbf2b5cee562c" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Dec 21 02:16:10 2010 -0800" }, "committer": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Dec 21 02:16:10 2010 -0800" }, "message": "drivers/net/*/: Use static const\n\nUsing static const generally increases object text and decreases data size.\nIt also generally decreases overall object size.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\n" }, { "commit": "b4fe2a03422e6bd20bd8df5e428109a85c9ea961", "tree": "b6505c0599251421fef39c9fa0655f255aac9ed6", "parents": [ "85cb7f1264c4d9e60ccdce52740238222e77ccd0", "2a27a03d3a891e87ca33d27a858b4db734a4cbab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 17:33:40 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 17:33:40 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: (75 commits)\n pppoe.c: Fix kernel panic caused by __pppoe_xmit\n WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.\n bnx2x: Advance a version number to 1.60.01-0\n bnx2x: Fixed a compilation warning\n bnx2x: LSO code was broken on BE platforms\n qlge: Fix deadlock when cancelling worker.\n net: fix skb_defer_rx_timestamp()\n cxgb4vf: Ingress Queue Entry Size needs to be 64 bytes\n phy: add the IC+ IP1001 driver\n atm: correct sysfs \u0027device\u0027 link creation and parent relationships\n MAINTAINERS: remove me from tulip\n SCTP: Fix SCTP_SET_PEER_PRIMARY_ADDR to accpet v4mapped address\n enic: Bug Fix: Pass napi reference to the isr that services receive queue\n ipv6: fix nl group when advertising a new link\n connector: add module alias\n net: Document the kernel_recvmsg() function\n r8169: Fix runtime power management\n hso: IP checksuming doesn\u0027t work on GE0301 option cards\n xfrm: Fix xfrm_state_migrate leak\n net: Convert netpoll blocking api in bonding driver to be a counter\n ...\n" }, { "commit": "eaff9453d3e2b63969af93e9d42a85e803060121", "tree": "f27368d0796494cc8d8469e2f387cb2d43f4b209", "parents": [ "9f5449611c9d6d7bdcae8020a197d8b4d9b6443c" ], "author": { "name": "Krzysztof Halasa", "email": "khc@pm.waw.pl", "time": "Sun Dec 12 12:06:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 12 15:03:00 2010 -0800" }, "message": "WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers.\n\nWe must not wake the TX queue without free TX descriptors.\nsca_xmit() expects at least one free descriptor and BUGs otherwise.\n\nProblem reported and fix tested by Bernie Innocenti and Ward Vandewege.\n\nSigned-off-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eed5ee1a3ab3020168cd67fdde2500452b0628c9", "tree": "9548c5a4851b1a1e832b7800baf1e72b33bc7a66", "parents": [ "435a5aebf609624bdf7c5a9a7705c260d0076195", "a5880a9e5bb40fbae55de60051d69a29091053c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:16 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 02 12:58:16 2010 -0800" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: mfd: adjust the baud rate setting\n TTY: open/hangup race fixup\n TTY: don\u0027t allow reopen when ldisc is changing\n NET: wan/x25, fix ldisc-\u003eopen retval\n TTY: ldisc, fix open flag handling\n serial8250: Mark console as CON_ANYTIME\n" }, { "commit": "6a20bd45fda271bd57e3ba41b3de3009797f4b5e", "tree": "d0699ec589106045e082b8fd7035860b616d1cbd", "parents": [ "7f90cfc505d613f4faf096e0d84ffe99208057d9" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu Nov 25 00:27:55 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Nov 29 14:51:54 2010 -0800" }, "message": "NET: wan/x25, fix ldisc-\u003eopen retval\n\nWe should never return positive values from ldisc-\u003eopen, tty layer\ndoesn\u0027t (and never did) expect that.\n\nIf we do that, weird things like warnings in tty_ldisc_close happen.\n\nNot sure if dev-\u003ebase_addr is used somehow now.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nCc: linux-x25@vger.kernel.org\nTested-by: Sergey Lapin \u003cslapin@ossfans.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "03fe5f3ef7eab88e1405baa52a7923fbf337230b", "tree": "94ca359bee9d5f4121af252310d4eb9293d45d9a", "parents": [ "42eb59d3a80ff83b4cacb92dcc44b22da7d4969b" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Wed Nov 24 13:54:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 28 11:43:47 2010 -0800" }, "message": "NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty\n\nWe register lapb when tty is created, but unregister it only when the\ndevice is UP. So move the lapb_unregister to x25_asy_close_tty after\nthe device is down.\n\nThe old behaviour causes ldisc switching to fail each second attempt,\nbecause we noted for us that the device is unused, so we use it the\nsecond time, but labp layer still have it registered, so it fails\nobviously.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nReported-by: Sergey Lapin \u003cslapin@ossfans.org\u003e\nCc: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nTested-by: Sergey Lapin \u003cslapin@ossfans.org\u003e\nTested-by: Mikhail Ulyanov \u003culyanov.mikhail@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0", "tree": "7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29", "parents": [ "02f36038c568111ad4fc433f6fa760ff5e38fab4", "ec37a48d1d16c30b655ac5280209edf52a6775d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 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: (1699 commits)\n bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.\n vlan: Calling vlan_hwaccel_do_receive() is always valid.\n tproxy: use the interface primary IP address as a default value for --on-ip\n tproxy: added IPv6 support to the socket match\n cxgb3: function namespace cleanup\n tproxy: added IPv6 support to the TPROXY target\n tproxy: added IPv6 socket lookup function to nf_tproxy_core\n be2net: Changes to use only priority codes allowed by f/w\n tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled\n tproxy: added tproxy sockopt interface in the IPV6 layer\n tproxy: added udp6_lib_lookup function\n tproxy: added const specifiers to udp lookup functions\n tproxy: split off ipv6 defragmentation to a separate module\n l2tp: small cleanup\n nf_nat: restrict ICMP translation for embedded header\n can: mcp251x: fix generation of error frames\n can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set\n can-raw: add msg_flags to distinguish local traffic\n 9p: client code cleanup\n rds: make local functions/variables static\n ...\n\nFix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and\ndrivers/net/wireless/ath/ath9k/debug.c as per David\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d1985508320ad40a68375bdbafa8a5d6c56d2114", "tree": "5f19a8cd326d7cea49b2a3aa80d2440d299f2ff4", "parents": [ "0bce198b7688911e072bd65032ab9278b577ee93" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Sep 07 14:32:25 2010 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Oct 12 17:36:09 2010 +0200" }, "message": "net: Wan/cosa.c: Convert \"mutex\" to semaphore\n\nGet rid of init_MUTEX[_LOCKED]() and use sema_init() instead.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nLKML-Reference: \u003c20100907125055.557578360@linutronix.de\u003e\n\n" }, { "commit": "807540baae406c84dcb9c1c8ef07a56d2d2ae84a", "tree": "ccd5c2cb57710dd6b73cf8df11eedf67abc14ae4", "parents": [ "cb4dfe562cac6fcb544df752e40c1d78000d0712" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 23 05:40:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:34:29 2010 -0700" }, "message": "drivers/net: return operator cleanup\n\nChange \"return (EXPR);\" to \"return EXPR;\"\n\nreturn is not a function, parentheses are not required.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f0b31c31860a0be60663f76a305ca2d78e5e99f", "tree": "0df4e2730a232effdcd5ad2b72c3ee551963a84f", "parents": [ "817f2c842d6c38acfd58d20d29ba583ec467ae35" ], "author": { "name": "Thomas Weber", "email": "weber@corscience.de", "time": "Mon Sep 20 16:30:54 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Sep 21 17:05:44 2010 +0200" }, "message": "Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n\nFix typos with interrest*.\n\nSigned-off-by: Thomas Weber \u003cweber@corscience.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "95ae6b228f814fc0528d0506ee9f18ac333d6851", "tree": "d5287f3dee478e1bd5fa79e63192447c5bc91e92", "parents": [ "9e0064a5456fd75fd7c70f6f3692c7f732f91a65" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 15 04:04:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 22:06:05 2010 -0700" }, "message": "ipv4: ip_ptr cleanups\n\ndev-\u003eip_ptr is protected by rtnl and rcu.\n\nYet some places dont use appropriate primitives and/or locking rules.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dcfc5d787a24b9a20be3e18e3dbbab5280d35e38", "tree": "da976087c2112809566f4b9e5736e0ed354554a5", "parents": [ "adea1ac7effbddbe60a9de6d63462bfe79289e59" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Sep 02 14:29:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 06 13:32:20 2010 -0700" }, "message": "wan: make read-only data const\n\nChange several wan drivers to make strings and other initialize\nonly parameters const.\n\nCompile tested only (with no new warnings)\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c061b18df0f1fe3f50fe451dbbdc9ede3c19701a", "tree": "91508aff083ab7a93d1e7f3b6eb933059d1a2776", "parents": [ "31018e068edb9eed740bec5cf14802c3c676c9ee" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Aug 23 18:20:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 15:35:43 2010 -0700" }, "message": "drivers/net: Remove address use from assignments of function pointers\n\n\"foo \u003d \u0026function\" is more commonly written \"foo \u003d function\"\n\nDone with coccinelle script:\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\ndrivers/net/tehuti.c used a function and struct with the\nsame name, the function was renamed.\n\nCompile tested x86 only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "354c8e3104a8513dbbdc4dea1ffbefe714371e88", "tree": "133b58f7929710a203a9a160b6633a50917aabef", "parents": [ "1565c7c1c4c8e931bdba66abc8aa6f141a406872" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:17:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:25 2010 -0700" }, "message": "drivers/net/wan: Adjust confusing if indentation\n\nIndent the branch of an if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f2c779583e9646097b57599f8efeb8eca7bd654", "tree": "aa7c88eb4f4deb668cba56e6f1fddd8dcc5006cf", "parents": [ "2897c684d1d5140e0e0302e73660c7cb97981b27", "3c09e2647b5e1f1f9fd383971468823c2505e1b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 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: (30 commits)\n ctcm: rename READ/WRITE defines to avoid redefinitions\n claw: rename READ/WRITE defines to avoid redefinitions\n phylib: available for any speed ethernet\n can: add limit for nframes and clean up signed/unsigned variables\n pkt_sched: Check .walk and .leaf class handlers\n pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops\n caif-spi: Bugfix SPI_DATA_POS settings were inverted.\n caif: Bugfix - Increase default headroom size for control channel.\n net: make netpoll_rx return bool for !CONFIG_NETPOLL\n Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size\n Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM\n Bluetooth: Change default L2CAP ERTM retransmit timeout\n Bluetooth: Fix endianness issue with L2CAP MPS configuration\n net: Use NET_XMIT_SUCCESS where possible.\n isdn: mISDN: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n usbnet: rx_submit() should return an error code.\n pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles\n pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles\n ...\n" }, { "commit": "946880fa270c18c137654af70ba939f03181c6b6", "tree": "1fc66f0f55c17be3026d55fc261f4cbddaf80e90", "parents": [ "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "42ea573f872365b0797ddbcee2e1f1f48913f507" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "message": "Merge branch \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6\n\n* \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:\n IXP4xx: Fix LL debugging on little-endian CPU.\n IXP4xx: Fix sparse warnings in I/O primitives.\n IXP4xx: Make mdio_bus struct static in the Ethernet driver.\n IXP4xx: Fix ixp4xx_crypto little-endian operation.\n IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.\n ixp4xx/vulcan: add PCI support\n ixp4xx: base support for Arcom Vulcan\n" }, { "commit": "5d337d6f64d150b6577972cc23f709ee85f66881", "tree": "ece22e5268bc869902827ceefd281fbb864158fe", "parents": [ "c4e9b56e24422e71424b24eee27c2b134a191d7b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:06:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:06:58 2010 -0700" }, "message": "farsync: Fix compile warnings.\n\ndrivers/net/wan/farsync.c: In function \u0027fst_intr_rx\u0027:\ndrivers/net/wan/farsync.c:1312: warning: cast to pointer from integer of different size\ndrivers/net/wan/farsync.c: In function \u0027do_bottom_half_tx\u0027:\ndrivers/net/wan/farsync.c:1407: warning: cast to pointer from integer of different size\n\nThe \"skb\" and \"mem\" arguments being passed here are DMA addresses\nbeing programmed into the hardware registers, so pass them as the type\nthat they actually are. And use the correct printf formatting in\ndebug logging statements for these things to match the type change.\n\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f326d40994f922e0a3e468dd7fd9999eaf71574", "tree": "8cb01880e24fdc59caed2823f011519a79d3ec56", "parents": [ "4fc6eb7d35a28d808ff6c77fa36e637e334dceac" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Aug 02 16:01:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 16:01:35 2010 -0700" }, "message": "drivers/net/wan/farsync.c: Use standard pr_\u003clevel\u003e\n\nRemove locally defined equivalents\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "15fd0cd9a2ad24a78fbee369dec8ca660979d57e", "tree": "d81059460702ebfe4617ec6efd6efa7886ac673b", "parents": [ "76a64921dad9acd76270dc74249f0dfe11c84bb8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Jul 11 11:18:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:47 2010 -0700" }, "message": "net: autoconvert trivial BKL users to private mutex\n\nAll these files use the big kernel lock in a trivial\nway to serialize their private file operations,\ntypically resulting from an earlier semi-automatic\npushdown from VFS.\n\nNone of these drivers appears to want to lock against\nother code, and they all use the BKL as the top-level\nlock in their file operations, meaning that there\nis no lock-order inversion problem.\n\nConsequently, we can remove the BKL completely,\nreplacing it with a per-file mutex in every case.\nUsing a scripted approach means we can avoid\ntypos.\n\nfile\u003d$1\nname\u003d$2\nif grep -q lock_kernel ${file} ; then\n if grep -q \u0027include.*linux.mutex.h\u0027 ${file} ; then\n sed -i \u0027/include.*\u003clinux\\/smp_lock.h\u003e/d\u0027 ${file}\n else\n sed -i \u0027s/include.*\u003clinux\\/smp_lock.h\u003e.*$/include \u003clinux\\/mutex.h\u003e/g\u0027 ${file}\n fi\n sed -i ${file} \\\n -e \"/^#include.*linux.mutex.h/,$ {\n 1,/^\\(static\\|int\\|long\\)/ {\n /^\\(static\\|int\\|long\\)/istatic DEFINE_MUTEX(${name}_mutex);\n\n} }\" \\\n -e \"s/\\(un\\)*lock_kernel\\\u003e[ ]*()/mutex_\\1lock(\\\u0026${name}_mutex)/g\" \\\n -e \u0027/[ ]*cycle_kernel_lock();/d\u0027\nelse\n sed -i -e \u0027/include.*\\\u003csmp_lock.h\\\u003e/d\u0027 ${file} \\\n -e \u0027/cycle_kernel_lock()/d\u0027\nfi\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eedc765ca4b19a41cf0b921a492ac08d640060d1", "tree": "95c566c6238cc953e1e336115d2daafe8bcb388f", "parents": [ "e59d44df46edaafb6b637e98d046775524b31104", "024a07bacf8287a6ddfa83e9d5b951c5e8b4070e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 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/sfc/net_driver.h\n\tdrivers/net/sfc/siena.c\n" }, { "commit": "ca7335948e294faf8adf65f2c95ca18ea78540db", "tree": "998f5c9b854e348f4df2bd20b02c8652529681ce", "parents": [ "c44649216522cd607a4027d2ebf4a8147d3fa94c" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Fri Jun 04 16:14:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 16:14:48 2010 -0700" }, "message": "X25: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in drivers/net/wan/x25_asy.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba2d3587912f82d1ab4367975b1df460db60fb1e", "tree": "1e4e04caf23274bb4e39edbfc5713b4856326953", "parents": [ "1273d97674a1782ff55b823aa6c40aea9b538aaf" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 02 18:10:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 03:18:23 2010 -0700" }, "message": "drivers/net: use __packed annotation\n\ncleanup patch.\n\nUse new __packed annotation in drivers/net/\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d88950426da812a6ab93ee1bba821f7f0ec1766", "tree": "f57c4a675cd48bdb61f0b272d12a2496e2221189", "parents": [ "042604d2a3ee59c84f8293988caf35bac5de9eb3" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri May 21 22:26:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 00:24:14 2010 -0700" }, "message": "drivers/net/wan: Use memdup_user\n\nUse memdup_user when user data is immediately copied into the\nallocated region.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nposition p;\nidentifier l1,l2;\n@@\n\n- to \u003d \\(kmalloc@p\\|kzalloc@p\\)(size,flag);\n+ to \u003d memdup_user(from,size);\n if (\n- to\u003d\u003dNULL\n+ IS_ERR(to)\n || ...) {\n \u003c+... when !\u003d goto l1;\n- -ENOMEM\n+ PTR_ERR(to)\n ...+\u003e\n }\n- if (copy_from_user(to, from, size) !\u003d 0) {\n- \u003c+... when !\u003d goto l2;\n- -EFAULT\n- ...+\u003e\n- }\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": "c146fc9fc9bc1dc0f629fe83d49f32ab0f11bfdc", "tree": "c7cb7c247161c9409a7f65678aa18a4543de4c7c", "parents": [ "c5dc9a3581f486a738f82a5317229d494d0f475f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri May 21 22:20:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 00:24:13 2010 -0700" }, "message": "drivers/net/wan: Use memdup_user\n\nUse memdup_user when user data is immediately copied into the\nallocated region.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nposition p;\nidentifier l1,l2;\n@@\n\n- to \u003d \\(kmalloc@p\\|kzalloc@p\\)(size,flag);\n+ to \u003d memdup_user(from,size);\n if (\n- to\u003d\u003dNULL\n+ IS_ERR(to)\n || ...) {\n \u003c+... when !\u003d goto l1;\n- -ENOMEM\n+ PTR_ERR(to)\n ...+\u003e\n }\n- if (copy_from_user(to, from, size) !\u003d 0) {\n- \u003c+... when !\u003d goto l2;\n- -EFAULT\n- ...+\u003e\n- }\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": "627634293ae7f4ec864cecd4282650ceae7a5067", "tree": "2545b12d53b4b0bb57121e536928e076b1fb2daf", "parents": [ "ee977c2c4f09c36e47c3113ecfe856fcce3ca7b9" ], "author": { "name": "Krzysztof Hałasa", "email": "khc@pm.waw.pl", "time": "Thu May 27 12:40:17 2010 +0200" }, "committer": { "name": "Krzysztof Hałasa", "email": "khc@pm.waw.pl", "time": "Thu May 27 13:02:42 2010 +0200" }, "message": "IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.\n\nWith port configured with PCR_FRM_SYNC_OUTPUT* and external clock, bringing\nthe hdlcX interface up and down without active clock supplied to the HSS\ncauses a TX lockup. We don\u0027t support channelized/partial interfaces so\nFRaMe signals can\u0027t be used anyway, disabling them makes the lockup go away.\n\nChanges to this logic will be required if we want to support channelized\nHSS mode (this is most probably bug in NPE-A HSS firmware).\n\nSigned-off-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\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": "90b3e030370dba721e141e85661881f5e342e1ab", "tree": "dbc6e7da77bc50ac6b931b31e9325742e75410f4", "parents": [ "5d74731437b8c8914d2d2956c497c66af3bd6a52" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Mon Apr 19 13:30:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 22 16:12:51 2010 -0700" }, "message": "X25: Use identifiers for hdlc x25 device to x25 interface\n\nChange magic numbers to identifiers for X25 interface.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nAcked-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d74731437b8c8914d2d2956c497c66af3bd6a52", "tree": "88c246b39a51d77cf631a4a34c3a4bffcbcaf5f8", "parents": [ "4d99503e0b28edf654ca1918229a317a3f738f08" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Mon Apr 19 13:30:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 22 16:12:50 2010 -0700" }, "message": "X25: Use identifiers for cyclades device to x25 interface\n\nChange magic numbers to identifiers for X25 interface.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4d99503e0b28edf654ca1918229a317a3f738f08", "tree": "6b2078bf2347d1686d156219ca64988d8c7cd5ba", "parents": [ "7eeeacf0b5b8c0a0badced506388c02b9422d508" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Mon Apr 19 13:30:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 22 16:12:50 2010 -0700" }, "message": "X25: Use identifiers for lapbether device to x25 interface\n\nChange magic numbers to identifiers for X25 interface.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7eeeacf0b5b8c0a0badced506388c02b9422d508", "tree": "fb22a569e4f1be514106f1989a3ffb592f1ad3da", "parents": [ "4150bbf3388eba2c9d2cb7a345134e363cc6e34f" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Mon Apr 19 13:29:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 22 16:12:49 2010 -0700" }, "message": "X25: Use identifiers for x25 async device to x25 interface\n\nChange magic numbers to identifiers for X25 interface.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87eb367003887cdc81a5d183efea227b5b488961", "tree": "40f617e25a9364d573e3cd2189c9e7fa56c8a0fe", "parents": [ "ccb7c7732e2ceb4e81a7806faf1670be9681ccd2", "05d17608a69b3ae653ea5c9857283bef3439c733" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 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/wireless/iwlwifi/iwl-6000.c\n\tnet/core/dev.c\n" }, { "commit": "31f634a63de7068c6a5dcb0d7b09b24b61a5cf88", "tree": "1bdf1c9f73d692f3a4205464b1cb1dc27b1b3cb4", "parents": [ "334656f33c43921cf383dfd0220dfd34376bcd98" ], "author": { "name": "Krzysztof Halasa", "email": "khc@pm.waw.pl", "time": "Wed Apr 14 14:09:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 16 15:41:03 2010 -0700" }, "message": "WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.\n\ntx_queue is used as a temporary queue when not allowed to queue skb\ndirectly to the hw device driver (which may sleep). Most paths flush\nit before returning, but ppp_start() currently cannot. Make sure we\ndon\u0027t leave skbs pointing to a non-existent device.\n\nThanks to Michael Barkowski for reporting this problem.\n\nSigned-off-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\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": "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": "2381a55c88453d3f29fe62d235579a05fc20b7b3", "tree": "b962ee6d3f5260622504433ef6a485703d3da8dd", "parents": [ "d6dbee861386cd3f4cee62bcf28597e63e251e0c" ], "author": { "name": "Frans Pop", "email": "elendil@planet.nl", "time": "Wed Mar 24 07:57:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 24 14:10:38 2010 -0700" }, "message": "net/various: remove trailing space in messages\n\nSigned-off-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "640462cbd659990bcceaf86ab17ccbc02147e62a", "tree": "f14f569c76475edb7fbcc3c08defad847bd91e44", "parents": [ "7e2a10836c0455cb3ca397f89b8280496148d571" ], "author": { "name": "Rudy Matela", "email": "rudy.matela@gmail.com", "time": "Wed Dec 09 11:35:40 2009 -0300" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 04 11:55:46 2010 +0100" }, "message": "Coding style correction of some wan drivers\n\nAdded a space separating some if/switch/while keywords from the following\nparenthesis to conform to the CodingStyle.\n\nSigned-off-by: Rudy Matela \u003crudy.matela@gmail.com\u003e\nAcked-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a3aa18842a5303fc28fcc4d57dbd16618bd830a0", "tree": "9214348bd1e57ad0a3701314be60adf19dfef702", "parents": [ "108316c1bd0a75ba855ce4a6540c530e1562bfb0" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Jan 07 11:58:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 07 23:54:26 2010 -0800" }, "message": "drivers/net/: use DEFINE_PCI_DEVICE_TABLE()\n\nUse DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section\nin every case.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "d014d043869cdc591f3a33243d3481fa4479c2d0", "tree": "63626829498e647ba058a1ce06419fe7e4d5f97d", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "6070d81eb5f2d4943223c96e7609a53cdc984364" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\n\tkernel/irq/chip.c\n" }, { "commit": "870571a2ef6fb2d6306673b4376fec93d441e013", "tree": "da63ee272b6b651e605f3700cd61ec10f1b3b52e", "parents": [ "1b35edaf9ff33ee44db24aa38060061927a89185" ], "author": { "name": "Rudy Matela", "email": "rudy.matela@gmail.com", "time": "Wed Nov 25 10:20:20 2009 -0300" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 15:39:58 2009 +0100" }, "message": "hdlc: spelling fix in find_pvc() comment\n\nSigned-off-by: Rudy Matela \u003crudy.matela@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "af901ca181d92aac3a7dc265144a9081a86d8f39", "tree": "380054af22521144fbe1364c3bcd55ad24c9bde4", "parents": [ "972b94ffb90ea6d20c589d9a47215df103388ddd" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sat Nov 14 13:09:05 2009 -0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 15:39:55 2009 +0100" }, "message": "tree-wide: fix assorted typos all over the place\n\nThat is \"success\", \"unknown\", \"through\", \"performance\", \"[re|un]mapping\"\n, \"access\", \"default\", \"reasonable\", \"[con]currently\", \"temperature\"\n, \"channel\", \"[un]used\", \"application\", \"example\",\"hierarchy\", \"therefore\"\n, \"[over|under]flow\", \"contiguous\", \"threshold\", \"enough\" and others.\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\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": "614c12a1581687501f1b0fc721feff69b47abd92", "tree": "33c98a20f5c5003da4009a8650b711dab901b128", "parents": [ "5b23136bcf766a58160a319677b366c90f0cd223" ], "author": { "name": "Rudy Matela", "email": "rudy.matela@gmail.com", "time": "Wed Dec 02 01:26:01 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 01:26:01 2009 -0800" }, "message": "net: Coding style corrections on Sealevel Systems 4021 driver.\n\nChanged braces position on some statements.\nInserted a space between an \"if\" keyword and a parenthesis.\n\nSigned-off-by: Rudy Matela \u003crudy.matela@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff9c38bba37937adb909cceb2a6521f2e92e17c6", "tree": "93bd6152d9fa28348be99ef1c788040cc7b7a94d", "parents": [ "65c0cfafce9575319fb6f70080fbe226e5617e3b", "b2722b1c3a893ec6021508da15b32282ec79f4da" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 22:13:38 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 22:13:38 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/ht.c\n" } ], "next": "40be261dfd8bfba4baeff40168d44a6a4450ace1" }