GitHub/MotorolaMobilityLLC/kernel-slsi.git
19 years ago[PATCH] yenta: allocate resource fixes
Dominik Brodowski [Tue, 12 Jul 2005 20:58:17 +0000 (13:58 -0700)]
[PATCH] yenta: allocate resource fixes

The current CardBus window allocation code in yenta_socket is unable to handle
the transparent PCI-bridge handling update in 2.6.13.  We need to check _all_
resources of a given type to find the best one suitable for CardBus windows,
not just the first one.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] yenta: same resources in same structs
Dominik Brodowski [Tue, 12 Jul 2005 20:58:16 +0000 (13:58 -0700)]
[PATCH] yenta: same resources in same structs

drivers/pci/setup-bus.c enumerates the CardBus windows (bus->resources[])

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] pcmcia: Documentation update
Dominik Brodowski [Tue, 12 Jul 2005 20:58:15 +0000 (13:58 -0700)]
[PATCH] pcmcia: Documentation update

Update PCMCIA driver changes for patches merged in 2.6.13

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] yenta: fix parent resource determination
Dominik Brodowski [Tue, 12 Jul 2005 20:58:15 +0000 (13:58 -0700)]
[PATCH] yenta: fix parent resource determination

If the CardBus windows were pre-configured and the CardBus bridge is behind a
transparent PCI-PCI bridge, pci_find_parent_resource() might return a
different resource than the real parent if it is called before the window is
determined.  Therefore, move that call around.

Also fix return of value in void function.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] pcmcia: fix pcmcia-cs compilation
Dominik Brodowski [Tue, 12 Jul 2005 20:58:14 +0000 (13:58 -0700)]
[PATCH] pcmcia: fix pcmcia-cs compilation

Fix pcmcia-cs compilation with recent pcmcia kernel changes.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] x86_64: section alignment fix
Andrew Morton [Tue, 12 Jul 2005 20:58:13 +0000 (13:58 -0700)]
[PATCH] x86_64: section alignment fix

This is the second time this has happened: inserting a new section requires
that we adjust the arithmetic which is used to calculate the vsyscall page's
offset.

Cc: Christoph Lameter <christoph@lameter.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] bugfix: two read_inode() calls without clear_inode() call between
Artem B. Bityuckiy [Tue, 12 Jul 2005 20:58:12 +0000 (13:58 -0700)]
[PATCH] bugfix: two read_inode() calls without clear_inode() call between

Bug symptoms
~~~~~~~~~~~~
For the same inode VFS calls read_inode() twice and doesn't call
clear_inode() between the two read_inode() invocations.

Bug description
~~~~~~~~~~~~~~~
Suppose we have an inode which has zero reference count but is still in
the inode cache. Suppose kswapd invokes shrink_icache_memory() to free
some RAM. In prune_icache() inodes are removed from i_hash. prune_icache
() is then going to call clear_inode(), but drops the inode_lock
spinlock before this. If in this moment another task calls iget() for an
inode which was just removed from i_hash by prune_icache(), then iget()
invokes read_inode() for this inode, because it is *already removed*
from i_hash.

The end result is: we call iget(#N) then iput(#N); inode #N has zero
i_count now and is in the inode cache; kswapd starts. kswapd removes the
inode #N from i_hash ans is preempted; we call iget(#N) again;
read_inode() is invoked as the result; but we expect clear_inode()
before.

Fix
~~~~~~~
To fix the bug I remove inodes from i_hash later, when clear_inode() is
actually called. I remove them from i_hash under spinlock protection.
Since the i_state is set to I_FREEING, it is safe to do this. The others
will sleep waiting for the inode state change.

I also postpone removing inodes from i_sb_list. It is not compulsory to
do so but I do it for readability reasons. Inodes are added/removed to
the lists together everywhere in the code and there is no point to
change this rule. This is harmless because the only user of i_sb_list
which somehow may interfere with me (invalidate_list()) is excluded by
the iprune_sem mutex.

The same race is possible in invalidate_list() so I do the same for it.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] __wait_on_freeing_inode fix
Miklos Szeredi [Tue, 12 Jul 2005 20:58:10 +0000 (13:58 -0700)]
[PATCH] __wait_on_freeing_inode fix

This patch fixes queer behavior in __wait_on_freeing_inode().

If I_LOCK was not set it called yield(), effectively busy waiting for the
removal of the inode from the hash.  This change was introduced within
"[PATCH] eliminate inode waitqueue hashtable" Changeset 1.1938.166.16 last
october by wli.

The solution is to restore the old behavior, of unconditionally waiting on
the waitqueue.  It doesn't matter if I_LOCK is not set initally, the task
will go to sleep, and wake up when wake_up_inode() is called from
generic_delete_inode() after removing the inode from the hash chain.

Comment is also updated to better reflect current behavior.

This condition is very hard to trigger normally (simultaneous clear_inode()
with iget()) so probably only heavy stress testing can reveal any change of
behavior.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] lower VM_DONTCOPY total_vm
Hugh Dickins [Tue, 12 Jul 2005 20:58:09 +0000 (13:58 -0700)]
[PATCH] lower VM_DONTCOPY total_vm

dup_mmap of a VM_DONTCOPY vma forgot to lower the child's total_vm.  (But
no way does this account for the recent report of total_vm seen too low.)

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] quiet ide-cd warning
Matt Mackall [Tue, 12 Jul 2005 20:58:09 +0000 (13:58 -0700)]
[PATCH] quiet ide-cd warning

This shuts up a potential uninitialized variable warning.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] aacraid: swapped kmalloc args.
Dave Jones [Tue, 12 Jul 2005 20:58:08 +0000 (13:58 -0700)]
[PATCH] aacraid: swapped kmalloc args.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] name_to_dev_t warning fix
Andrew Morton [Tue, 12 Jul 2005 20:58:07 +0000 (13:58 -0700)]
[PATCH] name_to_dev_t warning fix

kernel/power/disk.c needs a declaration of name_to_dev_t() in scope.  mount.h
seems like an appropriate choice.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Linus Torvalds [Tue, 12 Jul 2005 22:54:36 +0000 (15:54 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 12 Jul 2005 20:17:42 +0000 (13:17 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 12 Jul 2005 20:16:40 +0000 (13:16 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

19 years ago[VLAN]: Fix early vlan adding leads to not functional device
Tommy Christensen [Tue, 12 Jul 2005 19:13:49 +0000 (12:13 -0700)]
[VLAN]: Fix early vlan adding leads to not functional device

OK, I can see what's happening here. eth0 doesn't detect link-up until
after a few seconds, so when the vlan interface is opened immediately
after eth0 has been opened, it inherits the link-down state. Subsequently
the vlan interface is never properly activated and are thus unable to
transmit any packets.

dev->state bits are not supposed to be manipulated directly. Something
similar is probably needed for the netif_device_present() bit, although
I don't know how this is meant to work for a virtual device.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Fix SMP build failure.
Andrew Morton [Tue, 12 Jul 2005 19:09:43 +0000 (12:09 -0700)]
[SPARC64]: Fix SMP build failure.

arch/sparc64/kernel/smp.c:48: error: parse error before "__attribute__"
arch/sparc64/kernel/smp.c:49: error: parse error before "__attribute__"

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: __be'ify *_type_trans()
Alexey Dobriyan [Tue, 12 Jul 2005 19:08:43 +0000 (12:08 -0700)]
[NET]: __be'ify *_type_trans()

tr_type_trans(), hippi_type_trans() left as-is.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NETFILTER]: Revert nf_reset change
Phil Oester [Tue, 12 Jul 2005 18:57:52 +0000 (11:57 -0700)]
[NETFILTER]: Revert nf_reset change

Revert the nf_reset change that caused so much trouble, drop conntrack
references manually before packets are queued to packet sockets.

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[PATCH] USB: add ldusb driver
Michael Hund [Mon, 27 Jun 2005 20:44:22 +0000 (22:44 +0200)]
[PATCH] USB: add ldusb driver

The following driver provides complete interrupt-in and interrupt-out
reports (raw data) to a user program. Until now it uses the
HIDIOCGDEVINFO ioctl call, because I don't know better :-(. Perhaps, it
will be ok for you - and I will be happy, if you assign 8 minor numbers.

I have tested it in several environments and it works very well for me.
However, it has a problem with two or more devices at the same hub, if
the two or more devices need 1 ms interrupt-in transfers. Unfortunately
more than one interrupt-in transfer every ms isn't possible (ehci
driver?). This is why the min_interrupt_in_interval and
min_interrupt_out_interval are increased to 2 ms (see the corresponding
module parameters). This way, I can use two devices simultaneously at
the same hub.

Signed-off-by: Michael Hund <mhund@ld-didactic.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: fix usb reference count bug in cdc-acm driver
brian@murphy.dk [Wed, 29 Jun 2005 23:53:29 +0000 (16:53 -0700)]
[PATCH] USB: fix usb reference count bug in cdc-acm driver

This increases the reference count on the usb cdc acm control interface
which is referred to by the tty interface provided by the driver. This
allows the deferred removal of the tty after the physical device is
disconnected if the tty is held open at the time of disconnection.

Signed-off-by: brian@murphy.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: export usb_get_intf() and usb_put_intf()
brian@murphy.dk [Wed, 29 Jun 2005 23:53:29 +0000 (16:53 -0700)]
[PATCH] USB: export usb_get_intf() and usb_put_intf()

Export usb_get_intf and usb_put_intf so that modules can increase
usb interface reference counts.

Signed-off-by: brian@murphy.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: another cdc descriptor
david-b@pacbell.net [Wed, 29 Jun 2005 14:04:14 +0000 (07:04 -0700)]
[PATCH] USB: another cdc descriptor

This adds another CDC descriptor type to <linux/usb_cdc.h>; the main claim
to fame for this is that some Motorola phones include it.  It's not currently
needed by any driver code; included for completeness.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: fix ohci merge glitch
david-b@pacbell.net [Wed, 29 Jun 2005 14:03:10 +0000 (07:03 -0700)]
[PATCH] USB: fix ohci merge glitch

A patch re-organizing some parts of root hub initialization deleted the
code initializing the bus-neutral reboot/shutdown notifier for OHCI.
This patch just restores that deleted code.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: ohci-omap pm updates
david-b@pacbell.net [Wed, 29 Jun 2005 13:59:14 +0000 (06:59 -0700)]
[PATCH] USB: ohci-omap pm updates

The recent "pm_message_t" changes removed functionality from the Linux
PM framework.  This patch removes it from the OMAP OHCI too, removing
the distinction between (previous) PM_SUSPEND_MEM and PM_SUSPEND_DISK
state transitions ... now the only suspend semantics supportable are
what was previously PM_SUSPEND_DISK (4) and is now "PMSG_SUSPEND" (3).

From: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: omap_udc tweaks
david-b@pacbell.net [Wed, 29 Jun 2005 14:00:56 +0000 (07:00 -0700)]
[PATCH] USB: omap_udc tweaks

Minor OMAP updates that somehow got dropped from previous patches.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: gadget/ether build fixes.
Ian Campbell [Wed, 29 Jun 2005 09:20:29 +0000 (10:20 +0100)]
[PATCH] USB: gadget/ether build fixes.

I also needed the following on 2.6.13-rc1 without CONFIG_USB_ETH_RNDIS,
symbol fs_status_desc isn't available in that case on PXA255.

This builds both with and without ETH_RNDIS, but I haven't actually
tested either.

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: gadget/ether fixes
Ian Campbell [Wed, 29 Jun 2005 09:15:32 +0000 (10:15 +0100)]
[PATCH] USB: gadget/ether fixes

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: SN9C10x driver updates
Luca Risolia [Sat, 25 Jun 2005 14:30:24 +0000 (16:30 +0200)]
[PATCH] USB: SN9C10x driver updates

SN9C10x driver updates.

Changes: + new, - removed, * cleanup, @ bugfix

@ Remove bad get_ctrl()'s
* Documentation updates
+ Add 0x0c45/0x602d to the list of SN9C10x based devices
+ Add support for OV7630 image sensors

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: add LD devices to hid blacklist
Michael Hund [Mon, 27 Jun 2005 20:44:22 +0000 (22:44 +0200)]
[PATCH] USB: add LD devices to hid blacklist

below you will find one patch to hid-core.c, which lets usbhid ignore
our HID devices. It would be nice, if you can apply it.

Signed-off-by: Michael Hund <mhund@ld-didactic.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: coverity: (desc->bitmap)[] overrun fix
KAMBAROV, ZAUR [Sat, 25 Jun 2005 05:20:35 +0000 (22:20 -0700)]
[PATCH] USB: coverity: (desc->bitmap)[] overrun fix

The length of the array desc->bitmap is 3, and not 4:

Definitions involved:

In drivers/usb/core/hcd.h

464   #define bitmap  DeviceRemovable

In drivers/usb/host/ohci-hub.c

395   struct usb_hub_descriptor *desc

In drivers/usb/core/hub.h

130   struct usb_hub_descriptor {
131   __u8  bDescLength;
132   __u8  bDescriptorType;
133   __u8  bNbrPorts;
134   __u16 wHubCharacteristics;
135   __u8  bPwrOn2PwrGood;
136   __u8  bHubContrCurrent;
137        /* add 1 bit for hub status change; round to bytes */
138   __u8  DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8];
139   __u8  PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8];
140   } __attribute__ ((packed));

In include/linux/usb.h

306   #define USB_MAXCHILDREN (16)

This defect was found automatically by Coverity Prevent, a static analysis
tool.

(akpm: this code should be shot.  Field `bitmap' doesn't exist in struct
usb_hub_descriptor.  And this .c file is #included in
drivers/usb/host/ohci-hcd.c, and someone somewhere #defines `bitmap' to
`DeviceRemovable'.

>From a maintainability POV it would be better to memset the whole array
beforehand - I changed the patch to do that)

Signed-off-by: Zaur Kambarov <zkambarov@coverity.com>
Cc: <linux-usb-devel@lists.sourceforge.net?
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: add driver for Keyspan Digital Remote
Michael Downey [Mon, 27 Jun 2005 17:48:26 +0000 (11:48 -0600)]
[PATCH] USB: add driver for Keyspan Digital Remote

This driver is a basic keypress input driver for the Keyspan Digital
Remote with part number UIA-11.  Currently there is an older remote with
part number UIA-10 which isn't supported by this driver.  Support for
the older UIA-10 could be added but a binary file is required to be
download to the device, and I don't have that file.  I also don't have a
UIA-10 device so I wouldn't be able to test any of the changes.

Signed-off-by: Michael Downey <downey@zymeta.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: net2280 warning fix
Andrew Morton [Mon, 27 Jun 2005 00:18:46 +0000 (17:18 -0700)]
[PATCH] USB: net2280 warning fix

drivers/usb/gadget/net2280.c: In function 'show_registers':
drivers/usb/gadget/net2280.c:1501: warning: assignment discards qualifiers from pointer target type

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: Fix kmalloc's flags type in USB
Olav Kongas [Thu, 23 Jun 2005 17:25:36 +0000 (20:25 +0300)]
[PATCH] USB: Fix kmalloc's flags type in USB

Greg,

This patch fixes the kmalloc() flags argument type in USB
subsystem; hopefully all of its occurences. The patch was
made against patch-2.6.12-git2 from Jun 20.

Cleanup of flags for kmalloc() in USB subsystem.

Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: isp116x-hcd cleanup
Olav Kongas [Thu, 23 Jun 2005 17:12:24 +0000 (20:12 +0300)]
[PATCH] USB: isp116x-hcd cleanup

Sorry that it took so long. Here comes a cleanup patch that
addresses the remarks by Alexey Dobriyan about
gregkh-usb-usb-isp116x-hcd-add.patch EXCEPT the remark about
the typecasting of mem_flags argument for kcalloc; this will
be addressed in a later patch.

OlavCleanup of isp116x-hcd.

Signed off by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: Patch to make usbmon to print control setup packets
Pete Zaitcev [Sat, 25 Jun 2005 21:32:59 +0000 (14:32 -0700)]
[PATCH] USB: Patch to make usbmon to print control setup packets

Make usbmon to print Setup packets of Control transfers. This is useful
when debugging enumeration issues.

This is a change to the trace format which is not fully compatible.
A parser has to look at the data length word now. If that word is
a character like 's', read setup packet before proceeding with data.
I decided not to bump the API tag for this because not many such
parsers exist at this point.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: SiS USB Makefile fixes
Thomas Winischhofer [Fri, 24 Jun 2005 16:44:20 +0000 (18:44 +0200)]
[PATCH] USB: SiS USB Makefile fixes

although 2.6.12 now contains the sisusb driver, it failes to build this
driver due to a missing patch of the Makefile.

From: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB ATM: fix line resync logic
Duncan Sands [Thu, 23 Jun 2005 07:37:56 +0000 (09:37 +0200)]
[PATCH] USB ATM: fix line resync logic

We map states 0x00 and 0x10 to the ATM_PHY_SIG_LOST flag.  The current logic fails to
resync the line if we get state 0x10 followed by 0x00, since we only resync the line
when the state is 0x00 and the flag changed.  Doubly fixed by (1) always resyncing the
line when the state is 0x00 even if the state didn't change, and (2) keeping track of
the last state, not just the flag.  We do (2) as well as (1) in order to get better log
messages.

This is a tweaked version of the original patch by Aurelio Arroyo.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB ATM: robustify poll throttling
Duncan Sands [Thu, 23 Jun 2005 07:23:10 +0000 (09:23 +0200)]
[PATCH] USB ATM: robustify poll throttling

No functional change, but less likely to break in the future.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB ATM: line speed measured in Kb not Kib
Duncan Sands [Thu, 23 Jun 2005 07:20:50 +0000 (09:20 +0200)]
[PATCH] USB ATM: line speed measured in Kb not Kib

Spotted by David Woodhouse.

Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: fix ftdi_sio compiler warnings
Greg Kroah-Hartman [Wed, 29 Jun 2005 23:53:29 +0000 (16:53 -0700)]
[PATCH] USB: fix ftdi_sio compiler warnings

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB ftdi_sio: remove redundant TIOCMBIS and TIOCMBIC code
Ian Abbott [Mon, 20 Jun 2005 16:10:19 +0000 (17:10 +0100)]
[PATCH] USB ftdi_sio: remove redundant TIOCMBIS and TIOCMBIC code

ftdi_sio: Remove redundant handling of TIOCMBIS and TIOCMBIC ioctls
as they are handled in the tty layer and never reach this driver.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB ftdi_sio: reduce device id table clutter
Ian Abbott [Mon, 20 Jun 2005 15:45:42 +0000 (16:45 +0100)]
[PATCH] USB ftdi_sio: reduce device id table clutter

ftdi_sio: Use a single usb_device_id table and detect the type of chip
programatically.  The table also flags devices requiring special
initialization.  The patch makes the driver about 10K smaller and makes
it easier to add new device IDs.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: khubd: use kthread API
akpm@osdl.org [Mon, 20 Jun 2005 21:29:58 +0000 (14:29 -0700)]
[PATCH] USB: khubd: use kthread API

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB Storage: Remove unneeded SC/P
Phil Dibowitz [Thu, 23 Jun 2005 05:47:13 +0000 (22:47 -0700)]
[PATCH] USB Storage: Remove unneeded SC/P

This patch removes an unneeded subclass and protocol from the
07af/0005/100 entry in unsual_devs.h as reported by Alfred Ganz
<alfred-ganz@agci.com>.

Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] USB: add bMaxPacketSize0 attribute to sysfs
Greg Kroah-Hartman [Wed, 29 Jun 2005 23:53:29 +0000 (16:53 -0700)]
[PATCH] USB: add bMaxPacketSize0 attribute to sysfs

For some reason this was not there...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[NET]: move config options out to individual protocols
Sam Ravnborg [Tue, 12 Jul 2005 04:13:56 +0000 (21:13 -0700)]
[NET]: move config options out to individual protocols

Move the protocol specific config options out to the specific protocols.
With this change net/Kconfig now starts to become readable and serve as a
good basis for further re-structuring.

The menu structure is left almost intact, except that indention is
fixed in most cases. Most visible are the INET changes where several
"depends on INET" are replaced with a single ifdef INET / endif pair.

Several new files were created to accomplish this change - they are
small but serve the purpose that config options are now distributed
out where they belongs.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: add a top-level Networking menu to *config
Sam Ravnborg [Tue, 12 Jul 2005 04:03:49 +0000 (21:03 -0700)]
[NET]: add a top-level Networking menu to *config

Create a new top-level menu named "Networking" thus moving
net related options and protocol selection way from the drivers
menu and up on the top-level where they belong.

To implement this all architectures has to source "net/Kconfig" before
drivers/*/Kconfig in their Kconfig file. This change has been
implemented for all architectures.

Device drivers for ordinary NIC's are still to be found
in the Device Drivers section, but Bluetooth, IrDA and ax25
are located with their corresponding menu entries under the new
networking menu item.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: Prevent oops when printing martian source
Olaf Kirch [Tue, 12 Jul 2005 04:01:42 +0000 (21:01 -0700)]
[IPV4]: Prevent oops when printing martian source

In some cases, we may be generating packets with a source address that
qualifies as martian. This can happen when we're in the middle of setting
up the network, and netfilter decides to reject a packet with an RST.
The IPv4 routing code would try to print a warning and oops, because
locally generated packets do not have a valid skb->mac.raw pointer
at this point.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPVS]: Add and reorder bh locks after moving to keventd.
Julian Anastasov [Tue, 12 Jul 2005 03:59:57 +0000 (20:59 -0700)]
[IPVS]: Add and reorder bh locks after moving to keventd.

An addition to the last ipvs changes that move
update_defense_level/si_meminfo to keventd:

- ip_vs_random_dropentry now runs in process context and should use _bh
  locks to protect from softirqs

- update_defense_level still needs _bh locks after si_meminfo is called,
  for the same purpose

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Trivial spelling fix patch for net/Kconfig
Jesper Juhl [Tue, 12 Jul 2005 03:59:03 +0000 (20:59 -0700)]
[NET]: Trivial spelling fix patch for net/Kconfig

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SCTP]: __nocast annotations
Alexey Dobriyan [Tue, 12 Jul 2005 03:57:47 +0000 (20:57 -0700)]
[SCTP]: __nocast annotations

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 11 Jul 2005 23:32:40 +0000 (16:32 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

19 years ago[PATCH] I2C: Move hwmon drivers (3/3)
Jean Delvare [Sat, 2 Jul 2005 16:52:48 +0000 (18:52 +0200)]
[PATCH] I2C: Move hwmon drivers (3/3)

Part 3: Move the drivers documentation, plus two general documentation
files.

Note that the patch "adds trailing whitespace", because it does move the
files as-is, and some files happen to have trailing whitespace.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: Move hwmon drivers (2/3)
Jean Delvare [Sat, 2 Jul 2005 16:20:26 +0000 (18:20 +0200)]
[PATCH] I2C: Move hwmon drivers (2/3)

Part 2: Move the driver files themselves.

Note that the patch "adds trailing whitespace", because it does move the
files as-is, and some files happen to have trailing whitespace.

From: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[NETLINK]: Reserve NETLINK_NETFILTER.
David S. Miller [Mon, 11 Jul 2005 21:29:11 +0000 (14:29 -0700)]
[NETLINK]: Reserve NETLINK_NETFILTER.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[PATCH] I2C: Move hwmon drivers (1/3)
Jean Delvare [Sat, 2 Jul 2005 16:15:49 +0000 (18:15 +0200)]
[PATCH] I2C: Move hwmon drivers (1/3)

Part 1: Configuration files and Makefiles.

From: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] w1: fix CRC calculation on bigendian platforms.
Evgeniy Polyakov [Thu, 30 Jun 2005 18:52:38 +0000 (22:52 +0400)]
[PATCH] w1: fix CRC calculation on bigendian platforms.

In the 2.6.13-rc1 code the "rn" structure is in the wrong-endianness
when passed to w1_attach_slave_device(). This causes problems like the
family and crc being swapped around.

Signed-off-by: Roger Blofeld <blofeldus@yahoo.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: SENSORS_ATXP1 must select I2C_SENSOR
Adrian Bunk [Thu, 30 Jun 2005 22:17:27 +0000 (00:17 +0200)]
[PATCH] I2C: SENSORS_ATXP1 must select I2C_SENSOR

On Thu, Jun 30, 2005 at 11:47:09PM +0200, Sebastian Pigulak wrote:
> I've tried patching linux-2.6.13-RC1 with patch-2.6.13-rc1-git2 and
> building atxp1(it allows Vcore voltage changing) into the kernel.
> Unfortunately, the kernel compilation stops with:
>
> LD      init/built-in.o
> LD      vmlinux
> drivers/built-in.o(.text+0x92298): In function `atxp1_detect':
> : undefined reference to `i2c_which_vrm'
> drivers/built-in.o(.text+0x921ae): In function `atxp1_attach_adapter':
> : undefined reference to `i2c_detect'
> make: *** [vmlinux] B??d 1
> ==> ERROR: Build Failed.  Aborting...
>
> Could someone have a look at the module and possibly fix it up?

SENSORS_ATXP1 must select I2C_SENSOR.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: Clarify the usage of i2c-dev.h
Jean Delvare [Sat, 25 Jun 2005 09:37:40 +0000 (11:37 +0200)]
[PATCH] I2C: Clarify the usage of i2c-dev.h

Upon suggestion by Nils Roeder, here is an update to the i2c
documentation to clarify which header files user-space applications
relying on the i2c-dev interface should include.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: Documentation fix
Jan Veldeman [Fri, 1 Jul 2005 14:20:24 +0000 (16:20 +0200)]
[PATCH] I2C: Documentation fix

Fix documentation to match code in include/linux/i2c-dev.h

Signed-off-by: Jan Veldeman <jan@mind.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: minor I2C doc cleanups
david-b@pacbell.net [Wed, 29 Jun 2005 14:14:06 +0000 (07:14 -0700)]
[PATCH] I2C: minor I2C doc cleanups

The I2C stack has long had "id" fields, of rather dubious utility, in
many data structures.  This removes mention of one of them from the
documentation about how to write an I2C driver, so that only drivers
that really need to use them (probably old/legacy code) will have any
reason to use this field.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: drop bogus eeprom comment
Jean Delvare [Thu, 23 Jun 2005 21:43:00 +0000 (23:43 +0200)]
[PATCH] I2C: drop bogus eeprom comment

This simple patch drops an out-of-date comment in the eeprom i2c chip
driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] i2c: make better use of IDR in i2c-core
Mark M. Hoffman [Tue, 28 Jun 2005 04:21:30 +0000 (00:21 -0400)]
[PATCH] i2c: make better use of IDR in i2c-core

This patch uses the already existing IDR mechanism to simplify and
improve the i2c_get_adapter function in i2c-core.

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: m41t00: fix incorrect kfree
Jean Delvare [Fri, 1 Jul 2005 12:28:15 +0000 (14:28 +0200)]
[PATCH] I2C: m41t00: fix incorrect kfree

Here is a simple path fixing an incorrect kfree in the m41t00 i2c chip
driver. The current code happens to work by accident, but the freed
pointer isn't the one which was allocated in the first place, which
could cause problems later.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: max6875 Kconfig update
Jean Delvare [Thu, 23 Jun 2005 21:41:39 +0000 (23:41 +0200)]
[PATCH] I2C: max6875 Kconfig update

Here is a proposed Kconfig update for the new max6875 i2c chip driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: max6875 documentation update
Jean Delvare [Thu, 23 Jun 2005 21:37:53 +0000 (23:37 +0200)]
[PATCH] I2C: max6875 documentation update

Here is a proposed documentation update for the new max6875 i2c chip
driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: New max6875 driver may corrupt EEPROMs
Jean Delvare [Fri, 24 Jun 2005 19:14:16 +0000 (21:14 +0200)]
[PATCH] I2C: New max6875 driver may corrupt EEPROMs

After a careful code analysis on the new max6875 driver
(drivers/i2c/chips/max6875.c), I have come to the conclusion that this
driver may cause EEPROM corruptions if used on random systems.

The EEPROM part of the MAX6875 chip is accessed using rather uncommon
I2C sequences. What is seen by the MAX6875 as reads can be seen by a
standard EEPROM (24C02) as writes. If you check the detection method
used by the driver, you'll find that the first SMBus command it will
send on the bus is i2c_smbus_write_byte_data(client, 0x80, 0x40). For
the MAX6875 it makes an internal pointer point to a specific offset of
the EEPROM waiting for a subsequent read command, so it's not an actual
data write operation, but for a standard EEPROM, this instead means
writing value 0x40 to offset 0x80. Blame Philips and Intel for the
obscure protocol.

Since the MAX6875 and the standard, common 24C02 EEPROMs share two I2C
addresses (0x50 and 0x52), loading the max6875 driver on a system with
standard EEPROMs at either address will trigger a write on these
EEPROMs, which will lead to their corruption if they happen not to be
write protected. This kind of EEPROMs can be found on memory modules
(SPD), ethernet adapters (MAC address), laptops (proprietary data) and
displays (EDID/DDC). Most of these are hopefully write-protected, but
not all of them.

For this reason, I would recommend that the max6875 driver be
neutralized, in a way that nobody can corrupt his/her EEPROMs by just
loading the driver. This means either deleting the driver completely, or
not listing any default address for it. I'd like this to be done before
2.6.13-rc1 is released.

Additionally, the max6875 driver lacks the 24RF08 corruption preventer
present in the eeprom driver, which means that loading this driver in a
system with such a chip would corrupt it as well.

Here is a proposed quick patch addressing the issue, although I wouldn't
mind a complete removal if it makes everyone feel safer. I think Ben
has plans to replace this driver by a much simplified one anyway.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: Strip trailing whitespace from strings
Jean Delvare [Thu, 23 Jun 2005 20:18:08 +0000 (22:18 +0200)]
[PATCH] I2C: Strip trailing whitespace from strings

Here is a simple patch originally from Denis Vlasenko, which strips a
useless trailing whitespace from 8 strings in 4 i2c drivers. Please
apply, thanks.

From: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: minor TPS6501x cleanups
david-b@pacbell.net [Wed, 29 Jun 2005 14:13:00 +0000 (07:13 -0700)]
[PATCH] I2C: minor TPS6501x cleanups

This includes various small cleanups and fixes to the TPS 6501x driver that
came mostly from review feedback by Jean Delvare; thanks Jean!  Also some
goofy whitespace gets fixed.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years ago[PATCH] I2C: Coding style cleanups to via686a
Denis Vlasenko [Wed, 22 Jun 2005 07:25:13 +0000 (10:25 +0300)]
[PATCH] I2C: Coding style cleanups to via686a

On Wednesday 22 June 2005 08:17, Greg KH wrote:
> [PATCH] I2C: Coding style cleanups to via686a
>
> The via686a hardware monitoring driver has infamous coding style at the
> moment. I'd like to clean up the mess before I start working on other
> changes to this driver. Is the following patch acceptable? No code
> change, only coding style (indentation, alignments, trailing white
> space, a few parentheses and a typo).
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Nice.

You missed some. This one is on top of your patch:

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Mon, 11 Jul 2005 21:08:08 +0000 (14:08 -0700)]
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6

19 years ago[SPARC64]: Add missing asm-sparc64/seccomp.h file.
David S. Miller [Mon, 11 Jul 2005 20:44:56 +0000 (13:44 -0700)]
[SPARC64]: Add missing asm-sparc64/seccomp.h file.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IA64] assign_irq_vector() should not panic
Kenji Kaneshige [Mon, 11 Jul 2005 04:49:00 +0000 (21:49 -0700)]
[IA64] assign_irq_vector() should not panic

Current assign_irq_vector() will panic if interrupt vectors is running
out. But I think how to handle the case of lack of interrupt vectors
should be handled by the caller of this function. For example, some
PCI devices can raise the interrupt signal via both MSI and I/O
APIC. So even if the driver for these device fails to allocate a
vector for MSI, the driver still has a chance to use I/O APIC based
interrupt. But currently there is no chance for these driver to use
I/O APIC based interrupt because kernel will panic when
assign_irq_vector() fails to allocate interrupt vector.

The following patch changes assign_irq_vector() for ia64 to return
-ENOSPC on error instead of panic (as i386 and x86_64 versions do).

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
19 years ago[IA64] use msleep_interruptible() instead of schedule_timeout
Nishanth Aravamudan [Sat, 9 Jul 2005 00:10:00 +0000 (17:10 -0700)]
[IA64] use msleep_interruptible() instead of schedule_timeout

Description: Replace schedule_timeout() with msleep_interruptible() to
guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
19 years ago[PATCH] v850: Update mmu.h header to match implementation changes
Miles Bader [Mon, 11 Jul 2005 09:24:50 +0000 (18:24 +0900)]
[PATCH] v850: Update mmu.h header to match implementation changes

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] v850: Update checksum.h to match changed function signatures
Miles Bader [Mon, 11 Jul 2005 09:24:50 +0000 (18:24 +0900)]
[PATCH] v850: Update checksum.h to match changed function signatures

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Linus Torvalds [Mon, 11 Jul 2005 17:18:18 +0000 (10:18 -0700)]
Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 11 Jul 2005 17:09:59 +0000 (10:09 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

19 years ago[IA64] remove linux/version.h include from arch/ia64
Olaf Hering [Sun, 10 Jul 2005 19:35:00 +0000 (12:35 -0700)]
[IA64] remove linux/version.h include from arch/ia64

changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
19 years agoAuto merge with /home/aegl/GIT/linus
Tony Luck [Mon, 11 Jul 2005 16:43:11 +0000 (09:43 -0700)]
Auto merge with /home/aegl/GIT/linus

19 years ago[SPARC64]: Add syscall auditing support.
David S. Miller [Mon, 11 Jul 2005 02:29:45 +0000 (19:29 -0700)]
[SPARC64]: Add syscall auditing support.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Pass regs and entry/exit boolean to syscall_trace()
David S. Miller [Sun, 10 Jul 2005 23:55:48 +0000 (16:55 -0700)]
[SPARC64]: Pass regs and entry/exit boolean to syscall_trace()

Also fix a bug in 32-bit syscall tracing.  We forgot to update
this code when we moved over to the convention that all 32-bit
syscall arguments are zero extended by default.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Add SECCOMP support.
David S. Miller [Sun, 10 Jul 2005 23:49:28 +0000 (16:49 -0700)]
[SPARC64]: Add SECCOMP support.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Kill ancient and unused SYSCALL_TRACING debugging code.
David S. Miller [Sun, 10 Jul 2005 22:56:40 +0000 (15:56 -0700)]
[SPARC64]: Kill ancient and unused SYSCALL_TRACING debugging code.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Add __read_mostly support.
David S. Miller [Sun, 10 Jul 2005 22:45:11 +0000 (15:45 -0700)]
[SPARC64]: Add __read_mostly support.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC]: Add ioprio system call support.
David S. Miller [Sun, 10 Jul 2005 22:11:45 +0000 (15:11 -0700)]
[SPARC]: Add ioprio system call support.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years agoMerge master.kernel.org:~rmk/linux-2.6-arm.git
Linus Torvalds [Sun, 10 Jul 2005 19:57:49 +0000 (12:57 -0700)]
Merge master.kernel.org:~rmk/linux-2.6-arm.git

19 years ago[PATCH] remove asm-xtensa/ipc.h
Stephen Rothwell [Sun, 10 Jul 2005 13:12:01 +0000 (23:12 +1000)]
[PATCH] remove asm-xtensa/ipc.h

Now that sys_ipc has been removed from xtensa, asm/ipc.h is no longer
needed for that architecture.  Not tested, but obviously correct.  This
file is included only from arch code and this patch also removes the only
inclusion.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] Sync up ieee-1394
Ben Collins [Sun, 10 Jul 2005 00:01:23 +0000 (20:01 -0400)]
[PATCH] Sync up ieee-1394

Lots of this patch is trivial code cleanups (static vars were being
intialized to 0, etc).

There's also some fixes for ISO transmits (max buffer handling).
Aswell, we have a few fixes to disable IRM capabilites correctly.  We've
also disabled, by default some generally unused EXPORT symbols for the
sake of cleanliness in the kernel.  However, instead of removing them
completely, we felt it necessary to have a config option that allowed
them to be enabled for the many projects outside of the main kernel tree
that use our API for driver development.

The primary reason for this patch is to revert a MODE6->MODE10 RBC
conversion patch from the SCSI maintainers.  The new conversions handled
directly in the scsi layer do not seem to work for SBP2.  This patch
reverts to our old working code so that users can enjoy using Firewire
disks and dvd drives again.

We are working with the SCSI maintainers to resolve this issue outside
of the main kernel tree.  We'll merge the patch once the SCSI layer's
handling of the MODE10 conversion is working for us.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] ARM: 2803/1: OMAP update 11/11: Add cpufreq support
Tony Lindgren [Sun, 10 Jul 2005 18:58:20 +0000 (19:58 +0100)]
[PATCH] ARM: 2803/1: OMAP update 11/11: Add cpufreq support

Patch from Tony Lindgren

This patch adds minimal cpufreq support for OMAP
taking advantage of the clock framework.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2805/1: OMAP update 10/11: Update H2 defconfig
Tony Lindgren [Sun, 10 Jul 2005 18:58:19 +0000 (19:58 +0100)]
[PATCH] ARM: 2805/1: OMAP update 10/11: Update H2 defconfig

Patch from Tony Lindgren

This patch updates H2 defconfig.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2804/1: OMAP update 9/11: Update OMAP arch files
Tony Lindgren [Sun, 10 Jul 2005 18:58:18 +0000 (19:58 +0100)]
[PATCH] ARM: 2804/1: OMAP update 9/11: Update OMAP arch files

Patch from Tony Lindgren

This patch by various OMAP developers syncs the OMAP
specific arch files with the linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch files
Tony Lindgren [Sun, 10 Jul 2005 18:58:17 +0000 (19:58 +0100)]
[PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch files

Patch from Tony Lindgren

This patch by various OMAP developers syncs the OMAP
specific arch files with the linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2812/1: OMAP update 7c/11: Move arch-omap to plat-omap
Tony Lindgren [Sun, 10 Jul 2005 18:58:15 +0000 (19:58 +0100)]
[PATCH] ARM: 2812/1: OMAP update 7c/11: Move arch-omap to plat-omap

Patch from Tony Lindgren

This patch move common OMAP code from arch-omap to plat-omap
directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2809/1: OMAP update 7b/11: Move arch-omap to plat-omap
Tony Lindgren [Sun, 10 Jul 2005 18:58:14 +0000 (19:58 +0100)]
[PATCH] ARM: 2809/1: OMAP update 7b/11: Move arch-omap to plat-omap

Patch from Tony Lindgren

This patch move common OMAP code from arch-omap to plat-omap
directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2807/1: OMAP update 7a/11: Move arch-omap to plat-omap
Tony Lindgren [Sun, 10 Jul 2005 18:58:13 +0000 (19:58 +0100)]
[PATCH] ARM: 2807/1: OMAP update 7a/11: Move arch-omap to plat-omap

Patch from Tony Lindgren

This patch move common OMAP code from arch-omap to plat-omap
directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2801/1: OMAP update 6/11: Split OMAP1 common code into id, io and serial
Tony Lindgren [Sun, 10 Jul 2005 18:58:12 +0000 (19:58 +0100)]
[PATCH] ARM: 2801/1: OMAP update 6/11: Split OMAP1 common code into id, io and serial

Patch from Tony Lindgren

This patch by Juha Yrjölä and other OMAP developers splits
OMAP1 specific common code into OMAP1 id, io, and serial
code in mach-omap1 directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2806/1: OMAP update 5/11: Move board files into mach-omap1 directory
Tony Lindgren [Sun, 10 Jul 2005 18:58:11 +0000 (19:58 +0100)]
[PATCH] ARM: 2806/1: OMAP update 5/11: Move board files into mach-omap1 directory

Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers
moves OMAP1 board files into mach-omap1 directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory
Tony Lindgren [Sun, 10 Jul 2005 18:58:10 +0000 (19:58 +0100)]
[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory

Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers
moves OMAP1 specific LED code into mach-omap1 directory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>