[linuxsh-dev] Sync from 2.5.43 / Beating the freeze

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

I have updated CVS to the latest development kernel, 2.5.43.  ChangeLog is
attached.

As some of you may already know, there is a 2.5 feature freeze aimed around
Halloween (October 31st).  The last LinuxSH sync to 2.5 was about 9 months
ago.  Paul Mundt and myself are scrambling to get what we have in shape
before the freeze - namely hacking away at the TODO list in the
linux-2_5-restructure branch.

I still have to test that the updated 2.5.43 HEAD builds, I'll also go
ahead and remove obsoleted files and get restructure up-to-date.  Because
the deadline is only a week and a half off, if anyone has _anything_ that
they want to go into 2.5/2.6 please speak up now.  SHmedia platform support
would be nice, but we don't know if that's possible.  Board maintainers?

Thanks,

M. R.

2002-10-18  M. R. Brown <mr...@li...>

	* fs/nfs/inode.c: Fix merge breakage.

	Linux 2.5.43

	* AGAINST-2.5.43: New file.
	* AGAINST-2.5.42: Removed.

	* Makefile, arch/sh/kernel/mach_7751se.c, arch/sh/kernel/mach_adx.c,
	arch/sh/kernel/mach_bigsur.c, arch/sh/kernel/mach_cat68701.c,
	arch/sh/kernel/mach_dc.c, arch/sh/kernel/mach_dmida.c,
	arch/sh/kernel/mach_ec3104.c, arch/sh/kernel/mach_hp600.c,
	arch/sh/kernel/mach_se.c, arch/sh/kernel/mach_unknown.c,
	arch/sh/kernel/setup.c, arch/sh/kernel/setup_cqreek.c,
	arch/sh/kernel/setup_dc.c, arch/sh/kernel/setup_ec3104.c,
	arch/sh/kernel/setup_hd64465.c, arch/sh/kernel/setup_sh2000.c,
	arch/sh/stboards/mach.c, drivers/block/rd.c, drivers/Makefile,
	drivers/char/Makefile, drivers/char/Config.help,
	drivers/mtd/maps/Config.in, drivers/mtd/maps/Config.help,
	drivers/mtd/Config.help, fs/nfs/inode.c, mm/memory.c: Merge changes
	from Linux 2.5.43.

	Linux 2.5.42

	* AGAINST-2.5.42: New file.
	* AGAINST-2.5.41: Removed.

	* Makefile, drivers/block/rd.c, drivers/char/Config.help,
	fs/nfs/inode.c, include/linux/input.h: Merge changes from Linux
	2.5.42.

	* Makefile: Fix merge breakage.

	Linux 2.5.41

	* AGAINST-2.5.41: New file.
	* AGAINST-2.5.40: Removed.

	* Makefile, drivers/block/rd.c, drivers/char/Makefile,
	drivers/char/Config.help, drivers/char/sh-sci.c,
	drivers/char/sh-sci.h, drivers/mtd/maps/Config.in,
	drivers/mtd/maps/Config.help, drivers/net/Config.in,
	drivers/pci/pci.ids, drivers/pcmcia/hd64465_ss.c, fs/nfs/inode.c,
	include/asm-sh/unistd.h, init/do_mounts.c, mm/memory.c: Merge changes
	from Linux 2.5.41.

	Linux 2.5.40

	* AGAINST-2.5.40: New file.
	* AGAINST-2.5.39: Removed.

	* Makefile, drivers/block/rd.c, drivers/net/8139too.c, mm/memory.c:
	Merge changes from Linux 2.5.40.

	Linux 2.5.39

	* AGAINST-2.5.39: New file.
	* AGAINST-2.5.38: Removed.

	* Makefile, arch/sh/Makefile, arch/sh/kernel/Makefile,
	arch/sh/mm/Makefile, arch/sh/stboards/Makefile, drivers/block/rd.c,
	mm/memory.c: Merge changes from Linux 2.5.39.

	Linux 2.5.38

	* AGAINST-2.5.38: New file.
	* AGAINST-2.5.37: Removed.

	* Makefile, drivers/block/rd.c: Merge changes from Linux 2.5.38.

	Linux 2.5.37

	* AGAINST-2.5.37: New file.
	* AGAINST-2.5.36: Removed.

	* Makefile, drivers/block/rd.c, drivers/net/8139too.c,
	drivers/net/Config.in, drivers/net/Config.help, fs/nfs/inode.c,
	mm/memory.c: Merge changes from Linux 2.5.37.

	Linux 2.5.36

	* AGAINST-2.5.36: New file.
	* AGAINST-2.5.35: Removed.

	* Makefile, arch/sh/Makefile, drivers/char/Makefile, kernel/ptrace.c,
	mm/memory.c: Merge changes from Linux 2.5.36.

	* Makefile: Fix merge breakage.

	Linux 2.5.35

	* AGAINST-2.5.35: New file.
	* AGAINST-2.5.34: Removed.

	* Makefile, arch/sh/Makefile, drivers/char/Makefile,
	drivers/char/Config.help, drivers/pci/pci.ids, fs/nfs/inode.c,
	include/asm-sh/hdreg.h, include/asm-sh/pgtable.h: Merge changes from
	Linux 2.5.35.

	Linux 2.5.34

	* AGAINST-2.5.34: New file.
	* AGAINST-2.5.33: Removed.

	* Makefile, arch/sh/mm/init.c, drivers/block/rd.c,
	drivers/char/Makefile, drivers/net/8139too.c, init/do_mounts.c,
	kernel/ptrace.c, mm/memory.c: Merge changes from Linux 2.5.34.

	Linux 2.5.33

	* AGAINST-2.5.33: New file.
	* AGAINST-2.5.32: Removed.

	* Makefile, arch/sh/kernel/irq_intc2.c, arch/sh/kernel/pci-dc.c,
	arch/sh/kernel/pci-sh7751.c, arch/sh/kernel/pci_st40.c,
	drivers/char/Makefile, drivers/char/Config.help,
	drivers/net/8139too.c, drivers/net/Config.in, drivers/net/Config.help,
	fs/nfs/inode.c, include/asm-sh/cache.h: Merge changes from Linux
	2.5.33.

	* drivers/pci/pci.ids, drivers/char/Makefile: Fix merge breakage.

	Linux 2.5.32

	* AGAINST-2.5.32: New file.
	* AGAINST-2.5.31: Removed.

	* Makefile, arch/sh/Makefile, arch/sh/config.in,
	drivers/char/Makefile, drivers/char/Config.help,
	drivers/input/joystick/Config.help, drivers/input/joystick/Config.in,
	drivers/mtd/maps/Config.in, drivers/pci/pci.ids,
	drivers/video/epson1355fb.c, drivers/video/hitfb.c,
	drivers/video/pvr2fb.c, include/asm-sh/keyboard.h,
	include/asm-sh/smplock.h, include/linux/input.h, init/do_mounts.c,
	kernel/ptrace.c, mm/memory.c: Merge changes from Linux 2.5.32.

	Linux 2.5.31

	* AGAINST-2.5.31: New file.
	* AGAINST-2.5.30: Removed.

	* Makefile, arch/sh/config.in, drivers/char/Makefile,
	drivers/net/8139too.c, mm/memory.c: Merge changes from Linux 2.5.31.

	* init/do_mounts.c, mm/memory.c: Fix merge breakage.

	Linux 2.5.30

	* AGAINST-2.5.30: New file.
	* AGAINST-2.5.29: Removed.

	* Makefile, arch/sh/kernel/Makefile, drivers/block/rd.c,
	drivers/Makefile, drivers/char/Makefile, drivers/char/Config.help,
	drivers/net/Config.in, fs/nfs/inode.c, include/asm-sh/processor.h,
	include/asm-sh/socket.h, include/asm-sh/unistd.h,
	include/linux/input.h, init/do_mounts.c, kernel/ptrace.c, mm/memory.c:
	Merge changes from Linux 2.5.30.

	Linux 2.5.29

	* AGAINST-2.5.29: New file.
	* AGAINST-2.5.28: Removed.

	* Makefile, arch/sh/config.in, drivers/input/joystick/Config.help,
	drivers/input/joystick/Config.in, drivers/input/joystick/Makefile,
	fs/nfs/inode.c, include/linux/input.h, init/do_mounts.c: Merge changes
	from Linux 2.5.29.

	Linux 2.5.28

	* AGAINST-2.5.28: New file.
	* AGAINST-2.5.27: Removed.

	* Makefile, arch/sh/kernel/irq.c, arch/sh/kernel/process.c,
	drivers/block/rd.c, drivers/Makefile, drivers/char/Makefile,
	drivers/net/8139too.c, include/asm-sh/system.h, kernel/ptrace.c,
	mm/memory.c: Merge changes from Linux 2.5.28.

	Linux 2.5.27

	* AGAINST-2.5.27: New file.
	* AGAINST-2.5.26: Removed.

	* Makefile, include/asm-sh/ide.h, kernel/ptrace.c, mm/memory.c: Merge
	changes from Linux 2.5.27.

	Linux 2.5.26

	* AGAINST-2.5.26: New file.
	* AGAINST-2.5.25: Removed.

	* Makefile, arch/sh/config.in, drivers/char/Makefile,
	drivers/char/Config.help, drivers/input/joystick/Config.help,
	drivers/input/joystick/Config.in, drivers/input/joystick/Makefile,
	fs/nfs/inode.c, include/asm-sh/pgtable-2level.h,
	include/linux/input.h: Merge changes from Linux 2.5.26.

	* include/linux/input.h: Fix merge breakage.

	Linux 2.5.25

	* AGAINST-2.5.25: New file.
	* AGAINST-2.5.24: Removed.
=09
	* Makefile, arch/sh/Makefile, arch/sh/boot/compressed/Makefile,
	arch/sh/boot/Makefile, drivers/char/Makefile,
	drivers/input/joystick/Config.help, drivers/input/joystick/Config.in,
	drivers/input/joystick/Makefile, fs/nfs/inode.c,
	include/linux/input.h, mm/memory.c: Merge changes from Linux 2.5.25.