GitHub/LineageOS/android_kernel_samsung_universal7580.git
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[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[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 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>
19 years ago[PATCH] ARM: 2800/1: OMAP update 3/11: Move OMAP1 core code into mach-omap1 directory
Tony Lindgren [Sun, 10 Jul 2005 18:58:09 +0000 (19:58 +0100)]
[PATCH] ARM: 2800/1: OMAP update 3/11: Move OMAP1 core code into mach-omap1 directory

Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers
moves OMAP1 specific IRQ, time, and FPGA code 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: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2
Tony Lindgren [Sun, 10 Jul 2005 18:58:08 +0000 (19:58 +0100)]
[PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2

Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers modifies
ARM specific Kconfig to allow sharing code between OMAP1 and
OMAP2 architectures.
In order to share code between OMAP1 and OMAP2, all OMAP1
specific code is moved into mach-omap1 directory in the
following patch. A new mach-omap2 directory will be added
later on.

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

Patch from Tony Lindgren

This patch by various OMAP developers syncs the OMAP
specific include 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: 2796/1: Fix ARMv5[TEJ] check in MMU initalization
Deepak Saxena [Sun, 10 Jul 2005 18:44:55 +0000 (19:44 +0100)]
[PATCH] ARM: 2796/1: Fix ARMv5[TEJ] check in MMU initalization

Patch from Deepak Saxena

The code in mm-armv.c checks for the condition (cpu_architecture()<= ARMv5)
in a few places but should be checking for ARMv5TEJ as the MMU is shared
across all v5 variations.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2795/1: update ixp2000 defconfigs
Lennert Buytenhek [Sun, 10 Jul 2005 18:44:54 +0000 (19:44 +0100)]
[PATCH] ARM: 2795/1: update ixp2000 defconfigs

Patch from Lennert Buytenhek

Update the ixp2000 defconfigs from 2.6.12-git6 to 2.6.13-rc2.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years ago[PATCH] ARM: 2793/1: platform serial support for ixp2000
Lennert Buytenhek [Sun, 10 Jul 2005 18:44:53 +0000 (19:44 +0100)]
[PATCH] ARM: 2793/1: platform serial support for ixp2000

Patch from Lennert Buytenhek

This patch converts the ixp2000 serial port over to a platform
serial device.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 years agodrm: fix stupid missing semicolon.
Dave Airlie [Sun, 10 Jul 2005 02:46:19 +0000 (12:46 +1000)]
drm: fix stupid missing semicolon.

I fixed this in one git tree but that wasn't the one I pushed...

Signed-off-by: Dave Airlie <airlied@linux.ie>
19 years agoMerge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)]
Merge head 'drm-fixes' of /linux/kernel/git/airlied/drm-2.6

19 years agoMerge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:58:47 +0000 (09:58 -0700)]
Merge head 'drm-3264' of /linux/kernel/git/airlied/drm-2.6

19 years agoMerge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:58:01 +0000 (09:58 -0700)]
Merge head 'drm-via' of /linux/kernel/git/airlied/drm-2.6

19 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:29:09 +0000 (09:29 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

19 years ago[SCTP]: Use struct list_head for chunk lists, not sk_buff_head.
David S. Miller [Sat, 9 Jul 2005 04:47:49 +0000 (21:47 -0700)]
[SCTP]: Use struct list_head for chunk lists, not sk_buff_head.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV6]: Fix warning in ip6_mc_msfilter.
David S. Miller [Sat, 9 Jul 2005 04:44:39 +0000 (21:44 -0700)]
[IPV6]: Fix warning in ip6_mc_msfilter.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: fix IPv4 leave-group group matching
David L Stevens [Sat, 9 Jul 2005 00:48:38 +0000 (17:48 -0700)]
[IPV4]: fix IPv4 leave-group group matching

        This patch fixes the multicast group matching for
IP_DROP_MEMBERSHIP, similar to the IP_ADD_MEMBERSHIP fix in a prior
patch. Groups are identifiedby <group address,interface> and including
the interface address in the match will fail if a leave-group is done
by address when the join was done by index, or if different addresses
on the same interface are used in the join and leave.

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: (INCLUDE,empty)/leave-group equivalence for full-state MSF APIs & errno fix
David L Stevens [Sat, 9 Jul 2005 00:47:28 +0000 (17:47 -0700)]
[IPV4]: (INCLUDE,empty)/leave-group equivalence for full-state MSF APIs & errno fix

1) Adds (INCLUDE, empty)/leave-group equivalence to the full-state
   multicast source filter APIs (IPv4 and IPv6)

2) Fixes an incorrect errno in the IPv6 leave-group (ENOENT should be
   EADDRNOTAVAIL)

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: multicast API "join" issues
David L Stevens [Sat, 9 Jul 2005 00:45:16 +0000 (17:45 -0700)]
[IPV4]: multicast API "join" issues

1) In the full-state API when imsf_numsrc == 0
   errno should be "0", but returns EADDRNOTAVAIL

2) An illegal filter mode change
   errno should be EINVAL, but returns EADDRNOTAVAIL

3) Trying to do an any-source option without IP_ADD_MEMBERSHIP
   errno should be EINVAL, but returns EADDRNOTAVAIL

4) Adds comments for the less obvious error return values

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: multicast API "join" issues
David L Stevens [Sat, 9 Jul 2005 00:39:23 +0000 (17:39 -0700)]
[IPV4]: multicast API "join" issues

1) Changes IP_ADD_SOURCE_MEMBERSHIP and MCAST_JOIN_SOURCE_GROUP to ignore
   EADDRINUSE errors on a "courtesy join" -- prior membership or not
   is ok for these.

2) Adds "leave group" equivalence of (INCLUDE, empty) filters in the
   delta-based API. Without this, mixing delta-based API calls that
   end in an (INCLUDE, empty) filter would not allow a subsequent
   regular IP_ADD_MEMBERSHIP. It also frees socket buffer memory that
   isn't needed for both the multicast group record and source filter.

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: multicast API "join" issues
David L Stevens [Sat, 9 Jul 2005 00:38:07 +0000 (17:38 -0700)]
[IPV4]: multicast API "join" issues

        This patch corrects a few problems with the IP_ADD_MEMBERSHIP
socket option:

1) The existing code makes an attempt at reference counting joins when
   using the ip_mreqn/imr_ifindex interface. Joining the same group
   on the same socket is an error, whatever the API. This leads to
   unexpected results when mixing ip_mreqn by index with ip_mreqn by
   address, ip_mreq, or other API's. For example, ip_mreq followed by
   ip_mreqn of the same group will "work" while the same two reversed
   will not.
           Fixed to always return EADDRINUSE on a duplicate join and
   removed the (now unused) reference count in ip_mc_socklist.

2) The group-search list in ip_mc_join_group() is comparing a full
   ip_mreqn structure and all of it must match for it to find the
   group. This doesn't correctly match a group that was joined with
   ip_mreq or ip_mreqn with an address (with or without an index). It
   also doesn't match groups that are joined by different addresses on
   the same interface. All of these are the same multicast group,
   which is identified by group address and interface index.
           Fixed the check to correctly match groups so we don't get
   duplicate group entries on the ip_mc_socklist.

3) The old code allocates a multicast address before searching for
   duplicates requiring it to free in various error cases. This
   patch moves the allocate until after the search and
   igmp_max_memberships check, so never a need to allocate, then free
   an entry.

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IPV4]: Apply sysctl_icmp_echo_ignore_broadcasts to ICMP_TIMESTAMP as well.
Alexey Kuznetsov [Sat, 9 Jul 2005 00:34:46 +0000 (17:34 -0700)]
[IPV4]: Apply sysctl_icmp_echo_ignore_broadcasts to ICMP_TIMESTAMP as well.

This was the full intention of the original code.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Support CONFIG_HZ
David S. Miller [Fri, 8 Jul 2005 22:21:51 +0000 (15:21 -0700)]
[SPARC64]: Support CONFIG_HZ

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Fix sparse warnings
Victor Fusco [Fri, 8 Jul 2005 21:57:47 +0000 (14:57 -0700)]
[NET]: Fix sparse warnings

From: Victor Fusco <victor@cetuc.puc-rio.br>

Fix the sparse warning "implicit cast to nocast type"

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[NET]: Transform skb_queue_len() binary tests into skb_queue_empty()
David S. Miller [Fri, 8 Jul 2005 21:57:23 +0000 (14:57 -0700)]
[NET]: Transform skb_queue_len() binary tests into skb_queue_empty()

This is part of the grand scheme to eliminate the qlen
member of skb_queue_head, and subsequently remove the
'list' member of sk_buff.

Most users of skb_queue_len() want to know if the queue is
empty or not, and that's trivially done with skb_queue_empty()
which doesn't use the skb_queue_head->qlen member and instead
uses the queue list emptyness as the test.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[SPARC64]: Typo in dtlb_backend.S, _PAGE_SZ4M --> _PAGE_SZ4MB
David S. Miller [Fri, 8 Jul 2005 20:33:10 +0000 (13:33 -0700)]
[SPARC64]: Typo in dtlb_backend.S, _PAGE_SZ4M --> _PAGE_SZ4MB

Noticed by Eddie C. Dost

Signed-off-by: David S. Miller <davem@davemloft.net>
19 years ago[IA64] Fix a typo in arch/ia64/kernel/entry.S
H. J. Lu [Fri, 8 Jul 2005 19:25:00 +0000 (12:25 -0700)]
[IA64] Fix a typo in arch/ia64/kernel/entry.S

Both 2.4 and 2.6 kernels need this patch for the next binutils.

Signed-off-by: Tony Luck <tony.luck@intel.com>
19 years agoAuto merge with /home/aegl/GIT/linus
Tony Luck [Fri, 8 Jul 2005 15:52:42 +0000 (08:52 -0700)]
Auto merge with /home/aegl/GIT/linus

19 years ago[PATCH] Add MAINTAINERS entry for audit subsystem
Chris Wright [Fri, 8 Jul 2005 01:12:23 +0000 (18:12 -0700)]
[PATCH] Add MAINTAINERS entry for audit subsystem

I've been asked about this a couple times, and there's no info in
MAINTAINERS file.  Add MAINTAINERS entry for audit subsystem.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] device-mapper: dm-raid1: Limit bios to size of mirror region
Alasdair G Kergon [Fri, 8 Jul 2005 00:59:34 +0000 (17:59 -0700)]
[PATCH] device-mapper: dm-raid1: Limit bios to size of mirror region

Set the target's split_io field when building a dm-mirror device so
incoming bios won't span the mirror's internal regions.  Without this,
regions can be accessed while not holding correct locks and data corruption
is possible.

Reported-By: "Zhao Qian" <zhaoqian@aaastor.com>
From: Kevin Corry <kevcorry@us.ibm.com>
Signed-Off-By: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] video doc: one more system where video works with S3
Pavel Machek [Fri, 8 Jul 2005 00:59:33 +0000 (17:59 -0700)]
[PATCH] video doc: one more system where video works with S3

One more system where video works with S3.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] m32r: framebuffer device support
Hirokazu Takata [Fri, 8 Jul 2005 00:59:32 +0000 (17:59 -0700)]
[PATCH] m32r: framebuffer device support

This patch is for supporting Epson s1d13xxx framebuffer device for m32r.  #
Sorry, a little bigger.

The Epson s1d13806 is already supported by 2.6.12 kernel, and its driver is
placed as drivers/video/s1d13xxxfb.c.

For the m32r, a header file include/asm-m32r/s1d13806.h was prepared for
several m32r target platforms.  It was originally generated by an Epson
tool S1D13806CFG.EXE, and modified manually for the m32r platforms.

Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] nfsd4: fix fh_expire_type
NeilBrown [Fri, 8 Jul 2005 00:59:30 +0000 (17:59 -0700)]
[PATCH] nfsd4: fix fh_expire_type

After discussion at the recent NFSv4 bake-a-thon, I realized that my
assumption that NFS4_FH_PERSISTENT required filehandles to persist was a
misreading of the spec.  This also fixes an interoperability problem with the
Solaris client.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] nfsd4: check lock type against openmode.
NeilBrown [Fri, 8 Jul 2005 00:59:27 +0000 (17:59 -0700)]
[PATCH] nfsd4: check lock type against openmode.

We shouldn't be allowing, e.g., write locks on files not open for read.  To
enforce this, we add a pointer from the lock stateid back to the open stateid
it came from, so that the check will continue to be correct even after the
open is upgraded or downgraded.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
19 years ago[PATCH] nfsd4: clean up nfs4_preprocess_seqid_op
NeilBrown [Fri, 8 Jul 2005 00:59:26 +0000 (17:59 -0700)]
[PATCH] nfsd4: clean up nfs4_preprocess_seqid_op

As long as we're here, do some miscellaneous cleanup.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>