commit f2d7499be1b1fe1cd8a5e6a01c1f44173894a241 Merge: 8d659f5... 76aab2c... Author: Linus Torvalds Date: Fri Aug 8 11:15:23 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits) pkt_sched: Fix actions referencing bnx2x: fix logical op tcp: (whitespace only) fix confusing indentation pkt_sched: Fix qdisc config when link is down. [Bluetooth] Add full quirk implementation for btusb driver [Bluetooth] Removal of unnecessary ignore module parameter [Bluetooth] Add parameters to control BNEP header compression ath9k: Revamp wireless mode usage ath9k: More unused macros ath9k: Remove a few unused macros and fix indentation ath9k: Use mac80211's band macros and remove enum hal_freq_band ath9k: Remove redundant data structure ath9k_txq_info ath9k: Cleanup data structures related to HW capabilities ath9k: work around gcc ICEs ath9k: Add new Atheros IEEE 802.11n driver ath5k: remove Atheros 11n devices from supported list list.h: add list_cut_position() list.h: Add list_splice_tail() and list_splice_tail_init() p54: swap short slot time dcf values rt2x00: Block all unsupported modes ... commit 8d659f5e43c5db2630e85f507b7384365e9e1c1e Merge: 9da1f7e... 433c5f7... Author: Linus Torvalds Date: Fri Aug 8 11:14:32 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix end-of-stack checking in save_stack_trace(). sparc: don't use asm/of_device.h sparc64: Use kernel/uid16.c helpers instead of own copy. of/sparc: remove include of linux/of_platform.h from asm/of_platform.h sparc: i8042-sparcio.h: fix warning commit 9da1f7e69aa4545d45d3435865c56f1e67c4b26a Author: Junio C Hamano Date: Thu Aug 7 18:45:08 2008 -0700 powerpc: Do not ignore arch/powerpc/include Back when .gitignore file was added to arch/powerpc/ in 06f2138 ([POWERPC] Add files build to .gitignore, 2006-11-26), there indeed was nothing tracked in the ignored hierarchy and ignoring everything made sense. But we have very many tracked files there these days, and having a higher level .gitignore that ignores everything is asking for future troubles.. This should have been part of b8b572e (powerpc: Move include files to arch/powerpc/include/asm, 2008-08-01). Signed-off-by: Junio C Hamano Acked-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 433c5f706856689be25928a99636e724fb3ea7cf Author: David S. Miller Date: Thu Aug 7 23:04:37 2008 -0700 sparc64: Fix end-of-stack checking in save_stack_trace(). Bug reported by Alexander Beregalov. Before we dereference the stack frame or try to peek at the pt_regs magic value, make sure the entire object is within the kernel stack bounds. Signed-off-by: David S. Miller commit 76aab2c1eae491a5d73ac83deec97dd28ebac584 Author: Jamal Hadi Salim Date: Thu Aug 7 20:37:22 2008 -0700 pkt_sched: Fix actions referencing When an action is added several times with the same exact index it gets deleted on every even-numbered attempt. This fixes that issue. Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 4ab84d450e24b3a309608182a8d8e30626b46f8f Author: Randy Dunlap Date: Thu Aug 7 20:33:19 2008 -0700 bnx2x: fix logical op Fix dubious logical operation that was found by sparse: linux-next-20080807/drivers/net/bnx2x_main.c:7205:27: warning: dubious: !x & y Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c1c6c11a6860c8135fd0d923c3d49fb368889b10 Merge: 2aaab9a... cfeb414... Author: David S. Miller Date: Thu Aug 7 20:28:46 2008 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 commit 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5 Author: Adam Langley Date: Thu Aug 7 20:27:45 2008 -0700 tcp: (whitespace only) fix confusing indentation The indentation in part of tcp_minisocks makes it look like one of the if statements is much more important than it actually is. Signed-off-by: Adam Langley Signed-off-by: David S. Miller commit 827ebd6410005b05b3c930ef6a116666c6986886 Author: David S. Miller Date: Thu Aug 7 20:26:40 2008 -0700 pkt_sched: Fix qdisc config when link is down. Bug reported by Stephen Hemminger. We need to fetch the root from ->qdisc_sleeping not ->qdisc. Signed-off-by: David S. Miller commit 22c7fdf4a7acfa24d9d498b1357e6c07d0e6c553 Merge: 5423b2e... 86b89ee... Author: David S. Miller Date: Thu Aug 7 18:52:57 2008 -0700 Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit aeee90dfa01844168cd7f8051d0a0f969c573067 Merge: 273b257... 5861bbf... Author: Linus Torvalds Date: Thu Aug 7 18:14:24 2008 -0700 Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace * 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: tracehook: fix CLONE_PTRACE commit 273b2578392bbf6e5c47a8a3d1ee461ce6fc7182 Merge: 8e43e12... 06a91a0... Author: Linus Torvalds Date: Thu Aug 7 18:14:07 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL IB/mlx4: Allow 4K messages for UD QPs mlx4_core: Add ethernet fields to CQE struct IB/ipath: Fix printk format warnings RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device RDMA/cxgb3: Fix up MW access rights RDMA/cxgb3: Fix QP capabilities RDMA/cma: Remove padding arrays by using struct sockaddr_storage IB/ipath: Use unsigned long for irq flags IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr() commit 8e43e12d638f732fa32600c324711f4be8fe0b1d Merge: 01b09b6... 62aa005... Author: Linus Torvalds Date: Thu Aug 7 18:13:30 2008 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: xen-blkfront.c: make blkif_ioctl() static bio: make use of bvec_nr_vecs cciss: fix bug if scsi tape support is disabled cciss: add support for multi lun tape devices cciss: change the way we notify scsi midlayer of tape drives cciss: fix negative logical drive count in procfs cciss: remove redundant code cciss: make rebuild_lun_table behave better cciss: return -EFAULT if copy_from_user() fails commit 01b09b6c605ed119fba75b82582f017e44dd4a55 Merge: c1ec829... bf9c8c9... Author: Linus Torvalds Date: Thu Aug 7 18:12:41 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers commit c1ec8295f6e8c888230bbc9b7a416dc26d03688e Author: Linus Torvalds Date: Thu Aug 7 18:10:12 2008 -0700 Fix up duplicate '__s3c2410wdt_stop()' function Looks like somebody didn't get enough sleep. Noticed-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 Merge: 4c514a5... 5875013... Author: Linus Torvalds Date: Thu Aug 7 18:07:33 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm. commit 4c514a5ad1314b872e3185dabaf105c81d39d7e8 Author: Stephen Rothwell Date: Thu Aug 7 14:08:27 2008 +1000 powerpc/iseries: remove the old viocons driver This driver was declared obsolete over 2 years ago, the alternative console driver for legacy iSeries (hvc_iseries) was made the default over 1 year ago and this driver has been build broken for over 3 months, so remove it. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit b80b601f0087391e55d3859e70f08278632b1185 Merge: a06dee4... 04793dd... Author: Linus Torvalds Date: Thu Aug 7 18:06:19 2008 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits) V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams V4L/DVB (8611): Add suspend/resume to pxa_camera driver V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. V4L/DVB (8564): fix vino driver build error V4L/DVB (8563): fix drivers/media/video/arv.c compilation V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select V4L/DVB (8558): media/video/Kconfig: fix a typo ... commit a06dee41a31bff488a261dfc542776ffd2f24ff1 Merge: b588e2b... 816d8c6... Author: Linus Torvalds Date: Thu Aug 7 18:05:39 2008 -0700 Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle hwmon: ad7414 driver hwmon: (thmc50) Add support for critical temperature limits hwmon: (adm9240) Remove EXPERIMENTAL dependency hwmon: (w83627hf) Drop reset module parameter hwmon: (w83627hf) Add pwm_enable sysfs interface hwmon: (w83791d) Use fan divisor bits from vbat register hwmon: (f71882fg) Delete needless forward declarations hwmon: (dme1737) Add support for the SMSC SCH5027 hwmon: (dme1737) Skip detection if forced hwmon: (dme1737) Cleanups commit b588e2bbd7b872c9cdf635fe0f04840534e72443 Merge: 3df302f... 7944d3a... Author: Linus Torvalds Date: Thu Aug 7 18:05:09 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits) [WATCHDOG] more coding style clean-up's [WATCHDOG] sbc8360.c - move stop code into a function [WATCHDOG] Coding style - Indentation - part 2 [WATCHDOG] Coding style - Indentation - part 1 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs [WATCHDOG] mpc8xxx_wdt: fix build [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver [WATCHDOG] pcwd: a couple of watchdogs escaped conversion [WATCHDOG] Clean-up includes [WATCHDOG] hpwdt.c - fix double includes [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl ... commit 3df302ff56fac91d54e964faed9d293018ac71ca Merge: 685d87f... 64a99d2... Author: Linus Torvalds Date: Thu Aug 7 18:04:28 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: a better way to generate cscope database change Kconfig: Extend "menuconfig" for modules to simplify Kconfig file bugfix for scripts/patch-kernel in 2.6 sublevel stepping kbuild: fix O=.. build with arm commit 5861bbfcc10fc0358abf52c7d22850c8d180f0b0 Author: Roland McGrath Date: Thu Aug 7 16:55:03 2008 -0700 tracehook: fix CLONE_PTRACE In the change in commit 09a05394fe2448a4139b014936330af23fa7ec83, I overlooked two nits in the logic and this broke using CLONE_PTRACE when PTRACE_O_TRACE* are not being used. A parent that is itself traced at all but not using PTRACE_O_TRACE*, using CLONE_PTRACE would have its new child fail to be traced. A parent that is not itself traced at all that uses CLONE_PTRACE (which should be a no-op in this case) would confuse the bookkeeping and lead to a crash at exit time. This restores the missing checks and fixes both failure modes. Reported-by: Eduardo Habkost Signed-off-by: Roland McGrath commit 764f2579d95120e1c76b7af1256d02466ddd00bf Author: Stephen Rothwell Date: Thu Aug 7 15:33:36 2008 -0700 sparc: don't use asm/of_device.h Use linux/of_device.h instead. Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit 06a91a02e9b249695f964bb59c8b02152c21e90c Merge: 3f44675... be43324... 70117b9... e081981... cd55ef5... 6e0d733... Author: Roland Dreier Date: Thu Aug 7 14:12:03 2008 -0700 Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus commit cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 Author: Julien Brunel Date: Thu Aug 7 14:11:56 2008 -0700 IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL In case of error, the function ib_create_send_mad() returns an ERR pointer, but never returns a NULL pointer. So testing the return value for error should be done with IS_ERR, not by comparing with NULL. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @correct_null_test@ expression x,E; statement S1, S2; @@ x = ib_create_send_mad(...) <... when != x = E if ( ( - x@p2 != NULL + ! IS_ERR ( x ) | - x@p2 == NULL + IS_ERR( x ) ) ) S1 else S2 ...> ? x = E; // Signed-off-by: Julien Brunel Signed-off-by: Julia Lawall Signed-off-by: Roland Dreier commit 6e0d733d921526e628107fb8b1aff5f7de870d6f Author: Alex Naslednikov Date: Thu Aug 7 14:06:50 2008 -0700 IB/mlx4: Allow 4K messages for UD QPs Current code limits the max message size to 2K for UD QPs, while MTU might be as big as 4K. This patch sets the maximum message size to 4K, which is needed for UD to work correctly on fabrics with a 4K MTU. Signed-off-by: Alex Naslednikov Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit cfeb414537b1d7c23ba202f198fa4154cd5a4856 Author: Marcel Holtmann Date: Thu Aug 7 22:26:56 2008 +0200 [Bluetooth] Add full quirk implementation for btusb driver This implements all the quirk handling from the hci_usb driver to the new btusb driver. Signed-off-by: Oliver Neukum Signed-off-by: Marcel Holtmann commit 943d56b0a578cfc10e0340c6f8d6b8795d380e67 Author: Marcel Holtmann Date: Thu Aug 7 22:26:55 2008 +0200 [Bluetooth] Removal of unnecessary ignore module parameter This removes the unnecessary ignore parameter, which is useless. There are alternate methods of kicking a driver off an USB device. Signed-off-by: Oliver Neukum Signed-off-by: Marcel Holtmann commit 28111eb2f5087c5aa5ec3697388f6c7d354b2ad8 Author: Marcel Holtmann Date: Thu Aug 7 22:26:54 2008 +0200 [Bluetooth] Add parameters to control BNEP header compression The Bluetooth qualification for PAN demands testing with BNEP header compression disabled. This is actually pretty stupid and the Linux implementation outsmarts the test system since it compresses whenever possible. So to pass qualification two need parameters have been added to control the compression of source and destination headers. Signed-off-by: Marcel Holtmann commit 86b89eed9aca2a4a335b9c1bf7380f9183db431f Author: Sujith Date: Thu Aug 7 10:54:57 2008 +0530 ath9k: Revamp wireless mode usage Use a single enum for managing modes, store supported modes by the HW in a bitmask. Register legacy rates with mac80211 only at init. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 3b95978ddadbab594aad6280bfa660a49948af86 Author: Sujith Date: Thu Aug 7 10:54:33 2008 +0530 ath9k: More unused macros Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit f22f558dcaaf2ca413571df0ae8219474af1a46f Author: Sujith Date: Thu Aug 7 10:54:07 2008 +0530 ath9k: Remove a few unused macros and fix indentation Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 06df8bea27e9d6fe4657e8ca0557ab7515695f00 Author: Sujith Date: Thu Aug 7 10:53:39 2008 +0530 ath9k: Use mac80211's band macros and remove enum hal_freq_band Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ea9880fb059e0e95d651eab6029f58e7c81b8602 Author: Sujith Date: Thu Aug 7 10:53:10 2008 +0530 ath9k: Remove redundant data structure ath9k_txq_info Use ath9k_tx_queue_info which contains the same elements, and merge get/set functions of tx queue properties. Also, fix whitespace damage in struct ath_softc. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 60b67f519213cf6d59236d065b0953962b56abca Author: Sujith Date: Thu Aug 7 10:52:38 2008 +0530 ath9k: Cleanup data structures related to HW capabilities Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit b08cbcd4546445740c2a04291204b56f8baf7be2 Author: Adrian Bunk Date: Tue Aug 5 22:06:51 2008 +0300 ath9k: work around gcc ICEs This patch works around an internal compiler error (gcc bug #37014) in all gcc 4.2 compilers and the gcc 4.3 series up to at least 4.3.1 on at least powerpc and mips. Many thanks to Andrew Pinski for analyzing the gcc bug. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit f078f209704849c86bd43c0beccfc1f410ed1c66 Author: Luis R. Rodriguez Date: Mon Aug 4 00:16:41 2008 -0700 ath9k: Add new Atheros IEEE 802.11n driver This adds the new mac80211 11n ath9k Atheros driver. Only STA support is currently enabled and tested. Signed-off-by: Senthil Balasubramanian Signed-off-by: Felix Fietkau Signed-off-by: Jack Howarth Signed-off-by: Jouni Malinen Signed-off-by: Sujith Manoharan Signed-off-by: Luis R. Rodriguez Signed-off-by: Pavel Roskin Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b1a5215004130689aeee9e522585c879d3b71472 Author: Luis R. Rodriguez Date: Mon Aug 4 00:16:40 2008 -0700 ath5k: remove Atheros 11n devices from supported list Remove Atheros 11n devices from being claimed by ath5k as its now handled by ath9k. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 00e8a4da8cf0d7dba8cc4b0da28ea0f12dcf6b36 Author: Luis R. Rodriguez Date: Wed Aug 6 13:28:54 2008 -0700 list.h: add list_cut_position() This adds list_cut_position() which lets you cut a list into two lists given a pivot in the list. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7d283aee50351ec19eaf654a8690d77c4e1dff50 Author: Luis R. Rodriguez Date: Wed Aug 6 15:21:26 2008 -0700 list.h: Add list_splice_tail() and list_splice_tail_init() If you are using linked lists for queues list_splice() will not do what you would expect even if you use the elements passed reversed. We need to handle these differently. We add list_splice_tail() and list_splice_tail_init(). Signed-off-by: Peter Zijlstra Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5423b2ed25993e13009ce39f55d742c3c6d03edb Author: Christian Lamparter Date: Thu Aug 7 10:22:28 2008 +0200 p54: swap short slot time dcf values these "magic" values must to be the other way round... Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 0fc980392e5a06cff34ca7acaac5790bb59528d1 Author: Ivo van Doorn Date: Wed Aug 6 16:18:31 2008 +0200 rt2x00: Block all unsupported modes It was possible for unsupported operating modes to be accepted by the add_interface callback function. This patch will block those modes until proper support has been implemented for them. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8dbc1722a78343eb80f0ce1a3ef1965a9774ad5b Author: Luis Carlos Cobo Date: Wed Aug 6 13:17:54 2008 +0200 mac80211: keep mesh ifaces in allmulti mode Currently a mesh node will not forward a multicast frame if it is not subscribed to the specific multicast address. This patch addresses the issue and fixes mesh multicast forwarding. Signed-off-by: Luis Carlos Cobo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit e32f85f7b917456265d4c30d15f734c4912cfa6a Author: Luis Carlos Cobo Date: Tue Aug 5 19:34:52 2008 +0200 mac80211: fix use of skb->cb for mesh forwarding Now we deal with mesh forwarding before the 802.11->802.3 conversion, thus eliminating a few unnecessary steps. The next hop lookup is called from ieee80211_master_start_xmit() instead of subif_start_xmit(). Until the next hop is found, RA in the frame will be all zeroes for frames originating from the device. For forwarded frames, RA will contain the TA of the received frame, which will be necessary to send a path error if a next hop is not found. Signed-off-by: Luis Carlos Cobo Acked-by: Johannes Berg Signed-off-by: John W. Linville commit eda0c003d1ff14c99d8476b482377ccfaf967b6c Author: Larry Finger Date: Tue Aug 5 11:23:16 2008 -0500 p54: Fix for TX sequence number problem Following "mac80211: fix TX sequence numbers", if a packet has the IEEE80211_TX_CTL_ASSIGN_SEQ assigned, a sequence number must be supplied, either by hardware or software. AFAIK, no such hardware exists for the p54, thus it must be done in software. With this patch, a connection qith p54usb is stable, whereas the interface went off-line in 2-3 hours without this change. Note that this code will have to be reworked for proper sequence numbers on beacons. In addition, the sequence number has been placed in the hardware state, not the vif state. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f367422794315b7632f2a78c93e15b3c757d4be8 Author: Tomas Winkler Date: Mon Aug 4 16:00:44 2008 +0800 iwlwifi: cleanup iwl_tx_skb This patch cleans up iwl_tx_skb function. Signed-off-by: Tomas Winkler Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e6fce5b916cd7f7f79b2b3e53ba74bbfc1d7cf8b Author: Robert Olsson Date: Thu Aug 7 02:23:01 2008 -0700 pktgen: multiqueue etc. Sofar far pktgen have had a restriction to only use one device per kernel thread. With the new multiqueue architecture this is no longer adequate. The patch below is an effort to remove this by in pktgen configuration adding a tag to the device name a la eth0@0 etc. The tag is used for usual device config just as before. Also a new flag is introduced to mirror queue_map with sending threads smp_processor_id() QUEUE_MAP_CPU. An example: We use 4 CPU's to send to one 10g interface (eth0) and we use the new tagging to send a mix of packet sizes, 64, 576 and 1500 bytes. Also we use TX queues according to smp_processor_id() PGDEV=/proc/net/pktgen/kpktgend_0 pgset "add_device eth0@0" PGDEV=/proc/net/pktgen/kpktgend_1 pgset "add_device eth0@1" PGDEV=/proc/net/pktgen/kpktgend_2 pgset "add_device eth0@2" PGDEV=/proc/net/pktgen/kpktgend_3 pgset "add_device eth0@3" .... PGDEV=/proc/net/pktgen/eth0@0 pgset "pkt_size 64" pgset "flag QUEUE_MAP_CPU" PGDEV=/proc/net/pktgen/eth0@1 pgset "pkt_size 572" pgset "flag QUEUE_MAP_CPU" PGDEV=/proc/net/pktgen/eth0@2 pgset "pkt_size 1496" PGDEV=/proc/net/pktgen/eth0@3 pgset "pkt_size 1496" pgset "flag QUEUE_MAP_CPU" Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 32bb93b02da8c75031e601ff1f9a25f99febbe5f Merge: 6edafaa... 3859069... Author: David S. Miller Date: Thu Aug 7 02:10:27 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 3859069bc3358772b08bd91efe9edec39a746ea8 Merge: e2c709b... 867240f... Author: Jeff Garzik Date: Thu Aug 7 04:05:46 2008 -0400 Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp commit e2c709b0ba2886b5438b666222b4b3faf82d65a9 Author: Krzysztof Halasa Date: Mon Jun 30 22:09:15 2008 +0200 WAN: remove extra help text from HDLC_PPP config option Remove extra help text from HDLC_PPP config option. Signed-off-by: Krzysztof Hałasa Signed-off-by: Jeff Garzik commit f982307f22db96201e41540295f24e8dcc10c78f Author: Joe Eykholt Date: Wed Jul 2 18:22:02 2008 -0700 net/core: Allow receive on active slaves. If a packet_type specifies an active slave to bonding and not just any interface, allow it to receive frames that came in on that interface. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 0d7a3681232f545c6a59f77e60f7667673ef0e93 Author: Joe Eykholt Date: Wed Jul 2 18:22:01 2008 -0700 net/core: Allow certain receives on inactive slave. Allow a packet_type that specifies the exact device to receive even on an inactive bonding slave devices. This is important for some L2 protocols such as LLDP and FCoE. This can eventually be used for the bonding special cases as well. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit cc9bd5cebc0825e0fabc0186ab85806a0891104f Author: Joe Eykholt Date: Wed Jul 2 18:22:00 2008 -0700 net/core: Uninline skb_bond(). Otherwise subsequent changes need multiple return values. Signed-off-by: Joe Eykholt Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit db018a5f49e1768891221a580e59f6825c52ab7a Author: Moni Shoua Date: Wed Jul 2 18:21:59 2008 -0700 bonding: Don't destroy bonding master when removing slave via sysfs It is wrong to destroy a bonding master from a context that uses the sysfs of that bond. When last IPoIB slave is unenslaved from by writing to a sysfs file (for bond0 this would be /sys/class/net/bond0/bonding/slaves) the driver tries to destroy the bond. This is wrong and can lead to a lockup or a crash. This fix lets the bonding master stay and relies on the user to destroy the bonding master if necessary (i.e. before module ib_ipoib is unloaded) This patch affects only bonds of IPoIB slaves. Ethernet slaves stay unaffected. Signed-off-by: Moni Shoua Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit f0c76d61779b153dbfb955db3f144c62d02173c2 Author: Jay Vosburgh Date: Wed Jul 2 18:21:58 2008 -0700 bonding: refactor mii monitor Refactor mii monitor. As with the previous ARP monitor refactor, the motivation for this is to handle locking rationally (in this case, removing conditional locking) and generally clean up the code. This patch breaks up the monolithic mii monitor into two phases: an inspection phase, followed by an optional commit phase. The commit phase is the only portion that requires RTNL or makes changes to state, and is only called when inspection finds something to change. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 Author: Gui Jianfeng Date: Wed Aug 6 23:50:04 2008 -0700 tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup If the following packet flow happen, kernel will panic. MathineA MathineB SYN ----------------------> SYN+ACK <---------------------- ACK(bad seq) ----------------------> When a bad seq ACK is received, tcp_v4_md5_do_lookup(skb->sk, ip_hdr(skb)->daddr)) is finally called by tcp_v4_reqsk_send_ack(), but the first parameter(skb->sk) is NULL at that moment, so kernel panic happens. This patch fixes this bug. OOPS output is as following: [ 302.812793] IP: [] tcp_v4_md5_do_lookup+0x12/0x42 [ 302.817075] Oops: 0000 [#1] SMP [ 302.819815] Modules linked in: ipv6 loop dm_multipath rtc_cmos rtc_core rtc_lib pcspkr pcnet32 mii i2c_piix4 parport_pc i2c_core parport ac button ata_piix libata dm_mod mptspi mptscsih mptbase scsi_transport_spi sd_mod scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan] [ 302.849946] [ 302.851198] Pid: 0, comm: swapper Not tainted (2.6.27-rc1-guijf #5) [ 302.855184] EIP: 0060:[] EFLAGS: 00010296 CPU: 0 [ 302.858296] EIP is at tcp_v4_md5_do_lookup+0x12/0x42 [ 302.861027] EAX: 0000001e EBX: 00000000 ECX: 00000046 EDX: 00000046 [ 302.864867] ESI: ceb69e00 EDI: 1467a8c0 EBP: cf75f180 ESP: c0792e54 [ 302.868333] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 [ 302.871287] Process swapper (pid: 0, ti=c0792000 task=c0712340 task.ti=c0746000) [ 302.875592] Stack: c06f413a 00000000 cf75f180 ceb69e00 00000000 c05d0d86 000016d0 ceac5400 [ 302.883275] c05d28f8 000016d0 ceb69e00 ceb69e20 681bf6e3 00001000 00000000 0a67a8c0 [ 302.890971] ceac5400 c04250a3 c06f413a c0792eb0 c0792edc cf59a620 cf59a620 cf59a634 [ 302.900140] Call Trace: [ 302.902392] [] tcp_v4_reqsk_send_ack+0x17/0x35 [ 302.907060] [] tcp_check_req+0x156/0x372 [ 302.910082] [] printk+0x14/0x18 [ 302.912868] [] tcp_v4_do_rcv+0x1d3/0x2bf [ 302.917423] [] tcp_v4_rcv+0x563/0x5b9 [ 302.920453] [] ip_local_deliver_finish+0xe8/0x183 [ 302.923865] [] ip_rcv_finish+0x286/0x2a3 [ 302.928569] [] dev_alloc_skb+0x11/0x25 [ 302.931563] [] netif_receive_skb+0x2d6/0x33a [ 302.934914] [] pcnet32_poll+0x333/0x680 [pcnet32] [ 302.938735] [] net_rx_action+0x5c/0xfe [ 302.941792] [] __do_softirq+0x5d/0xc1 [ 302.944788] [] __do_softirq+0x0/0xc1 [ 302.948999] [] do_softirq+0x55/0x88 [ 302.951870] [] handle_fasteoi_irq+0x0/0xa4 [ 302.954986] [] irq_exit+0x35/0x69 [ 302.959081] [] do_IRQ+0x99/0xae [ 302.961896] [] common_interrupt+0x23/0x28 [ 302.966279] [] default_idle+0x2a/0x3d [ 302.969212] [] cpu_idle+0xb2/0xd2 [ 302.972169] ======================= [ 302.974274] Code: fc ff 84 d2 0f 84 df fd ff ff e9 34 fe ff ff 83 c4 0c 5b 5e 5f 5d c3 90 90 57 89 d7 56 53 89 c3 50 68 3a 41 6f c0 e8 e9 55 e5 ff <8b> 93 9c 04 00 00 58 85 d2 59 74 1e 8b 72 10 31 db 31 c9 85 f6 [ 303.011610] EIP: [] tcp_v4_md5_do_lookup+0x12/0x42 SS:ESP 0068:c0792e54 [ 303.018360] Kernel panic - not syncing: Fatal exception in interrupt Signed-off-by: Gui Jianfeng Signed-off-by: David S. Miller commit ee7af8264dafa0c8c76a8dc596803966c2e29ebc Author: David S. Miller Date: Wed Aug 6 23:35:59 2008 -0700 pkt_sched: Fix "parent is root" test in qdisc_create(). As noticed by Stephen Hemminger, the root qdisc is denoted by TC_H_ROOT, not zero. Signed-off-by: David S. Miller commit c16d118537cadb21d186e35aebad90a13cd78846 Author: Wang Chen Date: Tue Jul 22 13:13:12 2008 +0800 [netdrvr] Drivers should not set IFF_* flag themselves Some hardware set promisc when they are requested to set IFF_ALLMULTI flag. It's ok, but if drivers set IFF_PROMISC flag when they set promisc, it will broken upper layer handle for promisc and allmulti. In addition, drivers can use their own hardware programming to make it. So do not allow drivers to set IFF_* flags. This is a general driver fix, so I didn't split it to pieces and send to specific driver maintainers. Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit fe414248551e2880fe8913577699003ff145ab9d Author: Laurent Pinchart Date: Wed Jul 23 17:41:52 2008 +0200 dm9000: Support MAC address setting through platform data. The dm9000 driver reads the chip's MAC address from the attached EEPROM. When no EEPROM is present, or when the MAC address is invalid, it falls back to reading the address from the chip. This patch lets platform code set the desired MAC address through platform data. Signed-off-by: Laurent Pinchart Signed-off-by: Jeff Garzik commit 9a5d3414202a21ed4b053657345ea0fd492d513a Author: Stephen Hemminger Date: Fri Jul 25 12:07:22 2008 -0700 3c59x: use netdev_alloc_skb Fix possible bug where end of receive buffer could be overwritten. The allocation needs to allow for the reserved space. This would only happen if device received packet greater than Ethernet standard MTU. Change this driver to use netdev_alloc_skb rather than setting skb->dev directly. For the initial allocation it doesn't need to be GFP_ATOMIC. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4 Author: Brandon Philips Date: Tue Jul 15 02:18:41 2008 -0700 ethtool: Expand ethtool_cmd.speed to 32 bits Introduce the speed_hi field to ethtool_cmd, using the reserved space, to expand the speed field to 2^32 Megabits/second. Making this field expansion now gives us plenty of time to fix up the user-space pieces that use SIOCETHTOOL before hardware faster than 64 Gb/s is available. Signed-off-by: Brandon Philips Signed-off-by: Jeff Garzik commit 4f63135eb23015a17eaf4f7478deedf63e98ff5c Author: Ben Collins Date: Wed Jul 30 12:39:02 2008 -0700 pegasus: add blacklist support to fix Belkin bluetooth dongle. Reference: https://launchpad.net/bugs/140511 The Belkin bluetooth dongle unfortunately shares the vendor and device id with the network adapter which causes lockups whenever the bluetooth dongle is inserted. Signed-off-by: Stefan Bader Signed-off-by: Ben Collins Cc: Greg Kroah-Hartman Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 11a859e591befae7413505c68dd241ad8e14748c Author: Andrew Morton Date: Wed Jul 30 12:50:12 2008 -0700 drivers/net/netxen/netxen_nic_hw.c: fix printk warnings drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_read_direct': drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_write_direct': drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64' You don't know what type was used for u64 hence they cannot be printed without casting. Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5608784fdf417467cbb2ccfb1129500464416f79 Author: Eugene Teo Date: Wed Jul 30 12:38:59 2008 -0700 hamradio: add missing sanity check to tty operation Add missing sanity check to tty operation. Acked-by: Alan Cox Signed-off-by: Eugene Teo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 11795aa4f89cf68e7aafc8a606feee14c97a12e5 Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:13 2008 -0300 drivers/net: coding styles fixes to drivers/net/8390.c Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit caa1687c0123705182dc0388304a4c9b78fcf41c Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:12 2008 -0300 drivers/net: coding styles fixes to drivers/net/8390p.c Fix all errors and warnings reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit 057b61afca098d3ad3d9e8d15914bc9f9315e425 Author: Gustavo F. Padovan Date: Sat Aug 2 15:55:11 2008 -0300 drivers/net: Remove 'return' of void function NS8390p_init() We don't need this into a void function. Signed-off-by: Gustavo F. Padovan Signed-off-by: Jeff Garzik commit 71557a37adb5df17631c493b3b7d912938c720b2 Author: Yoshinori Sato Date: Wed Aug 6 19:49:00 2008 -0400 [netdrvr] sh_eth: Add SH7619 support Add support SH7619 Internal ethernet controler. Signed-off-by: Yoshinori Sato Signed-off-by: Jeff Garzik commit d91d4bb9db4a7b2a78accff3560bfd42988c56e4 Author: Thomas Bogendoerfer Date: Thu Jul 31 01:14:24 2008 +0200 METH: fix MAC address setup Setup of the mac filter lost the upper 16bit of the mac address. This bug got unconvered by a patch, which fixed the promiscous handling. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit 0b1ab1b8a4f663a34c23f31d796fd08283b6077a Author: Eduardo Habkost Date: Thu Jul 31 17:36:55 2008 -0300 xen-netfront: use netif_start_queue() on xennet_open() xen-netfront never called netif_start_queue() and was was waking the queue on xennet_open(), triggering the BUG_ON() on __netif_schedule(). Signed-off-by: Eduardo Habkost Signed-off-by: Jeff Garzik commit b08c42b283141d1a79fb748d258dcd1da8baa32e Author: root Date: Thu Jul 31 13:46:08 2008 -0700 qla3xxx: driver version change. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 4ea0d6e5b8dc6c46c1a981e971fa0b78bfe6e5d3 Author: Ron Mercer Date: Thu Jul 31 13:46:07 2008 -0700 qla3xxx: cleanup: Remove some unused structure definitions and structure elements. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 6bc0ed97d5ddb49248cfb76827d72557f4bd0aae Author: Ron Mercer Date: Thu Jul 31 13:46:06 2008 -0700 qla3xxx: cleanup: Remove some unused defined constants in the header file. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit eb115b00992ed21fb8734cbee45d46d37f4010ce Author: Ron Mercer Date: Thu Jul 31 13:46:05 2008 -0700 qla3xxx: fix: Fix IFF_MULTICAST setting. The driver was erroneously clearing this bit though the hardware supports multicast. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 49ef26eb8dc76531b197b591072c403f0e6ec598 Author: Ron Mercer Date: Thu Jul 31 13:46:04 2008 -0700 qla3xxx: fix: Remove unused set_multicast function. This device is one side of a two-function adapter (NIC and iSCSI). Promiscuous mode setting/clearing is not allowed from the NIC side. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 9ad27643f3a054dff9211bb9938f2323907c2ffe Author: Dhananjay Phadke Date: Fri Aug 1 03:14:59 2008 -0700 netxen: fix promisc mode, mtu setting For NX3031, multicast filtering, promisc mode, and max frame size setting is handled by firmware, driver needs to send request to enable/disable it. For old chip revisions / firmware, driver still sets it directly. Added function pointer to set mtu according to chip revision. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 83821a078a1617e120d76954f455204cec78fe9d Author: Dhananjay Phadke Date: Fri Aug 1 03:14:58 2008 -0700 netxen: fix cmd ring init Initialize producer and consumer indices during netdev open(), only for old firmware/chip. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit d71e1be8edd355668a12a18660da03ae993dd9df Author: Dhananjay Phadke Date: Fri Aug 1 03:14:57 2008 -0700 netxen: fix legacy interrupts Fix legacy interrupt mode for NX3031 chips, read pci interrupt state in hardware to guard against spurious interrupt. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit ea771bd51c3b9b9683860515d93e6155a345fa2f Author: David S. Miller Date: Wed Aug 6 23:11:08 2008 -0700 sparc64: Use kernel/uid16.c helpers instead of own copy. Noticed by Adrian Bunk. Signed-off-by: David S. Miller commit a70f939338cae650f177ae79562ec44659788bb4 Author: Dhananjay Phadke Date: Fri Aug 1 03:14:56 2008 -0700 netxen: add new board types Add couple of new board configurations based on NX3031 chip. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 24a7a45511f89959b4f1dc60a66260d09777901a Author: Dhananjay Phadke Date: Fri Aug 1 03:14:55 2008 -0700 netxen: fix link status, link speed For NX3031, the phy is managed by firmware, so driver should avoid setting any phy registers. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 4ad7a018cf4ac3cbad661c28c0f783ee0a6e3bf6 Author: Adrian Bunk Date: Mon Aug 4 11:59:36 2008 +0300 remove bogus CONFIG_GFAR_NAPI's The commit that made the CONFIG_GFAR_NAPI code unconditional was included at the same time as a new CONFIG_GFAR_NAPI user, resulting in these bugus #ifdef's. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 5b1c29b4365d2eaf05eb81899cb1ca847dfe026e Author: Li Yang Date: Wed Aug 6 15:08:50 2008 +0800 net/fs_enet: remove redundant messages for performance Currently when we do a packet flood to the Ethernet port, the console reports error every time when a packet is dropped. This is too redundant and cost performance. Remove message for this type of event. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 9a33e883564c2db8e1b3b645de4579a98ac084d2 Author: Ayaz Abdulla Date: Wed Aug 6 12:12:34 2008 -0400 forcedeth: add tx pause limit This patch adds support for limiting the number of tx pause frames to a default of 8. Previously, hardware would send out continuous stream of pause frames. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 06941931d8697dd939d7cac379565b1b2de1415f Author: Ayaz Abdulla Date: Wed Aug 6 12:12:18 2008 -0400 forcedeth: add jumbo frame support for mcp79 This patch adds jumbo frame support for MCP79 chipsets. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9c6624352cdba7ef4859dae44eb48d538ac78d1b Author: Ayaz Abdulla Date: Wed Aug 6 12:11:42 2008 -0400 forcedeth: add new tx stat counters This patch adds support for new tx statistic counters in the hardware - unicast, multicast, and broadcast Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 1ef6841b4c4d9cc26e53271016c1d432ea65ed24 Author: Ayaz Abdulla Date: Wed Aug 6 12:11:03 2008 -0400 forcedeth: fix rx error policy This patch enforces a stricter policy on rx errors. The driver needs to verify whether there are multiple rx errors versus a single error. Signed-off-by: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 8bad4afe1257585967a1b38cd3f21324b260812b Merge: f71eb1a... 3c4dc71... Author: Jeff Garzik Date: Thu Aug 7 02:05:01 2008 -0400 Merge branch 'via-velocity' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into tmp commit f71eb1a24a8cdde8d388c8f93e935aa7ac491047 Author: Stephen Hemminger Date: Mon Aug 4 13:33:37 2008 -0700 sky2: fix PM related regressions Fix the problems reported for 2.6.27-rc1 caused by over aggressive power management. Turning clock off on PCI Express is problematic for WOL, and when doing multi-booting. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a6ef5e9d7dd6f3de4f88b68c390f0f0d7072944c Author: Alexander Duyck Date: Mon Aug 4 15:00:27 2008 -0700 igb: remove igb_init_managability as it is deprecated igb_init_managability does not actually perform any function as the two registers it attempts to write are both read only on the host. This patch removes the function and all references to it from the driver. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit ec796b4ffc947f74e9e85198d1648e9556300c55 Author: Alexander Duyck Date: Mon Aug 4 15:00:18 2008 -0700 igb: remove three redundant functions left in the code Three functions were left in the code that are no longer used. I am removing these functions just to keep the code clean. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 549bdd84dce242e15a9d7b42787ae481ba29f458 Author: Alexander Duyck Date: Mon Aug 4 15:00:06 2008 -0700 igb: correct issue of set_mta member of mac.ops not being populated The igb_mta_set function was not being correctly used Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 726c09e7b6b7b9f9015ae7ce803ba4cd67121d67 Author: Alexander Duyck Date: Mon Aug 4 14:59:56 2008 -0700 igb: fixes 82576 serdes init to correctly support manual flow control changes This patch changes the PCS configuration for serdes so that the flow control options change be set via the ethtool -A option. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c743a87eabc50110ba5e473e707079c9b429779a Author: Alexander Duyck Date: Mon Aug 4 14:59:46 2008 -0700 igb: fix null pointer dereference seen with fiber NICs With a fiber or serdes NIC installed the driver was causing a null pointer dereference on driver unload. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 106ef2fef3778f4af2e0f796a108cc19c6114264 Author: Alexander Duyck Date: Mon Aug 4 14:59:37 2008 -0700 igb: fix comments The internal name was used in comments, replaced with silicon part number. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c2ac3ef35c44195ca2b9c29275c7c6830eb2d9aa Author: Jay Cliburn Date: Mon Aug 4 19:05:10 2008 -0500 atl1: deal with hardware rx checksum bug The L1 hardware contains a bug that flags a fragmented IP packet as having an incorrect TCP/UDP checksum, even though the packet is perfectly valid and its checksum is correct. There's no way to distinguish between one of these good packets and a packet that actually contains a TCP/UDP checksum error, so all we can do is allow the packet to be handed up to the higher layers and let it be sorted out there. Add a comment describing this condition and remove the code that currently fails to handle what may or may not be a checksum error. Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit f0f422e5735ba9f48039aa7dd4c9daa16b996c2c Author: Bruce Allan Date: Mon Aug 4 17:21:53 2008 -0700 e1000e: remove inapplicable test for ioport There are currently no devices supported by the e1000e driver which need ioport resources, remove the test for it and all unnecessary code associated with it (struct e1000_adapter elements, local variables, etc.) Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c43bc57e5d72932b5e64bc5e4e7741bedbcaaf5f Author: Jesse Brandeburg Date: Mon Aug 4 17:21:40 2008 -0700 e1000e: fix drv load issues a few people seem to have problems maintaining gigabit link and it was root caused to an interaction between the managability firmware on the host and the driver, not communicating. The form of communication they use is the drv_load bit. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 10aa4c0447c308738dade244e23036f2fcbfb140 Author: Auke Kok Date: Mon Aug 4 17:21:20 2008 -0700 e1000e: perform basic 82573 EEPROM checks for known issues 82573 EEPROMs have been shipped out with known issues. While most people will never see the issues some people do and we know how to address them. Warn the user if we find one of these EEPROM issues. Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 44defeb3f6f98ea9bb48a2fe6eb9004e9e1a49a1 Author: Jeff Kirsher Date: Mon Aug 4 17:20:41 2008 -0700 e1000e: convert ndev_ printks to something smaller The ndev_* printk's are too lenghty and we don't need to specify the adapter/netdev struct at all, making this a lot more readable. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 77970ea50b8e7ee9733a6589bf61ed9c02f20ee9 Author: Brice Goglin Date: Wed Aug 6 16:15:23 2008 +0200 myri10ge: set 64bits consistent DMA mask Set 64bits consistent DMA mask since it improves performance in some cases. No need to check the return value since it is not required for the driver to work. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 6a4c4ad2f0aa331324649579649c5d9064893079 Author: Brice Goglin Date: Wed Aug 6 16:14:43 2008 +0200 myri10ge: update firmware headers Update myri10ge firmware headers. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 58750139001bae11a1f9b074f3a9c774fecf5ba8 Author: Greg Ungerer Date: Thu Jul 31 14:38:07 2008 +1000 Move all of include/asm-m68knommu to arch/m68knommu/include/asm. With the current kbuild infrastructure in place no other changes are required for this to work. Signed-off-by: Greg Ungerer commit f780a9f119caa48088b230836a7fa73d1096de7c Author: Yevgeny Petrilin Date: Wed Aug 6 20:14:06 2008 -0700 mlx4_core: Add ethernet fields to CQE struct Add ethernet-related fields to struct mlx4_cqe so that the mlx4_en ethernet NIC driver can share the same definition. Signed-off-by: Yevgeny Petrilin Signed-off-by: Roland Dreier commit 685d87f7ccc649ab92b55e18e507a65d0e694eb9 Author: Linus Torvalds Date: Wed Aug 6 19:24:47 2008 -0700 Revert "pcm_native.c: remove unused label" This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2. The label is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible snd_assert() macro. That macro could probably be improved to be along the lines of #define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0) or similar to make sure that we always both evaluate 'expr' and parse 'args', but while gcc should optimize it all away, I'm too lazy to really verify that. So I'll just admit defeat and will continue to live with the annoying warning. Noted-by: Robert P. J. Day Signed-off-by: Linus "Grr.." Torvalds commit 11d46123bfea068a48483f00518d301f452647fb Author: David S. Miller Date: Wed Aug 6 18:30:43 2008 -0700 ipv4: Fix over-ifdeffing of ip_static_sysctl_init. Noticed by Paulius Zaleckas. Signed-off-by: David S. Miller commit f8d91faff3bb82c7026d6a2a5c97ee7d88bc0229 Author: Stephen Rothwell Date: Wed Aug 6 18:14:28 2008 -0700 of/sparc: remove include of linux/of_platform.h from asm/of_platform.h Now that we have removed all inclusions of asm/of_platform.h, this compatability include can be removed. Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit f99e8f277f1172c49ac7b0585aed5b094fe235d4 Author: Linus Torvalds Date: Wed Aug 6 17:36:23 2008 -0700 iSeries: Fix up viotty_ioctl BKL locking fallout The bogus code to call into the n_tty layer got removed in commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe ("Remove bogons from the iSeries console"), but it left a now uninitialized "return ret;" around. Not that this code has ever even compiled since the BKL pushdown, since not only is "ret" no longer initialized, it was never actually declared even originally. Replace it with a "return -ENOIOCTLCMD" Pointed-out-by: Paul Mackerras Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 680db0136e0778a0d7e025af7572c6a8d82279e2 Author: Linus Torvalds Date: Wed Aug 6 15:14:13 2008 -0700 pcm_native.c: remove unused label This fixes the warning sound/core/pcm_native.c: In function 'snd_pcm_fasync': sound/core/pcm_native.c:3262: warning: label 'out' defined but not used Signed-off-by: Linus Torvalds commit 816d8c6a2580562698cf0fa0b9e5b4dd570e636e Author: Andrew Paprocki Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 The it8705 chip supports 16-bit fan tachometers in revisions at least >= 0x03 (Version G). This patch enables 16-bit fan readings on all revisions >= 0x03 just like the it8712, it8716, and it8718 chips. Signed-off-by: Andrew Paprocki Signed-off-by: Jean Delvare commit 0475169c13e177e1af5a02f5e9f30fda13dc0b86 Author: Andrew Paprocki Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 The it8712 chip supports 16-bit fan tachometers in revisions >= 0x07. Revisions >= 0x08 dropped support for 8-bit fan divisor registers. The patch enables 16-bit fan readings on all revisions >= 0x07 just like the it8716 and it8718 chips. Signed-off-by: Andrew Paprocki Signed-off-by: Jean Delvare commit 116d0486bdefc11f71e567cadf0c47f788b4dd06 Author: Frank Myhr Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus AMD NPT 0Fh cpus use 6 bit VID codes. Successive codes with msb 0 describe 25mV decrements, while those with msb 1 describe 12.5mV decrements. Existing hwmon-vid.c is correct only for codes with msb 0; add support for the codes with msb 1. Ref: p 309, Table 71 AMD Publication 32559, BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf Signed-off-by: Frank Myhr Signed-off-by: Jean Delvare commit 15872212e876de9ae404108e4ad231a645b55b54 Author: Frank Myhr Date: Wed Aug 6 22:41:06 2008 +0200 hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle Signed-off-by: Frank Myhr Signed-off-by: Jean Delvare commit 6c633c3025c75f5fcf3a76d375faff34e3be021b Author: Sean MacLennan Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: ad7414 driver Driver for the Analog Devices AD7414 temperature monitoring chip. Signed-off-by: Sean MacLennan Signed-off-by: Jean Delvare commit 84f768c1633cfc547d82b9dc671ffea2f3785542 Author: Krzysztof Helt Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: (thmc50) Add support for critical temperature limits Add critical temperature limits to the driver. These limits are read only. Signed-off-by: Krzysztof Helt Signed-off-by: Jean Delvare commit 68f823de3f1916cc0694376330c08377706b877d Author: Grant Coady Date: Wed Aug 6 22:41:05 2008 +0200 hwmon: (adm9240) Remove EXPERIMENTAL dependency The adm9240 driver is in the kernel for three years now, time to remove the EXPERIMENTAL dependency. Signed-off-by: Grant Coady Signed-off-by: Jean Delvare commit 2f8ea97a45e9db382787dd7afa7f500ee661aa7b Author: Jean Delvare Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83627hf) Drop reset module parameter Drop the reset parameter of the w83627hf driver. It seems it wasn't that useful. It was dropped from the Linux 2.4 version of this driver back in July 2004. The only users who have reported that they were still using this parameter, needed it to switch the chip from automatic fan speed control back to manual mode. Now that the driver creates pwmN_enable sysfs files, users will be able to use these files instead, which is way less agressive. Signed-off-by: Jean Delvare Acked-by: Dominik Geyer commit a95a5ed856e902e513119d4cc5b745faa202f761 Author: Dominik Geyer Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83627hf) Add pwm_enable sysfs interface Adds support for pwm_enable sysfs interface for the w83627hf driver. Signed-off-by: Dominik Geyer Signed-off-by: Jean Delvare commit ad02ad85cf221c9a0574b48516762e37cceca0da Author: Marc Hulsman Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (w83791d) Use fan divisor bits from vbat register Update w83791d with fan bits in vbat mon register (7.48 of the datasheet). This change allows all fans to have a divisor of 128, and fixes a problem with incorrectly reported fan speeds. Signed-off-by: Marc Hulsman Signed-off-by: Jean Delvare commit 05a5e477687ac7a22c0791b3e899ed7d539f7b95 Author: Jean Delvare Date: Wed Aug 6 22:41:04 2008 +0200 hwmon: (f71882fg) Delete needless forward declarations These functions aren't used before being defined, so there's no point in forward-declaring them. Signed-off-by: Jean Delvare Acked-by: Hans de Goede commit 549edb83327f2a5027a22d65b10603b01dc40175 Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Add support for the SMSC SCH5027 Add support for the SCH5027. The differences to the DME1737 are: - No support for programmable temp offsets - In auto mode, PWM outputs stay on min value if temp goes below low threshold and can't be programmed to fully turn off - Different voltage scaling - No VID input Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 55d68d75ab00e60953f8784af5927b60967a297f Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Skip detection if forced Skip the checking of the device ID register in the hwmon register block if the force_id option is used. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 73ce48f6c6b9d9dcf6a2bba0bcde39ede76809f0 Author: Juerg Haefliger Date: Wed Aug 6 22:41:03 2008 +0200 hwmon: (dme1737) Cleanups Fix names of attribute structs to make them more consistent with the rest of the code. Minor comment changes. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 970a8a513c30a1c3e8995609a153658a34bc02bf Author: Geert Uytterhoeven Date: Wed Aug 6 22:19:39 2008 +0200 m68k/amiserial: fix fallout of tty break handling rework commit 9e98966c7bb94355689478bc84cc3e0c190f977e (tty: rework break handling) forgot to update one exit point of rs_break() in the Amiga serial driver. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9 Author: Wim Van Sebroeck Date: Wed Aug 6 20:19:41 2008 +0000 [WATCHDOG] more coding style clean-up's More coding style clean-up's. Signed-off-by: Wim Van Sebroeck commit 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc Author: Denis ChengRq Date: Mon Aug 4 09:51:40 2008 +0800 kbuild: a better way to generate cscope database change It's a problem about cscope target of kernel Makefile, and the cscope plugin of emacs: 1. `make cscope` will generate cscope.files cscope.{in,po,}.out; 2. the cscope plugin expect a cscope.out.{in,po,}; 3. the default `cscope -b` would generate cscope.{in,po,}.out; There are three approach to solve it: 1. modify the cscope C code; 2. modify the cscope emacs plugin lisp code; 3. modify the Makefile; I have tried to communicate with the cscope upstream, but later I realize the third approach is most meaningful. Signed-off-by: Sam Ravnborg commit 0b0de144333fca335a0111a6f9c59176ad43ba0a Author: Robert P. J. Day Date: Mon Aug 4 13:31:32 2008 -0400 Kconfig: Extend "menuconfig" for modules to simplify Kconfig file Given that the init/Kconfig file uses a "menuconfig" directive for modules already, might as well wrap all the submenu entries in an "if" to toss all those dependencies. Signed-off-by: Robert P. J. Day Acked-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 0758416325dc75e203ab974aa5e937bef7d2afef Author: Erkki Lintunen Date: Wed Aug 6 22:11:33 2008 +0200 bugfix for scripts/patch-kernel in 2.6 sublevel stepping scripts/patch-kernel script can't patch a tree, say, from 2.6.25 to 2.6.26.1, because of a wrong comparison in context of patching 2.6.x base. Fix it. Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 7a48bdd01b5cab9c043b4d42a3f377624d6259f2 Author: Sam Ravnborg Date: Wed Aug 6 21:56:53 2008 +0200 kbuild: fix O=.. build with arm With a make O=... build kbuild would only create the include2/asm symlink for archs that not yet had moved headers to include/$ARCH/include There is no longer any reason to avoid the symlink for archs that has moved their headers so create it unconditionally. This fixes arm because kbuild checked for include/asm-$ARCH/errno.h and that file was not present for arm but the platform files are not yet moved. Signed-off-by: Sam Ravnborg Cc: Russell King commit 2e4f40d2eb763a17c75c07fff605402737260c59 Merge: d660668... e34a8ae... Author: Linus Torvalds Date: Wed Aug 6 12:07:36 2008 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: async_tx: fix missing braces in async_xor_zero_sum commit d6606683a5e3dac35cb979c7195f54ed827567bd Author: Linus Torvalds Date: Wed Aug 6 12:04:54 2008 -0700 Revert duplicate "mm/hugetlb.c must #include " This reverts commit 7cb93181629c613ee2b8f4ffe3446f8003074842, since we did that patch twice, and the problem was already fixed earlier by 78a34ae29bf1c9df62a5bd0f0798b6c62a54d520. Reported-by: Andi Kleen Signed-off-by: Linus Torvalds commit a14ad05f47b55ea84136eb4da43ea96fa469326a Merge: 0016fe9... 8401d92... Author: Linus Torvalds Date: Wed Aug 6 12:03:43 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: Preserve response data alignment bug when it is harmless commit 0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b Merge: 8bc5fb6... bcbd2b6... Author: Linus Torvalds Date: Wed Aug 6 11:46:39 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Update generic config [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU [IA64] Eliminate trailing backquote in IA64_SGI_UV [IA64] update generic_defconfig to support sn2. [IA64] update generic_defconfig for 2.6.27-rc1 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 [IA64] Cleanup generated file not ignored by .gitignore [IA64] pv_ops: fix ivt.S paravirtualization commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe Author: Alan Cox Date: Wed Aug 6 14:06:29 2008 +0100 Remove bogons from the iSeries console The iSeries driver calls into the n_tty ldisc code directly for some bizarre reason. I previously tagged this with a query but this actually does need fixing as n_tty methods when you have a different ldisc set are not a good thing to call. In n_tty mode this change should have no effect, the core tty layer has always called the ldisc ioctl method *anyway* and will call the one for the right ldisc. Signed-off-by: Alan Cox Acked-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3a35c27ac68cea19c252e127ec61099648eb4870 Author: Randy Dunlap Date: Wed Aug 6 10:08:56 2008 -0700 docbook: fix v4l fatal filename error docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory make[1]: *** [Documentation/DocBook/videobook.xml] Error 1 Signed-off-by: Randy Dunlap cc: mchehab@infradead.org Signed-off-by: Linus Torvalds commit 12b7a1523eda9cd72362fdda928ddb995ecdc06d Author: Wim Van Sebroeck Date: Fri Jul 18 19:59:48 2008 +0000 [WATCHDOG] sbc8360.c - move stop code into a function Move the sbc8360.c watchdog stop code into a seperate function. Signed-off-by: Wim Van Sebroeck commit 0c06090c9472db0525cb6fe229c3bea33bbbbb3c Author: Wim Van Sebroeck Date: Fri Jul 18 11:41:17 2008 +0000 [WATCHDOG] Coding style - Indentation - part 2 This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1. Main changes: * Re-structure the ioctl switch call for all drivers as follows: switch (cmd) { case WDIOC_GETSUPPORT: case WDIOC_GETSTATUS: case WDIOC_GETBOOTSTATUS: case WDIOC_GETTEMP: case WDIOC_SETOPTIONS: case WDIOC_KEEPALIVE: case WDIOC_SETTIMEOUT: case WDIOC_GETTIMEOUT: case WDIOC_GETTIMELEFT: default: } This to make the migration from the drivers to the uniform watchdog device driver easier in the future. Signed-off-by: Wim Van Sebroeck commit 5eb82498e3a6da8a979c48945e3c1a85c10ccc25 Author: Wim Van Sebroeck Date: Thu Jul 17 18:08:47 2008 +0000 [WATCHDOG] Coding style - Indentation - part 1 This brings the watchdog drivers into line with coding style. This patch takes cares of the indentation as described in chapter 1: The preferred way to ease multiple indentation levels in a switch statement is to align the "switch" and its subordinate "case" labels in the same column instead of "double-indenting" the "case" labels. Signed-off-by: Wim Van Sebroeck commit 0d7b101404f7bedcf3f448c1667c3744551cd9ee Author: Anton Vorontsov Date: Thu Jul 3 23:51:36 2008 -0700 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs The mpc8xxx_wdt driver is using two registers: SWSRR to push magic numbers, and SWCRR to control the watchdog. Both registers are available on the MPC8xx, and seem to have the same offsets and semantics as in MPC83xx/MPC86xx watchdogs. The only difference is prescale value. So this driver simply works on the MPC8xx CPUs. One quirk is needed for the MPC8xx, though. It has small prescale value and slow CPU, so the watchdog resets board prior to the driver has time to load. To solve this we should split initialization in two steps: start ping the watchdog early, and register the watchdog userspace interface later. MPC823 seem to be the first CPU in MPC8xx line, so we use fsl,mpc823-wdt compatible matching. Signed-off-by: Anton Vorontsov Tested-by: Jochen Friedrich Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit cb55d282a0d2156e7d40ee81726ab16b569e96d7 Author: Anton Vorontsov Date: Thu Jul 3 23:51:36 2008 -0700 [WATCHDOG] mpc8xxx_wdt: fix build CC drivers/watchdog/mpc8xxx_wdt.o drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_ioctl': drivers/watchdog/mpc8xxx_wdt.c:156: error: 'cmd' undeclared (first use in this function) drivers/watchdog/mpc8xxx_wdt.c:156: error: (Each undeclared identifier is reported only once drivers/watchdog/mpc8xxx_wdt.c:156: error: for each function it appears in.) drivers/watchdog/mpc8xxx_wdt.c: At top level: drivers/watchdog/mpc8xxx_wdt.c:176: warning: initialization from incompatible pointer type This patch ought to be folded into mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 59ca1b0d14ca71bdefef372ccd5035341e0ca091 Author: Anton Vorontsov Date: Thu Jul 3 23:51:35 2008 -0700 [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g mpc83xx_wdt.c renamed to mpc8xxx_wdt.c, now we can do various renames in the file itself. Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f Author: Anton Vorontsov Date: Thu Jul 3 23:51:34 2008 -0700 [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt Rename the driver because now we support some MPC86xx processors. There are no changes to the mpc83xx_wdt.c file, yet. When possible, we do file renames and changes separately (because Linus once asked so, because it helps git to track the renamed files). Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 500c919e3d699644cc9d6c1e93022481baafd8e1 Author: Anton Vorontsov Date: Thu Jul 3 23:51:34 2008 -0700 [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs On MPC86xx the watchdog could be enabled only at power-on-reset, and could not be disabled afterwards. We must ping the watchdog from the kernel until the userspace handles it. MPC83xx CPUs are only differ in a way that watchdog could be disabled once, but after it was enabled via software it becomes just the same as MPC86xx. Thus, to support MPC86xx I added the kernel timer which pings the watchdog until the userspace opens it. Since we implemented the timer, now we're able to implement proper handling for the CONFIG_WATCHDOG_NOWAYOUT case, for MPC83xx and MPC86xx. Also move the probe code into subsys_initcall, because we want start pinging the watchdog ASAP, and misc devices are available in subsys_initcall. Signed-off-by: Anton Vorontsov Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit ef8ab12ec2d663f9b146c920a4dd589a7e767f2d Author: Anton Vorontsov Date: Thu Jul 3 23:51:32 2008 -0700 [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver This patch simply converts mpc83xx_wdt to the OF platform driver so we can directly work with the device tree without passing various stuff through platform data. Signed-off-by: Anton Vorontsov Acked-by: Stephen Rothwell Cc: Kumar Gala Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit c9488520512df659ad21df5d100b52fed96bdf07 Author: Alan Cox Date: Thu Jul 3 23:51:32 2008 -0700 [WATCHDOG] pcwd: a couple of watchdogs escaped conversion Fix them up. Once we know the long term plan the watchdogs can all get shrunk massively anyway Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 089ab0791d127e8ada526c4b4d18b7584be8acf0 Author: Wim Van Sebroeck Date: Tue Jul 15 11:46:11 2008 +0000 [WATCHDOG] Clean-up includes Use #include instead of Use #include instead of Clean-up includes. Signed-off-by: Wim Van Sebroeck commit 9e74114d96bb5dbaa17b9292139b0c6205e0b971 Author: Wim Van Sebroeck Date: Tue Jul 15 11:18:04 2008 +0000 [WATCHDOG] hpwdt.c - fix double includes The last clean-up created 2 times the same include. delete the doubles. Signed-off-by: Wim Van Sebroeck commit 96e2e6fafaedd83bd899f682907e14d1eec17390 Merge: 0967d61... 7c4be5a... Author: Wim Van Sebroeck Date: Wed Aug 6 11:58:26 2008 +0000 [WATCHDOG] Merge code clean-up's from Alan Cox. Merge branch 'alan' of ../linux-2.6-watchdog-mm Fixed Conflicts in the following files: drivers/watchdog/booke_wdt.c drivers/watchdog/mpc5200_wdt.c drivers/watchdog/sc1200wdt.c Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Wim Van Sebroeck commit 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3 Author: Adrian Bunk Date: Mon Aug 4 11:59:05 2008 +0200 xen-blkfront.c: make blkif_ioctl() static This patch makes the needlessly global blkif_ioctl() static. Signed-off-by: Adrian Bunk Acked-by: Jeremy Fitzhardinge Signed-off-by: Jens Axboe commit 1ac0ae062cecd37587f5b951089f90e1d9d91769 Author: Denis ChengRq Date: Mon Aug 4 11:56:30 2008 +0200 bio: make use of bvec_nr_vecs Since introduced in 7ba1ba12eee, it should be made use of. Signed-off-by: Denis ChengRq Signed-off-by: Jens Axboe commit ba198efb5ef4e5f4927a18ff95a58f40c58cbaa9 Author: Mike Miller Date: Mon Aug 4 11:54:55 2008 +0200 cciss: fix bug if scsi tape support is disabled Bug fix. If SCSI tape support is turned off we get an implicit declaration of cciss_unregister_scsi error in cciss_remove_one. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe commit 935dc8d7575e6c1292b057e39045a40f1fbe26e7 Author: Mike Miller Date: Mon Aug 4 11:54:54 2008 +0200 cciss: add support for multi lun tape devices This patch adds support for multi-lun devices in a SAS environment. It's required for the support of media changers. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit f4a93bcda74edfe6977dcf296ed8c86119638871 Author: Mike Miller Date: Mon Aug 4 11:54:53 2008 +0200 cciss: change the way we notify scsi midlayer of tape drives This patch changes way we notify the scsi layer that something has changed on the SCSI tape side of the driver. The user can now just tell the driver to rescan a particular controller rather than having to know the SCSI nexus to echo into the SCSI mid-layer. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit eece695f8bf9d1aacf3a119ab8e21db31948e40b Author: Mike Miller Date: Mon Aug 4 11:54:53 2008 +0200 cciss: fix negative logical drive count in procfs This patch fixes a problem where the logical volume count may go negative. In some instances if several logical are configured on a controller and all of them are deleted using the online utilities the volume count in /proc may go negative with no way get it correct again. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40 Author: Mike Miller Date: Mon Aug 4 11:54:52 2008 +0200 cciss: remove redundant code This patch removes redundant code where ever logical volumes are added or removed. It adds 3 new functions that are called instead of having the same code spread throughout the driver. It also removes the cciss_getgeometry function. The patch is fairly complex but we haven't figured out how to make it any simpler and still do everything that needs to be done. Some of the complexity comes from having to special case booting from cciss. Otherwise the gendisk doesn't get added in time and the switchroot will fail. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit a72da29b6cbc5cf918567f2a0d76df6871e94b01 Author: Mike Miller Date: Mon Aug 4 11:54:51 2008 +0200 cciss: make rebuild_lun_table behave better This patch makes the rebuild_lun_table smart enough to not rip a logical volume out from under the OS. Without this fix if a customer is running hpacucli to monitor their storage the driver will blindly remove and re-add the disks whenever the utility calls the CCISS_REGNEWD ioctl. Unfortunately, both hpacucli and ACUXE call the ioctl repeatedly. Customers have reported IO coming to a standstill. Calling the ioctl is the problem, this patch is the fix. Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: Jens Axboe commit f7108f91cdcaca07c6a99777b2724093294f36ee Author: Nikanth Karthikesan Date: Mon Aug 4 10:56:07 2008 +0200 cciss: return -EFAULT if copy_from_user() fails Return -EFAULT instead of -ENOMEM if copy_from_user() fails. Signed-off-by: Nikanth Karthikesan Acked-by: Mike Miller Signed-off-by: Jens Axboe commit 04793dd041bbb88a39b768b714c725de2c339b51 Author: Laurent Pinchart Date: Thu Jul 31 17:11:12 2008 -0300 V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. Data buffers on the stack are not allowed for USB I/O. Use dynamically allocated buffers instead. Signed-off-by: Bruce Schmid Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 835f09c6594aa98cbfae05c5466a81fda3081d2c Author: Laurent Pinchart Date: Wed Jul 30 18:54:48 2008 -0300 V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams The Bison Electronics 5986:0300 and 5986:0303 webcams require the UVC_QUIRK_PROBE_MINMAX quirk. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 3f6ac497b036533d1a63ba04fdbe710c55e14cda Author: Robert Jarzmik Date: Sat Aug 2 07:10:04 2008 -0300 V4L/DVB (8611): Add suspend/resume to pxa_camera driver PXA suspend switches off DMA core, which loses all context of previously assigned descriptors. As pxa_camera driver relies on DMA transfers, setup the lost descriptors on resume and retrigger frame acquisition if needed. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 2e521061db61a35dd64ea85a1642f9a9dfde2872 Author: Robert Jarzmik Date: Fri Aug 1 20:14:50 2008 -0300 V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. Add suspend/resume hooks to call soc operation specific suspend and resume functions. This ensures the camera chip has been previously resumed, as well as the camera bus. These hooks in camera chip drivers should save/restore chip context between suspend and resume time. Signed-off-by: Robert Jarzmik Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 01c1e4ca8ec39d21be0cd9d1b300d479de97298a Author: Paul Mundt Date: Fri Aug 1 19:48:51 2008 -0300 V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. So, platform_driver_unregister() doesn't actually have a return value, nor do any of the void __exit routines. It's reassuring to know that people copy and paste blindly. This completely blew up my compiler. Signed-off-by: Paul Mundt Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d483b730681fa527f343dcc859185e06d60ae121 Author: Robert Lowery Date: Wed Jul 30 19:43:11 2008 -0300 V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 quoting Robert Lowery: I think I've found the cause of the oops. [...] BTW it appears I have fixed my tuning problems with the updated patch below. This reverts a change Mauro made a while back. All is good now :) [...] The good news is that I've got a better patch that definitely works this time and even better, makes use of the standard firmware (rather than the Australian specific one). ...based on an earlier patch by Hans-Frieder Vogt: http://www.linuxtv.org/pipermail/linux-dvb/2008-May/026280.html Signed-off-by: Robert Lowery Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fcf5cb2406827fc9d3f3fe260ac883ef72b8bac0 Author: Rabin Vincent Date: Sun Aug 3 07:58:54 2008 -0300 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 Bad mini/max check in setting control values (the gamma in zc3xx could be set to null). Signed-off-by: Rabin Vincent Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit cebf3b67f7f80fd69bd1ff5787fee69ab8fd3c2a Author: Jean-Francois Moine Date: Sun Aug 3 07:52:53 2008 -0300 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. The crash is due to USB exchanges done at interrupt level. These exchanges, tied to autogain, are now done by the application. Also, there is a fix about autogain start. Concerned subdrivers: etoms, pac7311, sonixj and spca561. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 594f5b8b3cce6d3137ebf260b7386520b2534385 Author: Jean-Francois Moine Date: Fri Aug 1 06:37:51 2008 -0300 V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. The hflip and vflip controls work for ov519 - ov7670 only. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a674a3b492d8085fd02ee49ed11cb42c63f0f71a Author: Eugeniy Meshcheryakov Date: Fri Aug 1 08:23:41 2008 -0300 V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro Pinnacle Hybrid Pro (2304:0226) requires mts_firmware flag to have any sound. Without this flag it is useful only for watching silent movies. Signed-off-by: Eugeniy Meshcheryakov Signed-off-by: Mauro Carvalho Chehab commit 00b27ce6205be8a943ae63d7bcce5208a9802bc3 Author: Jean-Francois Moine Date: Wed Jul 30 05:47:54 2008 -0300 V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 01b988b2abdd60cc58c7916c5f91602d2571e0c5 Author: Jean-Francois Moine Date: Wed Jul 30 05:33:11 2008 -0300 V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. Bug introduced in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 16fca0449997f1d77cd2d45d6c34b015f3853012 Author: Jean-Francois Moine Date: Wed Jul 30 05:14:38 2008 -0300 V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 335b3f88f2c3cb101059970f57860503b20d210f Author: Jean-Francois Moine Date: Wed Jul 30 04:53:02 2008 -0300 V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. This option is changed to GSPCA_DEBUG and it is set by default in gspca.h. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 8f47a3cefbb275893ce26ade7094599e4b129bb3 Author: Jean-Francois Moine Date: Tue Jul 29 14:14:04 2008 -0300 V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. The values from win traces do not seem to work while the webcams did work with gspca v1. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0cd6759da646aae9d117df278ce3d5f3cab31904 Author: Jean-Francois Moine Date: Tue Jul 29 05:25:28 2008 -0300 V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. The hflip and vflip controls work for ov7670 only. This bridge/sensor inverts blue and red - not fixed. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c2cfcf701881c9a4ef42d5a956f9f2d006c2af8e Author: Yoichi Yuasa Date: Tue Jul 29 05:30:58 2008 -0300 V4L/DVB (8564): fix vino driver build error The vino driver needs #include drivers/media/video/vino.c: In function 'vino_ioctl': drivers/media/video/vino.c:4364: error: implicit declaration of function 'video_usercopy' make[3]: *** [drivers/media/video/vino.o] Error 1 Signed-off-by: Yoichi Yuasa Signed-off-by: Mauro Carvalho Chehab commit dfb9aff025c4c874f9169e2fd690ce6fee2309fe Author: Adrian Bunk Date: Mon Jul 28 16:58:19 2008 -0300 V4L/DVB (8563): fix drivers/media/video/arv.c compilation This patch fixes the following compile errors: <-- snip --> ... CC [M] drivers/media/video/arv.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: In function 'ar_ioctl': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:544: error: implicit declaration of function 'video_usercopy' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: At top level: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:758: error: unknown field 'type' specified in initializer make[4]: *** [drivers/media/video/arv.o] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 886f8d678a28882c193c2886c7280c0eccd8c9dd Author: Adrian Bunk Date: Mon Jul 28 16:58:05 2008 -0300 V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select Also for the new DVB_DRX397XD driver the FW_LOADER select and the corresponding dependency on HOTPLUG can be removed. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 35774f42dc6e765fc1d8a92f36e218f617a17e1a Author: Mauro Carvalho Chehab Date: Mon Jul 28 18:07:35 2008 -0300 V4L/DVB (8558): media/video/Kconfig: fix a typo Thanks to Hermann Gausterer for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit b01466e14ce82ff96b74db19ebdaefb34a430a24 Author: Jean-Francois Moine Date: Mon Jul 28 07:52:27 2008 -0300 V4L/DVB (8552): gspca: Bad pixel format in the spca508 subdriver. The pixel format should have been changed in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 738608ae08572bf915c3fcd40e9579fbca06464b Author: Jean-Francois Moine Date: Mon Jul 28 06:41:51 2008 -0300 V4L/DVB (8550): gspca: Change a bit the init of ov7660 and Sonix JPEG bridges. Set back some values of gspcav1 in init of sonixj sensor ov7660. Add some comments. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit edc9189c879af8cc8f1bf9746e63c5b014801a8a Author: Randy Dunlap Date: Mon Jul 28 15:39:38 2008 -0300 V4L/DVB (8549a): fix kernel-doc warning, function name, and docbook filename Change function name in kernel-doc and add kernel-doc for parameter @index: Warning(linhead//drivers/media/video/videodev.c:2090): No description found for parameter 'index' Also change source file name in DocBook/videobook.tmpl to match the new source file name. Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 8c6a5cad1eec38c2bf3af94eb2d4350be29fa208 Author: Alexander Beregalov Date: Wed Aug 6 02:43:24 2008 -0700 sparc: i8042-sparcio.h: fix warning drivers/input/serio/i8042-sparcio.h:95: warning: 'sparc_i8042_driver' defined but not used Signed-off-by: Alexander Beregalov Signed-off-by: David S. Miller commit abf5cdb89d09ca981db10e1a85fd8531440165f2 Author: Joakim Koskela Date: Wed Aug 6 02:40:25 2008 -0700 ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer Here's a revised version, based on Herbert's comments, of a fix for the ipv4-inner, ipv6-outer interfamily ipsec beet mode. It fixes the network header adjustment during interfamily, as well as makes sure that we reserve enough room for the new ipv6 header if we might have something else as the inner family. Also, the ipv4 pseudo header construction was added. Signed-off-by: Joakim Koskela Acked-by: Herbert Xu Signed-off-by: David S. Miller commit eb49e63093498cd17382018495b8cfb5b4a679bd Author: Joakim Koskela Date: Wed Aug 6 02:39:30 2008 -0700 ipsec: Interfamily IPSec BEET Here's a revised version, based on Herbert's comments, of a fix for the ipv6-inner, ipv4-outer interfamily ipsec beet mode. It fixes the network header adjustment in interfamily, and doesn't reserve space for the pseudo header anymore when we have ipv6 as the inner family. Signed-off-by: Joakim Koskela Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 9714be7da8b32f36d2468fe08ff603b6402df8cf Author: Krzysztof Piotr Oledzki Date: Wed Aug 6 02:35:44 2008 -0700 netfilter: fix two recent sysctl problems Starting with 9043476f726802f4b00c96d0c4f418dde48d1304 ("[PATCH] sanitize proc_sysctl") we have two netfilter releated problems: - WARNING: at kernel/sysctl.c:1966 unregister_sysctl_table+0xcc/0x103(), caused by wrong order of ini/fini calls - net.netfilter is duplicated and has truncated set of records Thanks to very useful guidelines from Al Viro, this patch fixes both of them. Signed-off-by: Krzysztof Piotr Oledzki Acked-by: Al Viro Signed-off-by: David S. Miller commit 1ca615fb816ba85dc765209a9b58ab82cc99bce0 Author: Rami Rosen Date: Wed Aug 6 02:34:21 2008 -0700 ipv6: replace dst_metric() with dst_mtu() in net/ipv6/route.c. This patch replaces dst_metric() with dst_mtu() in net/ipv6/route.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit 6d273f8d011c351c9603c1dbfeae2c7458edd30d Author: Rami Rosen Date: Wed Aug 6 02:33:49 2008 -0700 ipv4: replace dst_metric() with dst_mtu() in net/ipv4/route.c. This patch replaces dst_metric() with dst_mtu() in net/ipv4/route.c. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit e34a8ae79056e6cea4a1ac21119ee3c91f378f99 Author: Dan Williams Date: Tue Aug 5 10:22:05 2008 -0700 async_tx: fix missing braces in async_xor_zero_sum Found-by: Yuri Tikhonov Signed-off-by: Dan Williams commit bcbd2b65868213c1426654304de3da330cde6b3a Author: Tony Luck Date: Mon Aug 4 15:47:25 2008 -0700 [IA64] Update generic config Changes to support a new platform in my lab. Signed-off-by: Tony Luck commit ee694d6b4106ca09dcf23f839b44efd152a1da82 Author: Tony Luck Date: Mon Aug 4 13:39:28 2008 -0700 [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU The SGI XP and GRU drivers only work on SMP systems ... the Kconfig file only disallowed them for non-SMP X86. Signed-off-by: Tony Luck commit 3351ab9b345ba5c2872acbf718cc631df72d3732 Author: Jack Steiner Date: Thu Jul 31 07:52:50 2008 -0500 [IA64] Eliminate trailing backquote in IA64_SGI_UV Eliminate trailing backquote in IA64_SGI_UV config. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit ceffacc1d6041392d1b47750b14bf6845c2372ab Author: Robin Holt Date: Sat Aug 2 13:35:27 2008 -0500 [IA64] update generic_defconfig to support sn2. This patch changes the generic_defconfig so it works on all sn2 platforms I have access to. There is only one support configuration which was not tested and that configuration is only a combination of two tested configurations. With this patchset applied, a generic kernel can be booted on either a RHEL 5.2, RHEL5.3, or SLES10 SP1 root and operate. All features needed by SGI's ProPack are also working. I have not tested all features of RHEL or SLES, but they do at least boot. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8 Author: Alexander Beregalov Date: Mon Aug 4 11:12:18 2008 -0700 IB/ipath: Fix printk format warnings ipath_driver.c:1260: warning: format '%Lx' expects type 'long long unsigned int', but argument 6 has type 'long unsigned int' ipath_driver.c:1459: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_intr.c:358: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:358: warning: format '%Lu' expects type 'long long unsigned int', but argument 6 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 5 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1123: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1130: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1032: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1045: warning: format '%llX' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_iba7220.c:2506: warning: format '%Lu' expects type 'long long unsigned int', but argument 4 has type 'u64' Signed-off-by: Alexander Beregalov Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Roland Dreier commit ac0af91ebcaedc1a9e1d2987ecbd22837924e6b9 Author: Robin Holt Date: Sat Aug 2 13:32:06 2008 -0500 [IA64] update generic_defconfig for 2.6.27-rc1 This patch updates the generic_defconfig for 2.6.27-rc1 by simply doing a make oldconfig and holding down the carriage return. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit d1339df1f46d10e0396c1470f371b0d1b23295ba Author: Robin Holt Date: Sat Aug 2 13:29:24 2008 -0500 [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096 ia64 has compiled with NR_CPUS=4096 for a couple releases, just forgot to update Kconfig to allow it. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit be43324d8b316fe83a7b4027334f2825f1121c2c Author: Steve Wise Date: Mon Aug 4 11:08:37 2008 -0700 RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device Running 'ifconfig up' on the cxgb3 interface with iw_cxgb3 loaded causes a deadlock. The rtnl lock is already held in this path. The function fw_supports_fastreg() was introduced in 2.6.27 to conditionally set the IB_DEVICE_MEM_MGT_EXTENSIONS bit iff the firmware was at 7.0 or greater, and this function also acquires the rtnl lock and which thus causes a deadlock. Further, if iw_cxgb3 is loaded _after_ the nic interface is brought up, then the deadlock does not occur and therefore fw_supports_fastreg() does need to grab the rtnl lock in that path. It turns out this code is all useless anyway. The low level driver will NOT allow the open if the firmware isn't 7.0, so iw_cxgb3 can always set the MEM_MGT_EXTENSIONS bit. Simplify... Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 94567ef16bf38e98a7de214694d327feb3ec42d4 Author: Robin Holt Date: Mon Aug 4 11:06:16 2008 -0700 [IA64] Cleanup generated file not ignored by .gitignore arch/ia64/kernel/vmlinux.lds is a generated file. Tell git to ignore it. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit 1c355a6e80fd08e623416138631e240f431385f2 Author: Steve Wise Date: Mon Aug 4 11:05:43 2008 -0700 RDMA/cxgb3: Fix up MW access rights - MWs don't have local read/write permissions. - Set the MW_BIND enabled bit if a MR has MW_BIND access. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 5f0f66b022ba607db0a083bf5cc13e4a4336e366 Author: Steve Wise Date: Mon Aug 4 11:04:42 2008 -0700 RDMA/cxgb3: Fix QP capabilities - Set the stag0 and fastreg capability bits only for kernel qps. - QP_PRIV flag is no longer used, so don't set it. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 3f44675439b136d51179d31eb5a498383cb38624 Author: Roland Dreier Date: Mon Aug 4 11:02:14 2008 -0700 RDMA/cma: Remove padding arrays by using struct sockaddr_storage There are a few places where the RDMA CM code handles IPv6 by doing struct sockaddr addr; u8 pad[sizeof(struct sockaddr_in6) - sizeof(struct sockaddr)]; This is fragile and ugly; handle this in a better way with just struct sockaddr_storage addr; [ Also roll in patch from Aleksey Senin to switch to struct sockaddr_storage and get rid of padding arrays in struct rdma_addr. ] Signed-off-by: Roland Dreier commit 9b3cbf725fb98733976fd02e2e557f0ae3028df0 Author: Isaku Yamahata Date: Mon Aug 4 12:02:28 2008 +0900 [IA64] pv_ops: fix ivt.S paravirtualization Recent kernels are not booting on some HP systems (though it does boot on others). James and Willy reported the problem. James did the bisection to find the commit that caused the problem: 498c5170472ff0c03a29d22dbd33225a0be038f4. [IA64] pvops: paravirtualize ivt.S Two instructions were wrongly paravirtualized such that _FROM_ macro had been used where _TO_ was intended Cc: James Bottomley Cc: "Wilcox, Matthew R" Signed-off-by: Isaku Yamahata Signed-off-by: Tony Luck commit bf9c8c9ddef7ef761ae9747349175adad0ef16ce Author: Timur Tabi Date: Fri Aug 1 14:58:44 2008 -0500 ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers If an OSS application calls SNDCTL_DSP_SYNC, then ALSA will call the driver's _hw_params and _prepare functions again. On the Freescale MPC8610 DMA ASoC driver, this caused the DMA controller to be unneccessarily re-programmed, and apparently it doesn't like that. The DMA will then not operate when instructed. This patch relocates much of the DMA programming to fsl_dma_open(), which is called only once. Signed-off-by: Timur Tabi Signed-off-by: Takashi Iwai commit 8401d92ba46a1e859464cbd9c9ee304f6e361da3 Author: David Moore Date: Tue Jul 29 23:46:25 2008 -0700 firewire: Preserve response data alignment bug when it is harmless Recently, a bug having to do with the alignment of transaction response data was fixed. However, some apps such as libdc1394 relied on the presence of that bug in order to function correctly. In order to stay compatible with old versions of those apps, this patch preserves the bug in cases where it is harmless to normal operation (such as the single quadlet read) due to a simple duplication of data. This guarantees maximum compatability for those users who are using the old app with the fixed kernel. Signed-off-by: David Moore Signed-off-by: Stefan Richter commit 3c4dc7115dfdb9e0450b7a3b0649948f5356d4af Author: Francois Romieu Date: Thu Jul 31 22:51:18 2008 +0200 via-velocity: velocity_init_{rd/tx}_ring use kcalloc(..., GFP_KERNEL). Allocate and free everyting outside of the locked section. Spotted-by: Arjan van de Ven Signed-off-by: Francois Romieu Fixed-by: Seguier Regis Signed-off-by: Andrew Morton commit 0fe9f15ee8bd652242a778ddfd30aa6d97a98e23 Author: Francois Romieu Date: Thu Jul 31 22:10:10 2008 +0200 via-velocity: separated struct allow wholesale copy during MTU changes. It should help people fix the bugs in my code :o) Signed-off-by: Francois Romieu Signed-off-by: Andrew Morton commit 52fd8ca6ad4124c15952ded35cfcf6adbd7ae8d4 Author: Vegard Nossum Date: Wed Jul 30 09:29:06 2008 -0700 IB/ipath: Use unsigned long for irq flags A few functions in the ipath driver incorrectly use unsigned int to hold irq flags for spin_lock_irqsave(). This patch was generated using the Coccinelle framework with the following semantic patch: The semantic patch I used was this: @@ expression lock; identifier flags; expression subclass; @@ - unsigned int flags; + unsigned long flags; ... <+... ( spin_lock_irqsave(lock, flags) | _spin_lock_irqsave(lock) | spin_unlock_irqrestore(lock, flags) | _spin_unlock_irqrestore(lock, flags) | read_lock_irqsave(lock, flags) | _read_lock_irqsave(lock) | read_unlock_irqrestore(lock, flags) | _read_unlock_irqrestore(lock, flags) | write_lock_irqsave(lock, flags) | _write_lock_irqsave(lock) | write_unlock_irqrestore(lock, flags) | _write_unlock_irqrestore(lock, flags) | spin_lock_irqsave_nested(lock, flags, subclass) | _spin_lock_irqsave_nested(lock, subclass) | spin_unlock_irqrestore(lock, flags) | _spin_unlock_irqrestore(lock, flags) | _raw_spin_lock_flags(lock, flags) | __raw_spin_lock_flags(lock, flags) ) ...+> Cc: Ralph Campbell Cc: Julia Lawall Cc: Alexey Dobriyan Signed-off-by: Vegard Nossum Signed-off-by: Roland Dreier commit e08198169ec5facb3d85bb455efa44a2f8327842 Author: Roland Dreier Date: Wed Jul 30 07:21:46 2008 -0700 IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr() wr->sg_list should be set to the sge pointer passed in, not priv->cm.rx_sge. Reported-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 867240f7b2a37b1be4ba37d904a9064a96c82099 Author: Krzysztof Hałasa Date: Thu Jul 3 00:39:46 2008 +0200 WAN: Use u32 type instead of u_int32_t in LMC driver. Signed-off-by: Krzysztof Hałasa commit d507911c3a451986b3501417c78b568f3850b8ef Author: Krzysztof Hałasa Date: Wed Jul 2 20:55:58 2008 +0200 WAN: don't mention syncppp in z8530 DocBook. Signed-off-by: Krzysztof Hałasa commit 64bef7630ad5b0ccfdd73973e95cf7b7e39224d0 Author: Krzysztof Hałasa Date: Wed Jul 2 20:46:21 2008 +0200 WAN: Port LMC driver to generic HDLC Signed-off-by: Krzysztof Hałasa commit 52e8a6a2d8dc19002d1757870d16051157ce999c Author: Krzysztof Hałasa Date: Wed Jul 2 17:47:52 2008 +0200 WAN: Convert Zilog-based drivers to generic HDLC Signed-off-by: Krzysztof Hałasa commit aca257530f7d681b953961090ad729c32aa5ad62 Author: Krzysztof Hałasa Date: Tue Jul 1 23:40:29 2008 +0200 WAN: Port COSA driver to generic HDLC. Signed-off-by: Krzysztof Hałasa commit 0bee8db8f63b099412fdbce5b55b01d9f177951d Author: Krzysztof Hałasa Date: Tue Jul 1 22:04:01 2008 +0200 WAN: farsync driver no longer uses syncppp.c directly Signed-off-by: Krzysztof Hałasa commit b22267d3883ebc76093e9f36c4c738125e092402 Author: Krzysztof Hałasa Date: Tue Jul 1 21:43:39 2008 +0200 WAN: Convert PC300 driver to use normal u8/u16/u32 types Signed-off-by: Krzysztof Hałasa commit c36936ce4bc6d2a0d6520bd798e85abbb139c2aa Author: Krzysztof Hałasa Date: Tue Jul 1 21:24:14 2008 +0200 WAN: Remove dead code from PC300 driver, part #2 Signed-off-by: Krzysztof Hałasa commit ea966165a306ad4243b7bf62c848288c4286a8b7 Author: Krzysztof Hałasa Date: Tue Jul 1 21:14:43 2008 +0200 WAN: Remove dead code from PC300 driver, part #1 Signed-off-by: Krzysztof Hałasa commit c1a0f0cdf95569c06946eed81c2fc7e04b272db4 Author: Krzysztof Hałasa Date: Tue Jul 1 20:35:06 2008 +0200 WAN: Remove unneeded "#include " Signed-off-by: Krzysztof Hałasa commit a8817d2f6d59b0caeacf6071f56a83164b474a32 Author: Krzysztof Hałasa Date: Tue Jul 1 20:24:10 2008 +0200 wanmain.c doesn't need syncppp.h Signed-off-by: Krzysztof Hałasa commit a24e202e3ffdbd1da45ceab8e60824720c6ab7fd Author: Krzysztof Hałasa Date: Tue Jul 1 20:18:49 2008 +0200 Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't exist Signed-off-by: Krzysztof Hałasa commit efa415840d462caf30002d259db20338b546a94b Author: Krzysztof Hałasa Date: Tue Jul 1 15:28:10 2008 +0200 Remove bogus variables from syncppp.[ch] Signed-off-by: Krzysztof Hałasa commit 86f584f08767160a745a50ed675e12b8f8bfbf30 Author: Krzysztof Hałasa Date: Tue Jul 1 15:10:11 2008 +0200 Remove bogus dosyncppp variable from synclink drivers. Signed-off-by: Krzysztof Hałasa commit 4dfce4075aa4e2eee35e52a78dbabfe37d94c908 Author: Krzysztof Hałasa Date: Mon Jun 30 19:06:40 2008 +0200 WAN: cosmetic changes to generic HDLC Signed-off-by: Krzysztof Hałasa commit 7c4be5aa8dce9ba37fdd971d5560490d9e30c270 Author: Alan Cox Date: Mon May 19 14:10:02 2008 +0100 [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f2b79c6ede54cf07355ac8d8f3044d682cd0c5ca Author: Alan Cox Date: Mon May 19 14:09:57 2008 +0100 [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit d0e58eed05f9baf77c4f75e794ae245f6dae240a Author: Alan Cox Date: Mon May 19 14:09:51 2008 +0100 [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit dae67a2835149e6518a78c5cf37d6de715c214fc Author: Alan Cox Date: Mon May 19 14:09:45 2008 +0100 [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 694b16b2bd23bbd13163762c29f1e7885fe0da41 Author: Alan Cox Date: Mon May 19 14:09:40 2008 +0100 [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 84af401af831567967250dec9c15680bceede5e4 Author: Alan Cox Date: Mon May 19 14:09:34 2008 +0100 [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit c1cfd1a2ffc5ee58f744b1ceb0887285df187668 Author: Alan Cox Date: Mon May 19 14:09:29 2008 +0100 [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit c1c8dd39f53e56d6a92aa6a2db9940d912d7ee4c Author: Alan Cox Date: Mon May 19 14:09:23 2008 +0100 [WATCHDOG 50/57] w83697hf_wdt: cleanup, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 46a3949ddc422882cc27c88d078838cd31885d78 Author: Alan Cox Date: Mon May 19 14:09:18 2008 +0100 [WATCHDOG 49/57] w83627hf: coding style, clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 8dc244f7deac4c0e95ce0ffd26f494bb6e1534c0 Author: Alan Cox Date: Mon May 19 14:09:12 2008 +0100 [WATCHDOG 48/57] txx9: Fix locking, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f92d3749d70265468e28643652c0e32c5a56cd2b Author: Alan Cox Date: Mon May 19 14:09:06 2008 +0100 [WATCHDOG 47/57] softdog: clean up, coding style and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 598467938dd8bcdcd4d88e9102c609f4caa9d9ef Author: Alan Cox Date: Mon May 19 14:09:00 2008 +0100 [WATCHDOG 46/57] smsc37b787_wdt: coding style, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 70b814ec1a484279a51bf9f7193551b996627247 Author: Alan Cox Date: Mon May 19 14:08:55 2008 +0100 [WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9b748ed03cabf533a815e5ffc50108a21c98e40c Author: Alan Cox Date: Mon May 19 14:08:49 2008 +0100 [WATCHDOG 44/57] scx200_wdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit ff94806057fba557abd6295f7313f5f9e972a48f Author: Alan Cox Date: Mon May 19 14:08:44 2008 +0100 [WATCHDOG 43/57] sc520_wdt: Clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit d14bccaadaa49b651fabcd1298b6ea07db3af552 Author: Alan Cox Date: Mon May 19 14:08:38 2008 +0100 [WATCHDOG 42/57] sc1200_wdt: clean up, fix locking and use unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit df3c9de3dee539c6b18a9c0797b37f6cb90c6ccb Author: Alan Cox Date: Mon May 19 14:08:33 2008 +0100 [WATCHDOG 41/57] sb_wdog: Clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f4f6f65a554d4a11e544070c39eea7c2ecc3ebfb Author: Alan Cox Date: Mon May 19 14:08:27 2008 +0100 [WATCHDOG 40/57] sbc_epx_c3_wdt: switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9f53c8de1aef08cad678dcda0f85fd8914ad7666 Author: Alan Cox Date: Mon May 19 14:08:22 2008 +0100 [WATCHDOG 39/57] sbc8360: clean up Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 619a8a2bb1d0c3f8270da4496a30f1e83e6eab5e Author: Alan Cox Date: Mon May 19 14:08:16 2008 +0100 [WATCHDOG 38/57] stg7240_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 1780de41406d783aa57459ba636a09aeda21d180 Author: Alan Cox Date: Mon May 19 14:08:11 2008 +0100 [WATCHDOG 37/57] sbc60xxwdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f19e031265dc6e05511308a6ecb9637e335b45b0 Author: Alan Cox Date: Mon May 19 14:08:05 2008 +0100 [WATCHDOG 36/57] sa1100_wdt: Switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit edef7a93f9414e1d4864150eabb49a618222c2bd Author: Alan Cox Date: Mon May 19 14:08:00 2008 +0100 [WATCHDOG 35/57] s3c2410: watchdog cleanup and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 72d5c0505bafae1a393f50e169e20b682d37f28e Author: Alan Cox Date: Mon May 19 14:07:54 2008 +0100 [WATCHDOG 34/57] rm9k_wdt: clean up Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 84ca995c258df70a8914866e8c996845003ff938 Author: Alan Cox Date: Mon May 19 14:07:48 2008 +0100 [WATCHDOG 33/57] pnx4008_wdt: unlocked_ioctl setup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 261dcc70aae926ba7b9218da7302f0ad2f665b79 Author: Alan Cox Date: Mon May 19 14:07:43 2008 +0100 [WATCHDOG 32/57] pcwd: clean up, unlocked_ioctl usage Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit aee334c23c9a559ce6334bd6ba74a5708b600ada Author: Alan Cox Date: Mon May 19 14:07:37 2008 +0100 [WATCHDOG 31/57] pc87413_wdt: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 12b9df7d21d0eedfaaee925f8f9c9aafb1cafa2f Author: Alan Cox Date: Mon May 19 14:07:32 2008 +0100 [WATCHDOG 30/57] omap_wdt: locking, unlocked_ioctl, tidy Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit a86b849868f40f83781f7a7e32e5e5ef939dc570 Author: Alan Cox Date: Mon May 19 14:07:26 2008 +0100 [WATCHDOG 29/57] mv64x60_wdt: clean up and locking checks Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit ed78c2da14924793310d96fa4b6a8c3a4172f72f Author: Alan Cox Date: Mon May 19 14:07:21 2008 +0100 [WATCHDOG 28/57] mtx-1_wdt: clean up, coding style, unlocked ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 83ab1a53f219c8139199633f60ab0ef88ef18c54 Author: Alan Cox Date: Mon May 19 14:07:15 2008 +0100 [WATCHDOG 27/57] mpcore watchdog: unlocked_ioctl and BKl work Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f26ef3dc69467e135e2b9555e44a088aee5c7d8f Author: Alan Cox Date: Mon May 19 14:07:09 2008 +0100 [WATCHDOG 26/57] mpc watchdog: clean up and locking Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 3930964532f8e454910cbe0d9909e98a02d9f552 Author: Alan Cox Date: Mon May 19 14:07:04 2008 +0100 [WATCHDOG 25/57] mixcomwd: coding style locking, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 325ea4d3a8a90b19d7a076714d0f8f238a5a6a69 Author: Alan Cox Date: Mon May 19 14:06:59 2008 +0100 [WATCHDOG 24/57] machzwd: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f4fabce15bb9b547f934e2b6f0e5e01044108e4d Author: Alan Cox Date: Mon May 19 14:06:53 2008 +0100 [WATCHDOG 23/57] ks8695_wdt: clean up, coding style, unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d Author: Alan Cox Date: Mon May 19 14:06:48 2008 +0100 [WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 640b4f685784feafcd99c24582c5eb3ea36c3c60 Author: Alan Cox Date: Mon May 19 14:06:42 2008 +0100 [WATCHDOG 21/57] ixp2000_wdt: clean up and unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 00e9c2059aba0a0d67d144229bac82d403c2f42a Author: Alan Cox Date: Mon May 19 14:06:36 2008 +0100 [WATCHDOG 20/57] booke watchdog: clean up and unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9a5f50d34b0927d2f43549b6d172b8f458b6b620 Author: Alan Cox Date: Mon May 19 14:06:30 2008 +0100 [WATCHDOG 19/57] bfin: watchdog cleanup and unlocked_ioctl Scan, tidy and check for unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 0e6fa3fb38e2c89ba9abce9a8b74867f07d20d19 Author: Alan Cox Date: Mon May 19 14:06:25 2008 +0100 [WATCHDOG 18/57] iTCO: unlocked_ioctl, coding style and cleanup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 30abcec14573e3462f18d63f4a8f154a23689f1b Author: Alan Cox Date: Mon May 19 14:06:19 2008 +0100 [WATCHDOG 17/57] it8712f: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 02e3814e193ff798676793016851bc222366dc6a Author: Alan Cox Date: Mon May 19 14:06:14 2008 +0100 [WATCHDOG 16/57] iop: watchdog switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 9b9dbcca3fa13acd64dbb9258bfe997809d6073b Author: Alan Cox Date: Mon May 19 14:06:08 2008 +0100 [WATCHDOG 15/57] indydog: Clean up and tidy Switch to unlocked_ioctl as well Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 02355c329a302c5ee81cacff0b7df7d306174981 Author: Alan Cox Date: Mon May 19 14:06:03 2008 +0100 [WATCHDOG 14/57] ibmasr: coding style, locking verify There is a new #if 0 section here which is a suggested fix for the horrible PCI hack in the existing code. Would be good if someone with a box that uses this device could test it. Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 0829291ea4a25c3c2ca4fba34aa38a1ee1e0b94b Author: Alan Cox Date: Mon May 19 14:05:57 2008 +0100 [WATCHDOG 13/57] i6300esb: Style, unlocked_ioctl, cleanup Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 2e43ba73d4e2d34ddb9843e30480be3752514c16 Author: Alan Cox Date: Mon May 19 14:05:52 2008 +0100 [WATCHDOG 12/57] ib700wdt: clean up and switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 6513e2a03887c6c9bd0b30593827a01ce3f7b542 Author: Alan Cox Date: Mon May 19 14:05:46 2008 +0100 [WATCHDOG 11/57] hpwdt: couple of include cleanups clean-up includes Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 89ea2429873e69201173f3606ab04d751f737cc4 Author: Alan Cox Date: Mon May 19 14:05:41 2008 +0100 [WATCHDOG 10/57] eurotechwdt: unlocked_ioctl, code lock check and tidy Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f339e2ac9d65656e6d18c92b1ddc4a7801373318 Author: Alan Cox Date: Mon May 19 14:05:35 2008 +0100 [WATCHDOG 09/57] ep93xx_wdt: unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit f78b0a8f27618b492dd2e1a8f5e4ce6f89b3c961 Author: Alan Cox Date: Mon May 19 14:05:30 2008 +0100 [WATCHDOG 08/57] davinci_wdt: unlocked_ioctl and check locking Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 6f932f18de7f0e22a1bdae5d0040eb5d8e4a6777 Author: Alan Cox Date: Mon May 19 14:05:24 2008 +0100 [WATCHDOG 07/57] cpu5_wdt: switch to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 2760600da2a13d5a2a335ba012d0f3ad5df4c098 Author: Alan Cox Date: Mon May 19 14:05:19 2008 +0100 [WATCHDOG 06/57] at91: watchdog to unlocked_ioctl Review and switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit a6be8e5ff95e12190fd5e5158eb553255677292f Author: Alan Cox Date: Mon May 19 14:05:13 2008 +0100 [WATCHDOG 05/57] atp watchdog Switch to unlocked_ioctl Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit fbd4714907cd54ba74b8d35228813a060ae0176a Author: Alan Cox Date: Mon May 19 14:05:07 2008 +0100 [WATCHDOG 04/57] AR7 watchdog Fix locking Use unlocked_ioctl Remove semaphores Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 173d95bc2e68baf73eb89fb9ef1cc63a66f581a5 Author: Alan Cox Date: Mon May 19 14:04:57 2008 +0100 [WATCHDOG 03/57] ali: watchdog locking and style Clean up and check locking Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit b6b4d9b8d07e34f745871d3109c84894db29041b Author: Alan Cox Date: Mon May 19 14:04:51 2008 +0100 [WATCHDOG 02/57] clean up and check advantech watchdog Clean up the advantech watchdog code and inspect for BKL problems Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck commit 94da1e2eff319994eefc7d04de7c911f64146e88 Author: Alan Cox Date: Mon May 19 14:04:46 2008 +0100 [WATCHDOG 01/57] Clean acquirewdt and check for BKL dependancies This brings the file into line with coding style. Signed-off-by: Alan Cox Signed-off-by: Wim Van Sebroeck