git not pulling origin staging-next cleanly.
Gary Rookard
garyrookard at gmail.com
Sat Mar 15 01:51:30 UTC 2014
On Sat, 15 Mar 2014, Greg KH wrote:
> On Wed, Mar 12, 2014 at 04:10:36PM -0400, Gary Rookard wrote:
>> Hi,
>> Could this problem be local machine (git-1.9.0-1) or dare I say it,
>> a tmp server-side melt-down of sorts?
>> I've tried everything nothing seams to work.
>
> What have you typed, exactly, and what has git responded with?
>
--
Ok, this is it from the very top, the commands are same as every other
time I've done it.
[gary at arch-tuxx Kernel-Hacks]$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Cloning into 'staging'...
remote: Counting objects: 3449057, done.
remote: Compressing objects: 100% (519453/519453), done.
remote: Total 3449057 (delta 2903733), reused 3445005 (delta 2900373)
Receiving objects: 100% (3449057/3449057), 722.83 MiB | 3.36 MiB/s, done.
Resolving deltas: 100% (2903733/2903733), done.
Checking connectivity... done.
Checking out files: 100% (45941/45941), done.
[gary at arch-tuxx Kernel-Hacks]$ cd staging
[gary at arch-tuxx staging]$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
[gary at arch-tuxx staging]$ git pull origin staging-next
>From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* branch staging-next -> FETCH_HEAD
Removing drivers/staging/sm7xxfb/sm7xxfb.c
Removing drivers/staging/sm7xxfb/sm7xx.h
Removing drivers/staging/sm7xxfb/TODO
Removing drivers/staging/sm7xxfb/Makefile
Removing drivers/staging/sm7xxfb/Kconfig
Removing drivers/staging/sb105x/sb_ser_core.h
Removing drivers/staging/sb105x/sb_pci_mp.h
Removing drivers/staging/sb105x/sb_pci_mp.c
Removing drivers/staging/sb105x/sb_mp_register.h
Removing drivers/staging/sb105x/Makefile
Removing drivers/staging/sb105x/Kconfig
Removing drivers/staging/rtl8192u/r819xU_HTType.h
Removing drivers/staging/rtl8192u/r819xU_HTGen.h
Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.h
Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.c
Removing drivers/staging/rtl8192u/ieee80211/rtl_crypto.h
Removing drivers/staging/rtl8192u/ieee80211/proc.c
Removing drivers/staging/rtl8192u/ieee80211/michael_mic.c
Removing drivers/staging/rtl8192u/ieee80211/internal.h
Removing drivers/staging/rtl8192u/ieee80211/digest.c
Removing drivers/staging/rtl8192u/ieee80211/crypto_compat.h
Removing drivers/staging/rtl8192u/ieee80211/compress.c
Removing drivers/staging/rtl8192u/ieee80211/cipher.c
Removing drivers/staging/rtl8192u/ieee80211/autoload.c
Removing drivers/staging/rtl8192u/ieee80211/arc4.c
Removing drivers/staging/rtl8192u/ieee80211/aes.c
Removing drivers/staging/rtl8192u/ieee80211/EndianFree.h
Removing drivers/staging/rtl8188eu/include/nic_spec.h
Removing drivers/staging/rtl8188eu/include/ip.h
Removing drivers/staging/rtl8188eu/include/ioctl_cfg80211.h
Removing drivers/staging/rtl8188eu/include/if_ether.h
Removing drivers/staging/rtl8188eu/include/h2clbk.h
Removing drivers/staging/rtl8188eu/include/ethernet.h
Removing drivers/staging/rtl8188eu/hal/odm_interface.c
Removing drivers/staging/imx-drm/imx-fbdev.c
Removing drivers/staging/imx-drm/imx-fb.c
Removing drivers/staging/echo/TODO
Removing drivers/staging/dgap/downld.c
Removing drivers/staging/dgap/digi.h
Removing drivers/staging/dgap/dgap_types.h
Removing drivers/staging/dgap/dgap_tty.h
Removing drivers/staging/dgap/dgap_tty.c
Removing drivers/staging/dgap/dgap_trace.h
Removing drivers/staging/dgap/dgap_trace.c
Removing drivers/staging/dgap/dgap_sysfs.h
Removing drivers/staging/dgap/dgap_sysfs.c
Removing drivers/staging/dgap/dgap_pci.h
Removing drivers/staging/dgap/dgap_parse.h
Removing drivers/staging/dgap/dgap_parse.c
Removing drivers/staging/dgap/dgap_kcompat.h
Removing drivers/staging/dgap/dgap_fep5.h
Removing drivers/staging/dgap/dgap_fep5.c
Removing drivers/staging/dgap/dgap_driver.h
Removing drivers/staging/dgap/dgap_driver.c
Removing drivers/staging/dgap/dgap_downld.h
Removing drivers/staging/dgap/dgap_conf.h
Removing drivers/staging/cxt1e1/ossiRelease.c
Auto-merging drivers/staging/cxt1e1/linux.c
CONFLICT (content): Merge conflict in drivers/staging/cxt1e1/linux.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
[gary at arch-tuxx staging]$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
modified: Documentation/devicetree/bindings/arm/atmel-adc.txt
new file: Documentation/devicetree/bindings/graph.txt
new file:
Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
new file:
Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
modified:
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
new file:
Documentation/devicetree/bindings/staging/imx-drm/hdmi.txt
modified:
Documentation/devicetree/bindings/staging/imx-drm/ldb.txt
modified: MAINTAINERS
modified: arch/arm/boot/dts/imx51-apf51dev.dts
modified: arch/arm/boot/dts/imx51-babbage.dts
modified: arch/arm/boot/dts/imx51.dtsi
modified: arch/arm/boot/dts/imx53-m53evk.dts
modified: arch/arm/boot/dts/imx53-mba53.dts
modified: arch/arm/boot/dts/imx53-qsb.dts
modified: arch/arm/boot/dts/imx53.dtsi
modified: arch/arm/boot/dts/imx6dl.dtsi
modified: arch/arm/boot/dts/imx6q.dtsi
modified: arch/arm/boot/dts/imx6qdl.dtsi
modified: drivers/iio/accel/bma180.c
modified: drivers/iio/adc/Kconfig
modified: drivers/iio/adc/Makefile
modified: drivers/iio/adc/max1363.c
modified: drivers/iio/adc/ti_am335x_adc.c
modified: drivers/iio/adc/twl6030-gpadc.c
new file: drivers/iio/adc/vf610_adc.c
modified: drivers/iio/adc/viperboard_adc.c
new file: drivers/iio/adc/xilinx-xadc-core.c
new file: drivers/iio/adc/xilinx-xadc-events.c
new file: drivers/iio/adc/xilinx-xadc.h
modified: drivers/iio/buffer_cb.c
modified: drivers/iio/dac/ad7303.c
modified: drivers/iio/dac/max517.c
modified: drivers/iio/dac/mcp4725.c
modified: drivers/iio/humidity/Kconfig
modified: drivers/iio/humidity/Makefile
new file: drivers/iio/humidity/si7005.c
modified: drivers/iio/imu/Kconfig
modified: drivers/iio/imu/adis16400_core.c
modified: drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
modified: drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
modified: drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
modified: drivers/iio/industrialio-buffer.c
modified: drivers/iio/industrialio-core.c
modified: drivers/iio/industrialio-event.c
modified: drivers/iio/industrialio-trigger.c
modified: drivers/iio/light/Kconfig
modified: drivers/iio/light/Makefile
modified: drivers/iio/light/adjd_s311.c
new file: drivers/iio/light/hid-sensor-prox.c
new file: drivers/iio/light/ltr501.c
modified: drivers/iio/light/tcs3472.c
modified: drivers/iio/magnetometer/ak8975.c
modified: drivers/iio/magnetometer/mag3110.c
modified: drivers/iio/pressure/Kconfig
modified: drivers/iio/pressure/Makefile
new file: drivers/iio/pressure/hid-sensor-press.c
modified: drivers/iio/pressure/mpl3115.c
modified: drivers/iio/pressure/st_pressure.h
modified: drivers/iio/pressure/st_pressure_core.c
modified: drivers/iio/pressure/st_pressure_i2c.c
modified: drivers/iio/pressure/st_pressure_spi.c
modified: drivers/media/i2c/adv7343.c
modified: drivers/media/i2c/mt9p031.c
modified: drivers/media/i2c/s5k5baf.c
modified: drivers/media/i2c/tvp514x.c
modified: drivers/media/i2c/tvp7002.c
modified: drivers/media/platform/exynos4-is/fimc-is.c
modified: drivers/media/platform/exynos4-is/media-dev.c
modified: drivers/media/platform/exynos4-is/mipi-csis.c
modified: drivers/media/v4l2-core/v4l2-of.c
modified: drivers/misc/Kconfig
modified: drivers/misc/Makefile
renamed: drivers/staging/echo/Kconfig ->
drivers/misc/echo/Kconfig
renamed: drivers/staging/echo/Makefile ->
drivers/misc/echo/Makefile
renamed: drivers/staging/echo/echo.c ->
drivers/misc/echo/echo.c
renamed: drivers/staging/echo/echo.h ->
drivers/misc/echo/echo.h
renamed: drivers/staging/echo/fir.h -> drivers/misc/echo/fir.h
renamed: drivers/staging/echo/oslec.h ->
drivers/misc/echo/oslec.h
modified: drivers/of/base.c
modified: drivers/staging/Kconfig
modified: drivers/staging/Makefile
modified: drivers/staging/android/Kconfig
modified: drivers/staging/android/android_alarm.h
modified: drivers/staging/android/ashmem.h
modified: drivers/staging/android/binder.c
modified: drivers/staging/android/binder.h
modified: drivers/staging/android/binder_trace.h
modified: drivers/staging/android/ion/ion.c
modified: drivers/staging/android/ion/ion_cma_heap.c
modified: drivers/staging/android/ion/ion_dummy_driver.c
modified: drivers/staging/android/ion/ion_heap.c
modified: drivers/staging/android/ion/ion_page_pool.c
modified: drivers/staging/android/ion/ion_priv.h
modified: drivers/staging/android/ion/ion_system_heap.c
modified: drivers/staging/android/ion/tegra/tegra_ion.c
modified: drivers/staging/android/lowmemorykiller.c
modified: drivers/staging/android/sw_sync.h
modified: drivers/staging/android/sync.h
modified: drivers/staging/android/timed_gpio.c
modified: drivers/staging/android/timed_output.h
new file: drivers/staging/android/uapi/android_alarm.h
renamed: drivers/staging/android/ashmem.h ->
drivers/staging/android/uapi/ashmem.h
renamed: drivers/staging/android/binder.h ->
drivers/staging/android/uapi/binder.h
new file: drivers/staging/android/uapi/sw_sync.h
new file: drivers/staging/android/uapi/sync.h
modified: drivers/staging/bcm/Bcmchar.c
modified: drivers/staging/bcm/DDRInit.c
modified: drivers/staging/bcm/InterfaceInit.c
modified: drivers/staging/bcm/Qos.c
modified: drivers/staging/ced1401/ced_ioc.c
modified: drivers/staging/ced1401/ced_ioctl.h
modified: drivers/staging/ced1401/usb1401.c
modified: drivers/staging/comedi/comedi_fops.c
modified: drivers/staging/comedi/comedidev.h
modified: drivers/staging/comedi/drivers.c
modified: drivers/staging/comedi/drivers/8255_pci.c
modified:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
modified:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
modified:
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
modified: drivers/staging/comedi/drivers/addi_apci_1500.c
modified: drivers/staging/comedi/drivers/addi_apci_3xxx.c
modified: drivers/staging/comedi/drivers/adl_pci6208.c
modified: drivers/staging/comedi/drivers/adl_pci7x3x.c
modified: drivers/staging/comedi/drivers/adl_pci9111.c
modified: drivers/staging/comedi/drivers/adl_pci9118.c
modified: drivers/staging/comedi/drivers/adq12b.c
modified: drivers/staging/comedi/drivers/adv_pci1710.c
modified: drivers/staging/comedi/drivers/adv_pci1723.c
modified: drivers/staging/comedi/drivers/adv_pci_dio.c
modified: drivers/staging/comedi/drivers/aio_aio12_8.c
modified: drivers/staging/comedi/drivers/aio_iiro_16.c
modified: drivers/staging/comedi/drivers/amplc_dio200_common.c
modified: drivers/staging/comedi/drivers/amplc_pc236.c
modified: drivers/staging/comedi/drivers/amplc_pc263.c
modified: drivers/staging/comedi/drivers/amplc_pci224.c
modified: drivers/staging/comedi/drivers/amplc_pci230.c
modified: drivers/staging/comedi/drivers/amplc_pci263.c
modified: drivers/staging/comedi/drivers/cb_das16_cs.c
modified: drivers/staging/comedi/drivers/cb_pcidas.c
modified: drivers/staging/comedi/drivers/cb_pcidas64.c
modified: drivers/staging/comedi/drivers/cb_pcidda.c
modified: drivers/staging/comedi/drivers/cb_pcimdas.c
modified: drivers/staging/comedi/drivers/cb_pcimdda.c
modified: drivers/staging/comedi/drivers/comedi_bond.c
modified: drivers/staging/comedi/drivers/comedi_test.c
modified: drivers/staging/comedi/drivers/contec_pci_dio.c
modified: drivers/staging/comedi/drivers/daqboard2000.c
modified: drivers/staging/comedi/drivers/das08.c
modified: drivers/staging/comedi/drivers/das16.c
modified: drivers/staging/comedi/drivers/das16m1.c
modified: drivers/staging/comedi/drivers/das800.c
modified: drivers/staging/comedi/drivers/dmm32at.c
modified: drivers/staging/comedi/drivers/dt2811.c
modified: drivers/staging/comedi/drivers/dt2814.c
modified: drivers/staging/comedi/drivers/dt2815.c
modified: drivers/staging/comedi/drivers/dt282x.c
modified: drivers/staging/comedi/drivers/dt3000.c
modified: drivers/staging/comedi/drivers/dyna_pci10xx.c
modified: drivers/staging/comedi/drivers/fl512.c
modified: drivers/staging/comedi/drivers/icp_multi.c
modified: drivers/staging/comedi/drivers/ii_pci20kc.c
modified: drivers/staging/comedi/drivers/jr3_pci.c
modified: drivers/staging/comedi/drivers/ke_counter.c
modified: drivers/staging/comedi/drivers/me_daq.c
modified: drivers/staging/comedi/drivers/mf6x4.c
modified: drivers/staging/comedi/drivers/mite.h
modified: drivers/staging/comedi/drivers/mpc624.c
modified: drivers/staging/comedi/drivers/multiq3.c
modified: drivers/staging/comedi/drivers/ni_660x.c
modified: drivers/staging/comedi/drivers/ni_670x.c
modified: drivers/staging/comedi/drivers/ni_at_a2150.c
modified: drivers/staging/comedi/drivers/ni_atmio16d.c
modified: drivers/staging/comedi/drivers/ni_daq_700.c
modified: drivers/staging/comedi/drivers/ni_labpc.c
modified: drivers/staging/comedi/drivers/ni_mio_common.c
modified: drivers/staging/comedi/drivers/ni_pcimio.c
modified: drivers/staging/comedi/drivers/ni_tio.h
modified: drivers/staging/comedi/drivers/pcl711.c
modified: drivers/staging/comedi/drivers/pcl812.c
modified: drivers/staging/comedi/drivers/pcl816.c
modified: drivers/staging/comedi/drivers/pcl818.c
modified: drivers/staging/comedi/drivers/pcm3724.c
modified: drivers/staging/comedi/drivers/pcmad.c
modified: drivers/staging/comedi/drivers/pcmmio.c
modified: drivers/staging/comedi/drivers/plx9080.h
modified: drivers/staging/comedi/drivers/poc.c
modified: drivers/staging/comedi/drivers/rtd520.c
modified: drivers/staging/comedi/drivers/rti800.c
modified: drivers/staging/comedi/drivers/s526.c
modified: drivers/staging/comedi/drivers/s626.c
modified: drivers/staging/comedi/drivers/skel.c
modified: drivers/staging/comedi/drivers/ssv_dnp.c
modified: drivers/staging/comedi/drivers/usbduxfast.c
modified: drivers/staging/comedi/kcomedilib/kcomedilib_main.c
modified: drivers/staging/comedi/range.c
modified: drivers/staging/crystalhd/bcm_70012_regs.h
modified: drivers/staging/crystalhd/crystalhd_hw.c
modified: drivers/staging/crystalhd/crystalhd_lnx.c
modified: drivers/staging/crystalhd/crystalhd_lnx.h
modified: drivers/staging/crystalhd/crystalhd_misc.c
modified: drivers/staging/crystalhd/crystalhd_misc.h
modified: drivers/staging/cxt1e1/Makefile
modified: drivers/staging/cxt1e1/comet.c
modified: drivers/staging/cxt1e1/comet_tables.c
modified: drivers/staging/cxt1e1/functions.c
modified: drivers/staging/cxt1e1/hwprobe.c
modified: drivers/staging/cxt1e1/musycc.c
deleted: drivers/staging/cxt1e1/ossiRelease.c
modified: drivers/staging/cxt1e1/pmc93x6_eeprom.c
modified: drivers/staging/cxt1e1/pmcc4.h
modified: drivers/staging/cxt1e1/pmcc4_drv.c
modified: drivers/staging/cxt1e1/pmcc4_private.h
modified: drivers/staging/cxt1e1/sbeproc.c
modified: drivers/staging/dgap/Makefile
new file: drivers/staging/dgap/dgap.c
new file: drivers/staging/dgap/dgap.h
deleted: drivers/staging/dgap/dgap_conf.h
deleted: drivers/staging/dgap/dgap_downld.h
deleted: drivers/staging/dgap/dgap_driver.c
deleted: drivers/staging/dgap/dgap_driver.h
deleted: drivers/staging/dgap/dgap_fep5.c
deleted: drivers/staging/dgap/dgap_fep5.h
deleted: drivers/staging/dgap/dgap_kcompat.h
deleted: drivers/staging/dgap/dgap_parse.c
deleted: drivers/staging/dgap/dgap_parse.h
deleted: drivers/staging/dgap/dgap_pci.h
deleted: drivers/staging/dgap/dgap_sysfs.c
deleted: drivers/staging/dgap/dgap_sysfs.h
deleted: drivers/staging/dgap/dgap_trace.c
deleted: drivers/staging/dgap/dgap_trace.h
deleted: drivers/staging/dgap/dgap_tty.c
deleted: drivers/staging/dgap/dgap_tty.h
deleted: drivers/staging/dgap/dgap_types.h
deleted: drivers/staging/dgap/digi.h
deleted: drivers/staging/dgap/downld.c
modified: drivers/staging/dgnc/dgnc_driver.c
modified: drivers/staging/dgnc/dgnc_mgmt.c
modified: drivers/staging/dgrp/dgrp_sysfs.c
modified: drivers/staging/dgrp/dgrp_tty.c
deleted: drivers/staging/echo/TODO
modified: drivers/staging/et131x/et131x.c
modified: drivers/staging/frontier/alphatrack.c
modified: drivers/staging/frontier/tranzport.c
modified: drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
modified: drivers/staging/gdm724x/gdm_usb.c
modified: drivers/staging/gdm72xx/gdm_wimax.c
new file: drivers/staging/gs_fpgaboot/Kconfig
new file: drivers/staging/gs_fpgaboot/Makefile
new file: drivers/staging/gs_fpgaboot/README
new file: drivers/staging/gs_fpgaboot/TODO
new file: drivers/staging/gs_fpgaboot/gs_fpgaboot.c
new file: drivers/staging/gs_fpgaboot/gs_fpgaboot.h
new file: drivers/staging/gs_fpgaboot/io.c
new file: drivers/staging/gs_fpgaboot/io.h
modified: drivers/staging/iio/Documentation/iio_utils.h
new file: drivers/staging/iio/Documentation/lsiio.c
modified: drivers/staging/iio/accel/sca3000.h
modified: drivers/staging/iio/accel/sca3000_core.c
modified: drivers/staging/iio/accel/sca3000_ring.c
modified: drivers/staging/iio/adc/ad799x.h
modified: drivers/staging/iio/adc/ad799x_core.c
modified: drivers/staging/iio/adc/mxs-lradc.c
modified: drivers/staging/iio/resolver/ad2s1210.c
modified: drivers/staging/imx-drm/Kconfig
modified: drivers/staging/imx-drm/Makefile
modified: drivers/staging/imx-drm/TODO
modified: drivers/staging/imx-drm/imx-drm-core.c
modified: drivers/staging/imx-drm/imx-drm.h
deleted: drivers/staging/imx-drm/imx-fb.c
deleted: drivers/staging/imx-drm/imx-fbdev.c
modified: drivers/staging/imx-drm/imx-hdmi.c
modified: drivers/staging/imx-drm/imx-ldb.c
modified: drivers/staging/imx-drm/imx-tve.c
modified: drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h
modified: drivers/staging/imx-drm/ipu-v3/ipu-dc.c
modified: drivers/staging/imx-drm/ipu-v3/ipu-di.c
modified: drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c
modified: drivers/staging/imx-drm/ipuv3-crtc.c
modified: drivers/staging/imx-drm/ipuv3-plane.c
modified: drivers/staging/imx-drm/parallel-display.c
modified: drivers/staging/line6/driver.c
modified: drivers/staging/line6/driver.h
modified: drivers/staging/line6/midi.c
modified: drivers/staging/line6/usbdefs.h
modified: drivers/staging/lustre/include/linux/libcfs/curproc.h
modified:
drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
modified:
drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
modified: drivers/staging/lustre/include/linux/lnet/lib-lnet.h
modified: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
modified: drivers/staging/lustre/lnet/lnet/api-ni.c
modified: drivers/staging/lustre/lnet/lnet/config.c
modified: drivers/staging/lustre/lnet/lnet/lib-ptl.c
modified: drivers/staging/lustre/lnet/lnet/router_proc.c
modified: drivers/staging/lustre/lnet/selftest/console.c
modified: drivers/staging/lustre/lustre/fld/fld_internal.h
modified: drivers/staging/lustre/lustre/include/cl_object.h
modified: drivers/staging/lustre/lustre/include/ioctl.h
modified: drivers/staging/lustre/lustre/include/lclient.h
modified:
drivers/staging/lustre/lustre/include/linux/lustre_acl.h
modified:
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
modified:
drivers/staging/lustre/lustre/include/lustre/lustre_user.h
modified: drivers/staging/lustre/lustre/include/lustre_cfg.h
modified: drivers/staging/lustre/lustre/include/lustre_disk.h
modified: drivers/staging/lustre/lustre/include/lustre_dlm.h
modified:
drivers/staging/lustre/lustre/include/lustre_dlm_flags.h
modified: drivers/staging/lustre/lustre/include/lustre_export.h
modified: drivers/staging/lustre/lustre/include/lustre_fid.h
modified: drivers/staging/lustre/lustre/include/lustre_import.h
modified: drivers/staging/lustre/lustre/include/lustre_linkea.h
modified: drivers/staging/lustre/lustre/include/lustre_mdc.h
modified: drivers/staging/lustre/lustre/include/lustre_net.h
modified: drivers/staging/lustre/lustre/include/lustre_quota.h
modified: drivers/staging/lustre/lustre/include/lustre_sec.h
modified: drivers/staging/lustre/lustre/include/md_object.h
modified: drivers/staging/lustre/lustre/include/obd.h
modified: drivers/staging/lustre/lustre/include/obd_class.h
modified: drivers/staging/lustre/lustre/include/obd_support.h
modified: drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
modified: drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
modified: drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
modified: drivers/staging/lustre/lustre/ldlm/ldlm_request.c
modified: drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
modified:
drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c
modified: drivers/staging/lustre/lustre/libcfs/libcfs_string.c
modified: drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
modified:
drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
modified:
drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
modified: drivers/staging/lustre/lustre/libcfs/nidstrings.c
modified: drivers/staging/lustre/lustre/libcfs/workitem.c
modified: drivers/staging/lustre/lustre/llite/dcache.c
modified: drivers/staging/lustre/lustre/llite/dir.c
modified: drivers/staging/lustre/lustre/llite/file.c
modified: drivers/staging/lustre/lustre/llite/llite_close.c
modified: drivers/staging/lustre/lustre/llite/llite_internal.h
modified: drivers/staging/lustre/lustre/llite/llite_lib.c
modified: drivers/staging/lustre/lustre/llite/llite_mmap.c
modified: drivers/staging/lustre/lustre/llite/llite_nfs.c
modified: drivers/staging/lustre/lustre/llite/lloop.c
modified: drivers/staging/lustre/lustre/llite/namei.c
modified: drivers/staging/lustre/lustre/llite/rw.c
modified: drivers/staging/lustre/lustre/llite/statahead.c
modified: drivers/staging/lustre/lustre/llite/vvp_io.c
modified: drivers/staging/lustre/lustre/llite/xattr.c
modified: drivers/staging/lustre/lustre/llite/xattr_cache.c
modified: drivers/staging/lustre/lustre/lmv/lmv_intent.c
modified: drivers/staging/lustre/lustre/lmv/lmv_obd.c
modified: drivers/staging/lustre/lustre/lmv/lproc_lmv.c
modified: drivers/staging/lustre/lustre/lov/lov_ea.c
modified: drivers/staging/lustre/lustre/lov/lov_io.c
modified: drivers/staging/lustre/lustre/lov/lov_obd.c
modified: drivers/staging/lustre/lustre/lov/lov_object.c
modified: drivers/staging/lustre/lustre/lov/lovsub_dev.c
modified: drivers/staging/lustre/lustre/lvfs/lvfs_linux.c
modified: drivers/staging/lustre/lustre/mdc/mdc_internal.h
modified: drivers/staging/lustre/lustre/mdc/mdc_lib.c
modified: drivers/staging/lustre/lustre/mdc/mdc_locks.c
modified: drivers/staging/lustre/lustre/mdc/mdc_reint.c
modified: drivers/staging/lustre/lustre/mdc/mdc_request.c
modified: drivers/staging/lustre/lustre/mgc/mgc_request.c
modified: drivers/staging/lustre/lustre/obdclass/cl_io.c
modified: drivers/staging/lustre/lustre/obdclass/cl_object.c
modified: drivers/staging/lustre/lustre/obdclass/genops.c
modified:
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
modified: drivers/staging/lustre/lustre/obdclass/llog_cat.c
modified: drivers/staging/lustre/lustre/obdclass/llog_lvfs.c
modified: drivers/staging/lustre/lustre/obdclass/llog_osd.c
modified: drivers/staging/lustre/lustre/obdclass/local_storage.c
modified:
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
modified: drivers/staging/lustre/lustre/obdclass/lu_object.c
modified: drivers/staging/lustre/lustre/obdclass/md_attrs.c
modified: drivers/staging/lustre/lustre/obdclass/obd_config.c
modified: drivers/staging/lustre/lustre/obdclass/obd_mount.c
modified: drivers/staging/lustre/lustre/obdclass/obdo.c
modified: drivers/staging/lustre/lustre/obdecho/echo_client.c
modified: drivers/staging/lustre/lustre/osc/osc_cache.c
modified: drivers/staging/lustre/lustre/osc/osc_io.c
modified: drivers/staging/lustre/lustre/osc/osc_page.c
modified: drivers/staging/lustre/lustre/osc/osc_quota.c
modified: drivers/staging/lustre/lustre/ptlrpc/client.c
modified: drivers/staging/lustre/lustre/ptlrpc/events.c
modified:
drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
modified: drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
modified:
drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c
modified: drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
modified:
drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c
modified: drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c
modified: drivers/staging/lustre/lustre/ptlrpc/import.c
modified: drivers/staging/lustre/lustre/ptlrpc/layout.c
modified: drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
modified: drivers/staging/lustre/lustre/ptlrpc/niobuf.c
modified: drivers/staging/lustre/lustre/ptlrpc/nrs.c
modified: drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
modified: drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
modified: drivers/staging/lustre/lustre/ptlrpc/recover.c
modified: drivers/staging/lustre/lustre/ptlrpc/sec.c
modified: drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
modified: drivers/staging/lustre/lustre/ptlrpc/sec_config.c
modified: drivers/staging/lustre/lustre/ptlrpc/service.c
modified: drivers/staging/lustre/lustre/ptlrpc/wiretest.c
modified: drivers/staging/media/cxd2099/cxd2099.c
modified: drivers/staging/media/go7007/go7007-loader.c
modified: drivers/staging/media/lirc/lirc_imon.c
modified: drivers/staging/media/lirc/lirc_parallel.c
modified: drivers/staging/media/lirc/lirc_sasem.c
modified: drivers/staging/media/sn9c102/sn9c102_core.c
modified: drivers/staging/media/solo6x10/solo6x10-core.c
modified: drivers/staging/media/solo6x10/solo6x10-tw28.c
modified: drivers/staging/netlogic/xlr_net.c
new file: drivers/staging/nokia_h4p/Kconfig
new file: drivers/staging/nokia_h4p/Makefile
new file: drivers/staging/nokia_h4p/TODO
new file: drivers/staging/nokia_h4p/hci_h4p.h
new file: drivers/staging/nokia_h4p/nokia_core.c
new file: drivers/staging/nokia_h4p/nokia_fw-bcm.c
new file: drivers/staging/nokia_h4p/nokia_fw-csr.c
new file: drivers/staging/nokia_h4p/nokia_fw-ti1273.c
new file: drivers/staging/nokia_h4p/nokia_fw.c
new file: drivers/staging/nokia_h4p/nokia_uart.c
modified: drivers/staging/nvec/nvec.c
modified: drivers/staging/nvec/nvec_ps2.c
modified: drivers/staging/octeon-usb/octeon-hcd.c
modified: drivers/staging/octeon/ethernet-defines.h
modified: drivers/staging/octeon/ethernet-mdio.c
modified: drivers/staging/octeon/ethernet-mem.c
modified: drivers/staging/octeon/ethernet-rgmii.c
modified: drivers/staging/octeon/ethernet-tx.c
modified: drivers/staging/octeon/ethernet.c
modified: drivers/staging/olpc_dcon/olpc_dcon.h
modified: drivers/staging/ozwpan/ozhcd.c
modified: drivers/staging/ozwpan/ozpd.c
modified: drivers/staging/ozwpan/ozpd.h
modified: drivers/staging/ozwpan/ozproto.c
modified: drivers/staging/ozwpan/ozproto.h
modified: drivers/staging/panel/panel.c
new file: drivers/staging/rtl8187se/Module.symvers
modified: drivers/staging/rtl8187se/ieee80211/dot11d.h
modified: drivers/staging/rtl8187se/ieee80211/ieee80211.h
modified:
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
modified:
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
modified: drivers/staging/rtl8187se/r8180.h
modified: drivers/staging/rtl8187se/r8180_core.c
modified: drivers/staging/rtl8187se/r8180_dm.c
modified: drivers/staging/rtl8187se/r8180_rtl8225.h
modified: drivers/staging/rtl8187se/r8180_rtl8225z2.c
modified: drivers/staging/rtl8187se/r8180_wx.c
modified: drivers/staging/rtl8187se/r8185b_init.c
modified: drivers/staging/rtl8188eu/Kconfig
modified: drivers/staging/rtl8188eu/Makefile
modified: drivers/staging/rtl8188eu/TODO
modified: drivers/staging/rtl8188eu/core/rtw_ap.c
modified: drivers/staging/rtl8188eu/core/rtw_br_ext.c
modified: drivers/staging/rtl8188eu/core/rtw_cmd.c
modified: drivers/staging/rtl8188eu/core/rtw_debug.c
modified: drivers/staging/rtl8188eu/core/rtw_ieee80211.c
modified: drivers/staging/rtl8188eu/core/rtw_io.c
modified: drivers/staging/rtl8188eu/core/rtw_ioctl_set.c
modified: drivers/staging/rtl8188eu/core/rtw_led.c
modified: drivers/staging/rtl8188eu/core/rtw_mlme.c
modified: drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
modified: drivers/staging/rtl8188eu/core/rtw_mp.c
modified: drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c
modified: drivers/staging/rtl8188eu/core/rtw_p2p.c
modified: drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
modified: drivers/staging/rtl8188eu/core/rtw_recv.c
modified: drivers/staging/rtl8188eu/core/rtw_security.c
modified: drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
modified: drivers/staging/rtl8188eu/core/rtw_wlan_util.c
modified: drivers/staging/rtl8188eu/core/rtw_xmit.c
modified: drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
modified: drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
modified: drivers/staging/rtl8188eu/hal/hal_intf.c
modified: drivers/staging/rtl8188eu/hal/odm.c
modified: drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c
deleted: drivers/staging/rtl8188eu/hal/odm_interface.c
modified: drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
modified: drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
modified: drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
modified: drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
modified: drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c
modified: drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
modified: drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
modified: drivers/staging/rtl8188eu/hal/usb_halinit.c
modified: drivers/staging/rtl8188eu/hal/usb_ops_linux.c
modified: drivers/staging/rtl8188eu/include/drv_types.h
deleted: drivers/staging/rtl8188eu/include/ethernet.h
deleted: drivers/staging/rtl8188eu/include/h2clbk.h
deleted: drivers/staging/rtl8188eu/include/if_ether.h
deleted: drivers/staging/rtl8188eu/include/ioctl_cfg80211.h
deleted: drivers/staging/rtl8188eu/include/ip.h
deleted: drivers/staging/rtl8188eu/include/nic_spec.h
modified: drivers/staging/rtl8188eu/include/odm_interface.h
modified: drivers/staging/rtl8188eu/include/osdep_service.h
modified: drivers/staging/rtl8188eu/include/recv_osdep.h
modified: drivers/staging/rtl8188eu/include/rtl8188e_hal.h
modified: drivers/staging/rtl8188eu/include/rtl8188e_recv.h
modified: drivers/staging/rtl8188eu/include/rtw_debug.h
modified: drivers/staging/rtl8188eu/include/rtw_io.h
modified: drivers/staging/rtl8188eu/include/rtw_ioctl.h
modified: drivers/staging/rtl8188eu/include/rtw_mlme.h
modified: drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
modified: drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
modified: drivers/staging/rtl8188eu/include/rtw_recv.h
modified: drivers/staging/rtl8188eu/include/rtw_xmit.h
modified: drivers/staging/rtl8188eu/include/wifi.h
modified: drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
modified: drivers/staging/rtl8188eu/os_dep/mlme_linux.c
modified: drivers/staging/rtl8188eu/os_dep/os_intfs.c
modified: drivers/staging/rtl8188eu/os_dep/osdep_service.c
modified: drivers/staging/rtl8188eu/os_dep/recv_linux.c
modified: drivers/staging/rtl8188eu/os_dep/rtw_android.c
modified: drivers/staging/rtl8188eu/os_dep/usb_intf.c
modified: drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
modified: drivers/staging/rtl8188eu/os_dep/xmit_linux.c
modified: drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
modified: drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
modified: drivers/staging/rtl8192e/rtllib_tx.c
deleted: drivers/staging/rtl8192u/ieee80211/EndianFree.h
deleted: drivers/staging/rtl8192u/ieee80211/aes.c
deleted: drivers/staging/rtl8192u/ieee80211/arc4.c
deleted: drivers/staging/rtl8192u/ieee80211/autoload.c
deleted: drivers/staging/rtl8192u/ieee80211/cipher.c
deleted: drivers/staging/rtl8192u/ieee80211/compress.c
deleted: drivers/staging/rtl8192u/ieee80211/crypto_compat.h
deleted: drivers/staging/rtl8192u/ieee80211/digest.c
modified: drivers/staging/rtl8192u/ieee80211/ieee80211.h
modified: drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
modified: drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
modified: drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
deleted: drivers/staging/rtl8192u/ieee80211/internal.h
deleted: drivers/staging/rtl8192u/ieee80211/michael_mic.c
deleted: drivers/staging/rtl8192u/ieee80211/proc.c
deleted: drivers/staging/rtl8192u/ieee80211/rtl_crypto.h
deleted: drivers/staging/rtl8192u/ieee80211/scatterwalk.c
deleted: drivers/staging/rtl8192u/ieee80211/scatterwalk.h
modified: drivers/staging/rtl8192u/r8192U_core.c
deleted: drivers/staging/rtl8192u/r819xU_HTGen.h
deleted: drivers/staging/rtl8192u/r819xU_HTType.h
modified: drivers/staging/rtl8712/ieee80211.c
modified: drivers/staging/rtl8712/os_intfs.c
modified: drivers/staging/rtl8712/osdep_service.h
modified: drivers/staging/rtl8712/rtl8712_recv.c
modified: drivers/staging/rtl8712/rtl871x_cmd.c
modified: drivers/staging/rtl8712/rtl871x_security.c
modified: drivers/staging/rtl8821ae/base.c
modified: drivers/staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c
modified: drivers/staging/rtl8821ae/btcoexist/habtc8723a1ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtc8192e1ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtc8192e2ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtc8723a2ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtc8723b1ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtc8723b2ant.c
modified: drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c
modified: drivers/staging/rtl8821ae/core.c
modified: drivers/staging/rtl8821ae/core.h
modified: drivers/staging/rtl8821ae/debug.c
modified: drivers/staging/rtl8821ae/debug.h
modified: drivers/staging/rtl8821ae/efuse.c
modified: drivers/staging/rtl8821ae/pci.c
modified: drivers/staging/rtl8821ae/pci.h
modified: drivers/staging/rtl8821ae/ps.c
modified: drivers/staging/rtl8821ae/regd.c
modified: drivers/staging/rtl8821ae/regd.h
modified: drivers/staging/rtl8821ae/rtl8821ae/dm.c
modified: drivers/staging/rtl8821ae/rtl8821ae/fw.c
modified: drivers/staging/rtl8821ae/rtl8821ae/hal_bt_coexist.h
modified: drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c
modified: drivers/staging/rtl8821ae/rtl8821ae/hw.c
modified: drivers/staging/rtl8821ae/rtl8821ae/phy.c
modified: drivers/staging/rtl8821ae/rtl8821ae/phy.h
modified: drivers/staging/rtl8821ae/rtl8821ae/pwrseq.h
modified: drivers/staging/rtl8821ae/rtl8821ae/pwrseqcmd.c
modified: drivers/staging/rtl8821ae/rtl8821ae/reg.h
modified: drivers/staging/rtl8821ae/rtl8821ae/sw.c
modified: drivers/staging/rtl8821ae/rtl8821ae/trx.c
modified: drivers/staging/rtl8821ae/wifi.h
modified: drivers/staging/rts5139/ms.c
modified: drivers/staging/rts5139/rts51x.c
modified: drivers/staging/rts5139/rts51x_fop.c
modified: drivers/staging/rts5139/rts51x_fop.h
modified: drivers/staging/rts5139/rts51x_scsi.c
modified: drivers/staging/rts5139/sd.c
modified: drivers/staging/rts5139/xd.c
modified: drivers/staging/rts5208/ms.c
modified: drivers/staging/rts5208/rtsx.c
modified: drivers/staging/rts5208/rtsx_card.c
modified: drivers/staging/rts5208/rtsx_scsi.c
modified: drivers/staging/rts5208/rtsx_transport.c
deleted: drivers/staging/sb105x/Kconfig
deleted: drivers/staging/sb105x/Makefile
deleted: drivers/staging/sb105x/sb_mp_register.h
deleted: drivers/staging/sb105x/sb_pci_mp.c
deleted: drivers/staging/sb105x/sb_pci_mp.h
deleted: drivers/staging/sb105x/sb_ser_core.h
modified: drivers/staging/sbe-2t3e3/2t3e3.h
modified: drivers/staging/sbe-2t3e3/ctrl.c
modified: drivers/staging/sbe-2t3e3/ctrl.h
modified: drivers/staging/sbe-2t3e3/dc.c
modified: drivers/staging/sbe-2t3e3/intr.c
modified: drivers/staging/sbe-2t3e3/maps.c
modified: drivers/staging/sbe-2t3e3/module.c
modified: drivers/staging/sbe-2t3e3/netdev.c
modified: drivers/staging/sep/sep_crypto.c
modified: drivers/staging/sep/sep_main.c
modified: drivers/staging/serqt_usb2/serqt_usb2.c
modified: drivers/staging/silicom/bp_mod.h
modified: drivers/staging/silicom/bpctl_mod.c
modified: drivers/staging/silicom/bypasslib/bp_ioctl.h
modified: drivers/staging/silicom/bypasslib/libbp_sd.h
modified: drivers/staging/slicoss/README
renamed: drivers/staging/slicoss/README ->
drivers/staging/slicoss/TODO
modified: drivers/staging/slicoss/slic.h
modified: drivers/staging/slicoss/slicoss.c
deleted: drivers/staging/sm7xxfb/Kconfig
deleted: drivers/staging/sm7xxfb/Makefile
deleted: drivers/staging/sm7xxfb/TODO
deleted: drivers/staging/sm7xxfb/sm7xx.h
deleted: drivers/staging/sm7xxfb/sm7xxfb.c
modified: drivers/staging/tidspbridge/Kconfig
modified: drivers/staging/tidspbridge/core/io_sm.c
modified: drivers/staging/tidspbridge/core/tiomap3430_pwr.c
modified: drivers/staging/tidspbridge/dynload/tramp.c
modified: drivers/staging/tidspbridge/rmgr/dbdcd.c
modified: drivers/staging/tidspbridge/rmgr/drv.c
modified: drivers/staging/tidspbridge/rmgr/nldr.c
modified: drivers/staging/tidspbridge/rmgr/node.c
new file: drivers/staging/unisys/Documentation/overview.txt
new file: drivers/staging/unisys/Documentation/proc-entries.txt
new file: drivers/staging/unisys/Kconfig
new file: drivers/staging/unisys/MAINTAINERS
new file: drivers/staging/unisys/Makefile
new file: drivers/staging/unisys/TODO
new file: drivers/staging/unisys/channels/Kconfig
new file: drivers/staging/unisys/channels/Makefile
new file: drivers/staging/unisys/channels/channel.c
new file: drivers/staging/unisys/channels/chanstub.c
new file: drivers/staging/unisys/channels/chanstub.h
new file:
drivers/staging/unisys/common-spar/include/channels/channel.h
new file:
drivers/staging/unisys/common-spar/include/channels/channel_guid.h
new file:
drivers/staging/unisys/common-spar/include/channels/controlframework.h
new file:
drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
new file:
drivers/staging/unisys/common-spar/include/channels/diagchannel.h
new file:
drivers/staging/unisys/common-spar/include/channels/iochannel.h
new file:
drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
new file:
drivers/staging/unisys/common-spar/include/controlvmcompletionstatus.h
new file:
drivers/staging/unisys/common-spar/include/diagnostics/appos_subsystems.h
new file:
drivers/staging/unisys/common-spar/include/iovmcall_gnuc.h
new file:
drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h
new file: drivers/staging/unisys/common-spar/include/version.h
new file:
drivers/staging/unisys/common-spar/include/vmcallinterface.h
new file: drivers/staging/unisys/include/commontypes.h
new file: drivers/staging/unisys/include/guestlinuxdebug.h
new file: drivers/staging/unisys/include/guidutils.h
new file: drivers/staging/unisys/include/periodic_work.h
new file: drivers/staging/unisys/include/procobjecttree.h
new file: drivers/staging/unisys/include/sparstop.h
new file: drivers/staging/unisys/include/timskmod.h
new file: drivers/staging/unisys/include/timskmodutils.h
new file: drivers/staging/unisys/include/uisqueue.h
new file: drivers/staging/unisys/include/uisthread.h
new file: drivers/staging/unisys/include/uisutils.h
new file: drivers/staging/unisys/include/uniklog.h
new file: drivers/staging/unisys/include/vbushelper.h
new file: drivers/staging/unisys/uislib/Kconfig
new file: drivers/staging/unisys/uislib/Makefile
new file: drivers/staging/unisys/uislib/uislib.c
new file: drivers/staging/unisys/uislib/uisqueue.c
new file: drivers/staging/unisys/uislib/uisthread.c
new file: drivers/staging/unisys/uislib/uisutils.c
new file: drivers/staging/unisys/virthba/Kconfig
new file: drivers/staging/unisys/virthba/Makefile
new file: drivers/staging/unisys/virthba/virthba.c
new file: drivers/staging/unisys/virthba/virthba.h
new file: drivers/staging/unisys/virtpci/Kconfig
new file: drivers/staging/unisys/virtpci/Makefile
new file: drivers/staging/unisys/virtpci/virtpci.c
new file: drivers/staging/unisys/virtpci/virtpci.h
new file: drivers/staging/unisys/visorchannel/Kconfig
new file: drivers/staging/unisys/visorchannel/Makefile
new file: drivers/staging/unisys/visorchannel/globals.h
new file: drivers/staging/unisys/visorchannel/visorchannel.h
new file:
drivers/staging/unisys/visorchannel/visorchannel_funcs.c
new file:
drivers/staging/unisys/visorchannel/visorchannel_main.c
new file: drivers/staging/unisys/visorchipset/Kconfig
new file: drivers/staging/unisys/visorchipset/Makefile
new file: drivers/staging/unisys/visorchipset/controlvm.h
new file: drivers/staging/unisys/visorchipset/controlvm_direct.c
new file: drivers/staging/unisys/visorchipset/file.c
new file: drivers/staging/unisys/visorchipset/file.h
new file: drivers/staging/unisys/visorchipset/filexfer.c
new file: drivers/staging/unisys/visorchipset/filexfer.h
new file: drivers/staging/unisys/visorchipset/globals.h
new file: drivers/staging/unisys/visorchipset/parser.c
new file: drivers/staging/unisys/visorchipset/parser.h
new file: drivers/staging/unisys/visorchipset/testing.h
new file: drivers/staging/unisys/visorchipset/visorchipset.h
new file:
drivers/staging/unisys/visorchipset/visorchipset_main.c
new file:
drivers/staging/unisys/visorchipset/visorchipset_umode.h
new file: drivers/staging/unisys/visorutil/Kconfig
new file: drivers/staging/unisys/visorutil/Makefile
new file: drivers/staging/unisys/visorutil/charqueue.c
new file: drivers/staging/unisys/visorutil/charqueue.h
new file: drivers/staging/unisys/visorutil/easyproc.c
new file: drivers/staging/unisys/visorutil/easyproc.h
new file: drivers/staging/unisys/visorutil/memregion.h
new file: drivers/staging/unisys/visorutil/memregion_direct.c
new file: drivers/staging/unisys/visorutil/periodic_work.c
new file: drivers/staging/unisys/visorutil/procobjecttree.c
new file: drivers/staging/unisys/visorutil/visorkmodutils.c
modified: drivers/staging/usbip/stub.h
modified: drivers/staging/usbip/stub_dev.c
modified: drivers/staging/usbip/stub_main.c
modified: drivers/staging/usbip/stub_rx.c
new file: drivers/staging/usbip/uapi/usbip.h
modified: drivers/staging/usbip/usbip_common.c
modified: drivers/staging/usbip/usbip_common.h
modified: drivers/staging/usbip/userspace/README
modified: drivers/staging/usbip/userspace/configure.ac
modified: drivers/staging/usbip/userspace/libsrc/Makefile.am
new file: drivers/staging/usbip/userspace/libsrc/list.h
new file: drivers/staging/usbip/userspace/libsrc/sysfs_utils.c
new file: drivers/staging/usbip/userspace/libsrc/sysfs_utils.h
modified: drivers/staging/usbip/userspace/libsrc/usbip_common.c
modified: drivers/staging/usbip/userspace/libsrc/usbip_common.h
modified:
drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
modified:
drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h
modified: drivers/staging/usbip/userspace/libsrc/vhci_driver.c
modified: drivers/staging/usbip/userspace/libsrc/vhci_driver.h
modified: drivers/staging/usbip/userspace/src/Makefile.am
modified: drivers/staging/usbip/userspace/src/usbip_attach.c
modified: drivers/staging/usbip/userspace/src/usbip_bind.c
modified: drivers/staging/usbip/userspace/src/usbip_detach.c
modified: drivers/staging/usbip/userspace/src/usbip_list.c
modified: drivers/staging/usbip/userspace/src/usbip_network.h
modified: drivers/staging/usbip/userspace/src/usbip_unbind.c
modified: drivers/staging/usbip/userspace/src/usbipd.c
modified: drivers/staging/usbip/userspace/src/utils.c
modified: drivers/staging/usbip/vhci_hcd.c
modified: drivers/staging/usbip/vhci_sysfs.c
modified: drivers/staging/vt6655/aes_ccmp.c
modified: drivers/staging/vt6655/desc.h
modified: drivers/staging/vt6655/dpc.c
modified: drivers/staging/vt6655/key.c
modified: drivers/staging/vt6655/mac.c
modified: drivers/staging/vt6655/mac.h
modified: drivers/staging/vt6655/michael.c
modified: drivers/staging/vt6655/michael.h
modified: drivers/staging/vt6655/rxtx.c
modified: drivers/staging/vt6656/80211hdr.h
modified: drivers/staging/vt6656/card.h
modified: drivers/staging/vt6656/device.h
modified: drivers/staging/vt6656/dpc.c
modified: drivers/staging/vt6656/int.c
modified: drivers/staging/vt6656/int.h
modified: drivers/staging/vt6656/iwctl.c
modified: drivers/staging/vt6656/mac.c
modified: drivers/staging/vt6656/mac.h
modified: drivers/staging/vt6656/main_usb.c
modified: drivers/staging/vt6656/power.c
modified: drivers/staging/vt6656/rxtx.c
modified: drivers/staging/vt6656/usbpipe.c
modified: drivers/staging/vt6656/wcmd.c
modified: drivers/staging/vt6656/wcmd.h
modified: drivers/staging/vt6656/wmgr.c
modified: drivers/staging/winbond/wb35rx.c
modified: drivers/staging/wlags49_h2/dhf.c
modified: drivers/staging/wlags49_h2/hcf.c
modified: drivers/staging/wlags49_h2/sta_h2.c
modified: drivers/staging/wlags49_h2/wl_main.c
modified: drivers/staging/wlags49_h2/wl_util.c
modified: drivers/staging/wlags49_h2/wl_wext.c
modified: drivers/staging/wlan-ng/cfg80211.c
modified: drivers/staging/wlan-ng/hfa384x.h
modified: drivers/staging/wlan-ng/p80211mgmt.h
modified: drivers/staging/wlan-ng/p80211netdev.c
modified: drivers/staging/wlan-ng/prism2fw.c
modified: drivers/staging/xgifb/XGI_main_26.c
modified: drivers/usb/core/devio.c
modified: drivers/usb/core/generic.c
modified: drivers/usb/core/hub.c
modified: drivers/usb/core/hub.h
modified: drivers/usb/core/message.c
modified: drivers/usb/core/usb.h
modified: include/linux/hid-sensor-ids.h
modified: include/linux/iio/iio.h
new file: include/linux/of_graph.h
new file: include/linux/platform_data/bt-nokia-h4p.h
modified: include/linux/usb.h
modified: include/media/v4l2-of.h
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: drivers/staging/cxt1e1/linux.c
[gary at arch-tuxx staging]$ git checkout staging-next
drivers/staging/cxt1e1/linux.c: needs merge
error: you need to resolve your current index first
More information about the devel
mailing list