24 May, 2011

8 commits

  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
    staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
    staging:iio: Trivial kconfig reorganization and uniformity improvements.
    staging:iio:documenation partial update.
    staging:iio: use pollfunc allocation helpers in remaining drivers.
    staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
    staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
    staging:iio:meter:ade7758: Use private data space from iio_allocate_device
    staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
    staging:iio: ring core cleanups + check if read_last available in lis3l02dq
    staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
    staging:iio: poll func allocation clean up.
    staging:iio:ad7780 trivial unused header cleanup.
    staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
    staging:iio:adc:AD7780: Convert to new channel registration method
    staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
    staging:iio:adc: AD7606: Consitently use indio_dev
    staging:iio: Rip out helper for software rings.
    staging:iio:adc:AD7298: Use private data space from iio_allocate_device
    staging:iio: rationalization of different buffer implementation hooks.
    staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
    ...

    Fix up trivial conflicts in
    - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
    - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
    - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion

    Linus Torvalds
     
  • * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
    USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
    USB: UHCI: Support big endian GRUSBHC HC
    sparc: add {read,write}*_be routines
    USB: UHCI: Add support for big endian descriptors
    USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
    USB: UHCI: Add support for big endian mmio
    usb-storage: Correct adjust_quirks to include latest flags
    usb/isp1760: Fix possible unlink problems
    usb/isp1760: Move function isp1760_endpoint_disable() within file.
    USB: remove remaining usages of hcd->state from usbcore and fix regression
    usb: musb: ux500: add configuration and build options for ux500 dma
    usb: musb: ux500: add dma glue layer for ux500
    usb: musb: ux500: add dma name for ux500
    usb: musb: ux500: add ux500 specific code for gadget side
    usb: musb: fix compile error
    usb-storage: fix up the unusual_realtek device list
    USB: gadget: f_audio: Fix invalid dereference of initdata
    EHCI: don't rescan interrupt QHs needlessly
    OHCI: fix regression caused by nVidia shutdown workaround
    USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
    ...

    Linus Torvalds
     
  • * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
    serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
    tty/serial: Fix break handling for PORT_TEGRA
    tty/serial: Add explicit PORT_TEGRA type
    n_tracerouter and n_tracesink ldisc additions.
    Intel PTI implementaiton of MIPI 1149.7.
    Kernel documentation for the PTI feature.
    export kernel call get_task_comm().
    tty: Remove to support serial for S5P6442
    pch_phub: Support new device ML7223
    8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
    ASoC: Update cx20442 for TTY API change
    pch_uart: Support new device ML7223 IOH
    parport: Use request_muxed_region for IT87 probe and lock
    tty/serial: add support for Xilinx PS UART
    n_gsm: Use print_hex_dump_bytes
    drivers/tty/moxa.c: Put correct tty value
    TTY: tty_io, annotate locking functions
    TTY: serial_core, remove superfluous set_task_state
    TTY: serial_core, remove invalid test
    Char: moxa, fix locking in moxa_write
    ...

    Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
    drivers/tty/serial/Makefile.

    I did the hci_ldisc thing as an evil merge, cleaning things up.

    Linus Torvalds
     
  • cpu_sibling_mask() is not defined unless CONFIG_SMP is defined, so it
    must not be used directly in the code without ifdef protection.

    To solve the problem and avoid ifdefs in the code, define
    for_each_sibling() and use it instead.

    Signed-off-by: Guenter Roeck
    Cc: Fenghua Yu
    Cc: Durgadoss R
    Signed-off-by: Linus Torvalds

    Guenter Roeck
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
    hwmon: (coretemp) Fix checkpatch errors
    hwmon: Remove pkgtemp driver
    hwmon: (coretemp) Merge pkgtemp with coretemp
    hwmon: (pmbus) Add support for Analog Devices ADM1275
    hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers
    hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers
    hwmon: (pmbus) Use device specific function to read fan configuration
    hwmon: (pmbus) Expand scope of device specific get_status function
    hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers
    hwmon: Driver for MAX16065 System Manager and compatibles
    hwmon: (sht15) add support for CRC validation
    hwmon: (sht15) add support for the status register
    hwmon: (sht15) clean-up the probe function
    hwmon: (sht15) general code clean-up
    hwmon: Add support for MAX6642

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    b43: fix comment typo reqest -> request
    Haavard Skinnemoen has left Atmel
    cris: typo in mach-fs Makefile
    Kconfig: fix copy/paste-ism for dell-wmi-aio driver
    doc: timers-howto: fix a typo ("unsgined")
    perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
    md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
    treewide: fix a few typos in comments
    regulator: change debug statement be consistent with the style of the rest
    Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
    audit: acquire creds selectively to reduce atomic op overhead
    rtlwifi: don't touch with treewide double semicolon removal
    treewide: cleanup continuations and remove logging message whitespace
    ath9k_hw: don't touch with treewide double semicolon removal
    include/linux/leds-regulator.h: fix syntax in example code
    tty: fix typo in descripton of tty_termios_encode_baud_rate
    xtensa: remove obsolete BKL kernel option from defconfig
    m68k: fix comment typo 'occcured'
    arch:Kconfig.locks Remove unused config option.
    treewide: remove extra semicolons
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
    HID: hid-multitouch: cosmetic changes, sort classes and devices
    HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
    HID: hid-multitouch: add support for Unitec panels
    HID: hid-multitouch: add support for Touch International panels
    HID: hid-multitouch: add support for GoodTouch panels
    HID: hid-multitouch: add support for CVTouch panels
    HID: hid-multitouch: add support for ActionStar panels
    HID: hiddev: fix race between hiddev_disconnect and hiddev_release
    HID: magicmouse: ignore 'ivalid report id' while switching modes
    HID: fix a crash in hid_report_raw_event() function.
    HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
    HID: assorted usage updates from hut 1.12
    HID: roccat: fix actual/startup profile sysfs attribute in koneplus
    HID: hid-multitouch: Add support for Lumio panels
    HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
    HID: hid-multitouch: add support for Ilitek dual-touch panel
    HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
    HID: add support for Logitech G27 wheel
    HID: hiddev: fix error path in hiddev_read when interrupted
    HID: add support for Sony Navigation Controller
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
    apm-emulation: apm_mutex breaks ACK; remove it
    APM: take over maintainership

    Linus Torvalds
     

23 May, 2011

19 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
    ASoC: core: Don't set "(null)" as a driver name
    ALSA: hda - Use LPIB for ATI/AMD chipsets as default
    Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
    ASoC: Tegra: Fix compile when debugfs not enabled
    ASoC: spdif-dit: Add missing MODULE_*
    SOUND: OSS: Remove Au1550 driver.
    ALSA: hda - add Intel Panther Point HDMI codec id
    ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
    ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
    ALSA: hda - Fix input-src parse in patch_analog.c
    ASoC: davinci-mcasp: enable ping-pong SRAM buffers
    ASoC: add iPAQ hx4700 machine driver
    ASoC: Asahi Kasei AK4641 codec driver
    ALSA: hda - Enable Realtek ALC269 codec input layer beep
    ALSA: intel8x0m: enable AMD8111 modem
    ALSA: HDA: Add jack detection for HDMI
    ALSA: sound, core, pcm_lib: fix xrun_log
    ASoC: Max98095: Move existing NULL check before pointer dereference.
    ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
    ALSA: usb-audio - Add support for USB X-Fi S51 Pro
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
    bnx2x: allow device properly initialize after hotplug
    bnx2x: fix DMAE timeout according to hw specifications
    bnx2x: properly handle CFC DEL in cnic flow
    bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb
    net: filter: move forward declarations to avoid compile warnings
    pktgen: refactor pg_init() code
    pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
    net: skb_trim explicitely check the linearity instead of data_len
    ipv4: Give backtrace in ip_rt_bug().
    net: avoid synchronize_rcu() in dev_deactivate_many
    net: remove synchronize_net() from netdev_set_master()
    rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event
    net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
    bridge: call NETDEV_JOIN notifiers when add a slave
    netpoll: disable netpoll when enslave a device
    macvlan: Forward unicast frames in bridge mode to lowerdev
    net: Remove linux/prefetch.h include from linux/skbuff.h
    ipv4: Include linux/prefetch.h in fib_trie.c
    netlabel: Remove prefetches from list handlers.
    drivers/net: add prefetch header for prefetch users
    ...

    Fixed up prefetch parts: removed a few duplicate prefetch.h includes,
    fixed the location of the igb prefetch.h, took my version of the
    skbuff.h code without the extra parentheses etc.

    Linus Torvalds
     
  • apm_mutex is locked by a process (e.g. apm -s) at the start of apm_ioctl() and
    remains locked while pm_suspend() is called. Any subsequent process trying to
    ACK the suspend (e.g. apmd) is then blocked at the start of apm_ioctl(),
    causing the suspend to be delayed for 5 seconds in apm_suspend_notifier()
    while the ACK times out. In short, ACKs don't work.

    The driver's data structures are sufficiently protected by assorted locks. And
    pm_suspend() has its own mutex to prevent reentrancy. Consequently there is no
    obvious requirement for apm_mutex, which evolved from earlier BKL calls. So
    let's remove it.

    Signed-off-by: Paul Parsons
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Jiri Kosina

    Paul Parsons
     
  • Jiri Kosina
     
  • Recent trivial fix corrected 'occured', but left 'reqest'.
    codespell needs another dictionary entry.

    cc: Lucas De Marchi
    Signed-off-by: Jim Cromie
    Signed-off-by: Jiri Kosina

    Jim Cromie
     
  • This patch sorts the defs for the MT_CLS. I choose to split
    generic classes and device specific ones to be able to add
    more generic classes in the future.

    It also put eGalax devices at their right place (alphabetically)
    in mt_devices.

    Signed-off-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
    ide/ide-scan-pci.c: Use for_each_pci_dev().
    ide: Use linux/mutex.h
    IDE: ide-floppy, remove unnecessary NULL check
    drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
    ide: fix use after free in ide-acpi

    Linus Torvalds
     
  • * 'for-linus' of git://neil.brown.name/md:
    md: allow resync_start to be set while an array is active.
    md/raid10: reformat some loops with less indenting.
    md/raid10: remove unused variable.
    md/raid10: make more use of 'slot' in raid10d.
    md/raid10: some tidying up in fix_read_error
    md/raid1: improve handling of pages allocated for write-behind.
    md/raid1: try fix_sync_read_error before process_checks.
    md/raid1: tidy up new functions: process_checks and fix_sync_read_error.
    md/raid1: split out two sub-functions from sync_request_write
    md: make error_handler functions more uniform and correct.
    md/multipath: discard ->working_disks in favour of ->degraded
    md/raid1: clean up read_balance.
    md: simplify raid10 read_balance
    md/bitmap: fix saving of events_cleared and other state.
    md: reject a re-add request that cannot be honoured.
    md: Fix race when creating a new md device.

    Linus Torvalds
     
  • After discovering that wide use of prefetch on modern CPUs
    could be a net loss instead of a win, net drivers which were
    relying on the implicit inclusion of prefetch.h via the list
    headers showed up in the resulting cleanup fallout. Give
    them an explicit include via the following $0.02 script.

    =========================================
    #!/bin/bash
    MANUAL=""
    for i in `git grep -l 'prefetch(.*)' .` ; do
    grep -q '' $i
    if [ $? = 0 ] ; then
    continue
    fi

    ( echo '?^#include '
    echo .
    echo w
    echo q
    ) | ed -s $i > /dev/null 2>&1
    if [ $? != 0 ]; then
    echo $i needs manual fixup
    MANUAL="$i $MANUAL"
    fi
    done
    echo ------------------- 8\
    [ Fixed up some incorrect #include placements, and added some
    non-network drivers and the fib_trie.c case - Linus ]
    Signed-off-by: Linus Torvalds

    Paul Gortmaker
     
  • Signed-off-by: Dmitry Kravkov
    Signed-off-by: Eilon Greenstein
    Signed-off-by: David S. Miller

    Dmitry Kravkov
     
  • Signed-off-by: Dmitry Kravkov
    Signed-off-by: Eilon Greenstein
    Signed-off-by: David S. Miller

    Dmitry Kravkov
     
  • Signed-off-by: Dmitry Kravkov
    Signed-off-by: Eilon Greenstein
    Signed-off-by: David S. Miller

    Vladislav Zolotarov
     
  • replace function calls when possible call in both irq/non-irq contexts

    Signed-off-by: Dmitry Kravkov
    Signed-off-by: Eilon Greenstein
    Signed-off-by: David S. Miller

    Vladislav Zolotarov
     
  • s/NETDEV_BONDING_DESLAVE/NETDEV_RELEASE/ as Andy suggested.

    Signed-off-by: WANG Cong
    Cc: Andy Gospodarek
    Cc: Neil Horman
    Signed-off-by: David S. Miller

    Amerigo Wang
     
  • V3: rename NETDEV_ENSLAVE to NETDEV_JOIN

    Currently we do nothing when we enslave a net device which is running netconsole.
    Neil pointed out that we may get weird results in such case, so let's disable
    netpoll on the device being enslaved. I think it is too harsh to prevent
    the device being ensalved if it is running netconsole.

    By the way, this patch also removes the NETDEV_GOING_DOWN from netconsole
    netdev notifier, because netpoll will check if the device is running or not
    and we don't handle NETDEV_PRE_UP neither.

    This patch is based on net-next-2.6.

    Signed-off-by: WANG Cong
    Cc: Neil Horman
    Signed-off-by: David S. Miller

    Amerigo Wang
     
  • Unicast frames between macvlan interfaces in bridge mode are not otherwise
    sent to network taps on the lowerdev (as all other macvlan frames are), so
    forward the frames to the receive queue of the lowerdev first.

    Signed-off-by: David Ward
    Signed-off-by: David S. Miller

    David Ward
     
  • After discovering that wide use of prefetch on modern CPUs
    could be a net loss instead of a win, net drivers which were
    relying on the implicit inclusion of prefetch.h via the list
    headers showed up in the resulting cleanup fallout. Give
    them an explicit include via the following $0.02 script.

    =========================================
    #!/bin/bash
    MANUAL=""
    for i in `git grep -l 'prefetch(.*)' .` ; do
    grep -q '' $i
    if [ $? = 0 ] ; then
    continue
    fi

    ( echo '?^#include '
    echo .
    echo w
    echo q
    ) | ed -s $i > /dev/null 2>&1
    if [ $? != 0 ]; then
    echo $i needs manual fixup
    MANUAL="$i $MANUAL"
    fi
    done
    echo ------------------- 8\
    Signed-off-by: David S. Miller

    Paul Gortmaker
     
  • Casting to u32 warns anyways.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • * 'viafb-next' of git://github.com/schandinat/linux-2.6: (24 commits)
    viafb: Automatic OLPC XO-1.5 configuration
    viafb: remove unused CEA mode
    viafb: try to map less memory in case of failure
    viafb: use write combining for video ram
    viafb: add X server compatibility mode
    viafb: reduce OLPC refresh a bit
    viafb: fix OLPC XO 1.5 device connection
    viafb: fix OLPC DCON refresh rate
    viafb: delete clock and PLL initialization
    viafb: replace custom return values
    viafb: some small cleanup for global variables
    viafb: gather common good, old VGA initialization in one place
    viafb: add engine clock support
    viafb: add VIA slapping capability
    viafb: split clock and PLL code to an extra file
    viafb: add primary/secondary clock on/off switches
    viafb: add clock source selection and PLL power management support
    viafb: prepare for PLL separation
    viafb: call viafb_get_clk_value only in viafb_set_vclock
    viafb: remove unused max_hres/vres
    ...

    Linus Torvalds
     

22 May, 2011

3 commits


21 May, 2011

10 commits

  • Fix remaining checkpatch errors in the coretemp driver.

    Signed-off-by: Guenter Roeck
    Cc: Fenghua Yu
    Cc: Durgadoss R
    Acked-by: Jean Delvare

    Guenter Roeck
     
  • After the merge of pkgtemp functionality into the coretemp driver,
    the pkgtemp driver is no longer necessary. Remove it.

    Signed-off-by: Guenter Roeck
    Cc: Fenghua Yu
    Acked-by: Jean Delvare

    Guenter Roeck
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (45 commits)
    crypto: caam - add support for sha512 variants of existing AEAD algorithms
    crypto: caam - remove unused authkeylen from caam_ctx
    crypto: caam - fix decryption shared vs. non-shared key setting
    crypto: caam - platform_bus_type migration
    crypto: aesni-intel - fix aesni build on i386
    crypto: aesni-intel - Merge with fpu.ko
    crypto: mv_cesa - make count_sgs() null-pointer proof
    crypto: mv_cesa - copy remaining bytes to SRAM only when needed
    crypto: mv_cesa - move digest state initialisation to a better place
    crypto: mv_cesa - fill inner/outer IV fields only in HMAC case
    crypto: mv_cesa - refactor copy_src_to_buf()
    crypto: mv_cesa - no need to save digest state after the last chunk
    crypto: mv_cesa - print a warning when registration of AES algos fail
    crypto: mv_cesa - drop this call to mv_hash_final from mv_hash_finup
    crypto: mv_cesa - the descriptor pointer register needs to be set just once
    crypto: mv_cesa - use ablkcipher_request_cast instead of the manual container_of
    crypto: caam - fix printk recursion for long error texts
    crypto: caam - remove unused keylen from session context
    hwrng: amd - enable AMD hw rnd driver for Maple PPC boards
    hwrng: amd - manage resource allocation
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    libata: Power off empty ports
    libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
    ATA: Don't powerdown Compaq Triflex IDE device on suspend
    libata: Use Maximum Write Same Length to report discard size limit
    drivers/ata/acard-ahci.c: fix enum warning
    pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
    libata-sff: prevent irq descriptions for dummy ports
    pata_cm64x: fix boot crash on parisc

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
    macvlan: fix panic if lowerdev in a bond
    tg3: Add braces around 5906 workaround.
    tg3: Fix NETIF_F_LOOPBACK error
    macvlan: remove one synchronize_rcu() call
    networking: NET_CLS_ROUTE4 depends on INET
    irda: Fix error propagation in ircomm_lmp_connect_response()
    irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
    irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
    rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
    be2net: Kill set but unused variable 'req' in lancer_fw_download()
    irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
    atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
    rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
    rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
    rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
    rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
    pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
    isdn: capi: Use pr_debug() instead of ifdefs.
    tg3: Update version to 3.119
    tg3: Apply rx_discards fix to 5719/5720
    ...

    Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
    as per Davem.

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] define "_sdata" symbol
    pstore: Fix Kconfig dependencies for apei->pstore
    pstore: fix potential logic issue in pstore read interface
    pstore: fix pstore filesystem mount/remount issue
    pstore: fix one type of return value in pstore
    [IA64] fix build warning in arch/ia64/oprofile/backtrace.c

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (110 commits)
    [SCSI] qla2xxx: Refactor call to qla2xxx_read_sfp for thermal temperature.
    [SCSI] qla2xxx: Unify the read/write sfp mailbox command routines.
    [SCSI] qla2xxx: Clear complete initialization control block.
    [SCSI] qla2xxx: Allow an override of the registered maximum LUN.
    [SCSI] qla2xxx: Add host number in reset and quiescent message logs.
    [SCSI] qla2xxx: Correctly read sfp single byte mailbox register.
    [SCSI] qla2xxx: Add qla82xx_rom_unlock() function.
    [SCSI] qla2xxx: Log if qla82xx firmware fails to load from flash.
    [SCSI] qla2xxx: Use passed in host to initialize local scsi_qla_host in queuecommand function
    [SCSI] qla2xxx: Correct buffer start in edc sysfs debug print.
    [SCSI] qla2xxx: Update firmware version after flash update for ISP82xx.
    [SCSI] qla2xxx: Fix hang during driver unload when vport is active.
    [SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6.
    [SCSI] qla2xxx: Fix virtual port failing to login after chip reset.
    [SCSI] qla2xxx: Fix vport delete hang when logins are outstanding.
    [SCSI] hpsa: Change memset using sizeof(ptr) to sizeof(*ptr)
    [SCSI] ipr: Rate limit DMA mapping errors
    [SCSI] hpsa: add P2000 to list of shared SAS devices
    [SCSI] hpsa: do not attempt PCI power management reset method if we know it won't work.
    [SCSI] hpsa: remove superfluous sleeps around reset code
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (152 commits)
    powerpc: Fix hard CPU IDs detection
    powerpc/pmac: Update via-pmu to new syscore_ops
    powerpc/kvm: Fix the build for 32-bit Book 3S (classic) processors
    powerpc/kvm: Fix kvmppc_core_pending_dec
    powerpc: Remove last piece of GEMINI
    powerpc: Fix for Pegasos keyboard and mouse
    powerpc: Make early memory scan more resilient to out of order nodes
    powerpc/pseries/iommu: Cleanup ddw naming
    powerpc/pseries/iommu: Find windows after kexec during boot
    powerpc/pseries/iommu: Remove ddw property when destroying window
    powerpc/pseries/iommu: Add additional checks when changing iommu mask
    powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_created
    powerpc: Remove unused/obsolete CONFIG_XICS
    misc: Add CARMA DATA-FPGA Programmer support
    misc: Add CARMA DATA-FPGA Access Driver
    powerpc: Make IRQ_NOREQUEST last to clear, first to set
    powerpc: Integrated Flash controller device tree bindings
    powerpc/85xx: Create dts of each core in CAMP mode for P1020RDB
    powerpc/85xx: Fix PCIe IDSEL for Px020RDB
    powerpc/85xx: P2020 DTS: re-organize dts files
    ...

    Linus Torvalds
     
  • Commit e66eed651fd1 ("list: remove prefetching from regular list
    iterators") removed the include of prefetch.h from list.h, which
    uncovered several cases that had apparently relied on that rather
    obscure header file dependency.

    So this fixes things up a bit, using

    grep -L linux/prefetch.h $(git grep -l '[^a-z_]prefetchw*(' -- '*.[ch]')
    grep -L 'prefetchw*(' $(git grep -l 'linux/prefetch.h' -- '*.[ch]')

    to guide us in finding files that either need
    inclusion, or have it despite not needing it.

    There are more of them around (mostly network drivers), but this gets
    many core ones.

    Reported-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • commit a35e2c1b6d905 (macvlan: use rx_handler_data pointer to store
    macvlan_port pointer V2) added a bug in macvlan_port_create()

    Steps to reproduce the bug:

    # ifenslave bond0 eth0 eth1

    # ip link add link eth0 up name eth0#1 type macvlan
    ->error EBUSY

    # ip link add link eth0 up name eth0#1 type macvlan
    ->panic

    Fix: Dont set IFF_MACVLAN_PORT in error case.

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet