summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-02-18 18:49:01 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-02-18 18:50:35 +1100
commit6bbfb187d7a556235d084fca7604323e5a0691c6 (patch)
tree62ad3151a7df5abc64382b27d17a009ffd8be7ee
parent8de455418946f40e27194e8169969b32465a7cfe (diff)
Add the linux-next specific filesnext-20080218
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat
-rw-r--r--Next/Trees28
-rw-r--r--Next/merge.log1031
-rw-r--r--Next/quilt-import.log138
-rw-r--r--localversion-next1
4 files changed, 1198 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..4a07daaf5efc
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,28 @@
+Trees included into this release:
+
+Name Type URL
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver/
+pci quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/
+usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/
+device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
+kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/
+avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git
+v4l-dvb git ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git
+s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git
+sh git ssh://master.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
+jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
+pata quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git
+xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git
+infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
+acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
+blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git
+nfsd git git://git.linux-nfs.org/~bfields/linux.git
+firewire git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..893d9f38ee59
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,1031 @@
+HEAD is now at e760e71... Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
+Merging origin/master
+Updating e760e71..1309d4e
+Fast forward
+ Documentation/00-INDEX | 2 +
+ Documentation/cpuidle/core.txt | 23 +
+ Documentation/cpuidle/driver.txt | 31 +
+ Documentation/cpuidle/governor.txt | 29 +
+ Documentation/cpuidle/sysfs.txt | 79 +
+ MAINTAINERS | 9 +-
+ Makefile | 4 +-
+ arch/alpha/kernel/osf_sys.c | 4 +-
+ arch/blackfin/kernel/traps.c | 12 +-
+ arch/cris/arch-v10/lib/memset.c | 397 ++--
+ arch/cris/arch-v32/lib/memset.c | 398 ++--
+ arch/m68knommu/platform/5206/Makefile | 4 +-
+ arch/m68knommu/platform/5206e/Makefile | 4 +-
+ arch/m68knommu/platform/520x/Makefile | 4 +-
+ arch/m68knommu/platform/523x/Makefile | 4 +-
+ arch/m68knommu/platform/5249/Makefile | 4 +-
+ arch/m68knommu/platform/5272/Makefile | 4 +-
+ arch/m68knommu/platform/527x/Makefile | 4 +-
+ arch/m68knommu/platform/528x/Makefile | 4 +-
+ arch/m68knommu/platform/5307/Makefile | 4 +-
+ arch/m68knommu/platform/532x/Makefile | 4 +-
+ arch/m68knommu/platform/5407/Makefile | 4 +-
+ arch/m68knommu/platform/coldfire/Makefile | 4 +-
+ arch/m68knommu/platform/coldfire/entry.S | 9 +-
+ arch/m68knommu/platform/coldfire/timers.c | 17 +-
+ arch/mips/kernel/sysirix.c | 12 +-
+ arch/parisc/hpux/sys_hpux.c | 4 +-
+ arch/powerpc/Kconfig | 4 -
+ arch/powerpc/boot/Makefile | 2 +
+ arch/powerpc/boot/ps3-hvcall.S | 2 +-
+ arch/powerpc/kernel/Makefile | 2 +
+ arch/powerpc/kernel/process.c | 2 +-
+ arch/powerpc/kernel/vdso.c | 12 +-
+ arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
+ arch/powerpc/platforms/512x/Kconfig | 1 -
+ arch/powerpc/platforms/52xx/Kconfig | 2 -
+ arch/powerpc/platforms/Kconfig | 2 -
+ arch/powerpc/platforms/Kconfig.cputype | 4 -
+ arch/powerpc/platforms/cell/ras.c | 11 +-
+ arch/powerpc/platforms/cell/spufs/inode.c | 18 +-
+ arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
+ arch/powerpc/platforms/embedded6xx/Kconfig | 4 -
+ arch/powerpc/platforms/iseries/vio.c | 2 +-
+ arch/sh/Kconfig | 19 +
+ arch/sh/Kconfig.cpu | 4 +-
+ arch/sh/Kconfig.debug | 3 +-
+ arch/sh/Makefile | 1 +
+ arch/sh/boards/renesas/migor/Makefile | 1 +
+ arch/sh/boards/renesas/migor/setup.c | 61 +
+ arch/sh/boards/renesas/r7780rp/setup.c | 47 +-
+ arch/sh/boards/renesas/rts7751r2d/setup.c | 45 +-
+ arch/sh/boards/renesas/sdk7780/Kconfig | 7 -
+ arch/sh/cchips/hd6446x/hd64465/setup.c | 47 +-
+ arch/sh/configs/migor_defconfig | 824 ++++++++
+ arch/sh/configs/rts7751r2d1_defconfig | 340 +++-
+ arch/sh/configs/rts7751r2dplus_defconfig | 340 +++-
+ arch/sh/configs/se7705_defconfig | 1 -
+ arch/sh/drivers/dma/dma-api.c | 2 +-
+ arch/sh/drivers/pci/fixups-lboxre2.c | 4 +-
+ arch/sh/drivers/pci/fixups-rts7751r2d.c | 4 +-
+ arch/sh/drivers/pci/ops-dreamcast.c | 44 +-
+ arch/sh/drivers/pci/ops-rts7751r2d.c | 3 +-
+ arch/sh/drivers/pci/pci-sh4.h | 4 +-
+ arch/sh/drivers/pci/pci-sh7751.c | 16 +-
+ arch/sh/drivers/pci/pci-sh7780.c | 2 +-
+ arch/sh/kernel/Makefile_32 | 1 +
+ arch/sh/kernel/Makefile_64 | 1 +
+ arch/sh/kernel/cpu/irq/Makefile | 1 -
+ arch/sh/kernel/cpu/irq/intc-sh5.c | 27 +-
+ arch/sh/kernel/cpu/irq/maskreg.c | 93 -
+ arch/sh/kernel/cpu/sh4/probe.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/Makefile | 2 +
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 10 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 177 ++
+ arch/sh/kernel/cpu/sh5/probe.c | 61 +-
+ arch/sh/kernel/io.c | 8 +-
+ arch/sh/kernel/io_generic.c | 24 +-
+ arch/sh/kernel/io_trapped.c | 276 +++
+ arch/sh/kernel/irq.c | 3 -
+ arch/sh/kernel/process_64.c | 9 +-
+ arch/sh/kernel/ptrace_32.c | 4 +-
+ arch/sh/kernel/setup.c | 2 +-
+ arch/sh/kernel/syscalls_32.S | 4 +-
+ arch/sh/kernel/syscalls_64.S | 4 +-
+ arch/sh/kernel/time_32.c | 19 +-
+ arch/sh/kernel/time_64.c | 31 +-
+ arch/sh/kernel/timers/timer-mtu2.c | 1 -
+ arch/sh/kernel/traps_32.c | 164 +-
+ arch/sh/kernel/traps_64.c | 4 +-
+ arch/sh/kernel/vmlinux_64.lds.S | 2 +-
+ arch/sh/mm/cache-sh5.c | 1019 ++++------
+ arch/sh/mm/consistent.c | 30 +-
+ arch/sh/mm/fault_32.c | 11 +
+ arch/sh/mm/init.c | 2 +
+ arch/sh/tools/mach-types | 2 +
+ arch/sparc64/solaris/fs.c | 12 +-
+ arch/um/drivers/mconsole_kern.c | 6 +-
+ arch/x86/Kconfig | 4 +-
+ arch/x86/kernel/acpi/cstate.c | 2 +
+ arch/x86/kernel/efi.c | 4 +-
+ arch/x86/kernel/pci-gart_64.c | 9 +
+ arch/x86/kernel/test_rodata.c | 2 +-
+ arch/x86/kernel/traps_64.c | 4 +-
+ arch/x86/mm/fault.c | 2 +-
+ arch/x86/mm/init_32.c | 1 +
+ arch/x86/mm/init_64.c | 1 +
+ arch/x86/mm/pageattr.c | 17 +-
+ drivers/acpi/blacklist.c | 64 +-
+ drivers/acpi/event.c | 2 +-
+ drivers/acpi/hardware/hwsleep.c | 1 +
+ drivers/acpi/osl.c | 6 +-
+ drivers/acpi/processor_idle.c | 19 +
+ drivers/ata/ata_piix.c | 2 +-
+ drivers/ata/libata-core.c | 1 -
+ drivers/ata/libata-scsi.c | 2 +-
+ drivers/ata/pata_acpi.c | 4 +-
+ drivers/ata/pata_amd.c | 7 +-
+ drivers/ata/pata_cs5536.c | 10 +-
+ drivers/ata/pata_jmicron.c | 3 +-
+ drivers/ata/pata_legacy.c | 2 -
+ drivers/ata/pata_marvell.c | 4 +-
+ drivers/ata/pata_scc.c | 2 +
+ drivers/ata/sata_mv.c | 4 +-
+ drivers/ata/sata_promise.c | 2 +-
+ drivers/ata/sata_via.c | 4 +-
+ drivers/block/swim3.c | 4 -
+ drivers/bluetooth/hci_ldisc.c | 1 +
+ drivers/char/hvc_rtas.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 3 +-
+ drivers/cpuidle/sysfs.c | 14 +-
+ drivers/hid/hid-input-quirks.c | 17 +-
+ drivers/hid/hid-input.c | 8 +-
+ drivers/hid/usbhid/hid-quirks.c | 38 +-
+ drivers/infiniband/core/cm.c | 26 +-
+ drivers/infiniband/core/cma.c | 10 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 17 +
+ drivers/infiniband/hw/mlx4/mr.c | 2 +-
+ drivers/infiniband/hw/mthca/mthca_cq.c | 2 +-
+ drivers/infiniband/hw/mthca/mthca_memfree.c | 1 +
+ drivers/infiniband/ulp/ipoib/ipoib.h | 1 -
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 +
+ drivers/macintosh/mediabay.c | 2 -
+ drivers/md/bitmap.c | 8 +-
+ drivers/md/dm-table.c | 4 +-
+ drivers/md/md.c | 3 +-
+ drivers/misc/thinkpad_acpi.c | 4 +-
+ drivers/mtd/mtdsuper.c | 14 +-
+ drivers/net/8139too.c | 2 +-
+ drivers/net/Kconfig | 18 +
+ drivers/net/Makefile | 3 +-
+ drivers/net/cxgb3/l2t.c | 2 +-
+ drivers/net/cxgb3/sge.c | 35 +-
+ drivers/net/dm9000.c | 654 ++++---
+ drivers/net/e1000/e1000_main.c | 18 +-
+ drivers/net/forcedeth.c | 132 +-
+ drivers/net/mlx4/mr.c | 21 +-
+ drivers/net/netconsole.c | 4 +-
+ drivers/net/ni52.c | 1142 ++++++------
+ drivers/net/ni52.h | 158 +-
+ drivers/net/pcnet32.c | 48 +-
+ drivers/net/phy/fixed.c | 4 +-
+ drivers/net/ps3_gelic_net.c | 1215 +++++++-----
+ drivers/net/ps3_gelic_net.h | 415 +++--
+ drivers/net/ps3_gelic_wireless.c | 2753 ++++++++++++++++++++++++++
+ drivers/net/ps3_gelic_wireless.h | 329 +++
+ drivers/net/r6040.c | 233 ++-
+ drivers/net/sis190.c | 3 +-
+ drivers/oprofile/buffer_sync.c | 21 +-
+ drivers/pnp/pnpacpi/core.c | 2 +-
+ drivers/pnp/pnpbios/core.c | 2 -
+ drivers/ps3/ps3-lpm.c | 22 +-
+ drivers/ps3/ps3-sys-manager.c | 44 +-
+ drivers/s390/net/claw.h | 19 +-
+ drivers/s390/net/lcs.c | 2 +-
+ drivers/s390/net/lcs.h | 16 +-
+ drivers/s390/net/netiucv.c | 29 +-
+ drivers/serial/sh-sci.c | 2 +-
+ drivers/serial/sh-sci.h | 9 +-
+ drivers/sh/maple/maple.c | 981 +++++-----
+ drivers/usb/gadget/file_storage.c | 8 +-
+ fs/afs/mntpt.c | 23 +-
+ fs/autofs4/root.c | 5 +-
+ fs/binfmt_flat.c | 8 +-
+ fs/block_dev.c | 6 +-
+ fs/cifs/cifs_dfs_ref.c | 25 +-
+ fs/coda/pioctl.c | 6 +-
+ fs/compat.c | 11 +-
+ fs/compat_ioctl.c | 2 +-
+ fs/configfs/symlink.c | 8 +-
+ fs/dcache.c | 103 +-
+ fs/dcookies.c | 34 +-
+ fs/dquot.c | 9 +-
+ fs/ecryptfs/dentry.c | 12 +-
+ fs/ecryptfs/inode.c | 24 +-
+ fs/ecryptfs/main.c | 6 +-
+ fs/exec.c | 8 +-
+ fs/ext3/super.c | 8 +-
+ fs/ext4/super.c | 8 +-
+ fs/gfs2/ops_fstype.c | 7 +-
+ fs/inotify_user.c | 12 +-
+ fs/namei.c | 311 ++--
+ fs/namespace.c | 268 ++--
+ fs/nfs/callback.c | 18 +-
+ fs/nfs/dir.c | 8 +-
+ fs/nfs/namespace.c | 29 +-
+ fs/nfs/nfs4proc.c | 8 +-
+ fs/nfs/nfs4state.c | 4 +-
+ fs/nfs/super.c | 4 +
+ fs/nfsctl.c | 4 +-
+ fs/nfsd/export.c | 122 +-
+ fs/nfsd/nfs3proc.c | 2 +-
+ fs/nfsd/nfs3xdr.c | 4 +-
+ fs/nfsd/nfs4recover.c | 34 +-
+ fs/nfsd/nfs4state.c | 4 +-
+ fs/nfsd/nfs4xdr.c | 12 +-
+ fs/nfsd/nfsfh.c | 26 +-
+ fs/nfsd/nfsproc.c | 6 +-
+ fs/nfsd/nfsxdr.c | 2 +-
+ fs/nfsd/vfs.c | 13 +-
+ fs/open.c | 61 +-
+ fs/proc/base.c | 61 +-
+ fs/proc/internal.h | 2 +-
+ fs/proc/nommu.c | 2 +-
+ fs/proc/proc_sysctl.c | 2 +-
+ fs/proc/task_mmu.c | 8 +-
+ fs/proc/task_nommu.c | 6 +-
+ fs/reiserfs/super.c | 14 +-
+ fs/seq_file.c | 6 +-
+ fs/stat.c | 19 +-
+ fs/utimes.c | 4 +-
+ fs/xattr.c | 32 +-
+ fs/xfs/linux-2.6/xfs_ioctl.c | 8 +-
+ include/acpi/processor.h | 9 +-
+ include/asm-m68knommu/cacheflush.h | 14 +-
+ include/asm-m68knommu/system.h | 2 +-
+ include/asm-powerpc/systbl.h | 4 +-
+ include/asm-powerpc/unistd.h | 6 +-
+ include/asm-ppc/page.h | 2 +
+ include/asm-sh/bugs.h | 2 +-
+ include/asm-sh/cpu-sh4/freq.h | 4 +-
+ include/asm-sh/cpu-sh5/cacheflush.h | 6 +-
+ include/asm-sh/cpu-sh5/mmu_context.h | 6 -
+ include/asm-sh/hp6xx.h | 28 +-
+ include/asm-sh/io.h | 22 +-
+ include/asm-sh/io_trapped.h | 58 +
+ include/asm-sh/ioctls.h | 4 +
+ include/asm-sh/irq.h | 4 +
+ include/asm-sh/mmu_context_64.h | 3 +
+ include/asm-sh/page.h | 7 +-
+ include/asm-sh/pgtable_64.h | 13 +
+ include/asm-sh/processor.h | 2 +-
+ include/asm-sh/r7780rp.h | 3 -
+ include/asm-sh/rts7751r2d.h | 3 -
+ include/asm-sh/system.h | 5 +
+ include/asm-sh/system_32.h | 3 +
+ include/asm-sh/termbits.h | 5 +-
+ include/asm-sh/termios.h | 6 +-
+ include/asm-sh/tlb.h | 1 +
+ include/asm-sh/uaccess.h | 29 +
+ include/asm-sh/uaccess_32.h | 24 +-
+ include/asm-sh/uaccess_64.h | 19 -
+ include/asm-sh/unistd_32.h | 6 +-
+ include/asm-sh/unistd_64.h | 6 +-
+ include/asm-x86/cacheflush.h | 7 +-
+ include/asm-x86/kdebug.h | 1 -
+ include/linux/acpi.h | 1 +
+ include/linux/audit.h | 5 +-
+ include/linux/configfs.h | 1 +
+ include/linux/cpuidle.h | 2 +
+ include/linux/dcache.h | 5 +-
+ include/linux/dcookies.h | 15 +-
+ include/linux/dm9000.h | 2 +
+ include/linux/fs.h | 6 +-
+ include/linux/fs_struct.h | 10 +-
+ include/linux/hid.h | 2 +-
+ include/linux/ktime.h | 2 +
+ include/linux/maple.h | 100 +-
+ include/linux/module.h | 3 +-
+ include/linux/namei.h | 11 +-
+ include/linux/netdevice.h | 8 +-
+ include/linux/nfsd/export.h | 8 +-
+ include/linux/path.h | 15 +
+ include/linux/proc_fs.h | 2 +-
+ include/linux/seq_file.h | 5 +-
+ include/linux/slub_def.h | 15 +-
+ include/net/ax25.h | 2 +
+ include/net/ndisc.h | 1 -
+ include/net/xfrm.h | 5 +-
+ init/do_mounts.c | 6 +-
+ kernel/audit.c | 12 +-
+ kernel/audit_tree.c | 28 +-
+ kernel/auditfilter.c | 15 +-
+ kernel/auditsc.c | 28 +-
+ kernel/exit.c | 12 +-
+ kernel/fork.c | 18 +-
+ kernel/futex.c | 2 +-
+ kernel/futex_compat.c | 2 +-
+ kernel/hrtimer.c | 48 +-
+ kernel/kmod.c | 5 +-
+ kernel/posix-timers.c | 8 +-
+ mm/memory.c | 9 +-
+ mm/mempolicy.c | 2 +-
+ mm/slab.c | 3 +-
+ mm/slub.c | 94 +-
+ mm/swapfile.c | 2 +-
+ net/ax25/af_ax25.c | 12 +-
+ net/ax25/ax25_dev.c | 2 +-
+ net/ax25/ax25_ds_timer.c | 12 +-
+ net/ax25/ax25_route.c | 28 +-
+ net/ax25/ax25_timer.c | 60 +-
+ net/core/dev.c | 4 +-
+ net/core/neighbour.c | 12 +-
+ net/core/rtnetlink.c | 36 +-
+ net/core/skbuff.c | 3 +-
+ net/ipv4/ah4.c | 2 +-
+ net/ipv4/arp.c | 3 -
+ net/ipv4/esp4.c | 5 +-
+ net/ipv4/fib_trie.c | 99 +-
+ net/ipv4/inet_hashtables.c | 3 -
+ net/ipv4/ip_sockglue.c | 5 -
+ net/ipv6/ah6.c | 2 +-
+ net/ipv6/esp6.c | 5 +-
+ net/ipv6/ip6_output.c | 6 +-
+ net/ipv6/xfrm6_output.c | 2 +-
+ net/key/af_key.c | 1 +
+ net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
+ net/netfilter/xt_SECMARK.c | 2 +-
+ net/netlabel/netlabel_domainhash.c | 6 +-
+ net/netlabel/netlabel_unlabeled.c | 30 +-
+ net/netlabel/netlabel_user.c | 3 +-
+ net/netlink/genetlink.c | 6 +-
+ net/socket.c | 3 +
+ net/sunrpc/rpc_pipe.c | 7 +-
+ net/unix/af_unix.c | 26 +-
+ net/xfrm/Kconfig | 2 +-
+ net/xfrm/xfrm_input.c | 4 +-
+ net/xfrm/xfrm_output.c | 2 +-
+ net/xfrm/xfrm_user.c | 1 +
+ scripts/kernel-doc | 1 -
+ security/selinux/avc.c | 15 +-
+ security/selinux/hooks.c | 32 +-
+ security/selinux/include/avc.h | 6 +-
+ security/smack/smack_lsm.c | 2 +-
+ sound/core/seq/seq_clientmgr.c | 4 +-
+ sound/core/seq/seq_device.c | 3 -
+ sound/core/sound.c | 4 -
+ sound/core/timer.c | 2 -
+ sound/ppc/daca.c | 5 +-
+ sound/ppc/tumbler.c | 5 +-
+ 349 files changed, 11024 insertions(+), 5427 deletions(-)
+ create mode 100644 Documentation/cpuidle/core.txt
+ create mode 100644 Documentation/cpuidle/driver.txt
+ create mode 100644 Documentation/cpuidle/governor.txt
+ create mode 100644 Documentation/cpuidle/sysfs.txt
+ create mode 100644 arch/sh/boards/renesas/migor/Makefile
+ create mode 100644 arch/sh/boards/renesas/migor/setup.c
+ create mode 100644 arch/sh/configs/migor_defconfig
+ delete mode 100644 arch/sh/kernel/cpu/irq/maskreg.c
+ create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+ create mode 100644 arch/sh/kernel/io_trapped.c
+ create mode 100644 drivers/net/ps3_gelic_wireless.c
+ create mode 100644 drivers/net/ps3_gelic_wireless.h
+ create mode 100644 include/asm-sh/io_trapped.h
+ create mode 100644 include/linux/path.h
+Merging quilt/driver-core
+Merge made by recursive.
+ arch/x86/kernel/traps_32.c | 1 +
+ arch/x86/kernel/traps_64.c | 1 +
+ drivers/base/core.c | 1 +
+ drivers/cpufreq/cpufreq.c | 8 -
+ drivers/media/video/Kconfig | 1 +
+ drivers/media/video/Makefile | 2 +
+ drivers/media/video/go7007/Kconfig | 14 +
+ drivers/media/video/go7007/Makefile | 17 +
+ drivers/media/video/go7007/go7007-driver.c | 693 +++++++++++
+ drivers/media/video/go7007/go7007-fw.c | 1643 +++++++++++++++++++++++++++
+ drivers/media/video/go7007/go7007-i2c.c | 309 +++++
+ drivers/media/video/go7007/go7007-priv.h | 279 +++++
+ drivers/media/video/go7007/go7007-usb.c | 1229 ++++++++++++++++++++
+ drivers/media/video/go7007/go7007-v4l2.c | 1516 ++++++++++++++++++++++++
+ drivers/media/video/go7007/go7007.h | 120 ++
+ drivers/media/video/go7007/saa7134-go7007.c | 484 ++++++++
+ drivers/media/video/go7007/snd-go7007.c | 315 +++++
+ drivers/media/video/go7007/wis-i2c.h | 55 +
+ drivers/media/video/go7007/wis-ov7640.c | 146 +++
+ drivers/media/video/go7007/wis-saa7113.c | 378 ++++++
+ drivers/media/video/go7007/wis-saa7115.c | 507 +++++++++
+ drivers/media/video/go7007/wis-sony-tuner.c | 757 ++++++++++++
+ drivers/media/video/go7007/wis-tw2804.c | 383 +++++++
+ drivers/media/video/go7007/wis-tw9903.c | 378 ++++++
+ drivers/media/video/go7007/wis-uda1342.c | 136 +++
+ drivers/net/phy/phy_device.c | 8 +-
+ fs/sysfs/file.c | 13 +
+ fs/sysfs/mount.c | 2 +-
+ fs/sysfs/sysfs.h | 1 +
+ include/linux/init.h | 1 +
+ include/linux/sysfs.h | 5 +
+ init/main.c | 9 +
+ lib/kobject.c | 52 +
+ 33 files changed, 9448 insertions(+), 16 deletions(-)
+ create mode 100644 drivers/media/video/go7007/Kconfig
+ create mode 100644 drivers/media/video/go7007/Makefile
+ create mode 100644 drivers/media/video/go7007/go7007-driver.c
+ create mode 100644 drivers/media/video/go7007/go7007-fw.c
+ create mode 100644 drivers/media/video/go7007/go7007-i2c.c
+ create mode 100644 drivers/media/video/go7007/go7007-priv.h
+ create mode 100644 drivers/media/video/go7007/go7007-usb.c
+ create mode 100644 drivers/media/video/go7007/go7007-v4l2.c
+ create mode 100644 drivers/media/video/go7007/go7007.h
+ create mode 100644 drivers/media/video/go7007/saa7134-go7007.c
+ create mode 100644 drivers/media/video/go7007/snd-go7007.c
+ create mode 100644 drivers/media/video/go7007/wis-i2c.h
+ create mode 100644 drivers/media/video/go7007/wis-ov7640.c
+ create mode 100644 drivers/media/video/go7007/wis-saa7113.c
+ create mode 100644 drivers/media/video/go7007/wis-saa7115.c
+ create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c
+ create mode 100644 drivers/media/video/go7007/wis-tw2804.c
+ create mode 100644 drivers/media/video/go7007/wis-tw9903.c
+ create mode 100644 drivers/media/video/go7007/wis-uda1342.c
+Merging quilt/pci
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 4 -
+ arch/frv/mb93090-mb00/pci-frv.h | 2 -
+ arch/frv/mb93090-mb00/pci-vdk.c | 53 -----
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 2 -
+ arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +-
+ arch/sh/drivers/pci/pci-sh4.h | 2 -
+ arch/x86/kernel/pci-calgary_64.c | 3 +-
+ arch/x86/pci/common.c | 61 ------
+ arch/x86/pci/pcbios.c | 72 -------
+ arch/x86/pci/pci.h | 3 -
+ drivers/ide/ide-scan-pci.c | 9 +-
+ drivers/ide/ide.c | 12 -
+ drivers/pci/bus.c | 15 +-
+ drivers/pci/hotplug/Kconfig | 4 +-
+ drivers/pci/hotplug/cpcihp_generic.c | 8 +-
+ drivers/pci/probe.c | 56 ++----
+ drivers/pci/remove.c | 10 +-
+ drivers/pci/search.c | 313 +++++++++++-----------------
+ include/asm-sh/mpc1211/pci.h | 2 -
+ include/linux/ide.h | 1 -
+ include/linux/pci.h | 20 +--
+ 21 files changed, 159 insertions(+), 500 deletions(-)
+Merging quilt/usb
+Merge made by recursive.
+ drivers/usb/image/Kconfig | 9 +
+ drivers/usb/image/Makefile | 1 +
+ drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/image/s2255drv.c | 2727 +++
+ drivers/usb/image/s2255drv.h | 245 +
+ drivers/usb/misc/Kconfig | 9 +
+ drivers/usb/misc/Makefile | 1 +
+ drivers/usb/misc/gotemp.c | 295 +
+ drivers/usb/serial/Kconfig | 10 +
+ drivers/usb/serial/Makefile | 3 +-
+ drivers/usb/serial/ftdi_sio.c | 4 +-
+ drivers/usb/serial/option.c | 33 +-
+ drivers/usb/serial/spcp8x5.c | 1079 ++
+ 13 files changed, 44744 insertions(+), 6 deletions(-)
+ create mode 100644 drivers/usb/image/f2255usb.h
+ create mode 100644 drivers/usb/image/s2255drv.c
+ create mode 100644 drivers/usb/image/s2255drv.h
+ create mode 100644 drivers/usb/misc/gotemp.c
+ create mode 100644 drivers/usb/serial/spcp8x5.c
+Applying s2255drv-Include-linux-vmalloc.h-for-vmalloc-vfree.patch
+Merging quilt/device-mapper
+Merge made by recursive.
+Merging hid/mm
+Merge made by recursive.
+ drivers/hid/usbhid/hid-core.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging quilt/i2c
+Removed drivers/i2c/algos/i2c-algo-pca.h
+Merge made by recursive.
+ drivers/i2c/algos/Kconfig | 39 ++----------
+ drivers/i2c/algos/i2c-algo-pca.c | 125 +++++++++++++++++++-------------------
+ drivers/i2c/algos/i2c-algo-pca.h | 26 --------
+ drivers/i2c/busses/i2c-pca-isa.c | 53 ++++++----------
+ drivers/i2c/busses/i2c-pxa.c | 27 +++++----
+ include/linux/i2c-algo-pca.h | 37 ++++++++++--
+ 6 files changed, 134 insertions(+), 173 deletions(-)
+ delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h
+Merging quilt/kernel-doc
+Merge made by recursive.
+ Documentation/DocBook/kernel-api.tmpl | 2 ++
+ arch/x86/kernel/cpu/mtrr/main.c | 1 +
+ block/blk-core.c | 2 ++
+ block/blk-settings.c | 1 -
+ drivers/base/driver.c | 3 +++
+ drivers/base/power/main.c | 1 +
+ include/linux/skbuff.h | 2 ++
+ include/net/sock.h | 1 +
+ kernel/audit.c | 4 ++--
+ 9 files changed, 14 insertions(+), 3 deletions(-)
+Merging avr32/avr32-arch
+Merge made by recursive.
+ arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
+ arch/avr32/kernel/process.c | 3 +
+ arch/avr32/kernel/semaphore.c | 124 +++++++++++++++---------------
+ arch/avr32/kernel/time.c | 45 ++---------
+ arch/avr32/mach-at32ap/at32ap700x.c | 7 ++-
+ arch/avr32/mm/fault.c | 2 +
+ drivers/char/keyboard.c | 3 +-
+ include/asm-avr32/arch-at32ap/board.h | 5 +-
+ include/asm-avr32/page.h | 8 +-
+ include/asm-avr32/pgtable.h | 1 +
+ include/asm-avr32/processor.h | 2 +-
+ 11 files changed, 93 insertions(+), 109 deletions(-)
+Merging v4l-dvb/stable
+Auto-merged drivers/media/video/Kconfig
+Auto-merged drivers/media/video/Makefile
+Merge made by recursive.
+ Documentation/video4linux/CARDLIST.em28xx | 2 +-
+ Documentation/video4linux/CARDLIST.saa7134 | 6 +-
+ Documentation/video4linux/zr364xx.txt | 4 +-
+ arch/arm/mach-pxa/devices.c | 32 +
+ arch/arm/mach-pxa/pcm990-baseboard.c | 86 ++
+ drivers/media/Kconfig | 25 +-
+ drivers/media/common/Kconfig | 2 +-
+ drivers/media/common/ir-functions.c | 2 +-
+ drivers/media/common/ir-keymaps.c | 46 +
+ drivers/media/common/saa7146_vbi.c | 1 -
+ drivers/media/common/saa7146_video.c | 2 -
+ drivers/media/dvb/b2c2/flexcop-pci.c | 2 +-
+ drivers/media/dvb/bt8xx/bt878.c | 23 +-
+ drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
+ drivers/media/dvb/dvb-core/dvbdev.c | 2 +-
+ drivers/media/dvb/dvb-usb/ttusb2.c | 1 +
+ drivers/media/dvb/frontends/cx22702.c | 2 +-
+ drivers/media/dvb/frontends/dvb-pll.c | 2 +-
+ drivers/media/dvb/frontends/lgdt330x.c | 2 +-
+ drivers/media/dvb/frontends/nxt6000.c | 2 +-
+ drivers/media/dvb/frontends/s5h1409.c | 2 +-
+ drivers/media/dvb/frontends/s5h1420.c | 2 +-
+ drivers/media/dvb/frontends/sp8870.c | 12 +-
+ drivers/media/dvb/frontends/tda10086.c | 30 +-
+ drivers/media/dvb/frontends/tda10086.h | 3 +
+ drivers/media/dvb/frontends/tda18271-common.c | 21 +-
+ drivers/media/dvb/frontends/tda18271-fe.c | 66 +-
+ drivers/media/dvb/frontends/tda18271-priv.h | 7 +-
+ drivers/media/dvb/frontends/tda826x.c | 2 +-
+ drivers/media/dvb/frontends/tda827x.c | 2 +-
+ drivers/media/dvb/frontends/ves1x93.c | 2 +-
+ drivers/media/dvb/frontends/xc5000.c | 2 +-
+ drivers/media/dvb/frontends/xc5000.h | 3 +-
+ drivers/media/dvb/frontends/zl10353.c | 2 +-
+ drivers/media/dvb/ttpci/av7110_av.c | 15 +-
+ drivers/media/dvb/ttpci/budget-av.c | 8 +
+ drivers/media/dvb/ttpci/budget-ci.c | 2 +-
+ drivers/media/dvb/ttpci/budget.c | 1 +
+ drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +-
+ drivers/media/radio/Kconfig | 4 +-
+ drivers/media/radio/miropcm20-rds.c | 2 +-
+ drivers/media/radio/radio-cadet.c | 10 +-
+ drivers/media/radio/radio-sf16fmi.c | 1 +
+ drivers/media/radio/radio-sf16fmr2.c | 5 +-
+ drivers/media/radio/radio-si470x.c | 597 ++++++++-----
+ drivers/media/radio/radio-typhoon.c | 2 +-
+ drivers/media/video/Kconfig | 49 +-
+ drivers/media/video/Makefile | 13 +-
+ drivers/media/video/adv7170.c | 2 +-
+ drivers/media/video/adv7175.c | 2 +-
+ drivers/media/video/arv.c | 4 +-
+ drivers/media/video/bt819.c | 2 +-
+ drivers/media/video/bt856.c | 2 +-
+ drivers/media/video/bt8xx/bttv-driver.c | 51 +-
+ drivers/media/video/bt8xx/bttv-vbi.c | 6 +-
+ drivers/media/video/bw-qcam.c | 4 +-
+ drivers/media/video/c-qcam.c | 4 +-
+ drivers/media/video/cafe_ccic.c | 4 +-
+ drivers/media/video/cpia2/cpia2_core.c | 4 +-
+ drivers/media/video/cpia2/cpia2_usb.c | 2 +-
+ drivers/media/video/cx23885/cx23885-i2c.c | 2 +-
+ drivers/media/video/cx88/cx88-blackbird.c | 2 +-
+ drivers/media/video/cx88/cx88-core.c | 6 +-
+ drivers/media/video/cx88/cx88-dvb.c | 2 +-
+ drivers/media/video/cx88/cx88-i2c.c | 4 +-
+ drivers/media/video/cx88/cx88-input.c | 2 +-
+ drivers/media/video/cx88/cx88-mpeg.c | 18 +-
+ drivers/media/video/cx88/cx88-tvaudio.c | 6 +-
+ drivers/media/video/cx88/cx88-vbi.c | 2 +-
+ drivers/media/video/cx88/cx88-video.c | 4 +-
+ drivers/media/video/cx88/cx88.h | 1 +
+ drivers/media/video/dpc7146.c | 4 +-
+ drivers/media/video/em28xx/em28xx-audio.c | 6 +-
+ drivers/media/video/em28xx/em28xx-cards.c | 8 +-
+ drivers/media/video/em28xx/em28xx-core.c | 117 ++-
+ drivers/media/video/em28xx/em28xx-i2c.c | 4 +-
+ drivers/media/video/em28xx/em28xx-video.c | 81 ++-
+ drivers/media/video/em28xx/em28xx.h | 5 +-
+ drivers/media/video/et61x251/et61x251_core.c | 2 +-
+ drivers/media/video/hexium_gemini.c | 4 +-
+ drivers/media/video/hexium_orion.c | 4 +-
+ drivers/media/video/ir-kbd-i2c.c | 2 +-
+ drivers/media/video/ivtv/ivtv-driver.c | 6 +-
+ drivers/media/video/ivtv/ivtv-yuv.c | 6 +-
+ drivers/media/video/meye.c | 12 +-
+ drivers/media/video/mt20xx.c | 7 +-
+ drivers/media/video/mt9m001.c | 694 +++++++++++++++
+ drivers/media/video/mt9v022.c | 804 +++++++++++++++++
+ drivers/media/video/mxb.c | 4 +-
+ drivers/media/video/pms.c | 4 +-
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +-
+ drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +-
+ drivers/media/video/pwc/pwc-if.c | 8 +-
+ drivers/media/video/pxa_camera.c | 937 ++++++++++++++++++++
+ drivers/media/video/saa6588.c | 8 +-
+ drivers/media/video/saa7110.c | 2 +-
+ drivers/media/video/saa7111.c | 2 +-
+ drivers/media/video/saa7114.c | 2 +-
+ drivers/media/video/saa7115.c | 2 +-
+ drivers/media/video/saa711x.c | 2 +-
+ drivers/media/video/saa7134/saa7134-alsa.c | 2 +-
+ drivers/media/video/saa7134/saa7134-cards.c | 123 +++-
+ drivers/media/video/saa7134/saa7134-core.c | 10 +-
+ drivers/media/video/saa7134/saa7134-dvb.c | 34 +-
+ drivers/media/video/saa7134/saa7134-empress.c | 8 +-
+ drivers/media/video/saa7134/saa7134-i2c.c | 4 +-
+ drivers/media/video/saa7134/saa7134-input.c | 12 +-
+ drivers/media/video/saa7134/saa7134-ts.c | 2 +-
+ drivers/media/video/saa7134/saa7134-tvaudio.c | 6 +-
+ drivers/media/video/saa7134/saa7134-vbi.c | 2 +-
+ drivers/media/video/saa7134/saa7134-video.c | 22 +-
+ drivers/media/video/saa7134/saa7134.h | 2 +
+ drivers/media/video/saa7185.c | 2 +-
+ drivers/media/video/se401.c | 2 +-
+ drivers/media/video/sn9c102/sn9c102_core.c | 2 +-
+ drivers/media/video/soc_camera.c | 973 +++++++++++++++++++++
+ drivers/media/video/stk-sensor.c | 23 +-
+ drivers/media/video/stk-webcam.c | 104 ++-
+ drivers/media/video/stk-webcam.h | 3 +-
+ drivers/media/video/stradis.c | 4 +-
+ drivers/media/video/stv680.c | 9 +-
+ drivers/media/video/tcm825x.c | 2 +-
+ drivers/media/video/tda8290.c | 3 +-
+ drivers/media/video/tda9840.c | 2 +-
+ drivers/media/video/tda9887.c | 3 +-
+ drivers/media/video/tea5761.c | 7 +-
+ drivers/media/video/tea5767.c | 34 +-
+ drivers/media/video/tea6415c.c | 2 +-
+ drivers/media/video/tea6420.c | 2 +-
+ drivers/media/video/tuner-core.c | 46 +-
+ drivers/media/video/tuner-i2c.h | 118 +++-
+ drivers/media/video/tuner-simple.c | 506 +++++++-----
+ drivers/media/video/tuner-simple.h | 11 +-
+ drivers/media/video/tuner-types.c | 6 +
+ drivers/media/video/tuner-xc2028.c | 13 +-
+ drivers/media/video/tvaudio.c | 18 +-
+ drivers/media/video/tveeprom.c | 2 +-
+ drivers/media/video/tvp5150.c | 2 +-
+ drivers/media/video/usbvideo/ibmcam.c | 2 +-
+ drivers/media/video/usbvideo/konicawc.c | 2 +-
+ drivers/media/video/usbvideo/quickcam_messenger.c | 2 +-
+ drivers/media/video/usbvideo/ultracam.c | 4 +-
+ drivers/media/video/usbvideo/usbvideo.c | 2 +-
+ drivers/media/video/usbvision/usbvision-core.c | 14 +-
+ drivers/media/video/usbvision/usbvision-i2c.c | 2 +-
+ drivers/media/video/usbvision/usbvision-video.c | 4 +-
+ drivers/media/video/v4l1-compat.c | 2 +-
+ drivers/media/video/v4l2-common.c | 393 +--------
+ drivers/media/video/videobuf-core.c | 78 +-
+ drivers/media/video/videobuf-dma-sg.c | 6 +-
+ drivers/media/video/videobuf-dvb.c | 2 +-
+ drivers/media/video/videobuf-vmalloc.c | 22 +-
+ drivers/media/video/videocodec.c | 4 +-
+ drivers/media/video/videodev.c | 444 ++++++++--
+ drivers/media/video/vino.c | 10 +-
+ drivers/media/video/vpx3220.c | 2 +-
+ drivers/media/video/w9966.c | 4 +-
+ drivers/media/video/w9968cf.c | 2 +-
+ drivers/media/video/zc0301/zc0301_core.c | 2 +-
+ drivers/media/video/zoran_card.c | 6 +-
+ drivers/media/video/zoran_device.c | 5 +-
+ drivers/media/video/zoran_driver.c | 2 +-
+ drivers/media/video/zr36016.c | 5 +-
+ drivers/media/video/zr36050.c | 5 +-
+ drivers/media/video/zr36060.c | 6 +-
+ drivers/media/video/zr364xx.c | 6 +-
+ include/asm-arm/arch-pxa/camera.h | 48 +
+ include/asm-arm/arch-pxa/pxa-regs.h | 166 +++-
+ include/linux/meye.h | 2 +-
+ include/linux/videodev.h | 1 +
+ include/linux/videodev2.h | 53 +-
+ include/media/ir-common.h | 1 +
+ include/media/soc_camera.h | 147 ++++
+ include/media/v4l2-chip-ident.h | 6 +
+ include/media/v4l2-common.h | 2 -
+ include/media/v4l2-dev.h | 2 +
+ include/media/videobuf-core.h | 2 +-
+ include/media/videobuf-vmalloc.h | 2 +-
+ 178 files changed, 6115 insertions(+), 1477 deletions(-)
+ create mode 100644 drivers/media/video/mt9m001.c
+ create mode 100644 drivers/media/video/mt9v022.c
+ create mode 100644 drivers/media/video/pxa_camera.c
+ create mode 100644 drivers/media/video/soc_camera.c
+ create mode 100644 include/asm-arm/arch-pxa/camera.h
+ create mode 100644 include/media/soc_camera.h
+Applying v4l-dvb-fix-1.patch
+Merging s390/features
+Merge made by recursive.
+ arch/s390/Kconfig | 3 +-
+ arch/s390/kernel/process.c | 15 ++++++----
+ arch/s390/kernel/smp.c | 53 +++++++++++++++++++++++++----------
+ arch/s390/kernel/time.c | 2 -
+ drivers/s390/block/dasd.c | 12 ++++----
+ drivers/s390/block/dasd_3990_erp.c | 36 ++++++++++++++++++++++++
+ drivers/s390/block/dasd_int.h | 5 +++
+ drivers/s390/char/sclp.c | 12 ++++----
+ drivers/s390/char/sclp.h | 6 +++-
+ drivers/s390/char/sclp_config.c | 2 +-
+ drivers/s390/char/sclp_cpi_sys.c | 2 +-
+ drivers/s390/char/sclp_rw.c | 4 +-
+ drivers/s390/char/sclp_vt220.c | 2 +-
+ drivers/s390/cio/device.c | 15 +++++++++-
+ drivers/s390/cio/qdio.c | 10 +-----
+ drivers/s390/cio/qdio.h | 2 +-
+ include/asm-s390/bitops.h | 20 ++++++++-----
+ 17 files changed, 139 insertions(+), 62 deletions(-)
+Merging sh/master
+Merge made by recursive.
+ arch/sh/Kconfig | 1 +
+ arch/sh/kernel/cpu/sh3/probe.c | 4 ++--
+ include/asm-sh/cpu-sh3/cache.h | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+Merging jfs/next
+Merge made by recursive.
+ fs/jfs/jfs_dmap.c | 11 +++++------
+ fs/jfs/jfs_imap.c | 15 ++++++---------
+ fs/jfs/jfs_xtree.c | 26 ++++++++------------------
+ 3 files changed, 19 insertions(+), 33 deletions(-)
+Merging kbuild/master
+Auto-merged Makefile
+Merge made by recursive.
+ Makefile | 11 +++++++----
+ lib/Kconfig.debug | 3 +++
+ scripts/kconfig/symbol.c | 34 +++++++++++++++++++++-------------
+ 3 files changed, 31 insertions(+), 17 deletions(-)
+Merging quilt/pata
+Auto-merged MAINTAINERS
+Auto-merged drivers/ata/libata-core.c
+Auto-merged drivers/ide/ide.c
+Auto-merged drivers/macintosh/mediabay.c
+Auto-merged include/linux/ide.h
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 14 +-
+ Documentation/ide.txt | 36 +--
+ Documentation/ide/warm-plug-howto.txt | 13 +
+ MAINTAINERS | 2 +-
+ arch/powerpc/kernel/setup_32.c | 8 -
+ arch/powerpc/platforms/powermac/pci.c | 22 --
+ arch/powerpc/platforms/powermac/pmac.h | 5 -
+ arch/powerpc/platforms/powermac/setup.c | 8 -
+ arch/ppc/configs/sandpoint_defconfig | 2 +-
+ arch/ppc/kernel/ppc_ksyms.c | 5 -
+ arch/ppc/kernel/setup.c | 2 -
+ arch/ppc/platforms/4xx/bamboo.c | 1 -
+ arch/ppc/platforms/4xx/ebony.c | 1 -
+ arch/ppc/platforms/4xx/luan.c | 1 -
+ arch/ppc/platforms/4xx/ocotea.c | 1 -
+ arch/ppc/platforms/4xx/taishan.c | 1 -
+ arch/ppc/platforms/4xx/yucca.c | 1 -
+ arch/ppc/platforms/chestnut.c | 1 -
+ arch/ppc/platforms/cpci690.c | 1 -
+ arch/ppc/platforms/ev64260.c | 1 -
+ arch/ppc/platforms/hdpu.c | 36 --
+ arch/ppc/platforms/lopec.c | 85 -----
+ arch/ppc/platforms/mvme5100.c | 1 -
+ arch/ppc/platforms/powerpmc250.c | 1 -
+ arch/ppc/platforms/pplus.c | 58 ---
+ arch/ppc/platforms/prep_setup.c | 38 --
+ arch/ppc/platforms/prpmc750.c | 1 -
+ arch/ppc/platforms/prpmc800.c | 1 -
+ arch/ppc/platforms/radstone_ppc7d.c | 1 -
+ arch/ppc/platforms/residual.c | 1 -
+ arch/ppc/platforms/sandpoint.c | 94 -----
+ arch/ppc/platforms/sandpoint.h | 3 -
+ arch/ppc/platforms/spruce.c | 1 -
+ arch/ppc/syslib/m8xx_setup.c | 6 -
+ arch/ppc/syslib/ppc4xx_setup.c | 23 --
+ block/compat_ioctl.c | 1 -
+ drivers/ata/libata-core.c | 1 +
+ drivers/ide/Kconfig | 35 +--
+ drivers/ide/Makefile | 2 +-
+ drivers/ide/arm/bast-ide.c | 6 +-
+ drivers/ide/arm/icside.c | 2 +-
+ drivers/ide/arm/ide_arm.c | 2 +-
+ drivers/ide/arm/palm_bk3710.c | 30 +-
+ drivers/ide/arm/rapide.c | 4 +-
+ drivers/ide/cris/ide-cris.c | 20 +-
+ drivers/ide/h8300/ide-h8300.c | 3 +-
+ drivers/ide/ide-acpi.c | 2 +
+ drivers/ide/ide-cd.c | 10 +-
+ drivers/ide/ide-disk.c | 1 +
+ drivers/ide/ide-floppy.c | 346 +++++++-----------
+ drivers/ide/ide-generic.c | 97 +++++-
+ drivers/ide/ide-io.c | 38 ++-
+ drivers/ide/ide-iops.c | 86 +++--
+ drivers/ide/ide-pnp.c | 4 +-
+ drivers/ide/ide-probe.c | 127 ++++++--
+ drivers/ide/ide-proc.c | 3 -
+ drivers/ide/ide-tape.c | 541 +++++++++++++---------------
+ drivers/ide/ide-taskfile.c | 29 +-
+ drivers/ide/ide.c | 393 +++++----------------
+ drivers/ide/legacy/Makefile | 1 +
+ drivers/ide/legacy/ali14xx.c | 12 +
+ drivers/ide/legacy/buddha.c | 2 +-
+ drivers/ide/legacy/dtc2278.c | 12 +
+ drivers/ide/legacy/falconide.c | 6 +-
+ drivers/ide/legacy/gayle.c | 2 +-
+ drivers/ide/legacy/ht6560b.c | 28 ++-
+ drivers/ide/legacy/ide-4drives.c | 50 +++
+ drivers/ide/legacy/ide-cs.c | 8 +-
+ drivers/ide/legacy/ide_platform.c | 4 +-
+ drivers/ide/legacy/macide.c | 4 +-
+ drivers/ide/legacy/q40ide.c | 2 +-
+ drivers/ide/legacy/qd65xx.c | 44 ++-
+ drivers/ide/legacy/umc8672.c | 16 +-
+ drivers/ide/mips/au1xxx-ide.c | 13 +-
+ drivers/ide/mips/swarm.c | 9 +-
+ drivers/ide/pci/aec62xx.c | 3 +-
+ drivers/ide/pci/alim15x3.c | 1 -
+ drivers/ide/pci/amd74xx.c | 3 +-
+ drivers/ide/pci/atiixp.c | 5 +-
+ drivers/ide/pci/cmd640.c | 122 ++++----
+ drivers/ide/pci/cmd64x.c | 9 +-
+ drivers/ide/pci/cs5520.c | 3 +-
+ drivers/ide/pci/cs5530.c | 3 +-
+ drivers/ide/pci/cs5535.c | 2 +-
+ drivers/ide/pci/cy82c693.c | 3 +-
+ drivers/ide/pci/delkin_cb.c | 8 +-
+ drivers/ide/pci/generic.c | 6 +-
+ drivers/ide/pci/hpt34x.c | 2 +-
+ drivers/ide/pci/hpt366.c | 4 +-
+ drivers/ide/pci/it8213.c | 3 +-
+ drivers/ide/pci/it821x.c | 1 -
+ drivers/ide/pci/jmicron.c | 1 -
+ drivers/ide/pci/ns87415.c | 3 +-
+ drivers/ide/pci/opti621.c | 6 +-
+ drivers/ide/pci/piix.c | 4 +-
+ drivers/ide/pci/rz1000.c | 2 +-
+ drivers/ide/pci/sc1200.c | 3 +-
+ drivers/ide/pci/scc_pata.c | 17 +-
+ drivers/ide/pci/serverworks.c | 5 +-
+ drivers/ide/pci/sgiioc4.c | 31 +-
+ drivers/ide/pci/siimage.c | 1 -
+ drivers/ide/pci/sis5513.c | 3 +-
+ drivers/ide/pci/sl82c105.c | 7 +-
+ drivers/ide/pci/slc90e66.c | 2 +-
+ drivers/ide/pci/triflex.c | 1 -
+ drivers/ide/pci/trm290.c | 1 -
+ drivers/ide/pci/via82cxxx.c | 4 +-
+ drivers/ide/ppc/mpc8xx.c | 86 ++----
+ drivers/ide/ppc/pmac.c | 193 ++++-------
+ drivers/ide/setup-pci.c | 62 +---
+ drivers/macintosh/mediabay.c | 17 +-
+ drivers/scsi/ide-scsi.c | 203 +++++------
+ include/asm-alpha/ide.h | 11 -
+ include/asm-arm/ide.h | 8 -
+ include/asm-blackfin/ide.h | 4 -
+ include/asm-ia64/ide.h | 10 -
+ include/asm-m32r/ide.h | 10 -
+ include/asm-mips/mach-generic/ide.h | 10 -
+ include/asm-parisc/ide.h | 2 -
+ include/asm-powerpc/ide.h | 57 ++--
+ include/asm-powerpc/mediabay.h | 6 +-
+ include/asm-sh/ide.h | 3 -
+ include/asm-sparc/ide.h | 2 -
+ include/asm-sparc64/ide.h | 2 -
+ include/asm-x86/ide.h | 10 -
+ include/linux/Kbuild | 2 +-
+ include/linux/hdreg.h | 4 +-
+ include/linux/hdsmart.h | 4 +-
+ include/linux/ide.h | 181 ++++++----
+ include/linux/pci_ids.h | 1 +
+ 130 files changed, 1495 insertions(+), 2134 deletions(-)
+ create mode 100644 Documentation/ide/warm-plug-howto.txt
+ create mode 100644 drivers/ide/legacy/ide-4drives.c
+Applying pata-fix-1.patch.patch
+Merging libata/NEXT
+Already up-to-date.
+Merging nfs/linux-next
+Merge made by recursive.
+ fs/nfs/write.c | 34 +++++++++++++++++++---------------
+ include/linux/sunrpc/clnt.h | 9 +++++----
+ net/sunrpc/clnt.c | 4 ++--
+ 3 files changed, 26 insertions(+), 21 deletions(-)
+Merging xfs/master
+Removed fs/xfs/Kbuild
+Auto-merged fs/xfs/Makefile-linux-2.6
+CONFLICT (content): Merge conflict in fs/xfs/Makefile-linux-2.6
+Auto-merged fs/xfs/linux-2.6/xfs_buf.c
+Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c
+Auto-merged fs/xfs/linux-2.6/xfs_lrw.c
+Auto-merged fs/xfs/quota/xfs_qm.c
+Auto-merged fs/xfs/xfs_alloc.c
+Auto-merged fs/xfs/xfs_attr_leaf.c
+Auto-merged fs/xfs/xfs_bmap_btree.c
+Auto-merged fs/xfs/xfs_da_btree.c
+Auto-merged fs/xfs/xfs_fsops.c
+Auto-merged fs/xfs/xfs_log.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_log.c
+Auto-merged fs/xfs/xfs_trans.c
+Automatic merge failed; fix conflicts and then commit the result.
+Fixed up merge conflicts as advised
+Merging infiniband/for-next
+Already up-to-date.
+Merging acpi/test
+Auto-merged drivers/base/power/main.c
+Merge made by recursive.
+ Documentation/laptops/thinkpad-acpi.txt | 63 ++++---
+ arch/powerpc/Kconfig | 2 +
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/boot.h | 5 +
+ arch/x86/boot/video-bios.c | 6 +
+ arch/x86/boot/video-mode.c | 173 +++++++++++++++
+ arch/x86/boot/video-vesa.c | 8 +
+ arch/x86/boot/video-vga.c | 12 +-
+ arch/x86/boot/video.c | 157 +--------------
+ arch/x86/kernel/acpi/Makefile | 8 +-
+ arch/x86/kernel/acpi/realmode/Makefile | 58 +++++
+ arch/x86/kernel/acpi/realmode/copy.S | 1 +
+ arch/x86/kernel/acpi/realmode/video-bios.c | 1 +
+ arch/x86/kernel/acpi/realmode/video-mode.c | 1 +
+ arch/x86/kernel/acpi/realmode/video-vesa.c | 1 +
+ arch/x86/kernel/acpi/realmode/video-vga.c | 1 +
+ arch/x86/kernel/acpi/realmode/wakemain.c | 81 +++++++
+ arch/x86/kernel/acpi/realmode/wakeup.S | 115 ++++++++++
+ arch/x86/kernel/acpi/realmode/wakeup.h | 36 ++++
+ arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 ++++++
+ arch/x86/kernel/acpi/sleep.c | 72 ++++++-
+ arch/x86/kernel/acpi/sleep.h | 17 ++
+ arch/x86/kernel/acpi/wakeup_32.S | 247 ++--------------------
+ arch/x86/kernel/acpi/wakeup_64.S | 313 +---------------------------
+ arch/x86/kernel/acpi/wakeup_rm.S | 10 +
+ arch/x86/kernel/head_64.S | 4 -
+ arch/x86/kernel/setup_32.c | 4 +-
+ arch/x86/kernel/smpboot_64.c | 5 +-
+ arch/x86/mm/pageattr.c | 19 ++-
+ drivers/acpi/ec.c | 6 +-
+ drivers/acpi/fan.c | 30 ++-
+ drivers/acpi/processor_core.c | 39 ++--
+ drivers/acpi/utils.c | 18 +-
+ drivers/acpi/video.c | 3 +
+ drivers/base/power/main.c | 2 +-
+ drivers/misc/Kconfig | 17 ++
+ drivers/misc/acer-wmi.c | 9 +
+ drivers/misc/intel_menlow.c | 11 +-
+ drivers/misc/thinkpad_acpi.c | 123 +++++++++--
+ drivers/pci/pci-acpi.c | 3 +-
+ drivers/thermal/thermal.c | 39 +++--
+ include/linux/mm.h | 6 +
+ kernel/power/snapshot.c | 42 +++--
+ 43 files changed, 1005 insertions(+), 826 deletions(-)
+ create mode 100644 arch/x86/boot/video-mode.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/Makefile
+ create mode 100644 arch/x86/kernel/acpi/realmode/copy.S
+ create mode 100644 arch/x86/kernel/acpi/realmode/video-bios.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/video-mode.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/video-vesa.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/video-vga.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/wakemain.c
+ create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.S
+ create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.h
+ create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.lds.S
+ create mode 100644 arch/x86/kernel/acpi/sleep.h
+ create mode 100644 arch/x86/kernel/acpi/wakeup_rm.S
+Applying acpi-fix-1.patch.patch
+Merging blackfin/for-linus
+Already up-to-date.
+Merging nfsd/nfsd-next
+Merge made by recursive.
+ fs/Kconfig | 94 +++++++++++++++-------------
+ fs/lockd/host.c | 9 +--
+ fs/lockd/svc.c | 132 +++++++++++++++++----------------------
+ fs/lockd/svclock.c | 3 +-
+ fs/nfs/symlink.c | 1 -
+ fs/nfsd/export.c | 9 ++-
+ fs/nfsd/nfs4state.c | 57 ++++++++++-------
+ fs/nfsd/nfs4xdr.c | 13 +++-
+ fs/nfsd/nfsctl.c | 15 ++++-
+ fs/nfsd/nfssvc.c | 2 -
+ fs/nfsd/vfs.c | 2 +-
+ include/linux/nfs3.h | 2 +-
+ include/linux/sunrpc/cache.h | 1 -
+ include/linux/sunrpc/svcauth.h | 5 +-
+ include/net/ipv6.h | 9 +++
+ net/sunrpc/cache.c | 1 -
+ net/sunrpc/svc_xprt.c | 30 ++++++++-
+ net/sunrpc/svcauth_unix.c | 118 ++++++++++++++++++++++++------------
+ net/sunrpc/svcsock.c | 1 +
+ 19 files changed, 297 insertions(+), 207 deletions(-)
+Merging firewire/for-next
+Merge made by recursive.
+ drivers/firewire/fw-cdev.c | 8 +-
+ drivers/firewire/fw-device.c | 48 ++++++---
+ drivers/firewire/fw-device.h | 2 +-
+ drivers/firewire/fw-sbp2.c | 239 ++++++++++++++++++++++++++++--------------
+ drivers/ieee1394/csr.c | 6 +-
+ drivers/ieee1394/sbp2.c | 19 +++-
+ drivers/ieee1394/sbp2.h | 2 +
+ 7 files changed, 213 insertions(+), 111 deletions(-)
+Merging hwmon/testing
+Auto-merged MAINTAINERS
+Merge made by recursive.
+ Documentation/hwmon/coretemp | 3 +-
+ MAINTAINERS | 2 +-
+ drivers/hwmon/adm1026.c | 2 +
+ drivers/hwmon/applesmc.c | 29 ++++++++++++++++--------
+ drivers/hwmon/coretemp.c | 38 +++++++++++++++++++++++++++-----
+ drivers/hwmon/dme1737.c | 5 ++++
+ drivers/hwmon/f71805f.c | 5 ++++
+ drivers/hwmon/f71882fg.c | 5 ++++
+ drivers/hwmon/it87.c | 5 ++++
+ drivers/hwmon/lm92.c | 16 ++++++++++++-
+ drivers/hwmon/max1619.c | 17 ++++++++++++++
+ drivers/hwmon/pc87360.c | 6 +++++
+ drivers/hwmon/pc87427.c | 5 ++++
+ drivers/hwmon/sis5595.c | 5 ++++
+ drivers/hwmon/smsc47b397.c | 5 ++++
+ drivers/hwmon/smsc47m1.c | 30 +++++++++++++++++++++++--
+ drivers/hwmon/thmc50.c | 6 ++--
+ drivers/hwmon/via686a.c | 33 ++++++++++++++++++++++++++++
+ drivers/hwmon/vt1211.c | 5 ++++
+ drivers/hwmon/vt8231.c | 49 ++++++++++++++++++++++++++++++++++++++---
+ drivers/hwmon/w83627ehf.c | 6 +++++
+ drivers/hwmon/w83627hf.c | 5 ++++
+ 22 files changed, 253 insertions(+), 29 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..e7441269d0e9
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,138 @@
+../quilt/pci/series: v2.6.25-rc2
+Deleted branch quilt/pci.
+Switched to a new branch "quilt/pci"
+pci-remove-pci_find_present.patch
+pci-remove-pci_get_device_reverse-from-calgary-driver.patch
+ide-remove-ide-reverse-ide-core.patch
+pci-remove-pci_get_device_reverse.patch
+pci-clean-up-search.c-a-lot.patch
+pci-hotplug-make-cpcihp-driver-use-modern-apis.patch
+pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch
+pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch
+pci-make-no_pci_devices-use-the-pci_bus_type-list.patch
+pci-add-is_added-flag-to-struct-pci_dev.patch
+pci-remove-pcibios_fixup_ghosts.patch
+pci-remove-global-list-of-pci-devices.patch
+../quilt/usb/series: v2.6.25-rc2
+Deleted branch quilt/usb.
+Switched to a new branch "quilt/usb"
+usb-ftdi_sio.c-add-missing.patch
+usb-sane-memory-allocation-in-option-driver.patch
+usb-add-usb-serial-spcp8x5-driver.patch
+usb-gotemp.patch
+usb-add-sensoray-2255-v4l-driver.patch
+../quilt/device-mapper/series: v2.6.25-rc1
+Deleted branch quilt/device-mapper.
+Switched to a new branch "quilt/device-mapper"
+dm-raid1-fix-test_and_set_bit.patch
+No author found in dm-raid1-fix-test_and_set_bit.patch
+---
+test_and_set_bit() on address of uint32_t is a Bad Idea(tm)...
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Alasdair G Kergon <agk@redhat.com>
+Author: Al Viro <viro@zeniv.linux.org.uk>
+Al Viro <viro@zeniv.linux.org.uk>
+../quilt/i2c/series: e760e716d47b48caf98da348368fd41b4a9b9e7e
+Deleted branch quilt/i2c.
+Switched to a new branch "quilt/i2c"
+i2c-pxa-misc-fixes.patch
+i2c-no-algos-in-kconfig.patch
+No author found in i2c-no-algos-in-kconfig.patch
+---
+The algorithm drivers are helper drivers that are selected automatically
+as needed. There's no point in listing them in the config menu, it can
+only confuse users and waste their time.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Author: Jean Delvare <khali@linux-fr.org>
+Jean Delvare <khali@linux-fr.org>
+i2c-pca-01-removing-trailing-whitespace.patch
+i2c-pca-02-extension-of-pca-algorithm.patch
+../quilt/kernel-doc/series: 4ee29f6a52158cea526b16a44ae38643946103ec
+Deleted branch quilt/kernel-doc.
+Switched to a new branch "quilt/kernel-doc"
+docbook-audit-prms.patch
+docbook-blk-prms.patch
+docbook-cpu-mtrr-prm.patch
+docbook-drv-base.patch
+docbook-skbuffh-prm.patch
+../quilt/pata/series: 96b5a46e2a72dc1829370c87053e0cd558d58bc0
+Deleted branch quilt/pata.
+Switched to a new branch "quilt/pata"
+ide-add-missing-base-addresses-for-falconide-and-macide.patch
+ide-libata-st310211a-has-buggy-hpa-too.patch
+maintainers-update-ide-cd-maintainer-s-email-address.patch
+falconide-locking-bugfix.patch
+via82cxxx-add-new-pci-id-for-cx700.patch
+linux-hdsmart-h-fix-goofups-take-2.patch
+ide-tape-schedule-driver-for-removal-after-6-months.patch
+ide-generic-set-hwif-chipset.patch
+ide-fix-ide_find_port.patch
+ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch
+ide-acpi-add-missing-drive-acpidata-zeroing.patch
+ide-factor-out-cable-detection-from-ide_init_port.patch
+ide-factor-out-unregistering-devices-from-ide_unregister.patch
+ide-factor-out-devices-init-from-ide_init_port_data.patch
+ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch
+ide-rework-powermac-media-bay-support-take-2.patch
+ide-add-warm-plug-support-for-ide-devices.patch
+ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch
+Context reduced to (1/1) to apply fragment at 104
+ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch
+ide-remove-config_blk_dev_hd_ide-config-option.patch
+ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch
+ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-3.patch
+ide-remove-hold-field-from-ide_hwif_t-take-2.patch
+ide-remove-init_hwif_default.patch
+ide-remove-ide_init_hwif_ports.patch
+ide-floppy-remove-struct-idefloppy_id_gcw.patch
+ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch
+ide-remove-ide_-_reg-macros.patch
+ide-tape-move-all-struct-and-other-defs-at-the-top.patch
+ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch
+ide-add-generic-packet-command-representation-ide_atapi_pc.patch
+ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch
+ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch
+ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch
+ide-floppy-rename-end_request-handler-properly.patch
+ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch
+ide-scsi-do-non-atomic-pc-flags-testing.patch
+ide-pmac-remove-dead-code.patch
+ppc-hdpu-remove-dead-ide-code.patch
+ppc-ppc4xx-remove-ppc_ide_md-hooks.patch
+ppc-pmac-remove-ppc_ide_md-hooks.patch
+ppc-mpc8xx-remove-ppc_ide_md-hooks.patch
+ppc-lopec-remove-ppc_ide_md-hooks.patch
+ppc-sandpoint-remove-ppc_ide_md-hooks.patch
+ppc-pplus-remove-ppc_ide_md-ide_init_hwif-hook.patch
+ppc-remove-ppc_ide_md-ide_init_hwif-hook.patch
+ppc-dont-include-linux-ide-h.patch
+ppc-pmac-remove-no-longer-needed-ide-quirk.patch
+ide-add-config_ide_arch_obsolete_defaults.patch
+ide-remove-config_ide_arch_obsolete_init.patch
+ide-remove-ide_default_io_ctl-macro.patch
+ide-remove-ppc-ifdef-from-init_ide_data.patch
+ide-add-ide-4drives-host-driver-take-2.patch
+cmd640-cleanup-setup_device_ptrs.patch
+cmd640-init-hwif-io_ports-irq-explicitly.patch
+ide-limit-legacy-vlb-host-drivers-to-alpha-x86-and-mips.patch
+ide-init-hwif-io_ports-irq-explicitly-in-legacy-vlb-host-drivers.patch
+ide-remove-needless-hwif-irq-check-from-ide_hwif_configure.patch
+ide-move-default-ide-ports-setup-to-ide_generic-host-driver.patch
+ide-remove-ide_init_default_irq-macro.patch
+ide-cleanup-ide_match_hwif.patch
+ide-cleanup-ide_find_port.patch
+swarm-use-ide_find_port.patch
+ide-pmac-dynamically-allocate-struct-pmac_ide_hwif-instances.patch
+ide-pmac-use-ide_find_port.patch
+sgiioc4-use-ide_find_port.patch
+au1xxx-ide-use-ide_find_port.patch
+cmd640-remove-cmd_drives.patch
+cmd640-use-ide_find_port.patch
+scc_pata-store-hwif-pointer-in-struct-scc_ports.patch
+umc8672-dont-use-ide_hwifs-in-umc_set_pio_mode.patch
+ht6560b-use-driver-name-for-resource-allocation.patch
+qd65xx-return-error-value-in-qd_probe.patch
+ide-ide_hflag_bootable-to-ide_hflag_non_bootable.patch
+ide-use-div_round_up.patch
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..0ae52a2e7b3a
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20080218
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 04:30:30 +0000