diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-15 19:40:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-15 19:40:35 +1000 |
| commit | 9544194c7b7968fa36a68d4b89e5bcc676fbee70 (patch) | |
| tree | bbaba89fb85a276e23924635fe0203a66e37578a | |
| parent | 54afd97d4f0a1b249e99a969077e2dbaedf73c6e (diff) | |
Add linux-next specific filesnext-20080415
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 61 | ||||
| -rw-r--r-- | Next/merge.log | 6058 | ||||
| -rw-r--r-- | Next/quilt-import.log | 603 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6723 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..eda0ca5c3282 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,61 @@ +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 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/ +pci quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/ +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 +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.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-2.6.26.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-2.6.26.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 +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +x86-latest git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#latest +sched-latest git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#latest +ldp quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d4f303fd5837 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6058 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 120dd64 Linux 2.6.25-rc9 +Merging origin/master +$ git merge origin/master +Updating 120dd64..a985aab +Fast forward + arch/frv/kernel/traps.c | 2 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/sata_svw.c | 4 +- + drivers/isdn/i4l/isdn_net.c | 1 + + drivers/net/ehea/ehea.h | 3 +- + drivers/net/ehea/ehea_main.c | 24 +++++++++++++++- + drivers/net/forcedeth.c | 26 ++++++++++++++++- + drivers/net/fs_enet/fs_enet-main.c | 3 +- + drivers/net/macb.c | 14 +++++---- + drivers/net/sc92031.c | 1 + + drivers/net/sky2.c | 1 + + drivers/net/smc91x.c | 2 + + drivers/net/tg3.c | 7 +++-- + drivers/net/tun.c | 38 +++++++++++++++++++++++++- + drivers/net/ucc_geth.c | 53 ++++++++++++++++++++--------------- + drivers/net/wan/Kconfig | 6 +++- + include/linux/Kbuild | 2 +- + include/linux/if_tun.h | 39 -------------------------- + include/linux/ipv6.h | 2 +- + include/net/inet_ecn.h | 2 +- + include/net/sctp/command.h | 1 + + include/net/sctp/ulpevent.h | 2 +- + kernel/sched_fair.c | 6 +--- + net/ax25/ax25_uid.c | 2 + + net/bridge/br_netfilter.c | 3 +- + net/core/skbuff.c | 4 +- + net/core/sock.c | 2 +- + net/dccp/dccp.h | 6 ++++ + net/dccp/ipv4.c | 1 - + net/dccp/output.c | 1 - + net/dccp/proto.c | 3 ++ + net/ethernet/eth.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++- + net/ipv6/addrconf.c | 19 +++++++------ + net/ipv6/raw.c | 6 +++- + net/sched/cls_u32.c | 12 ++++++-- + net/sctp/ipv6.c | 5 ++- + net/sctp/outqueue.c | 3 ++ + net/sctp/protocol.c | 4 ++- + net/sctp/sm_make_chunk.c | 29 +++++++++++++++++-- + net/sctp/sm_sideeffect.c | 3 ++ + net/sctp/sm_statefuns.c | 23 ++++++++++++++- + net/sctp/socket.c | 5 ++- + net/sctp/ulpevent.c | 2 +- + 44 files changed, 256 insertions(+), 124 deletions(-) +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Merge made by recursive. + arch/x86/pci/irq.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Merge made by recursive. +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 quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + Documentation/ABI/testing/sysfs-ibft | 23 + + Documentation/DocBook/kernel-api.tmpl | 5 - + Documentation/filesystems/sysfs.txt | 9 +- + Documentation/power/devices.txt | 5 + + MAINTAINERS | 5 + + arch/arm/Kconfig | 2 + + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/setup_32.c | 3 + + arch/x86/kernel/setup_64.c | 4 + + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + block/bsg.c | 11 +- + drivers/ata/ahci.c | 4 +- + drivers/ata/libata-scsi.c | 15 +- + drivers/base/attribute_container.c | 77 +- + drivers/base/bus.c | 17 +- + drivers/base/class.c | 8 +- + drivers/base/core.c | 59 +- + drivers/base/cpu.c | 4 +- + drivers/base/dd.c | 14 +- + drivers/base/firmware_class.c | 18 +- + drivers/base/memory.c | 33 +- + drivers/base/power/main.c | 106 +-- + drivers/base/power/power.h | 23 +- + drivers/base/power/sysfs.c | 2 + + drivers/base/sys.c | 18 +- + drivers/base/transport_class.c | 14 +- + drivers/char/drm/drmP.h | 1 - + drivers/char/hw_random/core.c | 10 +- + drivers/char/misc.c | 13 +- + drivers/firmware/Kconfig | 20 + + drivers/firmware/Makefile | 2 + + drivers/firmware/iscsi_ibft.c | 982 ++++++++++++++++++++ + drivers/firmware/iscsi_ibft_find.c | 84 ++ + drivers/infiniband/core/sysfs.c | 76 +- + drivers/infiniband/core/ucm.c | 62 +- + drivers/infiniband/core/user_mad.c | 109 ++-- + drivers/infiniband/core/uverbs.h | 4 +- + drivers/infiniband/core/uverbs_main.c | 51 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 +- + drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- + drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- + drivers/infiniband/hw/mlx4/main.c | 49 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- + drivers/infiniband/hw/nes/nes_verbs.c | 48 +- + drivers/infiniband/ulp/srp/ib_srp.c | 181 ++-- + drivers/infiniband/ulp/srp/ib_srp.h | 4 +- + drivers/leds/led-class.c | 11 +- + drivers/memstick/core/memstick.c | 33 +- + drivers/memstick/core/mspro_block.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 16 +- + drivers/message/fusion/mptscsih.c | 122 ++-- + drivers/message/fusion/mptscsih.h | 2 +- + drivers/misc/enclosure.c | 118 ++-- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/wireless/b43/leds.c | 5 +- + drivers/net/wireless/b43/main.c | 8 +- + drivers/scsi/3w-9xxx.c | 9 +- + drivers/scsi/3w-xxxx.c | 9 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/aacraid.h | 4 +- + drivers/scsi/aacraid/linit.c | 93 ++- + drivers/scsi/arcmsr/arcmsr.h | 4 +- + drivers/scsi/arcmsr/arcmsr_attr.c | 163 ++-- + drivers/scsi/ch.c | 13 +- + drivers/scsi/hosts.c | 34 +- + drivers/scsi/hptiop.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- + drivers/scsi/ipr.c | 140 ++-- + drivers/scsi/lpfc/lpfc_attr.c | 484 +++++----- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/megaraid/megaraid_mbox.c | 13 +- + drivers/scsi/ncr53c8xx.c | 7 +- + drivers/scsi/osst.c | 76 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- + drivers/scsi/qla2xxx/qla_attr.c | 177 ++-- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/raid_class.c | 73 +- + drivers/scsi/scsi_sas_internal.h | 24 +- + drivers/scsi/scsi_sysfs.c | 150 ++-- + drivers/scsi/scsi_transport_fc.c | 385 +++++---- + drivers/scsi/scsi_transport_iscsi.c | 107 ++- + drivers/scsi/scsi_transport_sas.c | 157 ++-- + drivers/scsi/scsi_transport_spi.c | 185 ++-- + drivers/scsi/scsi_transport_srp.c | 26 +- + drivers/scsi/sd.c | 78 +- + drivers/scsi/ses.c | 28 +- + drivers/scsi/sg.c | 36 +- + drivers/scsi/st.c | 71 +- + drivers/serial/serial_core.c | 2 +- + drivers/uio/Kconfig | 23 +- + drivers/uio/Makefile | 1 + + drivers/uio/uio.c | 36 +- + drivers/uio/uio_cif.c | 6 +- + drivers/uio/uio_smx.c | 140 +++ + fs/partitions/check.c | 4 + + fs/sysfs/dir.c | 1 + + fs/sysfs/file.c | 19 +- + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/attribute_container.h | 28 +- + include/linux/bsg.h | 2 +- + include/linux/device.h | 35 +- + include/linux/enclosure.h | 11 +- + include/linux/hw_random.h | 10 +- + include/linux/init.h | 1 + + include/linux/iscsi_ibft.h | 50 + + include/linux/kernel.h | 6 +- + include/linux/leds.h | 10 +- + include/linux/libata.h | 2 +- + include/linux/memory.h | 5 +- + include/linux/memstick.h | 2 +- + include/linux/miscdevice.h | 10 +- + include/linux/pm.h | 43 +- + include/linux/pm_wakeup.h | 90 ++ + include/linux/raid_class.h | 12 +- + include/linux/sysfs.h | 14 +- + include/linux/transport_class.h | 6 +- + include/rdma/ib_verbs.h | 2 +- + include/scsi/scsi_device.h | 10 +- + include/scsi/scsi_host.h | 7 +- + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 14 +- + include/scsi/scsi_transport_sas.h | 12 +- + include/scsi/sd.h | 4 +- + init/main.c | 9 + + lib/kobject.c | 71 ++- + mm/memory_hotplug.c | 2 +- + .../firmware_class/firmware_sample_driver.c | 49 +- + .../firmware_sample_firmware_class.c | 39 +- + scripts/mod/file2alias.c | 57 +- + 136 files changed, 3959 insertions(+), 2326 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-ibft + create mode 100644 drivers/firmware/iscsi_ibft.c + create mode 100644 drivers/firmware/iscsi_ibft_find.c + create mode 100644 drivers/uio/uio_smx.c + create mode 100644 include/linux/iscsi_ibft.h + create mode 100644 include/linux/pm_wakeup.h + rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) + rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) +Merging quilt/pci +$ git merge quilt/pci +Merge made by recursive. + Documentation/00-INDEX | 10 - + Documentation/ABI/testing/sysfs-bus-pci | 11 + + Documentation/PCI/00-INDEX | 12 + + Documentation/{ => PCI}/PCIEBUS-HOWTO.txt | 12 +- + Documentation/{ => PCI}/pci-error-recovery.txt | 0 + Documentation/{ => PCI}/pci.txt | 2 +- + Documentation/{ => PCI}/pcieaer-howto.txt | 2 +- + Documentation/ide/ide.txt | 2 - + Documentation/kernel-parameters.txt | 10 +- + Documentation/memory-barriers.txt | 4 +- + arch/alpha/kernel/pci.c | 23 +- + arch/frv/mb93090-mb00/pci-frv.h | 2 - + arch/frv/mb93090-mb00/pci-vdk.c | 53 -- + arch/ia64/pci/pci.c | 44 +-- + arch/mn10300/unit-asb2305/pci-asb2305.h | 2 - + arch/parisc/kernel/pci.c | 30 +- + arch/powerpc/kernel/pci-common.c | 34 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- + arch/ppc/kernel/pci.c | 59 +-- + arch/sh/drivers/pci/pci-sh4.h | 2 - + arch/x86/kernel/pci-calgary_64.c | 3 +- + arch/x86/pci/acpi.c | 11 +- + arch/x86/pci/common.c | 63 +-- + arch/x86/pci/i386.c | 38 -- + arch/x86/pci/pcbios.c | 72 --- + arch/x86/pci/pci.h | 4 - + drivers/ide/Kconfig | 9 +- + drivers/ide/ide-scan-pci.c | 9 +- + drivers/ide/ide.c | 12 - + drivers/parisc/dino.c | 1 - + drivers/pci/access.c | 166 +++++ + drivers/pci/bus.c | 15 +- + drivers/pci/hotplug/Kconfig | 4 +- + drivers/pci/hotplug/acpi_pcihp.c | 24 +- + drivers/pci/hotplug/acpiphp_core.c | 18 +- + drivers/pci/hotplug/acpiphp_glue.c | 38 +- + drivers/pci/hotplug/acpiphp_ibm.c | 36 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 60 +- + drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- + drivers/pci/hotplug/cpcihp_generic.c | 8 +- + drivers/pci/hotplug/cpqphp.h | 6 +- + drivers/pci/hotplug/cpqphp_core.c | 38 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 64 +- + drivers/pci/hotplug/cpqphp_nvram.c | 2 +- + drivers/pci/hotplug/cpqphp_pci.c | 8 +- + drivers/pci/hotplug/fakephp.c | 4 +- + drivers/pci/hotplug/ibmphp_core.c | 30 +- + drivers/pci/hotplug/ibmphp_ebda.c | 92 ++-- + drivers/pci/hotplug/ibmphp_hpc.c | 68 +- + drivers/pci/hotplug/ibmphp_pci.c | 18 +- + drivers/pci/hotplug/ibmphp_res.c | 12 +- + drivers/pci/hotplug/pci_hotplug_core.c | 2 +- + drivers/pci/hotplug/pciehp.h | 2 +- + drivers/pci/hotplug/pciehp_core.c | 32 +- + drivers/pci/hotplug/pciehp_ctrl.c | 34 +- + drivers/pci/hotplug/pciehp_hpc.c | 144 +++--- + drivers/pci/hotplug/pciehp_pci.c | 8 +- + drivers/pci/hotplug/pcihp_skeleton.c | 18 +- + drivers/pci/hotplug/rpadlpar_core.c | 20 +- + drivers/pci/hotplug/rpaphp_core.c | 6 +- + drivers/pci/hotplug/rpaphp_pci.c | 14 +- + drivers/pci/hotplug/rpaphp_slot.c | 6 +- + drivers/pci/hotplug/sgi_hotplug.c | 8 +- + drivers/pci/hotplug/shpchp.h | 6 +- + drivers/pci/hotplug/shpchp_core.c | 26 +- + drivers/pci/hotplug/shpchp_ctrl.c | 46 +- + drivers/pci/hotplug/shpchp_hpc.c | 64 +- + drivers/pci/hotplug/shpchp_pci.c | 4 +- + drivers/pci/intel-iommu.c | 147 ++++- + drivers/pci/iova.c | 50 +- + drivers/pci/iova.h | 2 + + drivers/pci/pci-sysfs.c | 114 +++- + drivers/pci/pci.c | 6 +- + drivers/pci/pci.h | 19 + + drivers/pci/pcie/Kconfig | 20 + + drivers/pci/pcie/Makefile | 3 + + drivers/pci/pcie/aer/aerdrv.c | 4 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 5 +- + drivers/pci/pcie/aer/aerdrv_core.c | 5 +- + drivers/pci/pcie/aspm.c | 811 ++++++++++++++++++++++++ + drivers/pci/pcie/portdrv_core.c | 4 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 73 +-- + drivers/pci/quirks.c | 17 +- + drivers/pci/remove.c | 14 +- + drivers/pci/search.c | 313 ++++------ + drivers/pci/setup-bus.c | 3 + + drivers/pci/setup-res.c | 87 ++- + include/asm-sh/mpc1211/pci.h | 2 - + include/linux/aer.h | 5 - + include/linux/ide.h | 1 - + include/linux/ioport.h | 5 +- + include/linux/pci-aspm.h | 56 ++ + include/linux/pci.h | 30 +- + include/linux/pci_regs.h | 8 + + kernel/resource.c | 18 + + 96 files changed, 2208 insertions(+), 1320 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci + create mode 100644 Documentation/PCI/00-INDEX + rename Documentation/{ => PCI}/PCIEBUS-HOWTO.txt (98%) + rename Documentation/{ => PCI}/pci-error-recovery.txt (100%) + rename Documentation/{ => PCI}/pci.txt (99%) + rename Documentation/{ => PCI}/pcieaer-howto.txt (99%) + create mode 100644 drivers/pci/pcie/aspm.c + create mode 100644 include/linux/pci-aspm.h +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + Documentation/DocBook/writing_usb_driver.tmpl | 14 +- + Documentation/usb/WUSB-Design-overview.txt | 448 +++ + Documentation/usb/anchors.txt | 50 + + Documentation/usb/persist.txt | 43 +- + Documentation/usb/usb-serial.txt | 7 +- + Documentation/usb/wusb-cbaf | 136 + + drivers/input/joystick/xpad.c | 20 +- + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/atm/ueagle-atm.c | 6 +- + drivers/usb/atm/usbatm.c | 27 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/class/cdc-acm.c | 88 +- + drivers/usb/class/cdc-acm.h | 7 +- + drivers/usb/core/Kconfig | 42 +- + drivers/usb/core/config.c | 17 + + drivers/usb/core/devio.c | 46 +- + drivers/usb/core/driver.c | 51 +- + drivers/usb/core/hcd-pci.c | 15 +- + drivers/usb/core/hcd.c | 16 +- + drivers/usb/core/hcd.h | 7 +- + drivers/usb/core/hub.c | 470 ++- + drivers/usb/core/hub.h | 9 +- + drivers/usb/core/inode.c | 4 +- + drivers/usb/core/message.c | 17 +- + drivers/usb/core/quirks.c | 14 + + drivers/usb/core/sysfs.c | 22 +- + drivers/usb/core/urb.c | 26 +- + drivers/usb/core/usb.h | 2 - + drivers/usb/gadget/Kconfig | 18 +- + drivers/usb/gadget/amd5536udc.c | 10 + + drivers/usb/gadget/at91_udc.c | 9 +- + drivers/usb/gadget/dummy_hcd.c | 98 +- + drivers/usb/gadget/epautoconf.c | 12 +- + drivers/usb/gadget/ether.c | 18 +- + drivers/usb/gadget/file_storage.c | 8 +- + drivers/usb/gadget/fsl_usb2_udc.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.h | 2 +- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/goku_udc.c | 20 +- + drivers/usb/gadget/inode.c | 18 +- + drivers/usb/gadget/lh7a40x_udc.c | 132 +- + drivers/usb/gadget/m66592-udc.h | 2 +- + drivers/usb/gadget/net2280.h | 2 +- + drivers/usb/gadget/omap_udc.c | 20 +- + drivers/usb/gadget/printer.c | 92 +- + drivers/usb/gadget/pxa2xx_udc.c | 26 +- + drivers/usb/gadget/rndis.c | 148 +- + drivers/usb/gadget/serial.c | 3 +- + drivers/usb/host/Kconfig | 10 +- + drivers/usb/host/ehci-au1xxx.c | 5 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-hcd.c | 113 +- + drivers/usb/host/ehci-hub.c | 17 +- + drivers/usb/host/ehci-ixp4xx.c | 3 +- + drivers/usb/host/ehci-pci.c | 6 +- + drivers/usb/host/ehci-ppc-soc.c | 5 +- + drivers/usb/host/ehci-ps3.c | 1 - + drivers/usb/host/ehci-q.c | 70 +- + drivers/usb/host/ehci-sched.c | 46 +- + drivers/usb/host/isp116x-hcd.c | 12 +- + drivers/usb/host/ohci-at91.c | 1 + + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-ep93xx.c | 4 +- + drivers/usb/host/ohci-hub.c | 67 +- + drivers/usb/host/ohci-omap.c | 7 +- + drivers/usb/host/ohci-pci.c | 46 +- + drivers/usb/host/ohci-ps3.c | 1 - + drivers/usb/host/ohci-pxa27x.c | 5 +- + drivers/usb/host/ohci-sm501.c | 15 +- + drivers/usb/host/ohci-ssb.c | 36 +- + drivers/usb/host/pci-quirks.c | 6 +- + drivers/usb/host/r8a66597-hcd.c | 256 +- + drivers/usb/host/r8a66597.h | 51 +- + drivers/usb/host/sl811-hcd.c | 12 +- + drivers/usb/host/u132-hcd.c | 5127 ++++++++++++------------- + drivers/usb/host/uhci-hcd.c | 16 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/image/Kconfig | 4 +- + drivers/usb/image/microtek.c | 3 +- + drivers/usb/image/microtek.h | 1 - + drivers/usb/misc/Kconfig | 29 +- + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/adutux.c | 120 +- + drivers/usb/misc/appledisplay.c | 6 +- + drivers/usb/misc/auerswald.c | 135 +- + drivers/usb/misc/emi26.c | 30 +- + drivers/usb/misc/emi62.c | 32 +- + drivers/usb/misc/ftdi-elan.c | 2 +- + drivers/usb/misc/gotemp.c | 295 ++ + drivers/usb/misc/iowarrior.c | 10 +- + drivers/usb/misc/ldusb.c | 10 +- + drivers/usb/misc/legousbtower.c | 92 +- + drivers/usb/misc/phidgetkit.c | 6 +- + drivers/usb/misc/phidgetmotorcontrol.c | 2 +- + drivers/usb/misc/phidgetservo.c | 6 +- + drivers/usb/misc/usblcd.c | 8 +- + drivers/usb/misc/usbtest.c | 13 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 9 +- + drivers/usb/mon/mon_main.c | 3 +- + drivers/usb/serial/Kconfig | 76 +- + drivers/usb/serial/Makefile | 3 +- + drivers/usb/serial/aircable.c | 52 +- + drivers/usb/serial/airprime.c | 34 +- + drivers/usb/serial/ark3116.c | 7 +- + drivers/usb/serial/belkin_sa.c | 20 +- + drivers/usb/serial/console.c | 10 +- + drivers/usb/serial/cp2101.c | 108 +- + drivers/usb/serial/cyberjack.c | 109 +- + drivers/usb/serial/cypress_m8.c | 567 ++-- + drivers/usb/serial/digi_acceleport.c | 44 +- + drivers/usb/serial/empeg.c | 56 +- + drivers/usb/serial/ezusb.c | 8 +- + drivers/usb/serial/ftdi_sio.c | 168 +- + drivers/usb/serial/garmin_gps.c | 112 +- + drivers/usb/serial/generic.c | 53 +- + drivers/usb/serial/io_edgeport.c | 326 +- + drivers/usb/serial/io_ti.c | 392 +- + drivers/usb/serial/ipaq.c | 54 +- + drivers/usb/serial/ipw.c | 48 +- + drivers/usb/serial/ir-usb.c | 50 +- + drivers/usb/serial/iuu_phoenix.c | 162 +- + drivers/usb/serial/keyspan.c | 281 +- + drivers/usb/serial/keyspan_pda.c | 33 +- + drivers/usb/serial/kl5kusb105.c | 121 +- + drivers/usb/serial/kobil_sct.c | 71 +- + drivers/usb/serial/mct_u232.c | 38 +- + drivers/usb/serial/mos7720.c | 119 +- + drivers/usb/serial/mos7840.c | 159 +- + drivers/usb/serial/navman.c | 28 +- + drivers/usb/serial/omninet.c | 39 +- + drivers/usb/serial/option.c | 145 +- + drivers/usb/serial/oti6858.c | 118 +- + drivers/usb/serial/pl2303.c | 114 +- + drivers/usb/serial/safe_serial.c | 57 +- + drivers/usb/serial/sierra.c | 125 +- + drivers/usb/serial/spcp8x5.c | 1075 ++++++ + drivers/usb/serial/ti_usb_3410_5052.c | 205 +- + drivers/usb/serial/usb-serial.c | 93 +- + drivers/usb/serial/visor.c | 94 +- + drivers/usb/serial/whiteheat.c | 112 +- + drivers/usb/storage/Kconfig | 39 +- + drivers/usb/storage/Makefile | 1 + + drivers/usb/storage/cypress_atacb.c | 200 + + drivers/usb/storage/cypress_atacb.h | 25 + + drivers/usb/storage/libusual.c | 14 +- + drivers/usb/storage/scsiglue.c | 26 +- + drivers/usb/storage/transport.c | 23 +- + drivers/usb/storage/unusual_devs.h | 104 +- + drivers/usb/storage/usb.c | 26 +- + drivers/usb/usb-skeleton.c | 8 +- + include/linux/bitmap.h | 1 + + include/linux/usb.h | 199 +- + include/linux/usb/audio.h | 2 +- + include/linux/usb/cdc.h | 4 + + include/linux/usb/ch9.h | 17 +- + include/linux/usb/g_printer.h | 4 + + include/linux/usb/gadget.h | 2 +- + include/linux/usb/gadgetfs.h | 16 +- + include/linux/usb/input.h | 8 +- + include/linux/usb/iowarrior.h | 6 +- + include/linux/usb/isp116x.h | 6 +- + include/linux/usb/midi.h | 2 +- + include/linux/usb/net2280.h | 9 +- + include/linux/usb/otg.h | 6 +- + include/linux/usb/quirks.h | 5 + + include/linux/usb/rndis_host.h | 9 +- + include/linux/usb/serial.h | 3 +- + include/linux/usb/sl811.h | 5 +- + include/linux/usb/usbnet.h | 8 +- + include/linux/usb/wusb-wa.h | 284 ++ + include/linux/usb/wusb.h | 420 ++ + include/linux/usb_usual.h | 1 + + include/linux/uwb.h | 770 ++++ + include/linux/uwb/bugs-macros.h | 64 + + include/linux/uwb/bugs.h | 41 + + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 + + include/linux/uwb/spec.h | 650 ++++ + 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 + + scripts/checkpatch.pl | 7 + + 186 files changed, 12598 insertions(+), 6216 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/anchors.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/serial/spcp8x5.c + create mode 100644 drivers/usb/storage/cypress_atacb.c + create mode 100644 drivers/usb/storage/cypress_atacb.h + 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 +Auto-merged Documentation/kernel-parameters.txt +Removed arch/x86/kernel/mpparse_64.c +Auto-merged arch/x86/kernel/msr.c +Auto-merged arch/x86/kernel/setup_32.c +Auto-merged arch/x86/kernel/setup_64.c +Removed arch/x86/kernel/smp_32.c +Removed arch/x86/kernel/smp_64.c +Removed arch/x86/kernel/smpboot_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Removed arch/x86/mach-rdc321x/wdt.c +Removed arch/x86/mm/Makefile_32 +Removed arch/x86/mm/Makefile_64 +Auto-merged arch/x86/pci/i386.c +Removed include/asm-x86/mach-default/mach_reboot.h +Removed include/asm-x86/mach_apic.h +Removed include/asm-x86/nmi_32.h +Removed include/asm-x86/nmi_64.h +Removed include/asm-x86/smp_32.h +Removed include/asm-x86/smp_64.h +Auto-merged init/main.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 2 +- + Documentation/i386/boot.txt | 28 + + Documentation/kernel-parameters.txt | 18 + + Documentation/x86/pat.txt | 100 ++ + Documentation/x86_64/boot-options.txt | 5 + + arch/x86/Kconfig | 95 ++- + arch/x86/Kconfig.cpu | 3 +- + arch/x86/Kconfig.debug | 62 ++- + arch/x86/Makefile | 7 +- + arch/x86/boot/Makefile | 14 + + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/misc.c | 202 +++-- + arch/x86/boot/cpucheck.c | 20 +- + arch/x86/boot/header.S | 6 +- + arch/x86/boot/pm.c | 2 +- + arch/x86/boot/tools/build.c | 88 ++- + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/ia32/ia32entry.S | 12 +- + arch/x86/ia32/sys_ia32.c | 31 +- + arch/x86/kernel/Makefile | 21 +- + arch/x86/kernel/acpi/boot.c | 67 +- + arch/x86/kernel/alternative.c | 103 ++- + arch/x86/kernel/aperture_64.c | 6 +- + arch/x86/kernel/apic_32.c | 224 ++++- + arch/x86/kernel/apic_64.c | 140 +++- + arch/x86/kernel/apm_32.c | 5 +- + arch/x86/kernel/asm-offsets_32.c | 2 +- + arch/x86/kernel/bugs_64.c | 14 +- + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/amd.c | 121 ++- + arch/x86/kernel/cpu/centaur.c | 490 +++++----- + arch/x86/kernel/cpu/common.c | 182 ++-- + arch/x86/kernel/cpu/cpu.h | 26 +- + arch/x86/kernel/cpu/cyrix.c | 136 ++-- + arch/x86/kernel/cpu/feature_names.c | 2 +- + arch/x86/kernel/cpu/intel.c | 106 +- + arch/x86/kernel/cpu/mcheck/mce_32.c | 50 +- + arch/x86/kernel/cpu/mcheck/non-fatal.c | 21 +- + arch/x86/kernel/cpu/mcheck/p5.c | 16 +- + arch/x86/kernel/cpu/mcheck/p6.c | 48 +- + arch/x86/kernel/cpu/mcheck/winchip.c | 8 +- + arch/x86/kernel/cpu/mtrr/generic.c | 139 +++ + arch/x86/kernel/cpu/mtrr/if.c | 7 +- + arch/x86/kernel/cpu/mtrr/main.c | 2 +- + arch/x86/kernel/cpu/mtrr/state.c | 14 +- + arch/x86/kernel/cpu/nexgen.c | 15 +- + arch/x86/kernel/cpu/proc.c | 170 ++- + arch/x86/kernel/cpu/transmeta.c | 30 +- + arch/x86/kernel/cpu/umc.c | 19 +- + arch/x86/kernel/crash.c | 4 - + arch/x86/kernel/ds.c | 8 +- + arch/x86/kernel/e820_32.c | 27 +- + arch/x86/kernel/e820_64.c | 151 ++- + arch/x86/kernel/early_printk.c | 24 +- + arch/x86/kernel/efi.c | 18 +- + arch/x86/kernel/efi_64.c | 12 +- + arch/x86/kernel/entry_32.S | 39 +- + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/genapic_64.c | 47 +- + arch/x86/kernel/genapic_flat_64.c | 7 +- + arch/x86/kernel/genx2apic_uv_x.c | 245 +++++ + arch/x86/kernel/head32.c | 14 + + arch/x86/kernel/head64.c | 80 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 24 +- + arch/x86/kernel/i387.c | 88 +- + arch/x86/kernel/io_apic_32.c | 164 ++-- + arch/x86/kernel/io_apic_64.c | 63 +- + arch/x86/kernel/ipi.c | 178 ++++ + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/kprobes.c | 14 +- + arch/x86/kernel/mca_32.c | 96 +- + arch/x86/kernel/microcode.c | 16 +- + arch/x86/kernel/{mpparse_32.c => mpparse.c} | 850 +++++++-------- + arch/x86/kernel/mpparse_64.c | 867 --------------- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/nmi_32.c | 14 +- + arch/x86/kernel/nmi_64.c | 2 + + arch/x86/kernel/paravirt.c | 18 +- + arch/x86/kernel/pci-dma_64.c | 20 +- + arch/x86/kernel/process_32.c | 41 +- + arch/x86/kernel/process_64.c | 40 +- + arch/x86/kernel/ptrace.c | 1 - + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/relocate_kernel_32.S | 30 +- + arch/x86/kernel/relocate_kernel_64.S | 40 +- + arch/x86/kernel/rtc.c | 33 +- + arch/x86/kernel/setup.c | 113 ++ + arch/x86/kernel/setup64.c | 81 +-- + arch/x86/kernel/setup_32.c | 91 ++- + arch/x86/kernel/setup_64.c | 230 ++--- + arch/x86/kernel/{sigframe_32.h => sigframe.h} | 14 +- + arch/x86/kernel/signal_32.c | 303 +++--- + arch/x86/kernel/signal_64.c | 108 +-- + arch/x86/kernel/smp.c | 343 ++++++ + arch/x86/kernel/smp_32.c | 712 ------------- + arch/x86/kernel/smp_64.c | 530 --------- + arch/x86/kernel/{smpboot_32.c => smpboot.c} | 1356 +++++++++++++----------- + arch/x86/kernel/smpboot_64.c | 1108 ------------------- + arch/x86/kernel/smpcommon.c | 83 ++ + arch/x86/kernel/smpcommon_32.c | 81 -- + arch/x86/kernel/srat_32.c | 10 +- + arch/x86/kernel/step.c | 2 +- + arch/x86/kernel/summit_32.c | 57 +- + arch/x86/kernel/syscall_64.c | 13 +- + arch/x86/kernel/sysprof.c | 213 ++++ + arch/x86/kernel/test_nx.c | 2 + + arch/x86/kernel/tlb_32.c | 243 +++++ + arch/x86/kernel/tlb_64.c | 274 +++++ + arch/x86/kernel/traps_32.c | 612 ++++++----- + arch/x86/kernel/traps_64.c | 2 + + arch/x86/kernel/tsc_32.c | 16 +- + arch/x86/kernel/tsc_64.c | 3 +- + arch/x86/kernel/vm86_32.c | 213 ++-- + arch/x86/kernel/vmlinux_32.lds.S | 6 + + arch/x86/kernel/vmlinux_64.lds.S | 11 + + arch/x86/kernel/vsmp_64.c | 131 ++- + arch/x86/kernel/x8664_ksyms_64.c | 12 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/lib/memcpy_32.c | 2 +- + arch/x86/lib/memmove_64.c | 8 +- + arch/x86/lib/mmx_32.c | 197 ++-- + arch/x86/lib/string_32.c | 60 +- + arch/x86/lib/strstr_32.c | 4 +- + arch/x86/lib/usercopy_32.c | 122 ++-- + arch/x86/mach-generic/bigsmp.c | 30 +- + arch/x86/mach-generic/default.c | 8 +- + arch/x86/mach-generic/probe.c | 37 +- + arch/x86/mach-generic/summit.c | 8 +- + arch/x86/mach-rdc321x/Makefile | 2 +- + arch/x86/mach-rdc321x/wdt.c | 275 ----- + arch/x86/mach-voyager/voyager_smp.c | 17 +- + arch/x86/math-emu/fpu_entry.c | 1 + + arch/x86/math-emu/reg_ld_str.c | 13 +- + arch/x86/mm/Makefile | 16 +- + arch/x86/mm/Makefile_32 | 9 - + arch/x86/mm/Makefile_64 | 9 - + arch/x86/mm/discontig_32.c | 2 +- + arch/x86/mm/dump_pagetables.c | 354 ++++++ + arch/x86/mm/fault.c | 6 +- + arch/x86/mm/init_32.c | 54 +- + arch/x86/mm/init_64.c | 242 ++++- + arch/x86/mm/ioremap.c | 181 +++- + arch/x86/mm/numa_64.c | 6 +- + arch/x86/mm/pageattr.c | 105 ++- + arch/x86/mm/pat.c | 568 ++++++++++ + arch/x86/mm/pgtable_32.c | 8 +- + arch/x86/mm/srat_64.c | 7 +- + arch/x86/oprofile/init.c | 13 +- + arch/x86/oprofile/nmi_timer_int.c | 6 +- + arch/x86/oprofile/op_model_athlon.c | 46 +- + arch/x86/oprofile/op_model_ppro.c | 52 +- + arch/x86/pci/i386.c | 73 ++- + arch/x86/pci/numa.c | 32 +- + arch/x86/power/cpu_32.c | 41 +- + arch/x86/vdso/Makefile | 2 +- + arch/x86/vdso/vdso32-setup.c | 11 +- + arch/x86/xen/enlighten.c | 7 +- + arch/x86/xen/multicalls.c | 4 +- + arch/x86/xen/smp.c | 6 +- + arch/x86/xen/xen-asm.S | 11 +- + arch/x86/xen/xen-ops.h | 2 +- + drivers/char/mem.c | 133 ++- + include/asm-generic/iomap.h | 4 + + include/asm-generic/vmlinux.lds.h | 1 + + include/asm-x86/Kbuild | 1 + + include/asm-x86/a.out-core.h | 12 +- + include/asm-x86/acpi.h | 8 +- + include/asm-x86/alternative.h | 32 +- + include/asm-x86/apic.h | 7 +- + include/asm-x86/apicdef.h | 69 +- + include/asm-x86/atomic_32.h | 143 ++-- + include/asm-x86/atomic_64.h | 251 +++--- + include/asm-x86/{mach-default => }/bios_ebda.h | 0 + include/asm-x86/bitops.h | 54 +- + include/asm-x86/bitops_32.h | 40 +- + include/asm-x86/bitops_64.h | 40 +- + include/asm-x86/bug.h | 34 +- + include/asm-x86/byteorder.h | 39 +- + include/asm-x86/cacheflush.h | 80 ++- + include/asm-x86/checksum_32.h | 152 ++-- + include/asm-x86/checksum_64.h | 118 +-- + include/asm-x86/cmpxchg_32.h | 253 +++--- + include/asm-x86/cmpxchg_64.h | 134 ++-- + include/asm-x86/compat.h | 2 +- + include/asm-x86/cpufeature.h | 8 +- + include/asm-x86/current_32.h | 2 +- + include/asm-x86/current_64.h | 12 +- + include/asm-x86/desc.h | 61 +- + include/asm-x86/desc_defs.h | 15 +- + include/asm-x86/div64.h | 35 +- + include/asm-x86/dma.h | 45 +- + include/asm-x86/dwarf2_64.h | 9 +- + include/asm-x86/e820_32.h | 4 +- + include/asm-x86/e820_64.h | 24 +- + include/asm-x86/edac.h | 4 +- + include/asm-x86/efi.h | 2 +- + include/asm-x86/elf.h | 112 ++- + include/asm-x86/fixmap_32.h | 21 +- + include/asm-x86/fixmap_64.h | 20 +- + include/asm-x86/floppy.h | 93 +- + include/asm-x86/futex.h | 101 +- + include/asm-x86/genapic_32.h | 105 +- + include/asm-x86/genapic_64.h | 10 + + include/asm-x86/geode.h | 2 +- + include/asm-x86/highmem.h | 2 +- + include/asm-x86/hw_irq_64.h | 15 +- + include/asm-x86/hypertransport.h | 15 +- + include/asm-x86/i387.h | 23 +- + include/asm-x86/i8259.h | 29 +- + include/asm-x86/ia32.h | 62 +- + include/asm-x86/io.h | 14 + + include/asm-x86/io_32.h | 143 ++-- + include/asm-x86/io_64.h | 116 ++- + include/asm-x86/io_apic.h | 8 +- + include/asm-x86/ioctls.h | 13 +- + include/asm-x86/ipcbuf.h | 3 +- + include/asm-x86/ipi.h | 11 +- + include/asm-x86/irq_32.h | 2 +- + include/asm-x86/irq_64.h | 4 +- + include/asm-x86/irqflags.h | 59 +- + include/asm-x86/kdebug.h | 4 +- + include/asm-x86/kexec.h | 71 +- + include/asm-x86/kprobes.h | 12 +- + include/asm-x86/kvm_host.h | 24 +- + include/asm-x86/kvm_x86_emulate.h | 28 +- + include/asm-x86/lguest.h | 11 +- + include/asm-x86/lguest_hcall.h | 5 +- + include/asm-x86/linkage.h | 3 + + include/asm-x86/local.h | 105 +- + include/asm-x86/mach-bigsmp/mach_apic.h | 18 +- + include/asm-x86/mach-default/mach_apic.h | 95 +- + include/asm-x86/mach-default/mach_apicdef.h | 9 +- + include/asm-x86/mach-default/mach_ipi.h | 10 + + include/asm-x86/mach-default/mach_mpparse.h | 11 - + include/asm-x86/mach-default/mach_reboot.h | 61 -- + include/asm-x86/mach-default/smpboot_hooks.h | 7 + + include/asm-x86/mach-es7000/mach_apic.h | 20 +- + include/asm-x86/mach-es7000/mach_mpparse.h | 11 - + include/asm-x86/mach-generic/mach_apic.h | 1 - + include/asm-x86/mach-generic/mach_mpparse.h | 5 - + include/asm-x86/mach-numaq/mach_apic.h | 10 + + include/asm-x86/mach-numaq/mach_mpparse.h | 23 +- + include/asm-x86/mach-summit/mach_apic.h | 14 +- + include/asm-x86/mach-summit/mach_mpparse.h | 11 - + include/asm-x86/mach-visws/mach_apic.h | 2 +- + include/asm-x86/mach-visws/smpboot_hooks.h | 4 + + include/asm-x86/mach_apic.h | 29 - + include/asm-x86/mc146818rtc.h | 16 +- + include/asm-x86/mca_dma.h | 34 +- + include/asm-x86/mmu.h | 4 +- + include/asm-x86/mmu_context_32.h | 12 +- + include/asm-x86/mmu_context_64.h | 21 +- + include/asm-x86/mmx.h | 2 +- + include/asm-x86/mmzone_32.h | 4 +- + include/asm-x86/mmzone_64.h | 24 +- + include/asm-x86/mpspec.h | 47 +- + include/asm-x86/mpspec_def.h | 46 +- + include/asm-x86/msidef.h | 12 +- + include/asm-x86/msr-index.h | 4 + + include/asm-x86/msr.h | 89 +- + include/asm-x86/mtrr.h | 73 +- + include/asm-x86/mutex_32.h | 66 +- + include/asm-x86/mutex_64.h | 73 +- + include/asm-x86/nmi.h | 94 ++- + include/asm-x86/nmi_32.h | 61 -- + include/asm-x86/nmi_64.h | 90 -- + include/asm-x86/nops.h | 2 + + include/asm-x86/numa_64.h | 5 +- + include/asm-x86/numaq.h | 9 +- + include/asm-x86/page.h | 5 +- + include/asm-x86/page_32.h | 9 +- + include/asm-x86/page_64.h | 10 +- + include/asm-x86/param.h | 4 +- + include/asm-x86/paravirt.h | 54 +- + include/asm-x86/parport.h | 6 +- + include/asm-x86/pat.h | 16 + + include/asm-x86/pci-direct.h | 2 +- + include/asm-x86/pci.h | 8 +- + include/asm-x86/pci_64.h | 14 +- + include/asm-x86/pda.h | 83 +- + include/asm-x86/percpu.h | 104 +- + include/asm-x86/pgtable-2level.h | 18 +- + include/asm-x86/pgtable-3level.h | 48 +- + include/asm-x86/pgtable.h | 187 +++- + include/asm-x86/pgtable_32.h | 100 +- + include/asm-x86/pgtable_64.h | 151 ++-- + include/asm-x86/posix_types.h | 8 +- + include/asm-x86/posix_types_32.h | 47 +- + include/asm-x86/posix_types_64.h | 54 +- + include/asm-x86/processor.h | 729 +++++++------ + include/asm-x86/proto.h | 6 +- + include/asm-x86/ptrace.h | 46 +- + include/asm-x86/reboot.h | 3 +- + include/asm-x86/resume-trace.h | 15 +- + include/asm-x86/rio.h | 76 +- + include/asm-x86/rwsem.h | 169 ++-- + include/asm-x86/segment.h | 3 +- + include/asm-x86/setup.h | 8 +- + include/asm-x86/sigcontext.h | 7 +- + include/asm-x86/sigcontext32.h | 4 +- + include/asm-x86/signal.h | 48 +- + include/asm-x86/smp.h | 223 ++++- + include/asm-x86/smp_32.h | 165 --- + include/asm-x86/smp_64.h | 101 -- + include/asm-x86/sparsemem.h | 6 +- + include/asm-x86/spinlock.h | 117 +-- + include/asm-x86/srat.h | 2 +- + include/asm-x86/stackprotector.h | 38 + + include/asm-x86/string_32.h | 2 +- + include/asm-x86/string_64.h | 66 +- + include/asm-x86/suspend_32.h | 12 +- + include/asm-x86/suspend_64.h | 5 +- + include/asm-x86/swiotlb.h | 28 +- + include/asm-x86/sync_bitops.h | 77 +- + include/asm-x86/system.h | 230 +++-- + include/asm-x86/tce.h | 2 +- + include/asm-x86/thread_info_32.h | 88 +- + include/asm-x86/thread_info_64.h | 78 +- + include/asm-x86/tlbflush.h | 5 +- + include/asm-x86/topology.h | 23 +- + include/asm-x86/tsc.h | 2 +- + include/asm-x86/uaccess_32.h | 316 ++++--- + include/asm-x86/uaccess_64.h | 376 ++++--- + include/asm-x86/unaligned.h | 2 +- + include/asm-x86/unistd.h | 8 +- + include/asm-x86/unistd_32.h | 2 +- + include/asm-x86/unistd_64.h | 2 +- + include/asm-x86/user32.h | 7 +- + include/asm-x86/user_32.h | 6 +- + include/asm-x86/user_64.h | 16 +- + include/asm-x86/uv/uv_hub.h | 284 +++++ + include/asm-x86/uv/uv_mmrs.h | 373 +++++++ + include/asm-x86/vdso.h | 23 +- + include/asm-x86/vga.h | 4 +- + include/asm-x86/vm86.h | 23 +- + include/asm-x86/vmi.h | 88 +- + include/asm-x86/voyager.h | 51 +- + include/asm-x86/xor_32.h | 494 +++++----- + include/asm-x86/xor_64.h | 294 +++--- + include/linux/compiler-gcc.h | 13 +- + include/linux/efi.h | 7 + + include/linux/percpu.h | 7 + + include/linux/sched.h | 5 +- + include/linux/stackprotector.h | 16 + + init/main.c | 7 + + kernel/panic.c | 71 ++- + lib/Kconfig.debug | 1 - + 350 files changed, 13925 insertions(+), 11903 deletions(-) + create mode 100644 Documentation/x86/pat.txt + create mode 100644 arch/x86/kernel/genx2apic_uv_x.c + create mode 100644 arch/x86/kernel/head32.c + create mode 100644 arch/x86/kernel/ipi.c + rename arch/x86/kernel/{mpparse_32.c => mpparse.c} (53%) + delete mode 100644 arch/x86/kernel/mpparse_64.c + create mode 100644 arch/x86/kernel/setup.c + rename arch/x86/kernel/{sigframe_32.h => sigframe.h} (66%) + create mode 100644 arch/x86/kernel/smp.c + delete mode 100644 arch/x86/kernel/smp_32.c + delete mode 100644 arch/x86/kernel/smp_64.c + rename arch/x86/kernel/{smpboot_32.c => smpboot.c} (62%) + delete mode 100644 arch/x86/kernel/smpboot_64.c + create mode 100644 arch/x86/kernel/smpcommon.c + create mode 100644 arch/x86/kernel/sysprof.c + create mode 100644 arch/x86/kernel/tlb_32.c + create mode 100644 arch/x86/kernel/tlb_64.c + delete mode 100644 arch/x86/mach-rdc321x/wdt.c + delete mode 100644 arch/x86/mm/Makefile_32 + delete mode 100644 arch/x86/mm/Makefile_64 + create mode 100644 arch/x86/mm/dump_pagetables.c + create mode 100644 arch/x86/mm/pat.c + rename include/asm-x86/{mach-default => }/bios_ebda.h (100%) + delete mode 100644 include/asm-x86/mach-default/mach_reboot.h + delete mode 100644 include/asm-x86/mach_apic.h + delete mode 100644 include/asm-x86/nmi_32.h + delete mode 100644 include/asm-x86/nmi_64.h + create mode 100644 include/asm-x86/pat.h + delete mode 100644 include/asm-x86/smp_32.h + delete mode 100644 include/asm-x86/smp_64.h + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/asm-x86/uv/uv_hub.h + create mode 100644 include/asm-x86/uv/uv_mmrs.h + create mode 100644 include/linux/stackprotector.h +Merging sched/for-akpm +$ git merge sched/for-akpm +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/alternative.c +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged include/asm-x86/alternative.h +Auto-merged include/asm-x86/irqflags.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 4 +- + 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/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/ktime.h | 6 + + include/linux/linkage.h | 2 + + include/linux/preempt.h | 34 +- + include/linux/rcupdate.h | 2 - + include/linux/sched.h | 71 +- + include/linux/seqlock.h | 46 +- + init/main.c | 17 + + kernel/Makefile | 10 + + kernel/fork.c | 2 +- + kernel/kthread.c | 1 + + kernel/latencytop.c | 27 +- + kernel/lockdep.c | 30 +- + kernel/printk.c | 31 +- + kernel/rcupreempt.c | 2 - + kernel/sched.c | 543 ++++++-- + kernel/sched_debug.c | 1 - + kernel/sched_fair.c | 90 +- + kernel/sched_rt.c | 185 ++- + kernel/softirq.c | 63 +- + kernel/softlockup.c | 4 +- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 26 +- + kernel/time/tick-sched.c | 5 - + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 23 + + kernel/trace/ftrace.c | 1396 +++++++++++++++++ + kernel/trace/trace.c | 2685 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 301 ++++ + kernel/trace/trace_functions.c | 76 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_sched_switch.c | 183 +++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 551 +++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 +++++ + kernel/user.c | 28 + + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 61 files changed, 8048 insertions(+), 301 deletions(-) + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 include/linux/ftrace.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_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 quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Auto-merged drivers/hid/hid-core.c +Auto-merged drivers/hid/usbhid/hid-core.c +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged include/linux/Kbuild +Merge made by recursive. + drivers/hid/hid-core.c | 19 ++- + drivers/hid/hid-debug.c | 2 +- + drivers/hid/hid-input-quirks.c | 24 +++- + drivers/hid/usbhid/Kconfig | 12 ++- + drivers/hid/usbhid/Makefile | 3 + + drivers/hid/usbhid/hid-core.c | 69 ++++++---- + drivers/hid/usbhid/hid-ff.c | 3 + + drivers/hid/usbhid/hid-lg2ff.c | 114 ++++++++++++++++ + drivers/hid/usbhid/hid-quirks.c | 84 ++++++++---- + drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- + drivers/hid/usbhid/usbhid.h | 3 +- + include/linux/Kbuild | 2 + + include/linux/hid.h | 17 ++- + include/linux/hidraw.h | 1 + + 14 files changed, 431 insertions(+), 208 deletions(-) + create mode 100644 drivers/hid/usbhid/hid-lg2ff.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged MAINTAINERS +Removed drivers/i2c/algos/i2c-algo-pca.h +Merge made by recursive. + MAINTAINERS | 2 + + drivers/i2c/algos/Kconfig | 39 +-- + drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- + drivers/i2c/algos/i2c-algo-pca.h | 26 -- + drivers/i2c/busses/Kconfig | 73 +++-- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-au1550.c | 1 + + drivers/i2c/busses/i2c-bfin-twi.c | 475 +++++++++++++++++---------- + drivers/i2c/busses/i2c-davinci.c | 9 +- + drivers/i2c/busses/i2c-gpio.c | 1 + + drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++- + drivers/i2c/busses/i2c-iop3xx.c | 1 + + drivers/i2c/busses/i2c-ixp2000.c | 1 + + drivers/i2c/busses/i2c-mpc.c | 3 + + drivers/i2c/busses/i2c-ocores.c | 3 + + drivers/i2c/busses/i2c-omap.c | 1 + + drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- + drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ + drivers/i2c/busses/i2c-pmcmsp.c | 7 +- + drivers/i2c/busses/i2c-pnx.c | 45 ++-- + drivers/i2c/busses/i2c-powermac.c | 3 + + drivers/i2c/busses/i2c-pxa.c | 3 +- + drivers/i2c/busses/i2c-s3c2410.c | 5 +- + drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-sh_mobile.c | 500 ++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-simtec.c | 3 + + drivers/i2c/busses/i2c-versatile.c | 1 + + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/chips/isp1301_omap.c | 87 +++--- + drivers/i2c/i2c-core.c | 2 +- + drivers/i2c/i2c-dev.c | 329 ++++++++++--------- + include/asm-sh/i2c-sh7760.h | 22 ++ + include/linux/i2c-algo-pca.h | 37 ++- + include/linux/i2c-pca-platform.h | 12 + + 35 files changed, 2345 insertions(+), 604 deletions(-) + delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h + create mode 100644 drivers/i2c/busses/i2c-pca-platform.c + create mode 100644 drivers/i2c/busses/i2c-sh7760.c + create mode 100644 drivers/i2c/busses/i2c-sh_mobile.c + create mode 100644 include/asm-sh/i2c-sh7760.h + create mode 100644 include/linux/i2c-pca-platform.h +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Merge made by recursive. + Documentation/00-INDEX | 2 - + Documentation/DMA-API.txt | 4 +- + Documentation/DocBook/kernel-locking.tmpl | 25 ++++- + Documentation/kbuild/00-INDEX | 4 + + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ + Documentation/{ => kbuild}/smart-config.txt | 2 +- + Documentation/spi/spidev | 168 +----------------------- + Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ + README | 32 +++-- + scripts/kernel-doc | 25 +++- + 10 files changed, 417 insertions(+), 191 deletions(-) + create mode 100644 Documentation/kbuild/make-configs.txt + rename Documentation/{ => kbuild}/smart-config.txt (99%) + create mode 100644 Documentation/spi/spidev_fdx.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Removed arch/avr32/mach-at32ap/time-tc.c +Auto-merged drivers/usb/gadget/Kconfig +Auto-merged drivers/usb/gadget/atmel_usba_udc.c +Removed include/asm-avr32/arch-at32ap/time.h +Removed include/asm-avr32/intc.h +Merge made by recursive. + arch/avr32/Kconfig | 5 + + arch/avr32/kernel/entry-avr32b.S | 20 -- + arch/avr32/kernel/process.c | 4 +- + arch/avr32/kernel/time.c | 248 +++++++++----------------- + arch/avr32/mach-at32ap/Makefile | 3 +- + arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- + arch/avr32/mach-at32ap/intc.c | 1 - + arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ + arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- + arch/avr32/oprofile/op_model_avr32.c | 1 - + drivers/char/keyboard.c | 3 +- + drivers/clocksource/Makefile | 1 + + drivers/clocksource/tcb_clksrc.c | 302 ++++++++++++++++++++++++++++++++ + drivers/misc/Kconfig | 33 ++++ + drivers/misc/Makefile | 1 + + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/atmel_usba_udc.c | 156 ++++++++--------- + drivers/usb/gadget/atmel_usba_udc.h | 9 + + include/asm-avr32/arch-at32ap/board.h | 9 +- + include/asm-avr32/arch-at32ap/pm.h | 48 +++++ + include/asm-avr32/arch-at32ap/time.h | 112 ------------ + include/asm-avr32/asm.h | 8 +- + include/asm-avr32/intc.h | 128 -------------- + include/asm-avr32/irq.h | 5 + + include/asm-avr32/page.h | 8 +- + include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ + include/linux/usb/atmel_usba_udc.h | 22 +++ + 28 files changed, 1305 insertions(+), 766 deletions(-) + create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S + delete mode 100644 arch/avr32/mach-at32ap/time-tc.c + create mode 100644 drivers/clocksource/tcb_clksrc.c + create mode 100644 drivers/misc/atmel_tclib.c + create mode 100644 include/asm-avr32/arch-at32ap/pm.h + delete mode 100644 include/asm-avr32/arch-at32ap/time.h + delete mode 100644 include/asm-avr32/intc.h + create mode 100644 include/linux/atmel_tc.h + create mode 100644 include/linux/usb/atmel_usba_udc.h +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Merge made by recursive. + Documentation/video4linux/CARDLIST.bttv | 2 + + Documentation/video4linux/CARDLIST.cx88 | 9 + + Documentation/video4linux/CARDLIST.saa7134 | 9 + + arch/arm/mach-pxa/devices.c | 32 + + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + + drivers/media/Kconfig | 2 +- + drivers/media/common/ir-functions.c | 2 +- + drivers/media/common/ir-keymaps.c | 96 ++- + drivers/media/common/saa7146_vbi.c | 4 +- + drivers/media/common/saa7146_video.c | 4 +- + drivers/media/dvb/b2c2/Kconfig | 1 + + drivers/media/dvb/b2c2/Makefile | 1 + + drivers/media/dvb/b2c2/flexcop-common.h | 17 +- + drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 113 +- + drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- + drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- + drivers/media/dvb/b2c2/flexcop.c | 10 +- + drivers/media/dvb/bt8xx/Kconfig | 2 +- + drivers/media/dvb/bt8xx/Makefile | 5 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 14 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- + drivers/media/dvb/dvb-core/demux.h | 2 + + drivers/media/dvb/dvb-core/dmxdev.c | 10 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/cxusb.c | 13 +- + drivers/media/dvb/dvb-usb/dib0700.h | 4 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 4 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- + drivers/media/dvb/dvb-usb/ttusb2.c | 62 +- + drivers/media/dvb/frontends/Kconfig | 7 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/cx22702.c | 2 +- + drivers/media/dvb/frontends/cx24123.c | 304 +++-- + drivers/media/dvb/frontends/cx24123.h | 21 +- + drivers/media/dvb/frontends/dvb-pll.c | 260 +--- + drivers/media/dvb/frontends/dvb-pll.h | 31 +- + drivers/media/dvb/frontends/isl6405.c | 164 ++ + drivers/media/dvb/frontends/isl6405.h | 74 + + drivers/media/dvb/frontends/lgdt330x.c | 2 +- + drivers/media/dvb/frontends/nxt6000.c | 2 +- + drivers/media/dvb/frontends/s5h1409.c | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 2 +- + drivers/media/dvb/frontends/sp8870.c | 12 +- + drivers/media/dvb/frontends/tda1004x.h | 1 - + drivers/media/dvb/frontends/tda10086.c | 2 +- + drivers/media/dvb/frontends/tda18271-common.c | 57 +- + drivers/media/dvb/frontends/tda18271-fe.c | 418 ++--- + drivers/media/dvb/frontends/tda18271-priv.h | 16 +- + drivers/media/dvb/frontends/tda18271-tables.c | 84 +- + drivers/media/dvb/frontends/tda18271.h | 23 +- + drivers/media/dvb/frontends/tda826x.c | 2 +- + drivers/media/dvb/frontends/tda827x.c | 167 +- + drivers/media/dvb/frontends/tda827x.h | 4 +- + drivers/media/dvb/frontends/ves1x93.c | 2 +- + drivers/media/dvb/frontends/xc5000.c | 2 +- + drivers/media/dvb/frontends/zl10353.c | 2 +- + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- + drivers/media/radio/dsbr100.c | 2 + + drivers/media/radio/miropcm20-radio.c | 2 + + drivers/media/radio/miropcm20-rds.c | 2 +- + drivers/media/radio/radio-aimslab.c | 2 + + drivers/media/radio/radio-aztech.c | 2 + + drivers/media/radio/radio-cadet.c | 12 +- + drivers/media/radio/radio-gemtek-pci.c | 2 + + drivers/media/radio/radio-gemtek.c | 2 + + drivers/media/radio/radio-maestro.c | 2 + + drivers/media/radio/radio-maxiradio.c | 2 + + drivers/media/radio/radio-rtrack2.c | 2 + + drivers/media/radio/radio-sf16fmi.c | 2 + + drivers/media/radio/radio-sf16fmr2.c | 104 +- + drivers/media/radio/radio-si470x.c | 59 +- + drivers/media/radio/radio-terratec.c | 2 + + drivers/media/radio/radio-trust.c | 2 + + drivers/media/radio/radio-typhoon.c | 4 +- + drivers/media/radio/radio-zoltrix.c | 2 + + drivers/media/video/Kconfig | 45 + + drivers/media/video/Makefile | 9 +- + drivers/media/video/adv7170.c | 2 +- + drivers/media/video/adv7175.c | 2 +- + drivers/media/video/arv.c | 6 +- + drivers/media/video/bt819.c | 2 +- + drivers/media/video/bt856.c | 2 +- + drivers/media/video/bt8xx/bttv-cards.c | 55 +- + drivers/media/video/bt8xx/bttv-driver.c | 33 +- + drivers/media/video/bt8xx/bttv-input.c | 6 + + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- + drivers/media/video/bt8xx/bttv.h | 3 + + drivers/media/video/bt8xx/bttvp.h | 1 - + drivers/media/video/bw-qcam.c | 6 +- + drivers/media/video/c-qcam.c | 6 +- + drivers/media/video/cafe_ccic.c | 4 +- + drivers/media/video/cpia.c | 2 + + drivers/media/video/cpia2/cpia2_core.c | 4 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 + + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx23885/cx23885-dvb.c | 15 +- + drivers/media/video/cx23885/cx23885-i2c.c | 2 +- + drivers/media/video/cx23885/cx23885-video.c | 4 +- + drivers/media/video/cx25840/cx25840-core.c | 91 +- + drivers/media/video/cx25840/cx25840-core.h | 2 +- + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- + drivers/media/video/cx25840/cx25840-vbi.c | 6 +- + drivers/media/video/cx88/Kconfig | 1 + + drivers/media/video/cx88/cx88-alsa.c | 8 +- + drivers/media/video/cx88/cx88-blackbird.c | 10 +- + drivers/media/video/cx88/cx88-cards.c | 581 ++++++- + drivers/media/video/cx88/cx88-core.c | 13 +- + drivers/media/video/cx88/cx88-dvb.c | 245 +++- + drivers/media/video/cx88/cx88-i2c.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 15 +- + drivers/media/video/cx88/cx88-mpeg.c | 4 +- + drivers/media/video/cx88/cx88-tvaudio.c | 6 +- + drivers/media/video/cx88/cx88-vbi.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 63 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/dabfirmware.h | 7 + + drivers/media/video/dabusb.c | 8 +- + drivers/media/video/dpc7146.c | 4 +- + drivers/media/video/em28xx/em28xx-cards.c | 2 +- + drivers/media/video/em28xx/em28xx-core.c | 24 +- + drivers/media/video/em28xx/em28xx-i2c.c | 4 +- + drivers/media/video/em28xx/em28xx-video.c | 2 +- + drivers/media/video/et61x251/et61x251_core.c | 4 +- + drivers/media/video/hexium_gemini.c | 4 +- + drivers/media/video/hexium_orion.c | 4 +- + drivers/media/video/ir-kbd-i2c.c | 26 +- + drivers/media/video/ivtv/ivtv-cards.c | 7 +- + drivers/media/video/ivtv/ivtv-cards.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 44 +- + drivers/media/video/ivtv/ivtv-driver.h | 2 + + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- + drivers/media/video/ivtv/ivtv-irq.c | 25 +- + drivers/media/video/ivtv/ivtv-queue.c | 4 +- + drivers/media/video/ivtv/ivtv-yuv.c | 38 +- + drivers/media/video/meye.c | 14 +- + drivers/media/video/msp3400-kthreads.c | 15 +- + drivers/media/video/mt20xx.c | 7 +- + drivers/media/video/mt9m001.c | 722 ++++++++ + drivers/media/video/mt9v022.c | 844 ++++++++++ + drivers/media/video/mxb.c | 4 +- + drivers/media/video/ov511.c | 2 + + drivers/media/video/pms.c | 6 +- + drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- + drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- + drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 52 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - + drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- + drivers/media/video/pwc/pwc-if.c | 10 +- + drivers/media/video/pxa_camera.c | 1000 +++++++++++ + drivers/media/video/saa5249.c | 2 + + drivers/media/video/saa6588.c | 8 +- + drivers/media/video/saa7110.c | 2 +- + drivers/media/video/saa7111.c | 2 +- + drivers/media/video/saa7114.c | 2 +- + drivers/media/video/saa7115.c | 4 +- + drivers/media/video/saa711x.c | 2 +- + drivers/media/video/saa7134/Kconfig | 1 + + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- + drivers/media/video/saa7134/saa7134-cards.c | 427 +++++- + drivers/media/video/saa7134/saa7134-core.c | 52 +- + drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- + drivers/media/video/saa7134/saa7134-empress.c | 6 +- + drivers/media/video/saa7134/saa7134-i2c.c | 4 +- + drivers/media/video/saa7134/saa7134-input.c | 6 +- + drivers/media/video/saa7134/saa7134-reg.h | 3 + + drivers/media/video/saa7134/saa7134-ts.c | 2 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- + drivers/media/video/saa7134/saa7134-vbi.c | 2 +- + drivers/media/video/saa7134/saa7134-video.c | 17 +- + drivers/media/video/saa7134/saa7134.h | 22 +- + drivers/media/video/saa7185.c | 2 +- + drivers/media/video/se401.c | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 12 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +- + drivers/media/video/soc_camera.c | 1033 ++++++++++++ + drivers/media/video/stk-webcam.c | 4 +- + drivers/media/video/stradis.c | 6 +- + drivers/media/video/stv680.c | 11 +- + drivers/media/video/tda8290.c | 12 +- + drivers/media/video/tda8290.h | 2 +- + drivers/media/video/tda9840.c | 2 +- + drivers/media/video/tda9887.c | 42 +- + drivers/media/video/tea5761.c | 7 +- + drivers/media/video/tea5767.c | 34 +- + drivers/media/video/tea6415c.c | 2 +- + drivers/media/video/tea6420.c | 2 +- + drivers/media/video/tuner-core.c | 47 +- + drivers/media/video/tuner-i2c.h | 118 ++- + drivers/media/video/tuner-simple.c | 861 ++++++++--- + drivers/media/video/tuner-simple.h | 11 +- + drivers/media/video/tuner-types.c | 188 ++- + drivers/media/video/tuner-xc2028.c | 57 +- + drivers/media/video/tvaudio.c | 8 +- + drivers/media/video/tveeprom.c | 103 -- + drivers/media/video/tvp5150.c | 2 +- + drivers/media/video/usbvideo/ibmcam.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 2 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- + drivers/media/video/usbvideo/ultracam.c | 4 +- + drivers/media/video/usbvideo/usbvideo.c | 8 +- + drivers/media/video/usbvideo/vicam.c | 2 + + drivers/media/video/usbvision/usbvision-core.c | 45 +- + drivers/media/video/usbvision/usbvision-i2c.c | 8 +- + drivers/media/video/usbvision/usbvision-video.c | 46 +- + drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- + drivers/media/video/videobuf-core.c | 168 ++- + drivers/media/video/videobuf-dma-sg.c | 137 +- + drivers/media/video/videobuf-dvb.c | 2 +- + drivers/media/video/videobuf-vmalloc.c | 49 +- + drivers/media/video/videocodec.c | 4 +- + drivers/media/video/vino.c | 10 +- + drivers/media/video/vivi.c | 334 ++--- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/w9966.c | 6 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/media/video/zc0301/zc0301_core.c | 4 +- + drivers/media/video/zoran_card.c | 6 +- + drivers/media/video/zoran_card.h | 2 + + drivers/media/video/zoran_device.c | 12 +- + drivers/media/video/zoran_driver.c | 4 +- + drivers/media/video/zr36016.c | 5 +- + drivers/media/video/zr36050.c | 5 +- + drivers/media/video/zr36060.c | 6 +- + drivers/media/video/zr364xx.c | 4 +- + include/asm-arm/arch-pxa/camera.h | 48 + + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- + include/linux/dvb/dmx.h | 3 +- + include/linux/meye.h | 2 +- + include/linux/videodev2.h | 55 +- + include/media/ir-common.h | 2 + + include/media/soc_camera.h | 179 ++ + include/media/tuner-types.h | 17 +- + include/media/tuner.h | 2 +- + include/media/v4l2-chip-ident.h | 6 + + include/media/videobuf-core.h | 9 +- + include/media/videobuf-dma-sg.h | 14 +- + 255 files changed, 11100 insertions(+), 3609 deletions(-) + create mode 100644 drivers/media/dvb/frontends/isl6405.c + create mode 100644 drivers/media/dvb/frontends/isl6405.h + create mode 100644 drivers/media/video/mt9m001.c + create mode 100644 drivers/media/video/mt9v022.c + create mode 100644 drivers/media/video/pxa_camera.c + create mode 100644 drivers/media/video/soc_camera.c + create mode 100644 include/asm-arm/arch-pxa/camera.h + create mode 100644 include/media/soc_camera.h +Merging s390/features +$ git merge s390/features +Auto-merged drivers/char/hw_random/core.c +Merge made by recursive. + Documentation/s390/s390dbf.txt | 21 ++ + arch/s390/Kconfig | 33 +--- + arch/s390/crypto/aes_s390.c | 8 +- + arch/s390/crypto/des_s390.c | 8 +- + arch/s390/crypto/sha1_s390.c | 8 +- + arch/s390/crypto/sha256_s390.c | 8 +- + arch/s390/defconfig | 1 + + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/compat_linux.h | 73 +++++++ + arch/s390/kernel/compat_signal.c | 11 + + arch/s390/kernel/debug.c | 53 ++++-- + arch/s390/kernel/early.c | 1 + + arch/s390/kernel/entry.h | 60 ++++++ + arch/s390/kernel/ipl.c | 2 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/process.c | 76 ++++---- + arch/s390/kernel/ptrace.c | 1 + + arch/s390/kernel/s390_ext.c | 14 +- + arch/s390/kernel/setup.c | 15 ++- + arch/s390/kernel/signal.c | 16 +- + arch/s390/kernel/smp.c | 91 ++++++++- + arch/s390/kernel/sys_s390.c | 2 +- + arch/s390/kernel/time.c | 259 ++++++++------------------ + arch/s390/kernel/topology.c | 314 +++++++++++++++++++++++++++++++ + arch/s390/kernel/traps.c | 7 +- + arch/s390/lib/delay.c | 14 +- + arch/s390/lib/uaccess_pt.c | 61 ++++-- + arch/s390/mm/fault.c | 21 +-- + arch/s390/mm/init.c | 1 - + drivers/base/topology.c | 17 +- + drivers/char/hw_random/core.c | 4 + + drivers/crypto/Kconfig | 1 + + drivers/s390/block/Kconfig | 1 + + drivers/s390/block/dasd.c | 10 +- + drivers/s390/block/dasd_3990_erp.c | 34 ++++ + drivers/s390/block/dasd_alias.c | 49 ++--- + drivers/s390/block/dasd_eckd.c | 7 + + drivers/s390/block/dasd_fba.c | 3 +- + drivers/s390/block/dasd_int.h | 6 + + drivers/s390/char/sclp_tty.c | 2 +- + drivers/s390/char/sclp_vt220.c | 13 +- + drivers/s390/char/tape_34xx.c | 2 +- + drivers/s390/char/tape_char.c | 4 +- + drivers/s390/char/tape_class.c | 5 +- + drivers/s390/char/tape_class.h | 2 +- + drivers/s390/char/vmur.c | 24 ++- + drivers/s390/char/vmur.h | 4 +- + drivers/s390/char/vmwatchdog.c | 4 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/chsc.c | 15 +- + drivers/s390/cio/cio.c | 30 ++-- + drivers/s390/cio/cio.h | 1 + + drivers/s390/cio/css.c | 16 ++- + drivers/s390/cio/css.h | 1 + + drivers/s390/cio/device.c | 1 - + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_ops.c | 9 +- + drivers/s390/cio/device_status.c | 8 +- + drivers/s390/cio/qdio.c | 180 +++++++++--------- + drivers/s390/cio/qdio.h | 28 +++ + drivers/s390/crypto/ap_bus.c | 16 +- + drivers/s390/crypto/zcrypt_api.c | 138 +++++++++++++- + drivers/s390/crypto/zcrypt_api.h | 16 ++- + drivers/s390/crypto/zcrypt_cca_key.h | 4 +- + drivers/s390/crypto/zcrypt_error.h | 2 +- + drivers/s390/crypto/zcrypt_pcicc.c | 4 +- + drivers/s390/crypto/zcrypt_pcixcc.c | 201 ++++++++++++++++++++- + drivers/s390/net/claw.c | 344 +++++++++++++++++----------------- + drivers/s390/net/netiucv.c | 97 +++++----- + drivers/s390/s390mach.c | 8 +- + drivers/s390/s390mach.h | 4 + + drivers/s390/scsi/zfcp_def.h | 2 +- + drivers/s390/sysinfo.c | 116 ++---------- + include/asm-s390/cio.h | 4 + + include/asm-s390/cpu.h | 8 + + include/asm-s390/debug.h | 5 + + include/asm-s390/hardirq.h | 2 +- + include/asm-s390/lowcore.h | 6 +- + include/asm-s390/smp.h | 3 + + include/asm-s390/sysinfo.h | 116 ++++++++++++ + include/asm-s390/system.h | 2 + + include/asm-s390/timex.h | 13 +- + include/asm-s390/tlbflush.h | 36 +++-- + include/asm-s390/topology.h | 25 +++ + include/linux/interrupt.h | 19 ++ + include/linux/irq.h | 10 - + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 4 +- + kernel/time/tick-oneshot.c | 2 +- + 89 files changed, 1949 insertions(+), 927 deletions(-) + create mode 100644 arch/s390/kernel/entry.h + create mode 100644 arch/s390/kernel/topology.c + create mode 100644 include/asm-s390/sysinfo.h +Merging sh/master +$ git merge sh/master +Auto-merged drivers/rtc/rtc-sh.c +Merge made by recursive. + arch/sh/Kconfig | 30 +- + arch/sh/Kconfig.debug | 13 +- + arch/sh/Makefile | 1 + + arch/sh/boards/renesas/migor/setup.c | 197 +++++- + arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- + arch/sh/boards/renesas/r7780rp/setup.c | 42 +- + arch/sh/boards/se/7721/Makefile | 1 + + arch/sh/boards/se/7721/irq.c | 45 ++ + arch/sh/boards/se/7721/setup.c | 99 +++ + arch/sh/boards/se/7722/setup.c | 41 + + arch/sh/configs/se7721_defconfig | 1085 ++++++++++++++++++++++++++ + arch/sh/kernel/cf-enabler.c | 15 +- + arch/sh/kernel/cpu/sh2a/Makefile | 7 +- + arch/sh/kernel/cpu/sh2a/probe.c | 3 + + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 ++++ + arch/sh/kernel/cpu/sh4/probe.c | 33 +- + arch/sh/kernel/cpu/sh4a/Makefile | 2 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 28 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 300 +++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 10 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +- + arch/sh/kernel/setup.c | 15 + + arch/sh/lib/clear_page.S | 6 +- + arch/sh/lib/copy_page.S | 6 +- + arch/sh/mm/cache-debugfs.c | 4 +- + arch/sh/mm/pmb.c | 2 +- + arch/sh/tools/mach-types | 5 +- + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/sh_keysc.c | 280 +++++++ + drivers/rtc/rtc-sh.c | 296 +++++--- + drivers/serial/sh-sci.c | 7 +- + drivers/serial/sh-sci.h | 60 ++- + include/asm-sh/bugs.h | 2 +- + include/asm-sh/cpu-sh4/freq.h | 6 +- + include/asm-sh/cpu-sh4/rtc.h | 5 + + include/asm-sh/migor.h | 58 ++ + include/asm-sh/processor.h | 5 +- + include/asm-sh/r7780rp.h | 22 +- + include/asm-sh/se7721.h | 70 ++ + include/asm-sh/se7722.h | 2 + + include/asm-sh/sh_keysc.h | 13 + + include/asm-sh/system.h | 2 + + include/asm-sh/uaccess_32.h | 5 +- + 44 files changed, 2858 insertions(+), 219 deletions(-) + create mode 100644 arch/sh/boards/se/7721/Makefile + create mode 100644 arch/sh/boards/se/7721/irq.c + create mode 100644 arch/sh/boards/se/7721/setup.c + create mode 100644 arch/sh/configs/se7721_defconfig + create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c + create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7723.c + create mode 100644 drivers/input/keyboard/sh_keysc.c + create mode 100644 include/asm-sh/migor.h + create mode 100644 include/asm-sh/se7721.h + create mode 100644 include/asm-sh/sh_keysc.h +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_dmap.c | 11 +++++------ + fs/jfs/jfs_dmap.h | 2 +- + fs/jfs/jfs_imap.c | 15 ++++++--------- + fs/jfs/jfs_xtree.c | 26 ++++++++------------------ + 4 files changed, 20 insertions(+), 34 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/ide/ide.txt +CONFLICT (content): Merge conflict in Documentation/ide/ide.txt +Auto-merged Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merged drivers/ide/Kconfig +Auto-merged drivers/ide/ide-scan-pci.c +Auto-merged drivers/ide/ide.c +CONFLICT (content): Merge conflict in drivers/ide/ide.c +Auto-merged include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Removed include/linux/hdsmart.h +Auto-merged include/linux/ide.h +Resolved 'Documentation/ide/ide.txt' using previous resolution. +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'drivers/ide/ide.c' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/ide/ide-tape.txt | 211 ++--- + Documentation/ide/ide.txt | 144 +-- + Documentation/ide/warm-plug-howto.txt | 13 + + Documentation/kernel-parameters.txt | 7 - + Documentation/mips/AU1xxx_IDE.README | 46 - + arch/powerpc/kernel/setup_32.c | 8 - + arch/powerpc/platforms/powermac/pci.c | 22 - + arch/powerpc/platforms/powermac/pmac.h | 5 - + arch/powerpc/platforms/powermac/setup.c | 8 - + arch/ppc/configs/sandpoint_defconfig | 2 +- + arch/ppc/kernel/ppc_ksyms.c | 5 - + arch/ppc/kernel/setup.c | 2 - + arch/ppc/platforms/4xx/bamboo.c | 1 - + arch/ppc/platforms/4xx/ebony.c | 1 - + arch/ppc/platforms/4xx/luan.c | 1 - + arch/ppc/platforms/4xx/ocotea.c | 1 - + arch/ppc/platforms/4xx/taishan.c | 1 - + arch/ppc/platforms/4xx/yucca.c | 1 - + arch/ppc/platforms/chestnut.c | 1 - + arch/ppc/platforms/cpci690.c | 1 - + arch/ppc/platforms/ev64260.c | 1 - + arch/ppc/platforms/hdpu.c | 36 - + arch/ppc/platforms/lopec.c | 85 -- + arch/ppc/platforms/mvme5100.c | 1 - + arch/ppc/platforms/powerpmc250.c | 1 - + arch/ppc/platforms/pplus.c | 58 - + arch/ppc/platforms/prep_setup.c | 38 - + arch/ppc/platforms/prpmc750.c | 1 - + arch/ppc/platforms/prpmc800.c | 1 - + arch/ppc/platforms/radstone_ppc7d.c | 1 - + arch/ppc/platforms/residual.c | 1 - + arch/ppc/platforms/sandpoint.c | 94 -- + arch/ppc/platforms/sandpoint.h | 3 - + arch/ppc/platforms/spruce.c | 1 - + arch/ppc/syslib/m8xx_setup.c | 6 - + arch/ppc/syslib/ppc4xx_setup.c | 23 - + block/compat_ioctl.c | 1 - + drivers/ide/Kconfig | 35 +- + drivers/ide/Makefile | 2 +- + drivers/ide/arm/bast-ide.c | 24 +- + drivers/ide/arm/icside.c | 68 +- + drivers/ide/arm/ide_arm.c | 20 +- + drivers/ide/arm/palm_bk3710.c | 64 +- + drivers/ide/arm/rapide.c | 12 +- + drivers/ide/cris/ide-cris.c | 115 +- + drivers/ide/h8300/ide-h8300.c | 28 +- + drivers/ide/ide-acpi.c | 32 +- + drivers/ide/ide-cd.c | 942 +++++++--------- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 159 ++-- + drivers/ide/ide-dma.c | 155 +--- + drivers/ide/ide-floppy.c | 384 +++---- + drivers/ide/ide-generic.c | 119 ++- + drivers/ide/ide-io.c | 56 +- + drivers/ide/ide-iops.c | 274 +++--- + drivers/ide/ide-lib.c | 44 +- + drivers/ide/ide-pnp.c | 46 +- + drivers/ide/ide-probe.c | 401 ++++++-- + drivers/ide/ide-proc.c | 188 ++-- + drivers/ide/ide-scan-pci.c | 2 +- + drivers/ide/ide-tape.c | 1679 ++++++++--------------------- + drivers/ide/ide-taskfile.c | 63 +- + drivers/ide/ide.c | 1152 +++++--------------- + drivers/ide/legacy/Makefile | 1 + + drivers/ide/legacy/ali14xx.c | 32 +- + drivers/ide/legacy/buddha.c | 19 +- + drivers/ide/legacy/dtc2278.c | 27 +- + drivers/ide/legacy/falconide.c | 41 +- + drivers/ide/legacy/gayle.c | 26 +- + drivers/ide/legacy/hd.c | 78 +- + drivers/ide/legacy/ht6560b.c | 54 +- + drivers/ide/legacy/ide-4drives.c | 72 ++ + drivers/ide/legacy/ide-cs.c | 83 +- + drivers/ide/legacy/ide_platform.c | 14 +- + drivers/ide/legacy/macide.c | 9 +- + drivers/ide/legacy/q40ide.c | 34 +- + drivers/ide/legacy/qd65xx.c | 223 ++--- + drivers/ide/legacy/qd65xx.h | 1 - + drivers/ide/legacy/umc8672.c | 80 +- + drivers/ide/mips/au1xxx-ide.c | 146 +-- + drivers/ide/mips/swarm.c | 20 +- + drivers/ide/pci/aec62xx.c | 39 +- + drivers/ide/pci/alim15x3.c | 332 +----- + drivers/ide/pci/amd74xx.c | 19 +- + drivers/ide/pci/atiixp.c | 29 +- + drivers/ide/pci/cmd640.c | 316 +++--- + drivers/ide/pci/cmd64x.c | 153 ++-- + drivers/ide/pci/cs5520.c | 29 +- + drivers/ide/pci/cs5530.c | 18 +- + drivers/ide/pci/cs5535.c | 24 +- + drivers/ide/pci/cy82c693.c | 97 +- + drivers/ide/pci/delkin_cb.c | 19 +- + drivers/ide/pci/generic.c | 10 +- + drivers/ide/pci/hpt34x.c | 17 +- + drivers/ide/pci/hpt366.c | 191 ++-- + drivers/ide/pci/it8213.c | 34 +- + drivers/ide/pci/it821x.c | 52 +- + drivers/ide/pci/jmicron.c | 29 +- + drivers/ide/pci/ns87415.c | 44 +- + drivers/ide/pci/opti621.c | 82 +- + drivers/ide/pci/pdc202xx_new.c | 23 +- + drivers/ide/pci/pdc202xx_old.c | 126 +-- + drivers/ide/pci/piix.c | 17 +- + drivers/ide/pci/rz1000.c | 2 +- + drivers/ide/pci/sc1200.c | 39 +- + drivers/ide/pci/scc_pata.c | 138 ++- + drivers/ide/pci/serverworks.c | 38 +- + drivers/ide/pci/sgiioc4.c | 153 ++-- + drivers/ide/pci/siimage.c | 508 ++++----- + drivers/ide/pci/sis5513.c | 253 +++--- + drivers/ide/pci/sl82c105.c | 87 +- + drivers/ide/pci/slc90e66.c | 22 +- + drivers/ide/pci/tc86c001.c | 90 +- + drivers/ide/pci/triflex.c | 12 +- + drivers/ide/pci/trm290.c | 47 +- + drivers/ide/pci/via82cxxx.c | 20 +- + drivers/ide/ppc/mpc8xx.c | 142 ++-- + drivers/ide/ppc/pmac.c | 282 +++--- + drivers/ide/setup-pci.c | 227 ++--- + drivers/macintosh/mediabay.c | 17 +- + drivers/scsi/ide-scsi.c | 230 ++--- + include/asm-alpha/ide.h | 11 - + include/asm-arm/arch-sa1100/ide.h | 6 +- + include/asm-arm/ide.h | 8 - + include/asm-blackfin/ide.h | 4 - + include/asm-cris/arch-v10/ide.h | 11 +- + include/asm-ia64/ide.h | 10 - + include/asm-m32r/ide.h | 10 - + include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - + include/asm-mips/mach-generic/ide.h | 10 - + include/asm-parisc/ide.h | 2 - + include/asm-powerpc/ide.h | 57 +- + include/asm-powerpc/mediabay.h | 6 +- + include/asm-sh/ide.h | 3 - + include/asm-sparc/ide.h | 2 - + include/asm-sparc64/ide.h | 2 - + include/asm-x86/ide.h | 10 - + include/linux/Kbuild | 1 - + include/linux/hdreg.h | 4 +- + include/linux/hdsmart.h | 126 --- + include/linux/ide.h | 413 ++++---- + 141 files changed, 4985 insertions(+), 7621 deletions(-) + create mode 100644 Documentation/ide/warm-plug-howto.txt + create mode 100644 drivers/ide/legacy/ide-4drives.c + delete mode 100644 include/linux/hdsmart.h +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/ahci.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/ata/pata_ali.c +Auto-merged drivers/ata/sata_svw.c +Auto-merged drivers/scsi/ipr.c +Auto-merged include/linux/libata.h +Merge made by recursive. + drivers/ata/Kconfig | 52 +- + drivers/ata/Makefile | 5 +- + drivers/ata/ahci.c | 309 ++---- + drivers/ata/ata_generic.c | 51 +- + drivers/ata/ata_piix.c | 312 ++----- + drivers/ata/libata-acpi.c | 2 +- + drivers/ata/libata-core.c | 2228 +++++--------------------------------- + drivers/ata/libata-eh.c | 225 ++--- + drivers/ata/libata-pmp.c | 247 +---- + drivers/ata/libata-scsi.c | 17 +- + drivers/ata/libata-sff.c | 2296 +++++++++++++++++++++++++++++++++++---- + drivers/ata/libata.h | 53 +- + drivers/ata/pata_acpi.c | 83 +-- + drivers/ata/pata_ali.c | 165 +--- + drivers/ata/pata_amd.c | 268 +---- + drivers/ata/pata_artop.c | 125 +-- + drivers/ata/pata_at32.c | 46 +- + drivers/ata/pata_atiixp.c | 57 +- + drivers/ata/pata_bf54x.c | 137 +-- + drivers/ata/pata_cmd640.c | 83 +- + drivers/ata/pata_cmd64x.c | 137 +-- + drivers/ata/pata_cs5520.c | 64 +- + drivers/ata/pata_cs5530.c | 80 +- + drivers/ata/pata_cs5535.c | 50 +- + drivers/ata/pata_cs5536.c | 50 +- + drivers/ata/pata_cypress.c | 50 +- + drivers/ata/pata_efar.c | 66 +- + drivers/ata/pata_hpt366.c | 77 +- + drivers/ata/pata_hpt37x.c | 245 +---- + drivers/ata/pata_hpt3x2n.c | 85 +-- + drivers/ata/pata_hpt3x3.c | 56 +- + drivers/ata/pata_icside.c | 67 +- + drivers/ata/pata_isapnp.c | 41 +- + drivers/ata/pata_it8213.c | 67 +- + drivers/ata/pata_it821x.c | 109 +-- + drivers/ata/pata_ixp4xx_cf.c | 46 +- + drivers/ata/pata_jmicron.c | 68 +-- + drivers/ata/pata_legacy.c | 316 +----- + drivers/ata/pata_marvell.c | 69 +-- + drivers/ata/pata_mpc52xx.c | 48 +- + drivers/ata/pata_mpiix.c | 71 +- + drivers/ata/pata_netcell.c | 58 +- + drivers/ata/pata_ninja32.c | 54 +- + drivers/ata/pata_ns87410.c | 68 +- + drivers/ata/pata_ns87415.c | 102 +-- + drivers/ata/pata_oldpiix.c | 74 +-- + drivers/ata/pata_opti.c | 66 +- + drivers/ata/pata_optidma.c | 103 +-- + drivers/ata/pata_pcmcia.c | 68 +- + drivers/ata/pata_pdc2027x.c | 99 +-- + drivers/ata/pata_pdc202xx_old.c | 96 +-- + drivers/ata/pata_platform.c | 46 +- + drivers/ata/pata_qdi.c | 77 +-- + drivers/ata/pata_radisys.c | 57 +- + drivers/ata/pata_rb500_cf.c | 54 +- + drivers/ata/pata_rz1000.c | 49 +- + drivers/ata/pata_sc1200.c | 59 +- + drivers/ata/pata_scc.c | 257 ++--- + drivers/ata/pata_serverworks.c | 114 +-- + drivers/ata/pata_sil680.c | 71 +- + drivers/ata/pata_sis.c | 230 +---- + drivers/ata/pata_sl82c105.c | 67 +- + drivers/ata/pata_triflex.c | 58 +- + drivers/ata/pata_via.c | 134 +-- + drivers/ata/pata_winbond.c | 47 +- + drivers/ata/pdc_adma.c | 80 +-- + drivers/ata/sata_fsl.c | 136 +-- + drivers/ata/sata_inic162x.c | 73 +- + drivers/ata/sata_mv.c | 377 +++---- + drivers/ata/sata_nv.c | 263 ++---- + drivers/ata/sata_promise.c | 118 +-- + drivers/ata/sata_qstor.c | 56 +- + drivers/ata/sata_sil.c | 55 +- + drivers/ata/sata_sil24.c | 247 ++--- + drivers/ata/sata_sis.c | 44 +- + drivers/ata/sata_svw.c | 47 +- + drivers/ata/sata_sx4.c | 52 +- + drivers/ata/sata_uli.c | 55 +- + drivers/ata/sata_via.c | 126 +-- + drivers/ata/sata_vsc.c | 44 +- + drivers/scsi/ipr.c | 74 +- + drivers/scsi/libsas/sas_ata.c | 19 +- + include/linux/libata.h | 718 ++++++++----- + 83 files changed, 4657 insertions(+), 8658 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged fs/Kconfig +Auto-merged fs/nfs/file.c +Auto-merged fs/nfs/inode.c +Auto-merged fs/nfs/super.c +Auto-merged net/sunrpc/clnt.c +Merge made by recursive. + fs/Kconfig | 70 +++++------ + fs/lockd/host.c | 20 ++-- + fs/lockd/mon.c | 113 +++++++++++++---- + fs/lockd/svc.c | 12 ++ + fs/nfs/Makefile | 3 +- + fs/nfs/client.c | 16 +++ + fs/nfs/dir.c | 2 +- + fs/nfs/direct.c | 9 +- + fs/nfs/file.c | 6 - + fs/nfs/inode.c | 45 +++++++- + fs/nfs/internal.h | 13 +-- + fs/nfs/nfs2xdr.c | 37 +++++-- + fs/nfs/nfs3xdr.c | 37 +++++-- + fs/nfs/nfs4proc.c | 18 ++- + fs/nfs/nfs4state.c | 8 +- + fs/nfs/nfs4xdr.c | 39 +++++-- + fs/nfs/read.c | 18 +-- + fs/nfs/super.c | 130 +++++++++++++------- + fs/nfs/unlink.c | 2 +- + fs/nfs/write.c | 86 +++++++------ + include/linux/lockd/lockd.h | 17 ++-- + include/linux/lockd/sm_inter.h | 1 + + include/linux/nfs_fs_sb.h | 8 ++ + include/linux/sunrpc/auth.h | 13 ++- + include/linux/sunrpc/clnt.h | 9 +- + include/linux/sunrpc/sched.h | 41 +++---- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth.c | 63 ++++++---- + net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ + net/sunrpc/auth_gss/auth_gss.c | 7 +- + net/sunrpc/auth_null.c | 1 + + net/sunrpc/auth_unix.c | 57 ++++----- + net/sunrpc/clnt.c | 8 +- + net/sunrpc/rpcb_clnt.c | 2 +- + net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- + net/sunrpc/xprt.c | 45 ++++--- + net/sunrpc/xprtsock.c | 7 +- + 37 files changed, 888 insertions(+), 498 deletions(-) + create mode 100644 net/sunrpc/auth_generic.c +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/quota/xfs_qm.c +Auto-merged fs/xfs/quota/xfs_qm_syscalls.c +CONFLICT (content): Merge conflict in fs/xfs/quota/xfs_qm_syscalls.c +Auto-merged fs/xfs/xfs_bmap.c +Auto-merged fs/xfs/xfs_dir2.c +Auto-merged fs/xfs/xfs_ialloc.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c +Auto-merged fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_inode_item.c +Auto-merged fs/xfs/xfs_itable.c +Auto-merged fs/xfs/xfs_log.c +Auto-merged fs/xfs/xfs_log_priv.h +Auto-merged fs/xfs/xfs_log_recover.c +Auto-merged fs/xfs/xfs_mount.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_mount.c +Auto-merged fs/xfs/xfs_utils.c +Auto-merged fs/xfs/xfs_vfsops.c +Auto-merged fs/xfs/xfs_vnodeops.c +Resolved 'fs/xfs/linux-2.6/xfs_ioctl.c' using previous resolution. +Resolved 'fs/xfs/quota/xfs_qm_syscalls.c' using previous resolution. +Resolved 'fs/xfs/xfs_ialloc.c' using previous resolution. +Resolved 'fs/xfs/xfs_mount.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/filesystems/xfs.txt | 15 +- + fs/xfs/linux-2.6/kmem.c | 6 +- + fs/xfs/linux-2.6/xfs_aops.c | 12 +- + fs/xfs/linux-2.6/xfs_buf.c | 8 +- + fs/xfs/linux-2.6/xfs_buf.h | 8 +- + fs/xfs/linux-2.6/xfs_cred.h | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 14 +- + fs/xfs/linux-2.6/xfs_file.c | 13 +- + fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- + fs/xfs/linux-2.6/xfs_ioctl.c | 676 ++++++++++++++++------------------ + fs/xfs/linux-2.6/xfs_iops.c | 223 +++++++----- + fs/xfs/linux-2.6/xfs_linux.h | 1 - + fs/xfs/linux-2.6/xfs_lrw.c | 72 ++--- + fs/xfs/linux-2.6/xfs_lrw.h | 3 +- + fs/xfs/linux-2.6/xfs_stats.h | 4 +- + fs/xfs/linux-2.6/xfs_super.c | 24 +- + fs/xfs/linux-2.6/xfs_vnode.h | 30 +-- + fs/xfs/quota/xfs_dquot.c | 20 +- + fs/xfs/quota/xfs_dquot_item.c | 14 +- + fs/xfs/quota/xfs_qm.c | 76 +++-- + fs/xfs/quota/xfs_qm.h | 2 +- + fs/xfs/quota/xfs_qm_stats.h | 4 +- + fs/xfs/quota/xfs_qm_syscalls.c | 44 ++- + fs/xfs/support/ktrace.c | 37 +- + fs/xfs/support/ktrace.h | 3 +- + fs/xfs/xfs_acl.c | 16 +- + fs/xfs/xfs_alloc.c | 65 ++-- + fs/xfs/xfs_bmap.c | 44 +-- + fs/xfs/xfs_bmap.h | 2 +- + fs/xfs/xfs_bmap_btree.c | 54 +++- + fs/xfs/xfs_buf_item.c | 7 +- + fs/xfs/xfs_dir2.c | 62 ++-- + fs/xfs/xfs_dir2.h | 12 +- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_ialloc.c | 44 ++- + fs/xfs/xfs_iget.c | 49 +--- + fs/xfs/xfs_inode.c | 730 ++++++++++++++++++------------------- + fs/xfs/xfs_inode.h | 23 +- + fs/xfs/xfs_inode_item.c | 8 +- + fs/xfs/xfs_inode_item.h | 8 + + fs/xfs/xfs_iomap.c | 7 +- + fs/xfs/xfs_itable.c | 7 +- + fs/xfs/xfs_log.c | 259 +++++--------- + fs/xfs/xfs_log.h | 5 +- + fs/xfs/xfs_log_priv.h | 93 +++-- + fs/xfs/xfs_log_recover.c | 123 +++++-- + fs/xfs/xfs_mount.c | 66 ++-- + fs/xfs/xfs_mount.h | 30 +- + fs/xfs/xfs_rename.c | 121 ++---- + fs/xfs/xfs_rtalloc.c | 41 ++- + fs/xfs/xfs_rw.c | 8 +- + fs/xfs/xfs_trans.h | 8 +- + fs/xfs/xfs_trans_ail.c | 151 +++----- + fs/xfs/xfs_trans_buf.c | 15 +- + fs/xfs/xfs_types.h | 5 + + fs/xfs/xfs_utils.c | 26 +-- + fs/xfs/xfs_utils.h | 15 +- + fs/xfs/xfs_vfsops.c | 73 ++--- + fs/xfs/xfs_vnodeops.c | 505 ++++++++------------------ + fs/xfs/xfs_vnodeops.h | 33 +- + 60 files changed, 1854 insertions(+), 2210 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merged drivers/infiniband/core/uverbs.h +Auto-merged drivers/infiniband/core/uverbs_main.c +Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c +Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c +Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c +Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h +Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c +Auto-merged drivers/infiniband/hw/mlx4/main.c +Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c +Auto-merged drivers/infiniband/hw/nes/nes_verbs.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c +Auto-merged drivers/infiniband/ulp/srp/ib_srp.c +Auto-merged include/rdma/ib_verbs.h +Resolved 'drivers/infiniband/hw/amso1100/c2_provider.c' using previous resolution. +Resolved 'drivers/infiniband/hw/cxgb3/iwch_provider.c' using previous resolution. +Resolved 'drivers/infiniband/hw/nes/nes_verbs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cm.c | 63 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/core/fmr_pool.c | 3 +- + drivers/infiniband/core/ucma.c | 2 +- + drivers/infiniband/core/uverbs.h | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 14 +- + drivers/infiniband/core/uverbs_main.c | 28 +- + drivers/infiniband/core/verbs.c | 14 +- + drivers/infiniband/hw/amso1100/c2.c | 80 +- + drivers/infiniband/hw/amso1100/c2.h | 16 +- + drivers/infiniband/hw/amso1100/c2_ae.c | 10 +- + drivers/infiniband/hw/amso1100/c2_alloc.c | 12 +- + drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- + drivers/infiniband/hw/amso1100/c2_intr.c | 6 +- + drivers/infiniband/hw/amso1100/c2_mm.c | 2 +- + drivers/infiniband/hw/amso1100/c2_mq.c | 4 +- + drivers/infiniband/hw/amso1100/c2_mq.h | 2 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 85 +- + drivers/infiniband/hw/amso1100/c2_qp.c | 30 +- + drivers/infiniband/hw/amso1100/c2_rnic.c | 31 +- + drivers/infiniband/hw/amso1100/c2_vq.c | 2 +- + drivers/infiniband/hw/amso1100/c2_wr.h | 212 +- + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 24 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 84 +- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 12 +- + drivers/infiniband/hw/cxgb3/iwch.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch.h | 2 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 166 +- + drivers/infiniband/hw/cxgb3/iwch_cm.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_ev.c | 12 +- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 81 +- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 42 +- + drivers/infiniband/hw/ehca/ehca_av.c | 31 - + drivers/infiniband/hw/ehca/ehca_classes.h | 2 - + drivers/infiniband/hw/ehca/ehca_cq.c | 19 - + drivers/infiniband/hw/ehca/ehca_hca.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 19 +- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 42 +- + drivers/infiniband/hw/ehca/ehca_pd.c | 11 - + drivers/infiniband/hw/ehca/ehca_qp.c | 51 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- + drivers/infiniband/hw/ehca/ehca_tools.h | 16 +- + drivers/infiniband/hw/ehca/ehca_uverbs.c | 19 - + drivers/infiniband/hw/ipath/Makefile | 3 + + drivers/infiniband/hw/ipath/ipath_7220.h | 57 + + drivers/infiniband/hw/ipath/ipath_common.h | 54 +- + drivers/infiniband/hw/ipath/ipath_debug.h | 2 + + drivers/infiniband/hw/ipath/ipath_diag.c | 35 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 1041 +++++++--- + drivers/infiniband/hw/ipath/ipath_eeprom.c | 428 ++++- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 176 ++- + drivers/infiniband/hw/ipath/ipath_iba6110.c | 51 +- + drivers/infiniband/hw/ipath/ipath_iba6120.c | 203 ++- + drivers/infiniband/hw/ipath/ipath_iba7220.c | 2571 ++++++++++++++++++++++++ + drivers/infiniband/hw/ipath/ipath_init_chip.c | 312 ++-- + drivers/infiniband/hw/ipath/ipath_intr.c | 656 ++++--- + drivers/infiniband/hw/ipath/ipath_kernel.h | 304 +++- + drivers/infiniband/hw/ipath/ipath_mad.c | 110 +- + drivers/infiniband/hw/ipath/ipath_qp.c | 59 +- + drivers/infiniband/hw/ipath/ipath_rc.c | 67 +- + drivers/infiniband/hw/ipath/ipath_registers.h | 168 +- + drivers/infiniband/hw/ipath/ipath_ruc.c | 22 +- + drivers/infiniband/hw/ipath/ipath_sd7220.c | 1462 ++++++++++++++ + drivers/infiniband/hw/ipath/ipath_sd7220_img.c | 1082 ++++++++++ + drivers/infiniband/hw/ipath/ipath_sdma.c | 790 ++++++++ + drivers/infiniband/hw/ipath/ipath_srq.c | 5 +- + drivers/infiniband/hw/ipath/ipath_stats.c | 33 +- + drivers/infiniband/hw/ipath/ipath_sysfs.c | 104 +- + drivers/infiniband/hw/ipath/ipath_uc.c | 8 +- + drivers/infiniband/hw/ipath/ipath_ud.c | 7 +- + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 879 ++++++++ + drivers/infiniband/hw/ipath/ipath_user_sdma.h | 54 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 413 ++++- + drivers/infiniband/hw/ipath/ipath_verbs.h | 32 +- + drivers/infiniband/hw/mlx4/cq.c | 319 +++- + drivers/infiniband/hw/mlx4/mad.c | 2 +- + drivers/infiniband/hw/mlx4/main.c | 25 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 15 + + drivers/infiniband/hw/mlx4/qp.c | 117 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +- + drivers/infiniband/hw/mthca/mthca_cmd.h | 1 + + drivers/infiniband/hw/mthca/mthca_cq.c | 14 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 14 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 4 +- + drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- + drivers/infiniband/hw/mthca/mthca_main.c | 15 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- + drivers/infiniband/hw/mthca/mthca_profile.c | 4 +- + drivers/infiniband/hw/mthca/mthca_profile.h | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 28 +- + drivers/infiniband/hw/mthca/mthca_wqe.h | 16 +- + drivers/infiniband/hw/nes/nes.c | 11 +- + drivers/infiniband/hw/nes/nes.h | 32 +- + drivers/infiniband/hw/nes/nes_cm.c | 131 +- + drivers/infiniband/hw/nes/nes_cm.h | 35 - + drivers/infiniband/hw/nes/nes_hw.c | 49 +- + drivers/infiniband/hw/nes/nes_nic.c | 26 +- + drivers/infiniband/hw/nes/nes_utils.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 29 +- + drivers/infiniband/ulp/ipoib/Makefile | 3 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 10 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 11 + + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 99 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 116 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 33 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 + + drivers/infiniband/ulp/srp/ib_srp.c | 7 +- + drivers/net/mlx4/catas.c | 2 +- + drivers/net/mlx4/cmd.c | 3 +- + drivers/net/mlx4/cq.c | 72 +- + drivers/net/mlx4/eq.c | 5 +- + drivers/net/mlx4/fw.c | 13 + + drivers/net/mlx4/fw.h | 1 + + drivers/net/mlx4/intf.c | 8 +- + drivers/net/mlx4/main.c | 3 +- + drivers/net/mlx4/mlx4.h | 4 +- + include/linux/mlx4/cmd.h | 2 +- + include/linux/mlx4/cq.h | 19 +- + include/linux/mlx4/device.h | 1 + + include/linux/mlx4/driver.h | 3 +- + include/linux/mlx4/qp.h | 15 +- + include/rdma/ib_user_verbs.h | 5 +- + include/rdma/ib_verbs.h | 35 +- + net/sunrpc/xprtrdma/verbs.c | 1 - + 128 files changed, 11646 insertions(+), 2213 deletions(-) + create mode 100644 drivers/infiniband/hw/ipath/ipath_7220.h + create mode 100644 drivers/infiniband/hw/ipath/ipath_iba7220.c + create mode 100644 drivers/infiniband/hw/ipath/ipath_sd7220.c + create mode 100644 drivers/infiniband/hw/ipath/ipath_sd7220_img.c + create mode 100644 drivers/infiniband/hw/ipath/ipath_sdma.c + create mode 100644 drivers/infiniband/hw/ipath/ipath_user_sdma.c + create mode 100644 drivers/infiniband/hw/ipath/ipath_user_sdma.h + create mode 100644 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +Applying infiniband-fix-2 +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/boot/Makefile +Removed arch/x86/kernel/acpi/sleep_32.c +Auto-merged arch/x86/kernel/apm_32.c +Auto-merged arch/x86/kernel/e820_64.c +Auto-merged arch/x86/kernel/head_64.S +Auto-merged arch/x86/kernel/setup_32.c +Auto-merged arch/x86/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c +CONFLICT (delete/modify): arch/x86/kernel/smpboot_64.c deleted in HEAD and modified in acpi/test. Version acpi/test of arch/x86/kernel/smpboot_64.c left in tree. +Auto-merged drivers/rtc/rtc-cmos.c +CONFLICT (delete/modify): include/asm-x86/smp_64.h deleted in HEAD and modified in acpi/test. Version acpi/test of include/asm-x86/smp_64.h left in tree. +Auto-merged include/linux/pnp.h +Removed kernel/power/pm.c +Resolved 'arch/x86/kernel/setup_64.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm arch/x86/kernel/smpboot_64.c include/asm-x86/smp_64.h +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/frv/kernel/pm.c | 8 - + arch/mips/au1000/common/power.c | 35 +--- + arch/x86/Kconfig | 2 +- + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/boot.h | 5 + + arch/x86/boot/video-bios.c | 6 + + arch/x86/boot/video-mode.c | 173 ++++++++++++ + arch/x86/boot/video-vesa.c | 8 + + arch/x86/boot/video-vga.c | 12 +- + arch/x86/boot/video.c | 157 +----------- + arch/x86/kernel/acpi/Makefile | 8 +- + arch/x86/kernel/acpi/realmode/Makefile | 57 ++++ + arch/x86/kernel/acpi/realmode/copy.S | 1 + + arch/x86/kernel/acpi/realmode/video-bios.c | 1 + + arch/x86/kernel/acpi/realmode/video-mode.c | 1 + + arch/x86/kernel/acpi/realmode/video-vesa.c | 1 + + arch/x86/kernel/acpi/realmode/video-vga.c | 1 + + arch/x86/kernel/acpi/realmode/wakemain.c | 81 ++++++ + arch/x86/kernel/acpi/realmode/wakeup.S | 113 ++++++++ + arch/x86/kernel/acpi/realmode/wakeup.h | 36 +++ + arch/x86/kernel/acpi/realmode/wakeup.lds.S | 61 ++++ + arch/x86/kernel/acpi/sleep.c | 73 ++++- + arch/x86/kernel/acpi/sleep.h | 18 ++ + arch/x86/kernel/acpi/sleep_32.c | 40 --- + arch/x86/kernel/acpi/wakeup_32.S | 247 ++--------------- + arch/x86/kernel/acpi/wakeup_64.S | 313 +-------------------- + arch/x86/kernel/acpi/wakeup_rm.S | 10 + + arch/x86/kernel/apm_32.c | 16 - + arch/x86/kernel/e820_64.c | 5 +- + arch/x86/kernel/head_64.S | 4 - + arch/x86/kernel/setup_32.c | 4 +- + arch/x86/kernel/setup_64.c | 16 + + drivers/acpi/ec.c | 240 +++++++++-------- + drivers/acpi/events/evgpe.c | 3 +- + drivers/acpi/glue.c | 20 ++ + drivers/acpi/utilities/utxface.c | 36 ++-- + drivers/pnp/base.h | 43 +++ + drivers/pnp/card.c | 57 ++++- + drivers/pnp/core.c | 36 +++- + drivers/pnp/driver.c | 28 ++- + drivers/pnp/interface.c | 105 +++----- + drivers/pnp/isapnp/core.c | 198 ++++++-------- + drivers/pnp/manager.c | 128 +++------ + drivers/pnp/pnpacpi/core.c | 85 +----- + drivers/pnp/pnpacpi/pnpacpi.h | 8 +- + drivers/pnp/pnpacpi/rsparser.c | 414 ++++++++++++---------------- + drivers/pnp/pnpbios/core.c | 31 +-- + drivers/pnp/pnpbios/pnpbios.h | 4 +- + drivers/pnp/pnpbios/rsparser.c | 188 ++++--------- + drivers/pnp/quirks.c | 15 +- + drivers/pnp/resource.c | 274 ++++++++++++++---- + drivers/pnp/system.c | 21 +- + drivers/rtc/rtc-cmos.c | 7 +- + include/asm-x86/trampoline.h | 18 ++ + include/linux/isapnp.h | 10 - + include/linux/pnp.h | 147 +++++------ + kernel/power/Kconfig | 10 - + kernel/power/Makefile | 1 - + kernel/power/pm.c | 205 -------------- + 59 files changed, 1751 insertions(+), 2096 deletions(-) + create mode 100644 arch/x86/boot/video-mode.c + create mode 100644 arch/x86/kernel/acpi/realmode/Makefile + create mode 100644 arch/x86/kernel/acpi/realmode/copy.S + create mode 100644 arch/x86/kernel/acpi/realmode/video-bios.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-mode.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-vesa.c + create mode 100644 arch/x86/kernel/acpi/realmode/video-vga.c + create mode 100644 arch/x86/kernel/acpi/realmode/wakemain.c + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.S + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.h + create mode 100644 arch/x86/kernel/acpi/realmode/wakeup.lds.S + create mode 100644 arch/x86/kernel/acpi/sleep.h + delete mode 100644 arch/x86/kernel/acpi/sleep_32.c + create mode 100644 arch/x86/kernel/acpi/wakeup_rm.S + create mode 100644 include/asm-x86/trampoline.h + delete mode 100644 kernel/power/pm.c +Applying acpi-fix-1 +Applying acpi-fix-2 +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged fs/Kconfig +Auto-merged fs/lockd/host.c +Auto-merged fs/lockd/svc.c +Merge made by recursive. + Documentation/filesystems/nfs-rdma.txt | 252 ++++++++++++++++++++++++++++++ + fs/Kconfig | 109 +++++++------ + fs/lockd/host.c | 73 +++++----- + fs/lockd/svc.c | 150 ++++++++---------- + fs/lockd/svclock.c | 6 +- + fs/lockd/svcshare.c | 3 +- + fs/nfs/callback.c | 93 ++++++------ + fs/nfs/symlink.c | 1 - + fs/nfsd/auth.c | 1 + + fs/nfsd/export.c | 9 +- + fs/nfsd/nfs4callback.c | 28 ++-- + fs/nfsd/nfs4idmap.c | 2 +- + fs/nfsd/nfs4state.c | 71 +++++---- + fs/nfsd/nfs4xdr.c | 13 ++- + fs/nfsd/nfsctl.c | 22 ++- + fs/nfsd/nfsfh.c | 228 +++++++++++++++------------- + fs/nfsd/nfssvc.c | 2 - + fs/nfsd/vfs.c | 4 +- + include/linux/exportfs.h | 2 +- + include/linux/nfs3.h | 2 +- + include/linux/nfsd/Kbuild | 4 +- + include/linux/nfsd/cache.h | 2 - + include/linux/nfsd/nfsd.h | 11 +- + include/linux/sunrpc/cache.h | 1 - + include/linux/sunrpc/gss_krb5.h | 6 +- + include/linux/sunrpc/svc.h | 1 - + include/linux/sunrpc/svcauth.h | 5 +- + include/net/ipv6.h | 9 + + net/sunrpc/auth_gss/gss_generic_token.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 9 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +- + net/sunrpc/auth_gss/gss_spkm3_seal.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 9 +- + net/sunrpc/cache.c | 1 - + net/sunrpc/svc.c | 15 +-- + net/sunrpc/svc_xprt.c | 30 +++- + net/sunrpc/svcauth_unix.c | 118 ++++++++++----- + net/sunrpc/svcsock.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 + + 42 files changed, 843 insertions(+), 480 deletions(-) + create mode 100644 Documentation/filesystems/nfs-rdma.txt +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/firewire/fw-ohci.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/debugging-via-ohci1394.txt | 16 +- + drivers/firewire/Kconfig | 5 + + drivers/firewire/fw-card.c | 52 +---- + drivers/firewire/fw-cdev.c | 13 +- + drivers/firewire/fw-device.c | 263 +++++++++++++++++---- + drivers/firewire/fw-device.h | 38 +++- + drivers/firewire/fw-iso.c | 5 - + drivers/firewire/fw-ohci.c | 383 ++++++++++++++++++++++++------ + drivers/firewire/fw-ohci.h | 2 + + drivers/firewire/fw-sbp2.c | 150 ++++++------ + drivers/firewire/fw-topology.c | 22 ++- + drivers/firewire/fw-topology.h | 11 +- + drivers/firewire/fw-transaction.c | 75 +++--- + drivers/firewire/fw-transaction.h | 17 +- + drivers/ieee1394/csr.c | 6 +- + drivers/ieee1394/dv1394.c | 4 +- + drivers/ieee1394/highlevel.c | 6 +- + drivers/ieee1394/ieee1394_core.c | 2 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/ieee1394/ohci1394.c | 229 +++++++++--------- + drivers/ieee1394/pcilynx.c | 15 +- + drivers/ieee1394/raw1394.c | 2 - + drivers/ieee1394/sbp2.c | 11 +- + drivers/ieee1394/video1394.c | 4 +- + lib/Kconfig.debug | 13 +- + 25 files changed, 881 insertions(+), 469 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Merge made by recursive. + Documentation/hwmon/w83l785ts | 3 +- + drivers/hwmon/adm1026.c | 22 ++++++--- + drivers/hwmon/adm1029.c | 30 ++++++++----- + drivers/hwmon/adm1031.c | 20 ++++++-- + drivers/hwmon/adm9240.c | 20 ++++++--- + drivers/hwmon/adt7470.c | 40 ++++++++++------- + drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ + drivers/hwmon/asb100.c | 20 +++++--- + drivers/hwmon/dme1737.c | 5 ++ + drivers/hwmon/f71805f.c | 5 ++ + drivers/hwmon/f71882fg.c | 5 ++ + drivers/hwmon/it87.c | 5 ++ + drivers/hwmon/lm75.c | 5 +-- + drivers/hwmon/pc87360.c | 6 +++ + drivers/hwmon/pc87427.c | 5 ++ + drivers/hwmon/sis5595.c | 5 ++ + drivers/hwmon/smsc47b397.c | 22 ++++++++- + drivers/hwmon/smsc47m1.c | 5 ++ + drivers/hwmon/via686a.c | 5 ++ + drivers/hwmon/vt1211.c | 5 ++ + drivers/hwmon/vt8231.c | 5 ++ + drivers/hwmon/w83627ehf.c | 6 +++ + drivers/hwmon/w83627hf.c | 5 ++ + drivers/hwmon/w83793.c | 26 ++++++----- + drivers/hwmon/w83l785ts.c | 4 +- + 25 files changed, 257 insertions(+), 121 deletions(-) +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. + Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ + drivers/mtd/ubi/Kconfig | 9 +- + drivers/mtd/ubi/build.c | 18 +- + drivers/mtd/ubi/debug.h | 2 + + drivers/mtd/ubi/gluebi.c | 5 +- + drivers/mtd/ubi/io.c | 4 + + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- + drivers/mtd/ubi/ubi.h | 3 +- + include/mtd/Kbuild | 1 - + 9 files changed, 241 insertions(+), 21 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-ubi + rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) +Merging kvm/master +$ git merge kvm/master +Auto-merged MAINTAINERS +Auto-merged arch/s390/Kconfig +Auto-merged arch/s390/kernel/early.c +Auto-merged arch/s390/kernel/setup.c +Auto-merged arch/s390/lib/uaccess_pt.c +CONFLICT (content): Merge conflict in arch/s390/lib/uaccess_pt.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/crash.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_32.c +Auto-merged arch/x86/kernel/setup_64.c +Removed arch/x86/kvm/segment_descriptor.h +Auto-merged drivers/s390/sysinfo.c +Auto-merged include/asm-s390/lowcore.h +Auto-merged include/asm-s390/sysinfo.h +CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h +Auto-merged include/asm-x86/kvm_host.h +CONFLICT (content): Merge conflict in include/asm-x86/kvm_host.h +Auto-merged include/asm-x86/reboot.h +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Resolved 'arch/s390/lib/uaccess_pt.c' using previous resolution. +Resolved 'include/asm-s390/sysinfo.h' using previous resolution. +Resolved 'include/asm-x86/kvm_host.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/ia64/kvm.txt | 82 ++ + Documentation/ioctl-number.txt | 2 + + Documentation/s390/kvm.txt | 125 +++ + MAINTAINERS | 10 + + arch/ia64/Kconfig | 3 + + arch/ia64/Makefile | 1 + + arch/ia64/kernel/mca.c | 49 + + arch/ia64/kernel/mca_asm.S | 5 + + arch/ia64/kernel/smp.c | 82 ++ + arch/ia64/kvm/Kconfig | 49 + + arch/ia64/kvm/Makefile | 61 + + arch/ia64/kvm/asm-offsets.c | 251 +++++ + arch/ia64/kvm/kvm-ia64.c | 1794 ++++++++++++++++++++++++++++++ + arch/ia64/kvm/kvm_fw.c | 500 +++++++++ + arch/ia64/kvm/kvm_minstate.h | 273 +++++ + arch/ia64/kvm/lapic.h | 25 + + arch/ia64/kvm/misc.h | 93 ++ + arch/ia64/kvm/mmio.c | 341 ++++++ + arch/ia64/kvm/optvfault.S | 918 ++++++++++++++++ + arch/ia64/kvm/process.c | 970 +++++++++++++++++ + arch/ia64/kvm/trampoline.S | 1038 ++++++++++++++++++ + arch/ia64/kvm/vcpu.c | 2163 +++++++++++++++++++++++++++++++++++++ + arch/ia64/kvm/vcpu.h | 740 +++++++++++++ + arch/ia64/kvm/vmm.c | 66 ++ + arch/ia64/kvm/vmm_ivt.S | 1424 ++++++++++++++++++++++++ + arch/ia64/kvm/vti.h | 290 +++++ + arch/ia64/kvm/vtlb.c | 636 +++++++++++ + arch/ia64/mm/tlb.c | 198 ++++ + arch/s390/Kconfig | 14 + + arch/s390/Makefile | 2 +- + arch/s390/kernel/early.c | 4 + + arch/s390/kernel/setup.c | 14 +- + arch/s390/kernel/vtime.c | 1 + + arch/s390/kvm/Kconfig | 46 + + arch/s390/kvm/Makefile | 14 + + arch/s390/kvm/diag.c | 67 ++ + arch/s390/kvm/gaccess.h | 274 +++++ + arch/s390/kvm/intercept.c | 216 ++++ + arch/s390/kvm/interrupt.c | 588 ++++++++++ + arch/s390/kvm/kvm-s390.c | 673 ++++++++++++ + arch/s390/kvm/kvm-s390.h | 64 ++ + arch/s390/kvm/priv.c | 323 ++++++ + arch/s390/kvm/sie64a.S | 47 + + arch/s390/kvm/sigp.c | 288 +++++ + arch/s390/lib/uaccess_pt.c | 3 + + arch/s390/mm/pgtable.c | 65 ++- + arch/x86/Kconfig | 19 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/kvm.c | 247 +++++ + arch/x86/kernel/kvmclock.c | 187 ++++ + arch/x86/kernel/reboot.c | 13 +- + arch/x86/kernel/setup_32.c | 6 + + arch/x86/kernel/setup_64.c | 7 + + arch/x86/kvm/Kconfig | 13 +- + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/i8254.c | 611 +++++++++++ + arch/x86/kvm/i8254.h | 62 ++ + arch/x86/kvm/irq.c | 18 + + arch/x86/kvm/irq.h | 3 + + arch/x86/kvm/kvm_svm.h | 2 + + arch/x86/kvm/lapic.c | 34 +- + arch/x86/kvm/mmu.c | 675 ++++++++++-- + arch/x86/kvm/mmu.h | 6 + + arch/x86/kvm/paging_tmpl.h | 86 +- + arch/x86/kvm/segment_descriptor.h | 29 - + arch/x86/kvm/svm.c | 273 ++++-- + arch/x86/kvm/svm.h | 3 + + arch/x86/kvm/tss.h | 59 + + arch/x86/kvm/vmx.c | 278 ++++- + arch/x86/kvm/vmx.h | 10 +- + arch/x86/kvm/x86.c | 897 ++++++++++++++-- + arch/x86/kvm/x86_emulate.c | 285 +++--- + drivers/s390/Makefile | 2 +- + drivers/s390/kvm/Makefile | 9 + + drivers/s390/kvm/kvm_virtio.c | 332 ++++++ + include/asm-ia64/gcc_intrin.h | 12 + + include/asm-ia64/kregs.h | 3 + + include/asm-ia64/kvm.h | 205 ++++- + include/asm-ia64/kvm_host.h | 524 +++++++++ + include/asm-ia64/kvm_para.h | 29 + + include/asm-ia64/processor.h | 63 ++ + include/asm-ia64/smp.h | 3 + + include/asm-ia64/tlb.h | 26 + + include/asm-s390/Kbuild | 1 + + include/asm-s390/kvm.h | 40 +- + include/asm-s390/kvm_host.h | 234 ++++ + include/asm-s390/kvm_para.h | 150 +++ + include/asm-s390/kvm_virtio.h | 53 + + include/asm-s390/lowcore.h | 15 +- + include/asm-s390/mmu.h | 1 + + include/asm-s390/mmu_context.h | 8 +- + include/asm-s390/pgtable.h | 93 ++- + include/asm-s390/setup.h | 1 + + include/asm-x86/kvm.h | 41 + + include/asm-x86/kvm_host.h | 99 ++- + include/asm-x86/kvm_para.h | 55 + + include/asm-x86/reboot.h | 2 + + include/linux/kvm.h | 123 +++- + include/linux/kvm_host.h | 58 +- + include/linux/kvm_para.h | 11 +- + include/linux/kvm_types.h | 2 + + include/linux/sched.h | 2 + + kernel/fork.c | 2 +- + mm/rmap.c | 7 +- + virt/kvm/kvm_main.c | 212 ++++- + virt/kvm/kvm_trace.c | 276 +++++ + 107 files changed, 20818 insertions(+), 602 deletions(-) + create mode 100644 Documentation/ia64/kvm.txt + create mode 100644 Documentation/s390/kvm.txt + create mode 100644 arch/ia64/kvm/Kconfig + create mode 100644 arch/ia64/kvm/Makefile + create mode 100644 arch/ia64/kvm/asm-offsets.c + create mode 100644 arch/ia64/kvm/kvm-ia64.c + create mode 100644 arch/ia64/kvm/kvm_fw.c + create mode 100644 arch/ia64/kvm/kvm_minstate.h + create mode 100644 arch/ia64/kvm/lapic.h + create mode 100644 arch/ia64/kvm/misc.h + create mode 100644 arch/ia64/kvm/mmio.c + create mode 100644 arch/ia64/kvm/optvfault.S + create mode 100644 arch/ia64/kvm/process.c + create mode 100644 arch/ia64/kvm/trampoline.S + create mode 100644 arch/ia64/kvm/vcpu.c + create mode 100644 arch/ia64/kvm/vcpu.h + create mode 100644 arch/ia64/kvm/vmm.c + create mode 100644 arch/ia64/kvm/vmm_ivt.S + create mode 100644 arch/ia64/kvm/vti.h + create mode 100644 arch/ia64/kvm/vtlb.c + create mode 100644 arch/s390/kvm/Kconfig + create mode 100644 arch/s390/kvm/Makefile + create mode 100644 arch/s390/kvm/diag.c + create mode 100644 arch/s390/kvm/gaccess.h + create mode 100644 arch/s390/kvm/intercept.c + create mode 100644 arch/s390/kvm/interrupt.c + create mode 100644 arch/s390/kvm/kvm-s390.c + create mode 100644 arch/s390/kvm/kvm-s390.h + create mode 100644 arch/s390/kvm/priv.c + create mode 100644 arch/s390/kvm/sie64a.S + create mode 100644 arch/s390/kvm/sigp.c + create mode 100644 arch/x86/kernel/kvm.c + create mode 100644 arch/x86/kernel/kvmclock.c + create mode 100644 arch/x86/kvm/i8254.c + create mode 100644 arch/x86/kvm/i8254.h + delete mode 100644 arch/x86/kvm/segment_descriptor.h + create mode 100644 arch/x86/kvm/tss.h + create mode 100644 drivers/s390/kvm/Makefile + create mode 100644 drivers/s390/kvm/kvm_virtio.c + create mode 100644 include/asm-ia64/kvm_host.h + create mode 100644 include/asm-ia64/kvm_para.h + create mode 100644 include/asm-s390/kvm_host.h + create mode 100644 include/asm-s390/kvm_para.h + create mode 100644 include/asm-s390/kvm_virtio.h + create mode 100644 virt/kvm/kvm_trace.c +Merging dlm/next +$ git merge dlm/next +Auto-merged include/linux/Kbuild +Removed include/linux/lock_dlm_plock.h +Merge made by recursive. + fs/dlm/Makefile | 1 + + fs/dlm/config.c | 50 +++++++++-- + fs/dlm/config.h | 3 +- + fs/dlm/dlm_internal.h | 8 +- + fs/dlm/lock.c | 5 +- + fs/dlm/lock.h | 1 - + fs/dlm/main.c | 7 ++ + fs/dlm/member.c | 34 +++++++- + fs/{gfs2/locking => }/dlm/plock.c | 169 ++++++++++++++++++++++--------------- + fs/dlm/recoverd.c | 1 + + fs/gfs2/locking/dlm/Makefile | 2 +- + fs/gfs2/locking/dlm/lock_dlm.h | 11 +-- + fs/gfs2/locking/dlm/main.c | 8 -- + fs/gfs2/locking/dlm/mount.c | 21 +++++ + include/linux/Kbuild | 2 +- + include/linux/dlm.h | 4 - + include/linux/dlm_device.h | 3 - + include/linux/dlm_plock.h | 50 +++++++++++ + include/linux/dlmconstants.h | 4 + + include/linux/lock_dlm_plock.h | 41 --------- + 20 files changed, 266 insertions(+), 159 deletions(-) + rename fs/{gfs2/locking => }/dlm/plock.c (67%) + create mode 100644 include/linux/dlm_plock.h + delete mode 100644 include/linux/lock_dlm_plock.h +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/base/transport_class.c +Auto-merged drivers/message/fusion/mptscsih.c +Auto-merged drivers/s390/scsi/zfcp_def.h +Auto-merged drivers/scsi/3w-9xxx.c +Auto-merged drivers/scsi/3w-xxxx.c +Auto-merged drivers/scsi/aacraid/aachba.c +Auto-merged drivers/scsi/ch.c +Auto-merged drivers/scsi/hosts.c +Auto-merged drivers/scsi/hptiop.c +Auto-merged drivers/scsi/lpfc/lpfc_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_gbl.h +Auto-merged drivers/scsi/raid_class.c +Removed drivers/scsi/scsi_debug.h +Auto-merged drivers/scsi/st.c +Auto-merged include/linux/attribute_container.h +Auto-merged include/linux/transport_class.h +Auto-merged include/scsi/scsi_host.h +Merge made by recursive. + Documentation/scsi/st.txt | 12 +- + arch/ia64/hp/sim/simscsi.c | 23 +- + drivers/ata/libata-scsi.c | 6 +- + drivers/base/transport_class.c | 3 +- + drivers/message/fusion/mptbase.c | 29 +- + drivers/message/fusion/mptbase.h | 5 +- + drivers/message/fusion/mptsas.c | 22 +- + drivers/message/fusion/mptscsih.c | 8 +- + drivers/s390/scsi/zfcp_aux.c | 33 +- + drivers/s390/scsi/zfcp_ccw.c | 21 +- + drivers/s390/scsi/zfcp_dbf.c | 1283 ++++++++++++++++++----------- + drivers/s390/scsi/zfcp_dbf.h | 229 +++++ + drivers/s390/scsi/zfcp_def.h | 169 +---- + drivers/s390/scsi/zfcp_erp.c | 680 +++++----------- + drivers/s390/scsi/zfcp_ext.h | 57 +- + drivers/s390/scsi/zfcp_fsf.c | 410 +++------- + drivers/s390/scsi/zfcp_qdio.c | 6 +- + drivers/s390/scsi/zfcp_scsi.c | 68 +- + drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 +- + drivers/s390/scsi/zfcp_sysfs_port.c | 9 +- + drivers/s390/scsi/zfcp_sysfs_unit.c | 5 +- + drivers/scsi/3w-9xxx.c | 23 +- + drivers/scsi/3w-xxxx.c | 14 +- + drivers/scsi/BusLogic.c | 5 +- + drivers/scsi/BusLogic.h | 21 +- + drivers/scsi/FlashPoint.c | 6 +- + drivers/scsi/Kconfig | 14 +- + drivers/scsi/a2091.c | 3 + + drivers/scsi/a3000.c | 3 + + drivers/scsi/aacraid/aachba.c | 67 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- + drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 2 +- + drivers/scsi/aic94xx/aic94xx.h | 16 - + drivers/scsi/aic94xx/aic94xx_dev.c | 8 +- + drivers/scsi/aic94xx/aic94xx_dump.c | 10 +- + drivers/scsi/aic94xx/aic94xx_dump.h | 9 - + drivers/scsi/aic94xx/aic94xx_hwi.c | 44 +- + drivers/scsi/aic94xx/aic94xx_hwi.h | 2 - + drivers/scsi/aic94xx/aic94xx_init.c | 10 +- + drivers/scsi/aic94xx/aic94xx_reg.c | 53 +- + drivers/scsi/aic94xx/aic94xx_scb.c | 33 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 4 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 31 +- + drivers/scsi/aic94xx/aic94xx_seq.h | 4 - + drivers/scsi/aic94xx/aic94xx_task.c | 12 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/arm/acornscsi.c | 1 - + drivers/scsi/arm/cumana_1.c | 1 - + drivers/scsi/ch.c | 33 +- + drivers/scsi/dc395x.c | 1 - + drivers/scsi/eata_pio.c | 2 - + drivers/scsi/gdth.c | 320 +++----- + drivers/scsi/gdth.h | 2 - + drivers/scsi/gvp11.c | 3 + + drivers/scsi/hosts.c | 1 - + drivers/scsi/hptiop.c | 7 +- + drivers/scsi/initio.c | 9 +- + drivers/scsi/ips.c | 89 +-- + drivers/scsi/libsas/sas_scsi_host.c | 41 + + drivers/scsi/lpfc/lpfc.h | 5 +- + drivers/scsi/lpfc/lpfc_attr.c | 10 +- + drivers/scsi/lpfc/lpfc_ct.c | 48 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 2 + + drivers/scsi/lpfc/lpfc_els.c | 121 ++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 73 +-- + drivers/scsi/lpfc/lpfc_init.c | 98 +-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +- + drivers/scsi/lpfc/lpfc_scsi.c | 34 +- + drivers/scsi/lpfc/lpfc_sli.c | 112 ++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 3 +- + drivers/scsi/mac_scsi.c | 1 - + drivers/scsi/megaraid/megaraid_sas.c | 49 +- + drivers/scsi/megaraid/megaraid_sas.h | 5 + + drivers/scsi/mvme147.c | 3 + + drivers/scsi/ps3rom.c | 101 +-- + drivers/scsi/qla2xxx/Kconfig | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 36 +- + drivers/scsi/qla2xxx/qla_dbg.c | 124 +--- + drivers/scsi/qla2xxx/qla_dbg.h | 23 +- + drivers/scsi/qla2xxx/qla_def.h | 78 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 173 ++++- + drivers/scsi/qla2xxx/qla_gbl.h | 33 +- + drivers/scsi/qla2xxx/qla_gs.c | 16 +- + drivers/scsi/qla2xxx/qla_init.c | 192 +++-- + drivers/scsi/qla2xxx/qla_inline.h | 87 +-- + drivers/scsi/qla2xxx/qla_iocb.c | 5 +- + drivers/scsi/qla2xxx/qla_isr.c | 223 +++--- + drivers/scsi/qla2xxx/qla_mbx.c | 318 ++++++-- + drivers/scsi/qla2xxx/qla_mid.c | 30 +- + drivers/scsi/qla2xxx/qla_os.c | 443 +++++----- + drivers/scsi/qla2xxx/qla_settings.h | 16 +- + drivers/scsi/qla2xxx/qla_sup.c | 315 ++++++-- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla4xxx/ql4_fw.h | 4 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 4 + + drivers/scsi/qla4xxx/ql4_iocb.c | 14 +- + drivers/scsi/qla4xxx/ql4_isr.c | 40 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 39 + + drivers/scsi/qla4xxx/ql4_os.c | 96 ++- + drivers/scsi/raid_class.c | 2 +- + drivers/scsi/scsi.c | 229 ++++-- + drivers/scsi/scsi_debug.c | 1219 ++++++++++++--------------- + drivers/scsi/scsi_debug.h | 24 - + drivers/scsi/scsi_error.c | 150 +++- + drivers/scsi/scsi_lib.c | 12 +- + drivers/scsi/sgiwd93.c | 7 +- + drivers/scsi/st.c | 83 ++- + drivers/scsi/st.h | 3 + + drivers/scsi/st_options.h | 6 +- + drivers/scsi/stex.c | 83 +-- + drivers/scsi/wd33c93.c | 3 - + include/linux/attribute_container.h | 2 +- + include/linux/mtio.h | 1 + + include/linux/scatterlist.h | 5 + + include/linux/transport_class.h | 5 +- + include/scsi/libsas.h | 2 + + include/scsi/sas_ata.h | 4 +- + include/scsi/scsi_cmnd.h | 17 + + include/scsi/scsi_eh.h | 5 +- + include/scsi/scsi_host.h | 1 + + lib/scatterlist.c | 102 +++ + 125 files changed, 4694 insertions(+), 4311 deletions(-) + create mode 100644 drivers/s390/scsi/zfcp_dbf.h + delete mode 100644 drivers/scsi/scsi_debug.h +Merging ia64/test +$ git merge ia64/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/ia64/Kconfig +Auto-merged arch/ia64/kernel/mca.c +CONFLICT (content): Merge conflict in arch/ia64/kernel/mca.c +Auto-merged arch/ia64/mm/tlb.c +CONFLICT (content): Merge conflict in arch/ia64/mm/tlb.c +Resolved 'arch/ia64/kernel/mca.c' using previous resolution. +Resolved 'arch/ia64/mm/tlb.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/kernel-parameters.txt | 4 + + arch/ia64/Kconfig | 14 + + arch/ia64/hp/common/sba_iommu.c | 56 ++- + arch/ia64/ia32/elfcore32.h | 14 +- + arch/ia64/ia32/sys_ia32.c | 649 ++++++++++++++++++- + arch/ia64/kernel/acpi.c | 4 +- + arch/ia64/kernel/asm-offsets.c | 13 + + arch/ia64/kernel/crash.c | 55 +- + arch/ia64/kernel/efi.c | 46 ++ + arch/ia64/kernel/entry.S | 65 ++ + arch/ia64/kernel/fsys.S | 88 ++- + arch/ia64/kernel/head.S | 20 + + arch/ia64/kernel/irq_ia64.c | 2 +- + arch/ia64/kernel/ivt.S | 69 ++ + arch/ia64/kernel/kprobes.c | 133 +++- + arch/ia64/kernel/mca.c | 11 +- + arch/ia64/kernel/minstate.h | 14 + + arch/ia64/kernel/numa.c | 2 +- + arch/ia64/kernel/patch.c | 8 +- + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/process.c | 30 - + arch/ia64/kernel/ptrace.c | 1217 +++++++++++++++++++++++++--------- + arch/ia64/kernel/setup.c | 8 +- + arch/ia64/kernel/smpboot.c | 2 +- + arch/ia64/kernel/time.c | 78 +++ + arch/ia64/kernel/unaligned.c | 3 +- + arch/ia64/mm/contig.c | 2 - + arch/ia64/mm/discontig.c | 15 +- + arch/ia64/mm/init.c | 8 +- + arch/ia64/mm/numa.c | 4 +- + arch/ia64/mm/tlb.c | 177 +++++- + arch/ia64/sn/kernel/xpc_main.c | 8 +- + arch/ia64/sn/kernel/xpc_partition.c | 2 +- + include/asm-ia64/acpi.h | 33 + + include/asm-ia64/cputime.h | 104 +++ + include/asm-ia64/elf.h | 31 +- + include/asm-ia64/kprobes.h | 7 +- + include/asm-ia64/numa.h | 2 + + include/asm-ia64/pal.h | 72 ++- + include/asm-ia64/pgtable.h | 2 +- + include/asm-ia64/sal.h | 21 + + include/asm-ia64/system.h | 12 + + include/asm-ia64/thread_info.h | 14 + + include/asm-ia64/tlbflush.h | 1 + + 44 files changed, 2578 insertions(+), 546 deletions(-) +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 +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged MAINTAINERS +Auto-merged fs/Kconfig +Merge made by recursive. + Documentation/ABI/obsolete/o2cb | 11 + + Documentation/ABI/stable/o2cb | 10 + + Documentation/feature-removal-schedule.txt | 11 + + MAINTAINERS | 1 + + fs/Kconfig | 26 + + fs/ocfs2/Makefile | 14 +- + fs/ocfs2/alloc.c | 465 +++++++++++++-- + fs/ocfs2/aops.c | 6 +- + fs/ocfs2/cluster/Makefile | 2 +- + fs/ocfs2/cluster/netdebug.c | 441 ++++++++++++++ + fs/ocfs2/cluster/nodemanager.c | 5 +- + fs/ocfs2/cluster/sys.c | 9 + + fs/ocfs2/cluster/tcp.c | 164 ++++-- + fs/ocfs2/cluster/tcp.h | 32 + + fs/ocfs2/cluster/tcp_internal.h | 26 +- + fs/ocfs2/dlm/Makefile | 2 +- + fs/ocfs2/dlm/dlmcommon.h | 49 ++ + fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- + fs/ocfs2/dlm/dlmdebug.h | 86 +++ + fs/ocfs2/dlm/dlmdomain.c | 70 ++- + fs/ocfs2/dlm/dlmlock.c | 22 +- + fs/ocfs2/dlm/dlmmaster.c | 200 ++----- + fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- + fs/ocfs2/dlmglue.h | 5 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/heartbeat.c | 184 +------ + fs/ocfs2/heartbeat.h | 17 +- + fs/ocfs2/ioctl.c | 13 +- + fs/ocfs2/ioctl.h | 3 +- + fs/ocfs2/journal.c | 211 ++++++- + fs/ocfs2/journal.h | 4 + + fs/ocfs2/localalloc.c | 4 + + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/ocfs2.h | 77 ++- + fs/ocfs2/ocfs2_fs.h | 79 +++- + fs/ocfs2/ocfs2_lockid.h | 2 +- + fs/ocfs2/slot_map.c | 454 +++++++++++--- + fs/ocfs2/slot_map.h | 32 +- + fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ + fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ + fs/ocfs2/stackglue.c | 568 +++++++++++++++++ + fs/ocfs2/stackglue.h | 261 ++++++++ + fs/ocfs2/suballoc.c | 103 +++- + fs/ocfs2/suballoc.h | 1 + + fs/ocfs2/super.c | 208 ++++--- + fs/sysfs/symlink.c | 9 +- + 46 files changed, 5712 insertions(+), 1042 deletions(-) + create mode 100644 Documentation/ABI/obsolete/o2cb + create mode 100644 Documentation/ABI/stable/o2cb + create mode 100644 fs/ocfs2/cluster/netdebug.c + create mode 100644 fs/ocfs2/dlm/dlmdebug.h + create mode 100644 fs/ocfs2/stack_o2cb.c + create mode 100644 fs/ocfs2/stack_user.c + create mode 100644 fs/ocfs2/stackglue.c + create mode 100644 fs/ocfs2/stackglue.h +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Auto-merged security/selinux/hooks.c +Auto-merged security/selinux/include/security.h +Auto-merged security/selinux/ss/services.c +Merge made by recursive. + security/commoncap.c | 4 +- + security/keys/internal.h | 8 +- + security/root_plug.c | 2 +- + security/security.c | 8 +- + security/selinux/Kconfig | 2 +- + security/selinux/Makefile | 1 + + security/selinux/avc.c | 13 +- + security/selinux/hooks.c | 165 +++++++++------ + security/selinux/include/av_perm_to_string.h | 5 + + security/selinux/include/av_permissions.h | 5 + + security/selinux/include/netlabel.h | 16 -- + security/selinux/include/netport.h | 31 +++ + security/selinux/include/objsec.h | 15 +- + security/selinux/include/security.h | 15 +- + security/selinux/netlabel.c | 82 ++------ + security/selinux/netlink.c | 2 +- + security/selinux/netnode.c | 67 +++--- + security/selinux/netport.c | 286 ++++++++++++++++++++++++++ + security/selinux/selinuxfs.c | 11 +- + security/selinux/ss/avtab.c | 40 ++-- + security/selinux/ss/conditional.c | 16 +- + security/selinux/ss/ebitmap.c | 14 +- + security/selinux/ss/policydb.c | 65 ++++--- + security/selinux/ss/policydb.h | 2 + + security/selinux/ss/services.c | 69 ++++-- + 25 files changed, 643 insertions(+), 301 deletions(-) + create mode 100644 security/selinux/include/netport.h + create mode 100644 security/selinux/netport.c +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/Kconfig | 7 ------- + drivers/char/vme_scc.c | 4 +--- + drivers/video/Kconfig | 1 - + include/asm-m68k/bug.h | 4 ++-- + include/asm-m68k/uaccess.h | 6 +++++- + 5 files changed, 8 insertions(+), 14 deletions(-) +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/powerpc/kernel/setup_32.c +Auto-merged arch/powerpc/platforms/powermac/setup.c +Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c +Auto-merged arch/ppc/platforms/radstone_ppc7d.c +Auto-merged lib/Makefile +Merge made by recursive. + Documentation/kernel-parameters.txt | 2 + + Documentation/powerpc/booting-without-of.txt | 16 - + Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ + arch/powerpc/Kconfig | 37 +- + arch/powerpc/Makefile | 2 +- + arch/powerpc/boot/Makefile | 38 +- + arch/powerpc/boot/bamboo.c | 3 +- + arch/powerpc/boot/cuboot-rainier.c | 3 +- + arch/powerpc/boot/cuboot-sequoia.c | 3 +- + arch/powerpc/boot/cuboot-taishan.c | 3 +- + arch/powerpc/boot/cuboot-warp.c | 2 +- + arch/powerpc/boot/cuboot-yosemite.c | 44 + + arch/powerpc/boot/dts/bamboo.dts | 2 - + arch/powerpc/boot/dts/canyonlands.dts | 402 +++++++++ + arch/powerpc/boot/dts/ebony.dts | 2 - + arch/powerpc/boot/dts/glacier.dts | 467 +++++++++++ + arch/powerpc/boot/dts/haleakala.dts | 4 +- + arch/powerpc/boot/dts/katmai.dts | 2 +- + arch/powerpc/boot/dts/kilauea.dts | 4 +- + arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++ + arch/powerpc/boot/dts/makalu.dts | 4 +- + arch/powerpc/boot/dts/rainier.dts | 6 +- + arch/powerpc/boot/dts/sequoia.dts | 6 +- + arch/powerpc/boot/dts/taishan.dts | 31 +- + arch/powerpc/boot/dts/walnut.dts | 1 - + arch/powerpc/boot/dts/warp.dts | 1 - + arch/powerpc/boot/dts/yosemite.dts | 304 +++++++ + arch/powerpc/boot/ebony.c | 3 +- + arch/powerpc/boot/libfdt-wrapper.c | 2 +- + arch/powerpc/boot/ps3-head.S | 25 +- + arch/powerpc/boot/ps3.c | 23 +- + arch/powerpc/boot/simpleboot.c | 84 ++ + arch/powerpc/boot/treeboot-walnut.c | 2 +- + arch/powerpc/boot/virtex405-head.S | 30 + + arch/powerpc/boot/wrapper | 27 +- + arch/powerpc/configs/canyonlands_defconfig | 721 +++++++++++++++++ + arch/powerpc/configs/chrp32_defconfig | 7 +- + arch/powerpc/configs/g5_defconfig | 7 +- + arch/powerpc/configs/iseries_defconfig | 7 +- + arch/powerpc/configs/ksi8560_defconfig | 899 +++++++++++++++++++++ + arch/powerpc/configs/maple_defconfig | 131 +++- + arch/powerpc/configs/pmac32_defconfig | 7 +- + arch/powerpc/configs/ppc44x_defconfig | 14 +- + arch/powerpc/configs/ppc64_defconfig | 8 +- + arch/powerpc/configs/pseries_defconfig | 8 +- + arch/powerpc/kernel/asm-offsets.c | 4 - + arch/powerpc/kernel/btext.c | 3 +- + arch/powerpc/kernel/cpu_setup_44x.S | 5 +- + arch/powerpc/kernel/cputable.c | 28 +- + arch/powerpc/kernel/crash.c | 3 +- + arch/powerpc/kernel/crash_dump.c | 3 +- + arch/powerpc/kernel/head_32.S | 17 - + arch/powerpc/kernel/head_64.S | 18 +- + arch/powerpc/kernel/ibmebus.c | 12 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/isa-bridge.c | 6 +- + arch/powerpc/kernel/lparcfg.c | 12 +- + arch/powerpc/kernel/machine_kexec.c | 3 +- + arch/powerpc/kernel/ppc_ksyms.c | 3 +- + arch/powerpc/kernel/process.c | 5 - + arch/powerpc/kernel/prom.c | 61 ++- + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/kernel/rtas_flash.c | 2 +- + arch/powerpc/kernel/rtas_pci.c | 29 +- + arch/powerpc/kernel/setup-common.c | 11 +- + arch/powerpc/kernel/setup_32.c | 12 + + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/sys_ppc32.c | 5 - + arch/powerpc/kernel/vdso.c | 3 +- + arch/powerpc/kernel/vio.c | 10 +- + arch/powerpc/lib/string.S | 14 + + arch/powerpc/math-emu/fabs.c | 2 +- + arch/powerpc/math-emu/fadd.c | 2 +- + arch/powerpc/math-emu/fadds.c | 2 +- + arch/powerpc/math-emu/fcmpo.c | 2 +- + arch/powerpc/math-emu/fcmpu.c | 2 +- + arch/powerpc/math-emu/fctiw.c | 2 +- + arch/powerpc/math-emu/fctiwz.c | 2 +- + arch/powerpc/math-emu/fdiv.c | 6 +- + arch/powerpc/math-emu/fdivs.c | 6 +- + arch/powerpc/math-emu/fmadd.c | 2 +- + arch/powerpc/math-emu/fmadds.c | 2 +- + arch/powerpc/math-emu/fmr.c | 2 +- + arch/powerpc/math-emu/fmsub.c | 2 +- + arch/powerpc/math-emu/fmsubs.c | 2 +- + arch/powerpc/math-emu/fmul.c | 2 +- + arch/powerpc/math-emu/fmuls.c | 2 +- + arch/powerpc/math-emu/fnabs.c | 2 +- + arch/powerpc/math-emu/fneg.c | 2 +- + arch/powerpc/math-emu/fnmadd.c | 2 +- + arch/powerpc/math-emu/fnmadds.c | 2 +- + arch/powerpc/math-emu/fnmsub.c | 2 +- + arch/powerpc/math-emu/fnmsubs.c | 2 +- + arch/powerpc/math-emu/fres.c | 2 +- + arch/powerpc/math-emu/frsp.c | 2 +- + arch/powerpc/math-emu/frsqrte.c | 2 +- + arch/powerpc/math-emu/fsel.c | 2 +- + arch/powerpc/math-emu/fsqrt.c | 2 +- + arch/powerpc/math-emu/fsqrts.c | 2 +- + arch/powerpc/math-emu/fsub.c | 2 +- + arch/powerpc/math-emu/fsubs.c | 2 +- + arch/powerpc/math-emu/lfd.c | 2 +- + arch/powerpc/math-emu/lfs.c | 2 +- + arch/powerpc/math-emu/mcrfs.c | 4 +- + arch/powerpc/math-emu/mffs.c | 2 +- + arch/powerpc/math-emu/mtfsb0.c | 2 +- + arch/powerpc/math-emu/mtfsb1.c | 2 +- + arch/powerpc/math-emu/mtfsf.c | 2 +- + arch/powerpc/math-emu/mtfsfi.c | 2 +- + arch/powerpc/math-emu/stfd.c | 2 +- + arch/powerpc/math-emu/stfiwx.c | 2 +- + arch/powerpc/math-emu/stfs.c | 2 +- + arch/powerpc/mm/Makefile | 2 +- + arch/powerpc/mm/hash_utils_64.c | 32 +- + arch/powerpc/mm/init_32.c | 4 +- + arch/powerpc/mm/init_64.c | 4 +- + arch/powerpc/mm/mem.c | 5 +- + arch/powerpc/mm/numa.c | 3 +- + arch/powerpc/mm/ppc_mmu_32.c | 2 +- + arch/powerpc/mm/stab.c | 4 +- + arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +- + arch/powerpc/oprofile/cell/vma_map.c | 10 +- + arch/powerpc/oprofile/op_model_cell.c | 14 +- + arch/powerpc/platforms/40x/ep405.c | 2 + + arch/powerpc/platforms/40x/kilauea.c | 4 +- + arch/powerpc/platforms/40x/makalu.c | 2 + + arch/powerpc/platforms/40x/virtex.c | 2 + + arch/powerpc/platforms/40x/walnut.c | 4 +- + arch/powerpc/platforms/44x/44x.h | 1 - + arch/powerpc/platforms/44x/Kconfig | 27 + + arch/powerpc/platforms/44x/Makefile | 2 + + arch/powerpc/platforms/44x/bamboo.c | 15 +- + arch/powerpc/platforms/44x/canyonlands.c | 63 ++ + arch/powerpc/platforms/44x/ebony.c | 5 +- + arch/powerpc/platforms/44x/katmai.c | 5 +- + arch/powerpc/platforms/44x/misc_44x.S | 11 - + arch/powerpc/platforms/44x/rainier.c | 4 +- + arch/powerpc/platforms/44x/sequoia.c | 4 +- + arch/powerpc/platforms/44x/taishan.c | 5 +- + arch/powerpc/platforms/44x/warp-nand.c | 3 +- + arch/powerpc/platforms/44x/warp.c | 6 +- + arch/powerpc/platforms/52xx/lite5200.c | 4 +- + arch/powerpc/platforms/85xx/Kconfig | 7 + + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/ksi8560.c | 257 ++++++ + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- + arch/powerpc/platforms/Kconfig.cputype | 2 + + arch/powerpc/platforms/cell/iommu.c | 10 +- + arch/powerpc/platforms/cell/pervasive.c | 2 +- + arch/powerpc/platforms/cell/ras.c | 10 +- + arch/powerpc/platforms/cell/spu_base.c | 8 +- + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/cell/spu_manage.c | 8 +- + arch/powerpc/platforms/cell/spufs/file.c | 4 +- + arch/powerpc/platforms/cell/spufs/run.c | 10 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +- + arch/powerpc/platforms/iseries/pci.c | 3 +- + arch/powerpc/platforms/maple/pci.c | 47 -- + arch/powerpc/platforms/maple/setup.c | 4 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++ + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 78 ++- + arch/powerpc/platforms/ps3/htab.c | 3 +- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/ps3/mm.c | 3 +- + arch/powerpc/platforms/ps3/os-area.c | 3 +- + arch/powerpc/platforms/ps3/setup.c | 14 +- + arch/powerpc/platforms/ps3/spu.c | 7 + + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/eeh.c | 5 +- + arch/powerpc/platforms/pseries/lpar.c | 15 + + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++ + arch/powerpc/platforms/pseries/reconfig.c | 12 +- + arch/powerpc/platforms/pseries/scanlog.c | 37 +- + arch/powerpc/platforms/pseries/setup.c | 4 + + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/cpm2.c | 2 +- + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/mpic.c | 32 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 133 +++- + arch/powerpc/sysdev/ppc4xx_pci.h | 59 ++ + arch/powerpc/sysdev/ppc4xx_soc.c | 200 +++++ + arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- + arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +- + arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +- + arch/powerpc/sysdev/tsi108_dev.c | 4 +- + arch/powerpc/sysdev/tsi108_pci.c | 4 +- + arch/ppc/8xx_io/commproc.c | 2 +- + arch/ppc/8xx_io/fec.c | 4 +- + arch/ppc/kernel/head.S | 17 - + arch/ppc/mm/init.c | 1 - + arch/ppc/platforms/radstone_ppc7d.c | 8 +- + arch/ppc/syslib/mpc52xx_setup.c | 2 +- + arch/sparc64/Kconfig | 1 + + drivers/block/viodasd.c | 2 +- + drivers/char/xilinx_hwicap/buffer_icap.c | 22 +- + drivers/char/xilinx_hwicap/buffer_icap.h | 5 +- + drivers/char/xilinx_hwicap/fifo_icap.c | 31 +- + drivers/char/xilinx_hwicap/fifo_icap.h | 1 + + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 63 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 + + drivers/net/Makefile | 3 +- + drivers/net/pasemi_mac.c | 324 ++++++-- + drivers/net/pasemi_mac.h | 35 +- + drivers/net/pasemi_mac_ethtool.c | 159 ++++ + drivers/net/ps3_gelic_net.c | 81 ++ + drivers/net/ps3_gelic_net.h | 20 + + drivers/of/base.c | 26 + + drivers/ps3/ps3-sys-manager.c | 74 ++- + drivers/ps3/sys-manager-core.c | 16 +- + drivers/serial/of_serial.c | 4 +- + include/asm-powerpc/Kbuild | 2 +- + include/asm-powerpc/abs_addr.h | 3 +- + include/asm-powerpc/cputhreads.h | 2 +- + include/asm-powerpc/dcr-native.h | 17 + + include/asm-powerpc/dcr-regs.h | 78 ++ + include/asm-powerpc/lmb.h | 82 +-- + include/asm-powerpc/machdep.h | 2 + + include/asm-powerpc/pasemi_dma.h | 77 ++- + include/asm-powerpc/pgtable-ppc32.h | 3 +- + include/asm-powerpc/phyp_dump.h | 45 + + include/asm-powerpc/ppc4xx.h | 18 + + include/asm-powerpc/ps3.h | 7 +- + include/asm-powerpc/sparsemem.h | 1 + + include/asm-powerpc/string.h | 2 + + include/asm-sparc64/lmb.h | 10 + + include/linux/lmb.h | 83 ++ + include/linux/of.h | 1 + + lib/Kconfig | 3 + + lib/Makefile | 2 + + {arch/powerpc/mm => lib}/lmb.c | 141 ++-- + 234 files changed, 6774 insertions(+), 865 deletions(-) + create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt + create mode 100644 arch/powerpc/boot/cuboot-yosemite.c + create mode 100644 arch/powerpc/boot/dts/canyonlands.dts + create mode 100644 arch/powerpc/boot/dts/glacier.dts + create mode 100644 arch/powerpc/boot/dts/ksi8560.dts + create mode 100644 arch/powerpc/boot/dts/yosemite.dts + create mode 100644 arch/powerpc/boot/simpleboot.c + create mode 100644 arch/powerpc/boot/virtex405-head.S + create mode 100644 arch/powerpc/configs/canyonlands_defconfig + create mode 100644 arch/powerpc/configs/ksi8560_defconfig + create mode 100644 arch/powerpc/platforms/44x/canyonlands.c + create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c + create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c + create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c + create mode 100644 drivers/net/pasemi_mac_ethtool.c + create mode 100644 include/asm-powerpc/phyp_dump.h + create mode 100644 include/asm-powerpc/ppc4xx.h + create mode 100644 include/asm-sparc64/lmb.h + create mode 100644 include/linux/lmb.h + rename {arch/powerpc/mm => lib}/lmb.c (68%) +Merging hrt/mm +$ git merge hrt/mm +Auto-merged Documentation/00-INDEX +Auto-merged kernel/time/tick-sched.c +Merge made by recursive. + Documentation/00-INDEX | 6 +-- + Documentation/{hrtimers => timers}/highres.txt | 0 + Documentation/{hrtimers => timers}/hrtimers.txt | 0 + Documentation/{hrtimer => timers}/timer_stats.txt | 0 + include/linux/hrtimer.h | 2 - + include/linux/spinlock.h | 37 --------------------- + include/linux/thread_info.h | 12 +++++++ + kernel/compat.c | 15 ++++---- + kernel/hrtimer.c | 22 ++++++------- + kernel/posix-cpu-timers.c | 30 ++++++++-------- + kernel/time/clocksource.c | 18 ++++++++-- + kernel/time/tick-sched.c | 6 +-- + kernel/timer.c | 16 ++------- + kernel/workqueue.c | 2 + + 14 files changed, 68 insertions(+), 98 deletions(-) + rename Documentation/{hrtimers => timers}/highres.txt (100%) + rename Documentation/{hrtimers => timers}/hrtimers.txt (100%) + rename Documentation/{hrtimer => timers}/timer_stats.txt (100%) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merged arch/sparc64/mm/init.c +Auto-merged fs/jbd2/journal.c +CONFLICT (content): Merge conflict in fs/jbd2/journal.c +Auto-merged fs/jbd2/revoke.c +CONFLICT (content): Merge conflict in fs/jbd2/revoke.c +Resolved 'fs/jbd2/journal.c' using previous resolution. +Resolved 'fs/jbd2/revoke.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/mm/mmu.c | 1 + + arch/m68k/mm/init.c | 1 + + arch/sparc/kernel/sparc_ksyms.c | 2 + + arch/sparc64/mm/init.c | 1 + + fs/ext4/balloc.c | 43 ++++-- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 12 +- + fs/ext4/extents.c | 308 ++++++++++++++++++++++++++++++--------- + fs/ext4/file.c | 21 +++- + fs/ext4/fsync.c | 3 + + fs/ext4/ialloc.c | 122 ++++++++++++++-- + fs/ext4/inode.c | 52 ++++--- + fs/ext4/ioctl.c | 12 +- + fs/ext4/mballoc.c | 83 +++++------ + fs/ext4/migrate.c | 39 +++++- + fs/ext4/namei.c | 37 +++-- + fs/ext4/resize.c | 76 +++++----- + fs/ext4/super.c | 79 +++++++++-- + fs/ext4/xattr.c | 32 ++-- + fs/ext4/xattr.h | 7 - + fs/jbd2/commit.c | 19 +-- + fs/jbd2/journal.c | 38 +++-- + fs/jbd2/revoke.c | 163 +++++++++------------ + fs/jbd2/transaction.c | 41 +++++- + include/linux/ext4_fs.h | 32 ++++- + include/linux/ext4_fs_sb.h | 3 + + 26 files changed, 817 insertions(+), 412 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/configs/{ => 40x}/ep405_defconfig | 0 + arch/powerpc/configs/{ => 40x}/kilauea_defconfig | 0 + arch/powerpc/configs/{ => 40x}/makalu_defconfig | 0 + arch/powerpc/configs/{ => 40x}/walnut_defconfig | 0 + arch/powerpc/configs/{ => 44x}/bamboo_defconfig | 0 + .../configs/{ => 44x}/canyonlands_defconfig | 0 + arch/powerpc/configs/{ => 44x}/ebony_defconfig | 0 + arch/powerpc/configs/{ => 44x}/katmai_defconfig | 0 + arch/powerpc/configs/{ => 44x}/rainier_defconfig | 0 + arch/powerpc/configs/{ => 44x}/sequoia_defconfig | 0 + arch/powerpc/configs/{ => 44x}/taishan_defconfig | 0 + arch/powerpc/configs/{ => 44x}/warp_defconfig | 0 + 12 files changed, 0 insertions(+), 0 deletions(-) + rename arch/powerpc/configs/{ => 40x}/ep405_defconfig (100%) + rename arch/powerpc/configs/{ => 40x}/kilauea_defconfig (100%) + rename arch/powerpc/configs/{ => 40x}/makalu_defconfig (100%) + rename arch/powerpc/configs/{ => 40x}/walnut_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/bamboo_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/canyonlands_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/ebony_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/katmai_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/rainier_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/sequoia_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/taishan_defconfig (100%) + rename arch/powerpc/configs/{ => 44x}/warp_defconfig (100%) +Merging async_tx/next +$ git merge async_tx/next +Auto-merged drivers/dma/fsldma.c +Auto-merged include/linux/dmaengine.h +Merge made by recursive. + crypto/async_tx/async_memcpy.c | 2 +- + crypto/async_tx/async_tx.c | 202 ++++++++++++++++++++++++++------ + crypto/async_tx/async_xor.c | 2 +- + drivers/dma/Kconfig | 8 -- + drivers/dma/dmaengine.c | 15 +-- + drivers/dma/fsldma.c | 57 +++++----- + drivers/dma/ioat_dma.c | 36 ++---- + drivers/dma/iop-adma.c | 60 ++++------ + include/asm-arm/arch-iop13xx/adma.h | 5 - + include/asm-arm/hardware/iop3xx-adma.h | 8 -- + include/asm-arm/hardware/iop_adma.h | 2 - + include/linux/dmaengine.h | 36 ++++--- + 12 files changed, 261 insertions(+), 172 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Auto-merged include/linux/Kbuild +Removed include/linux/udf_fs.h +Removed include/linux/udf_fs_sb.h +Merge made by recursive. + fs/udf/balloc.c | 13 +- + fs/udf/crc.c | 4 +- + fs/udf/dir.c | 83 ++---- + fs/udf/ecma_167.h | 13 - + fs/udf/file.c | 47 --- + fs/udf/ialloc.c | 13 +- + fs/udf/inode.c | 187 +++--------- + fs/udf/lowlevel.c | 1 - + fs/udf/misc.c | 1 - + fs/udf/namei.c | 197 +++++--------- + fs/udf/partition.c | 1 - + fs/udf/super.c | 697 +++++++++++++++++++-------------------------- + fs/udf/symlink.c | 1 - + fs/udf/truncate.c | 81 ++---- + fs/udf/udf_i.h | 30 ++- + fs/udf/udf_sb.h | 93 ++++++ + fs/udf/udfdecl.h | 64 +++-- + fs/udf/udfend.h | 22 -- + fs/udf/udftime.c | 35 ++-- + fs/udf/unicode.c | 59 ++--- + include/linux/Kbuild | 2 +- + include/linux/udf_fs.h | 51 ---- + include/linux/udf_fs_i.h | 31 -- + include/linux/udf_fs_sb.h | 117 -------- + 24 files changed, 682 insertions(+), 1161 deletions(-) + delete mode 100644 include/linux/udf_fs.h + delete mode 100644 include/linux/udf_fs_sb.h +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged include/linux/security.h +Auto-merged kernel/audit.c +Auto-merged security/dummy.c +Auto-merged security/security.c +Auto-merged security/selinux/hooks.c +Auto-merged security/selinux/ss/services.c +Auto-merged security/smack/smack.h +Auto-merged security/smack/smack_lsm.c +Auto-merged security/smack/smackfs.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 6 ++ + include/linux/audit.h | 29 ++++++++ + include/linux/security.h | 114 +++++++++++++++++++++++++++++- + include/linux/selinux.h | 134 ----------------------------------- + kernel/audit.c | 24 +++---- + kernel/audit.h | 25 ------- + kernel/auditfilter.c | 99 ++++++++++---------------- + kernel/auditsc.c | 74 ++++++++++--------- + net/netlink/af_netlink.c | 3 +- + security/dummy.c | 51 +++++++++++++- + security/security.c | 73 +++++++++++++++++++- + security/selinux/exports.c | 42 ----------- + security/selinux/hooks.c | 34 ++++++++- + security/selinux/include/audit.h | 65 +++++++++++++++++ + security/selinux/ss/services.c | 45 +++++++++--- + security/smack/smack.h | 2 + + security/smack/smack_lsm.c | 7 ++- + security/smack/smackfs.c | 11 +++- + 18 files changed, 503 insertions(+), 335 deletions(-) + create mode 100644 security/selinux/include/audit.h +Merging net/master +$ git merge net/master +Auto-merged Documentation/feature-removal-schedule.txt +Removed Documentation/networking/bcm43xx.txt +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/s390/defconfig +Auto-merged drivers/net/Makefile +Removed drivers/net/atl1/Makefile +Removed drivers/net/atl1/atl1.h +Removed drivers/net/atl1/atl1_ethtool.c +Removed drivers/net/atl1/atl1_hw.c +Removed drivers/net/atl1/atl1_hw.h +Removed drivers/net/atl1/atl1_param.c +Removed drivers/net/sk98lin/Makefile +Removed drivers/net/sk98lin/h/lm80.h +Removed drivers/net/sk98lin/h/skaddr.h +Removed drivers/net/sk98lin/h/skcsum.h +Removed drivers/net/sk98lin/h/skdebug.h +Removed drivers/net/sk98lin/h/skdrv1st.h +Removed drivers/net/sk98lin/h/skdrv2nd.h +Removed drivers/net/sk98lin/h/skerror.h +Removed drivers/net/sk98lin/h/skgedrv.h +Removed drivers/net/sk98lin/h/skgehw.h +Removed drivers/net/sk98lin/h/skgehwt.h +Removed drivers/net/sk98lin/h/skgei2c.h +Removed drivers/net/sk98lin/h/skgeinit.h +Removed drivers/net/sk98lin/h/skgepnm2.h +Removed drivers/net/sk98lin/h/skgepnmi.h +Removed drivers/net/sk98lin/h/skgesirq.h +Removed drivers/net/sk98lin/h/ski2c.h +Removed drivers/net/sk98lin/h/skqueue.h +Removed drivers/net/sk98lin/h/skrlmt.h +Removed drivers/net/sk98lin/h/sktimer.h +Removed drivers/net/sk98lin/h/sktypes.h +Removed drivers/net/sk98lin/h/skversion.h +Removed drivers/net/sk98lin/h/skvpd.h +Removed drivers/net/sk98lin/h/xmac_ii.h +Removed drivers/net/sk98lin/skaddr.c +Removed drivers/net/sk98lin/skdim.c +Removed drivers/net/sk98lin/skethtool.c +Removed drivers/net/sk98lin/skge.c +Removed drivers/net/sk98lin/skgehwt.c +Removed drivers/net/sk98lin/skgeinit.c +Removed drivers/net/sk98lin/skgemib.c +Removed drivers/net/sk98lin/skgepnmi.c +Removed drivers/net/sk98lin/skgesirq.c +Removed drivers/net/sk98lin/ski2c.c +Removed drivers/net/sk98lin/sklm80.c +Removed drivers/net/sk98lin/skqueue.c +Removed drivers/net/sk98lin/skrlmt.c +Removed drivers/net/sk98lin/sktimer.c +Removed drivers/net/sk98lin/skvpd.c +Removed drivers/net/sk98lin/skxmac2.c +Auto-merged drivers/net/smc91x.h +Removed drivers/net/tulip/xircom_tulip_cb.c +Auto-merged drivers/net/wireless/b43/main.c +Removed drivers/net/wireless/bcm43xx/Kconfig +Removed drivers/net/wireless/bcm43xx/Makefile +Removed drivers/net/wireless/bcm43xx/bcm43xx.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h +Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c +Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h +Removed drivers/net/wireless/iwlwifi/iwl-4965-io.h +Removed drivers/net/wireless/libertas/join.c +Removed drivers/net/wireless/libertas/join.h +Removed drivers/net/wireless/net2280.h +Removed drivers/net/wireless/rt2x00/rt2x00ring.h +Removed drivers/s390/net/ctcdbug.c +Removed drivers/s390/net/ctcdbug.h +Removed drivers/s390/net/ctcmain.c +Removed drivers/s390/net/ctcmain.h +Removed drivers/s390/net/qeth_fs.h +Removed drivers/s390/net/qeth_main.c +Removed drivers/s390/net/qeth_mpc.c +Removed drivers/s390/net/qeth_proc.c +Removed drivers/s390/net/qeth_sys.c +Removed drivers/s390/net/qeth_tso.h +Auto-merged include/linux/Kbuild +Removed include/linux/pcounter.h +Auto-merged include/linux/security.h +Removed include/net/ieee80211softmac.h +Removed include/net/ieee80211softmac_wx.h +Auto-merged include/net/ipv6.h +Auto-merged lib/Makefile +Removed lib/pcounter.c +Removed net/ieee80211/softmac/Kconfig +Removed net/ieee80211/softmac/Makefile +Removed net/ieee80211/softmac/ieee80211softmac_assoc.c +Removed net/ieee80211/softmac/ieee80211softmac_auth.c +Removed net/ieee80211/softmac/ieee80211softmac_event.c +Removed net/ieee80211/softmac/ieee80211softmac_io.c +Removed net/ieee80211/softmac/ieee80211softmac_module.c +Removed net/ieee80211/softmac/ieee80211softmac_priv.h +Removed net/ieee80211/softmac/ieee80211softmac_scan.c +Removed net/ieee80211/softmac/ieee80211softmac_wx.c +Auto-merged net/ipv4/ipconfig.c +Removed net/mac80211/rc80211_simple.c +Removed net/mac80211/regdomain.c +Auto-merged net/netlink/af_netlink.c +Auto-merged net/rxrpc/ar-internal.h +Auto-merged net/sunrpc/auth_gss/auth_gss.c +Auto-merged net/sunrpc/clnt.c +Auto-merged net/sunrpc/rpcb_clnt.c +Auto-merged net/sunrpc/xprtsock.c +Auto-merged security/dummy.c +Auto-merged security/security.c +Auto-merged security/selinux/ss/services.c +Auto-merged security/smack/smack_lsm.c +Resolved 'MAINTAINERS' 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/Makefile | 3 +- + Documentation/DocBook/mac80211.tmpl | 335 + + Documentation/feature-removal-schedule.txt | 37 - + Documentation/laptops/acer-wmi.txt | 2 +- + Documentation/networking/bcm43xx.txt | 89 - + MAINTAINERS | 17 +- + arch/ia64/hp/sim/simeth.c | 2 +- + arch/s390/defconfig | 8 +- + drivers/atm/ambassador.c | 22 +- + drivers/atm/horizon.c | 24 +- + drivers/block/aoe/aoenet.c | 2 +- + drivers/net/3c509.c | 729 +- + drivers/net/8139too.c | 10 +- + drivers/net/8390.c | 6 +- + drivers/net/Kconfig | 94 +- + drivers/net/Makefile | 4 +- + drivers/net/appletalk/cops.c | 6 +- + drivers/net/arcnet/arcnet.c | 5 +- + drivers/net/arcnet/com20020.c | 7 +- + drivers/net/at1700.c | 7 +- + drivers/net/atarilance.c | 7 +- + drivers/net/atl1/Makefile | 2 - + drivers/net/atl1/atl1.h | 286 - + drivers/net/atl1/atl1_ethtool.c | 505 -- + drivers/net/atl1/atl1_hw.c | 720 -- + drivers/net/atl1/atl1_hw.h | 946 --- + drivers/net/atl1/atl1_param.c | 203 - + drivers/net/atlx/Makefile | 1 + + drivers/net/{atl1/atl1_main.c => atlx/atl1.c} | 2120 ++++-- + drivers/net/atlx/atl1.h | 796 ++ + drivers/net/atlx/atlx.c | 433 + + drivers/net/atlx/atlx.h | 506 ++ + drivers/net/atp.c | 4 +- + drivers/net/bonding/bond_3ad.c | 2 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 12 +- + drivers/net/cassini.c | 12 +- + drivers/net/cxgb3/cxgb3_offload.c | 22 +- + drivers/net/cxgb3/l2t.c | 2 +- + drivers/net/defxx.c | 3 +- + drivers/net/e1000/e1000.h | 27 +- + drivers/net/e1000/e1000_ethtool.c | 17 +- + drivers/net/e1000/e1000_hw.c | 223 +- + drivers/net/e1000/e1000_hw.h | 62 +- + drivers/net/e1000/e1000_main.c | 131 +- + drivers/net/e1000/e1000_osdep.h | 7 - + drivers/net/e1000e/82571.c | 127 +- + drivers/net/e1000e/Makefile | 2 +- + drivers/net/e1000e/defines.h | 109 +- + drivers/net/e1000e/e1000.h | 33 +- + drivers/net/e1000e/es2lan.c | 105 +- + drivers/net/e1000e/ethtool.c | 161 +- + drivers/net/e1000e/hw.h | 171 +- + drivers/net/e1000e/ich8lan.c | 279 +- + drivers/net/e1000e/lib.c | 342 +- + drivers/net/e1000e/netdev.c | 621 +- + drivers/net/e1000e/param.c | 33 +- + drivers/net/e1000e/phy.c | 164 +- + drivers/net/ehea/ehea.h | 6 +- + drivers/net/ehea/ehea_main.c | 92 +- + drivers/net/forcedeth.c | 6 +- + drivers/net/gianfar.c | 24 +- + drivers/net/gianfar.h | 9 +- + drivers/net/hamradio/bpqether.c | 4 +- + drivers/net/ibmveth.c | 42 +- + drivers/net/ixgb/ixgb.h | 28 +- + drivers/net/ixgb/ixgb_ee.c | 50 +- + drivers/net/ixgb/ixgb_ee.h | 2 +- + drivers/net/ixgb/ixgb_ethtool.c | 17 +- + drivers/net/ixgb/ixgb_hw.c | 57 +- + drivers/net/ixgb/ixgb_hw.h | 18 +- + drivers/net/ixgb/ixgb_main.c | 96 +- + drivers/net/ixgb/ixgb_osdep.h | 7 - + drivers/net/ixgbe/ixgbe.h | 87 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 39 +- + drivers/net/ixgbe/ixgbe_main.c | 1520 +++- + drivers/net/korina.c | 1233 +++ + drivers/net/loopback.c | 2 +- + drivers/net/macvlan.c | 2 +- + drivers/net/mv643xx_eth.c | 2 +- + drivers/net/natsemi.c | 10 +- + drivers/net/ni52.c | 255 +- + drivers/net/ni52.h | 4 +- + drivers/net/niu.c | 701 ++- + drivers/net/niu.h | 4 +- + drivers/net/phy/broadcom.c | 57 +- + drivers/net/pppoe.c | 6 +- + drivers/net/ps3_gelic_wireless.c | 2 +- + drivers/net/qla3xxx.c | 6 +- + drivers/net/s2io.c | 459 +- + drivers/net/s2io.h | 50 +- + drivers/net/sk98lin/Makefile | 87 - + drivers/net/sk98lin/h/lm80.h | 179 - + drivers/net/sk98lin/h/skaddr.h | 285 - + drivers/net/sk98lin/h/skcsum.h | 213 - + drivers/net/sk98lin/h/skdebug.h | 74 - + drivers/net/sk98lin/h/skdrv1st.h | 188 - + drivers/net/sk98lin/h/skdrv2nd.h | 447 - + drivers/net/sk98lin/h/skerror.h | 55 - + drivers/net/sk98lin/h/skgedrv.h | 51 - + drivers/net/sk98lin/h/skgehw.h | 2126 ----- + drivers/net/sk98lin/h/skgehwt.h | 48 - + drivers/net/sk98lin/h/skgei2c.h | 210 - + drivers/net/sk98lin/h/skgeinit.h | 797 -- + drivers/net/sk98lin/h/skgepnm2.h | 334 - + drivers/net/sk98lin/h/skgepnmi.h | 962 --- + drivers/net/sk98lin/h/skgesirq.h | 110 - + drivers/net/sk98lin/h/ski2c.h | 174 - + drivers/net/sk98lin/h/skqueue.h | 94 - + drivers/net/sk98lin/h/skrlmt.h | 438 - + drivers/net/sk98lin/h/sktimer.h | 63 - + drivers/net/sk98lin/h/sktypes.h | 69 - + drivers/net/sk98lin/h/skversion.h | 38 - + drivers/net/sk98lin/h/skvpd.h | 248 - + drivers/net/sk98lin/h/xmac_ii.h | 1579 ---- + drivers/net/sk98lin/skaddr.c | 1788 ---- + drivers/net/sk98lin/skdim.c | 742 -- + drivers/net/sk98lin/skethtool.c | 627 -- + drivers/net/sk98lin/skge.c | 5218 ------------ + drivers/net/sk98lin/skgehwt.c | 171 - + drivers/net/sk98lin/skgeinit.c | 2005 ----- + drivers/net/sk98lin/skgemib.c | 1075 --- + drivers/net/sk98lin/skgepnmi.c | 8198 ------------------ + drivers/net/sk98lin/skgesirq.c | 2229 ----- + drivers/net/sk98lin/ski2c.c | 1296 --- + drivers/net/sk98lin/sklm80.c | 141 - + drivers/net/sk98lin/skqueue.c | 179 - + drivers/net/sk98lin/skrlmt.c | 3257 ------- + drivers/net/sk98lin/sktimer.c | 250 - + drivers/net/sk98lin/skvpd.c | 1091 --- + drivers/net/sk98lin/skxmac2.c | 4160 --------- + drivers/net/skfp/fplustm.c | 12 +- + drivers/net/skfp/h/fplustm.h | 20 +- + drivers/net/skfp/hwmtm.c | 86 +- + drivers/net/skfp/skfddi.c | 4 +- + drivers/net/smc91x.c | 335 +- + drivers/net/smc91x.h | 331 +- + drivers/net/tokenring/3c359.c | 21 +- + drivers/net/tulip/Kconfig | 15 +- + drivers/net/tulip/Makefile | 1 - + drivers/net/tulip/xircom_tulip_cb.c | 1726 ---- + drivers/net/usb/dm9601.c | 10 +- + drivers/net/usb/rndis_host.c | 5 +- + drivers/net/veth.c | 2 +- + drivers/net/via-velocity.c | 23 +- + drivers/net/wan/cosa.c | 14 +- + drivers/net/wan/dlci.c | 2 +- + drivers/net/wan/hdlc.c | 4 +- + drivers/net/wan/lapbether.c | 4 +- + drivers/net/wan/syncppp.c | 2 +- + drivers/net/wireless/Kconfig | 113 +- + drivers/net/wireless/Makefile | 5 +- + drivers/net/wireless/adm8211.c | 95 +- + drivers/net/wireless/adm8211.h | 65 +- + drivers/net/wireless/ath5k/Kconfig | 37 + + drivers/net/wireless/ath5k/Makefile | 8 +- + drivers/net/wireless/ath5k/ath5k.h | 159 +- + drivers/net/wireless/ath5k/base.c | 561 +- + drivers/net/wireless/ath5k/base.h | 18 +- + drivers/net/wireless/ath5k/debug.c | 92 +- + drivers/net/wireless/ath5k/debug.h | 29 +- + drivers/net/wireless/ath5k/hw.c | 649 +- + drivers/net/wireless/ath5k/hw.h | 150 +- + drivers/net/wireless/ath5k/initvals.c | 239 +- + drivers/net/wireless/ath5k/phy.c | 272 +- + drivers/net/wireless/ath5k/reg.h | 4 +- + drivers/net/wireless/atmel.c | 5 +- + drivers/net/wireless/b43/Kconfig | 18 + + drivers/net/wireless/b43/Makefile | 5 +- + drivers/net/wireless/b43/b43.h | 195 +- + drivers/net/wireless/b43/dma.c | 440 +- + drivers/net/wireless/b43/dma.h | 14 +- + drivers/net/wireless/b43/main.c | 1023 ++- + drivers/net/wireless/b43/main.h | 11 +- + drivers/net/wireless/b43/nphy.c | 1 - + drivers/net/wireless/b43/nphy.h | 40 + + drivers/net/wireless/b43/pcmcia.c | 10 +- + drivers/net/wireless/b43/pio.c | 842 ++ + drivers/net/wireless/b43/pio.h | 220 + + drivers/net/wireless/b43/sysfs.c | 89 +- + drivers/net/wireless/b43/wa.c | 45 +- + drivers/net/wireless/b43/xmit.c | 206 +- + drivers/net/wireless/b43/xmit.h | 44 +- + drivers/net/wireless/b43legacy/b43legacy.h | 46 +- + drivers/net/wireless/b43legacy/main.c | 433 +- + drivers/net/wireless/b43legacy/xmit.c | 78 +- + drivers/net/wireless/bcm43xx/Kconfig | 70 - + drivers/net/wireless/bcm43xx/Makefile | 12 - + drivers/net/wireless/bcm43xx/bcm43xx.h | 997 --- + drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 556 -- + drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 118 - + drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 1263 --- + drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 386 - + drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 - + drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 - + drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 352 - + drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 33 - + drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 307 - + drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 62 - + drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4281 ---------- + drivers/net/wireless/bcm43xx/bcm43xx_main.h | 133 - + drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2346 ----- + drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 78 - + drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 674 -- + drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 163 - + drivers/net/wireless/bcm43xx/bcm43xx_power.c | 393 - + drivers/net/wireless/bcm43xx/bcm43xx_power.h | 56 - + drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 2170 ----- + drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 115 - + drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 471 - + drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h | 9 - + drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1035 --- + drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 - + drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 565 -- + drivers/net/wireless/bcm43xx/bcm43xx_xmit.h | 150 - + drivers/net/wireless/ipw2200.c | 16 +- + drivers/net/wireless/ipw2200.h | 112 +- + drivers/net/wireless/iwlwifi/Kconfig | 53 +- + drivers/net/wireless/iwlwifi/Makefile | 21 + + drivers/net/wireless/iwlwifi/iwl-3945-commands.h | 96 +- + drivers/net/wireless/iwlwifi/iwl-3945-core.h | 80 + + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 211 +- + drivers/net/wireless/iwlwifi/iwl-3945-io.h | 41 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 433 + + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 73 + + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 158 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 431 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 115 +- + drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 109 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 509 +-- + drivers/net/wireless/iwlwifi/iwl-4965-io.h | 431 - + drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 522 +- + drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2119 +++--- + drivers/net/wireless/iwlwifi/iwl-4965.h | 397 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 279 + + drivers/net/wireless/iwlwifi/iwl-core.h | 218 + + drivers/net/wireless/iwlwifi/iwl-csr.h | 265 + + .../iwlwifi/{iwl-4965-debug.h => iwl-debug.h} | 65 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 320 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 561 ++ + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 375 + + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 277 + + drivers/net/wireless/iwlwifi/iwl-helpers.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 429 + + drivers/net/wireless/iwlwifi/iwl-led.c | 449 + + drivers/net/wireless/iwlwifi/iwl-led.h | 82 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 78 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 170 + + drivers/net/wireless/iwlwifi/iwl-rfkill.h | 54 + + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1076 +-- + drivers/net/wireless/iwlwifi/iwl4965-base.c | 3393 +++----- + drivers/net/wireless/libertas/11d.c | 16 +- + drivers/net/wireless/libertas/11d.h | 5 +- + drivers/net/wireless/libertas/Makefile | 2 +- + drivers/net/wireless/libertas/assoc.c | 1283 +++- + drivers/net/wireless/libertas/assoc.h | 29 +- + drivers/net/wireless/libertas/cmd.c | 514 +- + drivers/net/wireless/libertas/cmd.h | 11 +- + drivers/net/wireless/libertas/cmdresp.c | 210 +- + drivers/net/wireless/libertas/debugfs.c | 177 +- + drivers/net/wireless/libertas/decl.h | 13 +- + drivers/net/wireless/libertas/defs.h | 10 +- + drivers/net/wireless/libertas/dev.h | 57 +- + drivers/net/wireless/libertas/ethtool.c | 77 +- + drivers/net/wireless/libertas/host.h | 4 - + drivers/net/wireless/libertas/hostcmd.h | 57 +- + drivers/net/wireless/libertas/if_cs.c | 3 + + drivers/net/wireless/libertas/join.c | 895 -- + drivers/net/wireless/libertas/join.h | 53 - + drivers/net/wireless/libertas/main.c | 131 +- + drivers/net/wireless/libertas/rx.c | 2 +- + drivers/net/wireless/libertas/scan.c | 877 +-- + drivers/net/wireless/libertas/scan.h | 184 +- + drivers/net/wireless/libertas/tx.c | 5 +- + drivers/net/wireless/libertas/types.h | 13 + + drivers/net/wireless/libertas/wext.c | 62 +- + drivers/net/wireless/libertas/wext.h | 13 - + drivers/net/wireless/net2280.h | 452 - + drivers/net/wireless/p54/Kconfig | 63 + + drivers/net/wireless/p54/Makefile | 3 + + drivers/net/wireless/p54/net2280.h | 452 + + drivers/net/wireless/{ => p54}/p54.h | 4 - + drivers/net/wireless/{ => p54}/p54common.c | 96 +- + drivers/net/wireless/{ => p54}/p54common.h | 75 - + drivers/net/wireless/{ => p54}/p54pci.c | 0 + drivers/net/wireless/{ => p54}/p54pci.h | 0 + drivers/net/wireless/{ => p54}/p54usb.c | 0 + drivers/net/wireless/{ => p54}/p54usb.h | 0 + drivers/net/wireless/prism54/isl_ioctl.c | 51 +- + drivers/net/wireless/prism54/islpci_dev.c | 6 +- + drivers/net/wireless/prism54/islpci_dev.h | 6 +- + drivers/net/wireless/rndis_wlan.c | 451 +- + drivers/net/wireless/rt2x00/Kconfig | 60 +- + drivers/net/wireless/rt2x00/Makefile | 37 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 569 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 14 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 591 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 6 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 644 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 9 +- + drivers/net/wireless/rt2x00/rt2x00.h | 356 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 167 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 125 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 913 +-- + drivers/net/wireless/rt2x00/rt2x00dump.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 21 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 219 + + drivers/net/wireless/rt2x00/rt2x00leds.h | 50 + + drivers/net/wireless/rt2x00/rt2x00lib.h | 100 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 309 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 287 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 67 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 304 + + drivers/net/wireless/rt2x00/rt2x00queue.h | 468 + + drivers/net/wireless/rt2x00/rt2x00reg.h | 75 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00ring.h | 290 - + drivers/net/wireless/rt2x00/rt2x00usb.c | 331 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 161 +- + drivers/net/wireless/rt2x00/rt61pci.c | 829 +- + drivers/net/wireless/rt2x00/rt61pci.h | 33 +- + drivers/net/wireless/rt2x00/rt73usb.c | 699 +- + drivers/net/wireless/rt2x00/rt73usb.h | 24 +- + drivers/net/wireless/rtl8180.h | 2 +- + drivers/net/wireless/rtl8180_dev.c | 107 +- + drivers/net/wireless/rtl8180_grf5101.c | 5 +- + drivers/net/wireless/rtl8180_max2820.c | 5 +- + drivers/net/wireless/rtl8180_rtl8225.c | 15 +- + drivers/net/wireless/rtl8180_sa2400.c | 5 +- + drivers/net/wireless/rtl8187.h | 2 +- + drivers/net/wireless/rtl8187_dev.c | 92 +- + drivers/net/wireless/rtl8187_rtl8225.c | 15 +- + drivers/net/wireless/rtl818x.h | 70 - + drivers/net/wireless/strip.c | 6 +- + drivers/net/wireless/wavelan_cs.c | 47 +- + drivers/net/wireless/wavelan_cs.p.h | 26 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 24 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 17 +- + drivers/net/wireless/zd1211rw/zd_ieee80211.c | 11 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 241 +- + drivers/net/wireless/zd1211rw/zd_mac.h | 5 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 11 +- + drivers/net/yellowfin.c | 4 +- + drivers/s390/net/Kconfig | 84 +- + drivers/s390/net/Makefile | 12 +- + drivers/s390/net/ctcdbug.c | 80 - + drivers/s390/net/ctcdbug.h | 125 - + drivers/s390/net/ctcm_dbug.c | 67 + + drivers/s390/net/ctcm_dbug.h | 158 + + drivers/s390/net/ctcm_fsms.c | 2347 +++++ + drivers/s390/net/ctcm_fsms.h | 359 + + drivers/s390/net/ctcm_main.c | 1772 ++++ + drivers/s390/net/ctcm_main.h | 287 + + drivers/s390/net/ctcm_mpc.c | 2472 ++++++ + drivers/s390/net/ctcm_mpc.h | 239 + + drivers/s390/net/ctcm_sysfs.c | 210 + + drivers/s390/net/ctcmain.c | 3062 ------- + drivers/s390/net/ctcmain.h | 270 - + drivers/s390/net/{qeth.h => qeth_core.h} | 811 +-- + drivers/s390/net/qeth_core_main.c | 4540 ++++++++++ + drivers/s390/net/qeth_core_mpc.c | 266 + + drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} | 143 +- + drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} | 287 +- + drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} | 50 +- + drivers/s390/net/qeth_core_sys.c | 651 ++ + drivers/s390/net/qeth_fs.h | 168 - + drivers/s390/net/qeth_l2_main.c | 1242 +++ + drivers/s390/net/qeth_l3.h | 76 + + drivers/s390/net/qeth_l3_main.c | 3391 ++++++++ + drivers/s390/net/qeth_l3_sys.c | 1051 +++ + drivers/s390/net/qeth_main.c | 8956 -------------------- + drivers/s390/net/qeth_mpc.c | 269 - + drivers/s390/net/qeth_proc.c | 316 - + drivers/s390/net/qeth_sys.c | 1858 ---- + drivers/s390/net/qeth_tso.h | 148 - + drivers/ssb/Kconfig | 20 + + drivers/ssb/Makefile | 2 + + drivers/ssb/driver_chipcommon.c | 12 +- + drivers/ssb/driver_gige.c | 294 + + drivers/ssb/driver_mipscore.c | 1 + + drivers/ssb/driver_pcicore.c | 160 +- + drivers/ssb/embedded.c | 90 + + drivers/ssb/main.c | 260 +- + drivers/ssb/pci.c | 211 +- + drivers/ssb/pcihost_wrapper.c | 10 + + drivers/ssb/pcmcia.c | 699 ++- + drivers/ssb/sprom.c | 133 + + drivers/ssb/ssb_private.h | 24 + + fs/proc/proc_net.c | 6 +- + include/linux/Kbuild | 2 + + include/linux/arcdevice.h | 4 +- + include/linux/atalk.h | 2 - + include/linux/filter.h | 35 +- + include/linux/icmpv6.h | 11 +- + include/linux/ieee80211.h | 35 + + include/linux/if_arp.h | 6 + + include/linux/if_tunnel.h | 22 +- + include/linux/if_vlan.h | 2 +- + include/linux/igmp.h | 38 +- + include/linux/in6.h | 34 + + include/linux/inetdevice.h | 8 +- + include/linux/ipv6.h | 48 +- + include/linux/mroute.h | 25 +- + include/linux/mroute6.h | 228 + + include/linux/net.h | 3 +- + include/linux/netdevice.h | 35 +- + include/linux/netfilter.h | 85 +- + include/linux/netfilter/nf_conntrack_dccp.h | 40 + + include/linux/netfilter/nf_conntrack_sip.h | 185 +- + include/linux/netfilter/nfnetlink_conntrack.h | 8 + + include/linux/netfilter/x_tables.h | 4 +- + include/linux/netfilter/xt_sctp.h | 84 +- + include/linux/netfilter_arp/arp_tables.h | 17 +- + include/linux/netfilter_bridge/ebt_nflog.h | 21 + + include/linux/netfilter_ipv4.h | 2 - + include/linux/nl80211.h | 218 +- + include/linux/pcounter.h | 74 - + include/linux/pim.h | 45 + + include/linux/security.h | 48 +- + include/linux/seq_file.h | 13 - + include/linux/seq_file_net.h | 27 + + include/linux/skbuff.h | 206 +- + include/linux/smc91x.h | 13 + + include/linux/ssb/ssb.h | 50 +- + include/linux/ssb/ssb_driver_chipcommon.h | 7 +- + include/linux/ssb/ssb_driver_gige.h | 174 + + include/linux/ssb/ssb_driver_pci.h | 19 + + include/linux/tcp.h | 7 + + include/linux/udp.h | 19 +- + include/linux/wireless.h | 1 + + include/linux/xfrm.h | 3 +- + include/net/addrconf.h | 122 +- + include/net/cfg80211.h | 159 +- + include/net/dst.h | 10 +- + include/net/icmp.h | 9 +- + include/net/ieee80211.h | 1 - + include/net/ieee80211softmac.h | 373 - + include/net/ieee80211softmac_wx.h | 99 - + include/net/inet_common.h | 11 + + include/net/inet_connection_sock.h | 5 - + include/net/inet_frag.h | 6 +- + include/net/inet_hashtables.h | 10 +- + include/net/inet_sock.h | 7 +- + include/net/inet_timewait_sock.h | 18 + + include/net/ip.h | 10 +- + include/net/ip6_fib.h | 18 +- + include/net/ip6_route.h | 56 +- + include/net/ipip.h | 10 + + include/net/ipv6.h | 84 +- + include/net/llc_if.h | 5 - + include/net/mac80211.h | 557 +- + include/net/mip6.h | 3 - + include/net/ndisc.h | 31 +- + include/net/neighbour.h | 31 +- + include/net/net_namespace.h | 45 +- + include/net/netfilter/nf_conntrack.h | 39 +- + include/net/netfilter/nf_conntrack_core.h | 4 +- + include/net/netfilter/nf_conntrack_expect.h | 22 +- + include/net/netfilter/nf_conntrack_helper.h | 5 +- + include/net/netfilter/nf_conntrack_l3proto.h | 19 +- + include/net/netfilter/nf_conntrack_l4proto.h | 13 +- + include/net/netfilter/nf_conntrack_tuple.h | 96 +- + include/net/netfilter/nf_nat_helper.h | 3 + + include/net/netfilter/nf_nat_protocol.h | 46 +- + include/net/netfilter/nf_nat_rule.h | 3 - + include/net/netlabel.h | 14 +- + include/net/netns/core.h | 16 + + include/net/netns/dccp.h | 11 + + include/net/netns/ipv4.h | 11 + + include/net/netns/ipv6.h | 18 + + include/net/pkt_cls.h | 2 +- + include/net/protocol.h | 3 +- + include/net/raw.h | 4 +- + include/net/request_sock.h | 9 +- + include/net/route.h | 5 +- + include/net/sctp/command.h | 3 +- + include/net/sctp/sctp.h | 5 - + include/net/sctp/sm.h | 8 - + include/net/sctp/structs.h | 10 +- + include/net/sock.h | 118 +- + include/net/tcp.h | 28 +- + include/net/tipc/tipc_bearer.h | 9 + + include/net/tipc/tipc_port.h | 7 - + include/net/udp.h | 15 +- + include/net/wireless.h | 186 + + include/net/xfrm.h | 69 +- + lib/Makefile | 1 - + lib/kobject_uevent.c | 6 +- + lib/pcounter.c | 58 - + net/8021q/vlan.c | 38 +- + net/8021q/vlan_dev.c | 14 +- + net/8021q/vlanproc.c | 2 +- + net/9p/error.c | 2 +- + net/Kconfig | 2 +- + net/appletalk/aarp.c | 25 +- + net/appletalk/ddp.c | 6 +- + net/atm/clip.c | 6 +- + net/atm/lec.c | 37 +- + net/atm/mpc.c | 2 +- + net/atm/proc.c | 48 +- + net/atm/resources.c | 5 +- + net/atm/svc.c | 2 +- + net/ax25/af_ax25.c | 4 +- + net/ax25/ax25_in.c | 2 +- + net/bluetooth/l2cap.c | 2 +- + net/bluetooth/rfcomm/sock.c | 2 +- + net/bluetooth/sco.c | 2 +- + net/bridge/br_netfilter.c | 16 +- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_notify.c | 2 +- + net/bridge/br_stp_bpdu.c | 2 +- + net/bridge/br_sysfs_br.c | 6 +- + net/bridge/netfilter/Kconfig | 14 + + net/bridge/netfilter/Makefile | 1 + + net/bridge/netfilter/ebt_nflog.c | 74 + + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/can/af_can.c | 4 +- + net/can/bcm.c | 2 +- + net/can/raw.c | 2 +- + net/core/dev.c | 28 +- + net/core/dev_mcast.c | 37 +- + net/core/dst.c | 15 +- + net/core/fib_rules.c | 8 +- + net/core/filter.c | 57 +- + net/core/neighbour.c | 171 +- + net/core/netpoll.c | 6 +- + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 16 +- + net/core/skbuff.c | 96 +- + net/core/sock.c | 150 +- + net/core/sysctl_net_core.c | 12 +- + net/dccp/dccp.h | 8 +- + net/dccp/ipv4.c | 79 +- + net/dccp/ipv6.c | 91 +- + net/dccp/minisocks.c | 2 +- + net/dccp/output.c | 6 +- + net/dccp/proto.c | 27 +- + net/decnet/af_decnet.c | 25 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/dn_fib.c | 4 +- + net/decnet/dn_route.c | 6 +- + net/decnet/dn_table.c | 2 +- + net/econet/af_econet.c | 4 +- + net/ieee80211/Kconfig | 1 - + net/ieee80211/Makefile | 1 - + net/ieee80211/softmac/Kconfig | 12 - + net/ieee80211/softmac/Makefile | 9 - + net/ieee80211/softmac/ieee80211softmac_assoc.c | 489 -- + net/ieee80211/softmac/ieee80211softmac_auth.c | 413 - + net/ieee80211/softmac/ieee80211softmac_event.c | 189 - + net/ieee80211/softmac/ieee80211softmac_io.c | 488 -- + net/ieee80211/softmac/ieee80211softmac_module.c | 568 -- + net/ieee80211/softmac/ieee80211softmac_priv.h | 244 - + net/ieee80211/softmac/ieee80211softmac_scan.c | 254 - + net/ieee80211/softmac/ieee80211softmac_wx.c | 508 -- + net/ipv4/af_inet.c | 70 +- + net/ipv4/arp.c | 62 +- + net/ipv4/cipso_ipv4.c | 1 - + net/ipv4/devinet.c | 35 +- + net/ipv4/fib_frontend.c | 20 +- + net/ipv4/fib_hash.c | 5 +- + net/ipv4/fib_rules.c | 2 +- + net/ipv4/fib_trie.c | 240 +- + net/ipv4/icmp.c | 203 +- + net/ipv4/igmp.c | 45 +- + net/ipv4/inet_connection_sock.c | 45 +- + net/ipv4/inet_fragment.c | 10 +- + net/ipv4/inet_hashtables.c | 24 +- + net/ipv4/inet_timewait_sock.c | 4 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_fragment.c | 26 +- + net/ipv4/ip_gre.c | 6 +- + net/ipv4/ip_input.c | 21 +- + net/ipv4/ip_options.c | 63 +- + net/ipv4/ip_output.c | 28 +- + net/ipv4/ip_sockglue.c | 13 +- + net/ipv4/ipcomp.c | 2 +- + net/ipv4/ipconfig.c | 39 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 12 +- + net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 +- + net/ipv4/ipvs/ip_vs_proto_udp.c | 2 +- + net/ipv4/ipvs/ip_vs_sync.c | 4 +- + net/ipv4/netfilter.c | 37 +- + net/ipv4/netfilter/Kconfig | 15 + + net/ipv4/netfilter/Makefile | 5 +- + net/ipv4/netfilter/arp_tables.c | 89 +- + net/ipv4/netfilter/arpt_mangle.c | 12 +- + net/ipv4/netfilter/arptable_filter.c | 7 +- + net/ipv4/netfilter/ip_queue.c | 2 +- + net/ipv4/netfilter/ip_tables.c | 53 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 14 +- + net/ipv4/netfilter/ipt_ECN.c | 2 +- + net/ipv4/netfilter/ipt_LOG.c | 9 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +- + net/ipv4/netfilter/ipt_REJECT.c | 6 +- + net/ipv4/netfilter/ipt_recent.c | 6 +- + net/ipv4/netfilter/iptable_filter.c | 21 +- + net/ipv4/netfilter/iptable_mangle.c | 51 +- + net/ipv4/netfilter/iptable_raw.c | 8 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 70 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 15 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 27 +- + net/ipv4/netfilter/nf_nat_core.c | 61 +- + net/ipv4/netfilter/nf_nat_helper.c | 5 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_common.c | 120 + + net/ipv4/netfilter/nf_nat_proto_dccp.c | 108 + + net/ipv4/netfilter/nf_nat_proto_gre.c | 45 +- + net/ipv4/netfilter/nf_nat_proto_icmp.c | 19 +- + net/ipv4/netfilter/nf_nat_proto_sctp.c | 96 + + net/ipv4/netfilter/nf_nat_proto_tcp.c | 80 +- + net/ipv4/netfilter/nf_nat_proto_udp.c | 77 +- + net/ipv4/netfilter/nf_nat_proto_udplite.c | 99 + + net/ipv4/netfilter/nf_nat_proto_unknown.c | 25 +- + net/ipv4/netfilter/nf_nat_rule.c | 25 +- + net/ipv4/netfilter/nf_nat_sip.c | 556 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 29 +- + net/ipv4/netfilter/nf_nat_standalone.c | 76 +- + net/ipv4/proc.c | 71 +- + net/ipv4/raw.c | 47 +- + net/ipv4/route.c | 278 +- + net/ipv4/syncookies.c | 102 +- + net/ipv4/sysctl_net_ipv4.c | 162 +- + net/ipv4/tcp.c | 18 +- + net/ipv4/tcp_cubic.c | 35 +- + net/ipv4/tcp_input.c | 76 +- + net/ipv4/tcp_ipv4.c | 193 +- + net/ipv4/tcp_minisocks.c | 36 +- + net/ipv4/tcp_output.c | 11 +- + net/ipv4/tcp_probe.c | 2 +- + net/ipv4/tcp_timer.c | 19 +- + net/ipv4/udp.c | 138 +- + net/ipv4/udp_impl.h | 6 +- + net/ipv4/udplite.c | 62 +- + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/Kconfig | 41 +- + net/ipv6/Makefile | 3 + + net/ipv6/addrconf.c | 765 +- + net/ipv6/addrlabel.c | 25 +- + net/ipv6/af_inet6.c | 227 +- + net/ipv6/anycast.c | 63 +- + net/ipv6/fib6_rules.c | 113 +- + net/ipv6/icmp.c | 145 +- + net/ipv6/inet6_connection_sock.c | 4 + + net/ipv6/inet6_hashtables.c | 10 +- + net/ipv6/ip6_fib.c | 294 +- + net/ipv6/ip6_flowlabel.c | 101 +- + net/ipv6/ip6_input.c | 98 +- + net/ipv6/ip6_output.c | 40 +- + net/ipv6/ip6_tunnel.c | 8 +- + net/ipv6/ip6mr.c | 1643 ++++ + net/ipv6/ipv6_sockglue.c | 365 +- + net/ipv6/mcast.c | 272 +- + net/ipv6/mip6.c | 24 +- + net/ipv6/ndisc.c | 237 +- + net/ipv6/netfilter.c | 46 +- + net/ipv6/netfilter/ip6_queue.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 51 +- + net/ipv6/netfilter/ip6t_LOG.c | 6 +- + net/ipv6/netfilter/ip6t_REJECT.c | 7 +- + net/ipv6/netfilter/ip6t_ipv6header.c | 3 +- + net/ipv6/netfilter/ip6t_rt.c | 3 +- + net/ipv6/netfilter/ip6table_filter.c | 2 +- + net/ipv6/netfilter/ip6table_mangle.c | 2 +- + net/ipv6/netfilter/ip6table_raw.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 14 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 29 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 23 +- + net/ipv6/proc.c | 73 +- + net/ipv6/raw.c | 69 +- + net/ipv6/reassembly.c | 19 +- + net/ipv6/route.c | 638 +- + net/ipv6/sit.c | 261 +- + net/ipv6/syncookies.c | 279 + + net/ipv6/sysctl_net_ipv6.c | 15 +- + net/ipv6/tcp_ipv6.c | 197 +- + net/ipv6/udp.c | 44 +- + net/ipv6/udp_impl.h | 2 + + net/ipv6/udplite.c | 40 +- + net/ipv6/xfrm6_input.c | 55 +- + net/ipv6/xfrm6_policy.c | 9 +- + net/ipv6/xfrm6_state.c | 171 +- + net/ipv6/xfrm6_tunnel.c | 45 +- + net/ipx/af_ipx.c | 4 +- + net/irda/af_irda.c | 180 +- + net/irda/discovery.c | 4 +- + net/irda/ircomm/ircomm_core.c | 46 +- + net/irda/ircomm/ircomm_event.c | 12 +- + net/irda/ircomm/ircomm_lmp.c | 30 +- + net/irda/ircomm/ircomm_param.c | 32 +- + net/irda/ircomm/ircomm_ttp.c | 26 +- + net/irda/ircomm/ircomm_tty.c | 90 +- + net/irda/ircomm/ircomm_tty_attach.c | 78 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 18 +- + net/irda/irda_device.c | 18 +- + net/irda/iriap.c | 76 +- + net/irda/iriap_event.c | 38 +- + net/irda/irias_object.c | 44 +- + net/irda/irlan/irlan_client.c | 48 +- + net/irda/irlan/irlan_client_event.c | 64 +- + net/irda/irlan/irlan_common.c | 72 +- + net/irda/irlan/irlan_eth.c | 18 +- + net/irda/irlan/irlan_event.c | 4 +- + net/irda/irlan/irlan_filter.c | 4 +- + net/irda/irlan/irlan_provider.c | 30 +- + net/irda/irlan/irlan_provider_event.c | 16 +- + net/irda/irlap.c | 56 +- + net/irda/irlap_event.c | 122 +- + net/irda/irlap_frame.c | 76 +- + net/irda/irlmp.c | 112 +- + net/irda/irlmp_event.c | 94 +- + net/irda/irlmp_frame.c | 36 +- + net/irda/irmod.c | 2 +- + net/irda/irnet/irnet.h | 10 +- + net/irda/irnetlink.c | 4 +- + net/irda/irqueue.c | 8 +- + net/irda/irttp.c | 108 +- + net/irda/parameters.c | 42 +- + net/irda/qos.c | 24 +- + net/irda/wrapper.c | 18 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 17 +- + net/key/af_key.c | 143 +- + net/llc/af_llc.c | 16 +- + net/llc/llc_c_ac.c | 2 +- + net/llc/llc_c_ev.c | 8 +- + net/llc/llc_conn.c | 26 +- + net/llc/llc_input.c | 6 +- + net/mac80211/Kconfig | 33 +- + net/mac80211/Makefile | 21 +- + net/mac80211/aes_ccm.c | 2 +- + net/mac80211/cfg.c | 436 +- + net/mac80211/debugfs.c | 53 +- + net/mac80211/debugfs_key.c | 42 +- + net/mac80211/debugfs_key.h | 11 +- + net/mac80211/debugfs_netdev.c | 218 +- + net/mac80211/debugfs_sta.c | 181 +- + net/mac80211/debugfs_sta.h | 2 + + net/mac80211/ieee80211_i.h | 517 +- + net/mac80211/{ieee80211_iface.c => iface.c} | 48 +- + net/mac80211/key.c | 368 +- + net/mac80211/{ieee80211_key.h => key.h} | 39 +- + net/mac80211/{ieee80211_led.c => led.c} | 2 +- + net/mac80211/{ieee80211_led.h => led.h} | 0 + net/mac80211/{ieee80211.c => main.c} | 1059 ++- + net/mac80211/mesh.c | 449 + + net/mac80211/mesh.h | 290 + + net/mac80211/mesh_hwmp.c | 855 ++ + net/mac80211/mesh_pathtbl.c | 516 ++ + net/mac80211/mesh_plink.c | 762 ++ + net/mac80211/{ieee80211_sta.c => mlme.c} | 1791 +++-- + net/mac80211/{ieee80211_rate.c => rate.c} | 25 +- + net/mac80211/{ieee80211_rate.h => rate.h} | 44 +- + net/mac80211/rc80211_pid_algo.c | 124 +- + net/mac80211/rc80211_pid_debugfs.c | 2 +- + net/mac80211/rc80211_simple.c | 400 - + net/mac80211/regdomain.c | 152 - + net/mac80211/rx.c | 869 ++- + net/mac80211/sta_info.c | 698 ++- + net/mac80211/sta_info.h | 357 +- + net/mac80211/tkip.c | 70 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/tx.c | 732 +- + net/mac80211/util.c | 172 +- + net/mac80211/wep.c | 40 +- + net/mac80211/wep.h | 10 +- + net/mac80211/{ieee80211_ioctl.c => wext.c} | 262 +- + net/mac80211/wme.c | 139 +- + net/mac80211/wme.h | 23 +- + net/mac80211/wpa.c | 152 +- + net/mac80211/wpa.h | 24 +- + net/netfilter/Kconfig | 10 + + net/netfilter/Makefile | 1 + + net/netfilter/core.c | 8 + + net/netfilter/nf_conntrack_amanda.c | 18 +- + net/netfilter/nf_conntrack_core.c | 29 +- + net/netfilter/nf_conntrack_expect.c | 81 +- + net/netfilter/nf_conntrack_extend.c | 3 + + net/netfilter/nf_conntrack_ftp.c | 19 +- + net/netfilter/nf_conntrack_h323_main.c | 95 +- + net/netfilter/nf_conntrack_helper.c | 5 +- + net/netfilter/nf_conntrack_irc.c | 24 +- + net/netfilter/nf_conntrack_l3proto_generic.c | 12 +- + net/netfilter/nf_conntrack_netbios_ns.c | 11 +- + net/netfilter/nf_conntrack_netlink.c | 34 +- + net/netfilter/nf_conntrack_pptp.c | 18 +- + net/netfilter/nf_conntrack_proto.c | 9 +- + net/netfilter/nf_conntrack_proto_dccp.c | 815 ++ + net/netfilter/nf_conntrack_proto_generic.c | 20 +- + net/netfilter/nf_conntrack_proto_gre.c | 31 +- + net/netfilter/nf_conntrack_proto_sctp.c | 50 +- + net/netfilter/nf_conntrack_proto_tcp.c | 64 +- + net/netfilter/nf_conntrack_proto_udp.c | 18 +- + net/netfilter/nf_conntrack_proto_udplite.c | 55 +- + net/netfilter/nf_conntrack_sane.c | 14 +- + net/netfilter/nf_conntrack_sip.c | 1391 +++- + net/netfilter/nf_conntrack_standalone.c | 133 +- + net/netfilter/nf_conntrack_tftp.c | 19 +- + net/netfilter/nf_sockopt.c | 2 +- + net/netfilter/nfnetlink_queue.c | 2 +- + net/netfilter/x_tables.c | 22 +- + net/netfilter/xt_CONNSECMARK.c | 2 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netfilter/xt_connlimit.c | 10 +- + net/netfilter/xt_conntrack.c | 4 +- + net/netfilter/xt_dccp.c | 3 +- + net/netfilter/xt_esp.c | 3 +- + net/netfilter/xt_multiport.c | 6 +- + net/netfilter/xt_policy.c | 2 +- + net/netfilter/xt_rateest.c | 4 +- + net/netfilter/xt_sctp.c | 6 +- + net/netfilter/xt_tcpmss.c | 6 +- + net/netfilter/xt_tcpudp.c | 9 +- + net/netfilter/xt_time.c | 2 +- + net/netlabel/netlabel_unlabeled.c | 2 +- + net/netlink/af_netlink.c | 83 +- + net/netrom/af_netrom.c | 4 +- + net/packet/af_packet.c | 33 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-internal.h | 8 +- + net/rxrpc/ar-proc.c | 4 +- + net/sched/act_api.c | 4 +- + net/sched/cls_api.c | 4 +- + net/sched/em_meta.c | 4 +- + net/sched/sch_api.c | 10 +- + net/sctp/associola.c | 42 +- + net/sctp/bind_addr.c | 15 +- + net/sctp/chunk.c | 23 +- + net/sctp/command.c | 10 +- + net/sctp/input.c | 3 +- + net/sctp/ipv6.c | 17 +- + net/sctp/output.c | 14 +- + net/sctp/outqueue.c | 66 +- + net/sctp/proc.c | 27 +- + net/sctp/protocol.c | 50 +- + net/sctp/sm_make_chunk.c | 12 +- + net/sctp/sm_sideeffect.c | 29 +- + net/sctp/sm_statefuns.c | 38 +- + net/sctp/socket.c | 81 +- + net/sctp/transport.c | 10 +- + net/socket.c | 4 +- + net/sunrpc/auth_gss/auth_gss.c | 2 +- + net/sunrpc/clnt.c | 44 +- + net/sunrpc/rpc_pipe.c | 12 +- + net/sunrpc/rpcb_clnt.c | 20 +- + net/sunrpc/xprtsock.c | 2 +- + net/tipc/core.c | 11 +- + net/tipc/core.h | 6 + + net/tipc/eth_media.c | 4 +- + net/tipc/link.c | 16 +- + net/tipc/msg.c | 16 +- + net/tipc/msg.h | 50 +- + net/tipc/port.c | 12 +- + net/tipc/socket.c | 151 +- + net/unix/af_unix.c | 32 +- + net/wireless/Makefile | 2 +- + net/wireless/core.c | 41 + + net/wireless/core.h | 3 + + net/wireless/nl80211.c | 552 ++- + net/wireless/reg.c | 162 + + net/wireless/util.c | 121 + + net/wireless/wext.c | 2 +- + net/x25/af_x25.c | 4 +- + net/x25/x25_dev.c | 2 +- + net/xfrm/xfrm_policy.c | 156 +- + net/xfrm/xfrm_state.c | 53 +- + net/xfrm/xfrm_user.c | 100 +- + security/dummy.c | 14 +- + security/security.c | 21 +- + security/selinux/include/xfrm.h | 13 +- + security/selinux/netif.c | 2 +- + security/selinux/ss/services.c | 2 +- + security/selinux/xfrm.c | 39 +- + security/smack/smack_lsm.c | 2 +- + 882 files changed, 75465 insertions(+), 112489 deletions(-) + create mode 100644 Documentation/DocBook/mac80211.tmpl + delete mode 100644 Documentation/networking/bcm43xx.txt + delete mode 100644 drivers/net/atl1/Makefile + delete mode 100644 drivers/net/atl1/atl1.h + delete mode 100644 drivers/net/atl1/atl1_ethtool.c + delete mode 100644 drivers/net/atl1/atl1_hw.c + delete mode 100644 drivers/net/atl1/atl1_hw.h + delete mode 100644 drivers/net/atl1/atl1_param.c + create mode 100644 drivers/net/atlx/Makefile + rename drivers/net/{atl1/atl1_main.c => atlx/atl1.c} (57%) + create mode 100644 drivers/net/atlx/atl1.h + create mode 100644 drivers/net/atlx/atlx.c + create mode 100644 drivers/net/atlx/atlx.h + create mode 100644 drivers/net/korina.c + delete mode 100644 drivers/net/sk98lin/Makefile + delete mode 100644 drivers/net/sk98lin/h/lm80.h + delete mode 100644 drivers/net/sk98lin/h/skaddr.h + delete mode 100644 drivers/net/sk98lin/h/skcsum.h + delete mode 100644 drivers/net/sk98lin/h/skdebug.h + delete mode 100644 drivers/net/sk98lin/h/skdrv1st.h + delete mode 100644 drivers/net/sk98lin/h/skdrv2nd.h + delete mode 100644 drivers/net/sk98lin/h/skerror.h + delete mode 100644 drivers/net/sk98lin/h/skgedrv.h + delete mode 100644 drivers/net/sk98lin/h/skgehw.h + delete mode 100644 drivers/net/sk98lin/h/skgehwt.h + delete mode 100644 drivers/net/sk98lin/h/skgei2c.h + delete mode 100644 drivers/net/sk98lin/h/skgeinit.h + delete mode 100644 drivers/net/sk98lin/h/skgepnm2.h + delete mode 100644 drivers/net/sk98lin/h/skgepnmi.h + delete mode 100644 drivers/net/sk98lin/h/skgesirq.h + delete mode 100644 drivers/net/sk98lin/h/ski2c.h + delete mode 100644 drivers/net/sk98lin/h/skqueue.h + delete mode 100644 drivers/net/sk98lin/h/skrlmt.h + delete mode 100644 drivers/net/sk98lin/h/sktimer.h + delete mode 100644 drivers/net/sk98lin/h/sktypes.h + delete mode 100644 drivers/net/sk98lin/h/skversion.h + delete mode 100644 drivers/net/sk98lin/h/skvpd.h + delete mode 100644 drivers/net/sk98lin/h/xmac_ii.h + delete mode 100644 drivers/net/sk98lin/skaddr.c + delete mode 100644 drivers/net/sk98lin/skdim.c + delete mode 100644 drivers/net/sk98lin/skethtool.c + delete mode 100644 drivers/net/sk98lin/skge.c + delete mode 100644 drivers/net/sk98lin/skgehwt.c + delete mode 100644 drivers/net/sk98lin/skgeinit.c + delete mode 100644 drivers/net/sk98lin/skgemib.c + delete mode 100644 drivers/net/sk98lin/skgepnmi.c + delete mode 100644 drivers/net/sk98lin/skgesirq.c + delete mode 100644 drivers/net/sk98lin/ski2c.c + delete mode 100644 drivers/net/sk98lin/sklm80.c + delete mode 100644 drivers/net/sk98lin/skqueue.c + delete mode 100644 drivers/net/sk98lin/skrlmt.c + delete mode 100644 drivers/net/sk98lin/sktimer.c + delete mode 100644 drivers/net/sk98lin/skvpd.c + delete mode 100644 drivers/net/sk98lin/skxmac2.c + delete mode 100644 drivers/net/tulip/xircom_tulip_cb.c + create mode 100644 drivers/net/wireless/ath5k/Kconfig + create mode 100644 drivers/net/wireless/b43/pio.c + create mode 100644 drivers/net/wireless/b43/pio.h + delete mode 100644 drivers/net/wireless/bcm43xx/Kconfig + delete mode 100644 drivers/net/wireless/bcm43xx/Makefile + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_dma.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_leds.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_main.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_phy.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_pio.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_power.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_radio.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_wx.h + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.c + delete mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_xmit.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-core.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-led.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-led.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-4965-io.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-core.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-csr.h + rename drivers/net/wireless/iwlwifi/{iwl-4965-debug.h => iwl-debug.h} (79%) + create mode 100644 drivers/net/wireless/iwlwifi/iwl-debugfs.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-eeprom.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-hcmd.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-led.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-led.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.h + delete mode 100644 drivers/net/wireless/libertas/join.c + delete mode 100644 drivers/net/wireless/libertas/join.h + delete mode 100644 drivers/net/wireless/net2280.h + create mode 100644 drivers/net/wireless/p54/Kconfig + create mode 100644 drivers/net/wireless/p54/Makefile + create mode 100644 drivers/net/wireless/p54/net2280.h + rename drivers/net/wireless/{ => p54}/p54.h (93%) + rename drivers/net/wireless/{ => p54}/p54common.c (91%) + rename drivers/net/wireless/{ => p54}/p54common.h (80%) + rename drivers/net/wireless/{ => p54}/p54pci.c (100%) + rename drivers/net/wireless/{ => p54}/p54pci.h (100%) + rename drivers/net/wireless/{ => p54}/p54usb.c (100%) + rename drivers/net/wireless/{ => p54}/p54usb.h (100%) + create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.h + create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.h + delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ring.h + delete mode 100644 drivers/s390/net/ctcdbug.c + delete mode 100644 drivers/s390/net/ctcdbug.h + create mode 100644 drivers/s390/net/ctcm_dbug.c + create mode 100644 drivers/s390/net/ctcm_dbug.h + create mode 100644 drivers/s390/net/ctcm_fsms.c + create mode 100644 drivers/s390/net/ctcm_fsms.h + create mode 100644 drivers/s390/net/ctcm_main.c + create mode 100644 drivers/s390/net/ctcm_main.h + create mode 100644 drivers/s390/net/ctcm_mpc.c + create mode 100644 drivers/s390/net/ctcm_mpc.h + create mode 100644 drivers/s390/net/ctcm_sysfs.c + delete mode 100644 drivers/s390/net/ctcmain.c + delete mode 100644 drivers/s390/net/ctcmain.h + rename drivers/s390/net/{qeth.h => qeth_core.h} (52%) + create mode 100644 drivers/s390/net/qeth_core_main.c + create mode 100644 drivers/s390/net/qeth_core_mpc.c + rename drivers/s390/net/{qeth_mpc.h => qeth_core_mpc.h} (78%) + rename drivers/s390/net/{qeth_eddp.c => qeth_core_offl.c} (67%) + rename drivers/s390/net/{qeth_eddp.h => qeth_core_offl.h} (55%) + create mode 100644 drivers/s390/net/qeth_core_sys.c + delete mode 100644 drivers/s390/net/qeth_fs.h + create mode 100644 drivers/s390/net/qeth_l2_main.c + create mode 100644 drivers/s390/net/qeth_l3.h + create mode 100644 drivers/s390/net/qeth_l3_main.c + create mode 100644 drivers/s390/net/qeth_l3_sys.c + delete mode 100644 drivers/s390/net/qeth_main.c + delete mode 100644 drivers/s390/net/qeth_mpc.c + delete mode 100644 drivers/s390/net/qeth_proc.c + delete mode 100644 drivers/s390/net/qeth_sys.c + delete mode 100644 drivers/s390/net/qeth_tso.h + create mode 100644 drivers/ssb/driver_gige.c + create mode 100644 drivers/ssb/sprom.c + create mode 100644 include/linux/mroute6.h + create mode 100644 include/linux/netfilter/nf_conntrack_dccp.h + create mode 100644 include/linux/netfilter_bridge/ebt_nflog.h + delete mode 100644 include/linux/pcounter.h + create mode 100644 include/linux/pim.h + create mode 100644 include/linux/seq_file_net.h + create mode 100644 include/linux/smc91x.h + create mode 100644 include/linux/ssb/ssb_driver_gige.h + delete mode 100644 include/net/ieee80211softmac.h + delete mode 100644 include/net/ieee80211softmac_wx.h + create mode 100644 include/net/netns/core.h + create mode 100644 include/net/netns/dccp.h + delete mode 100644 lib/pcounter.c + create mode 100644 net/bridge/netfilter/ebt_nflog.c + delete mode 100644 net/ieee80211/softmac/Kconfig + delete mode 100644 net/ieee80211/softmac/Makefile + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_assoc.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_auth.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_event.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_io.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_module.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_priv.h + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_scan.c + delete mode 100644 net/ieee80211/softmac/ieee80211softmac_wx.c + create mode 100644 net/ipv4/netfilter/nf_nat_proto_common.c + create mode 100644 net/ipv4/netfilter/nf_nat_proto_dccp.c + create mode 100644 net/ipv4/netfilter/nf_nat_proto_sctp.c + create mode 100644 net/ipv4/netfilter/nf_nat_proto_udplite.c + create mode 100644 net/ipv6/ip6mr.c + create mode 100644 net/ipv6/syncookies.c + rename net/mac80211/{ieee80211_iface.c => iface.c} (88%) + rename net/mac80211/{ieee80211_key.h => key.h} (70%) + rename net/mac80211/{ieee80211_led.c => led.c} (99%) + rename net/mac80211/{ieee80211_led.h => led.h} (100%) + rename net/mac80211/{ieee80211.c => main.c} (59%) + create mode 100644 net/mac80211/mesh.c + create mode 100644 net/mac80211/mesh.h + create mode 100644 net/mac80211/mesh_hwmp.c + create mode 100644 net/mac80211/mesh_pathtbl.c + create mode 100644 net/mac80211/mesh_plink.c + rename net/mac80211/{ieee80211_sta.c => mlme.c} (72%) + rename net/mac80211/{ieee80211_rate.c => rate.c} (91%) + rename net/mac80211/{ieee80211_rate.h => rate.h} (82%) + delete mode 100644 net/mac80211/rc80211_simple.c + delete mode 100644 net/mac80211/regdomain.c + rename net/mac80211/{ieee80211_ioctl.c => wext.c} (87%) + create mode 100644 net/netfilter/nf_conntrack_proto_dccp.c + create mode 100644 net/wireless/reg.c + create mode 100644 net/wireless/util.c +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Auto-merged drivers/net/ucc_geth.c +Merge made by recursive. + Documentation/powerpc/booting-without-of.txt | 6 +- + arch/powerpc/Kconfig | 5 + + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/boot/cpm-serial.c | 117 +++-- + arch/powerpc/boot/devtree.c | 20 + + arch/powerpc/boot/dts/ep8248e.dts | 5 +- + arch/powerpc/boot/dts/mpc832x_mds.dts | 7 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 - + arch/powerpc/boot/dts/mpc836x_mds.dts | 4 - + arch/powerpc/boot/dts/mpc8544ds.dts | 41 ++ + arch/powerpc/boot/dts/mpc8568mds.dts | 4 - + arch/powerpc/boot/mpc52xx-psc.c | 9 +- + arch/powerpc/boot/ns16550.c | 10 +- + arch/powerpc/boot/ops.h | 1 + + .../configs/{ => 83xx}/mpc8313_rdb_defconfig | 0 + .../configs/{ => 83xx}/mpc8315_rdb_defconfig | 0 + .../configs/{ => 83xx}/mpc832x_mds_defconfig | 0 + .../configs/{ => 83xx}/mpc832x_rdb_defconfig | 0 + .../configs/{ => 83xx}/mpc834x_itx_defconfig | 0 + .../configs/{ => 83xx}/mpc834x_itxgp_defconfig | 0 + .../configs/{ => 83xx}/mpc834x_mds_defconfig | 0 + .../configs/{ => 83xx}/mpc836x_mds_defconfig | 0 + .../configs/{ => 83xx}/mpc837x_mds_defconfig | 0 + .../configs/{ => 83xx}/mpc837x_rdb_defconfig | 0 + arch/powerpc/configs/{ => 83xx}/sbc834x_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/ksi8560_defconfig | 0 + .../configs/{ => 85xx}/mpc8540_ads_defconfig | 0 + .../configs/{ => 85xx}/mpc8544_ds_defconfig | 17 +- + .../configs/{ => 85xx}/mpc8560_ads_defconfig | 0 + .../configs/{ => 85xx}/mpc8568mds_defconfig | 0 + .../configs/{ => 85xx}/mpc8572_ds_defconfig | 0 + .../configs/{ => 85xx}/mpc85xx_cds_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/sbc8548_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/sbc8560_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/stx_gp3_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/tqm8540_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/tqm8541_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/tqm8555_defconfig | 0 + arch/powerpc/configs/{ => 85xx}/tqm8560_defconfig | 0 + arch/powerpc/kernel/head_44x.S | 4 +- + arch/powerpc/kernel/head_booke.h | 33 +- + arch/powerpc/kernel/head_fsl_booke.S | 10 +- + arch/powerpc/platforms/82xx/Kconfig | 3 - + arch/powerpc/platforms/85xx/Kconfig | 8 - + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 13 + + arch/powerpc/platforms/8xx/Kconfig | 4 - + arch/powerpc/platforms/Kconfig | 8 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/cpm1.c | 112 ---- + arch/powerpc/sysdev/cpm2.c | 103 +---- + arch/powerpc/sysdev/cpm_common.c | 3 - + arch/powerpc/sysdev/fsl_lbc.c | 129 +++++ + arch/powerpc/sysdev/fsl_soc.c | 541 -------------------- + arch/powerpc/sysdev/qe_lib/qe.c | 13 +- + arch/powerpc/sysdev/qe_lib/qe_io.c | 5 +- + drivers/mtd/nand/fsl_elbc_nand.c | 219 +-------- + drivers/net/ucc_geth.c | 8 +- + drivers/net/ucc_geth_mii.c | 11 +- + drivers/serial/cpm_uart/cpm_uart.h | 3 + + drivers/serial/cpm_uart/cpm_uart_core.c | 19 +- + drivers/serial/cpm_uart/cpm_uart_cpm1.c | 12 + + drivers/serial/cpm_uart/cpm_uart_cpm2.c | 52 ++ + drivers/serial/ucc_uart.c | 16 +- + include/asm-powerpc/cpm.h | 14 + + include/asm-powerpc/cpm1.h | 13 - + include/asm-powerpc/cpm2.h | 11 +- + include/asm-powerpc/fsl_lbc.h | 311 +++++++++++ + include/asm-powerpc/immap_qe.h | 3 +- + include/asm-powerpc/qe.h | 12 +- + 69 files changed, 805 insertions(+), 1141 deletions(-) + rename arch/powerpc/configs/{ => 83xx}/mpc8313_rdb_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc8315_rdb_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc832x_mds_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc832x_rdb_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc834x_itx_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc834x_itxgp_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc834x_mds_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc836x_mds_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc837x_mds_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/mpc837x_rdb_defconfig (100%) + rename arch/powerpc/configs/{ => 83xx}/sbc834x_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/ksi8560_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/mpc8540_ads_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/mpc8544_ds_defconfig (99%) + rename arch/powerpc/configs/{ => 85xx}/mpc8560_ads_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/mpc8568mds_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/mpc8572_ds_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/mpc85xx_cds_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/sbc8548_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/sbc8560_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/stx_gp3_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/tqm8540_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/tqm8541_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/tqm8555_defconfig (100%) + rename arch/powerpc/configs/{ => 85xx}/tqm8560_defconfig (100%) + create mode 100644 arch/powerpc/sysdev/fsl_lbc.c + create mode 100644 include/asm-powerpc/fsl_lbc.h +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- + fs/jffs2/fs.c | 14 +++++++++++--- + 2 files changed, 28 insertions(+), 18 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merged arch/s390/crypto/sha1_s390.c +Auto-merged arch/s390/crypto/sha256_s390.c +Auto-merged drivers/char/hw_random/core.c +Auto-merged drivers/crypto/Kconfig +Merge made by recursive. + arch/s390/crypto/Makefile | 5 +- + arch/s390/crypto/crypt_s390.h | 2 + + arch/s390/crypto/sha.h | 35 + + arch/s390/crypto/sha1_s390.c | 91 +- + arch/s390/crypto/sha256_s390.c | 90 +- + arch/s390/crypto/sha512_s390.c | 114 + + arch/s390/crypto/sha_common.c | 97 + + arch/x86/crypto/aes-i586-asm_32.S | 3 - + crypto/Kconfig | 638 +- + crypto/Makefile | 6 +- + crypto/aes_generic.c | 56 +- + crypto/anubis.c | 8 +- + crypto/api.c | 3 + + crypto/blowfish.c | 8 +- + crypto/cast5.c | 8 +- + crypto/cast6.c | 8 +- + crypto/crc32c.c | 8 +- + crypto/crypto_null.c | 8 +- + crypto/cts.c | 347 + + crypto/deflate.c | 8 +- + crypto/des_generic.c | 8 +- + crypto/fcrypt.c | 8 +- + crypto/khazad.c | 8 +- + crypto/lrw.c | 5 +- + crypto/lzo.c | 8 +- + crypto/md4.c | 8 +- + crypto/md5.c | 8 +- + crypto/proc.c | 8 +- + crypto/salsa20_generic.c | 8 +- + crypto/serpent.c | 8 +- + crypto/sha1_generic.c | 8 +- + crypto/sha256_generic.c | 8 +- + crypto/{sha512.c => sha512_generic.c} | 31 +- + crypto/tcrypt.c | 529 +- + crypto/tcrypt.h |11923 +++++++++++++++++---------------- + crypto/tea.c | 8 +- + crypto/tgr192.c | 8 +- + crypto/twofish.c | 8 +- + crypto/wp512.c | 8 +- + drivers/crypto/Kconfig | 14 + + drivers/crypto/padlock-aes.c | 320 +- + include/crypto/aes.h | 8 +- + include/linux/crypto.h | 7 - + 43 files changed, 7407 insertions(+), 7093 deletions(-) + create mode 100644 arch/s390/crypto/sha.h + create mode 100644 arch/s390/crypto/sha512_s390.c + create mode 100644 arch/s390/crypto/sha_common.c + create mode 100644 crypto/cts.c + rename crypto/{sha512.c => sha512_generic.c} (95%) +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged fs/nfs/dir.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/ocfs2/ioctl.c +Auto-merged fs/signalfd.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Auto-merged fs/xfs/linux-2.6/xfs_lrw.c +Auto-merged include/linux/security.h +Auto-merged include/linux/seq_file.h +Auto-merged lib/Kconfig.debug +Auto-merged net/unix/af_unix.c +Auto-merged security/dummy.c +Auto-merged security/security.c +Auto-merged security/selinux/hooks.c +Auto-merged security/smack/smack_lsm.c +Auto-merged virt/kvm/kvm_main.c +Resolved 'fs/xfs/linux-2.6/xfs_ioctl.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/filesystems/proc.txt | 38 +++ + fs/anon_inodes.c | 24 ++- + fs/dcache.c | 114 +++++-- + fs/eventfd.c | 5 +- + fs/eventpoll.c | 7 +- + fs/ext2/ioctl.c | 47 ++- + fs/ext3/ioctl.c | 103 ++++-- + fs/fat/file.c | 12 +- + fs/file_table.c | 42 +++- + fs/hfsplus/ioctl.c | 38 ++- + fs/inode.c | 51 ++-- + fs/internal.h | 11 + + fs/jfs/ioctl.c | 33 ++- + fs/namei.c | 275 ++++++++++++---- + fs/namespace.c | 647 ++++++++++++++++++++++++++++++++---- + fs/ncpfs/ioctl.c | 54 +++- + fs/nfs/dir.c | 3 +- + fs/nfsd/nfs4proc.c | 7 +- + fs/nfsd/nfs4recover.c | 5 + + fs/nfsd/nfs4state.c | 3 +- + fs/nfsd/vfs.c | 26 ++- + fs/ocfs2/ioctl.c | 11 +- + fs/open.c | 149 +++++--- + fs/pnode.c | 60 ++++- + fs/pnode.h | 2 + + fs/proc/base.c | 121 ++++--- + fs/reiserfs/ioctl.c | 63 +++-- + fs/seq_file.c | 111 +++++-- + fs/signalfd.c | 6 +- + fs/super.c | 25 ++- + fs/timerfd.c | 5 +- + fs/utimes.c | 18 +- + fs/xattr.c | 16 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 15 +- + fs/xfs/linux-2.6/xfs_iops.c | 7 - + fs/xfs/linux-2.6/xfs_lrw.c | 9 +- + include/linux/anon_inodes.h | 6 +- + include/linux/dcache.h | 3 +- + include/linux/file.h | 1 + + include/linux/fs.h | 58 +++- + include/linux/mnt_namespace.h | 12 + + include/linux/mount.h | 15 +- + include/linux/security.h | 52 ++-- + include/linux/seq_file.h | 6 + + ipc/mqueue.c | 25 ++- + lib/Kconfig.debug | 10 + + net/unix/af_unix.c | 4 + + security/dummy.c | 10 +- + security/security.c | 20 +- + security/selinux/hooks.c | 8 +- + security/smack/smack_lsm.c | 4 +- + virt/kvm/kvm_main.c | 17 +- + 52 files changed, 1853 insertions(+), 561 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Removed arch/alpha/kernel/semaphore.c +Removed arch/arm/kernel/semaphore.c +Removed arch/avr32/kernel/semaphore.c +Removed arch/cris/kernel/semaphore.c +Removed arch/frv/kernel/semaphore.c +Removed arch/h8300/kernel/semaphore.c +Removed arch/ia64/kernel/semaphore.c +Removed arch/m32r/kernel/semaphore.c +Removed arch/m68k/kernel/semaphore.c +Removed arch/m68k/lib/semaphore.S +Removed arch/m68knommu/kernel/semaphore.c +Removed arch/m68knommu/lib/semaphore.S +Removed arch/mips/kernel/semaphore.c +Removed arch/mn10300/kernel/semaphore.c +Removed arch/parisc/kernel/semaphore.c +Auto-merged arch/powerpc/kernel/ppc_ksyms.c +Removed arch/powerpc/kernel/semaphore.c +Removed arch/ppc/kernel/semaphore.c +Auto-merged arch/s390/kernel/Makefile +Removed arch/s390/kernel/semaphore.c +Removed arch/sh/kernel/semaphore.c +Removed arch/sparc/kernel/semaphore.c +Auto-merged arch/sparc/kernel/sparc_ksyms.c +Removed arch/sparc64/kernel/semaphore.c +Removed arch/v850/kernel/semaphore.c +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/x8664_ksyms_64.c +Auto-merged arch/x86/lib/thunk_64.S +Removed arch/xtensa/kernel/semaphore.c +Removed include/asm-arm/semaphore-helper.h +Removed include/asm-blackfin/semaphore-helper.h +Removed include/asm-cris/semaphore-helper.h +Removed include/asm-h8300/semaphore-helper.h +Removed include/asm-m68k/semaphore-helper.h +Removed include/asm-m68knommu/semaphore-helper.h +Removed include/asm-parisc/semaphore-helper.h +Removed include/asm-sh/semaphore-helper.h +Removed include/asm-x86/semaphore_32.h +Removed include/asm-x86/semaphore_64.h +Auto-merged kernel/Makefile +Auto-merged lib/Makefile +Removed lib/semaphore-sleepers.c +Merge made by recursive. + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/alpha_ksyms.c | 9 - + arch/alpha/kernel/semaphore.c | 224 -------------------------- + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/semaphore.c | 221 -------------------------- + arch/avr32/kernel/Makefile | 2 +- + arch/avr32/kernel/semaphore.c | 148 ----------------- + arch/blackfin/Kconfig | 4 - + arch/blackfin/kernel/bfin_ksyms.c | 5 - + arch/cris/kernel/Makefile | 3 +- + arch/cris/kernel/crisksyms.c | 7 - + arch/cris/kernel/semaphore.c | 129 --------------- + arch/frv/kernel/Makefile | 2 +- + arch/frv/kernel/frv_ksyms.c | 1 - + arch/frv/kernel/semaphore.c | 155 ------------------ + arch/h8300/kernel/Makefile | 2 +- + arch/h8300/kernel/h8300_ksyms.c | 1 - + arch/h8300/kernel/semaphore.c | 132 ---------------- + arch/ia64/kernel/Makefile | 2 +- + arch/ia64/kernel/ia64_ksyms.c | 6 - + arch/ia64/kernel/semaphore.c | 165 ------------------- + arch/m32r/kernel/Makefile | 2 +- + arch/m32r/kernel/m32r_ksyms.c | 5 - + arch/m32r/kernel/semaphore.c | 185 ---------------------- + arch/m68k/kernel/Makefile | 2 +- + arch/m68k/kernel/m68k_ksyms.c | 6 - + arch/m68k/kernel/semaphore.c | 132 ---------------- + arch/m68k/lib/Makefile | 2 +- + arch/m68k/lib/semaphore.S | 53 ------ + arch/m68knommu/kernel/Makefile | 2 +- + arch/m68knommu/kernel/m68k_ksyms.c | 6 - + arch/m68knommu/kernel/semaphore.c | 133 ---------------- + arch/m68knommu/lib/Makefile | 2 +- + arch/m68knommu/lib/semaphore.S | 66 -------- + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/semaphore.c | 168 -------------------- + arch/mn10300/kernel/Makefile | 2 +- + arch/mn10300/kernel/semaphore.c | 149 ----------------- + arch/parisc/kernel/Makefile | 2 +- + arch/parisc/kernel/parisc_ksyms.c | 5 - + arch/parisc/kernel/semaphore.c | 102 ------------ + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/ppc_ksyms.c | 1 - + arch/powerpc/kernel/semaphore.c | 135 ---------------- + arch/ppc/kernel/semaphore.c | 131 --------------- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/s390_ksyms.c | 7 - + arch/s390/kernel/semaphore.c | 108 ------------- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/Makefile_64 | 2 +- + arch/sh/kernel/semaphore.c | 139 ---------------- + arch/sh/kernel/sh_ksyms_32.c | 7 - + arch/sh/kernel/sh_ksyms_64.c | 4 - + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/semaphore.c | 155 ------------------ + arch/sparc/kernel/sparc_ksyms.c | 5 - + arch/sparc64/kernel/Makefile | 2 +- + arch/sparc64/kernel/semaphore.c | 254 ------------------------------ + arch/sparc64/kernel/sparc64_ksyms.c | 6 - + arch/um/Kconfig.i386 | 4 - + arch/um/Kconfig.x86_64 | 4 - + arch/um/sys-i386/ksyms.c | 12 -- + arch/um/sys-ppc/Makefile | 8 +- + arch/um/sys-x86_64/ksyms.c | 13 +-- + arch/v850/kernel/Makefile | 2 +- + arch/v850/kernel/semaphore.c | 166 ------------------- + arch/v850/kernel/v850_ksyms.c | 7 - + arch/x86/Kconfig | 3 - + arch/x86/kernel/i386_ksyms_32.c | 5 - + arch/x86/kernel/x8664_ksyms_64.c | 6 - + arch/x86/lib/semaphore_32.S | 83 ---------- + arch/x86/lib/thunk_64.S | 5 - + arch/xtensa/kernel/Makefile | 2 +- + arch/xtensa/kernel/semaphore.c | 226 -------------------------- + arch/xtensa/kernel/xtensa_ksyms.c | 9 - + drivers/acpi/osl.c | 89 +++-------- + include/asm-alpha/semaphore.h | 150 +----------------- + include/asm-arm/semaphore-helper.h | 84 ---------- + include/asm-arm/semaphore.h | 99 +------------ + include/asm-avr32/semaphore.h | 109 +------------- + include/asm-blackfin/semaphore-helper.h | 82 ---------- + include/asm-blackfin/semaphore.h | 106 +------------ + include/asm-cris/semaphore-helper.h | 78 --------- + include/asm-cris/semaphore.h | 134 +---------------- + include/asm-frv/semaphore.h | 156 +------------------ + include/asm-h8300/semaphore-helper.h | 85 ---------- + include/asm-h8300/semaphore.h | 191 +---------------------- + include/asm-ia64/semaphore.h | 100 +------------ + include/asm-m32r/semaphore.h | 145 +----------------- + include/asm-m68k/semaphore-helper.h | 142 ----------------- + include/asm-m68k/semaphore.h | 164 +------------------- + include/asm-m68knommu/semaphore-helper.h | 82 ---------- + include/asm-m68knommu/semaphore.h | 154 +------------------ + include/asm-mips/semaphore.h | 109 +------------- + include/asm-mn10300/semaphore.h | 170 +-------------------- + include/asm-parisc/semaphore-helper.h | 89 ----------- + include/asm-parisc/semaphore.h | 146 +----------------- + include/asm-powerpc/semaphore.h | 95 +----------- + include/asm-s390/semaphore.h | 108 +------------- + include/asm-sh/semaphore-helper.h | 89 ----------- + include/asm-sh/semaphore.h | 116 +-------------- + include/asm-sparc/semaphore.h | 193 +---------------------- + include/asm-sparc64/semaphore.h | 54 +------ + include/asm-um/semaphore.h | 7 +- + include/asm-v850/semaphore.h | 85 +---------- + include/asm-x86/semaphore.h | 6 +- + include/asm-x86/semaphore_32.h | 175 -------------------- + include/asm-x86/semaphore_64.h | 180 --------------------- + include/asm-xtensa/semaphore.h | 100 +------------ + include/linux/quota.h | 8 +- + include/linux/semaphore.h | 86 ++++++++++ + kernel/Makefile | 2 +- + kernel/semaphore.c | 207 ++++++++++++++++++++++++ + lib/Makefile | 1 - + lib/kernel_lock.c | 1 + + lib/semaphore-sleepers.c | 176 --------------------- + 116 files changed, 371 insertions(+), 7749 deletions(-) + delete mode 100644 arch/alpha/kernel/semaphore.c + delete mode 100644 arch/arm/kernel/semaphore.c + delete mode 100644 arch/avr32/kernel/semaphore.c + delete mode 100644 arch/cris/kernel/semaphore.c + delete mode 100644 arch/frv/kernel/semaphore.c + delete mode 100644 arch/h8300/kernel/semaphore.c + delete mode 100644 arch/ia64/kernel/semaphore.c + delete mode 100644 arch/m32r/kernel/semaphore.c + delete mode 100644 arch/m68k/kernel/semaphore.c + delete mode 100644 arch/m68k/lib/semaphore.S + delete mode 100644 arch/m68knommu/kernel/semaphore.c + delete mode 100644 arch/m68knommu/lib/semaphore.S + delete mode 100644 arch/mips/kernel/semaphore.c + delete mode 100644 arch/mn10300/kernel/semaphore.c + delete mode 100644 arch/parisc/kernel/semaphore.c + delete mode 100644 arch/powerpc/kernel/semaphore.c + delete mode 100644 arch/ppc/kernel/semaphore.c + delete mode 100644 arch/s390/kernel/semaphore.c + delete mode 100644 arch/sh/kernel/semaphore.c + delete mode 100644 arch/sparc/kernel/semaphore.c + delete mode 100644 arch/sparc64/kernel/semaphore.c + delete mode 100644 arch/v850/kernel/semaphore.c + delete mode 100644 arch/xtensa/kernel/semaphore.c + delete mode 100644 include/asm-arm/semaphore-helper.h + delete mode 100644 include/asm-blackfin/semaphore-helper.h + delete mode 100644 include/asm-cris/semaphore-helper.h + delete mode 100644 include/asm-h8300/semaphore-helper.h + delete mode 100644 include/asm-m68k/semaphore-helper.h + delete mode 100644 include/asm-m68knommu/semaphore-helper.h + delete mode 100644 include/asm-parisc/semaphore-helper.h + delete mode 100644 include/asm-sh/semaphore-helper.h + delete mode 100644 include/asm-x86/semaphore_32.h + delete mode 100644 include/asm-x86/semaphore_64.h + create mode 100644 include/linux/semaphore.h + create mode 100644 kernel/semaphore.c + delete mode 100644 lib/semaphore-sleepers.c +Merging x86-latest/latest +$ git merge x86-latest/latest +Auto-merged Documentation/DocBook/Makefile +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged arch/arm/kernel/Makefile +Auto-merged arch/um/Kconfig.i386 +CONFLICT (content): Merge conflict in arch/um/Kconfig.i386 +Auto-merged arch/um/Kconfig.x86_64 +CONFLICT (content): Merge conflict in arch/um/Kconfig.x86_64 +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/boot/boot.h +Auto-merged arch/x86/boot/video-bios.c +Auto-merged arch/x86/boot/video-vesa.c +Auto-merged arch/x86/boot/video-vga.c +Auto-merged arch/x86/boot/video.c +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/acpi/Makefile +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/Makefile +Auto-merged arch/x86/kernel/acpi/sleep.h +CONFLICT (add/add): Merge conflict in arch/x86/kernel/acpi/sleep.h +Auto-merged arch/x86/kernel/e820_64.c +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/pci-calgary_64.c +Removed arch/x86/kernel/pci-dma_32.c +Removed arch/x86/kernel/pci-dma_64.c +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_32.c +Auto-merged arch/x86/kernel/setup_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/lib/Makefile +Removed arch/x86/lib/bitops_32.c +Removed arch/x86/lib/bitops_64.c +Auto-merged arch/x86/pci/acpi.c +CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c +Auto-merged arch/x86/pci/common.c +CONFLICT (content): Merge conflict in arch/x86/pci/common.c +Auto-merged arch/x86/pci/pci.h +CONFLICT (content): Merge conflict in arch/x86/pci/pci.h +Auto-merged drivers/base/core.c +Auto-merged drivers/misc/Makefile +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/serial/serial_core.c +Auto-merged drivers/video/Kconfig +Removed include/asm-x86/bitops_32.h +Removed include/asm-x86/bitops_64.h +Removed include/asm-x86/dma-mapping_32.h +Removed include/asm-x86/dma-mapping_64.h +Auto-merged include/asm-x86/ide.h +CONFLICT (content): Merge conflict in include/asm-x86/ide.h +Removed include/asm-x86/pgalloc_32.h +Removed include/asm-x86/pgalloc_64.h +CONFLICT (delete/modify): include/asm-x86/semaphore_32.h deleted in HEAD and modified in x86-latest/latest. Version x86-latest/latest of include/asm-x86/semaphore_32.h left in tree. +CONFLICT (delete/modify): include/asm-x86/semaphore_64.h deleted in HEAD and modified in x86-latest/latest. Version x86-latest/latest of include/asm-x86/semaphore_64.h left in tree. +Auto-merged include/asm-x86/trampoline.h +CONFLICT (add/add): Merge conflict in include/asm-x86/trampoline.h +Auto-merged include/linux/bitmap.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/irqflags.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/netdevice.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/skbuff.h +Auto-merged include/net/inet_sock.h +Auto-merged include/net/tcp.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/time/clocksource.c +Auto-merged kernel/time/tick-broadcast.c +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merged lib/bitmap.c +Auto-merged net/core/skbuff.c +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'arch/um/Kconfig.i386' using previous resolution. +Resolved 'arch/um/Kconfig.x86_64' using previous resolution. +Resolved 'arch/x86/kernel/acpi/Makefile' using previous resolution. +Resolved 'arch/x86/kernel/acpi/sleep.h' using previous resolution. +Resolved 'arch/x86/pci/acpi.c' using previous resolution. +Resolved 'arch/x86/pci/common.c' using previous resolution. +Resolved 'arch/x86/pci/pci.h' using previous resolution. +Resolved 'include/asm-x86/ide.h' using previous resolution. +Resolved 'include/asm-x86/trampoline.h' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm include/asm-x86/semaphore_32.h include/asm-x86/semaphore_64.h +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/kgdb.tmpl | 447 +++++ + Documentation/feature-removal-schedule.txt | 6 + + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/i386/boot.txt | 26 + + Documentation/kernel-parameters.txt | 17 +- + Documentation/kmemcheck.txt | 101 ++ + .../prctl/disable-tsc-ctxt-sw-stress-test.c | 96 ++ + .../prctl/disable-tsc-on-off-stress-test.c | 95 ++ + Documentation/prctl/disable-tsc-test.c | 94 ++ + MAINTAINERS | 6 + + arch/arm/Kconfig | 1 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/kgdb.c | 219 +++ + arch/arm/kernel/setup.c | 5 + + arch/arm/kernel/traps.c | 11 + + arch/um/Kconfig | 50 +- + arch/um/Kconfig.char | 6 +- + arch/um/Kconfig.i386 | 24 +- + arch/um/Kconfig.x86_64 | 30 +- + arch/um/sys-i386/Makefile | 2 +- + arch/um/sys-x86_64/Makefile | 2 +- + arch/x86/Kconfig | 53 +- + arch/x86/Kconfig.cpu | 20 +- + arch/x86/Kconfig.debug | 64 + + arch/x86/Makefile_32.cpu | 3 +- + arch/x86/boot/a20.c | 2 - + arch/x86/boot/apm.c | 2 - + arch/x86/boot/bitops.h | 2 - + arch/x86/boot/boot.h | 2 - + arch/x86/boot/cmdline.c | 2 - + arch/x86/boot/compressed/head_32.S | 15 +- + arch/x86/boot/compressed/head_64.S | 30 +- + arch/x86/boot/compressed/misc.c | 8 +- + arch/x86/boot/compressed/vmlinux_64.lds | 4 +- + arch/x86/boot/copy.S | 2 - + arch/x86/boot/cpucheck.c | 2 - + arch/x86/boot/edd.c | 2 - + arch/x86/boot/header.S | 6 +- + arch/x86/boot/install.sh | 2 - + arch/x86/boot/main.c | 2 - + arch/x86/boot/mca.c | 2 - + arch/x86/boot/memory.c | 2 - + arch/x86/boot/pm.c | 2 - + arch/x86/boot/pmjump.S | 2 - + arch/x86/boot/printf.c | 2 - + arch/x86/boot/string.c | 2 - + arch/x86/boot/tty.c | 2 - + arch/x86/boot/version.c | 2 - + arch/x86/boot/video-bios.c | 2 - + arch/x86/boot/video-vesa.c | 2 - + arch/x86/boot/video-vga.c | 2 - + arch/x86/boot/video.c | 2 - + arch/x86/boot/video.h | 2 - + arch/x86/boot/voyager.c | 2 - + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/kernel/Makefile | 14 +- + arch/x86/kernel/acpi/boot.c | 70 + + arch/x86/kernel/acpi/cstate.c | 2 - + arch/x86/kernel/acpi/processor.c | 2 - + arch/x86/kernel/aperture_64.c | 59 +- + arch/x86/kernel/cpu/common.c | 7 + + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 4 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 70 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 - + arch/x86/kernel/ds.c | 953 ++++++++---- + arch/x86/kernel/e820_64.c | 39 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 21 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/head64.c | 20 + + arch/x86/kernel/head_32.S | 1 - + arch/x86/kernel/io_apic_32.c | 2 +- + arch/x86/kernel/io_apic_64.c | 4 +- + arch/x86/kernel/kdebugfs.c | 163 ++- + arch/x86/kernel/kgdb.c | 567 +++++++ + arch/x86/kernel/kmemcheck.c | 939 +++++++++++ + arch/x86/kernel/mfgpt_32.c | 8 +- + arch/x86/kernel/mmconf-fam10h_64.c | 215 +++ + arch/x86/kernel/mpparse.c | 2 +- + arch/x86/kernel/nmi_32.c | 3 +- + arch/x86/kernel/nmi_64.c | 6 +- + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/pci-calgary_64.c | 3 +- + arch/x86/kernel/pci-dma.c | 524 ++++++ + arch/x86/kernel/pci-dma_32.c | 177 -- + arch/x86/kernel/pci-dma_64.c | 344 ---- + arch/x86/kernel/pci-gart_64.c | 25 +- + arch/x86/kernel/{pci-nommu_64.c => pci-nommu.c} | 34 +- + arch/x86/kernel/pci-swiotlb_64.c | 9 +- + arch/x86/kernel/process_32.c | 73 +- + arch/x86/kernel/process_64.c | 105 ++- + arch/x86/kernel/ptrace.c | 448 ++++-- + arch/x86/kernel/reboot.c | 4 +- + arch/x86/kernel/setup64.c | 20 +- + arch/x86/kernel/setup_64.c | 43 +- + arch/x86/kernel/smpboot.c | 23 +- + arch/x86/kernel/trampoline.c | 18 + + arch/x86/kernel/trampoline_32.S | 2 +- + arch/x86/kernel/trampoline_64.S | 5 - + arch/x86/kernel/traps_32.c | 32 +- + arch/x86/kernel/traps_64.c | 41 +- + arch/x86/kernel/tsc_32.c | 23 +- + arch/x86/kernel/tsc_64.c | 23 +- + arch/x86/kernel/vmi_32.c | 22 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/bitops_32.c | 70 - + arch/x86/lib/bitops_64.c | 175 -- + arch/x86/mach-visws/visws_apic.c | 2 - + arch/x86/mach-voyager/voyager_basic.c | 2 - + arch/x86/mach-voyager/voyager_cat.c | 2 - + arch/x86/mach-voyager/voyager_smp.c | 7 +- + arch/x86/mach-voyager/voyager_thread.c | 2 - + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/fault.c | 25 +- + arch/x86/mm/init_32.c | 9 +- + arch/x86/mm/init_64.c | 41 +- + arch/x86/mm/ioremap.c | 7 +- + arch/x86/mm/k8topology_64.c | 40 +- + arch/x86/mm/numa_64.c | 62 +- + arch/x86/mm/pageattr.c | 4 +- + arch/x86/mm/pgtable.c | 276 ++++ + arch/x86/mm/pgtable_32.c | 208 --- + arch/x86/mm/srat_64.c | 32 +- + arch/x86/oprofile/nmi_int.c | 49 +- + arch/x86/pci/Makefile_32 | 1 + + arch/x86/pci/Makefile_64 | 2 +- + arch/x86/pci/acpi.c | 103 +- + arch/x86/pci/common.c | 65 +- + arch/x86/pci/direct.c | 8 +- + arch/x86/pci/fixup.c | 17 + + arch/x86/pci/init.c | 15 +- + arch/x86/pci/irq.c | 4 +- + arch/x86/pci/k8-bus_64.c | 580 ++++++- + arch/x86/pci/legacy.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 249 +++- + arch/x86/pci/mmconfig_32.c | 4 + + arch/x86/pci/mmconfig_64.c | 22 +- + arch/x86/pci/mp_bus_to_node.c | 23 + + arch/x86/pci/pci.h | 4 +- + arch/x86/video/fbdev.c | 1 - + arch/x86/xen/Kconfig | 2 +- + arch/x86/xen/Makefile | 4 +- + arch/x86/xen/enlighten.c | 54 +- + arch/x86/xen/grant-table.c | 91 ++ + arch/x86/xen/mmu.c | 143 +- + arch/x86/xen/setup.c | 21 + + arch/x86/xen/smp.c | 20 +- + arch/x86/xen/xen-asm.S | 42 +- + arch/x86/xen/xen-ops.h | 8 +- + drivers/Kconfig | 2 + + drivers/acpi/bus.c | 2 + + drivers/base/core.c | 14 +- + drivers/block/xen-blkfront.c | 23 +- + drivers/char/agp/amd64-agp.c | 50 +- + drivers/char/tty_io.c | 47 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 2 + + drivers/input/misc/pcspkr.c | 16 +- + drivers/input/xen-kbdfront.c | 340 ++++ + drivers/misc/Makefile | 1 + + drivers/misc/kgdbts.c | 1090 +++++++++++++ + drivers/net/xen-netfront.c | 2 + + drivers/pci/pci-sysfs.c | 84 +- + drivers/pci/probe.c | 21 +- + drivers/serial/8250.c | 58 + + drivers/serial/Kconfig | 3 + + drivers/serial/Makefile | 1 + + drivers/serial/amba-pl011.c | 30 + + drivers/serial/kgdboc.c | 168 ++ + drivers/serial/serial_core.c | 74 +- + drivers/video/Kconfig | 14 + + drivers/video/Makefile | 1 + + drivers/video/geode/display_gx.h | 1 - + drivers/video/geode/gxfb_core.c | 3 +- + drivers/video/geode/lxfb.h | 8 - + drivers/video/geode/lxfb_ops.c | 19 +- + drivers/video/geode/video_gx.c | 5 +- + drivers/video/geode/video_gx.h | 3 - + drivers/video/xen-fbfront.c | 550 +++++++ + drivers/xen/Kconfig | 19 + + drivers/xen/Makefile | 4 +- + drivers/xen/balloon.c | 712 ++++++++ + {arch/x86 => drivers}/xen/events.c | 121 ++- + {arch/x86 => drivers}/xen/features.c | 0 + drivers/xen/grant-table.c | 37 +- + drivers/xen/xenbus/xenbus_client.c | 6 +- + drivers/xen/xenbus/xenbus_probe.c | 32 +- + drivers/xen/xencomm.c | 232 +++ + include/asm-alpha/bitops.h | 5 + + include/asm-alpha/topology.h | 3 +- + include/asm-arm/kgdb.h | 104 ++ + include/asm-arm/traps.h | 2 + + include/asm-frv/topology.h | 4 +- + include/asm-generic/bitops/__fls.h | 43 + + include/asm-generic/bitops/find.h | 2 + + include/asm-generic/bitops/fls64.h | 22 + + include/asm-generic/siginfo.h | 8 + + include/asm-generic/topology.h | 14 + + include/asm-ia64/bitops.h | 16 + + include/asm-ia64/topology.h | 5 + + include/asm-mips/bitops.h | 5 + + include/asm-parisc/bitops.h | 1 + + include/asm-powerpc/bitops.h | 20 +- + include/asm-powerpc/topology.h | 3 +- + include/asm-s390/bitops.h | 1 + + include/asm-sh/bitops.h | 1 + + include/asm-sparc64/bitops.h | 1 + + include/asm-x86/bitops.h | 149 ++- + include/asm-x86/bitops_32.h | 166 -- + include/asm-x86/bitops_64.h | 162 -- + include/asm-x86/boot.h | 8 + + include/asm-x86/bootparam.h | 14 + + include/asm-x86/dma-mapping.h | 238 +++- + include/asm-x86/dma-mapping_32.h | 187 --- + include/asm-x86/dma-mapping_64.h | 202 --- + include/asm-x86/ds.h | 258 +++- + include/asm-x86/e820_64.h | 3 +- + include/asm-x86/gart.h | 21 + + include/asm-x86/geode.h | 16 +- + include/asm-x86/i8253.h | 31 +- + include/asm-x86/ide.h | 58 +- + include/asm-x86/irq_64.h | 6 + + include/asm-x86/kdebug.h | 4 +- + include/asm-x86/kgdb.h | 81 + + include/asm-x86/kmemcheck.h | 30 + + include/asm-x86/mach-default/smpboot_hooks.h | 2 +- + include/asm-x86/numa_64.h | 3 +- + include/asm-x86/paravirt.h | 43 +- + include/asm-x86/pci.h | 2 + + include/asm-x86/pci_64.h | 1 + + include/asm-x86/pgalloc.h | 127 ++- + include/asm-x86/pgalloc_32.h | 95 -- + include/asm-x86/pgalloc_64.h | 133 -- + include/asm-x86/pgtable.h | 87 +- + include/asm-x86/pgtable_32.h | 32 +- + include/asm-x86/pgtable_64.h | 2 +- + include/asm-x86/processor.h | 19 +- + include/asm-x86/ptrace-abi.h | 14 +- + include/asm-x86/ptrace.h | 38 +- + include/asm-x86/scatterlist.h | 2 - + include/asm-x86/smp.h | 13 - + include/asm-x86/string_32.h | 313 +++-- + include/asm-x86/string_64.h | 1 + + include/asm-x86/thread_info_64.h | 4 +- + include/asm-x86/topology.h | 27 +- + include/asm-x86/trampoline.h | 11 +- + include/asm-x86/tsc.h | 1 + + include/asm-x86/xen/events.h | 22 + + include/asm-x86/xen/grant_table.h | 7 + + include/asm-x86/xen/hypercall.h | 6 + + include/asm-x86/xen/interface.h | 28 + + include/asm-x86/xen/page.h | 168 ++ + include/linux/acpi.h | 5 + + include/linux/bitmap.h | 1 + + include/linux/bitops.h | 144 ++ + include/linux/clocksource.h | 1 + + include/linux/cpumask.h | 7 + + include/linux/fs.h | 4 +- + include/linux/gfp.h | 3 +- + include/linux/ide.h | 3 +- + include/linux/irqflags.h | 6 +- + include/linux/kernel.h | 2 +- + include/linux/kernel_stat.h | 2 +- + include/linux/kgdb.h | 281 ++++ + include/linux/kmemcheck.h | 27 + + include/linux/netdevice.h | 4 +- + include/linux/page-flags.h | 6 + + include/linux/pci.h | 12 +- + include/linux/pci_ids.h | 2 + + include/linux/prctl.h | 6 + + include/linux/serial_core.h | 4 + + include/linux/skbuff.h | 3 +- + include/linux/slab.h | 7 + + include/linux/slub_def.h | 17 + + include/linux/tty_driver.h | 12 + + include/linux/uaccess.h | 22 + + include/net/inet_sock.h | 3 +- + include/net/tcp.h | 11 + + include/xen/balloon.h | 61 + + include/xen/events.h | 9 +- + include/xen/grant_table.h | 7 + + include/xen/interface/callback.h | 102 ++ + include/xen/interface/grant_table.h | 11 +- + include/xen/interface/io/fbif.h | 124 ++ + include/xen/interface/io/kbdif.h | 114 ++ + include/xen/interface/io/protocols.h | 21 + + include/xen/interface/memory.h | 12 +- + include/xen/interface/vcpu.h | 5 + + include/xen/interface/xen.h | 22 +- + include/xen/interface/xencomm.h | 41 + + include/xen/page.h | 181 +--- + include/xen/xen-ops.h | 8 + + include/xen/xenbus.h | 1 + + include/xen/xencomm.h | 77 + + init/do_mounts.c | 8 +- + init/main.c | 2 + + kernel/Makefile | 1 + + kernel/fork.c | 15 +- + kernel/irq/chip.c | 2 +- + kernel/kgdb.c | 1700 ++++++++++++++++++++ + kernel/printk.c | 2 +- + kernel/signal.c | 12 + + kernel/sys.c | 13 +- + kernel/sysctl.c | 12 + + kernel/time/clocksource.c | 12 + + kernel/time/tick-broadcast.c | 2 +- + kernel/time/timekeeping.c | 2 + + lib/Kconfig.debug | 2 + + lib/Kconfig.kgdb | 58 + + lib/Makefile | 1 + + lib/bitmap.c | 16 + + lib/find_next_bit.c | 77 +- + localversion-x86-latest.git | 1 + + mm/Makefile | 5 +- + mm/allocpercpu.c | 3 +- + mm/bootmem.c | 157 ++- + mm/maccess.c | 55 + + mm/slub.c | 37 +- + mm/slub_kmemcheck.c | 99 ++ + mm/sparse.c | 37 +- + net/core/skbuff.c | 19 +- + 324 files changed, 15872 insertions(+), 3959 deletions(-) + create mode 100644 Documentation/DocBook/kgdb.tmpl + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c + create mode 100644 Documentation/prctl/disable-tsc-on-off-stress-test.c + create mode 100644 Documentation/prctl/disable-tsc-test.c + create mode 100644 arch/arm/kernel/kgdb.c + create mode 100644 arch/x86/kernel/kgdb.c + create mode 100644 arch/x86/kernel/kmemcheck.c + create mode 100644 arch/x86/kernel/mmconf-fam10h_64.c + create mode 100644 arch/x86/kernel/pci-dma.c + delete mode 100644 arch/x86/kernel/pci-dma_32.c + delete mode 100644 arch/x86/kernel/pci-dma_64.c + rename arch/x86/kernel/{pci-nommu_64.c => pci-nommu.c} (77%) + create mode 100644 arch/x86/kernel/trampoline.c + delete mode 100644 arch/x86/lib/bitops_32.c + delete mode 100644 arch/x86/lib/bitops_64.c + create mode 100644 arch/x86/mm/pgtable.c + create mode 100644 arch/x86/pci/mp_bus_to_node.c + create mode 100644 arch/x86/xen/grant-table.c + create mode 100644 drivers/input/xen-kbdfront.c + create mode 100644 drivers/misc/kgdbts.c + create mode 100644 drivers/serial/kgdboc.c + create mode 100644 drivers/video/xen-fbfront.c + create mode 100644 drivers/xen/Kconfig + create mode 100644 drivers/xen/balloon.c + rename {arch/x86 => drivers}/xen/events.c (82%) + rename {arch/x86 => drivers}/xen/features.c (100%) + create mode 100644 drivers/xen/xencomm.c + create mode 100644 include/asm-arm/kgdb.h + create mode 100644 include/asm-generic/bitops/__fls.h + delete mode 100644 include/asm-x86/bitops_32.h + delete mode 100644 include/asm-x86/bitops_64.h + delete mode 100644 include/asm-x86/dma-mapping_32.h + delete mode 100644 include/asm-x86/dma-mapping_64.h + create mode 100644 include/asm-x86/kgdb.h + create mode 100644 include/asm-x86/kmemcheck.h + delete mode 100644 include/asm-x86/pgalloc_32.h + delete mode 100644 include/asm-x86/pgalloc_64.h + create mode 100644 include/asm-x86/xen/events.h + create mode 100644 include/asm-x86/xen/grant_table.h + create mode 100644 include/asm-x86/xen/page.h + create mode 100644 include/linux/kgdb.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 include/xen/balloon.h + create mode 100644 include/xen/interface/callback.h + create mode 100644 include/xen/interface/io/fbif.h + create mode 100644 include/xen/interface/io/kbdif.h + create mode 100644 include/xen/interface/io/protocols.h + create mode 100644 include/xen/interface/xencomm.h + create mode 100644 include/xen/xen-ops.h + create mode 100644 include/xen/xencomm.h + create mode 100644 kernel/kgdb.c + create mode 100644 lib/Kconfig.kgdb + create mode 100644 localversion-x86-latest.git + create mode 100644 mm/maccess.c + create mode 100644 mm/slub_kmemcheck.c +Applying x86-latest-kvm-fix-1 +Merging sched-latest/latest +$ git merge sched-latest/latest +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/reboot.c +Auto-merged drivers/base/cpu.c +Auto-merged drivers/base/topology.c +CONFLICT (content): Merge conflict in drivers/base/topology.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/probe.c +Auto-merged include/linux/irq.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/compat.c +Auto-merged net/sunrpc/svc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 +++++ + Documentation/RCU/checklist.txt | 89 +++-- + Documentation/RCU/whatisRCU.txt | 58 ++- + Documentation/tracers/mmiotrace.txt | 153 +++++++ + arch/alpha/kernel/irq.c | 2 +- + arch/x86/Kconfig | 3 + + arch/x86/Kconfig.debug | 28 ++ + arch/x86/kernel/acpi/cstate.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 28 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 32 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 13 +- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 20 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 34 +- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 46 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/microcode.c | 16 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 28 ++- + 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 | 9 +- + arch/x86/mm/kmmio.c | 499 +++++++++++++++++++++ + arch/x86/mm/mmio-mod.c | 507 +++++++++++++++++++++ + 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 +++ + drivers/acpi/processor_throttling.c | 10 +- + drivers/base/cpu.c | 50 +++ + drivers/base/node.c | 29 +- + drivers/base/topology.c | 48 ++- + drivers/firmware/dcdbas.c | 4 +- + drivers/pci/pci-driver.c | 11 +- + drivers/pci/pci-sysfs.c | 20 +- + drivers/pci/probe.c | 27 +- + include/asm-x86/topology.h | 5 - + include/linux/cpumask.h | 23 +- + include/linux/cpuset.h | 15 +- + include/linux/irq.h | 7 - + include/linux/mmiotrace.h | 89 ++++ + include/linux/rcuclassic.h | 3 + + include/linux/rcupdate.h | 24 + + include/linux/rcupreempt.h | 42 ++- + include/linux/sched.h | 2 +- + include/linux/sysdev.h | 17 +- + include/linux/topology.h | 46 +-- + init/main.c | 8 +- + kernel/compat.c | 2 +- + kernel/cpu.c | 6 +- + kernel/cpuset.c | 154 ++++++- + kernel/irq/manage.c | 65 +++ + kernel/kmod.c | 2 +- + kernel/kthread.c | 50 ++- + kernel/printk.c | 61 ++-- + kernel/rcuclassic.c | 30 ++- + kernel/rcupdate.c | 71 ++- + kernel/rcupreempt.c | 414 ++++++++++++++++-- + kernel/sched.c | 515 ++++++++++++++-------- + kernel/sched_stats.h | 8 +- + kernel/stop_machine.c | 2 +- + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 6 +- + kernel/trace/trace.c | 89 +++- + kernel/trace/trace.h | 29 ++ + kernel/trace/trace_mmiotrace.c | 220 +++++++++ + kernel/trace/trace_selftest.c | 16 +- + kernel/trace/trace_sysprof.c | 4 +- + localversion-sched-devel.git | 1 + + mm/page_alloc.c | 6 +- + mm/pdflush.c | 4 +- + mm/slab.c | 5 +- + mm/vmscan.c | 18 +- + net/sunrpc/svc.c | 16 +- + tests/rcutorture.c | 49 ++- + 77 files changed, 4005 insertions(+), 637 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + 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/mmiotrace.h + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 localversion-sched-devel.git +Merging quilt/ldp +$ git merge quilt/ldp +Auto-merged drivers/Kconfig +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Auto-merged drivers/net/Kconfig +Auto-merged drivers/net/Makefile +Auto-merged fs/Kconfig +Resolved 'drivers/misc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/appleir.c | 360 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/firesat/Kconfig | 11 + + drivers/media/dvb/firesat/Makefile | 12 + + drivers/media/dvb/firesat/avc_api.c | 813 + + drivers/media/dvb/firesat/avc_api.h | 380 + + drivers/media/dvb/firesat/cmp.c | 230 + + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 95 + + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 82 + + drivers/media/dvb/firesat/firesat-rc.h | 9 + + drivers/media/dvb/firesat/firesat.h | 85 + + drivers/media/dvb/firesat/firesat_1394.c | 468 + + drivers/media/dvb/firesat/firesat_dvb.c | 325 + + drivers/media/dvb/firesat/firesat_fe.c | 263 + + drivers/media/video/Kconfig | 1 + + drivers/media/video/Makefile | 2 + + drivers/media/video/go7007/Kconfig | 14 + + drivers/media/video/go7007/Makefile | 17 + + drivers/media/video/go7007/go7007-driver.c | 693 + + drivers/media/video/go7007/go7007-fw.c | 1643 ++ + drivers/media/video/go7007/go7007-i2c.c | 309 + + drivers/media/video/go7007/go7007-priv.h | 279 + + drivers/media/video/go7007/go7007-usb.c | 1229 + + drivers/media/video/go7007/go7007-v4l2.c | 1516 + + drivers/media/video/go7007/go7007.h | 120 + + drivers/media/video/go7007/saa7134-go7007.c | 484 + + drivers/media/video/go7007/snd-go7007.c | 315 + + drivers/media/video/go7007/wis-i2c.h | 55 + + drivers/media/video/go7007/wis-ov7640.c | 146 + + drivers/media/video/go7007/wis-saa7113.c | 378 + + drivers/media/video/go7007/wis-saa7115.c | 507 + + drivers/media/video/go7007/wis-sony-tuner.c | 757 + + drivers/media/video/go7007/wis-tw2804.c | 383 + + drivers/media/video/go7007/wis-tw9903.c | 378 + + drivers/media/video/go7007/wis-uda1342.c | 136 + + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 2 + + drivers/misc/aectc/Makefile | 1 + + drivers/misc/aectc/aec_tc.c | 349 + + drivers/misc/aectc/aectc.h | 18 + + drivers/misc/aectc/read.c | 63 + + drivers/misc/aectc/write.c | 64 + + drivers/misc/me4000.c | 5435 ++++ + drivers/misc/me4000.h | 1014 + + drivers/misc/xilinx_firm.h |15416 ++++++++++ + drivers/net/Kconfig | 32 + + drivers/net/Makefile | 2 + + drivers/net/et131x/MODULE-PARAMETER.txt | 36 + + drivers/net/et131x/Makefile | 18 + + drivers/net/et131x/et1310_address_map.h | 2399 ++ + drivers/net/et131x/et1310_eeprom.c | 480 + + drivers/net/et131x/et1310_eeprom.h | 89 + + drivers/net/et131x/et1310_jagcore.c | 222 + + drivers/net/et131x/et1310_jagcore.h | 112 + + drivers/net/et131x/et1310_mac.c | 800 + + drivers/net/et131x/et1310_mac.h | 93 + + drivers/net/et131x/et1310_phy.c | 1297 + + drivers/net/et131x/et1310_phy.h | 910 + + drivers/net/et131x/et1310_pm.c | 209 + + drivers/net/et131x/et1310_pm.h | 126 + + drivers/net/et131x/et1310_rx.c | 1401 + + drivers/net/et131x/et1310_rx.h | 373 + + drivers/net/et131x/et1310_tx.c | 1541 + + drivers/net/et131x/et1310_tx.h | 242 + + drivers/net/et131x/et131x_adapter.h | 347 + + drivers/net/et131x/et131x_config.c | 312 + + drivers/net/et131x/et131x_config.h | 67 + + drivers/net/et131x/et131x_debug.c | 218 + + drivers/net/et131x/et131x_debug.h | 202 + + drivers/net/et131x/et131x_defs.h | 128 + + drivers/net/et131x/et131x_initpci.c | 1047 + + drivers/net/et131x/et131x_initpci.h | 73 + + drivers/net/et131x/et131x_isr.c | 492 + + drivers/net/et131x/et131x_isr.h | 65 + + drivers/net/et131x/et131x_netdev.c | 868 + + drivers/net/et131x/et131x_netdev.h | 64 + + drivers/net/et131x/et131x_version.h | 86 + + drivers/net/slicoss/Makefile | 1 + + drivers/net/slicoss/gbdownload.h | 8215 ++++++ + drivers/net/slicoss/gbrcvucode.h | 239 + + drivers/net/slicoss/oasisdbgdownload.h | 6850 +++++ + drivers/net/slicoss/oasisdownload.h | 6848 +++++ + drivers/net/slicoss/oasisrcvucode.h | 205 + + drivers/net/slicoss/slic.h | 619 + + drivers/net/slicoss/slic_os.h | 150 + + drivers/net/slicoss/slicbuild.h | 97 + + drivers/net/slicoss/slicdbg.h | 100 + + drivers/net/slicoss/slicdump.h | 282 + + drivers/net/slicoss/slichw.h | 855 + + drivers/net/slicoss/slicinc.h | 215 + + drivers/net/slicoss/slicoss.c | 6160 ++++ + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 3349 +++ + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/host/Kconfig | 15 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/hwa-hc.c | 951 + + drivers/usb/image/Kconfig | 9 + + drivers/usb/image/Makefile | 1 + + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++ + drivers/usb/image/s2255drv.c | 2802 ++ + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 753 + + 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 | 550 + + drivers/usb/wusbcore/wa-xfer.c | 1710 ++ + drivers/usb/wusbcore/wusbhc.c | 395 + + drivers/usb/wusbcore/wusbhc.h | 522 + + drivers/uwb/Kconfig | 92 + + drivers/uwb/Makefile | 31 + + 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 | 428 + + drivers/uwb/hwa-rc.c | 925 + + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 286 + + 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 | 516 + + 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 | 430 + + 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 | 562 + + 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 | 103 + + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 306 + + drivers/uwb/uwb-internal.h | 298 + + drivers/uwb/uwbd.c | 428 + + drivers/uwb/whc-rc.c | 564 + + drivers/uwb/whci.c | 296 + + 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 + + fs/Kconfig | 9 + + fs/Makefile | 1 + + fs/novfs/Makefile | 19 + + fs/novfs/commands.h | 1089 + + fs/novfs/daemon.c | 2444 ++ + fs/novfs/file.c | 2225 ++ + fs/novfs/inode.c | 5634 ++++ + fs/novfs/nwcapi.c | 2537 ++ + fs/novfs/nwcapi.h | 2213 ++ + fs/novfs/nwerror.h | 658 + + fs/novfs/proc.c | 152 + + fs/novfs/profile.c | 687 + + fs/novfs/scope.c | 738 + + fs/novfs/vfs.h | 447 + + 194 files changed, 174519 insertions(+), 1 deletions(-) + create mode 100644 drivers/input/misc/appleir.c + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/video/go7007/Kconfig + create mode 100644 drivers/media/video/go7007/Makefile + create mode 100644 drivers/media/video/go7007/go7007-driver.c + create mode 100644 drivers/media/video/go7007/go7007-fw.c + create mode 100644 drivers/media/video/go7007/go7007-i2c.c + create mode 100644 drivers/media/video/go7007/go7007-priv.h + create mode 100644 drivers/media/video/go7007/go7007-usb.c + create mode 100644 drivers/media/video/go7007/go7007-v4l2.c + create mode 100644 drivers/media/video/go7007/go7007.h + create mode 100644 drivers/media/video/go7007/saa7134-go7007.c + create mode 100644 drivers/media/video/go7007/snd-go7007.c + create mode 100644 drivers/media/video/go7007/wis-i2c.h + create mode 100644 drivers/media/video/go7007/wis-ov7640.c + create mode 100644 drivers/media/video/go7007/wis-saa7113.c + create mode 100644 drivers/media/video/go7007/wis-saa7115.c + create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c + create mode 100644 drivers/media/video/go7007/wis-tw2804.c + create mode 100644 drivers/media/video/go7007/wis-tw9903.c + create mode 100644 drivers/media/video/go7007/wis-uda1342.c + create mode 100644 drivers/misc/aectc/Makefile + create mode 100644 drivers/misc/aectc/aec_tc.c + create mode 100644 drivers/misc/aectc/aectc.h + create mode 100644 drivers/misc/aectc/read.c + create mode 100644 drivers/misc/aectc/write.c + create mode 100644 drivers/misc/me4000.c + create mode 100644 drivers/misc/me4000.h + create mode 100644 drivers/misc/xilinx_firm.h + create mode 100644 drivers/net/et131x/MODULE-PARAMETER.txt + create mode 100644 drivers/net/et131x/Makefile + create mode 100644 drivers/net/et131x/et1310_address_map.h + create mode 100644 drivers/net/et131x/et1310_eeprom.c + create mode 100644 drivers/net/et131x/et1310_eeprom.h + create mode 100644 drivers/net/et131x/et1310_jagcore.c + create mode 100644 drivers/net/et131x/et1310_jagcore.h + create mode 100644 drivers/net/et131x/et1310_mac.c + create mode 100644 drivers/net/et131x/et1310_mac.h + create mode 100644 drivers/net/et131x/et1310_phy.c + create mode 100644 drivers/net/et131x/et1310_phy.h + create mode 100644 drivers/net/et131x/et1310_pm.c + create mode 100644 drivers/net/et131x/et1310_pm.h + create mode 100644 drivers/net/et131x/et1310_rx.c + create mode 100644 drivers/net/et131x/et1310_rx.h + create mode 100644 drivers/net/et131x/et1310_tx.c + create mode 100644 drivers/net/et131x/et1310_tx.h + create mode 100644 drivers/net/et131x/et131x_adapter.h + create mode 100644 drivers/net/et131x/et131x_config.c + create mode 100644 drivers/net/et131x/et131x_config.h + create mode 100644 drivers/net/et131x/et131x_debug.c + create mode 100644 drivers/net/et131x/et131x_debug.h + create mode 100644 drivers/net/et131x/et131x_defs.h + create mode 100644 drivers/net/et131x/et131x_initpci.c + create mode 100644 drivers/net/et131x/et131x_initpci.h + create mode 100644 drivers/net/et131x/et131x_isr.c + create mode 100644 drivers/net/et131x/et131x_isr.h + create mode 100644 drivers/net/et131x/et131x_netdev.c + create mode 100644 drivers/net/et131x/et131x_netdev.h + create mode 100644 drivers/net/et131x/et131x_version.h + create mode 100644 drivers/net/slicoss/Makefile + create mode 100644 drivers/net/slicoss/gbdownload.h + create mode 100644 drivers/net/slicoss/gbrcvucode.h + create mode 100644 drivers/net/slicoss/oasisdbgdownload.h + create mode 100644 drivers/net/slicoss/oasisdownload.h + create mode 100644 drivers/net/slicoss/oasisrcvucode.h + create mode 100644 drivers/net/slicoss/slic.h + create mode 100644 drivers/net/slicoss/slic_os.h + create mode 100644 drivers/net/slicoss/slicbuild.h + create mode 100644 drivers/net/slicoss/slicdbg.h + create mode 100644 drivers/net/slicoss/slicdump.h + create mode 100644 drivers/net/slicoss/slichw.h + create mode 100644 drivers/net/slicoss/slicinc.h + create mode 100644 drivers/net/slicoss/slicoss.c + create mode 100644 drivers/net/usb/hso.c + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/image/f2255usb.h + create mode 100644 drivers/usb/image/s2255drv.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 fs/novfs/Makefile + create mode 100644 fs/novfs/commands.h + create mode 100644 fs/novfs/daemon.c + create mode 100644 fs/novfs/file.c + create mode 100644 fs/novfs/inode.c + create mode 100644 fs/novfs/nwcapi.c + create mode 100644 fs/novfs/nwcapi.h + create mode 100644 fs/novfs/nwerror.h + create mode 100644 fs/novfs/proc.c + create mode 100644 fs/novfs/profile.c + create mode 100644 fs/novfs/scope.c + create mode 100644 fs/novfs/vfs.h +Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP +Applying Fix MAX_ORDER config problem +Applying ldp-fix-1 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..3d375eba1767 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,603 @@ +Importing driver-core based on 2.6.25-rc9 +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core v2.6.25-rc9 +Switched to a new branch "quilt/driver-core" +$ git quiltimport --patches ../quilt/driver-core +kobject-catch-kobjects-that-are-not-initialized.patch +uio-kconfig-improvements.patch +uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch +uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch +uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch +uio-implement-a-uio-interface-for-the-smx-cryptengine.patch +uio-hold-a-reference-to-the-device-s-owner-while-the-device-is-open.patch +driver-core-memory-semaphore-to-mutex.patch +driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch +driver-core-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch +sysfs-small-header-file-cleanup-for-sysfs-n.patch +firmware-move-firmware_class-from-documentation-to-samples.patch +firmware-clean-up-samples-for-coding-style-issues.patch +pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch +power_state-remove-it-from-driver-core.patch +driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch +sysdev-detect-multiple-driver-registrations.patch +block-send-disk-change-event-for-rescan_partitions.patch +pm-handle-device-registrations-during-suspend-resume.patch +driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch +pm-fix-misuse-of-wakeup-flag-accessors-in-serial-core.patch +pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch +pm-convert-wakeup-flag-accessors-to-inline-functions.patch +driver-core-make-device_is_registered-work-for-class-devices.patch +sysfs-explicitly-include-required-header-file-slab.h.patch +kobject-replace-list_for_each-with-list_for_each_entry.patch +pm-remove-legacy-pm.patch +firmware-add-iscsi-ibft-support.patch +pm-remove-destroy_suspended_device.patch +sysfs-refill-attribute-buffer-when-reading-from-offset-0.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +driver-core-replace-remaining-__function__-occurrences.patch +memstick-convert-struct-class_device-to-struct-device.patch +ib-convert-struct-class_device-to-struct-device.patch +ib-rename-dev-to-srp_dev-in-srp_host-structure.patch +drm-remove-unused-dev_class.patch +scsi-convert-struct-class_device-to-struct-device.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing pci based on quilt/driver-core +$ git branch -D quilt/pci +Deleted branch quilt/pci. +$ git checkout -b quilt/pci quilt/driver-core +Switched to a new branch "quilt/pci" +$ git quiltimport --patches ../quilt/pci +pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch +pci-if-0-pci_assign_resource_fixed.patch +pci-remove-pci_find_present.patch +pci-remove-pci_get_device_reverse-from-calgary-driver.patch +ide-remove-ide-reverse-ide-core.patch +pci-remove-pci_get_device_reverse.patch +pci-clean-up-search.c-a-lot.patch +pci-hotplug-make-cpcihp-driver-use-modern-apis.patch +pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch +pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch +pci-make-no_pci_devices-use-the-pci_bus_type-list.patch +pci-add-is_added-flag-to-struct-pci_dev.patch +pci-remove-pcibios_fixup_ghosts.patch +pci-remove-parisc-consumer-of-the-pci-global_list.patch +pci-remove-global-list-of-pci-devices.patch +pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch +pci-if-0-pci_cleanup_aer_correct_error_status.patch +pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch +pci-remove-pci-routeirq-noise-from-dmesg.patch +pci-add-pci-express-aspm-support.patch +pci-add-generic-pci_enable_resources.patch +pci-x86-use-generic-pci_enable_resources.patch +pci-alpha-use-generic-pci_enable_resources.patch +pci-ia64-use-generic-pci_enable_resources.patch +pci-powerpc-use-generic-pci_enable_resources.patch +pci-ppc-use-generic-pci_enable_resources.patch +pci-parisc-use-generic-pci_enable_resources.patch +pci-iova-rb-tree-setup-tweak.patch +pci-simplify-quirk-debug-output.patch +pci-iommu-iotlb-flushing.patch +pci-expose-pci-vpd-through-sysfs.patch +pci-update-via-cx700-quirk.patch +pci-aerdrv_acpi.c-remove-unneeded-null-check.patch +pci-clean-up-resource-alignment-management.patch +pci-hotplug-fix-leaks-in-ibm-hot-plug-controller-driver-ibmphp_init_devno.patch +pci-hotplug-fakephp-return-success-not-enodev-when-bus-rescan-is-triggered.patch +pci-replace-remaining-__function__-occurrences.patch +.dotest/patch:167: space before tab in indent. + dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name); +warning: 1 line adds whitespace errors. +Importing usb based on quilt/pci +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/pci +Switched to a new branch "quilt/usb" +$ git quiltimport --patches ../quilt/usb +usb-obscure-maxon-bp3-usb-device-support-16d8-6280-for-option-driver.patch +usb-option.c-add-more-device-ids.patch +usb-support-more-huawei-data-card-product-ids.patch +usb-option-add-new-vendor-id-and-device-id-for-amoi-hsdpa-modem.patch +usb-remove-broken-usb-serial-num_endpoints-check.patch +usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch +usb-reorganize-code-in-hub.c.patch +usb-make-usb-persist-work-after-every-system-sleep.patch +usb-remove-config_usb_persist-setting.patch +.dotest/patch:225: space before tab in indent. + */ +warning: 1 line adds whitespace errors. +usb-check-serial-number-string-after-device-reset.patch +usb-enable-usb-persist-by-default.patch +checkpatch-usb_free_urb-can-take-null.patch +usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch +usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch +usb-microtek-remove-unused-semaphore.patch +usb-libusual-locking-cleanup.patch +usb-make-usb_storage_onetouch-available-with-pm.patch +usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch +usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch +usb-defines-for-usb-link-power-management-ecn.patch +usb-ehci-minor-cleanups.patch +usb-ohci-port-reset-paranoia-timeout.patch +usb-ehci-tolerates-some-buggy-devices.patch +usb-ehci-minor-soc-bus-glue-fixes.patch +usb-m66592-udc-reduce-size-of-data-structure.patch +usb-ehci-refactor-if-state-hc_state_halt.patch +usb-gadget-hangup-tty-on-g_serial-disconnect.patch +usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch +usb-cypress_m8-feature-buffer-fixes.patch +usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch +usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch +usb-cypress_m8-get-rid-of-pointless-null-check.patch +usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch +usb-misc-auerswald-cp_mutex-to-mutex.diff +usb-misc-auerswald-ccp_readmutex-to-mutex.diff +usb-misc-auerswald-ccp_mutex-to-mutex.diff +usb-minor-ehci-xitd-simplifications.patch +usb-usb-serial-prepare-for-bkl-push-down.patch +usb-ftdi_sio-note-missing-locking.patch +usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch +usb-iuu_phoenix-lock-priv-tiostatus-properly.patch +usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch +usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch +usb-io_ti-lock-mcr-and-msr-shadows-properly.patch +usb-use-div_round_up.patch +usb-io_ti.c-remove-unneeded-null-tty-check.patch +usb-partial-usb-embedded-host-support.patch +usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch +usb-ipaq-fix-devices-having-more-than-one-endpoint.patch +usb-remove-dev-power.power_state.patch +usb-ehci-paranoia-reject-large-control-transfers.patch +usb-cypress_m8-speed-handling.patch +drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch +usb-usb.h-reduce-syslog-clutter.patch +usb-standardize-inclusion-protection-and-add-where-missing.patch +usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch +usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch +usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-mdc800-support.patch +usb-remove-experimental-from-dynamic-usb-minor-allocation.patch +usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch +usb-a-couple-corrections-and-clarifications-in-usb-doc.patch +usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch +usbmon-restore-mmap.patch +usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch +usb-increase-cdc-acm-write-throughput.patch +usb-serial-sierra-clean-up.patch +usb-serial-sierra-c597-fix.patch +usb-serial-sierra-add-new-dev-group.patch +usb-add-usb-serial-spcp8x5-driver.patch +u132-hcd-fix-checkpatch-style-issues.patch +u132-hdc-semaphore-to-mutex.patch +usb-fix-comments-of-2-functions-in-hcd.c.patch +usb-serial-remove-obsolete-contact-addresses.patch +usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch +usb-g_printer-bugfixes.patch +usb-usb-storage-use-adaptive-dma-mask.patch +usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch +usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch +usb-ohci-fix-bug-in-controller-resume.patch +usb-convert-away-from-urb-status-in-xpad-driver.patch +usb-root-hubs-don-t-lie-about-their-number-of-tts.patch +usb-clarify-usage-of-hcd-suspend-resume-methods.patch +usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch +usb-replace-remaining-__pretty_function__-occurrences.patch +usb-rework-sysfs-removal-of-interface-files.patch +usb-gadget-section-fixes.patch +usb-dummy-hcd-use-dynamic-allocation-for-platform_devices.patch +usb-at91_udc-can-prefetch-data.patch +usb-ehci-shutdown-refactored.patch +usb-oti6858-fix-tcflsh-ioctl-handling.patch +usb-r8a66597-hcd-fix-interrupt-transfer-interval.patch +usb-r8a66597-hcd-fix-usb-device-connection-timing.patch +usb-r8a66597-hcd-add-support-for-sh7366-usb-host.patch +usb-add-extension-of-anchor-api-usb_unlink_anchored_urbs.patch +usb-remove-superfluous-depends-on-usb_serial-from-kconfig.patch +usb-update-comments-about-usb-driver-s-header.patch +usb-log-an-error-message-when-usb-enumeration-fails.patch +usb-ehci-qh-qtd-cleanup-comments.patch +usb-add-documentation-about-usb_anchor.patch +usb-option.c-correct-dtr-behaviour.patch +wusb-add-authenticated-bit-to-usb-dev.patch +.dotest/patch:19: space before tab in indent. + unsigned authenticated:1; +warning: 1 line adds whitespace errors. +usb-add-usb_dev_reset_delayed.patch +wusb-add-link-wusb-usb-dev.patch +wusb-teach-choose-address-about-wireless-devices.patch +wusb-devices-dont-use-a-set-address.patch +.dotest/patch:14: space before tab in indent. + /* +.dotest/patch:15: space before tab in indent. + * If device is WUSB, we already assigned an +.dotest/patch:16: space before tab in indent. + * unauthorized address in the Connect Ack sequence; +.dotest/patch:17: space before tab in indent. + * authorization will assign the final address. +.dotest/patch:18: space before tab in indent. + */ +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +wusb-make-ep0-reinit-available.patch +wusb-update-devnum.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 +usb-replace-remaining-__function__-occurrences.patch +.dotest/patch:2601: space before tab in indent. + dbg(1," %s : file is NULL", __func__); +.dotest/patch:2609: space before tab in indent. + dbg(1," %s : object is NULL", __func__); +.dotest/patch:8366: space before tab in indent. + dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); +.dotest/patch:8741: space before tab in indent. + dbg ("%s - Update complete 0x%x", __func__, status); +.dotest/patch:8805: space before tab in indent. + dbg ("%s - Error downloading operational code image", __func__); +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +usb-serial-more-fixes-and-groundwork-for-tty-changes.patch +.dotest/patch:345: space before tab in indent. + mct_u232_set_modem_ctrl(serial, priv->control_state); +warning: 1 line adds whitespace errors. +usb-remove-unnecessary-type-casting-of-urb-context.patch +usb-gotemp.patch +Importing device-mapper based on 2.6.25-rc7 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25-rc7 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --patches ../quilt/device-mapper +Importing i2c based on 2.6.25-rc9 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c v2.6.25-rc9 +Checking out files: 2% (17/691)
Checking out files: 3% (21/691)
Checking out files: 4% (28/691)
Checking out files: 5% (35/691)
Checking out files: 6% (42/691)
Checking out files: 7% (49/691)
Checking out files: 8% (56/691)
Checking out files: 9% (63/691)
Checking out files: 10% (70/691)
Checking out files: 11% (77/691)
Checking out files: 12% (83/691)
Checking out files: 13% (90/691)
Checking out files: 14% (97/691)
Checking out files: 14% (101/691)
Checking out files: 15% (104/691)
Checking out files: 16% (111/691)
Checking out files: 17% (118/691)
Checking out files: 18% (125/691)
Checking out files: 19% (132/691)
Checking out files: 20% (139/691)
Checking out files: 21% (146/691)
Checking out files: 22% (153/691)
Checking out files: 23% (159/691)
Checking out files: 24% (166/691)
Checking out files: 25% (173/691)
Checking out files: 26% (180/691)
Checking out files: 27% (187/691)
Checking out files: 28% (194/691)
Checking out files: 29% (201/691)
Checking out files: 30% (208/691)
Checking out files: 31% (215/691)
Checking out files: 32% (222/691)
Checking out files: 33% (229/691)
Checking out files: 34% (235/691)
Checking out files: 35% (242/691)
Checking out files: 36% (249/691)
Checking out files: 37% (256/691)
Checking out files: 38% (263/691)
Checking out files: 39% (270/691)
Checking out files: 40% (277/691)
Checking out files: 41% (284/691)
Checking out files: 42% (291/691)
Checking out files: 43% (298/691)
Checking out files: 44% (305/691)
Checking out files: 45% (311/691)
Checking out files: 46% (318/691)
Checking out files: 47% (325/691)
Checking out files: 48% (332/691)
Checking out files: 49% (339/691)
Checking out files: 50% (346/691)
Checking out files: 51% (353/691)
Checking out files: 52% (360/691)
Checking out files: 53% (367/691)
Checking out files: 54% (374/691)
Checking out files: 55% (381/691)
Checking out files: 56% (387/691)
Checking out files: 57% (394/691)
Checking out files: 58% (401/691)
Checking out files: 59% (408/691)
Checking out files: 60% (415/691)
Checking out files: 61% (422/691)
Checking out files: 62% (429/691)
Checking out files: 63% (436/691)
Checking out files: 63% (439/691)
Checking out files: 64% (443/691)
Checking out files: 65% (450/691)
Checking out files: 66% (457/691)
Checking out files: 67% (463/691)
Checking out files: 68% (470/691)
Checking out files: 69% (477/691)
Checking out files: 70% (484/691)
Checking out files: 71% (491/691)
Checking out files: 72% (498/691)
Checking out files: 73% (505/691)
Checking out files: 74% (512/691)
Checking out files: 75% (519/691)
Checking out files: 76% (526/691)
Checking out files: 77% (533/691)
Checking out files: 78% (539/691)
Checking out files: 79% (546/691)
Checking out files: 80% (553/691)
Checking out files: 81% (560/691)
Checking out files: 82% (567/691)
Checking out files: 83% (574/691)
Checking out files: 84% (581/691)
Checking out files: 85% (588/691)
Checking out files: 86% (595/691)
Checking out files: 87% (602/691)
Checking out files: 88% (609/691)
Checking out files: 89% (615/691)
Checking out files: 90% (622/691)
Checking out files: 91% (629/691)
Checking out files: 92% (636/691)
Checking out files: 93% (643/691)
Checking out files: 94% (650/691)
Checking out files: 95% (657/691)
Checking out files: 96% (664/691)
Checking out files: 97% (671/691)
Checking out files: 98% (678/691)
Checking out files: 99% (685/691)
Checking out files: 100% (691/691)
Checking out files: 100% (691/691), done. +Switched to a new branch "quilt/i2c" +$ git quiltimport --patches ../quilt/i2c +i2c-new-co-maintainer.patch +i2c-no-algos-in-kconfig.patch +i2c-pca-01-removing-trailing-whitespace.patch +i2c-pca-02-extension-of-pca-algorithm.patch +i2c-pca-03-platform-driver.patch +i2c-ibm_iic-01-change-log-levels.patch +i2c-ibm_iic-02-of-platform.patch +i2c-dev-split-i2cdev_ioctl.patch +i2c-bus-driver-for-sh7760-soc.patch +i2c-replace-remaining-__FUNCTION__-occurrences.patch +i2c-remove-whitespaces-in-busses-Kconfig.patch +i2c-bfin-twi-01-add-repeated-start.patch +i2c-bfin-twi-02-support-multiport-controllers.patch +i2c-bfin-twi-03-add-pin-mux-operation.patch +i2c-bfin-twi-04-driver-description.patch +i2c-bfin-twi-05-use-simpler-comment-headers.patch +i2c-bfin-twi-06-add-ADSP-BF52x-support.patch +i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch +i2c-scx200_acb-dont-use-0-as-null-pointer.patch +i2c-superh-mobile-i2c-bus-controller-v5.patch +i2c-fix-platform-driver-hotplug-coldplug.patch +i2c-isp1301_omap-convert-to-new-style-1.patch +Importing kernel-doc based on 2.6.25-rc8 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc v2.6.25-rc8 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --patches ../quilt/kernel-doc +docsrc-spi-split-fix.patch +kconfig_allconfig_docv2.patch +move-smart-config.patch +kerndoc-dup-section-name-err.patch +docbook-klocking-tryfunc.patch +kerndoc-trailing-info.patch +doc-dma-api-txt.patch +Importing ide based on commit 7180c4c9e09888db0a188f729c96c6d7bd61fa83 +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide 7180c4c9e09888db0a188f729c96c6d7bd61fa83 +Switched to a new branch "quilt/ide" +$ git quiltimport --patches ../quilt/ide +ide-remove-ide-reverse-ide-core.patch +ide-generic-set-hwif-chipset.patch +ide-fix-ide_find_port.patch +ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch +ide-acpi-add-missing-drive-acpidata-zeroing.patch +ide-factor-out-cable-detection-from-ide_init_port.patch +ide-remove-ide-devices-from-proc-ide-before-unregistering-them.patch +ide-factor-out-unregistering-devices-from-ide_unregister.patch +ide-factor-out-devices-init-from-ide_init_port_data.patch +ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch +ide-rework-powermac-media-bay-support-take-2.patch +ide-remove-dead-obsolete-busproc-method.patch +ide-add-warm-plug-support-for-ide-devices-take-2.patch +ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch +ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch +ide-remove-config_blk_dev_hd_ide-config-option-take-2.patch +ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters-take-2.patch +ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-3.patch +ide-remove-hold-field-from-ide_hwif_t-take-2.patch +ide-remove-init_hwif_default.patch +ide-remove-ide_init_hwif_ports.patch +ide-floppy-remove-struct-idefloppy_id_gcw.patch +ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch +ide-remove-ide_-_reg-macros.patch +ide-tape-move-all-struct-and-other-defs-at-the-top.patch +ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch +ide-add-generic-packet-command-representation-ide_atapi_pc.patch +ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch +ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch +ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch +ide-floppy-rename-end_request-handler-properly.patch +ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch +ide-scsi-do-non-atomic-pc-flags-testing.patch +ide-pmac-remove-dead-code.patch +ppc-hdpu-remove-dead-ide-code.patch +ppc-ppc4xx-remove-ppc_ide_md-hooks.patch +ppc-pmac-remove-ppc_ide_md-hooks.patch +ppc-mpc8xx-remove-ppc_ide_md-hooks.patch +ppc-lopec-remove-ppc_ide_md-hooks.patch +ppc-sandpoint-remove-ppc_ide_md-hooks.patch +ppc-pplus-remove-ppc_ide_md-ide_init_hwif-hook.patch +ppc-remove-ppc_ide_md-ide_init_hwif-hook.patch +ppc-dont-include-linux-ide-h.patch +ppc-pmac-remove-no-longer-needed-ide-quirk.patch +ide-add-config_ide_arch_obsolete_defaults-take-2.patch +ide-remove-config_ide_arch_obsolete_init.patch +ide-remove-ide_default_io_ctl-macro.patch +ide-remove-ppc-ifdef-from-init_ide_data.patch +ide-add-ide-4drives-host-driver-take-3.patch +cmd640-cleanup-setup_device_ptrs.patch +cmd640-init-hwif-io_ports-irq-explicitly.patch +ide-limit-legacy-vlb-host-drivers-to-alpha-x86-and-mips.patch +ide-init-hwif-io_ports-irq-explicitly-in-legacy-vlb-host-drivers.patch +ide-remove-needless-hwif-irq-check-from-ide_hwif_configure.patch +ide-remove-obsoleted-idex-noprobe-kernel-parameter-take-2.patch +ide-move-default-ide-ports-setup-to-ide_generic-host-driver.patch +ide-remove-ide_init_default_irq-macro.patch +ide-cleanup-ide_match_hwif.patch +ide-cleanup-ide_find_port.patch +swarm-use-ide_find_port.patch +ide-pmac-dynamically-allocate-struct-pmac_ide_hwif-instances-take-2.patch +ide-pmac-use-ide_find_port.patch +sgiioc4-use-ide_find_port.patch +au1xxx-ide-use-ide_find_port.patch +cmd640-remove-cmd_drives.patch +cmd640-use-ide_find_port.patch +scc_pata-store-hwif-pointer-in-struct-scc_ports.patch +umc8672-dont-use-ide_hwifs-in-umc_set_pio_mode.patch +ht6560b-use-driver-name-for-resource-allocation.patch +qd65xx-return-error-value-in-qd_probe.patch +ide-ide_hflag_bootable-to-ide_hflag_non_bootable.patch +ide-use-div_round_up.patch +ide-remove-pio-downgrade-quirk.patch +ide-merge-ide_match_hwif-and-ide_find_port.patch +ide-use-ide_find_port-in-legacy-vlb-host-drivers-take-2.patch +ide-generic-use-ide_find_port-take-3.patch +ide-unexport-ide_hwifs.patch +ide-disk-add-proc_idedisk_read_smart-helper.patch +ide-disk-fix-issues-found-by-checkpatch-pl.patch +ide-cd-remove-the-internal-64k-buffer.patch +remove-include-linux-hdsmart-h.patch +ide_platform-fix-resources-handling.patch +delkin_cb-fix-resources-handling.patch +bast-ide-fix-resources-reservation.patch +mpc8xx-make-m8xx_ide_init_ports-return-an-error-value.patch +mpc8xx-fix-resources-reservation.patch +falconide-fix-resources-reservation-take-2.patch +ide-remove-ide_hflag_cy82c693-host-flag.patch +ide-remove-hwif-straight8-flag.patch +ide-coding-style-fixes-to-drivers_ide_setup-pci-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_tc86c001-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_slc90e66-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_sis5513-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_jmicron-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_generic-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_umc8672-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_ide-4drives-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-proc-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-pnp-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_opti621-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_cmd640-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_hd-c.patch +ide-coding-style-fixes-to-drivers_ide_legacy_ali14xx-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-floppy-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_it8213-c.patch +ide-coding-style-fixes-to-drivers_ide_pci_cy82c693-c.patch +ide-coding-style-fixes-to-drivers_ide_ide-cd-c.patch +ide-cd-replace-__function__-with-__func__.patch +ide-cd-put-proc-related-functions-together-under-single-ifdef.patch +qd65xx-selectproc-method-needs-to-be-always-used.patch +qd65xx-use-ide_hflag_single-host-flag.patch +it821x-fix-kzalloc-failure-handling.patch +sis5513-fail-early-for-unsupported-chipsets.patch +ide-sanitize-handling-of-ide_hflag_no_set_mode-host-flag.patch +ide-add-struct-ide_port_ops-take-2.patch +ide-cd-include-proper-headers.patch +ide-cd-put-all-proc-related-code-at-one-place.patch +ide-cd-fixup-comments.patch +ide-cd-shorten-lines-longer-than-80-columns.patch +ide-cd-fix-remaining-checkpatch-pl-issues.patch +ide-remove-noprobe-field-from-ide_hwif_t.patch +ide-add-ide_legacy_device_add-helper.patch +ide-use-ide_legacy_device_add-for-qd65xx-take-2.patch +qd65xx-cleanup-qd_probe.patch +ide-pnp-manage-io-resources-in-driver.patch +ide-cs-manage-io-resources-in-driver.patch +ide-register-ports-with-non-present-devices-for-warm-plug.patch +ide-remove-ide_hwif_release_regions.patch +ide-generic-manage-io-resources-in-driver.patch +ide-4drives-manage-io-resources-in-driver.patch +ide_arm-manage-io-resources-in-driver.patch +ide-add-ide_legacy_init_one-helper.patch +ide-manage-io-resources-in-ide_legacy_init_one.patch +cmd640-manage-io-resources-in-driver.patch +ide-manage-resources-for-pci-devices-in-ide_pci_enable-take-2.patch +ide-remove-ide_hwif_request_regions.patch +ide-cleanup-setting-hwif-mmio-flag.patch +ide-tape-remove-idetape_pipeline_active.patch +ide-replace-remaining-__function__-occurrences.patch +ide-remove-extra-field-from-struct-ide_port_info.patch +ide-remove-ide_dma_iobase.patch +ide-remove-cds-field-from-ide_hwif_t.patch +ide-dont-display-bios-settings-in-ide_setup_dma.patch +pdc202xx_old-remove-init_dma_pdc202xx.patch +alim15x3-skip-dma-initialization-completely-on-revs-lt-0x20.patch +ide-move-ide_setup_dma-call-out-from-init_dma-method.patch +ide-export-ide_allocate_dma_engine.patch +ide-factor-out-setting-pci-bus-mastering-from-ide_hwif_setup_dma.patch +ide-cleanup-ide_setup_dma.patch +au1xxx-ide-fix-mwdma-support.patch +ide-do-complete-dma-setup-in-init_dma-method-take-2.patch +ide-pmac-use-init_dma-method.patch +icside-use-init_dma-method.patch +sgiioc4-use-init_dma-method.patch +palm_bk3710-use-init_dma-method.patch +au1xxx-ide-use-init_dma-method.patch +sl82c105-check-bridge-revision-in-sl82c105_init_one.patch +ide-add-ide_hflag_serialize_dma-host-flag.patch +ide-add-struct-ide_dma_ops-take-3.patch +ide-constify-struct-ide_dma_ops.patch +ide-tape-remove-tape-cache_stage.patch +ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_write_request.patch +ide-tape-remove-pipeline-speed_control-calculations.patch +ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_read_request.patch +ide-add-ignore_cable-kernel-parameter-take-2.patch +ide-remove-obsoleted-idex-serialize-kernel-parameter.patch +ide-remove-obsoleted-idex-reset-kernel-parameter.patch +ide-remove-obsoleted-idex-kernel-parameters.patch +ide-remove-obsoleted-hdx-noautotune-kernel-parameter.patch +ide-tape-remove-unused-parameter-from-idetape_copy_stage_to_user.patch +ide-tape-remove-unused-parameter-from-idetape_copy_stage_from_user.patch +ide-tape-remove-pipeline-specific-code-in-idetape_space_over_filemarks.patch +ide-tape-remove-idetape_pipeline_size.patch +ide-tape-remove-idetape_remove_stage_head.patch +ide-tape-remove-pipeline-specific-code-from-idetape_end_request.patch +ide-tape-unwrap-idetape_queue_pc_tail.patch +ide-tape-remove-remaining-pipeline-functionality.patch +ide-tape-remove-pipelined-mode-tape-control-flags.patch +ide-tape-remove-pipeline-specific-members-from-struct-ide_tape_obj.patch +ide-tape-remove-pipelined-mode-parameters.patch +ide-tape-remove-misc-references-to-pipelined-operation-in-the-comments.patch +ide-tape-remove-pipelined-mode-description-from-documentation_ide_ide-tape-txt.patch +ide-tape-remove-comments-markup-from-documentation_ide_ide-tape-txt.patch +ide-add-vlb-pci_clock-parameter.patch +ide-mark-idebus-kernel-parameter-as-obsoleted-take-2.patch +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-always-auto-tune-pio-in-legacy-vlb-host-drivers.patch +cmd640-always-auto-tune-pio.patch +ide-remove-ide_hflag_no_autotune-host-flag.patch +ide-remove-obsoleted-hdx-autotune-kernel-parameter.patch +ide-add-nodma-noflush-noprobe-nowerr-parameters.patch +ide-add-cdrom-and-chs-parameters.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +gayle-add-doubler-parameter.patch +ide-add-noacpi-acpigtf-acpionboot-parameters.patch +ide-remove-obsoleted-ide-parameters.patch +mpc8xx-ide-use-ide_find_port.patch +ide-sanitize-ide_unregister-usage.patch +ide-make-ide_unregister-take-ide_hwif_t-as-an-argument.patch +ide-fix-hwif-s-initialization.patch +ide-make-ide_hwifs-static.patch +ide-make-32-bit-io-support-for-ide-vlb-available-only-when-it-makes-sense.patch +ide-add-struct-ide_io_ports.patch +ide-tape-improve-buffer-allocation-strategy.patch +ide-tape-mv-tape-stage_size-tape-buffer_size.patch +ide-tape-mv-tape-pages_per_stage-tape-pages_per_buffer.patch +ide-tape-improve-buffer-pages-freeing-strategy.patch +ide-remove-_proc_ide_ali.patch +ide-remove-now-unused-ide_pci_create_host_proc.patch +ide-tape-make-__idetape_discard_read_pipeline-of-type-void.patch +ide-tape-mv-idetape_discard_read_pipeline-ide_tape_discard_merge_buffer.patch +ide-tape-mv-idetape_empty_write_pipeline-ide_tape_flush_merge_buffer.patch +ide-tape-mv-tape-merge_stage_size-tape-merge_bh_size.patch +ide-tape-remove-tape-merge_stage.patch +ide-tape-fix-mem-leak.patch +falconide-q40ide-add-atapi_-put_bytes-and-ata_-put_data-methods-take-2.patch +ide-merge-atapi_-put_bytes-and-ata_-put_data-methods.patch +scc_pata-add-in-out-put_data-methods.patch +au1xxx-ide-add-in-out-put_data-methods.patch +ide-h8300-add-in-out-put_data-methods.patch +ide-add-ide_hflag_mmio-host-flag-take-2.patch +ide-remove-inswl-and-outswl-methods.patch +siimage-do-clocking-register-posting-earlier-in-setup_mmio_siimage.patch +siimage-add-sil_-io-ops.patch +siimage-remove-proc_reports_siimage.patch +ide-always-use-outbsync-method-for-executing-commands.patch +ide-floppy-tape-scsi-400ns-delay-is-required-after-executing-the-command.patch +ide-add-ide_execute_pkt_cmd-helper.patch +Importing m68k based on e315c121a858499d84dc88c499046b9f10bb61ec +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k e315c121a858499d84dc88c499046b9f10bb61ec +Switched to a new branch "quilt/m68k" +$ git quiltimport --patches ../quilt/m68k +m68k-use-KBUILD_DEFCONFIG.diff +m68k-update-defconfig-for-2.6.25-rc8.diff +m68k-convert-access_ok-to-inline-func.diff +m68k-FB_HP300-does-not-need-FB_CFB_FILLRECT.diff +m68k-whippet-serial-no-longer-exists.diff +m68k-vme_scc-globals.diff +m68k-silence-BUG-can-return-warnings.diff +Importing ldp based on quilt/usb +$ git branch -D quilt/ldp +Deleted branch quilt/ldp. +$ git checkout -b quilt/ldp quilt/usb +Switched to a new branch "quilt/ldp" +$ git quiltimport --patches ../quilt/ldp +wusb-add-the-wireless-usb-stack-to-linux.patch +.dotest/patch:4822: space before tab in indent. + const struct firmware *fw; +.dotest/patch:5182: space before tab in indent. + const struct firmware *fw; +.dotest/patch:7364: space before tab in indent. + "Dropping\n", untd_hdr->reserved1); +.dotest/patch:8660: space before tab in indent. + /* +.dotest/patch:14172: space before tab in indent. + whcrc->umc_dev = umc_dev; +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +wusb-add-the-usb-wireless-core-code.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +usb-add-sensoray-2255-v4l-driver.patch +dvb-add-firesat-driver.patch +usb-add-option-hso-driver.patch +video-add-the-go7007-driver.patch +.dotest/patch:1896: space before tab in indent. + 0xd3), +.dotest/patch:1911: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:1915: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:2125: space before tab in indent. + (1 << 14) | (1 << 9) : 0) | +.dotest/patch:2128: space before tab in indent. + GO7007_SENSOR_CONFIG_MASK), +warning: 5 lines add whitespace errors. +net-add-alacritech-slicoss-driver.patch +.dotest/patch:58: trailing whitespace. +obj-$(CONFIG_SLICOSS) += slicoss.o
+.dotest/patch:24450: space before tab in indent. + ushort DramRomFn; // 14 Dram/Rom function +warning: 2 lines add whitespace errors. +input-add-appleir-driver.patch +add-me4000-pci-data-collection-driver.patch +novfs-add-the-novell-filesystem-client-kernel-module.patch +aectc-add-the-aectc-driver.patch +net-add-et131x-driver.patch +.dotest/patch:2767: space before tab in indent. + /* bits 1:0 are equal to 1 */ +.dotest/patch:2822: space before tab in indent. + /* I2C write complete */ +.dotest/patch:7854: space before tab in indent. + pRxLocal->local_psr_full.bits.psr_full_wrap) { +.dotest/patch:12027: space before tab in indent. + * I need to call this function twice to get my card in a +warning: 4 lines add whitespace errors. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5c7eb9177d17 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080415 |