| a2d6ed1 | Adrian Bunk | 30 October 2007, 23:50:23 UTC | make ata_scsi_lpm_get() static ata_scsi_lpm_get() can become static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:29 UTC |
| 1992a5e | Stephen Rothwell | 31 October 2007, 03:53:32 UTC | libata: suppress two warnings drivers/ata/libata-core.c:768: warning: 'ata_lpm_enable' defined but not used drivers/ata/libata-core.c:784: warning: 'ata_lpm_disable' defined but not used Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:29 UTC |
| aa91c72 | ashish kalra | 31 October 2007, 11:28:04 UTC | ata/sata_fsl: Remove ata_scsi_suspend/resume callbacks Signed-off-by: ashish kalra <ashish.kalra@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:29 UTC |
| 1f0e417 | ashish kalra | 31 October 2007, 11:28:03 UTC | ata/sata_fsl: Remove sending LOG EXT command in sata_fsl_softreset() Signed-off-by: ashish kalra <ashish.kalra@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:29 UTC |
| e7eac96 | ashish kalra | 31 October 2007, 11:28:02 UTC | ata/sata_fsl: Move MPC8315DS link speed limit workaround to specific ifdef Signed-off-by: ashish kalra <ashish.kalra@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| 520d3a1 | Li Yang | 31 October 2007, 11:28:01 UTC | ata/sata_fsl: cleanup style problem Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| 066ce4d | Jeff Garzik | 31 October 2007, 11:28:00 UTC | ata/sata_fsl: remove unneeded sata_fsl_hardreset() Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| 25ce945 | Jeff Garzik | 31 October 2007, 11:27:59 UTC | ata/sata_fsl: remove unneeded on-stack copy of FIS Remove unneeded on-stack copy of FIS in sata_fsl_cache_taskfile_from_d2h_fis(). Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| 2a52e8d | Jeff Garzik | 31 October 2007, 11:27:58 UTC | ata/sata_fsl: cleanup needless casts to/from void __iomem * Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| 9465d53 | Jeff Garzik | 31 October 2007, 11:27:57 UTC | ata/sata_fsl: Remove unnecessary SCR cases SCRs in the driver map to the standard values found in include/linux/ata.h, so no need for individual scr_read/scr_write case statements duplicating the natural value. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:28 UTC |
| a2962dd | Li Yang | 31 October 2007, 11:27:56 UTC | ata/sata_fsl: Kill ata_sg_is_last() Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:27 UTC |
| 79b3edc | Li Yang | 31 October 2007, 11:27:55 UTC | ata/sata_fsl: save irq in private data for irq unmapping Powerpc uses virtual irq which has to be unmapped. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:27 UTC |
| 27c96ea | Li Yang | 31 October 2007, 11:27:54 UTC | ata/sata_fsl: Remove deprecated hooks Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:27 UTC |
| 1bf617b | Li Yang | 31 October 2007, 11:27:53 UTC | ata/sata_fsl: Update for ata_link introduction Update the driver to use the newly added ata_link structure. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 03 November 2007, 12:46:27 UTC |
| 74521c2 | Ralf Baechle | 02 November 2007, 17:26:06 UTC | Use i8253.c lock for PC speaker on MIPS, too. The Jazz machines have to use the PIT timer for dyntick and highresolution kernels. This may break because currently just like i386 used to do MIPS uses two separate spinlocks in the actual PIT code and the PC speaker code. So switch to do it the same that x86 currently does PIT locking. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 03 November 2007, 02:39:18 UTC |
| a89b771 | Linus Torvalds | 03 November 2007, 02:37:41 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: linux-input mailing list moved to vger.kernel.org Input: inport, logibm - use KERN_INFO when reporting missing mouse Input: appletouch - idle reset logic broke older Fountains Input: hp_sdc.c - fix section mismatch Input: appletouch - add Johannes Berg as maintainer Input: Add Euro and Dollar key codes Input: xpad - add more USB IDs | 03 November 2007, 02:37:41 UTC |
| 29dd5a7 | Linus Torvalds | 03 November 2007, 02:37:26 UTC | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (25 commits) [MIPS] Jazz: disable PIT; cleanup R4030 clockevent [MIPS] Bigsur supports highmem. [MIPS] mtx-1: Enable -Werror. [MIPS] mtx-1: Remove unused mtx1_sys_btn. [MIPS] Pb1200: Enable -Werror. [MIPS] Fix and cleanup the MIPS part of the (ab)use of CLOCK_TICK_RATE. [MIPS] SNI: register a02r clockevent; don't use PIT timer [MIPS] i8253.h: Remove all i8259 related definitions. [MIPS] i8253: Cleanup. [MIPS] Cobalt: Fix IRQ comment; the Cobalt kernel uses CP0 counter now. [MIPS] Pb1200: Fix warning. [MIPS] Pb1200: Fix warning. [MIPS] IP27: Fix build error. [MIPS] Excite: Fix build error. [MIPS] Sibyte: Split and move clock code. [MIPS] Sibyte: Fixes for oneshot timer mode. [MIPS] Sibyte: Remove blank line. [MIPS] Swarm: Fix build failure [MIPS] time: Code cleanups [MIPS] time: Remove now unused local_timer_interrupt. ... | 03 November 2007, 02:37:26 UTC |
| 71527bf | Linus Torvalds | 03 November 2007, 02:36:26 UTC | 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: [WATCHDOG] iTCO_wdt.c ICH8 pci-device-id's [WATCHDOG] iTCO_wdt.c init & exit fixes [WATCHDOG] iTCO_wdt.c pci_device_id table clean-up [WATCHDOG] spin_lock_init() fixes [WATCHDOG] Unlock in iTCO_wdt_start when reboot is disabled [WATCHDOG] Add necessary braces to if (...) \n #if... cases [WATCHDOG] trivial fix two returns in void functions | 03 November 2007, 02:36:26 UTC |
| acf6035 | Wim Van Sebroeck | 31 August 2007, 08:23:10 UTC | [WATCHDOG] iTCO_wdt.c ICH8 pci-device-id's Add the pci-device-id's for the ICH8M and the ICH8M-E chipsets. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> | 02 November 2007, 22:25:43 UTC |
| 08113e3 | Wim Van Sebroeck | 31 August 2007, 08:15:34 UTC | [WATCHDOG] iTCO_wdt.c init & exit fixes Mark init and exit procedures as __devinit & _-devexit. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> | 02 November 2007, 22:25:35 UTC |
| c87b639 | Wim Van Sebroeck | 19 August 2007, 20:17:58 UTC | [WATCHDOG] iTCO_wdt.c pci_device_id table clean-up Make the pci_device_id table more readable. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> | 02 November 2007, 22:25:21 UTC |
| c7dfd0c | Alexey Dobriyan | 01 November 2007, 23:27:08 UTC | [WATCHDOG] spin_lock_init() fixes Some watchdog drivers initialize global spinlocks in module's init function which is tolerable, but some do it in PCI probe function. So, switch to static initialization to fix theoretical bugs and, more importantly, stop giving people bad examples. Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | 02 November 2007, 19:09:07 UTC |
| 3be51f7 | Thomas Bogendoerfer | 02 November 2007, 10:17:13 UTC | [MIPS] Jazz: disable PIT; cleanup R4030 clockevent Fix ISA irq acknowledge. Make r4030 clockevent code look like other mips clockevent code. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:49 UTC |
| 651194f | Ralf Baechle | 01 November 2007, 21:55:39 UTC | [MIPS] Bigsur supports highmem. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:49 UTC |
| 9603a23 | Ralf Baechle | 01 November 2007, 16:50:06 UTC | [MIPS] mtx-1: Enable -Werror. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:49 UTC |
| e7c9d6b | Ralf Baechle | 01 November 2007, 16:49:12 UTC | [MIPS] mtx-1: Remove unused mtx1_sys_btn. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:49 UTC |
| ae11e32 | Ralf Baechle | 01 November 2007, 16:46:14 UTC | [MIPS] Pb1200: Enable -Werror. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| 72fc19f | Ralf Baechle | 01 November 2007, 15:45:37 UTC | [MIPS] Fix and cleanup the MIPS part of the (ab)use of CLOCK_TICK_RATE. This is the clock rate of the i8253 PIT. A MIPS system may not have a PIT by the symbol is used all over the kernel including some APIs. So keeping it defined to the number for the PIT is the only sane thing for now. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| c929402 | Thomas Bogendoerfer | 01 November 2007, 10:36:42 UTC | [MIPS] SNI: register a02r clockevent; don't use PIT timer Register A20R clockevent. Remove PIT timer setup because it doesn't work Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| f6a8cc3 | Ralf Baechle | 01 November 2007, 14:44:57 UTC | [MIPS] i8253.h: Remove all i8259 related definitions. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| dd3db6e | Ralf Baechle | 01 November 2007, 14:38:20 UTC | [MIPS] i8253: Cleanup. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| 9aa4cc1 | Yoichi Yuasa | 01 November 2007, 12:51:23 UTC | [MIPS] Cobalt: Fix IRQ comment; the Cobalt kernel uses CP0 counter now. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| db0c19e | Ralf Baechle | 01 November 2007, 12:59:18 UTC | [MIPS] Pb1200: Fix warning. arch/mips/au1000/pb1200/irqmap.c:101: warning: ignoring return value of 'request_irq', declared with attribute warn_unused_result And while at it a few coding style cleanups. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:48 UTC |
| f5cd9f1 | Ralf Baechle | 01 November 2007, 12:22:53 UTC | [MIPS] Pb1200: Fix warning. arch/mips/au1000/pb1200/board_setup.c:71: warning: unused variable 'pin_func' Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| c892529 | Ralf Baechle | 01 November 2007, 12:20:51 UTC | [MIPS] IP27: Fix build error. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| 07f6169 | Ralf Baechle | 01 November 2007, 12:16:20 UTC | [MIPS] Excite: Fix build error. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| 217dd11 | Ralf Baechle | 01 November 2007, 01:57:55 UTC | [MIPS] Sibyte: Split and move clock code. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| f3f9ad0 | Ralf Baechle | 01 November 2007, 00:24:50 UTC | [MIPS] Sibyte: Fixes for oneshot timer mode. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| faf2782 | Ralf Baechle | 01 November 2007, 00:10:07 UTC | [MIPS] Sibyte: Remove blank line. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| 211a29a | Thiemo Seufer | 31 October 2007, 16:26:56 UTC | [MIPS] Swarm: Fix build failure Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:47 UTC |
| d9eec1a | Atsushi Nemoto | 30 October 2007, 16:21:03 UTC | [MIPS] time: Code cleanups * Do not include unnecessary headers. * Do not mention time.README. * Do not mention mips_timer_ack. * Make clocksource_mips static. It is now dedicated to c0_timer. * Initialize clocksource_mips.read statically. * Remove null_hpt_read. * Remove an argument of plat_timer_setup. It is just a placeholder. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| 1d0a909 | Ralf Baechle | 30 October 2007, 14:24:51 UTC | [MIPS] time: Remove now unused local_timer_interrupt. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| 81b635e | Ralf Baechle | 31 October 2007, 13:10:00 UTC | [MIPS] IP32: Fix address of 2nd serial interface. Found by Giuseppe Sacco <giuseppe@eppesuigoccas.homedns.org>. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| 46abf4b | Ralf Baechle | 31 October 2007, 12:42:56 UTC | [MIPS] SB1250: Use the right irqaction for the timer interrupt. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| d1598b6 | Ralf Baechle | 31 October 2007, 12:36:42 UTC | [MIPS] SB1250: Remove stray assignment of cpumask. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| 2e5dcd2 | Ralf Baechle | 31 October 2007, 12:34:42 UTC | [MIPS] Sibyte: Fix names of the clockevent devices. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| 9e32a51 | Ralf Baechle | 31 October 2007, 00:08:06 UTC | [MIPS] Sibyte: Build fixes / dead code removal. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | 02 November 2007, 16:13:46 UTC |
| eb76c5c | Dmitry Torokhov | 02 November 2007, 13:07:33 UTC | Input: linux-input mailing list moved to vger.kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Jiri Kosina <jkosina@suse.cz> Acked-by: Johannes Berg <johannes@sipsolutions.net> | 02 November 2007, 13:07:33 UTC |
| 2a0f9c4 | Helge Deller | 02 November 2007, 02:19:15 UTC | Input: inport, logibm - use KERN_INFO when reporting missing mouse Many mouse drivers are often compiled (e.g. in Linux distributions) into the kernel at the same time just to make sure that at least one driver will suceed in find it's mouse device. Nevertheless, only the inport and logitech busmouse mouse drivers report with KERN_ERR log level if the mouse wasn't found. They should use KERN_INFO instead, because it's not an error if the mouse isn't attached at all. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> | 02 November 2007, 02:19:15 UTC |
| 2a3e480 | Dmitry Torokhov | 02 November 2007, 02:13:32 UTC | Input: appletouch - idle reset logic broke older Fountains Fountains do not support change mode request and therefore should be excluded from idle reset attempts. Also: - do not re-submit URB when we decide that touchpad needs to be reinicialized - do not repeat size detection when reinitializing the touchpad - Add missing KERN_* prefixes to messages Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Johannes Berg <johannes@sipsolutions.net> | 02 November 2007, 02:13:32 UTC |
| 434a25d | Linus Torvalds | 01 November 2007, 22:08:07 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Don't access input_dev->private directly HID: fix hidinput_connect ignoring retval from input_register_device HID: hiddev - fix compiler warning HID: Add GoTop tablets to blacklist | 01 November 2007, 22:08:07 UTC |
| 3ce4af1 | Linus Torvalds | 01 November 2007, 22:07:29 UTC | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Fix myri10ge NAPI oops & warnings Fix region size check in mpc5200 FEC driver mpc5200: Fix Kconfig dependancies on MPC5200 FEC device driver | 01 November 2007, 22:07:29 UTC |
| c956a24 | Andrew Gallatin | 31 October 2007, 21:40:06 UTC | Fix myri10ge NAPI oops & warnings When testing the myri10ge driver with 2.6.24-rc1, I found that the machine crashed under heavy load: Unable to handle kernel paging request at 0000000000100108 RIP: [<ffffffff803cc8dd>] net_rx_action+0x11b/0x184 The address corresponds to the list_move_tail() in netif_rx_complete(): if (unlikely(work == weight)) list_move_tail(&n->poll_list, list); Eventually, I traced the crashes to calling netif_rx_complete() with work_done == budget. From looking at other drivers, it appears that one should only call netif_rx_complete() when work_done < budget. To fix it, I changed the test in myri10ge_poll() so that it refers to to work_done rather than looking at the rx ring status. If work_done is < budget, then that implies we have no more packets to process. Any races will be resolved by the NIC when the write to irq_claim is made. In myri10ge_clean_rx_done(), if we ever exceeded our budget, it would report a work_done one larger than was acutally done. This is because the increment was done in the conditional, so work_done would be incremented regardless of whether or not the test passed or failed. This would lead to the WARN_ON_ONCE(work > weight); warning in net_rx_action triggering. I've moved the increment of work_done inside the loop. Note that this would only be a problem when we had exceeded our budget. Signed off by: Andrew Gallatin <gallatin@myri.com> Andrew Gallatin Myricom Inc Signed-off-by: Jeff Garzik <jeff@garzik.org> | 01 November 2007, 20:04:45 UTC |
| 48d5845 | Grant Likely | 01 November 2007, 14:22:35 UTC | Fix region size check in mpc5200 FEC driver Driver shouldn't complain if the register range is larger than what it expects. This works around failures with some device trees. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 01 November 2007, 20:04:45 UTC |
| 644fdf9 | Grant Likely | 01 November 2007, 14:22:30 UTC | mpc5200: Fix Kconfig dependancies on MPC5200 FEC device driver When not building an arch/powerpc kernel, the mpc5200 FEC driver depends on some symbols which are not defined (BESTCOMM & BESTCOMM_FEC). This patch flips around the dependancy logic so that it cannot be selected unless BESTCOMM_FEC is selected first. Kconfig stops complaining this way. Also, the driver only works for arch/powerpc (not arch/ppc) anyway so it should depend on PPC_MERGE also. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Jeff Garzik <jeff@garzik.org> | 01 November 2007, 20:04:45 UTC |
| 54866f0 | Linus Torvalds | 01 November 2007, 19:09:33 UTC | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] IRNET: Fix build when TCGETS2 is defined. [NET]: docbook fixes for netif_ functions [NET]: Hide the net_ns kmem cache [NET]: Mark the setup_net as __net_init [NET]: Hide the dead code in the net_namespace.c [NET]: Relax the reference counting of init_net_ns [NETNS]: Make the init/exit hooks checks outside the loop [NET]: Forget the zero_it argument of sk_alloc() [NET]: Remove bogus zero_it argument from sk_alloc [NET]: Make the sk_clone() lighter [NET]: Move some core sock setup into sk_prot_alloc [NET]: Auto-zero the allocated sock object [NET]: Cleanup the allocation/freeing of the sock object [NET]: Move the get_net() from sock_copy() [NET]: Move the sock_copy() from the header [TCP]: Another TAGBITS -> SACKED_ACKED|LOST conversion [TCP]: Process DSACKs that reside within a SACK block | 01 November 2007, 19:09:33 UTC |
| b4d367f | David S. Miller | 01 November 2007, 10:18:02 UTC | [SPARC64]: Update defconfig. Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 10:18:02 UTC |
| 49259d3 | David S. Miller | 01 November 2007, 09:26:38 UTC | [IRDA] IRNET: Fix build when TCGETS2 is defined. Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 09:26:38 UTC |
| 3b582cc | Stephen Hemminger | 01 November 2007, 09:21:47 UTC | [NET]: docbook fixes for netif_ functions Documentation updates for network interfaces. 1. Add doc for netif_napi_add 2. Remove doc for unused returns from netif_rx 3. Add doc for netif_receive_skb [ Incorporated minor mods from Randy Dunlap -DaveM ] Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 09:21:47 UTC |
| d57a921 | Pavel Emelyanov | 01 November 2007, 07:46:50 UTC | [NET]: Hide the net_ns kmem cache This cache is only required to create new namespaces, but we won't have them in CONFIG_NET_NS=n case. Hide it under the appropriate ifdef. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:46:50 UTC |
| 1a2ee93 | Pavel Emelyanov | 01 November 2007, 07:45:59 UTC | [NET]: Mark the setup_net as __net_init The setup_net is called for the init net namespace only (int the CONFIG_NET_NS=n of course) from the __init function, so mark it as __net_init to disappear with the caller after the boot. Yet again, in the perfect world this has to be under #ifdef CONFIG_NET_NS, but it isn't guaranteed that every subsystem is registered *after* the init_net_ns is set up. After we are sure, that we don't start registering them before the init net setup, we'll be able to move this code under the ifdef. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:45:59 UTC |
| 6a1a3b9 | Pavel Emelyanov | 01 November 2007, 07:44:50 UTC | [NET]: Hide the dead code in the net_namespace.c The namespace creation/destruction code is never called if the CONFIG_NET_NS is n, so it's OK to move it under appropriate ifdef. The copy_net_ns() in the "n" case checks for flags and returns -EINVAL when new net ns is requested. In a perfect world this stub must be in net_namespace.h, but this function need to know the CLONE_NEWNET value and thus requires sched.h. On the other hand this header is to be injected into almost every .c file in the networking code, and making all this code depend on the sched.h is a suicidal attempt. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:44:50 UTC |
| d465579 | Pavel Emelyanov | 01 November 2007, 07:43:49 UTC | [NET]: Relax the reference counting of init_net_ns When the CONFIG_NET_NS is n there's no need in refcounting the initial net namespace. So relax this code by making a stupid stubs for the "n" case. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:43:49 UTC |
| 1dba323 | Pavel Emelyanov | 01 November 2007, 07:42:43 UTC | [NETNS]: Make the init/exit hooks checks outside the loop When the new pernet something (subsys, device or operations) is being registered, the init callback is to be called for each namespace, that currently exitst in the system. During the unregister, the same is to be done with the exit callback. However, not every pernet something has both calls, but the check for the appropriate pointer to be not NULL is performed inside the for_each_net() loop. This is (at least) strange, so tune this. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:42:43 UTC |
| 6257ff2 | Pavel Emelyanov | 01 November 2007, 07:39:31 UTC | [NET]: Forget the zero_it argument of sk_alloc() Finally, the zero_it argument can be completely removed from the callers and from the function prototype. Besides, fix the checkpatch.pl warnings about using the assignments inside if-s. This patch is rather big, and it is a part of the previous one. I splitted it wishing to make the patches more readable. Hope this particular split helped. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:39:31 UTC |
| 154adbc | Pavel Emelyanov | 01 November 2007, 07:38:43 UTC | [NET]: Remove bogus zero_it argument from sk_alloc At this point nobody calls the sk_alloc(() with zero_it == 0, so remove unneeded checks from it. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:38:43 UTC |
| 8fd1d17 | Pavel Emelyanov | 01 November 2007, 07:37:32 UTC | [NET]: Make the sk_clone() lighter The sk_prot_alloc() already performs all the stuff needed by the sk_clone(). Besides, the sk_prot_alloc() requires almost twice less arguments than the sk_alloc() does, so call the sk_prot_alloc() saving the stack a bit. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:37:32 UTC |
| 2e4afe7 | Pavel Emelyanov | 01 November 2007, 07:36:26 UTC | [NET]: Move some core sock setup into sk_prot_alloc The security_sk_alloc() and the module_get is a part of the object allocations - move it in the proper place. Note, that since we do not reset the newly allocated sock in the sk_alloc() (memset() is removed with the previous patch) we can safely do this. Also fix the error path in sk_prot_alloc() - release the security context if needed. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:36:26 UTC |
| 3f0666e | Pavel Emelyanov | 01 November 2007, 07:34:42 UTC | [NET]: Auto-zero the allocated sock object We have a __GFP_ZERO flag that allocates a zeroed chunk of memory. Use it in the sk_alloc() and avoid a hand-made memset(). This is a temporary patch that will help us in the nearest future :) Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:34:42 UTC |
| c308c1b | Pavel Emelyanov | 01 November 2007, 07:33:50 UTC | [NET]: Cleanup the allocation/freeing of the sock object The sock object is allocated either from the generic cache with the kmalloc, or from the proc->slab cache. Move this logic into an isolated set of helpers and make the sk_alloc/sk_free look a bit nicer. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:33:50 UTC |
| 1e2e6b8 | Pavel Emelyanov | 01 November 2007, 07:31:26 UTC | [NET]: Move the get_net() from sock_copy() The sock_copy() is supposed to just clone the socket. In a perfect world it has to be just memcpy, but we have to handle the security mark correctly. All the extra setup must be performed in sk_clone() call, so move the get_net() into more proper place. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:31:26 UTC |
| f1a6c4d | Pavel Emelyanov | 01 November 2007, 07:29:45 UTC | [NET]: Move the sock_copy() from the header The sock_copy() call is not used outside the sock.c file, so just move it into a sock.c Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:29:45 UTC |
| 261ab36 | Ilpo J\xe4rvinen | 01 November 2007, 07:10:18 UTC | [TCP]: Another TAGBITS -> SACKED_ACKED|LOST conversion Similar to commit 3eec0047d9bdd, point of this is to avoid skipping R-bit skbs. Signed-off-by: Ilpo J\xe4rvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:10:18 UTC |
| e56d6cd | Ilpo J\xe4rvinen | 01 November 2007, 07:09:37 UTC | [TCP]: Process DSACKs that reside within a SACK block DSACK inside another SACK block were missed if start_seq of DSACK was larger than SACK block's because sorting prioritizes full processing of the SACK block before DSACK. After SACK block sorting situation is like this: SSSSSSSSS D SSSSSS SSSSSSS Because write_queue is walked in-order, when the first SACK block has been processed, TCP is already past the skb for which the DSACK arrived and we haven't taught it to backtrack (nor should we), so TCP just continues processing by going to the next SACK block after the DSACK (if any). Whenever such DSACK is present, do an embedded checking during the previous SACK block. If the DSACK is below snd_una, there won't be overlapping SACK block, and thus no problem in that case. Also if start_seq of the DSACK is equal to the actual block, it will be processed first. Tested this by using netem to duplicate 15% of packets, and by printing SACK block when found_dup_sack is true and the selected skb in the dup_sack = 1 branch (if taken): SACK block 0: 4344-5792 (relative to snd_una 2019137317) SACK block 1: 4344-5792 (relative to snd_una 2019137317) equal start seqnos => next_dup = 0, dup_sack = 1 won't occur... SACK block 0: 5792-7240 (relative to snd_una 2019214061) SACK block 1: 2896-7240 (relative to snd_una 2019214061) DSACK skb match 5792-7240 (relative to snd_una) ...and next_dup = 1 case (after the not shown start_seq sort), went to dup_sack = 1 branch. Signed-off-by: Ilpo J\xe4rvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> | 01 November 2007, 07:09:37 UTC |
| 52eb053 | David S. Miller | 31 October 2007, 04:11:28 UTC | [SPARC64]: Fix linkage of enormous kernels. This was found by make randconfig If the kernel .text is very large, the .fixup section branches are too far away to be relocated correctly. Use "sethi %hi(label), reg; jmpl reg + %lo(label); %g0" sequence instead of the branch to fix this. There is another case in switch_to() involving a branch, which is fixed similarly. Signed-off-by: David S. Miller <davem@davemloft.net> | 31 October 2007, 22:30:56 UTC |
| d689855 | David S. Miller | 29 October 2007, 08:19:14 UTC | [SPARC64]: Fix build with CONFIG_NET disabled. We can't export verify_compat_iovec when CONFIG_NET is disabled, and consequently the Solaris compat module should also depend upon CONFIG_NET. Signed-off-by: David S. Miller <davem@davemloft.net> | 31 October 2007, 22:30:54 UTC |
| 7e5766f | David S. Miller | 29 October 2007, 07:36:09 UTC | [SPARC64]: Fix build failure when CONFIG_BUG is disabled. When CONFIG_BUG is turned off, the standard trick of: switch (x) { case X: ... case Y: ... default: BUG(); }; to mark impossible cases does not work because BUG() evalutes to nothing and thus GCC just sees a fallthrough code path. Add an explicit KERN_ERR log message and a do_exit() to trap this case. Signed-off-by: David S. Miller <davem@davemloft.net> | 31 October 2007, 22:30:52 UTC |
| 099d575 | David S. Miller | 29 October 2007, 07:23:07 UTC | [SPARC64]: Kill unused ITAG_MASK macro in ultra.S It is unused since we went to an I-cache flush that solely used the 'flush' instruction, and it's presence breaks the build when PAGE_SIZE is 512KB. Signed-off-by: David S. Miller <davem@davemloft.net> | 31 October 2007, 22:30:51 UTC |
| 23e8bc2 | David S. Miller | 28 October 2007, 05:33:33 UTC | [SPARC64]: Fix bogus '&' conditinal in set_rtc_mmss(). We're using '&' instead of '&&'. Noticed by Roel Kluin. Signed-off-by: David S. Miller <davem@davemloft.net> | 31 October 2007, 22:30:49 UTC |
| b1d08ac | Linus Torvalds | 31 October 2007, 20:43:31 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: Revert "Driver core: remove class_device_*_bin_file" | 31 October 2007, 20:43:31 UTC |
| 57eb06e | Linus Torvalds | 31 October 2007, 20:40:29 UTC | Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4634/1: DaVinci GPIO header build fix [ARM] 4636/1: pxa: add default configuration for zylonite [ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com [ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c [ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b [ARM] pxa: shut up CLOCK_EVT_MODE_RESUME warning [ARM] Fix FIQ issue with ARM926 [ARM] Fix pxamci regression [ARM] Fix netx_defconfig regression [ARM] Fix ateb9200_defconfig build regression [ARM] Fix an rpc_defconfig regression [ARM] Fix omap_h2_1610_defconfig regressions [ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h | 31 October 2007, 20:40:29 UTC |
| d919fd4 | Greg Kroah-Hartman | 31 October 2007, 19:51:29 UTC | Revert "Driver core: remove class_device_*_bin_file" This reverts commit fcd239d3d5575e5cc63aab5c33cf6dc66904f6d6. I messed up, ia64 still uses these files in the current tree, and now can not build the pci code, which all ia64 boxes seem to require :) This fixes that mistake. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | 31 October 2007, 19:51:29 UTC |
| 2ed45b0 | Adrian Bunk | 28 October 2007, 15:51:32 UTC | ieee1394: ieee1394_transactions.c: remove dead code This patch removes dead code spotted by the Intel C Compiler. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 31 October 2007, 18:02:19 UTC |
| 0bd243c | Kristian Høgsberg | 05 June 2007, 23:27:05 UTC | firewire: Fix pci resume to not pass in a __be32 config rom. The ohci_enable() function shared between pci_probe and pci_resume takes a host endian config rom, but ohci->config_rom is __be32. This sets up the config rom in the wrong endian on little endian machine, specifically, BusOptions will be initialized to a 0 max receive size. This patch changes the way we reuse the config rom so that we avoid this problem. Signed-off-by: Kristian Hoegsberg <krh@redhat.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 31 October 2007, 18:02:19 UTC |
| 5307cc1 | Linus Torvalds | 31 October 2007, 16:19:46 UTC | Remove broken ptrace() special-case code from file mapping The kernel has for random historical reasons allowed ptrace() accesses to access (and insert) pages into the page cache above the size of the file. However, Nick broke that by mistake when doing the new fault handling in commit 54cb8821de07f2ffcd28c380ce9b93d5784b40d7 ("mm: merge populate and nopage into fault (fixes nonlinear)". The breakage caused a hang with gdb when trying to access the invalid page. The ptrace "feature" really isn't worth resurrecting, since it really is wrong both from a portability _and_ from an internal page cache validity standpoint. So this removes those old broken remnants, and fixes the ptrace() hang in the process. Noticed and bisected by Duane Griffin, who also supplied a test-case (quoth Nick: "Well that's probably the best bug report I've ever had, thanks Duane!"). Cc: Duane Griffin <duaneg@dghda.com> Acked-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 31 October 2007, 16:19:46 UTC |
| 558de8a | David Brownell | 29 October 2007, 23:15:46 UTC | [ARM] 4634/1: DaVinci GPIO header build fix This fixes a build problem with GPIOs on DaVinci. Since it inlines operations for on-chip GPIOs, it needs some headers to support those direct register accesses. Those headers won't be included on other platforms, since they don't have that optimization. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Acked-by: Kevin Hilman <khilman@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:52 UTC |
| 1398f67 | eric miao | 30 October 2007, 07:02:55 UTC | [ARM] 4636/1: pxa: add default configuration for zylonite Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:48 UTC |
| e9bba8e | eric miao | 30 October 2007, 07:01:38 UTC | [ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:48 UTC |
| 710798c | Roel Kluin | 26 October 2007, 21:22:51 UTC | [ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c Fix assignment instead of condition Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:43 UTC |
| fd3d728 | Russell King | 27 October 2007, 20:48:43 UTC | [ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b Someone forgot to use 'ls include/asm-*/flat.h' or 'grep -r flat_get_addr_from_rp .' to find all architectures which may be affected by their change. Fix the fall out. Noticed-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:42 UTC |
| df43309 | Russell King | 27 October 2007, 14:15:49 UTC | [ARM] pxa: shut up CLOCK_EVT_MODE_RESUME warning Resolve: CC arch/arm/mach-pxa/time.o arch/arm/mach-pxa/time.c: In function `pxa_osmr0_set_mode': arch/arm/mach-pxa/time.c:154: warning: enumeration value `CLOCK_EVT_MODE_RESUME' not handled in switch Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:42 UTC |
| 0214f92 | Russell King | 27 October 2007, 10:01:35 UTC | [ARM] Fix FIQ issue with ARM926 Jon Eibertzon writes: > We have noticed that the I-cache is disabled while waiting for > interrupt in cpu_arm926_do_idle in arch/arm/mm/proc-arm926.S > and we are curious to know why, because this causes us a great > performance hit when executing in FIQ-handlers. Is it assumed > here that every individual FIQ-handler re-enables the I-cache? The I-cache disable is an errata workaround, so the solution is to disable FIQs across the section with the I-cache disabled. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:40 UTC |
| d8cb70d | Russell King | 26 October 2007, 16:56:40 UTC | [ARM] Fix pxamci regression Fix: WARNING: at arch/arm/mach-pxa/clock.c:69 clk_disable() [<c002d7c8>] (dump_stack+0x0/0x14) from [<c00334f4>] (clk_disable+0x34/0xa0) [<c00334c0>] (clk_disable+0x0/0xa0) from [<c028a43c>] (pxamci_set_ios+0x74/0xf0) [<c028a3c8>] (pxamci_set_ios+0x0/0xf0) from [<c0281548>] (mmc_power_off+0x90/0x9c) [<c02814b8>] (mmc_power_off+0x0/0x9c) from [<c0281a30>] (mmc_start_host+0x18/0x28) [<c0281a18>] (mmc_start_host+0x0/0x28) from [<c02825a0>] (mmc_add_host+0xe8/0x104) [<c02824b8>] (mmc_add_host+0x0/0x104) from [<c028a7d0>] (pxamci_probe+0x24c/0x2f4) [<c028a584>] (pxamci_probe+0x0/0x2f4) from [<c01e5948>] (platform_drv_probe+0x20/0x24) ... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:39 UTC |
| 5984a2f | Russell King | 26 October 2007, 16:55:28 UTC | [ARM] Fix netx_defconfig regression Fix: CC arch/arm/mach-netx/xc.o arch/arm/mach-netx/xc.c: In function 'request_xc': arch/arm/mach-netx/xc.c:192: error: 'struct kobject' has no member named 'name' arch/arm/mach-netx/xc.c:196: error: 'struct kobject' has no member named 'name' arch/arm/mach-netx/xc.c:200: error: 'struct kobject' has no member named 'name' Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:37 UTC |
| a80770c | Russell King | 26 October 2007, 16:54:39 UTC | [ARM] Fix ateb9200_defconfig build regression Fix: CC drivers/serial/atmel_serial.o drivers/serial/atmel_serial.c: In function 'atmel_serial_suspend': drivers/serial/atmel_serial.c:924: error: implicit declaration of function 'at91_suspend_entering_slow_clock' Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:37 UTC |
| 01c0ad5 | Russell King | 26 October 2007, 16:47:34 UTC | [ARM] Fix an rpc_defconfig regression Fix: CC drivers/scsi/arm/powertec.o In file included from drivers/scsi/arm/powertec.c:29: drivers/scsi/arm/scsi.h: In function 'next_SCp': drivers/scsi/arm/scsi.h:42: error: 'struct scatterlist' has no member named 'page' drivers/scsi/arm/scsi.h: In function 'init_SCp': drivers/scsi/arm/scsi.h:80: error: 'struct scatterlist' has no member named 'page' Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:35 UTC |
| b23e79f | Russell King | 26 October 2007, 15:33:31 UTC | [ARM] Fix omap_h2_1610_defconfig regressions Fix: arch/arm/mach-omap1/built-in.o: In function `h2_init': board-h2.c:(.init.text+0xbb4): undefined reference to `i2c_register_board_info' Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:34 UTC |
| 9143019 | Matt Reimer | 25 October 2007, 18:06:44 UTC | [ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h Fix a typo in include/asm-arm/plat-s3c/regs-nand.h. Signed-off-by: Matt Reimer <mreimer@vpop.net> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | 31 October 2007, 15:21:33 UTC |
| bb374b7 | David Miller | 31 October 2007, 04:23:48 UTC | [MEDIA] IVTV: exit_ivtv_i2c() cannot be __devexit It is referenced both from __devinit code (ivtv_probe) and normal .text (ivtv_process_eeprom), and therefore cannot be discarded via __devexit. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 31 October 2007, 14:48:21 UTC |
| dd13810 | Linus Torvalds | 31 October 2007, 14:46:51 UTC | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [AF_KEY]: suppress a warning for 64k pages. [TIPC]: Fix headercheck wrt. tipc_config.h [COMPAT]: Fix build on COMPAT platforms when CONFIG_NET is disabled. [CONNECTOR]: Fix a spurious kfree_skb() call [COMPAT]: Fix new dev_ifname32 returning -EFAULT [NET]: Fix incorrect sg_mark_end() calls. [IPVS]: Remove /proc/net/ip_vs_lblcr [IPV6]: remove duplicate call to proc_net_remove [NETNS]: fix net released by rcu callback [NET]: Fix free_netdev on register_netdev failure. [WAN]: fix drivers/net/wan/lmc/ compilation | 31 October 2007, 14:46:51 UTC |
