diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-14 16:51:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-14 16:51:41 +1000 |
| commit | dd2c152cbc07097fe4f0f5505d979099fb4722da (patch) | |
| tree | 0a23957b409cd8a9afcc1257e3265a45751e02aa | |
| parent | 8640f5308fcfd23a0f9ddc854af08c564d90a121 (diff) | |
Add linux-next specific filesnext-20080514
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 78 | ||||
| -rw-r--r-- | Next/merge.log | 1908 | ||||
| -rw-r--r-- | Next/quilt-import.log | 260 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 2247 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..132f7217d7d6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,78 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-linus +sched-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-akpm +sched git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-akpm +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +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#mm +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#avr32-arch +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide 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#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#master +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/tests.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm +m68k quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +hrt git git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git#mm +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_testing#master +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#vfs-2.6.25 +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +ldp.next quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-ldp.next/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..cc757bdd2e1b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1908 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at c714a53 Make 'cond_resched()' nullification depend on PREEMPT_BKL +Merging origin/master +$ git merge origin/master +Updating c714a53..9604006 +Fast forward + Documentation/cgroups.txt | 4 +- + Documentation/hwmon/adt7473 | 3 +- + MAINTAINERS | 4 +- + arch/m68knommu/Kconfig | 3 + + arch/m68knommu/kernel/vmlinux.lds.S | 10 + + arch/mn10300/boot/install.sh | 16 +- + arch/parisc/mm/init.c | 2 +- + arch/um/Kconfig.char | 6 +- + arch/um/drivers/chan_user.c | 1 + + arch/um/drivers/cow_sys.h | 2 +- + arch/um/drivers/daemon_user.c | 4 +- + arch/um/drivers/fd.c | 2 +- + arch/um/drivers/hostaudio_kern.c | 2 +- + arch/um/drivers/mcast_user.c | 3 +- + arch/um/drivers/net_user.c | 2 +- + arch/um/drivers/port_user.c | 2 +- + arch/um/drivers/pty.c | 2 +- + arch/um/drivers/random.c | 122 +++++--- + arch/um/drivers/slip_user.c | 2 +- + arch/um/drivers/tty.c | 2 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/xterm.c | 2 +- + arch/um/include/as-layout.h | 14 +- + arch/um/include/line.h | 4 +- + arch/um/include/os.h | 1 + + arch/um/include/process.h | 20 +- + arch/um/include/skas_ptrace.h | 13 +- + arch/um/include/sysdep-i386/ptrace_user.h | 30 +-- + arch/um/include/sysdep-i386/sigcontext.h | 2 +- + arch/um/include/sysdep-x86_64/ptrace_user.h | 17 +- + arch/um/include/um_malloc.h | 9 +- + arch/um/kernel/dyn.lds.S | 7 +- + arch/um/kernel/mem.c | 5 + + arch/um/kernel/time.c | 4 +- + arch/um/kernel/um_arch.c | 7 +- + arch/um/kernel/uml.lds.S | 7 +- + arch/um/os-Linux/drivers/ethertap_user.c | 4 +- + arch/um/os-Linux/helper.c | 4 +- + arch/um/os-Linux/main.c | 2 +- + arch/um/os-Linux/sigio.c | 39 ++- + arch/um/os-Linux/signal.c | 1 + + arch/um/os-Linux/skas/process.c | 2 +- + arch/um/os-Linux/start_up.c | 81 +++--- + arch/um/os-Linux/sys-i386/registers.c | 5 +- + arch/um/os-Linux/time.c | 54 ++++- + arch/um/sys-i386/ptrace.c | 30 +- + arch/um/sys-i386/user-offsets.c | 2 +- + arch/um/sys-x86_64/user-offsets.c | 1 - + arch/x86/kernel/pci-dma.c | 8 +- + arch/x86/pci/i386.c | 4 +- + block/blktrace.c | 2 +- + block/compat_ioctl.c | 2 +- + drivers/char/synclink_gt.c | 2 +- + drivers/md/raid5.c | 25 +- + drivers/misc/sgi-xp/xp.h | 305 ++++++++------------- + drivers/misc/sgi-xp/xp_main.c | 44 ++-- + drivers/misc/sgi-xp/xpc.h | 83 ++---- + drivers/misc/sgi-xp/xpc_channel.c | 186 ++++++------ + drivers/misc/sgi-xp/xpc_main.c | 60 ++-- + drivers/misc/sgi-xp/xpc_partition.c | 74 +++--- + drivers/misc/sgi-xp/xpnet.c | 22 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/pci/intel-iommu.c | 6 +- + drivers/pci/pci-acpi.c | 109 +++++-- + drivers/pci/quirks.c | 1 + + drivers/pnp/interface.c | 2 +- + drivers/rtc/rtc-lib.c | 2 +- + drivers/rtc/rtc-m41t80.c | 3 +- + drivers/scsi/aha152x.c | 8 +- + drivers/scsi/gdth.c | 51 +++-- + drivers/scsi/libiscsi.c | 29 +- + drivers/scsi/qla1280.c | 4 +- + drivers/spi/Kconfig | 1 - + drivers/spi/pxa2xx_spi.c | 2 +- + drivers/spi/spi_mpc83xx.c | 411 ++++++++++++++++++--------- + drivers/video/Kconfig | 1 - + drivers/video/atmel_lcdfb.c | 11 +- + drivers/video/console/fbcon.c | 31 ++- + drivers/video/pnx4008/pnxrgbfb.c | 11 +- + drivers/video/tridentfb.c | 25 +- + fs/dquot.c | 10 + + fs/ecryptfs/inode.c | 13 +- + fs/ecryptfs/miscdev.c | 2 + + fs/exec.c | 2 +- + fs/ext4/mballoc.c | 6 +- + fs/fuse/file.c | 2 + + fs/fuse/fuse_i.h | 3 + + fs/fuse/inode.c | 5 +- + fs/hfsplus/inode.c | 2 + + fs/hppfs/Makefile | 6 +- + fs/hppfs/{hppfs_kern.c => hppfs.c} | 82 ++---- + fs/jbd2/journal.c | 4 +- + fs/proc/array.c | 1 + + fs/ufs/ufs.h | 1 - + include/asm-um/irq.h | 3 +- + include/asm-um/keyboard.h | 6 - + include/asm-um/page.h | 17 +- + include/linux/bitmap.h | 1 - + include/linux/cpumask.h | 7 - + include/linux/fuse.h | 1 + + include/linux/mm_types.h | 13 +- + include/sound/soc.h | 2 +- + init/main.c | 18 +- + lib/bitmap.c | 16 - + mm/pdflush.c | 4 +- + mm/vmstat.c | 2 + + sound/soc/codecs/tlv320aic3x.c | 4 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/omap/n810.c | 4 +- + sound/synth/emux/emux_synth.c | 6 +- + 110 files changed, 1253 insertions(+), 1084 deletions(-) + rename fs/hppfs/{hppfs_kern.c => hppfs.c} (92%) + delete mode 100644 include/asm-um/keyboard.h +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Already up-to-date. +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merged MAINTAINERS +Merge made by recursive. + drivers/base/memory.c | 2 + + drivers/net/Kconfig | 2 +- + drivers/net/atlx/atl1.c | 157 ++++-- + drivers/net/atlx/atl1.h | 2 +- + drivers/net/atlx/atlx.c | 2 +- + drivers/net/atlx/atlx.h | 7 +- + drivers/net/cxgb3/adapter.h | 1 + + drivers/net/cxgb3/common.h | 1 + + drivers/net/cxgb3/cxgb3_main.c | 40 +- + drivers/net/cxgb3/regs.h | 8 + + drivers/net/cxgb3/sge.c | 29 +- + drivers/net/cxgb3/t3_hw.c | 28 + + drivers/net/dm9000.c | 37 ++- + drivers/net/ehea/ehea.h | 27 +- + drivers/net/ehea/ehea_main.c | 25 + + drivers/net/ehea/ehea_qmr.c | 286 +++++++--- + drivers/net/gianfar.c | 2 + + drivers/net/myri10ge/myri10ge.c | 730 +++++++++++++---------- + drivers/net/myri10ge/myri10ge_mcp.h | 56 ++- + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 39 +- + drivers/net/niu.c | 53 +- + drivers/net/niu.h | 9 + + drivers/net/pppol2tp.c | 13 +- + drivers/net/ps3_gelic_wireless.c | 2 + + drivers/net/sfc/Makefile | 4 +- + drivers/net/sfc/boards.h | 2 + + drivers/net/sfc/efx.c | 4 +- + drivers/net/sfc/enum.h | 49 ++ + drivers/net/sfc/ethtool.c | 259 +++++++++- + drivers/net/sfc/falcon.c | 8 +- + drivers/net/sfc/falcon_hwdefs.h | 16 +- + drivers/net/sfc/falcon_xmac.c | 82 +++- + drivers/net/sfc/mdio_10g.c | 78 +++ + drivers/net/sfc/mdio_10g.h | 24 +- + drivers/net/sfc/net_driver.h | 28 +- + drivers/net/sfc/rx.c | 11 +- + drivers/net/sfc/selftest.c | 717 +++++++++++++++++++++++ + drivers/net/sfc/selftest.h | 50 ++ + drivers/net/sfc/sfe4001.c | 14 + + drivers/net/sfc/tenxpress.c | 91 +++- + drivers/net/sfc/tx.c | 664 +++++++++++++++++++++ + drivers/net/sfc/xfp_phy.c | 36 ++ + drivers/net/sky2.h | 4 +- + drivers/net/wan/Kconfig | 4 +- + drivers/net/wan/cosa.c | 14 +- + drivers/net/wan/hdlc_ppp.c | 2 +- + drivers/net/wan/hostess_sv11.c | 12 +- + drivers/net/wan/lmc/lmc_main.c | 1 + + drivers/net/wan/sealevel.c | 1 + + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/prism54/islpci_dev.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 5 +- + drivers/net/wireless/rt2x00/rt61pci.c | 31 +- + drivers/net/wireless/wavelan.c | 4 +- + drivers/net/wireless/wavelan_cs.c | 6 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 6 +- + include/linux/netdevice.h | 35 +- + include/net/syncppp.h | 2 +- + net/core/netpoll.c | 2 +- + net/econet/af_econet.c | 2 +- + net/ipv4/arp.c | 2 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/ipconfig.c | 6 +- + net/ipv4/raw.c | 10 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/mcast.c | 4 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/raw.c | 10 +- + net/mac80211/debugfs_key.c | 15 +- + net/mac80211/iface.c | 9 + + net/mac80211/mesh.c | 2 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_pathtbl.c | 17 +- + net/mac80211/mlme.c | 64 ++- + net/mac80211/rx.c | 12 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 10 +- + net/mac80211/wme.c | 3 +- + net/packet/af_packet.c | 2 +- + net/sctp/sm_make_chunk.c | 16 +- + net/xfrm/xfrm_output.c | 6 +- + 84 files changed, 3345 insertions(+), 714 deletions(-) + create mode 100644 drivers/net/sfc/selftest.c + create mode 100644 drivers/net/sfc/selftest.h +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/common/locomo.c | 66 ++++++++++++++++++++++++++---------- + arch/arm/kernel/armksyms.c | 2 + + arch/arm/mach-sa1100/collie.c | 42 ++++++++++++----------- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + include/asm-arm/arch-sa1100/irqs.h | 2 +- + include/asm-arm/hardware/locomo.h | 19 ++++++---- + 9 files changed, 88 insertions(+), 51 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/kobject.txt | 4 ++++ + block/genhd.c | 9 ++++++--- + drivers/base/core.c | 5 +++++ + include/linux/genhd.h | 4 ++-- + include/linux/sysfs.h | 2 +- + init/do_mounts.c | 27 ++++++++++++++++++++++++++- + lib/kobject.c | 18 +++++------------- + 7 files changed, 49 insertions(+), 20 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merged drivers/usb/c67x00/c67x00-ll-hpi.c +Merge made by recursive. + drivers/usb/c67x00/c67x00-ll-hpi.c | 1 + + drivers/usb/class/cdc-acm.c | 3 + + drivers/usb/core/endpoint.c | 11 +- + drivers/usb/core/message.c | 1 + + drivers/usb/core/sysfs.c | 137 ++++--- + drivers/usb/core/usb.c | 1 + + drivers/usb/core/usb.h | 4 + + drivers/usb/gadget/amd5536udc.c | 10 +- + drivers/usb/gadget/serial.c | 778 +++++++++++++++--------------------- + drivers/usb/host/isp1760-hcd.c | 4 +- + drivers/usb/host/isp1760-if.c | 2 +- + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/kl5kusb105.c | 2 +- + drivers/usb/serial/moto_modem.c | 70 ++++ + drivers/usb/serial/option.c | 8 +- + drivers/usb/storage/unusual_devs.h | 71 ++-- + include/linux/usb/association.h | 150 +++++++ + 19 files changed, 719 insertions(+), 546 deletions(-) + create mode 100644 drivers/usb/serial/moto_modem.c + create mode 100644 include/linux/usb/association.h +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged init/main.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-dev | 20 + + Documentation/filesystems/sysfs.txt | 6 + + arch/arm/common/dmabounce.c | 22 +- + arch/arm/common/sa1111.c | 3 +- + arch/arm/kernel/ecard.c | 3 +- + arch/arm/mach-integrator/impd1.c | 3 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/pasemi/misc.c | 2 +- + arch/sparc64/kernel/vio.c | 2 +- + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/pci-dma.c | 6 +- + arch/x86/kernel/pci-gart_64.c | 4 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + block/genhd.c | 5 +- + drivers/acpi/fan.c | 10 +- + drivers/acpi/glue.c | 6 +- + drivers/acpi/processor_core.c | 5 +- + drivers/acpi/scan.c | 2 +- + drivers/acpi/thermal.c | 4 +- + drivers/acpi/video.c | 5 +- + drivers/base/class.c | 4 + + drivers/base/core.c | 84 +++++- + drivers/base/platform.c | 296 +++++++++++++++- + drivers/base/power/main.c | 675 ++++++++++++++++++++++++++-------- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/eisa/Makefile | 2 +- + drivers/eisa/eisa-bus.c | 4 +- + drivers/mca/mca-bus.c | 2 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptfc.c | 4 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/pci/hotplug/acpiphp.h | 4 +- + drivers/pci/pci-driver.c | 376 +++++++++++++++++-- + drivers/scsi/hosts.c | 4 +- + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/usb/core/devio.c | 5 + + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/radeonfb.h | 2 +- + fs/partitions/check.c | 2 +- + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/device.h | 19 +- + include/linux/eisa.h | 2 +- + include/linux/i2c.h | 4 +- + include/linux/init.h | 1 + + include/linux/kobject.h | 1 - + include/linux/pci.h | 2 +- + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 ++++++++++++++-- + include/linux/spi/spi.h | 2 +- + include/linux/sysfs.h | 5 + + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_transport_fc.h | 4 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + init/main.c | 9 + + kernel/power/disk.c | 22 +- + kernel/power/main.c | 6 +- + lib/kobject.c | 62 +++- + 64 files changed, 1756 insertions(+), 341 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-dev +Merging quilt/usb +$ git merge quilt/usb +Auto-merged include/linux/bitmap.h +Auto-merged lib/bitmap.c +Merge made by recursive. + Documentation/usb/WUSB-Design-overview.txt | 448 +++++++ + Documentation/usb/wusb-cbaf | 136 ++ + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/core/driver.c | 31 +- + drivers/usb/core/hub.c | 506 +++++--- + drivers/usb/host/Kconfig | 15 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++++ + drivers/usb/host/isp1760-hcd.c | 8 +- + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 295 +++++ + drivers/usb/serial/Kconfig | 8 + + drivers/usb/serial/io_fw_down3.h | 11 +- + drivers/usb/serial/io_ti.c | 1888 ++++++++++++--------------- + drivers/usb/serial/ti_fw_3410.h | 4 + + drivers/usb/serial/ti_fw_5052.h | 5 + + drivers/usb/serial/ti_usb_3410_5052.c | 106 +- + drivers/usb/storage/isd200.c | 6 +- + drivers/usb/storage/scsiglue.c | 26 +- + drivers/usb/storage/transport.c | 76 +- + drivers/usb/storage/usb.c | 109 +- + drivers/usb/storage/usb.h | 23 +- + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 620 +++++++++ + drivers/usb/wusbcore/crypto.c | 537 ++++++++ + drivers/usb/wusbcore/dev-sysfs.c | 199 +++ + drivers/usb/wusbcore/devconnect.c | 1307 +++++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 329 +++++ + drivers/usb/wusbcore/pal.c | 39 + + drivers/usb/wusbcore/reservation.c | 127 ++ + drivers/usb/wusbcore/rh.c | 477 +++++++ + drivers/usb/wusbcore/security.c | 536 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 83 ++ + drivers/usb/wusbcore/wa-hc.h | 420 ++++++ + drivers/usb/wusbcore/wa-nep.c | 313 +++++ + drivers/usb/wusbcore/wa-rpipe.c | 548 ++++++++ + drivers/usb/wusbcore/wa-xfer.c | 1710 ++++++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 395 ++++++ + drivers/usb/wusbcore/wusbhc.h | 522 ++++++++ + drivers/uwb/Kconfig | 88 ++ + drivers/uwb/Makefile | 30 + + drivers/uwb/address.c | 380 ++++++ + drivers/uwb/beacon.c | 713 ++++++++++ + drivers/uwb/driver.c | 308 +++++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 230 ++++ + drivers/uwb/drp.c | 406 ++++++ + drivers/uwb/est.c | 414 ++++++ + drivers/uwb/hwa-rc.c | 915 +++++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 281 ++++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 264 ++++ + drivers/uwb/i1480/dfu/mac.c | 530 ++++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 501 +++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 160 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 ++++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 ++++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 492 +++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 +++++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 641 +++++++++ + drivers/uwb/ie.c | 591 +++++++++ + drivers/uwb/lc-dev.c | 703 ++++++++++ + drivers/uwb/lc-rc.c | 499 +++++++ + drivers/uwb/neh.c | 616 +++++++++ + drivers/uwb/pal.c | 71 + + drivers/uwb/reset.c | 328 +++++ + drivers/uwb/rsv.c | 607 +++++++++ + drivers/uwb/scan.c | 160 +++ + drivers/uwb/umc-bus.c | 186 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 306 +++++ + drivers/uwb/uwb-internal.h | 288 ++++ + drivers/uwb/uwbd.c | 428 ++++++ + drivers/uwb/whc-rc.c | 552 ++++++++ + drivers/uwb/whci.c | 285 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 +++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 715 ++++++++++ + drivers/uwb/wlp/txrx.c | 374 ++++++ + drivers/uwb/wlp/wlp-internal.h | 228 ++++ + drivers/uwb/wlp/wlp-lc.c | 565 ++++++++ + drivers/uwb/wlp/wss-lc.c | 1056 +++++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb.h | 6 + + include/linux/usb/wusb-wa.h | 284 ++++ + include/linux/usb/wusb.h | 420 ++++++ + include/linux/uwb.h | 768 +++++++++++ + include/linux/uwb/bugs-macros.h | 64 + + include/linux/uwb/bugs.h | 18 + + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 ++ + include/linux/uwb/spec.h | 630 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/util.h | 89 ++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 728 +++++++++++ + lib/bitmap.c | 20 + + 110 files changed, 34549 insertions(+), 1379 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/bugs-macros.h + create mode 100644 include/linux/uwb/bugs.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/util.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging x86/for-akpm +$ git merge x86/for-akpm +Already up-to-date. +Merging sched/for-akpm +$ git merge sched/for-akpm +Auto-merged Makefile +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged include/linux/sched.h +Auto-merged kernel/sched.c +Merge made by recursive. + Documentation/tracers/mmiotrace.txt | 164 ++ + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 28 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 22 +- + arch/x86/kernel/entry_32.S | 68 + + arch/x86/kernel/entry_64.S | 102 ++ + arch/x86/kernel/ftrace.c | 159 ++ + arch/x86/kernel/machine_kexec_32.c | 4 + + arch/x86/kernel/machine_kexec_64.c | 4 + + arch/x86/kernel/process_32.c | 3 + + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/thunk_32.S | 47 + + arch/x86/lib/thunk_64.S | 19 +- + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 13 + + arch/x86/mm/init_32.c | 4 + + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/ioremap.c | 11 +- + arch/x86/mm/kmmio.c | 508 ++++++ + arch/x86/mm/mmio-mod.c | 515 ++++++ + arch/x86/mm/pageattr.c | 1 + + arch/x86/mm/pf_in.c | 489 ++++++ + arch/x86/mm/pf_in.h | 39 + + arch/x86/mm/testmmiotrace.c | 71 + + arch/x86/vdso/vclock_gettime.c | 15 +- + arch/x86/vdso/vgetcpu.c | 3 +- + include/asm-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 123 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/mmiotrace.h | 85 + + include/linux/preempt.h | 34 +- + include/linux/sched.h | 48 + + kernel/Makefile | 11 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 33 +- + kernel/printk.c | 2 + + kernel/sched.c | 70 +- + kernel/sched_cpupri.c | 174 ++ + kernel/sched_cpupri.h | 36 + + kernel/sched_rt.c | 197 ++- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 11 +- + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 24 + + kernel/trace/ftrace.c | 1401 +++++++++++++++ + kernel/trace/trace.c | 3038 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 351 ++++ + kernel/trace/trace_functions.c | 78 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_mmiotrace.c | 295 ++++ + kernel/trace/trace_sched_switch.c | 186 ++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 555 ++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 ++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 66 files changed, 10270 insertions(+), 158 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 arch/x86/mm/kmmio.c + create mode 100644 arch/x86/mm/mmio-mod.c + create mode 100644 arch/x86/mm/pf_in.c + create mode 100644 arch/x86/mm/pf_in.h + create mode 100644 arch/x86/mm/testmmiotrace.c + create mode 100644 include/linux/ftrace.h + create mode 100644 include/linux/mmiotrace.h + create mode 100644 kernel/sched_cpupri.c + create mode 100644 kernel/sched_cpupri.h + create mode 100644 kernel/trace/Kconfig + create mode 100644 kernel/trace/Makefile + create mode 100644 kernel/trace/ftrace.c + create mode 100644 kernel/trace/trace.c + create mode 100644 kernel/trace/trace.h + create mode 100644 kernel/trace/trace_functions.c + create mode 100644 kernel/trace/trace_irqsoff.c + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 kernel/trace/trace_sched_switch.c + create mode 100644 kernel/trace/trace_sched_wakeup.c + create mode 100644 kernel/trace/trace_selftest.c + create mode 100644 kernel/trace/trace_selftest_dynamic.c + create mode 100644 kernel/trace/trace_sysprof.c +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged include/linux/pci.h +Merge made by recursive. + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/hotplug/shpchp_core.c | 2 +- + drivers/pci/proc.c | 2 +- + include/linux/pci.h | 5 ++++- + 4 files changed, 7 insertions(+), 4 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Merge made by recursive. + drivers/hid/hid-input.c | 5 ++- + drivers/hid/usbhid/hid-quirks.c | 45 ++++++++++++++++++++++---------------- + include/linux/hid.h | 1 + + 3 files changed, 30 insertions(+), 21 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Removed Documentation/i2c/busses/i2c-i810 +Removed Documentation/i2c/busses/i2c-prosavage +Removed Documentation/i2c/busses/i2c-savage4 +Auto-merged MAINTAINERS +Removed drivers/i2c/busses/i2c-i810.c +Removed drivers/i2c/busses/i2c-prosavage.c +Removed drivers/i2c/busses/i2c-savage4.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 - + Documentation/i2c/busses/i2c-i810 | 47 ---- + Documentation/i2c/busses/i2c-prosavage | 23 -- + Documentation/i2c/busses/i2c-savage4 | 26 --- + MAINTAINERS | 2 + + drivers/i2c/busses/Kconfig | 65 ++----- + drivers/i2c/busses/Makefile | 4 +- + drivers/i2c/busses/i2c-ali1535.c | 6 + + drivers/i2c/busses/i2c-ali1563.c | 5 + + drivers/i2c/busses/i2c-ali15x3.c | 5 + + drivers/i2c/busses/i2c-amd756.c | 6 + + drivers/i2c/busses/i2c-amd8111.c | 5 + + drivers/i2c/busses/i2c-davinci.c | 89 ++++++-- + drivers/i2c/busses/i2c-i801.c | 5 + + drivers/i2c/busses/i2c-i810.c | 260 ---------------------- + drivers/i2c/busses/i2c-nforce2-s4985.c | 261 ++++++++++++++++++++++ + drivers/i2c/busses/i2c-nforce2.c | 50 ++++- + drivers/i2c/busses/i2c-piix4.c | 4 + + drivers/i2c/busses/i2c-prosavage.c | 325 ---------------------------- + drivers/i2c/busses/i2c-savage4.c | 185 ---------------- + drivers/i2c/busses/i2c-sis5595.c | 6 + + drivers/i2c/busses/i2c-sis630.c | 6 + + drivers/i2c/busses/i2c-sis96x.c | 5 + + drivers/i2c/busses/i2c-viapro.c | 5 + + include/linux/i2c-id.h | 1 - + 25 files changed, 448 insertions(+), 955 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-i810 + delete mode 100644 Documentation/i2c/busses/i2c-prosavage + delete mode 100644 Documentation/i2c/busses/i2c-savage4 + delete mode 100644 drivers/i2c/busses/i2c-i810.c + create mode 100644 drivers/i2c/busses/i2c-nforce2-s4985.c + delete mode 100644 drivers/i2c/busses/i2c-prosavage.c + delete mode 100644 drivers/i2c/busses/i2c-savage4.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + 3 files changed, 11 insertions(+), 5 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/kernel/avr32_ksyms.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/video4linux/CARDLIST.cx23885 | 2 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + MAINTAINERS | 9 + + drivers/media/common/tuners/Kconfig | 32 +- + drivers/media/common/tuners/Makefile | 1 + + drivers/media/common/tuners/mxl5005s.c | 4110 +++++++++++++++++++++++++ + drivers/media/common/tuners/mxl5005s.h | 131 + + drivers/media/common/tuners/tda18271-common.c | 24 +- + drivers/media/common/tuners/tda18271-fe.c | 168 +- + drivers/media/common/tuners/tda18271-priv.h | 9 + + drivers/media/common/tuners/tea5767.c | 6 +- + drivers/media/common/tuners/xc5000.c | 9 +- + drivers/media/common/tuners/xc5000.h | 22 +- + drivers/media/common/tuners/xc5000_priv.h | 2 + + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- + drivers/media/dvb/bt8xx/Kconfig | 1 + + drivers/media/dvb/cinergyT2/Kconfig | 2 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 28 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/frontends/Kconfig | 32 +- + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/drx397xD.c | 1504 +++++++++ + drivers/media/dvb/frontends/drx397xD.h | 130 + + drivers/media/dvb/frontends/drx397xD_fw.h | 40 + + drivers/media/dvb/frontends/itd1000.c | 2 +- + drivers/media/dvb/frontends/mt312.c | 9 +- + drivers/media/dvb/frontends/mt312.h | 4 +- + drivers/media/dvb/ttpci/Kconfig | 2 + + drivers/media/dvb/ttusb-dec/Kconfig | 1 + + drivers/media/video/Kconfig | 10 +- + drivers/media/video/Makefile | 2 +- + drivers/media/video/au0828/Kconfig | 3 +- + drivers/media/video/au0828/au0828-dvb.c | 6 +- + drivers/media/video/bt8xx/Kconfig | 3 +- + drivers/media/video/cx18/Kconfig | 5 +- + drivers/media/video/cx18/cx18-cards.c | 25 +- + drivers/media/video/cx18/cx18-cards.h | 5 +- + drivers/media/video/cx18/cx18-driver.c | 29 +- + drivers/media/video/cx18/cx18-driver.h | 3 - + drivers/media/video/cx18/cx18-dvb.c | 40 +- + drivers/media/video/cx18/cx18-fileops.c | 6 +- + drivers/media/video/cx18/cx18-fileops.h | 9 - + drivers/media/video/cx18/cx18-gpio.c | 47 +- + drivers/media/video/cx18/cx18-i2c.c | 1 + + drivers/media/video/cx18/cx18-queue.c | 22 +- + drivers/media/video/cx18/cx18-queue.h | 4 - + drivers/media/video/cx18/cx18-streams.c | 26 +- + drivers/media/video/cx18/cx18-streams.h | 2 +- + drivers/media/video/cx23885/Kconfig | 6 +- + drivers/media/video/cx23885/cx23885-cards.c | 36 +- + drivers/media/video/cx23885/cx23885-dvb.c | 7 +- + drivers/media/video/cx25840/Kconfig | 1 + + drivers/media/video/cx88/Kconfig | 6 +- + drivers/media/video/cx88/cx88-dvb.c | 253 +- + drivers/media/video/em28xx/Kconfig | 3 +- + drivers/media/video/em28xx/em28xx-cards.c | 8 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 - + drivers/media/video/ivtv/Kconfig | 4 +- + drivers/media/video/ivtv/ivtv-controls.c | 4 +- + drivers/media/video/ivtv/ivtv-driver.c | 8 +- + drivers/media/video/ivtv/ivtv-fileops.c | 2 + + drivers/media/video/ivtv/ivtv-ioctl.c | 16 +- + drivers/media/video/ivtv/ivtv-ioctl.h | 6 +- + drivers/media/video/ivtv/ivtv-queue.c | 12 +- + drivers/media/video/ivtv/ivtv-streams.c | 43 +- + drivers/media/video/ivtv/ivtv-streams.h | 2 +- + drivers/media/video/ivtv/ivtv-vbi.c | 3 +- + drivers/media/video/ivtv/ivtv-yuv.c | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 88 +- + drivers/media/video/mt9m001.c | 5 +- + drivers/media/video/mt9v022.c | 7 +- + drivers/media/video/pvrusb2/Kconfig | 3 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 10 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 18 +- + drivers/media/video/saa7134/Kconfig | 3 +- + drivers/media/video/saa7134/saa7134-core.c | 6 - + drivers/media/video/saa7134/saa7134-dvb.c | 140 +- + drivers/media/video/stk-webcam.c | 7 + + drivers/media/video/tuner-core.c | 38 +- + drivers/media/video/tveeprom.c | 10 +- + drivers/media/video/usbvision/Kconfig | 2 +- + 81 files changed, 6770 insertions(+), 524 deletions(-) + create mode 100644 drivers/media/common/tuners/mxl5005s.c + create mode 100644 drivers/media/common/tuners/mxl5005s.h + create mode 100644 drivers/media/dvb/frontends/drx397xD.c + create mode 100644 drivers/media/dvb/frontends/drx397xD.h + create mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h +Merging s390/features +$ git merge s390/features +Removed arch/s390/kernel/binfmt_elf32.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-css | 35 +++ + Documentation/kernel-parameters.txt | 3 - + arch/s390/Kconfig | 1 + + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/binfmt_elf32.c | 214 --------------- + arch/s390/kernel/compat_ptrace.h | 4 +- + arch/s390/kernel/ptrace.c | 363 ++++++++++++++++++++++--- + arch/s390/mm/vmem.c | 19 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/cio/blacklist.c | 1 - + drivers/s390/cio/chp.c | 70 +++++- + drivers/s390/cio/chp.h | 15 +- + drivers/s390/cio/chsc.c | 243 +++-------------- + drivers/s390/cio/chsc.h | 2 - + drivers/s390/cio/cio.c | 157 ++++++------ + drivers/s390/cio/cio.h | 3 +- + drivers/s390/cio/css.c | 249 ++++++++---------- + drivers/s390/cio/css.h | 43 ++-- + drivers/s390/cio/device.c | 450 +++++++++++++++++++++++-------- + drivers/s390/cio/device.h | 7 +- + drivers/s390/cio/device_fsm.c | 106 +------- + drivers/s390/cio/device_pgid.c | 12 +- + drivers/s390/s390mach.c | 102 ++++---- + drivers/s390/s390mach.h | 7 + + include/asm-s390/elf.h | 51 +--- + include/asm-s390/processor.h | 14 +- + include/asm-s390/ptrace.h | 15 + + include/linux/mod_devicetable.h | 9 + + scripts/mod/file2alias.c | 12 + + 29 files changed, 1168 insertions(+), 1048 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-css + delete mode 100644 arch/s390/kernel/binfmt_elf32.c +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/kernel/head_32.S | 4 ++-- + arch/sh/kernel/setup.c | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Auto-merged block/blk-core.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 - + block/blk-core.c | 12 +- + block/blk-exec.c | 3 +- + drivers/block/paride/pd.c | 20 +- + drivers/ide/arm/palm_bk3710.c | 1 - + drivers/ide/h8300/ide-h8300.c | 2 - + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-cd.c | 115 ++++++------ + drivers/ide/ide-cd.h | 4 +- + drivers/ide/ide-cd_ioctl.c | 113 ++++++------ + drivers/ide/ide-disk.c | 13 +- + drivers/ide/ide-dma.c | 4 +- + drivers/ide/ide-floppy.c | 20 +- + drivers/ide/ide-io.c | 85 ++------- + drivers/ide/ide-iops.c | 10 +- + drivers/ide/ide-probe.c | 2 +- + drivers/ide/ide-tape.c | 52 +++-- + drivers/ide/ide-taskfile.c | 36 ++-- + drivers/ide/ide-timing.h | 1 - + drivers/ide/ide.c | 359 +++-------------------------------- + drivers/ide/legacy/ali14xx.c | 2 +- + drivers/ide/legacy/gayle.c | 3 +- + drivers/ide/legacy/ht6560b.c | 2 +- + drivers/ide/legacy/qd65xx.c | 4 +- + drivers/ide/mips/swarm.c | 16 +- + drivers/ide/pci/aec62xx.c | 2 +- + drivers/ide/pci/alim15x3.c | 2 +- + drivers/ide/pci/amd74xx.c | 16 +- + drivers/ide/pci/cmd640.c | 8 +- + drivers/ide/pci/cmd64x.c | 4 +- + drivers/ide/pci/cy82c693.c | 2 +- + drivers/ide/pci/opti621.c | 2 +- + drivers/ide/pci/scc_pata.c | 3 - + drivers/ide/pci/sgiioc4.c | 5 +- + drivers/ide/pci/siimage.c | 25 ++-- + drivers/ide/pci/via82cxxx.c | 16 +- + drivers/ide/setup-pci.c | 4 +- + drivers/scsi/ide-scsi.c | 7 +- + include/linux/blkdev.h | 1 - + include/linux/ide.h | 12 +- + 40 files changed, 308 insertions(+), 689 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged fs/xfs/xfs_mount.c +Auto-merged fs/xfs/xfs_mount.h +Auto-merged fs/xfs/xfs_vfsops.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 1 + + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_dir2_node.c | 358 ++++++++++++++++++++++++------------------ + fs/xfs/xfs_mount.c | 12 ++- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_sb.h | 7 + + fs/xfs/xfs_vfsops.c | 9 +- + 7 files changed, 231 insertions(+), 158 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/ulp/srp/ib_srp.c | 13 +++++-------- + 1 files changed, 5 insertions(+), 8 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged drivers/acpi/processor_core.c +Auto-merged drivers/acpi/scan.c +Merge made by recursive. + drivers/acpi/dispatcher/dsmethod.c | 2 +- + drivers/acpi/executer/exmutex.c | 4 +- + drivers/acpi/processor_core.c | 14 ++++++-- + drivers/acpi/scan.c | 56 ++++++++++++++++++++--------------- + kernel/cpu.c | 1 + + 5 files changed, 46 insertions(+), 31 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/nfs4state.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/ieee1394/csr1212.c | 32 ++++++++++++++++++++++---------- + drivers/ieee1394/sbp2.c | 20 ++++++++------------ + 2 files changed, 30 insertions(+), 22 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Already up-to-date. +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/ia64/kvm/Makefile | 3 +- + arch/ia64/kvm/kvm-ia64.c | 8 ---- + arch/ia64/kvm/memcpy.S | 1 + + arch/ia64/kvm/memset.S | 1 + + arch/powerpc/kvm/powerpc.c | 4 -- + arch/s390/kvm/kvm-s390.c | 4 -- + arch/x86/kvm/i8254.c | 9 ++-- + arch/x86/kvm/lapic.c | 4 ++ + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/svm.c | 85 +++++++++++++++++++++++++++---------- + arch/x86/kvm/vmx.c | 60 ++++++++++++++++---------- + arch/x86/kvm/x86.c | 64 ++++++++++------------------ + arch/x86/kvm/x86_emulate.c | 7 ++- + drivers/s390/kvm/kvm_virtio.c | 40 ++++++++++------- + include/asm-ia64/kvm.h | 10 ++++- + include/asm-x86/kvm.h | 1 + + include/asm-x86/kvm_host.h | 25 ++++++++++- + include/asm-x86/kvm_x86_emulate.h | 1 + + include/linux/kvm_host.h | 3 - + virt/kvm/kvm_main.c | 68 +++++++++++++++++++++++------- + 21 files changed, 250 insertions(+), 153 deletions(-) + create mode 100644 arch/ia64/kvm/memcpy.S + create mode 100644 arch/ia64/kvm/memset.S +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lowcomms.c | 27 ++++++++++++++------------- + fs/dlm/netlink.c | 2 +- + fs/dlm/plock.c | 2 +- + 3 files changed, 16 insertions(+), 15 deletions(-) +Merging scsi/master +$ git merge scsi/master +Removed drivers/md/dm-emc.c +Removed drivers/md/dm-hw-handler.c +Removed drivers/md/dm-hw-handler.h +Removed drivers/md/dm-mpath-hp-sw.c +Removed drivers/md/dm-mpath-rdac.c +Auto-merged drivers/scsi/Kconfig +Merge made by recursive. + Documentation/scsi/aacraid.txt | 24 +- + drivers/md/Kconfig | 19 +- + drivers/md/Makefile | 7 +- + drivers/md/dm-emc.c | 345 ------------- + drivers/md/dm-hw-handler.c | 213 -------- + drivers/md/dm-hw-handler.h | 63 --- + drivers/md/dm-mpath-hp-sw.c | 247 ---------- + drivers/md/dm-mpath-rdac.c | 700 --------------------------- + drivers/md/dm-mpath.c | 161 ++++--- + drivers/md/dm-mpath.h | 1 - + drivers/s390/scsi/zfcp_aux.c | 8 + + drivers/s390/scsi/zfcp_def.h | 20 + + drivers/s390/scsi/zfcp_fsf.c | 44 ++ + drivers/s390/scsi/zfcp_fsf.h | 11 +- + drivers/s390/scsi/zfcp_scsi.c | 65 +++ + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 + + drivers/scsi/device_handler/Kconfig | 32 ++ + drivers/scsi/device_handler/Makefile | 7 + + drivers/scsi/device_handler/scsi_dh.c | 162 ++++++ + drivers/scsi/device_handler/scsi_dh_emc.c | 499 +++++++++++++++++++ + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 202 ++++++++ + drivers/scsi/device_handler/scsi_dh_rdac.c | 691 ++++++++++++++++++++++++++ + drivers/scsi/scsi_error.c | 11 + + drivers/scsi/scsi_lib.c | 8 + + drivers/scsi/scsi_sysfs.c | 1 + + include/scsi/scsi.h | 1 + + include/scsi/scsi_device.h | 22 + + include/scsi/scsi_dh.h | 59 +++ + 29 files changed, 1954 insertions(+), 1672 deletions(-) + delete mode 100644 drivers/md/dm-emc.c + delete mode 100644 drivers/md/dm-hw-handler.c + delete mode 100644 drivers/md/dm-hw-handler.h + delete mode 100644 drivers/md/dm-mpath-hp-sw.c + delete mode 100644 drivers/md/dm-mpath-rdac.c + create mode 100644 drivers/scsi/device_handler/Kconfig + create mode 100644 drivers/scsi/device_handler/Makefile + create mode 100644 drivers/scsi/device_handler/scsi_dh.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_emc.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_hp_sw.c + create mode 100644 drivers/scsi/device_handler/scsi_dh_rdac.c + create mode 100644 include/scsi/scsi_dh.h +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Renamed drivers/misc/lkdtm.c => tests/lkdtm.c +Auto-merged tests/lkdtm.c +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 72 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 80 +++++++++++++++++++++++ + tests/Makefile | 10 +++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 12 ++-- + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 100 insertions(+), 83 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (96%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/netdebug.c | 31 +++++++++++++++++++++++++++++-- + fs/ocfs2/cluster/tcp.h | 22 ---------------------- + fs/ocfs2/dlm/dlmdebug.c | 30 ++++++++++++++++++++++++++++++ + fs/ocfs2/dlm/dlmdebug.h | 27 --------------------------- + 4 files changed, 59 insertions(+), 51 deletions(-) +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Merge made by recursive. + security/selinux/hooks.c | 20 +++- + security/selinux/include/security.h | 5 + + security/selinux/ss/context.h | 27 ++++- + security/selinux/ss/mls.c | 11 +- + security/selinux/ss/mls.h | 3 +- + security/selinux/ss/services.c | 245 ++++++++++++++++++++++++---------- + security/selinux/ss/sidtab.c | 58 +++------ + security/selinux/ss/sidtab.h | 7 +- + 8 files changed, 248 insertions(+), 128 deletions(-) +Merging quilt/m68k +$ git merge quilt/m68k +Auto-merged drivers/video/Kconfig +Merge made by recursive. + arch/m68k/Kconfig | 9 +- + arch/m68k/configs/amiga_defconfig | 130 ++-- + arch/m68k/configs/apollo_defconfig | 112 ++-- + arch/m68k/configs/atari_defconfig | 115 ++-- + arch/m68k/configs/bvme6000_defconfig | 112 ++-- + arch/m68k/configs/hp300_defconfig | 114 ++-- + arch/m68k/configs/mac_defconfig | 115 ++-- + arch/m68k/configs/multi_defconfig | 1255 ++++++++++++++++++++++++++++++++++ + arch/m68k/configs/mvme147_defconfig | 112 ++-- + arch/m68k/configs/mvme16x_defconfig | 112 ++-- + arch/m68k/configs/q40_defconfig | 131 ++-- + arch/m68k/configs/sun3_defconfig | 112 ++-- + arch/m68k/configs/sun3x_defconfig | 112 ++-- + arch/m68k/kernel/head.S | 2 +- + arch/m68k/kernel/setup.c | 3 +- + drivers/block/amiflop.c | 6 +- + drivers/block/z2ram.c | 2 +- + drivers/char/vme_scc.c | 4 +- + drivers/ide/legacy/macide.c | 3 + + drivers/input/misc/hp_sdc_rtc.c | 5 + + drivers/input/serio/hp_sdc_mlc.c | 5 + + drivers/input/serio/q40kbd.c | 2 +- + drivers/net/82596.c | 7 + + drivers/net/apne.c | 3 + + drivers/net/mac89x0.c | 3 + + drivers/net/macmace.c | 3 + + drivers/net/sun3lance.c | 3 + + drivers/video/Kconfig | 4 +- + drivers/video/amifb.c | 4 +- + drivers/video/dnfb.c | 3 + + drivers/video/hpfb.c | 2 +- + include/asm-m68k/bug.h | 4 +- + include/asm-m68k/setup.h | 2 +- + include/asm-m68k/uaccess.h | 6 +- + 34 files changed, 2087 insertions(+), 530 deletions(-) + create mode 100644 arch/m68k/configs/multi_defconfig +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Already up-to-date. +Merging hrt/mm +$ git merge hrt/mm +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++-- + drivers/dma/iop-adma.c | 6 ++---- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merged drivers/net/dm9000.c +Auto-merged drivers/net/gianfar.c +Auto-merged drivers/net/niu.h +Auto-merged drivers/net/pcnet32.c +Auto-merged drivers/net/ucc_geth_ethtool.c +Auto-merged drivers/net/wireless/iwlwifi/Kconfig +Auto-merged drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-4965-rs.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965-rs.c +Auto-merged drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merged drivers/net/wireless/rt2x00/rt61pci.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt61pci.c +Auto-merged net/mac80211/iface.c +Auto-merged net/mac80211/main.c +Auto-merged net/mac80211/mlme.c +Auto-merged net/mac80211/rx.c +Auto-merged net/mac80211/wme.c +Auto-merged net/tipc/core.h +Recorded preimage for 'drivers/net/wireless/iwlwifi/iwl-4965-rs.c' +Recorded preimage for 'drivers/net/wireless/rt2x00/rt61pci.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/net/3c523.c | 37 +- + drivers/net/3c527.c | 45 +- + drivers/net/8139cp.c | 43 +- + drivers/net/8139too.c | 53 +- + drivers/net/8390.h | 1 - + drivers/net/acenic.c | 21 +- + drivers/net/acenic.h | 1 - + drivers/net/cpmac.c | 2 +- + drivers/net/dm9000.c | 6 +- + drivers/net/gianfar.c | 2 +- + drivers/net/hamradio/6pack.c | 24 +- + drivers/net/lib8390.c | 96 +- + drivers/net/natsemi.c | 4 +- + drivers/net/niu.h | 2 +- + drivers/net/pcmcia/3c574_cs.c | 47 +- + drivers/net/pcmcia/3c589_cs.c | 49 +- + drivers/net/pcmcia/axnet_cs.c | 70 +- + drivers/net/pcnet32.c | 6 +- + drivers/net/qla3xxx.c | 4 +- + drivers/net/s2io.c | 4 +- + drivers/net/s2io.h | 2 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sis190.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/sky2.c | 2 +- + drivers/net/spider_net.c | 4 +- + drivers/net/tokenring/3c359.c | 20 +- + drivers/net/tokenring/3c359.h | 2 - + drivers/net/tsi108_eth.c | 4 +- + drivers/net/ucc_geth_ethtool.c | 4 +- + drivers/net/wireless/adm8211.c | 7 +- + drivers/net/wireless/ath5k/base.c | 10 +- + drivers/net/wireless/ath5k/base.h | 3 +- + drivers/net/wireless/b43/b43.h | 3 +- + drivers/net/wireless/b43/debugfs.c | 77 +- + drivers/net/wireless/b43/debugfs.h | 1 + + drivers/net/wireless/b43/dma.c | 8 +- + drivers/net/wireless/b43/lo.c | 727 +++------ + drivers/net/wireless/b43/lo.h | 115 +- + drivers/net/wireless/b43/main.c | 42 +- + drivers/net/wireless/b43/main.h | 3 + + drivers/net/wireless/b43/phy.c | 240 +--- + drivers/net/wireless/b43/phy.h | 16 +- + drivers/net/wireless/b43/pio.c | 8 +- + drivers/net/wireless/b43/xmit.c | 2 +- + drivers/net/wireless/b43legacy/dma.c | 8 +- + drivers/net/wireless/b43legacy/main.c | 3 +- + drivers/net/wireless/b43legacy/pio.c | 8 +- + drivers/net/wireless/b43legacy/xmit.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 36 +- + drivers/net/wireless/iwlwifi/Makefile | 8 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 1 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 5 - + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 605 +------- + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 983 ++++++------ + drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 87 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 1667 +++++--------------- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 133 ++ + drivers/net/wireless/iwlwifi/iwl-5000.c | 519 ++++++ + drivers/net/wireless/iwlwifi/iwl-calib.c | 779 +++++++++ + drivers/net/wireless/iwlwifi/iwl-calib.h | 104 ++ + .../{iwl-4965-commands.h => iwl-commands.h} | 63 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 562 +++++++- + drivers/net/wireless/iwlwifi/iwl-core.h | 34 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 +- + .../net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} | 180 ++-- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 118 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 205 ++-- + drivers/net/wireless/iwlwifi/iwl-fh.h | 391 +++++ + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 423 +++++ + drivers/net/wireless/iwlwifi/iwl-power.h | 76 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 310 ++++- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 92 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 11 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 21 +- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 1014 +++---------- + drivers/net/wireless/libertas/cmd.h | 2 +- + drivers/net/wireless/libertas/decl.h | 4 +- + drivers/net/wireless/libertas/main.c | 26 +- + drivers/net/wireless/p54/p54.h | 2 +- + drivers/net/wireless/p54/p54common.c | 28 +- + drivers/net/wireless/rt2x00/Kconfig | 55 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 37 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 35 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 20 +- + drivers/net/wireless/rt2x00/rt2x00.h | 20 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 39 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 6 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 37 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 21 +- + drivers/net/wireless/rt2x00/rt61pci.c | 27 +- + drivers/net/wireless/rt2x00/rt73usb.c | 33 +- + drivers/ssb/pci.c | 20 +- + include/net/ieee80211.h | 11 - + include/net/mac80211.h | 105 +- + include/net/sctp/sctp.h | 2 + + include/net/sctp/structs.h | 4 + + include/net/sctp/user.h | 36 +- + include/net/tipc/tipc_port.h | 3 +- + net/ieee80211/ieee80211_tx.c | 86 - + net/ieee80211/ieee80211_wx.c | 89 -- + net/mac80211/aes_ccm.c | 2 +- + net/mac80211/aes_ccm.h | 2 +- + net/mac80211/debugfs.c | 43 - + net/mac80211/debugfs_netdev.c | 2 +- + net/mac80211/debugfs_sta.c | 38 - + net/mac80211/ieee80211_i.h | 15 +- + net/mac80211/iface.c | 3 +- + net/mac80211/key.c | 7 + + net/mac80211/main.c | 11 +- + net/mac80211/mlme.c | 68 +- + net/mac80211/rx.c | 5 - + net/mac80211/sta_info.c | 2 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/wep.c | 2 +- + net/mac80211/wep.h | 2 +- + net/mac80211/wme.c | 119 +- + net/mac80211/wpa.c | 8 +- + net/sctp/associola.c | 3 + + net/sctp/proc.c | 141 ++ + net/sctp/protocol.c | 3 + + net/sctp/sm_sideeffect.c | 17 +- + net/sctp/socket.c | 306 +++-- + net/tipc/config.c | 2 +- + net/tipc/core.c | 6 +- + net/tipc/core.h | 124 +- + net/tipc/dbg.c | 231 ++-- + net/tipc/dbg.h | 12 +- + net/tipc/link.c | 20 +- + net/tipc/msg.c | 10 +- + net/tipc/name_distr.c | 3 - + net/tipc/name_table.c | 7 +- + net/tipc/port.c | 20 +- + net/tipc/ref.c | 12 +- + net/tipc/socket.c | 5 +- + net/tipc/subscr.c | 1 + + 146 files changed, 6653 insertions(+), 5695 deletions(-) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000-hw.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.h + rename drivers/net/wireless/iwlwifi/{iwl-4965-commands.h => iwl-commands.h} (98%) + rename drivers/net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} (91%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-fh.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Auto-merged drivers/net/Kconfig +Removed drivers/net/fec_8xx/Kconfig +Removed drivers/net/fec_8xx/Makefile +Removed drivers/net/fec_8xx/fec_8xx-netta.c +Removed drivers/net/fec_8xx/fec_8xx.h +Removed drivers/net/fec_8xx/fec_main.c +Removed drivers/net/fec_8xx/fec_mii.c +Merge made by recursive. + arch/powerpc/boot/dts/mpc8377_mds.dts | 27 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 60 ++- + arch/powerpc/boot/dts/sbc8548.dts | 94 ++ + arch/powerpc/configs/mpc8610_hpcd_defconfig | 95 ++- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 121 +++- + arch/powerpc/platforms/85xx/sbc8548.c | 30 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 15 +- + drivers/net/Kconfig | 1 - + drivers/net/Makefile | 1 - + drivers/net/fec_8xx/Kconfig | 20 - + drivers/net/fec_8xx/Makefile | 12 - + drivers/net/fec_8xx/fec_8xx-netta.c | 151 ---- + drivers/net/fec_8xx/fec_8xx.h | 220 ----- + drivers/net/fec_8xx/fec_main.c | 1264 --------------------------- + drivers/net/fec_8xx/fec_mii.c | 418 --------- + 15 files changed, 429 insertions(+), 2100 deletions(-) + delete mode 100644 drivers/net/fec_8xx/Kconfig + delete mode 100644 drivers/net/fec_8xx/Makefile + delete mode 100644 drivers/net/fec_8xx/fec_8xx-netta.c + delete mode 100644 drivers/net/fec_8xx/fec_8xx.h + delete mode 100644 drivers/net/fec_8xx/fec_main.c + delete mode 100644 drivers/net/fec_8xx/fec_mii.c +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/Kconfig | 51 +++++ + crypto/Makefile | 4 + + crypto/cryptd.c | 9 +- + crypto/rmd128.c | 343 +++++++++++++++++++++++++++++++++++ + crypto/rmd160.c | 387 +++++++++++++++++++++++++++++++++++++++ + crypto/rmd256.c | 362 ++++++++++++++++++++++++++++++++++++ + crypto/rmd320.c | 411 +++++++++++++++++++++++++++++++++++++++++ + crypto/tcrypt.c | 80 +++++++-- + crypto/tcrypt.h | 433 +++++++++++++++++++++++++++++++++++++++++++- + drivers/crypto/hifn_795x.c | 364 ++++++++++++++++++------------------- + include/crypto/ripemd.h | 43 +++++ + 11 files changed, 2278 insertions(+), 209 deletions(-) + create mode 100644 crypto/rmd128.c + create mode 100644 crypto/rmd160.c + create mode 100644 crypto/rmd256.c + create mode 100644 crypto/rmd320.c + create mode 100644 include/crypto/ripemd.h +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged fs/exec.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Merge made by recursive. + arch/alpha/kernel/init_task.c | 1 - + arch/arm/kernel/init_task.c | 1 - + arch/avr32/kernel/init_task.c | 1 - + arch/blackfin/kernel/init_task.c | 1 - + arch/cris/kernel/process.c | 1 - + arch/frv/kernel/init_task.c | 1 - + arch/h8300/kernel/init_task.c | 1 - + arch/ia64/kernel/init_task.c | 1 - + arch/m32r/kernel/init_task.c | 1 - + arch/m68k/kernel/process.c | 1 - + arch/m68knommu/kernel/init_task.c | 1 - + arch/mips/kernel/init_task.c | 1 - + arch/mn10300/kernel/init_task.c | 1 - + arch/parisc/kernel/init_task.c | 1 - + arch/powerpc/kernel/init_task.c | 1 - + arch/s390/kernel/init_task.c | 1 - + arch/sh/kernel/init_task.c | 1 - + arch/sparc/kernel/init_task.c | 1 - + arch/sparc64/kernel/init_task.c | 1 - + arch/um/kernel/init_task.c | 1 - + arch/v850/kernel/init_task.c | 1 - + arch/x86/kernel/init_task.c | 1 - + arch/xtensa/kernel/init_task.c | 1 - + fs/binfmt_elf.c | 9 +- + fs/compat.c | 4 +- + fs/exec.c | 12 ++- + fs/file.c | 152 ++++++++++++++++++++++++++++++++++++- + include/linux/binfmts.h | 1 + + include/linux/fdtable.h | 1 + + include/linux/init_task.h | 23 +------ + kernel/fork.c | 130 ------------------------------- + kernel/sysctl.c | 5 +- + 32 files changed, 172 insertions(+), 188 deletions(-) +Merging sound/master +$ git merge sound/master +Merge made by recursive. + include/sound/soc-dapm.h | 22 +++- + sound/core/memalloc.c | 62 -------- + sound/drivers/Kconfig | 1 + + sound/i2c/cs8427.c | 6 +- + sound/pci/ac97/ac97_patch.c | 76 +++++++++ + sound/pci/oxygen/hifier.c | 33 +++-- + sound/pci/oxygen/oxygen.c | 76 +++++++--- + sound/pci/oxygen/oxygen.h | 14 ++ + sound/pci/oxygen/oxygen_io.c | 22 +++- + sound/pci/oxygen/oxygen_lib.c | 106 +++++++++++++- + sound/pci/oxygen/oxygen_pcm.c | 53 +++++-- + sound/pci/oxygen/virtuoso.c | 252 ++++++++++++++++++------------- + sound/soc/at91/eti_b1_wm8731.c | 17 +-- + sound/soc/codecs/tlv320aic3x.c | 293 ++++++++++++++++++------------------ + sound/soc/codecs/tlv320aic3x.h | 51 ++++++ + sound/soc/codecs/wm8731.c | 16 +-- + sound/soc/codecs/wm8750.c | 16 +-- + sound/soc/codecs/wm8753.c | 17 +-- + sound/soc/codecs/wm9712.c | 15 +-- + sound/soc/codecs/wm9713.c | 15 +-- + sound/soc/davinci/davinci-evm.c | 14 +-- + sound/soc/omap/n810.c | 10 +- + sound/soc/pxa/corgi.c | 12 +- + sound/soc/pxa/poodle.c | 14 +- + sound/soc/pxa/spitz.c | 14 +- + sound/soc/pxa/tosa.c | 14 +-- + sound/soc/s3c24xx/neo1973_wm8753.c | 63 +++++++-- + sound/soc/soc-dapm.c | 122 +++++++++++++-- + sound/usb/caiaq/caiaq-audio.c | 1 + + sound/usb/caiaq/caiaq-device.c | 12 +- + sound/usb/caiaq/caiaq-device.h | 1 + + 31 files changed, 913 insertions(+), 527 deletions(-) +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/common/rtctime.c +Removed arch/arm/configs/em_x270_defconfig +Auto-merged arch/arm/kernel/ecard.c +Removed arch/arm/mach-footbridge/co285.c +Removed arch/arm/mach-integrator/time.c +Removed include/asm-arm/dyntick.h +Removed include/asm-arm/rtc.h +Auto-merged kernel/sysctl.c +Merge made by recursive. + arch/arm/Kconfig | 33 +- + arch/arm/Makefile | 2 - + arch/arm/common/Makefile | 1 - + arch/arm/common/rtctime.c | 434 ------- + arch/arm/common/sharpsl_pm.c | 2 + + arch/arm/configs/at91cap9adk_defconfig | 1 - + arch/arm/configs/at91rm9200dk_defconfig | 1 - + arch/arm/configs/at91rm9200ek_defconfig | 1 - + arch/arm/configs/at91sam9260ek_defconfig | 1 - + arch/arm/configs/at91sam9261ek_defconfig | 1 - + arch/arm/configs/at91sam9263ek_defconfig | 1 - + arch/arm/configs/at91sam9rlek_defconfig | 1 - + arch/arm/configs/ateb9200_defconfig | 1 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/ecbat91_defconfig | 1 - + arch/arm/configs/em_x270_defconfig | 1265 -------------------- + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/eseries_pxa_defconfig | 1 - + arch/arm/configs/iop13xx_defconfig | 1 - + arch/arm/configs/iop32x_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 1 - + arch/arm/configs/ixp2000_defconfig | 1 - + arch/arm/configs/ixp23xx_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 9 +- + arch/arm/configs/kafa_defconfig | 1 - + arch/arm/configs/kb9202_defconfig | 1 - + arch/arm/configs/ks8695_defconfig | 1 - + arch/arm/configs/lpd270_defconfig | 1 - + arch/arm/configs/lpd7a404_defconfig | 1 - + arch/arm/configs/netx_defconfig | 1 - + arch/arm/configs/onearm_defconfig | 1 - + arch/arm/configs/picotux200_defconfig | 1 - + arch/arm/configs/pnx4008_defconfig | 1 - + arch/arm/configs/realview-smp_defconfig | 1 - + arch/arm/configs/realview_defconfig | 1 - + arch/arm/configs/rpc_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/arm/configs/sam9_l9260_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 1 - + arch/arm/configs/tct_hammer_defconfig | 1 - + arch/arm/configs/trizeps4_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 1 - + .../{cm_x270_defconfig => xm_x270_defconfig} | 861 +++++++++---- + arch/arm/kernel/ecard.c | 13 +- + arch/arm/kernel/ecard.h | 13 + + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/time.c | 120 -- + arch/arm/mach-footbridge/Makefile | 2 - + arch/arm/mach-footbridge/co285.c | 39 - + arch/arm/mach-footbridge/common.c | 21 - + arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- + arch/arm/mach-footbridge/time.c | 3 +- + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/time.c | 223 ---- + arch/arm/mach-ixp4xx/Kconfig | 9 + + arch/arm/mach-ixp4xx/Makefile | 2 + + arch/arm/mach-ixp4xx/fsg-pci.c | 71 ++ + arch/arm/mach-ixp4xx/fsg-setup.c | 276 +++++ + arch/arm/mach-omap1/pm.c | 7 - + arch/arm/mach-omap2/pm.c | 7 - + arch/arm/mach-pxa/Kconfig | 13 +- + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/cm-x270-pci.c | 26 +- + arch/arm/mach-pxa/corgi_pm.c | 2 + + arch/arm/mach-pxa/devices.c | 60 + + arch/arm/mach-pxa/devices.h | 5 + + arch/arm/mach-pxa/em-x270.c | 1 + + arch/arm/mach-pxa/lpd270.c | 9 +- + arch/arm/mach-pxa/mainstone.c | 63 +- + arch/arm/mach-pxa/pwm.c | 299 +++++ + arch/arm/mach-pxa/pxa25x.c | 6 +- + arch/arm/mach-pxa/pxa27x.c | 7 +- + arch/arm/mach-pxa/pxa3xx.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 2 + + arch/arm/mach-pxa/zylonite.c | 26 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/se7705_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + drivers/net/arm/etherh.c | 2 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 15 +- + drivers/pcmcia/pxa2xx_mainstone.c | 13 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 12 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-at91rm9200.c | 4 - + drivers/rtc/rtc-at91sam9.c | 1 - + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pl030.c | 217 ++++ + drivers/rtc/rtc-pl031.c | 36 +- + drivers/rtc/rtc-s3c.c | 4 - + drivers/rtc/rtc-sa1100.c | 37 +- + drivers/scsi/arm/Kconfig | 2 +- + drivers/scsi/arm/acornscsi-io.S | 15 +- + drivers/scsi/arm/acornscsi.c | 426 +++---- + drivers/scsi/arm/acornscsi.h | 9 +- + drivers/usb/gadget/pxa2xx_udc.c | 10 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 143 +++ + include/asm-arm/arch-ebsa285/hardware.h | 26 - + include/asm-arm/arch-ebsa285/memory.h | 19 - + include/asm-arm/arch-ebsa285/vmalloc.h | 4 - + include/asm-arm/arch-ixp4xx/fsg.h | 50 + + include/asm-arm/arch-ixp4xx/hardware.h | 1 + + include/asm-arm/arch-ixp4xx/irqs.h | 7 + + include/asm-arm/arch-pxa/pxa-regs.h | 412 ------- + include/asm-arm/arch-pxa/pxa25x-udc.h | 163 +++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 256 ++++ + include/asm-arm/arch-pxa/zylonite.h | 1 - + include/asm-arm/arch-rpc/io.h | 5 +- + include/asm-arm/dyntick.h | 6 - + include/asm-arm/ecard.h | 35 - + include/asm-arm/hw_irq.h | 11 - + include/asm-arm/mach/time.h | 22 - + include/asm-arm/rtc.h | 43 - + include/linux/pwm.h | 31 + + include/linux/pwm_backlight.h | 14 + + kernel/hrtimer.c | 2 +- + kernel/sysctl.c | 12 - + kernel/timer.c | 10 +- + 125 files changed, 2629 insertions(+), 3461 deletions(-) + delete mode 100644 arch/arm/common/rtctime.c + delete mode 100644 arch/arm/configs/em_x270_defconfig + rename arch/arm/configs/{cm_x270_defconfig => xm_x270_defconfig} (65%) + delete mode 100644 arch/arm/mach-footbridge/co285.c + delete mode 100644 arch/arm/mach-integrator/time.c + create mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c + create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c + create mode 100644 arch/arm/mach-pxa/pwm.c + create mode 100644 drivers/rtc/rtc-pl030.c + create mode 100644 drivers/video/backlight/pwm_bl.c + create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h + create mode 100644 include/asm-arm/arch-pxa/pxa25x-udc.h + create mode 100644 include/asm-arm/arch-pxa/pxa27x-udc.h + delete mode 100644 include/asm-arm/dyntick.h + delete mode 100644 include/asm-arm/rtc.h + create mode 100644 include/linux/pwm.h + create mode 100644 include/linux/pwm_backlight.h +Merging cpufreq/master +$ git merge cpufreq/master +Removed arch/x86/kernel/cpu/cpufreq/p4-clockmod.c +Removed arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/Kconfig | 50 -- + arch/x86/kernel/cpu/cpufreq/Makefile | 2 - + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 315 ----------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 15 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 634 ---------------------- + drivers/cpufreq/cpufreq.c | 45 +- + drivers/cpufreq/cpufreq_stats.c | 24 +- + drivers/cpufreq/freq_table.c | 12 +- + 8 files changed, 55 insertions(+), 1042 deletions(-) + delete mode 100644 arch/x86/kernel/cpu/cpufreq/p4-clockmod.c + delete mode 100644 arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/input/serio/hp_sdc_mlc.c +Auto-merged drivers/net/3c527.c +Auto-merged drivers/usb/core/usb.c +Auto-merged include/linux/usb.h +Auto-merged kernel/printk.c +Auto-merged kernel/semaphore.c +Auto-merged kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Resolved 'kernel/sysctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 +++++++--------- + Documentation/lguest/lguest.c | 23 ++++--- + arch/ia64/kernel/salinfo.c | 4 +- + drivers/char/snsc.c | 4 +- + drivers/char/viotape.c | 4 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/input/serio/hil_mlc.c | 4 +- + drivers/input/serio/hp_sdc_mlc.c | 14 ++-- + drivers/lguest/lguest_device.c | 3 +- + drivers/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/virtio_net.c | 88 ++++++++++++++++++++++-- + drivers/net/wireless/airo.c | 12 ++-- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 5 ++ + drivers/virtio/virtio_pci.c | 6 ++- + drivers/virtio/virtio_ring.c | 28 ++++++-- + drivers/watchdog/ar7_wdt.c | 2 +- + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/scx200_wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + fs/ocfs2/inode.c | 4 - + fs/reiserfs/journal.c | 2 +- + fs/xfs/linux-2.6/sema.h | 8 +-- + fs/xfs/linux-2.6/xfs_buf.c | 4 +- + include/linux/compiler-gcc.h | 19 +++++ + include/linux/compiler-intel.h | 2 + + include/linux/kernel.h | 35 ++++++++++ + include/linux/kthread.h | 29 +++++++- + include/linux/mutex.h | 4 - + include/linux/semaphore.h | 7 ++- + include/linux/stop_machine.h | 19 ++++-- + include/linux/timer.h | 32 ++++++--- + include/linux/usb.h | 2 +- + include/linux/virtio_config.h | 7 ++ + include/linux/virtio_ring.h | 15 ++++- + kernel/kthread.c | 29 ++------- + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/semaphore.c | 17 ++--- + kernel/stop_machine.c | 105 +++++++++++++++++++++++------ + kernel/sysctl.c | 12 +++ + 47 files changed, 453 insertions(+), 185 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/CHANGES | 3 +- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsproto.h | 6 ++-- + fs/cifs/cifssmb.c | 54 ++++++++++++++++++++++++++++++++----------------- + fs/cifs/connect.c | 14 ++++++++++-- + fs/cifs/netmisc.c | 6 ++-- + fs/cifs/ntlmssp.h | 4 +- + fs/cifs/readdir.c | 7 ++++- + 8 files changed, 62 insertions(+), 33 deletions(-) +Merging mmc/next +$ git merge mmc/next +Auto-merged drivers/mmc/host/sdhci.h +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + drivers/mmc/core/Kconfig | 12 + + drivers/mmc/core/Makefile | 1 + + drivers/mmc/core/bus.c | 12 + + drivers/mmc/core/core.c | 8 + + drivers/mmc/core/lock.c | 193 +++++++++++ + drivers/mmc/core/lock.h | 41 +++ + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/mmc_ops.c | 117 +++++++ + drivers/mmc/core/mmc_ops.h | 3 + + drivers/mmc/core/sd.c | 16 +- + drivers/mmc/host/Kconfig | 18 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/sdhci-pci.c | 739 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 541 ++++++++----------------------- + drivers/mmc/host/sdhci.h | 82 ++++-- + include/linux/mmc/card.h | 3 + + include/linux/mmc/mmc.h | 8 + + include/linux/pci_ids.h | 1 + + 18 files changed, 1371 insertions(+), 441 deletions(-) + create mode 100644 drivers/mmc/core/lock.c + create mode 100644 drivers/mmc/core/lock.h + create mode 100644 drivers/mmc/host/sdhci-pci.c +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glops.c | 2 +- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 10 +++++----- + fs/gfs2/meta_io.c | 6 ++++-- + fs/gfs2/ops_fstype.c | 4 ++-- + fs/gfs2/ops_super.c | 16 +++++++++------- + fs/gfs2/rgrp.c | 2 +- + 7 files changed, 23 insertions(+), 18 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/serio/hp_sdc.c +Auto-merged include/linux/semaphore.h +Merge made by recursive. + drivers/input/keyboard/hil_kbd.c | 2 +- + drivers/input/misc/hp_sdc_rtc.c | 1 + + drivers/input/serio/hp_sdc.c | 1 + + include/asm-alpha/semaphore.h | 1 + + include/asm-arm/semaphore.h | 1 + + include/asm-avr32/semaphore.h | 1 + + include/asm-blackfin/semaphore.h | 1 + + include/asm-cris/semaphore.h | 1 + + include/asm-frv/semaphore.h | 1 + + include/asm-h8300/semaphore.h | 1 + + include/asm-ia64/semaphore.h | 1 + + include/asm-m32r/semaphore.h | 1 + + include/asm-m68k/semaphore.h | 1 + + include/asm-m68knommu/semaphore.h | 1 + + include/asm-mips/semaphore.h | 1 + + include/asm-mn10300/semaphore.h | 1 + + include/asm-parisc/semaphore.h | 1 + + include/asm-powerpc/semaphore.h | 1 + + include/asm-s390/semaphore.h | 1 + + include/asm-sh/semaphore.h | 1 + + include/asm-sparc/semaphore.h | 1 + + include/asm-sparc64/semaphore.h | 1 + + include/asm-um/semaphore.h | 1 + + include/asm-v850/semaphore.h | 1 + + include/asm-x86/semaphore.h | 1 + + include/asm-xtensa/semaphore.h | 1 + + include/linux/semaphore.h | 6 ++---- + 27 files changed, 28 insertions(+), 5 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/atm/ambassador.c +CONFLICT (content): Merge conflict in drivers/atm/ambassador.c +Auto-merged drivers/net/bonding/bond_main.c +CONFLICT (content): Merge conflict in drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +CONFLICT (content): Merge conflict in drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'drivers/atm/ambassador.c' using previous resolution. +Resolved 'drivers/net/bonding/bond_main.c' using previous resolution. +Resolved 'drivers/net/bonding/bond_sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 +++++++------ + drivers/atm/ambassador.c | 1 + + drivers/net/bonding/bond_main.c | 21 +++++++++-------- + drivers/net/bonding/bond_sysfs.c | 15 +++++++------ + drivers/net/ppp_async.c | 8 +++--- + drivers/net/ps3_gelic_net.c | 11 +++++---- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 41 ++++++++++++++++++----------------- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++------------- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 3 +- + drivers/scsi/qla2xxx/qla_mbx.c | 4 +- + drivers/scsi/qla2xxx/qla_mid.c | 18 +++++++------- + drivers/scsi/qla2xxx/qla_os.c | 14 +++++++----- + include/net/bluetooth/hci_core.h | 7 +++-- + net/9p/trans_virtio.c | 44 +++++++++++++++++++------------------ + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 +++++---- + 19 files changed, 132 insertions(+), 123 deletions(-) +Applying idr.h needs spinlock.h +Merging quilt/ldp.next +$ git merge quilt/ldp.next +Merge made by recursive. + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 3153 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 3164 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/usb/hso.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..7909ec6c0a6a --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,260 @@ +Importing driver-core.current based on 2.6.26-rc2 +$ git branch -D quilt/driver-core.current +Deleted branch quilt/driver-core.current. +$ git checkout -b quilt/driver-core.current v2.6.26-rc2 +Switched to a new branch "quilt/driver-core.current" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +block-do_mounts-accept-root-non-existant-partition.patch +kobject-fix-kobject_rename-and-config_sysfs.patch +Importing usb.current based on quilt/driver-core.current +$ git branch -D quilt/usb.current +Deleted branch quilt/usb.current. +$ git checkout -b quilt/usb.current quilt/driver-core.current +Switched to a new branch "quilt/usb.current" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-add-new-moto_modem-driver-for-some-morotola-phones.patch +usb-create-attributes-before-sending-uevent.patch +usb-add-association.h.patch +usb-add-telstra-nextg-cdma-id-to-option-driver.patch +usb-isp1760-fix-printk-format.patch +usb-fix-integer-as-null-pointer-warnings-found-by-sparse.patch +usb-support-for-the-et502hs-hdspa-modem.patch +usb-support-for-the-et502hs-hdspa-modem-in-option-driver.patch +usb-add-zoom-telephonics-model-3095f-v.92-usb-mini-external-modem-to-cdc-acm.patch +usb-fix-unusual_devs.h-ordering.patch +usb-c67x00-build-fix.patch +usb-do-not-handle-device-1410-5010-in-option-driver.patch +usb-fix-compile-warning-in-isp1760.patch +usb-use-get_unaligned_-helpers-for-kl5kusb105-driver.patch +usb-serial-gadget-cleanup-reorg.patch +usb-serial-gadget-remove-needless-data-structure.patch +usb-serial-gadget-simplify-endpoint-handling.patch +usb-serial-gadget-descriptor-cleanup.patch +usb-unusual_devs-add-support-for-gi-0401-sd-card-interface.patch +Importing driver-core based on quilt/usb.current +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core quilt/usb.current +Switched to a new branch "quilt/driver-core" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +sysfs-add-sys-dev-char-block-to-lookup-sysfs-path-by-major-minor.patch +kobject-replace-with-in-name.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch +pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.patch +pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch +driver-core-remove-kobj_name_len-define.patch +driver-core-remove-device_name_size-define.patch +driver-core-remove-device_id_size-define.patch +driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/driver-core +Switched to a new branch "quilt/usb" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +ti_usb-kick-firmware-into-user-space.patch +usb-add-new-routine-for-checking-port-resume-type.patch +usb-debounce-before-unregistering.patch +usb-simplify-hub_restart-logic.patch +usb-try-to-salvage-lost-power-sessions.patch +usb-optimize-port-debouncing-during-hub-activation.patch +usb-combine-hub_activate-and-hub_restart.patch +usb-combine-hub_quiesce-and-hub_stop.patch +usb-io_ti-first-cut-at-a-big-clean-up.patch +usb-storage-separate-dynamic-flags-from-fixed-flags.patch +usb-storage-change-remaining-semaphore-to-completion.patch +usb-isp1760-hcd.c-make-2-functions-static.patch +usb-implement-soft-unbinding.patch +usb-storage-implement-soft-unbinding.patch +usb-add-usb_dev_reset_delayed.patch +wusb-documentation.patch +bitmap-add-bitmap_copy_le.patch +wusb-add-usb-specific-wusb-include-files.patch +wusb-add-the-uwb-include-files.patch +uwb-add-the-uwb-stack.patch +wusb-add-whc-rc-radio-control-driver.patch +.dotest/patch:494: space before tab in indent. + whcrc->umc_dev = umc_dev; +.dotest/patch:507: space before tab in indent. + result = whcrc_setup_rc_umc(whcrc); +.dotest/patch:509: space before tab in indent. + dev_err(dev, "Can't setup RC UMC interface: %d\n", result); +.dotest/patch:514: space before tab in indent. + dev_err(dev, "Can't setup RC interface: %d\n", result); +.dotest/patch:576: space before tab in indent. + .probe = whcrc_probe, +warning: squelched 1 whitespace error +warning: 6 lines add whitespace errors. +wusb-add-hwa-rc-radio-controller-driver.patch +wusb-add-uwb-core-for-wimedia-link-protocol.patch +wusb-add-the-i1480-driver.patch +.dotest/patch:969: space before tab in indent. + const struct firmware *fw; +.dotest/patch:1329: space before tab in indent. + const struct firmware *fw; +.dotest/patch:3487: space before tab in indent. + "Dropping\n", untd_hdr->reserved1); +.dotest/patch:4783: space before tab in indent. + /* +warning: 4 lines add whitespace errors. +wusb-add-the-usb-wireless-core-code.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-add-the-wire-adapter-core.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.25-rc1 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25-rc1 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +Importing i2c based on 2.6.26-rc2 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c v2.6.26-rc2 +Switched to a new branch "quilt/i2c" +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-new-co-maintainer.patch +i2c-nforce2-blacklist-1-mainboard.patch +i2c-davinci-01-clock-between-7-12-mhz.patch +i2c-davinci-02-move-dev_dbg-statement-for-more-output.patch +i2c-davinci-03-remove-useless-ivr-read.patch +i2c-davinci-04-fix-signal-handling-bug.patch +i2c-davinci-05-initialize-cmd_complete-sooner.patch +i2c-nforce2-add-tyan-s4985-spport.patch +i2c-remove-3-deprecated-bus-drivers.patch +i2c-acpi-check-conflict.patch +Importing kernel-doc based on 2.6.25-git13 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc a01e035ebb552223c03f2d9138ffc73f2d4d3965 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --author Randy Dunlap <randy.dunlap@oracle.com> --patches ../quilt/kernel-doc +doc-move-initrd-txt.patch +Importing ide based on commit f74d505b58d36ceeef10e459094f0eb760681165 +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide f74d505b58d36ceeef10e459094f0eb760681165 +Switched to a new branch "quilt/ide" +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +swarm-ide-fix-up-following-changes-to-ide_hwif_t.patch +ide-make-ide-iops-c-select_mask-static.patch +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +ide-remove-obsoleted-ide-parameters.patch +ide-eliminate-fit-macro.patch +ide-tape-use-clamp_t-rather-than-nested-min_t-_max_t.patch +ide-use-get_unaligned_-helpers.patch +ide-set-req_preempt-request-flag-in-ide_do_drive_cmd-users.patch +ide-use-__generic_unplug_device-in-ide_do_drive_cmd.patch +ide-cd-convert-ide_cd_queue_pc-to-use-blk_execute_rq.patch +ide-cd-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-disk-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-floppy-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-taskfile-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-tape-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-convert-ide_do_drive_cmd-path-to-use-blk_execute_rq.patch +ide-remove-ide_wait_head_wait-path-in-ide_do_drive_cmd.patch +ide-remove-ide_init_drive_cmd.patch +ide-cd-remove-ide_cd_init_rq.patch +block-convert-pd_special_command-to-use-blk_execute_rq.patch +block-remove-the-checking-for-null-queue-in-blk_put_request.patch +block-unexport-blk_end_sync_rq.patch +ide-remove-try_to_flush_leftover_data.patch +sgiioc4-use-extra_base-instead-of-dma_status-for-dma_handle.patch +ide-remove-commented-out-code-from-ide_config_drive_speed.patch +ide-fix-do_probe-to-use-select_drive.patch +ide-remove-ide_tflag_no_select_mask-taskfile-flag.patch +ide-move-irq-unmasking-out-from-tf_load-method.patch +ide-remove-mmio-flag-from-ide_hwif_t.patch +Importing m68k based on 28a4acb48586dc21d2d14a75a7aab7be78b7c83b +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k 28a4acb48586dc21d2d14a75a7aab7be78b7c83b +Switched to a new branch "quilt/m68k" +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-convert-access_ok-to-inline-func.diff +m68k-kill-CONFIG_FB_DAFB.diff +m68k-correct-FB_HP300-dependencies.diff +m68k-whippet-serial-no-longer-exists.diff +m68k-vme_scc-globals.diff +m68k-silence-BUG-can-return-warnings.diff +m68k-hp300-breaks-multi-platform.diff +m68k-macide-breaks-multi-platform.diff +m68k-dnfb-breaks-multi-platform.diff +m68k-net-drivers-break-multiplatform.diff +m68k-input-drivers-break-multiplatform.diff +m68k-initcalls-should-return-ENODEV-if-device-not-found.diff +m68k-q40-floppy-is-broken.diff +m68k-update-defconfig.diff +m68k-add-multi_defconfig.diff +m68k-export-m68k_mmutype.diff +Importing rr based on v2.6.26-rc1-241-gc4f51b4 +$ git branch -D quilt/rr +Deleted branch quilt/rr. +$ git checkout -b quilt/rr v2.6.26-rc1-241-gc4f51b4 +Switched to a new branch "quilt/rr" +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +virtio:net-fix-dangling-packets.patch +module:modversions-in-vermagic.patch +module:modversions-all-or-nothing.patch +module:whole-vermagic-when-no-modversions.patch +virtio:net_add_ethtool_ops_for_sg_gso.patch +virtio:net_allow_receiving_sg_packets.patch +virtio:transport-features.patch +virtio:vring-enhance.patch +lguest:publish-indices.patch +misc:add_all_cpus_option_to_stop_machine_run.patch +misc:kernel-locking-doc-remove-semaphores.patch +.dotest/patch:61: trailing whitespace. + and <function>mutex_unlock()</function> to release it. There is also a +.dotest/patch:62: trailing whitespace. + <function>mutex_lock()</function>, which should be avoided, because it +.dotest/patch:68: trailing whitespace. + Example: <filename>net/netfilter/nf_sockopt.c</filename> allows +warning: 3 lines add whitespace errors. +misc:kthread-printf-attribute.patch +misc:cast_if_type.patch +misc:typesafe_cb.patch +misc:stop_machine-typesafe.patch +misc:kthread-typesafe.patch +misc:timer-typesafe.patch +misc:down_nowait.patch +misc:down_nowait-documentation.patch +misc:down_nowait-arch_ia64_kernel_salinfo.patch +misc:down_nowait-drivers_char_snsc.patch +misc:down_nowait-drivers_char_viotape.patch +misc:down_nowait-drivers_infiniband_core_user_mad.patch +misc:down_nowait-drivers_input_serio_hil_mlc.patch +misc:down_nowait-drivers_input_serio_hp_sdc_mlc.patch +misc:down_nowait-drivers_md_dm-raid1.patch +misc:down_nowait-drivers_net_3c527.patch +misc:down_nowait-drivers_net_irda_sir_dev.patch +misc:down_nowait-drivers_net_wireless_airo.patch +misc:down_nowait-drivers_scsi_aacraid_commsup.patch +misc:down_nowait-drivers_usb_core_usb.patch +misc:down_nowait-drivers_usb_gadget_inode.patch +misc:down_nowait-drivers_watchdog_ar7_wdt.patch +misc:down_nowait-drivers_watchdog_it8712f_wdt.patch +misc:down_nowait-drivers_watchdog_s3c2410_wdt.patch +misc:down_nowait-drivers_watchdog_sc1200wdt.patch +misc:down_nowait-drivers_watchdog_scx200_wdt.patch +misc:down_nowait-drivers_watchdog_wdt_pci.patch +misc:down_nowait-fs_reiserfs_journal.patch +misc:down_nowait-xfs.patch +misc:down_nowait-kernel_printk.patch +stop_machine:short_exit_path_for_if_we_cannot_create_enough_threads.patch +stop_machine:add_timeout_for_child_thread_deployment.patch +stop_machine:add_stopmachine_timeout_sysctl_entry.patch +Importing ldp.next based on quilt/usb +$ git branch -D quilt/ldp.next +Deleted branch quilt/ldp.next. +$ git checkout -b quilt/ldp.next quilt/usb +Switched to a new branch "quilt/ldp.next" +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/ldp.next +usb-add-option-hso-driver.patch diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0b0187d3f0a6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080514 |