10 Jan, 2012

1 commit

  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
    net/hyperv: Add support for jumbo frame up to 64KB
    net/hyperv: Add NETVSP protocol version negotiation
    net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
    staging/rtl8192e: Register against lib80211
    staging/rtl8192e: Convert to lib80211_crypt_info
    staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
    staging/rtl8192e: Add lib80211.h to rtllib.h
    staging/mei: add watchdog device registration wrappers
    drm/omap: GEM, deal with cache
    staging: vt6656: int.c, int.h: Change return of function to void
    staging: usbip: removed unused definitions from header
    staging: usbip: removed dead code from receive function
    staging:iio: Drop {mark,unmark}_in_use callbacks
    staging:iio: Drop buffer mark_param_change callback
    staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
    staging:iio: Drop buffer busy flag
    staging:iio: Make sure a device is only opened once at a time
    staging:iio: Disallow modifying buffer size when buffer is enabled
    staging:iio: Disallow changing scan elements in all buffered modes
    staging:iio: Use iio_buffer_enabled instead of open coding it
    ...

    Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
    module_init due to using module_i2c_driver() helper, next to removal of
    MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).

    Linus Torvalds
     

02 Jan, 2012

1 commit


28 Nov, 2011

1 commit

  • This patch converts pci_table entries to use the PCI_DEVICE macro,
    if .subvendor and .subdevice are set to PCI_ANY_ID,
    and thus improves readablity.

    Since CH_Agere_Systems_Mini_PCI_V1 is defined as 0 in hermes_pci_versions
    and neither the enum nor the value is used anywhere else, we can drop
    the assignment of .driver_data as it is initialized as 0 by default.

    Signed-off-by: Peter Huewe
    Signed-off-by: Greg Kroah-Hartman

    Peter Huewe
     

01 Nov, 2011

1 commit


26 Oct, 2011

1 commit

  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
    staging: et131x: Remove redundant check and return statement
    staging: et131x: Mainly whitespace changes to appease checkpatch
    staging: et131x: Remove last of the forward declarations
    staging: et131x: Remove even more forward declarations
    staging: et131x: Remove yet more forward declarations
    staging: et131x: Remove more forward declarations
    staging: et131x: Remove forward declaration of et131x_adapter_setup
    staging: et131x: Remove some forward declarations
    staging: et131x: Remove unused rx_ring.recv_packet_pool
    staging: et131x: Remove call to find pci pm capability
    staging: et131x: Remove redundant et131x_reset_recv() call
    staging: et131x: Remove unused rx_ring.recv_buffer_pool
    Staging: bcm: Fix three initialization errors in InterfaceDld.c
    Staging: bcm: Fix coding style issues in InterfaceDld.c
    staging:iio:dac: Add AD5360 driver
    staging:iio:trigger:bfin-timer: Fix compile error
    Staging: vt6655: add some range checks before memcpy()
    Staging: vt6655: whitespace fixes to iotcl.c
    Staging: vt6656: add some range checks before memcpy()
    Staging: vt6656: whitespace cleanups in ioctl.c
    ...

    Fix up conflicts in:
    - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
    vg driver movement
    - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
    driver removal vs now stale changes
    - drivers/staging/rtl8192e/r8192E_core.c:
    driver removal vs now stale changes
    - drivers/staging/et131x/et131*:
    driver consolidation into one file, tried to do fixups

    Linus Torvalds
     

19 Oct, 2011

1 commit


18 Oct, 2011

7 commits


05 Oct, 2011

3 commits


27 Sep, 2011

4 commits


21 Sep, 2011

2 commits


17 Sep, 2011

13 commits


18 Aug, 2011

1 commit


26 Jul, 2011

1 commit

  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
    staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
    staging:iio:kfifo_buf fix double initialization of the ring device structure.
    staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
    staging:iio:imu fix missing register table index for some channels
    spectra: enable device before poking it
    staging: rts_pstor: Fix a miswriting
    staging/lirc_bt829: Return -ENODEV when no hardware is found.
    staging/lirc_parallel: remove pointless prototypes.
    staging/lirc_parallel: fix panic on rmmod
    staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
    Staging: zram: Fix kunmapping order
    Revert "gma500: Fix dependencies"
    gma500: Add medfield header
    gma500: wire up the mrst i2c bus from chip_info
    gma500: Fix DPU build
    gma500: Clean up the DPU config and make it runtime
    gma500: resync with Medfield progress
    gma500: Use the mrst helpers and power control for mode commit
    gma500@ Fix backlight range error
    gma500: More Moorestown muddle meddling means MM maybe might modeset
    ...

    Fix up fairly trivial conflicts all over, mostly due to header file
    cleanup conflicts, but some deleted files and some just context changes:
    - Documentation/feature-removal-schedule.txt
    - drivers/staging/bcm/headers.h
    - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
    - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
    - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
    - drivers/staging/brcm80211/brcmfmac/wl_iw.c
    - drivers/staging/et131x/et131x_netdev.c
    - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
    - drivers/staging/rtl8192e/r8192E.h
    - drivers/staging/usbip/userspace/src/utils.h

    Linus Torvalds
     

13 Jul, 2011

1 commit

  • Almost all of these have long outstayed their welcome.

    And for every one of these macros, there are 10 features for which we
    didn't add macros.

    Let's just delete them all, and get out of habit of doing things this
    way.

    Signed-off-by: David S. Miller
    Acked-by: Stephen Hemminger
    Acked-by: Arnd Bergmann

    David S. Miller
     

06 Jul, 2011

1 commit


06 May, 2011

1 commit