)]}' { "log": [ { "commit": "6bd17eb96ffc9c3b52927913d59da9ced5109c6a", "tree": "d05fdf705734bdda0b463d45c3f909c2ff9c5b7c", "parents": [ "288fcee8b7aa98796d96cd5b1b2e8005639328bf" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon May 31 08:56:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 01 00:09:22 2010 -0700" }, "message": "can: mpc5xxx_can.c: Fix build failure\n\nFixes build error caused by the OF device_node pointer\nbeing moved into struct device.\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "631eb227849e3bfdec2d2e628ee5a3f962db82e2", "tree": "d88246a94889220897b6a8ff3d27fcd7effb7f25", "parents": [ "bd3581323cc02aefc79a21780a4ca8c578642892" ], "author": { "name": "Ira W. Snyder", "email": "iws@ovro.caltech.edu", "time": "Mon Mar 29 09:58:51 2010 -0700" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 28 01:37:33 2010 +0200" }, "message": "can: Add support for Janz VMOD-ICAN3 Intelligent CAN module\n\nThe Janz VMOD-ICAN3 is a MODULbus daughterboard which fits onto any\nMODULbus carrier board. It is an intelligent CAN controller with a\nmicrocontroller and associated firmware.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "b1cdc4670b9508fcd47a15fbd12f70d269880b37", "tree": "fea9e2650170886d539488f8b1e064f6ca60ad36", "parents": [ "ce7d0226198aac42ed311dd2783232adc16b296d", "f925b1303e0672effc78547353bd2ddfe11f5b5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 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: (63 commits)\n drivers/net/usb/asix.c: Fix pointer cast.\n be2net: Bug fix to avoid disabling bottom half during firmware upgrade.\n proc_dointvec: write a single value\n hso: add support for new products\n Phonet: fix potential use-after-free in pep_sock_close()\n ath9k: remove VEOL support for ad-hoc\n ath9k: change beacon allocation to prefer the first beacon slot\n sock.h: fix kernel-doc warning\n cls_cgroup: Fix build error when built-in\n macvlan: do proper cleanup in macvlan_common_newlink() V2\n be2net: Bug fix in init code in probe\n net/dccp: expansion of error code size\n ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep\n wireless: fix sta_info.h kernel-doc warnings\n wireless: fix mac80211.h kernel-doc warnings\n iwlwifi: testing the wrong variable in iwl_add_bssid_station()\n ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()\n ath9k_htc: dereferencing before check in hif_usb_tx_cb()\n rt2x00: Fix rt2800usb TX descriptor writing.\n rt2x00: Fix failed SLEEP-\u003eAWAKE and AWAKE-\u003eSLEEP transitions.\n ...\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "1f01bfd202bc539bccd282befa2bbdb8d6ad80ee", "tree": "77930cd6a9c7ffb724cd14e99ddc16f75787afc5", "parents": [ "0f0b405cd16f7aaff84a935984cae421897d725d" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Wed May 19 06:46:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 20 23:21:45 2010 -0700" }, "message": "can: SJA1000 add missing spin_lock_init()\n\nAs remarked by Sam Ravnborg the spin_lock variable, that has been introduced\nin commit 57c8a456640fa3ca777652f11f2db4179a3e66b6 (\"can: Fix SJA1000 command\nregister writes on SMP systems\") has not been initialized properly.\n\nThis patch adds the initialization to allow spinlock debugging.\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nCC: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a9b149212f3716c598afe973b6261fd58453b7a", "tree": "477716d84c71da124448b72278e98da28aadbd3d", "parents": [ "3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e", "e26bcf37234c67624f62d9fc95f922b8dbda1363" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)\n USB: remove unused usb_buffer_alloc and usb_buffer_free macros\n usb: musb: update gfp/slab.h includes\n USB: ftdi_sio: fix legacy SIO-device header\n USB: kl5usb105: reimplement using generic framework\n USB: kl5usb105: minor clean ups\n USB: kl5usb105: fix memory leak\n USB: io_ti: use kfifo to implement write buffering\n USB: io_ti: remove unsused private counter\n USB: ti_usb: use kfifo to implement write buffering\n USB: ir-usb: fix incorrect write-buffer length\n USB: aircable: fix incorrect write-buffer length\n USB: safe_serial: straighten out read processing\n USB: safe_serial: reimplement read using generic framework\n USB: safe_serial: reimplement write using generic framework\n usb-storage: always print quirks\n USB: usb-storage: trivial debug improvements\n USB: oti6858: use port write fifo\n USB: oti6858: use kfifo to implement write buffering\n USB: cypress_m8: use kfifo to implement write buffering\n USB: cypress_m8: remove unused drain define\n ...\n\nFix up conflicts (due to usb_buffer_alloc/free renaming) in\n\tdrivers/input/tablet/acecad.c\n\tdrivers/input/tablet/kbtab.c\n\tdrivers/input/tablet/wacom_sys.c\n\tdrivers/media/video/gspca/gspca.c\n\tsound/usb/usbaudio.c\n" }, { "commit": "997ea58eb92f9970b8af7aae48800d0ef43b9423", "tree": "65e021973e5a48ad7290d5be1f441940566468ad", "parents": [ "48679c6d772b1459a2945729e3a1256ac78fcabf" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Mon Apr 12 13:17:25 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 20 13:21:38 2010 -0700" }, "message": "USB: rename usb_buffer_alloc() and usb_buffer_free() users\n\nFor more clearance what the functions actually do,\n\n usb_buffer_alloc() is renamed to usb_alloc_coherent()\n usb_buffer_free() is renamed to usb_free_coherent()\n\nThey should only be used in code which really needs DMA coherency.\n\nAll call sites have been changed accordingly, except for staging\ndrivers.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Pedro Ribeiro \u003cpedrib@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "57c8a456640fa3ca777652f11f2db4179a3e66b6", "tree": "a290a904176384e1a9c80edc291f08286e23f3f3", "parents": [ "b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Tue May 18 14:03:10 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 14:03:10 2010 -0700" }, "message": "can: Fix SJA1000 command register writes on SMP systems\n\nThe SJA1000 command register is concurrently written in the rx-path to free\nthe receive buffer _and_ in the tx-path to start the transmission.\n\nThe SJA1000 data sheet, 6.4.4 COMMAND REGISTER (CMR) states:\n\"Between two commands at least one internal clock cycle is needed in\norder to proceed. The internal clock is half of the external oscillator\nfrequency.\"\n\nOn SMP systems the current implementation leads to a write stall in the\ntx-path, which can be solved by adding some general locking and some time\nto settle the write_reg() operation for the command register.\n\nThanks to Klaus Hitschler for the original fix and detailed problem\ndescription.\n\nThis patch applies on net-2.6 and (with some offsets) on net-next-2.6 .\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56e6943b902562e09d3e74126d8d8256b5ea17fb", "tree": "3b37d2e1382a666152b7c655a67b4f7b785c142f", "parents": [ "d19d56ddc88e7895429ef118db9c83c7bbe3ce6a" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon May 17 22:39:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 22:39:48 2010 -0700" }, "message": "can: sja1000 platform data fixes\n\nThe member \"clock\" of struct \"sja1000_platform_data\" is documented as\n\"CAN bus oscillator frequency in Hz\" but it\u0027s actually used as the CAN\nclock frequency, which is half of it. To avoid further confusion, this\npatch fixes it by renaming the member to \"osc_freq\". That way, also\nnon mainline users will notice the change. The platform code for the\nrelevant boards is updated accordingly. Furthermore, pre-defined\nvalues are now used for the members \"ocr\" and \"cdr\".\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6", "tree": "62e3c413b084c106d750cf6cc0701709cde30100", "parents": [ "21ce849ba5cc178740c6532ba3dded852296ad91" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 00:19:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 00:19:28 2010 -0700" }, "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1", "tree": "d1955a7639e99832590df26466a34d5786a880ae", "parents": [ "2b0b05ddc04b6d45e71cd36405df512075786f1e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 10 05:01:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 10 05:01:31 2010 -0700" }, "message": "net: trans_start cleanups\n\nNow that core network takes care of trans_start updates, dont do it\nin drivers themselves, if possible. Drivers can avoid one cache miss\n(on dev-\u003etrans_start) in their start_xmit() handler.\n\nExceptions are NETIF_F_LLTX drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1703b36c358dde24ececba4fd609ecd91433ba3", "tree": "d59c333d0ad5bf72f165264eba6048c87fdc4e0f", "parents": [ "7ec75c582e639d956ce3afd499f67febe6f902a4", "e95ef5d3f6bc60433883e1ef65dac747acd0bf1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e100.c\n\tdrivers/net/e1000e/netdev.c\n" }, { "commit": "1c0b28b1ee90261a0a27194e6684dd2837785064", "tree": "e5c31e2fc729ad0a6bd8e6291a5fb1f9d1bdf624", "parents": [ "05d17608a69b3ae653ea5c9857283bef3439c733" ], "author": { "name": "Hans J. Koch", "email": "hjk@linutronix.de", "time": "Wed Apr 21 00:18:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 16:14:51 2010 -0700" }, "message": "can: Fix possible NULL pointer dereference in ems_usb.c\n\nIn ems_usb_probe(), a pointer is dereferenced after making sure it is NULL...\n\nThis patch replaces netdev-\u003edev.parent with \u0026intf-\u003edev in dev_err() calls to\navoid this.\n\nSigned-off-by: \"Hans J. Koch\" \u003chjk@linutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "127aa0e14b3e1f8476c4781facdfac11d5546872", "tree": "939bdf390d438942fb1efbc158f92705900817f9", "parents": [ "acbbc07145b919248c410e1852b953d385be5c97" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Apr 10 22:48:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 03:32:43 2010 -0700" }, "message": "drivers: net: last_rx elimination\n\nNetwork drivers do not have to update last_rx, unless they need it for\ntheir private use.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "829e0015431537176e38812f88fffe1d3250083e", "tree": "585fa8fafbf09d629262f78c3b7ab2f578f35021", "parents": [ "5e10d4a7fc80e4ef310c07a6a547406fef50534a" ], "author": { "name": "Hans J. Koch", "email": "hjk@linutronix.de", "time": "Tue Apr 13 00:03:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 03:32:42 2010 -0700" }, "message": "Fix some #includes in CAN drivers (rebased for net-next-2.6)\n\nIn the current implementation, CAN drivers need to #include \u003clinux/can.h\u003e\n_before_ they #include \u003clinux/can/dev.h\u003e, which is both ugly and\nunnecessary.\n\nFix this by including \u003clinux/can.h\u003e in \u003clinux/can/dev.h\u003e and remove the\n#include \u003clinux/can.h\u003e lines from drivers.\n\nSigned-off-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82e381775f6da6b29ae625e73a2ea18844eb4825", "tree": "365f8d81cbabada143734883b42e2ace938ceeb1", "parents": [ "2e8e18ef52e7dd1af0a3bd1f7d990a1d0b249586" ], "author": { "name": "Matthias Fuchs", "email": "matthias.fuchs@esd.eu", "time": "Wed Apr 07 01:09:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 01:23:26 2010 -0700" }, "message": "can: Add esd board support to plx_pci CAN driver\n\nThis patch adds support for SJA1000 based PCI CAN interface cards\nfrom electronic system design gmbh.\n\nSome changes have been done on the common code:\n - esd boards must not have the 2nd local interupt enabled (PLX9030/9050)\n - a new path for PLX9056/PEX8311 chips has been added\n - new plx9056 reset function has been implemented\n - struct plx_card_info got a reset function entry\n\nIn detail the following additional boards are now supported:\n\n CAN-PCI/200 (PCI)\n CAN-PCI/266 (PCI)\n CAN-PMC266 (PMC module)\n CAN-PCIe/2000 (PCI Express)\n CAN-CPCI/200 (Compact PCI, 3U)\n CAN-PCI104 (PCI104)\n\nSigned-off-by: Matthias Fuchs \u003cmatthias.fuchs@esd.eu\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "e446630c960946b5c1762e4eadb618becef599e7", "tree": "7dc73fc57fd1d38f309b208b6dadfddf248cb05f", "parents": [ "598ed9367a36ee1fd4ae3271a54a3547a33975a5" ], "author": { "name": "Marc Zyngier", "email": "maz@misterjones.org", "time": "Mon Mar 29 08:57:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 30 23:51:09 2010 -0700" }, "message": "Add hotplug support to mcp251x driver\n\nChip model can now be selected directly by matching the modalias name\n(instead of filling the .model field in platform_data), and allows the\nmodule to be auto-loaded. Previous behaviour is of course still supported.\n\nConvert the two in-tree users to this feature (icontrol \u0026 zeus).\nTested on an Zeus platform (mcp2515).\n\nSigned-off-by: Marc Zyngier \u003cmaz@misterjones.org\u003e\nAcked-by: Christian Pellegrin \u003cchripell@fsfe.org\u003e\nCc: Edwin Peer \u003cepeer@tmtservices.co.za\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "21afc27c9f9ae1f6370c47b323be7f3b75106569", "tree": "25b84a6fde1c2f00df5872bc7fcf57447c1c260a", "parents": [ "91c030b4d6445ebe9fbddb86d584441f300df15c" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Sun Mar 21 21:06:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 22 20:05:45 2010 -0700" }, "message": "can: bfin_can: switch to common Blackfin can header\n\nThe MMR bits are being moved to this header, so include it.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "986917b7b7570f889fa9c8c54962a9f2c3b32bf4", "tree": "d96a4bf278ea05db315f2985903182fd6b5a48e4", "parents": [ "abde89d7f57adfae5a43f086b45e5746be16e3f0" ], "author": { "name": "Yegor Yefremov", "email": "yegor_sub1@visionsystems.de", "time": "Fri Mar 19 00:50:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 21 20:33:37 2010 -0700" }, "message": "can: sja1000: add read/write routines for 8, 16 and 32-bit register access\n\nadd routines for 8, 16 and 32-bit access like in\ndrivers/i2c/busses/i2c-pca-platform.c\n\nSigned-off-by: Yegor Yefremov \u003cyegorslists@googlemail.com\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abde89d7f57adfae5a43f086b45e5746be16e3f0", "tree": "d3bb3c0ca508e07f25df44da9c806ce37f4c54a0", "parents": [ "e99b99b471c21b071132e51bb7aa6b7a8796dc02" ], "author": { "name": "Yegor Yefremov", "email": "yegor_sub1@visionsystems.de", "time": "Fri Mar 19 00:49:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 21 20:33:37 2010 -0700" }, "message": "can: sja1000: allow shared interrupt definition\n\nextend the AND mask, so that IRQF_SHARED flag remains\n\nSigned-off-by: Yegor Yefremov \u003cyegorslists@googlemail.com\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e9dcd1613f0ac0b3573b7d813a2c5672cd8302eb", "tree": "501f5c9cf150d3e28885929e6225a8ea786e3895", "parents": [ "28b2774a0d5852236dab77a4147b8b88548110f1" ], "author": { "name": "Barry Song", "email": "barry.song@analog.com", "time": "Mon Mar 08 12:13:57 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 08 12:13:57 2010 -0800" }, "message": "can: fix bfin_can build error after alloc_candev() change\n\nLooks like commit a6e4bc530403 didn\u0027t include updates to drivers so the\nBlackfin CAN driver fails to build now.\n\nSigned-off-by: Barry Song \u003cbarry.song@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea3fb371b2a391958670f2a65e1203f7dba61671", "tree": "99daed8827feb1cd6570033da6936d794ebc3f0f", "parents": [ "02a780c014c40973cbe71d04cec7a24e6629995f" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Mar 06 01:11:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 07 15:25:50 2010 -0800" }, "message": "ems_usb: cleanup: remove uneeded check\n\n\"skb\" is alway non-null here, but even if it were null the check isn\u0027t\nneeded because dev_kfree_skb() can handle it.\n\nThis eliminates a smatch warning about dereferencing a variable before\nchecking that it is non-null.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "773c3e75d1fc7ea5058bfeab5d82bac5b85f8cd8", "tree": "c72b423271c5d02956e2536ae7dad0ff94b62fab", "parents": [ "738b0343e73604750feb107e063c28b3ca36cb84" ], "author": { "name": "Sriramakrishnan", "email": "srk@ti.com", "time": "Fri Feb 26 05:22:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 26 05:22:03 2010 -0800" }, "message": "can: ti hecc module : add platform specific initialization callback.\n\nCAN module on AM3517 requires programming of IO expander as part\nof init sequence - to enable CAN PHY. Added platform specific\ncallback to handle phy control(switch on /off).\n\nSigned-off-by: Sriramakrishnan \u003csrk@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52c793f24054f5dc30d228e37e0e19cc8313f086", "tree": "b7ebb686f5c2b0d58d05e42cc9d452adf651a83b", "parents": [ "78ca90ea995cb86c72cde9308276d2a701bd3c40" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Feb 22 22:21:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 26 01:48:49 2010 -0800" }, "message": "can: netlink support for bus-error reporting and counters\n\nThis patch makes the bus-error reporting configurable and allows to\nretrieve the CAN TX and RX bus error counters via netlink interface.\nI have added support for the SJA1000. The TX and RX bus error counters\nare also copied to the data fields 6..7 of error messages when state\nchanges are reported.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35e2da46d25a53e0e19956f533cc29272a6cceb2", "tree": "aa06cfa5bd76ce759c6f22f9c6c13719f86a19b2", "parents": [ "e5f8d9ac46e0291594abaa76bf467a08367bcccf" ], "author": { "name": "Sriram", "email": "srk@ti.com", "time": "Mon Feb 22 03:35:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 15:45:53 2010 -0800" }, "message": "can:ti_hecc: Add pm hook-up\n\nAdded the suspend and resume implementation in the HECC (CAN)\ndriver.\n\nSigned-off-by: K R Baalaaji \u003ckrbaalaaji@ti.com\u003e\nSigned-off-by: Sriramakrishnan \u003csrk@ti.com\u003e\nAcked-by: Anant Gole \u003canantgole@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ae06b8330aefb0338017c427d5694fc8ea9144c8", "tree": "8a3d48b67b4dd04d03da462a269cd031a926ec51", "parents": [ "10be7eb36b93364b98688831ee7d26f58402bb96" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@holoscopio.com", "time": "Thu Feb 04 09:21:28 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 04 09:21:28 2010 -0800" }, "message": "can: ems_usb: removed duplicated code setting local echo support\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf66f3736a945dd4e92d86427276c6eeab0a6c1d", "tree": "997d7552463813e0855e77cd85e67c81bcfc6cbd", "parents": [ "35cfabdc5e9b99e732899db8f36c63a215e105bc" ], "author": { "name": "Christian Pellegrin", "email": "chripell@fsfe.org", "time": "Wed Feb 03 07:39:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 03 20:32:28 2010 -0800" }, "message": "can: mcp251x: Move to threaded interrupts instead of workqueues.\n\nThis patch addresses concerns about efficiency of handling incoming\npackets. Handling of interrupts is done in a threaded interrupt handler\nwhich has a smaller latency than workqueues. This change needed a rework\nof the locking scheme that was much simplified. Some other (more or less\nlongstanding) bugs are fixed: utilization of just half of the RX\nbuffers, useless wait for interrupt on open, more reliable reset\nsequence. The MERR interrupt is not used anymore: it overloads the CPU\nin error-passive state without any additional information. One shot mode\nis disabled because it\u0027s not clear if it can be handled efficiently on\nthis CAN controller.\n\nSigned-off-by: Christian Pellegrin \u003cchripell@fsfe.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59b26c72914920fd12695033c5a099fb0bfae935", "tree": "8a2adfc20490e81a5f8f6c0cac856ccd20d46af2", "parents": [ "20d29d7a916a47bf533b5709437fe735b6b5b79e" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@holoscopio.com", "time": "Mon Feb 01 07:58:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 03 20:32:18 2010 -0800" }, "message": "trivial: remove duplicated \"from\" in CAN USB EMS Kconfig help\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24c4a3b29255f9f8bc48d93597a58256b5a1f83f", "tree": "72d14a5684ddaf378db119bbbca6e6c1616c7d06", "parents": [ "2e02644abc4b3574533b027782820b5a6dfe1920" ], "author": { "name": "Pavel Cheblakov", "email": "P.B.Cheblakov@inp.nsk.su", "time": "Mon Feb 01 09:42:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 03 18:38:41 2010 -0800" }, "message": "can: add support for CAN interface cards based on the PLX90xx PCI bridge\n\nThis driver is for CAN interface cards based on the PLX90xx PCI bridge.\nDriver supports now:\n - Adlink PCI-7841/cPCI-7841 card (http://www.adlinktech.com/)\n - Adlink PCI-7841/cPCI-7841 SE card\n - Marathon CAN-bus-PCI card (http://www.marathon.ru/)\n - TEWS TECHNOLOGIES TPMC810 card (http://www.tews.com/)\n\nChanges since v1:\n - Added some defines for static inline int plx_pci_check_sja1000(...)\n - static struct pci_device_id plx_pci_tbl[] replaced by\n static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl)\n - Typo fixed\n\nSigned-off-by: Pavel Cheblakov \u003cP.B.Cheblakov@inp.nsk.su\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5bab5e94d148aee2c852450374143c89aa56511", "tree": "79bda2606af8b68d0c2bd010bd1c5f0109d1dde4", "parents": [ "3a4d5c94e959359ece6d6b55045c3f046677f55c" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@denx.de", "time": "Thu Jan 14 01:05:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 15 01:43:30 2010 -0800" }, "message": "can: mscan-mpc5xxx: fix broken support for the MPC5200\n\nDue to an invalid \"#ifdef CONFIG_PPC_MPC5200\", the real clock setup\nfunction was not called for the MPC5200.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@denx.de\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad72c347e56bf3a0231b9d686e17764157d2961c", "tree": "4db03a0abae50edfaf996f43e3f717a57b776fbd", "parents": [ "1954dc11776ef8c06263ba4cd21bf4d25c79a19c" ], "author": { "name": "Christian Pellegrin", "email": "chripell@fsfe.org", "time": "Thu Jan 14 07:08:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 15 01:39:17 2010 -0800" }, "message": "can: Proper ctrlmode handling for CAN devices\n\nThis patch adds error checking of ctrlmode values for CAN devices. As\nan example all availabe bits are implemented in the mcp251x driver.\n\nSigned-off-by: Christian Pellegrin \u003cchripell@fsfe.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ccd4c6167d3b39d52631767ebbf8b5677c5855d", "tree": "bfcb801edebd00e8b30e897038bad7fee39625cc", "parents": [ "d218d11133d888f9745802146a50255a4781d37a" ], "author": { "name": "Oliver Hartkopp", "email": "oliver@hartkopp.net", "time": "Tue Jan 12 02:00:46 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 12 02:00:46 2010 -0800" }, "message": "can: Unify droping of invalid tx skbs and netdev stats\n\nTo prevent the CAN drivers to operate on invalid socketbuffers the skbs are\nnow checked and silently dropped at the xmit-function consistently.\n\nAlso the netdev stats are consistently using the CAN data length code (dlc)\nfor [rx|tx]_bytes now.\n\nSigned-off-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4a66e752d0b19934dd208884f8605fe385aaaa9", "tree": "72fb727be1d7636aae9cddfe9aa93ac9dec75daf", "parents": [ "bdbec4b86ee99b020e159f9bd604003a3ae3b0ab", "fa15e99b6bb44aa86b241a43ca8c509e91f80153" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/benet/be_cmds.h\n\tinclude/linux/sysctl.h\n" }, { "commit": "bf3af54732bea5894ccc2cbde3ab566f0af7da56", "tree": "e8e6681168c9f695006962cacfb937d3dc1bbb06", "parents": [ "2d4b6faf7d1818e9a52ae9f068ab4ffd9c3be923" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@denx.de", "time": "Thu Jan 07 09:43:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 01:02:18 2010 -0800" }, "message": "can: mscan-mpc5xxx: add support for the MPC512x processor\n\nThe main differences compared to the MSCAN on the MPC5200 are:\n\n- More flexibility in choosing the CAN source clock and frequency:\n\n Three different clock sources can be selected: \"ip\", \"ref\" or \"sys\".\n For the latter two, a clock divider can be defined as well. If the\n clock source is not specified by the device tree, we first try to\n find an optimal CAN source clock based on the system clock. If that\n is not possible, the reference clock will be used.\n\n- The behavior of bus-off recovery is configurable:\n\n To comply with the usual handling of Socket-CAN bus-off recovery,\n \"recovery on request\" is selected (instead of automatic recovery).\n\nNote that only MPC5121 Rev. 2 and later is supported.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@denx.de\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2d4b6faf7d1818e9a52ae9f068ab4ffd9c3be923", "tree": "ea83652ec221c38122ac4cc524e365db81b9d4c7", "parents": [ "5856b606e69d3e4dc2d718b475e216eb30ee2006" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@denx.de", "time": "Thu Jan 07 09:43:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 01:02:17 2010 -0800" }, "message": "can: mscan: fix improper return if dlc \u003c 8 in start_xmit function\n\nThe start_xmit function of the MSCAN Driver did return improperly if\nthe CAN dlc check failed (skb not freed and invalid return code). This\npatch adds a proper check of the frame lenght and data size and returns\nnow correctly. The invalid skb packets are dropped silently as suggested\nby David Miller in the thread \"[RFC] ndo_validate_skb: Let the netdev\ncheck a valid skb content\" on the netdev mailing list.\n\nFurthermore, a typo has been fixed.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@denx.de\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "ce739b473ce12d5ef067b39b8637bfd2b2174a15", "tree": "cc95857da8afed8c429e9644977734c9b35f818f", "parents": [ "073bd90f03d98bc3168865f21573c9b232777c13" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sun Dec 27 11:27:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 21:42:49 2010 -0800" }, "message": "drivers/net/can: Correct NULL test\n\nTest the just-allocated value for NULL rather than some other value.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression x,y;\nstatement S;\n@@\n\nx \u003d \\(kmalloc\\|kcalloc\\|kzalloc\\)(...);\n(\nif ((x) \u003d\u003d NULL) S\n|\nif (\n- y\n+ x\n \u003d\u003d NULL)\n S\n)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4773a47d8a564633cd80b94df397e91e946893e2", "tree": "2ac03e9459394f59bd0953a78eb13cd67a6562f2", "parents": [ "01a1e7ec6c3769dc7c5fde23ebc253c6be5f68eb" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Dec 18 20:31:56 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 18 20:31:56 2009 -0800" }, "message": "can/at91: don\u0027t check platform_get_irq\u0027s return value against zero\n\nplatform_get_irq returns -ENXIO on failure, so !irq was probably\nalways true. Better use (int)irq \u003c\u003d 0. Note that a return value of\nzero is still handled as error even though this could mean irq0.\n\nThis is a followup to 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0 that\nchanged the return value of platform_get_irq from 0 to -ENXIO on error.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "231d52a7bec6d141883d81dbb5516bff4a07533b", "tree": "13e42e3bb01d059718dc0971be19a3ad3e179ba6", "parents": [ "6057912d7baad31be9819518674ffad349a065b1" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Dec 13 09:11:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 13 19:56:36 2009 -0800" }, "message": "can: CAN_MCP251X should depend on HAS_DMA\n\nWhen building for Sun 3:\n\ndrivers/net/can/mcp251x.c:1074: undefined reference to `dma_free_coherent\u0027\ndrivers/net/can/mcp251x.c:976: undefined reference to `dma_alloc_coherent\u0027\ndrivers/net/can/mcp251x.c:1050: undefined reference to `dma_free_coherent\u0027\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7cd606f60e7679c7f9eee7010f02a6f000209c1", "tree": "31c19fd7617ede807757b0ae5c29d218587dc43f", "parents": [ "d90a909e1f3e006a1d57fe11fd417173b6494701" ], "author": { "name": "Oliver Hartkopp", "email": "oliver@hartkopp.net", "time": "Sat Dec 12 04:13:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 13 19:47:42 2009 -0800" }, "message": "can: Fix data length code handling in rx path\n\nA valid CAN dataframe can have a data length code (DLC) of 0 .. 8 data bytes.\n\nWhen reading the CAN controllers register the 4-bit value may contain values\nfrom 0 .. 15 which may exceed the reserved space in the socket buffer!\n\nThe ISO 11898-1 Chapter 8.4.2.3 (DLC field) says that register values \u003e 8\nshould be reduced to 8 without any error reporting or frame drop.\n\nThis patch introduces a new helper macro to cast a given 4-bit data length\ncode (dlc) to __u8 and ensure the DLC value to be max. 8 bytes.\n\nThe different handlings in the rx path of the CAN netdevice drivers are fixed.\n\nSigned-off-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbb84619c378414118fd4f1778125cd246c71e53", "tree": "d5e6ce741ab746f5e8bb03a2d045d360d79a77c0", "parents": [ "c20a66f474e890dd8cc34e124632cd85e4165899" ], "author": { "name": "Barry Song", "email": "21cnbao@gmail.com", "time": "Thu Dec 10 23:46:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 11 15:07:58 2009 -0800" }, "message": "can: add the driver for Analog Devices Blackfin on-chip CAN controllers\n\nSigned-off-by: Barry Song \u003c21cnbao@gmail.com\u003e\nSigned-off-by: H.J. Oertel \u003coe@port.de\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "4c9ba61e9e0212fd79da9a26f7b3d47de4a56a24", "tree": "b317063c1937138b06c068192580de27b10f7f4e", "parents": [ "9aff7e922b852036d864d039ce13ae1e38418b73" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Nov 18 08:20:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 10:48:35 2009 -0800" }, "message": "drivers/net/can: remove exceptional \u0026 on function name\n\nIn this file, function names are otherwise used as pointers without \u0026.\n\nA simplified version of the semantic patch that makes this change is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r@\nidentifier f;\n@@\n\nf(...) { ... }\n\n@@\nidentifier r.f;\n@@\n\n- \u0026f\n+ f\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "615534bc490606685621d63a40c0670d0f049d86", "tree": "8b58ce84e010715bf3b215cfb496582d252db98a", "parents": [ "9a4e328eb2bfa23b160558cff96e17ffa65ea5cf" ], "author": { "name": "Christian Pellegrin", "email": "chripell@fsfe.org", "time": "Tue Nov 17 06:20:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 05:03:18 2009 -0800" }, "message": "can: fix setting mcp251x bit timing on open\n\nSigned-off-by: Christian Pellegrin \u003cchripell@fsfe.org\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24cfbcbabf1faef396ee45b13b25c85d2d17b90d", "tree": "051ee7aaf63a08fa3fc60741b7c576aa8f11d3e3", "parents": [ "323907ac72a223ed4e4d67ce8e3589900023a0c8" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Tue Nov 17 03:57:12 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:57:34 2009 -0800" }, "message": "net/can/mscan: improve build\n\n- move Kconfig entries to the subdirectory\n- do remaining renames of mpc52xx to mpc5xxx\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "323907ac72a223ed4e4d67ce8e3589900023a0c8", "tree": "c186a27332acbcdc9a3fc9ad1231066eab1b4179", "parents": [ "74ff60b29ec602322178d32cb2a82b24ddb884fc" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:53 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:05 2009 -0800" }, "message": "net/can/mscan: add error path to mscan_open()\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74ff60b29ec602322178d32cb2a82b24ddb884fc", "tree": "a40c1fbec527711284eabfe18d9f50eb097e877f", "parents": [ "81593c1cea7afdcd653c77d626aa186993e39c91" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:52 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:04 2009 -0800" }, "message": "net/can/mscan: replace hardcoded values with defines\n\nNot all hardcoded values have been replaced as this made the code quite\nunreadable. IMHO this compromise serves the purpose of readability.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81593c1cea7afdcd653c77d626aa186993e39c91", "tree": "f70cc7dd8dc272a941cd7710e7115ac20c62d692", "parents": [ "3f158c253214bb783e7072f6848b61c1999631e7" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:04 2009 -0800" }, "message": "net/can/mpc52xx_can: improve properties and their description\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: devicetree-discuss@ozlabs.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f158c253214bb783e7072f6848b61c1999631e7", "tree": "dd0cb414b696df9c6a65d302621f142c44389708", "parents": [ "68bd7422a2e07a4e5502137cd4bddb8c2774a912" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:50 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:03 2009 -0800" }, "message": "net/can/mpc52xx_can: refactor clock-get routine\n\nMerge two functions into one. The result is smaller as they can now share some\nvariables.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68bd7422a2e07a4e5502137cd4bddb8c2774a912", "tree": "0f42eee1a2057ddc18264df99b4d881e62bff6a7", "parents": [ "1712fe59415faf23a36c38dbacf18efd4ffe94e0" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:02 2009 -0800" }, "message": "net/can/mscan: drop assignment in while-construct\n\nAs suggested by Wolfgang Grandegger.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1712fe59415faf23a36c38dbacf18efd4ffe94e0", "tree": "b26e572182cf76410090299fb3c920bbcd7c9e55", "parents": [ "59179ea60c117fe62b80705a12c1e9e919638120" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:02 2009 -0800" }, "message": "net/can/mscan: fix function annotations\n\n- use extern where apropriate\n- don\u0027t export symbols\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59179ea60c117fe62b80705a12c1e9e919638120", "tree": "759911e34f85409de8451376fd8394a63a3b84b3", "parents": [ "377a1f0b92819697aa1792f171c305a681fcca5a" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:47 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:01 2009 -0800" }, "message": "net/can/mscan: use {clr|set}bits8 macros\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "377a1f0b92819697aa1792f171c305a681fcca5a", "tree": "134dc5bba6a74f3d7c0756fc542f1e058c3ee639", "parents": [ "0285e7ceaaec9ef2d2e74dd37e2b557c0e017b5c" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:46 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:00 2009 -0800" }, "message": "net/can/mscan: drop support for CAN_MODE_{SLEEP|STOP}\n\nThe upper layer does not support it yet.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0285e7ceaaec9ef2d2e74dd37e2b557c0e017b5c", "tree": "8c0ec34c81f52b15cee294fdb576b1d674343a0d", "parents": [ "622ed7e9cfa931cefc423562d414cb6cd0b08991" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:45 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:54:00 2009 -0800" }, "message": "net/can/mscan: trivial fixes\n\n- remove whitespaces\n- use ! and ?: when apropriate\n- make braces consistent\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "622ed7e9cfa931cefc423562d414cb6cd0b08991", "tree": "8734ded09e2951cf7942162789417e023e8cc158", "parents": [ "a2bfbc072e279ff81e6b336acff612b9bc2e5281" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Mon Nov 16 12:57:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 03:53:59 2009 -0800" }, "message": "net/can/mscan: move defines into .h file\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a2bfbc072e279ff81e6b336acff612b9bc2e5281", "tree": "89cfe21911e1539e1b7f89d8a10d42abecba2a18", "parents": [ "5c427ff9e4cc61625d48172ea082ae99e21eea6a", "82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 00:05:02 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 00:05:02 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/can/Kconfig\n" }, { "commit": "afa17a500a3667f66df450100538d06769529bba", "tree": "d3e134c679b2ee54733eeced15a99b62548ebf93", "parents": [ "888801357f240daee5d310327867d834bc05183b" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Nov 13 06:14:52 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 20:47:03 2009 -0800" }, "message": "net/can: add driver for mscan family \u0026 mpc52xx_mscan\n\nTaken from socketcan-svn, fixed remaining todos, cleaned up, tested with a\nphyCORE-MPC5200B-IO and a custom board.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55369c0a6441e95062cfaeef6eefcfb357a31e8c", "tree": "1bd9907dad60ea1cd7ff388466da6f00d0f44d38", "parents": [ "b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Thu Nov 12 05:34:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 19:56:55 2009 -0800" }, "message": "can: add the missing netlink get_xstats_size callback\n\nThis patch adds the missing \"get_xstats_size\" callback for the\nnetlink interface, which is required if \"fill_xstats\" is used,\nas pointed out by Patrick McHardy.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf", "tree": "6f445f18e72b70fe03c0d0d9a0e685f43c7c6a70", "parents": [ "d0490cfdf440fded2c292cfb8bb9272fc9ef6943" ], "author": { "name": "Oliver Hartkopp", "email": "oliver@hartkopp.net", "time": "Thu Nov 12 01:35:01 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 19:56:55 2009 -0800" }, "message": "can: Fix driver Kconfig structure\n\nIn 2.6.32-rc the new EMS USB CAN driver was contributed and added the Kconfig\nentry right behind an entry of the same *vendor*. This teared the SJA1000\nbased driver selection into pieces.\n\nThis fix cleans up the 2.6.32-rc Kconfig files for the CAN drivers and moves\nthe SJA1000 and USB Kconfig portions into the belonging directories.\n\nAs there are many new CAN drivers in the queue getting this cleanup into\n2.6.32-rc would massively reduce the problems for the upcoming drivers.\n\nThanks,\nOliver\n\nSigned-off-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4", "tree": "daab7cc0db83226672f76d2fc9277e4355f89e6b", "parents": [ "9e0d57fd6dad37d72a3ca6db00ca8c76f2215454", "2606289779cb297320a185db5997729d29b6700b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 23:00:54 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 23:00:54 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/can/usb/ems_usb.c\n" }, { "commit": "e0000163e30eeb112b41486ea113fd54f64e1f17", "tree": "58f40d78882dc4eae86bc71145667f125354d39a", "parents": [ "81adee47dfb608df3ad0b91d230fb3cef75f0060" ], "author": { "name": "Christian Pellegrin", "email": "chripell@fsfe.org", "time": "Mon Nov 02 23:07:00 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 01:50:21 2009 -0800" }, "message": "can: Driver for the Microchip MCP251x SPI CAN controllers\n\nSigned-off-by: Christian Pellegrin \u003cchripell@fsfe.org\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81adee47dfb608df3ad0b91d230fb3cef75f0060", "tree": "e9d7a41872f84c1395e21915e5f92c05ab872e69", "parents": [ "f7a3a1d8affe563846fc17f0e7c0cc1500190c57" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@aristanetworks.com", "time": "Sun Nov 08 00:53:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 00:53:51 2009 -0800" }, "message": "net: Support specifying the network namespace upon device creation.\n\nThere is no good reason to not support userspace specifying the\nnetwork namespace during device creation, and it makes it easier\nto create a network device and pass it to a child network namespace\nwith a well known name.\n\nWe have to be careful to ensure that the target network namespace\nfor the new device exists through the life of the call. To keep\nthat logic clear I have factored out the network namespace grabbing\nlogic into rtnl_link_get_net.\n\nIn addtion we need to continue to pass the source network namespace\nto the rtnl_link_ops.newlink method so that we can find the base\ndevice source network namespace.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "53a0ef866dc379e577794819d0b8ade5ba338e3a", "tree": "250f93d5303cd788e09ee6032c416b5681ea2396", "parents": [ "6755aebaaf9fc5416acfd4578ab7a1e122ecbc74" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Fri Nov 06 23:53:13 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 00:45:48 2009 -0800" }, "message": "can: fix WARN_ON dump in net/core/rtnetlink.c:rtmsg_ifinfo()\n\nOn older kernels, e.g. 2.6.27, a WARN_ON dump in rtmsg_ifinfo()\nis thrown when the CAN device is registered due to insufficient\nskb space, as reported by various users. This patch adds the\nrtnl_link_ops \"get_size\" to fix the problem. I think this patch\nis required for more recent kernels as well, even if no WARN_ON\ndumps are triggered. Maybe we also need \"get_xstats_size\" for\nthe CAN xstats.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b2072e902848a63168570f500a5726744b3873a", "tree": "754df0db6446ed1f53e59002b5137a792be5eaff", "parents": [ "4f2aa89cd263932d61f286307771996df76bf63e" ], "author": { "name": "Sebastian Haas", "email": "haas@ems-wuensche.com", "time": "Wed Nov 04 05:48:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 06 20:26:07 2009 -0800" }, "message": "ems_usb: Fix byte order issues on big endian machines\n\nCPC-USB is using a ARM7 core with little endian byte order. The \"id\" field\nin can_msg needs byte order conversion from/to CPU byte order.\n\nSigned-off-by: Sebastian Haas \u003chaas@ems-wuensche.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfadf853f6cd9689f79a63ca960c6f9d6665314f", "tree": "35418e342d9783f0974ea33ef03875aa21d2362a", "parents": [ "05423b241311c9380b7280179295bac7794281b6", "f568a926a353d6816b3704d7367f34371df44ce7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 27 01:03:26 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 27 01:03:26 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sh_eth.c\n" }, { "commit": "9dbb58d867e90d2528752339751216c955523e62", "tree": "ac65c38756207bba5852eb92d18ca456946a2413", "parents": [ "10e85f7f08535c91aa623547c1024d570af4cdcd" ], "author": { "name": "Kurt Van Dijck", "email": "kurt.van.dijck@eia.be", "time": "Mon Oct 26 17:33:59 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 27 01:02:33 2009 -0700" }, "message": "can: sja1000: fix bug using library functions for skb allocation\n\nCommit 7b6856a0 \"can: provide library functions for skb allocation\"\ndid not properly remove two lines of the SJA1000 driver resulting in\na \u0027skb_over_panic\u0027 when calling skb_put, as reported by Kurt.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b6856a0296a8f187bb88ba31fa83a08abba7966", "tree": "0afbcc9291eeb368e4e4616b6eed9062df646de0", "parents": [ "0eae750e6019a93643063924209c1daf9cb9b4a7" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Tue Oct 20 00:08:01 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 20 00:08:01 2009 -0700" }, "message": "can: provide library functions for skb allocation\n\nThis patch makes the private functions alloc_can_skb() and\nalloc_can_err_skb() of the at91_can driver public and adapts all\ndrivers to use these. While making the patch I realized, that\nthe skb\u0027s are *not* setup consistently. It\u0027s now done as shown\nbelow:\n\n skb-\u003eprotocol \u003d htons(ETH_P_CAN);\n skb-\u003epkt_type \u003d PACKET_BROADCAST;\n skb-\u003eip_summed \u003d CHECKSUM_UNNECESSARY;\n *cf \u003d (struct can_frame *)skb_put(skb, sizeof(struct can_frame));\n memset(*cf, 0, sizeof(struct can_frame));\n\nThe frame is zeroed out to avoid uninitialized data to be passed to\nuser space. Some drivers or library code did not set \"pkt_type\" or\n\"ip_summed\". Also, \"__constant_htons()\" should not be used for\nruntime invocations, as pointed out by David Miller.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e72701acbe0b35e52d3f04d442837c06b4e64f1c", "tree": "2a8edc6952e79c3d2ee3bdf7690ed1a6f2e7bcc6", "parents": [ "0fe7463a35aadfaf22d1ca58325ab3851b8d757c" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Oct 14 14:54:52 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 14 14:54:52 2009 -0700" }, "message": "net: Fix OF platform drivers coldplug/hotplug when compiled as modules\n\nSome OF platform drivers are missing module device tables, so they won\u0027t\nload automatically on boot. This patch fixes the issue by adding proper\nMODULE_DEVICE_TABLE() macros to the drivers.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a6e4bc5304033e434fabccabb230b8e9ff55d76f", "tree": "a1ddf8a6648a5f60e8196c34ad20f9e107f40e8e", "parents": [ "61321bbd6235ca9a40ba3bc249e8906cc66233c3" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Thu Oct 08 22:17:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 03:44:04 2009 -0700" }, "message": "can: make the number of echo skb\u0027s configurable\n\nThis patch allows the CAN controller driver to define the number of echo\nskb\u0027s used for the local loopback (echo), as suggested by Kurt Van\nDijck, with the function:\n\n struct net_device *alloc_candev(int sizeof_priv,\n unsigned int echo_skb_max);\n\nThe CAN drivers have been adapted accordingly. For the ems_usb driver,\nas suggested by Sebastian Haas, the number of echo skb\u0027s has been\nincreased to 10, which improves the transmission performance a lot.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3758bf25db8caeec667e4e56e030da0ec3060529", "tree": "5eacde81468c8e201086083a19456ba28e67e3e0", "parents": [ "0cdc03698f2586923ad3b9fca06643ff5675f221" ], "author": { "name": "Anant Gole", "email": "anantgole@ti.com", "time": "Wed Oct 07 02:59:47 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 07 22:02:53 2009 -0700" }, "message": "can: add TI CAN (HECC) driver\n\nTI HECC (High End CAN Controller) module is found on many TI devices. It\nhas 32 hardware mailboxes with full implementation of CAN protocol 2.0B\nwith bus speeds up to 1Mbps. Specifications of the module are available\non TI web \u003chttp://www.ti.com\u003e\n\nSigned-off-by: Anant Gole \u003canantgole@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99c4a6344f6574c97019ac16e8d54bfe5ad21f2d", "tree": "dd2427ad6f4759561a81a01253051450e8d6d058", "parents": [ "43c2ed8e9e2d285be49d7ea1afc05071d5d7b0f9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 25 12:14:43 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 25 13:43:54 2009 -0700" }, "message": "at91_can: Forgotten git \u0027add\u0027 of at91_can.c\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edf42a27e8e242e543716663e54aa2b592ea070a", "tree": "c18ca7f0564e94a7c09cb25b03627798cc4454ae", "parents": [ "0c01695dabe508ecf3a619c36f0918e8d24c0d05" ], "author": { "name": "Sebastian Haas", "email": "haas@ems-wuensche.com", "time": "Thu Sep 24 03:55:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 24 15:39:18 2009 -0700" }, "message": "ems_pci: fix size of CAN controllers BAR mapping for CPC-PCI v2\n\nThe driver mapped only 128 bytes of the CAN controller address space when a\nCPC-PCI v2 was detected (incl. CPC-104P). This patch will fix it by always\nmapping the whole address space (4096 bytes on all boards) of the\ncorresponding PCI BAR.\n\nSigned-off-by: Sebastian Haas \u003chaas@ems-wuensche.com\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68f40152747da28ae0de21633c9062671448b66c", "tree": "2fc45b1007e575e0cc6cb8d2998677c6d041da69", "parents": [ "a7a1a05f9dc0308b1710c5a9545bb98ca250bb8d" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Tue Sep 22 14:46:57 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 22 14:46:57 2009 -0700" }, "message": "at91_can: add driver for Atmel\u0027s CAN controller on AT91SAM9263\n\nThis patch add the driver for the SoC CAN controller in Atmel\u0027s\nAT91SAM9263.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "702171adeed3607ee9603ec30ce081411e36ae42", "tree": "3e4ca84af1c9e6667a6dd53797abf4595ca8a4d2", "parents": [ "c1e815c03b7313d6474164bfe91916da1329ad2b" ], "author": { "name": "Sebastian Haas", "email": "haas@ems-wuensche.com", "time": "Wed Sep 16 02:04:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 21 11:32:26 2009 -0700" }, "message": "ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface\n\nThis patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from\nEMS Dr. Thomas Wuensche (http://www.ems-wuensche.com).\n\nSigned-off-by: Sebastian Haas \u003chaas@ems-wuensche.com\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "481a8199142c050b72bff8a1956a49fd0a75bbe0", "tree": "66bcd9798738a760c9982d62b9a39b57774e8349", "parents": [ "0b6a05c1dbebe8c616e2e5b0f52b7a01fd792911" ], "author": { "name": "Oliver Hartkopp", "email": "oliver@hartkopp.net", "time": "Tue Sep 15 01:31:34 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 15 01:31:34 2009 -0700" }, "message": "can: fix NOHZ local_softirq_pending 08 warning\n\nWhen using nanosleep() in an userspace application we get a ratelimit warning\n\nNOHZ: local_softirq_pending 08\n\nfor 10 times.\n\nThe echo of CAN frames is done from process context and softirq context only.\nTherefore the usage of netif_rx() was wrong (for years).\n\nThis patch replaces netif_rx() with netif_rx_ni() which has to be used from\nprocess/softirq context. It also adds a missing comment that can_send() must\nno be used from hardirq context.\n\nSigned-off-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nSigned-off-by: Urs Thuermann \u003curs@isnogud.escape.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n\n" }, { "commit": "2a6ba39ad6a277595ef9a0187a44f09e062dd3b2", "tree": "e4036840743f2f618df8626815edd5a9ab2cd5b2", "parents": [ "8935f57e68c40c6469efe03f996bfb6150e18c6b" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Tue Sep 01 05:37:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 04 02:16:16 2009 -0700" }, "message": "can: sja1000: legacy SJA1000 ISA bus driver\n\nThis patch adds support for legacy SJA1000 CAN controllers on the ISA\nor PC-104 bus. The I/O port or memory address and the IRQ number must\nbe specified via module parameters:\n\n insmod sja1000_isa.ko port\u003d0x310,0x380 irq\u003d7,11\n\nfor ISA devices using I/O ports or:\n\n insmod sja1000_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11\n\nfor memory mapped ISA devices.\n\nIndirect access via address and data port is supported as well:\n\n insmod sja1000_isa.ko port\u003d0x310,0x380 indirect\u003d1 irq\u003d7,11\n\nHere is a full list of the supported module parameters:\n\n port:I/O port number (array of ulong)\n mem:I/O memory address (array of ulong)\n indirect:Indirect access via address and data port (array of byte)\n irq:IRQ number (array of int)\n clk:External oscillator clock frequency (default\u003d16000000 [16 MHz])\n (array of int)\n cdr:Clock divider register (default\u003d0x48 [CDR_CBP | CDR_CLK_OFF])\n (array of byte)\n ocr:Output clock register (default\u003d0x18 [OCR_TX0_PUSHPULL])\n (array of byte)\n\nNote: for clk, cdr, ocr, the first argument re-defines the default\nfor all other devices, e.g.:\n\n insmod sja1000_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 clk\u003d24000000\n\nis equivalent to\n\n insmod sja1000_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 \\\n clk\u003d24000000,24000000\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nTested-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8935f57e68c40c6469efe03f996bfb6150e18c6b", "tree": "2e9467085839fff453d7760bf2623bb2a4a02117", "parents": [ "39e3ab6fded4d7e66e01a878f0cae23ddd480c3b" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Tue Sep 01 05:29:41 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 04 02:16:15 2009 -0700" }, "message": "can: sja1000: fix network statistics update\n\nThe member \"tx_bytes\" of \"struct net_device_stats\" should be\nincremented when the interrupt is done and an \"arbitration\nlost error\" is a TX error and the statistics should be updated\naccordingly.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "39e3ab6fded4d7e66e01a878f0cae23ddd480c3b", "tree": "44439df4436f965269f8f795cdf048290a202ed7", "parents": [ "fab4e76373a614d3af624caedf18bee43fc6ca16" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Tue Sep 01 05:26:12 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 04 02:16:14 2009 -0700" }, "message": "can: add can_free_echo_skb() for upcoming drivers\n\nThis patch adds the function can_free_echo_skb to the CAN\ndevice interface to allow upcoming drivers to release echo\nskb\u0027s in case of error.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "451f14439847db302e5104c44458b2dbb4b1829d", "tree": "697046c4438806c37c5b0835dc71b7fdd35b8a92", "parents": [ "6ce9e7b5fe3195d1ae6e3a0753d4ddcac5cd699e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 31 06:34:50 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 23:07:36 2009 -0700" }, "message": "drivers: Kill now superfluous -\u003elast_rx stores\n\nThe generic packet receive code takes care of setting\nnetdev-\u003elast_rx when necessary, for the sake of the\nbonding ARP monitor.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Neil Horman \u003cnhorman@txudriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "61357325f377889a1daffa14962d705dc814dd0e", "tree": "7b436f1097abbc5681de6d1e5901f62963b42220", "parents": [ "d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:58 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:14:07 2009 -0700" }, "message": "netdev: convert bulk of drivers to netdev_tx_t\n\nIn a couple of cases collapse some extra code like:\n int retval \u003d NETDEV_TX_OK;\n ...\n return retval;\ninto\n return NETDEV_TX_OK;\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "424efe9caf6047ffbcd6b383ff4d2347254aabf1", "tree": "d0ed516baa5b452ed8bc3a88fbd061f6e415bfb9", "parents": [ "6518bbb803fe02b15a3211c8db2afdff0ac4f808" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:13:40 2009 -0700" }, "message": "netdev: convert pseudo drivers to netdev_tx_t\n\nThese are all drivers that don\u0027t touch real hardware.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c16807d3d196203d2d3c9fae51ac7e422091904", "tree": "850c33533f80fe426b477c4660c61ba22315a808", "parents": [ "e5e2a8fd8358d1b3a2c51c3248edee72e4194703", "232e7d68d50c9ac3a55d716e5ae215ecd1e043b9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 13 19:59:44 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 13 19:59:44 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/netxen/netxen_nic_main.c\n" }, { "commit": "993e6f2fd487e2acddd711f79cf48f3420731382", "tree": "f68fe3d6ab0640d9f258434ddaa4e8cf060251b0", "parents": [ "839d1624b9dcf31fdc02e47359043bb7bd71d6ca" ], "author": { "name": "Oliver Hartkopp", "email": "oliver@hartkopp.net", "time": "Tue Aug 11 02:41:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 13 16:33:01 2009 -0700" }, "message": "can: fix oops caused by wrong rtnl newlink usage\n\nFor \u0027real\u0027 hardware CAN devices the netlink interface is used to set CAN\nspecific communication parameters. Real CAN hardware can not be created with\nthe ip tool ...\n\nThe invocation of \u0027ip link add type can\u0027 lead to an oops as the standard rtnl\nnewlink function was called:\n\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d13954\n\nThis patch adds a private newlink function for the CAN device driver interface\nthat unconditionally returns -EOPNOTSUPP.\n\nSigned-off-by: Oliver Hartkopp \u003coliver@hartkopp.net\u003e\nReported-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74d154189d597b91da4322996dbf4f5c3d1544ab", "tree": "6f09861b5e2f875d2d8ea2127b16add9103221c6", "parents": [ "5a6338db37885af06760d40cad589316e48431e9", "ffafa60d496f80c250f2ae0340ae94434c0b0b4d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwmc3200wifi/netdev.c\n\tnet/wireless/scan.c\n" }, { "commit": "dd52856ba24ed2f67679c86f207e5a9bab1eb93b", "tree": "613b683066df53b38d028a2e002e750b25d8fd19", "parents": [ "69222e2cb01ac3faaa8ca758c5ee036c191b8b9f" ], "author": { "name": "Sebastian Haas", "email": "haas@ems-wuensche.com", "time": "Tue Jul 21 12:38:13 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 18:01:02 2009 -0700" }, "message": "can: sja1000: Add support for the new 4 channel EMS CPC-PCI cards\n\nThis patch adds support to the ems_pci driver for the new, v2,\n4 channel CPC-PCI/PCIe/104P CAN cards from EMS Dr. Thomas Wuensche.\n\nSigned-off-by: Sebastian Haas \u003chaas@ems-wuensche.com\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1b0d92244ff2434a98272f6d2525da32fc230f19", "tree": "71ab998e48c94b1d67729da22051b8e24cc59258", "parents": [ "b3d0df7ca35018ebbc24fd102ed7021cf593ba74" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Jul 20 04:06:41 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 12:28:30 2009 -0700" }, "message": "can: switch carrier on if device was stopped while in bus-off state\n\nThis patch fixes a problem when a device is stopped while in the\nbus-off state. Then the carrier remains off forever.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@skynet.be\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3d0df7ca35018ebbc24fd102ed7021cf593ba74", "tree": "109a3480057ceeb8807f91877470046965153893", "parents": [ "e2372902d84af3443d421a984d812ec87eeb0758" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Jul 20 04:06:40 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 12:28:29 2009 -0700" }, "message": "can: restart device even if dev_alloc_skb() fails\n\nIf dev_alloc_skb() failed in can_restart(), the device was left behind\nin the bus-off state. This patch restarts the device nevertheless.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2372902d84af3443d421a984d812ec87eeb0758", "tree": "77895a31d982d6a6b5caacdcb409a37cd9c8ce5e", "parents": [ "90cb665937a2aab16d9aa60f22908195c16dcffd" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Jul 20 04:06:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 12:28:26 2009 -0700" }, "message": "can: sja1000: remove duplicated includes\n\nRemove duplicated #include(\u0027s) in\n drivers/net/can/sja1000/sja1000.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ed106549d17474ca17a16057f4c0ed4eba5a7ca", "tree": "b98c09081509b3a9757339b6b66779e4126dfa29", "parents": [ "0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 23 06:03:08 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 05 19:16:04 2009 -0700" }, "message": "net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions\n\nThis patch is the result of an automatic spatch transformation to convert\nall ndo_start_xmit() return values of 0 to NETDEV_TX_OK.\n\nSome occurences are missed by the automatic conversion, those will be\nhandled in a seperate patch.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fec37ab56f5b86b413f71258f36b181f57180d9c", "tree": "82939c83f6851011e12ab199cf90cf2956c685ea", "parents": [ "96f2ebd2e10417da151202c750d8664767a2194b" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Jun 22 21:31:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 23 04:16:44 2009 -0700" }, "message": "can: let SJA1000 driver depend on HAS_IOMEM\n\nFixes this compile error on s390:\n\ndrivers/net/can/sja1000/sja1000_platform.c: In function \u0027sp_read_reg\u0027:\ndrivers/net/can/sja1000/sja1000_platform.c:42: error: implicit declaration of function \u0027ioread8\u0027\ndrivers/net/can/sja1000/sja1000_platform.c: In function \u0027sp_write_reg\u0027:\ndrivers/net/can/sja1000/sja1000_platform.c:47: error: implicit declaration of function \u0027iowrite8\u0027\ndrivers/net/can/sja1000/sja1000_platform.c: In function \u0027sp_probe\u0027:\ndrivers/net/can/sja1000/sja1000_platform.c:79: error: implicit declaration of function \u0027ioremap_nocache\u0027\n\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Oliver Hartkopp \u003coliver.hartkopp@volkswagen.de\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "51611a120e8120290152edd7d0020d22a7f4b4a3", "tree": "75ed9a66a1282e4d93711f20b7d88310e963a087", "parents": [ "bf12691d846b48fa6e3289810a822687457036cf" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Jun 10 01:12:39 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 10 01:12:39 2009 -0700" }, "message": "can: sja1000_of_platform: fix build problems with printk format\n\nAccording to \"Documentation/printk-formats.txt\", if the type is\ndependent on a config option for its size, like resource_size_t,\nwe should use a format specifier of its largest possible type and\nexplicitly cast to it.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1a277c584d0862dbf51991baea947ea5f2ce6bf", "tree": "368832ff703abde6c813eaaba42a48ae451fc1f1", "parents": [ "255a9154319d3cf475d527458037758935f6445b" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Sat May 30 07:55:50 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 01 02:53:35 2009 -0700" }, "message": "can: sja1000: generic OF platform bus driver\n\nThis patch adds a generic driver for SJA1000 chips on the OpenFirmware\nplatform bus found on embedded PowerPC systems. You need a SJA1000 node\ndefinition in your flattened device tree source (DTS) file similar to:\n\n can@3,100 {\n \tcompatible \u003d \"nxp,sja1000\";\n \treg \u003d \u003c3 0x100 0x80\u003e;\n \tinterrupts \u003d \u003c2 0\u003e;\n \tinterrupt-parent \u003d \u003c\u0026mpic\u003e;\n \tnxp,external-clock-frequency \u003d \u003c16000000\u003e;\n };\n\nSee also Documentation/powerpc/dts-bindings/can/sja1000.txt.\n\nCC: devicetree-discuss@ozlabs.org\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "255a9154319d3cf475d527458037758935f6445b", "tree": "317fd2edb63cfa222000cbfa4c4bed6da15c5420", "parents": [ "128ced8f9d59bb3e36fbb4df87bd9d881f0a4463" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Sat May 30 07:55:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 01 02:53:34 2009 -0700" }, "message": "can: sja1000: stop misusing member base_addr of struct net_device\n\nAs discussed on the netdev mailing list, the member \"base_addr\" of\n\"struct net_device\" should not be (mis)used to store the virtual\naddress to the SJA1000 register area. According to David Miller,\nit\u0027s only use is to allow ISA and similar primitive bus devices to\nhave their I/O ports changed via ifconfig. The virtual address is\nnow stored in the private data structure of the SJA1000 device and\nthe callback functions use \"struct sja1000_priv\" instead of the\nunneeded \"struct net_device\".\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "128ced8f9d59bb3e36fbb4df87bd9d881f0a4463", "tree": "38906e40b99eac8acd9e243701001ab8dc2e9b7b", "parents": [ "86d15cd83363a9787039895cb1a1b6be50f82ad3" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Sat May 30 07:55:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 01 02:53:33 2009 -0700" }, "message": "can: some fixes and cleanups to the initial device driver interface\n\nThis patch fixes a few errors sneaked into the initial version of the\ndevice driver interface.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3878fb6fdbceecca20b15748f807340854220f06", "tree": "2d36bb539adbee72d4724188f33c0f96fb7493dc", "parents": [ "a61a8423c71d6da6f1f6f854d8adcea24b80bef6" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Fri May 15 23:39:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 15:41:43 2009 -0700" }, "message": "The patch adds support for the PCI cards: PCIcan and PCIcanx (1, 2 or 4 channel) from Kvaser (http://www.kvaser.com).\n\nSigned-off-by: Per Dalen \u003cper.dalen@cnw.se\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "a61a8423c71d6da6f1f6f854d8adcea24b80bef6" }