drivers/mtd/maps/ich2rom.c is completely unused because it was renamed to
drivers/mtd/maps/ichxrom.c.

This patch removes the stale ich2rom.c file.

This patch was already ACK'ed by David Woodhouse and Eric W. Biederman.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

dcache: is_subdir forgot to reset the result after seqretry.
Signed-Off-by: Prasanna Meda <pmeda@akamai.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is the DVB whitespace cleanup patch (the big one ;-).

I checked the whitespace-onlyness:

linux-2.6.11-bk9$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/1
linux-2.6.11-bk9$ cd -
linux-2.6.11-bk9.patched
linux-2.6.11-bk9.patched$ find drivers/media/common drivers/media/dvb -name "*.o" | xargs size >/tmp/2
linux-2.6.11-bk9.patched$ less /tmp/1
linux-2.6.11-bk9.patched$ less /tmp/2
linux-2.6.11-bk9.patched$ diff -us /tmp/1 /tmp/2
Files /tmp/1 and /tmp/2 are identical

DVB whitespace cleanups:

 o sync kernel and linuxtv.org CVS wrt whitespace
 o repair indentation damage
 o remove whitespace at eol
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes a logic error in the ide-pmac driver which could try to
access the chip's fcr register after the cell clock has been shut down,
thus causing a machine check on machines with the "Intrepid" chipset.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

outside of cifs vfs)

Signed-off-by: Steve French (sfrench@us.ibm.com)

Signed-off-by: Steve French (sfrench@us.ibm.com)

This patch further cleans up the appearance of TF in eflags when ptrace is
involved.  With this, PTRACE_SINGLESTEP will not cause TF to appear in
eflags as seen by PTRACE_GETREGS and the like, when the instruction faulted
for some reason other than the single-step trap.

This moves the check added by Dan's patch from setup_sigcontext to
handle_signal.  This is a cosmetic difference, but I think it makes more
sense to consolidate all the "reset registers to canonical state" work in
the same place (i.e. put it with the syscall rollback code), separate from
the signal handler setup.

The change that matters is moving the similar check out of do_debug,
where it only covers the case of a single-step trap.  Instead, it goes
into the ptrace_signal_deliver macro, which is called before the ptrace
stop for whatever signal results from whatever kind of fault in that
instruction (or asynchronous signal).  With that, the handle_signal
check is still needed only for the case of PTRACE_SINGLESTEP with a
handled signal.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into mars.ravnborg.org:/home/sam/bk/kconfig

fix:
arch/ppc/Kconfig:211:warning: type of 'CPU_FREQ_TABLE' redefined from 'tristate' to 'boolean'
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This properly indents the USB menu.
In usb menu do not display comment when USB is disabled.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This properly indents various driver menus.
Remove PARPORT_PC_CML1.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

o This properly indents the kernel hacking menu.
o Move LOG_BUF_SHIFT into kernel hacking menu (it already depended on DEBUG_KERNEL).
o Add DEBUG_KERNEL dependency to EARLY_PRINTK, DEBUG_PREEMPT and FRAME_POINTER.
o Remove overlong dependency, which included practically every arch.
o Merge the two MAGIC_SYSRQ menu entries.
o Remove unnecessary "default n" options.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This properly indents the cpufreq menu.
Remove CPU_FREQ_TABLE as visible option and use select instead
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This properly indents the bus options menu.
Merge the two MCA variables.
Remove unnecessary "default n" options.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Simplify dependencies.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This patch fixes some warnings about GtkToolButton in gconfig
Signed-off-by: Romain Liévin <lkml@lievin.net>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Define own icons for tree structure, allowing icons to match other icons.
This also makes gconfig independent on icons defined for xconfig.
Teached bk to ignore gconf executable
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

into bkbits.net:/repos/c/cifs/linux-2.5cifs

Signed-off-by: Steve French (sfrench@us.ibm.com)

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into mars.ravnborg.org:/home/sam/bk/kbuild

into bkbits.net:/repos/c/cifs/linux-2.5cifs

Fix singlestepping into a signal handler
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Update my copyright information in a few files (email change)
Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

makes a needlessly global variable static.
Posted to parisc-linux mailing list on Mon, 6 Dec 2004 01:41:39 +0100
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove no-longer-needed ASSERTs
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix declaration-after-code

From: Grant Grundler <grundler@parisc-linux.org>
From: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fix problem with building 64-bit kernels with gcc-3.4
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The IRT buffer must be 8-byte aligned
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Fix PCI-PCI bridges under the first HBA in the system
Signed-off-by: Ryan Bradetich <rbrad@parisc-linux.org>

 - fix up the comment to reflect rbrad's change and why it was made.
 - fix base_addr warning
From: Grant Grundler <grundler@parisc-linux.org>

 - Reword the explanation about why we renumber PCI busses on all platforms.
 - Remove CONFIG_PARISC64 symbol; use CONFIG_64BIT everywhere instead.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

LED addresses are physical addresses, not remapped.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Two problems occurred with the recent switch to virtual interrupt numbers.

The first is that two devices (eg Lasi PS/2 mouse and keyboard) can
share the same physical interrupt and should therefore share the same
virtual interrupt rather than have a new one assigned to them.  Fix this
by initialising the global_irq array to NO_IRQ, then checking the array
before assigning a new one.

The second is that some GSC devices (eg HIL and EISA) can have
two interrupts; one for normal interrupts and the other for NMI or
high-priority.  To fix this, I introduced an auxiliary IRQ to the
parisc_device and fill it in in Asp and Wax.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - add missing header fixing build warning
From: Thibaut Varene <varenet@parisc-linux.org>

 - remove duplicate definition of max_pfn
From: Randolph Chung <tausq@parisc-linux.org>

 - remove unnecessary assignment to mem_map (thanks to Dave Hansen)
 - print memory in MB, not Mb
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

some adjustments to the asm()s to make gcc happy
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix unwinding from millicode
Signed-off-by: Randolph Chung <tausq@debian.org>
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - currcon seems to have disappeared.  We weren't using it, just initialising
   it.
 - parisc_driver names no longer need to be different from pci_driver names.
 - DUMMY_CONSOLE_COLUMNS and DUMMY_CONSOLE_ROWS aren't used by the STI_CONSOLE
   at all.  In fact, they're used by the DUMMY_CONSOLE as their name implies.
 - STI_CONSOLE doesn't need to depend on FRAMEBUFFER_CONSOLE
 - sticore.o uses functions from fonts.o
 - PA-RISC doesn't have an MDA_CONSOLE
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>

 - Move STI_CONSOLE after FRAMEBUFFER_CONSOLE
 - Convert sticore.c to using gsc_(read|write)X instead of __raw_(read|write)X.
 - Convert pci_device_id table to use PCI_DEVICE().
Signed-Off-By: Kyle McMartin <kyle@parisc-linux.org>

 - apply patch by Andy Walker <ajwalker@broadpark.no> to fix stifb=
   bpp:x:y handling
From: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The atomic_dec in nul_destroy() is harmless, but can trigger an underflow
error if the atomic_dec_and_test() debugging is turned on.

Problem diagnosed by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux