Skip to contentSkip to conversation

Linux 3.3.1

DISCUSSION Greg KH 1 participant 2 messages Apr 2, 2012 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 3.3.1 kernel.

All users of the 3.3 kernel series must upgrade.

The updated 3.3.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.3.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                                          |    2 
 arch/arm/mach-shmobile/setup-sh7372.c             |    2 
 arch/arm/mach-tegra/Kconfig                       |   12 +
 arch/arm/mach-tegra/board-dt-tegra20.c            |    6 
 arch/arm/mach-tegra/devices.c                     |    7 
 arch/arm/mach-tegra/devices.h                     |    5 
 arch/x86/kernel/apic/io_apic.c                    |   40 ++++-
 arch/x86/kernel/entry_32.S                        |   17 +-
 arch/x86/kernel/tls.c                             |    4 
 arch/x86/kernel/tsc.c                             |   10 +
 arch/x86/kernel/vm86_32.c                         |    2 
 arch/x86/net/bpf_jit_comp.c                       |   14 -
 arch/x86/syscalls/syscall_32.tbl                  |    2 
 drivers/ata/ahci.c                                |    2 
 drivers/ata/ahci.h                                |    6 
 drivers/ata/ahci_platform.c                       |   11 +
 drivers/ata/libahci.c                             |    5 
 drivers/ata/pata_legacy.c                         |    3 
 drivers/base/power/domain.c                       |   67 ++++++--
 drivers/bluetooth/ath3k.c                         |    1 
 drivers/bluetooth/btusb.c                         |    1 
 drivers/char/tpm/Kconfig                          |    1 
 drivers/char/tpm/tpm.c                            |    3 
 drivers/clocksource/sh_cmt.c                      |    4 
 drivers/clocksource/sh_mtu2.c                     |    4 
 drivers/clocksource/sh_tmu.c                      |    4 
 drivers/firewire/ohci.c                           |    5 
 drivers/gpio/gpio-davinci.c                       |   26 ++-
 drivers/gpio/gpio-omap.c                          |    5 
 drivers/gpu/drm/gma500/framebuffer.c              |    2 
 drivers/gpu/drm/i915/i915_drv.c                   |    7 
 drivers/gpu/drm/i915/i915_gem.c                   |    7 
 drivers/gpu/drm/i915/intel_drv.h                  |    2 
 drivers/gpu/drm/i915/intel_fb.c                   |   10 +
 drivers/gpu/drm/radeon/atombios_crtc.c            |    8 -
 drivers/gpu/drm/radeon/atombios_dp.c              |    3 
 drivers/gpu/drm/radeon/atombios_encoders.c        |    4 
 drivers/gpu/drm/radeon/radeon_atombios.c          |   14 +
 drivers/gpu/drm/radeon/radeon_connectors.c        |    4 
 drivers/gpu/drm/radeon/radeon_cursor.c            |   13 +
 drivers/gpu/drm/radeon/radeon_object.c            |   18 ++
 drivers/gpu/drm/radeon/radeon_object.h            |    2 
 drivers/hid/hid-chicony.c                         |    7 
 drivers/hid/hid-core.c                            |    1 
 drivers/hid/hid-ids.h                             |    1 
 drivers/hwmon/fam15h_power.c                      |    2 
 drivers/infiniband/ulp/iser/iscsi_iser.c          |   18 --
 drivers/infiniband/ulp/iser/iscsi_iser.h          |    1 
 drivers/infiniband/ulp/iser/iser_initiator.c      |   30 ++-
 drivers/infiniband/ulp/srpt/ib_srpt.c             |   19 +-
 drivers/iommu/amd_iommu.c                         |    2 
 drivers/iommu/amd_iommu_init.c                    |   30 ++-
 drivers/md/bitmap.c                               |    2 
 drivers/md/dm-crypt.c                             |   38 ++--
 drivers/md/dm-exception-store.c                   |    2 
 drivers/md/dm-thin.c                              |  124 +++++++++------
 drivers/md/md.c                                   |   40 ++---
 drivers/md/persistent-data/dm-btree-remove.c      |  174 ++++++++++++----------
 drivers/md/raid1.c                                |   17 +-
 drivers/md/raid10.c                               |   17 +-
 drivers/media/dvb/dvb-usb/mxl111sf.c              |    6 
 drivers/media/dvb/frontends/au8522_dig.c          |   10 -
 drivers/media/dvb/frontends/lgdt330x.c            |    6 
 drivers/media/dvb/frontends/tda10071.c            |    2 
 drivers/media/video/pvrusb2/pvrusb2-devattr.c     |   10 +
 drivers/mfd/wm8994-core.c                         |   14 +
 drivers/mtd/ubi/scan.c                            |    8 -
 drivers/mtd/ubi/wl.c                              |   10 -
 drivers/net/ethernet/marvell/sky2.c               |   11 +
 drivers/net/ethernet/mellanox/mlx4/main.c         |    2 
 drivers/net/usb/usbnet.c                          |   10 +
 drivers/net/wireless/ath/ath9k/main.c             |    8 -
 drivers/net/wireless/iwlwifi/iwl-core.c           |   18 --
 drivers/net/wireless/p54/p54spi.c                 |   14 +
 drivers/net/wireless/rt2x00/rt2800usb.c           |    1 
 drivers/net/wireless/rtlwifi/base.c               |    1 
 drivers/net/wireless/rtlwifi/core.c               |   42 +++++
 drivers/net/wireless/rtlwifi/core.h               |    4 
 drivers/net/wireless/rtlwifi/pci.c                |   46 ++---
 drivers/net/wireless/rtlwifi/pci.h                |    1 
 drivers/net/wireless/rtlwifi/ps.c                 |    3 
 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c |   15 +
 drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c |   12 -
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c       |    6 
 drivers/net/wireless/rtlwifi/rtl8192ce/sw.c       |   24 +--
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c       |   33 +---
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c       |   29 +--
 drivers/net/wireless/rtlwifi/rtl8192de/fw.c       |   22 +-
 drivers/net/wireless/rtlwifi/rtl8192de/hw.c       |    3 
 drivers/net/wireless/rtlwifi/rtl8192de/sw.c       |   38 ++--
 drivers/net/wireless/rtlwifi/rtl8192se/fw.c       |    2 
 drivers/net/wireless/rtlwifi/rtl8192se/hw.c       |   16 +-
 drivers/net/wireless/rtlwifi/rtl8192se/led.c      |    5 
 drivers/net/wireless/rtlwifi/rtl8192se/sw.c       |   65 ++++++--
 drivers/net/wireless/rtlwifi/usb.c                |   48 ++----
 drivers/net/wireless/rtlwifi/wifi.h               |    4 
 drivers/pci/pcie/aspm.c                           |   13 +
 drivers/rtc/interface.c                           |   20 ++
 drivers/rtc/rtc-mpc5121.c                         |    2 
 drivers/scsi/scsi_transport_iscsi.c               |    4 
 drivers/staging/android/lowmemorykiller.c         |   14 -
 drivers/staging/media/as102/as102_fw.h            |    2 
 drivers/staging/media/as102/as10x_cmd.h           |   80 +++++-----
 drivers/staging/media/as102/as10x_types.h         |    2 
 drivers/staging/octeon/ethernet-mdio.c            |    4 
 drivers/staging/rtl8712/Kconfig                   |    7 
 drivers/staging/rtl8712/os_intfs.c                |    2 
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c     |    8 -
 drivers/staging/rtl8712/rtl871x_sta_mgt.c         |    4 
 drivers/staging/rtl8712/sta_info.h                |    4 
 drivers/staging/vme/devices/vme_pio2.h            |    4 
 drivers/staging/vme/devices/vme_pio2_gpio.c       |    4 
 drivers/staging/zcache/zcache-main.c              |    4 
 drivers/target/iscsi/iscsi_target.c               |   14 -
 drivers/target/iscsi/iscsi_target_configfs.c      |    6 
 drivers/target/loopback/tcm_loop.c                |    6 
 drivers/target/target_core_alua.c                 |    7 
 drivers/target/target_core_cdb.c                  |  170 +++++----------------
 drivers/target/target_core_device.c               |    6 
 drivers/target/tcm_fc/tfc_cmd.c                   |    6 
 drivers/tty/moxa.c                                |    2 
 drivers/tty/serial/omap-serial.c                  |    6 
 drivers/tty/serial/sh-sci.c                       |   15 +
 drivers/tty/vt/consolemap.c                       |   51 +++++-
 drivers/usb/class/cdc-wdm.c                       |   17 +-
 drivers/usb/dwc3/core.c                           |    2 
 drivers/usb/dwc3/gadget.c                         |   33 ++--
 drivers/usb/gadget/amd5536udc.c                   |    1 
 drivers/usb/gadget/at91_udc.c                     |    1 
 drivers/usb/gadget/atmel_usba_udc.c               |    1 
 drivers/usb/gadget/ci13xxx_udc.c                  |    1 
 drivers/usb/gadget/f_subset.c                     |   34 ++--
 drivers/usb/gadget/fsl_qe_udc.c                   |    1 
 drivers/usb/gadget/fsl_udc_core.c                 |   19 +-
 drivers/usb/gadget/goku_udc.c                     |    1 
 drivers/usb/gadget/hid.c                          |    6 
 drivers/usb/gadget/inode.c                        |    2 
 drivers/usb/gadget/langwell_udc.c                 |    1 
 drivers/usb/gadget/mv_udc_core.c                  |    1 
 drivers/usb/gadget/omap_udc.c                     |    1 
 drivers/usb/gadget/pch_udc.c                      |    1 
 drivers/usb/gadget/pxa25x_udc.c                   |    2 
 drivers/usb/gadget/s3c-hsudc.c                    |    2 
 drivers/usb/gadget/s3c2410_udc.c                  |    2 
 drivers/usb/host/ehci-fsl.c                       |    4 
 drivers/usb/host/ehci-fsl.h                       |    1 
 drivers/usb/host/fsl-mph-dr-of.c                  |    1 
 drivers/usb/musb/musb_gadget.c                    |   18 ++
 drivers/usb/renesas_usbhs/mod_gadget.c            |    6 
 drivers/usb/serial/cp210x.c                       |   44 +++++
 drivers/usb/serial/ftdi_sio.c                     |   32 +++-
 drivers/usb/serial/ftdi_sio.h                     |    3 
 drivers/usb/serial/ftdi_sio_ids.h                 |   19 ++
 drivers/usb/serial/generic.c                      |    4 
 drivers/usb/serial/mos7840.c                      |   83 +++++++---
 drivers/usb/serial/option.c                       |   16 ++
 drivers/usb/serial/qcserial.c                     |  105 +++++++------
 drivers/usb/storage/realtek_cr.c                  |    8 -
 drivers/video/backlight/tosa_lcd.c                |    2 
 drivers/video/fbmem.c                             |   18 ++
 drivers/video/udlfb.c                             |    2 
 fs/cifs/cifsfs.c                                  |    8 -
 fs/cifs/cifsglob.h                                |   10 -
 fs/cifs/cifssmb.c                                 |    9 -
 fs/cifs/connect.c                                 |   14 -
 fs/cifs/dir.c                                     |    6 
 fs/cifs/file.c                                    |   23 +-
 fs/cifs/transport.c                               |    4 
 fs/dcache.c                                       |    3 
 fs/ext4/ext4.h                                    |    2 
 fs/ext4/ext4_jbd2.h                               |   56 +++----
 fs/ext4/extents.c                                 |    2 
 fs/ext4/fsync.c                                   |    2 
 fs/ext4/inode.c                                   |   46 +++--
 fs/ext4/page-io.c                                 |   11 +
 fs/hugetlbfs/inode.c                              |   25 +--
 fs/jbd2/transaction.c                             |    2 
 fs/lockd/svc.c                                    |    2 
 fs/nfs/callback_xdr.c                             |    4 
 fs/nfs/delegation.c                               |   11 +
 fs/nfs/delegation.h                               |    1 
 fs/nfs/nfs4_fs.h                                  |    3 
 fs/nfs/nfs4proc.c                                 |   64 +++++---
 fs/nfs/nfs4state.c                                |   33 +++-
 fs/proc/namespaces.c                              |    2 
 fs/proc/proc_sysctl.c                             |   17 ++
 fs/proc/task_mmu.c                                |    9 +
 fs/sysfs/inode.c                                  |   11 -
 fs/xfs/xfs_iget.c                                 |   18 +-
 fs/xfs/xfs_log_recover.c                          |   33 +---
 include/asm-generic/pgtable.h                     |   61 +++++++
 include/asm-generic/unistd.h                      |    2 
 include/linux/fb.h                                |    1 
 include/linux/math64.h                            |    4 
 include/linux/pm_domain.h                         |    3 
 include/linux/rtc.h                               |    3 
 include/target/target_core_base.h                 |    2 
 kernel/futex.c                                    |   19 +-
 kernel/irq/chip.c                                 |    3 
 kernel/irq/manage.c                               |    2 
 kernel/module.c                                   |    3 
 kernel/power/hibernate.c                          |    7 
 kernel/time/ntp.c                                 |    2 
 lib/kobject_uevent.c                              |   19 +-
 mm/bootmem.c                                      |    5 
 mm/memcontrol.c                                   |    4 
 mm/memory.c                                       |   16 +-
 mm/mempolicy.c                                    |    2 
 mm/mincore.c                                      |    2 
 mm/pagewalk.c                                     |    2 
 mm/slub.c                                         |    3 
 mm/sparse.c                                       |   30 +--
 mm/swapfile.c                                     |    4 
 mm/vmscan.c                                       |   42 +++--
 net/core/dev.c                                    |    3 
 net/core/rtnetlink.c                              |    2 
 net/ipv6/ip6_output.c                             |   11 -
 net/ipv6/route.c                                  |    8 -
 net/l2tp/l2tp_ppp.c                               |    2 
 net/rds/send.c                                    |    1 
 net/sunrpc/cache.c                                |    2 
 net/sunrpc/sched.c                                |   15 +
 net/xfrm/xfrm_replay.c                            |    6 
 security/integrity/ima/Kconfig                    |    2 
 sound/pci/hda/hda_eld.c                           |    4 
 sound/soc/fsl/p1022_ds.c                          |   24 ++-
 sound/soc/pxa/pxa-ssp.c                           |   61 ++++---
 227 files changed, 2007 insertions(+), 1207 deletions(-)

Alex Deucher (3):
drm/radeon/kms: fix analog load detection on DVI-I connectors drm/radeon/kms: add connector quirk for Fujitsu D3003-S2 board drm/radeon/kms/atom: force bpc to 8 for now

Alexander Gordeev (1):
genirq: Fix incorrect check for forced IRQ thread handler

Alok Kataria (1):
x86, tsc: Skip refined tsc calibration on systems with reliable TSC

Andrea Arcangeli (1):
mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode

Andrea Righi (1):
staging: zcache: avoid AB-BA deadlock condition

Andreas Herrmann (1):
hwmon: (fam15h_power) Correct sign extension of running_avg_capture

Andrei Warkentin (1):
dm exception store: fix init error path

Andrew Vagin (1):
uevent: send events in correct order according to seqnum (v3)

Aneesh Kumar K.V (1):
hugetlbfs: avoid taking i_mutex from hugetlbfs_read()

Anssi Hannula (1):
ALSA: hda - fix printing of high HDMI sample rates

Anton Tikhomirov (1):
usb: dwc3: use proper function for setting endpoint name

Antti Palosaari (1):
tda10071: fix the delivery system

Artem Bityutskiy (1):
UBI: fix eraseblock picking criteria

Ben Hutchings (2):
cdc-wdm: Fix more races on the read path
cdc-wdm: Don't clear WDM_READ unless entire read buffer is emptied

Benjamin LaHaise (1):
Fix pppol2tp getsockname()

Bjørn Mork (2):
USB: option: make interface blacklist work again
USB: option: add ZTE MF820D

Brian Norris (3):
ahci: add AHCI_HFLAG_DELAY_ENGINE host flag
ahci: move AHCI_HFLAGS() macro to ahci.h
ahci_platform: add STRICT_AHCI platform type

Bruno Thomsen (1):
USB: Microchip VID mislabeled as Hornby VID in ftdi_sio.

Chris Metcalf (1):
compat: use sys_sendfile64() implementation for sendfile syscall

Chris Wilson (1):
drm/i915: Only clear the GPU domains upon a successful finish

Christoph Lameter (1):
slub: Do not hold slub_lock when calling sysfs_slab_add()

Clemens Ladisch (1):
firewire: ohci: fix too-early completion of IR multichannel buffers

Cousson, Benoit (1):
tty: serial: OMAP: Fix oops due to NULL pdata in DT boot

Dan Carpenter (4):
usb: dwc3: make dwc3_get_device_id() return the id
tty: moxa: fix bit test in moxa_start()
x86, tls: Off by one limit check
nfsd: don't allow zero length strings in cache_parse()

Dan Williams (1):
USB: qcserial: don't grab QMI port on Gobi 1000 devices

Daniel Mack (1):
ASoC: pxa-ssp: atomically set stream active masks

Daniele Palmas (1):
USB: option driver: adding support for Telit CC864-SINGLE, CC864-DUAL and DE910-DUAL modems

Dave Airlie (1):
drm/i915: suspend fbdev device around suspend/hibernate

Dave Chinner (1):
xfs: fix inode lookup race

Dave Jones (1):
Remove printk from rds_sendmsg

David Daney (1):
staging/octeon: Fix PHY binding in octeon-ethernet driver.

Dmitry Adamushko (1):
x86-32: Fix endless loop when processing signals for kernel tasks

Donald Lee (1):
USB: serial: mos7840: Fixed MCS7820 device attach problem

Eric Dumazet (3):
net: bpf_jit: fix BPF_S_LDX_B_MSH compilation
net: fix napi_reuse_skb() skb reserve
net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()

Eric Sandeen (1):
jbd2: clear BH_Delay & BH_Unwritten in journal_unmap_buffer

Fabio Estevam (1):
ima: fix Kconfig dependencies

Felix Fietkau (1):
ath9k: fix going to full-sleep on PS idle

Gao feng (1):
ipv6: fix incorrent ipv6 ipsec packet fragment

Gerard Snitselaar (1):
staging: vme: fix section mismatches in linux-next 20120314

Gertjan van Wingerde (1):

      rt2x00: Add support for D-Link DWA-127 to rt2800usb.

Gianluca Gennari (1):
as102: add __packed attribute to structs defined inside packed structs

Greg Kroah-Hartman (2):
USB: ftdi_sio: fix problem when the manufacture is a NULL string Linux 3.3.1

Greg Rose (1):
rtnetlink: Fix VF IFLA policy

Ido Shayevitz (1):
usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep on disable

Jan Kara (1):
xfs: Fix oops on IO error during xlog_recover_process_iunlinks()

Jeff Layton (1):
cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next

Jeff Moyer (2):
ext4: fix race between unwritten extent conversion and truncate
ext4: fix race between sync and completed io work

Jim Paris (1):
USB: ftdi_sio: add support for FT-X series devices

Jingjun Wu (1):
rtlwifi: rtl8192ce: Fix loss of receive performance

Joe Thornber (2):
dm persistent data: fix btree rebalancing after remove dm thin: fix stacked bi_next usage

Joerg Roedel (1):
iommu/amd: Make sure IOMMU interrupts are re-enabled on resume

Johan Hovold (1):
USB: serial: fix console error reporting

Johannes Berg (1):
iwlwifi: always monitor for stuck queues

John Stultz (1):
rtc: Provide flag for rtc devices that don't support UIE

Josh Boyer (1):
USB: ums_realtek: do not use stack memory for DMA in __do_config_autodelink

Jörn Engel (2):
target: fix use after free in target_report_luns
target: prevent NULL pointer dereference in target_report_luns

Kay Sievers (1):
udlfb: remove sysfs framebuffer device with USB .disconnect()

Keng-Yu Lin (3):
Bluetooth: Add AR30XX device ID on Asus laptops
HID: add extra hotkeys in Asus AIO keyboards
HID: add more hotkeys in Asus AIO keyboards

Kuninori Morimoto (1):

      usb: renesas_usbhs: bugfix: add .release function to gpriv->gadget.dev

Larry Finger (6):
staging: r8712u: Fix regression introduced by commit a5ee652
staging: r8712u: Fix regression in signal level after commit c6dc001
rtlwifi: rtl8192c_common: rtl8192de: Check for allocation failures
rtlwifi: rtl8192c: Prevent sleeping from invalid context in rtl8192cu
rtlwifi: Convert to asynchronous firmware load
staging: r8712u: Add missing initialization and remove configuration parameter CONFIG_R8712_AP

Liz Clark (1):
TTY: Wrong unicode value copied in con_set_unimap()

Lothar Waßmann (1):
usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH

Lucas De Marchi (1):
sysctl: protect poll() in entries that may go away

Lukas Czerner (1):
ext4: ignore EXT4_INODE_JOURNAL_DATA flag with delalloc

Mark Brown (1):
mfd: Test for jack detection when deciding if wm8994 should suspend

Masami Ichikawa (1):
sysfs: Fix memory leak in sysfs_sd_setsecdata().

Masanari Iida (1):
backlight: fix typo in tosa_lcd.c

Matthew Garrett (1):
ASPM: Fix pcie devices with non-pcie children

Max Filippov (1):
p54spi: Release GPIO lines and IRQ on error in p54spi_probe

Mel Gorman (1):
mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem

Meng Zhang (1):
USB: option: Add MediaTek MT6276M modem&app interfaces

Michael Krufky (3):
au8522: bug-fix: enable modulation AFTER tune (instead of before tuning)
pvrusb2: fix 7MHz & 8MHz DVB-T tuner support for HVR1900 rev D1F5
mxl111sf: fix error on stream stop in mxl111sf_ep6_streaming_ctrl()

Michał Wróbel (2):
USB: ftdi_sio: new PID: Distortec JTAG-lock-pick
USB: ftdi_sio: new PID: LUMEL PD12

Michel Dänzer (1):
drm/radeon: Restrict offset for legacy hardware cursor.

Michel Lespinasse (1):
vfs: fix d_ancestor() case in d_materialize_unique

Mike Christie (1):
SCSI: iscsi: fix setting of pid from netlink skb

Mikulas Patocka (2):
dm crypt: fix mempool deadlock
dm crypt: add missing error handling

NeilBrown (5):
md/bitmap: ensure to load bitmap when creating via sysfs.
md: don't set md arrays to readonly on shutdown. md/raid1,raid10: avoid deadlock during resync/recovery.
md: fix clearing of the 'changed' flags for the bad blocks list.
lockd: fix arg parsing for grace_period and timeout.

Nicholas Bellinger (4):
iscsi-target: Fix iscsit_alloc_buffs() failure cases
iscsi-target: Fix dynamic -> explict NodeACL pointer reference
tcm_fc: Fix fc_exch memory leak in ft_send_resp_status
ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception

Nishanth Aravamudan (1):
bootmem/sparsemem: remove limit constraint in alloc_bootmem_section

Or Gerlitz (1):
IB/iser: Post initial receive buffers before sending the final login request

Orjan Friberg (1):
USB: gadget: Make g_hid device class conform to spec.

Paul E. McKenney (1):
staging: android/lowmemorykiller: Don't unregister notifier from atomic context

Paul Zimmerman (2):
usb: dwc3: gadget: don't wrap around the TRB poll on non-ISOC
usb: dwc3: fix bogus test in dwc3_gadget_start_isoc

Pavel Shilovsky (2):
CIFS: Respect negotiated MaxMpxCount
CIFS: Fix a spurious error in cifs_push_posix_locks

Peter Chen (2):
usb: fsl_udc_core: Fix scheduling while atomic dump message
usb: Fix build error due to dma_mask is not at pdev_archdata at ARM

Peter Korsgaard (1):
USB: ftdi_sio: add support for BeagleBone rev A5+

Pravin B Shelar (1):
proc-ns: use d_set_d_op() API to set dentry ops in proc_ns_instantiate().

Preston Fick (1):

      usb: cp210x: Update to support CP2105 and multiple interface devices

Rabin Vincent (1):
rtc: Disable the alarm in the hardware (v2)

Rafael J. Wysocki (7):
PM / Domains: Fix handling of wakeup devices during system resume PM / Domains: Fix hibernation restore of devices, v2
PM / Domains: Check domain status during hibernation restore of devices PM / Domains: Introduce "always on" device flag
PM / shmobile: Make TMU driver use pm_genpd_dev_always_on() PM / shmobile: Make CMT driver use pm_genpd_dev_always_on() PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()

Richard Weinberger (1):
UBI: fix error handling in ubi_scan()

Roland Dreier (6):
mlx4_core: Fix one more static exported function
tcm_loop: Set residual field for SCSI commands
target: Fix up handling of short INQUIRY buffers
target: Set peripheral device type consistently in INQUIRY response
target: Don't set WBUS16 or SYNC bits in INQUIRY response
target: Fix 16-bit target ports for SET TARGET PORT GROUPS emulation

Russell King (1):
genirq: Fix long-term regression in genirq irq_set_irq_type() handling

Sasha Levin (3):
math: Introduce div64_long
ntp: Fix integer overflow when setting time
module: Remove module size limit

Scott Dial (1):
usb-serial: Add support for the Sealevel SeaLINK+8 2038-ROHS device

Sekhar Nori (2):
gpio/davinci: fix oops on unbanked gpio irq request gpio/davinci: fix enabling unbanked GPIO IRQs

Sergei Shtylyov (1):
pata_legacy: correctly mask recovery field for HT6560B

Shengzhou Liu (1):
powerpc/usb: fix bug of kernel hang when initializing usb

Simon Graham (1):
rtlwifi: Handle previous allocation failures when freeing device memory

Srivatsa S. Bhat (1):
PM / Hibernate: Enable usermodehelpers in hibernate() error path

Steffen Klassert (1):
xfrm: Access the replay notify functions via the registered callbacks

Steffen Persvold (1):
iommu/amd: Fix section warning for prealloc_protection_domains

Stephen Warren (2):
ARM: tegra: select required CPU and L2 errata options
ARM: tegra: Fix device tree AUXDATA for USB/EHCI

Supriya Karanth (1):
usb: musb: Reselect index reg in interrupt context

Suresh Siddha (1):
x86/ioapic: Add register level checks to detect bogus io-apic entries

Takashi YOSHII (1):
serial: sh-sci: fix a race of DMA submit_tx on transfer

Tarun Kanti DebBarma (1):
gpio/omap: fix _set_gpio_irqenable implementation

Theodore Ts'o (1):
ext4: check for zero length extent

Thierry Reding (1):
x86-32: Fix typo for mq_getsetattr in syscall table

Thomas Faber (1):
usb: gadgetfs: return number of bytes on ep0 read request

Thomas Gleixner (1):
futex: Cover all PI opcodes with cmpxchg enabled check

Tim Gardner (1):
TPM: Zero buffer whole after copying to userspace

Timur Tabi (1):
ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master

Trond Myklebust (6):
NFS: Properly handle the case where the delegation is revoked
NFSv4: Return the delegation if the server returns NFS4ERR_OPENMODE
SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()
NFSv4: Rate limit the state manager warning messages
NFSv4: Fix two infinite loops in the mount code NFSv4.1: Fix layoutcommit error handling

Xi Wang (1):

      lgdt330x: fix signedness error in i2c_read_demod_bytes()

Yoichi Yuasa (1):
gma500: Fix mmap frambuffer

stephen hemminger (1):
sky2: override for PCI legacy power management

[email protected] (2):
usbnet: increase URB reference count before usb_unlink_urb
usbnet: don't clear urb->dev in tx_complete

author maintainer
#1 lore raw
Makefile +1 -1
index 1932984..026a227 100644
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 3
-SUBLEVEL = 0
+SUBLEVEL = 1
 EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 
arch/arm/mach-shmobile/setup-sh7372.c +2 -0
index a83cf51..cccf91b 100644
@@ -1043,6 +1043,8 @@ void __init sh7372_add_standard_devices(void)
 	sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device);
 	sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device);
 	sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device);
+	sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device);
+	sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device);
 }
 
 void __init sh7372_add_early_devices(void)
arch/arm/mach-tegra/Kconfig +12 -0
index 373652d..46b6839 100644
@@ -10,6 +10,13 @@ config ARCH_TEGRA_2x_SOC
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 	select USB_ULPI if USB_SUPPORT
 	select USB_ULPI_VIEWPORT if USB_SUPPORT
+	select ARM_ERRATA_720789
+	select ARM_ERRATA_742230
+	select ARM_ERRATA_751472
+	select ARM_ERRATA_754327
+	select ARM_ERRATA_764369
+	select PL310_ERRATA_727915 if CACHE_L2X0
+	select PL310_ERRATA_769419 if CACHE_L2X0
 	help
 	  Support for NVIDIA Tegra AP20 and T20 processors, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -23,6 +30,11 @@ config ARCH_TEGRA_3x_SOC
 	select USB_ULPI if USB_SUPPORT
 	select USB_ULPI_VIEWPORT if USB_SUPPORT
 	select USE_OF
+	select ARM_ERRATA_743622
+	select ARM_ERRATA_751472
+	select ARM_ERRATA_754322
+	select ARM_ERRATA_764369
+	select PL310_ERRATA_769419 if CACHE_L2X0
 	help
 	  Support for NVIDIA Tegra T30 processor family, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
arch/arm/mach-tegra/board-dt-tegra20.c +3 -3
index 7a95e0b..7cd3456 100644
@@ -68,11 +68,11 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",
-		       &tegra_ehci1_device.dev.platform_data),
+		       &tegra_ehci1_pdata),
 	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",
-		       &tegra_ehci2_device.dev.platform_data),
+		       &tegra_ehci2_pdata),
 	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",
-		       &tegra_ehci3_device.dev.platform_data),
+		       &tegra_ehci3_pdata),
 	{}
 };
 
arch/arm/mach-tegra/devices.c +3 -4
index 7a2a02d..5f6b867 100644
@@ -23,7 +23,6 @@
 #include <linux/fsl_devices.h>
 #include <linux/serial_8250.h>
 #include <linux/i2c-tegra.h>
-#include <linux/platform_data/tegra_usb.h>
 #include <asm/pmu.h>
 #include <mach/irqs.h>
 #include <mach/iomap.h>
@@ -446,18 +445,18 @@ static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {
 	.clk = "cdev2",
 };
 
-static struct tegra_ehci_platform_data tegra_ehci1_pdata = {
+struct tegra_ehci_platform_data tegra_ehci1_pdata = {
 	.operating_mode = TEGRA_USB_OTG,
 	.power_down_on_bus_suspend = 1,
 };
 
-static struct tegra_ehci_platform_data tegra_ehci2_pdata = {
+struct tegra_ehci_platform_data tegra_ehci2_pdata = {
 	.phy_config = &tegra_ehci2_ulpi_phy_config,
 	.operating_mode = TEGRA_USB_HOST,
 	.power_down_on_bus_suspend = 1,
 };
 
-static struct tegra_ehci_platform_data tegra_ehci3_pdata = {
+struct tegra_ehci_platform_data tegra_ehci3_pdata = {
 	.operating_mode = TEGRA_USB_HOST,
 	.power_down_on_bus_suspend = 1,
 };
arch/arm/mach-tegra/devices.h +5 -0
index 873ecb2..ec45567 100644
@@ -20,6 +20,11 @@
 #define __MACH_TEGRA_DEVICES_H
 
 #include <linux/platform_device.h>
+#include <linux/platform_data/tegra_usb.h>
+
+extern struct tegra_ehci_platform_data tegra_ehci1_pdata;
+extern struct tegra_ehci_platform_data tegra_ehci2_pdata;
+extern struct tegra_ehci_platform_data tegra_ehci3_pdata;
 
 extern struct platform_device tegra_gpio_device;
 extern struct platform_device tegra_pinmux_device;
arch/x86/kernel/apic/io_apic.c +32 -8
index fb07275..6d10a66 100644
@@ -3967,18 +3967,36 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi)
 static __init int bad_ioapic(unsigned long address)
 {
 	if (nr_ioapics >= MAX_IO_APICS) {
-		printk(KERN_WARNING "WARNING: Max # of I/O APICs (%d) exceeded "
-		       "(found %d), skipping\n", MAX_IO_APICS, nr_ioapics);
+		pr_warn("WARNING: Max # of I/O APICs (%d) exceeded (found %d), skipping\n",
+			MAX_IO_APICS, nr_ioapics);
 		return 1;
 	}
 	if (!address) {
-		printk(KERN_WARNING "WARNING: Bogus (zero) I/O APIC address"
-		       " found in table, skipping!\n");
+		pr_warn("WARNING: Bogus (zero) I/O APIC address found in table, skipping!\n");
 		return 1;
 	}
 	return 0;
 }
 
+static __init int bad_ioapic_register(int idx)
+{
+	union IO_APIC_reg_00 reg_00;
+	union IO_APIC_reg_01 reg_01;
+	union IO_APIC_reg_02 reg_02;
+
+	reg_00.raw = io_apic_read(idx, 0);
+	reg_01.raw = io_apic_read(idx, 1);
+	reg_02.raw = io_apic_read(idx, 2);
+
+	if (reg_00.raw == -1 && reg_01.raw == -1 && reg_02.raw == -1) {
+		pr_warn("I/O APIC 0x%x registers return all ones, skipping!\n",
+			mpc_ioapic_addr(idx));
+		return 1;
+	}
+
+	return 0;
+}
+
 void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 {
 	int idx = 0;
@@ -3995,6 +4013,12 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 	ioapics[idx].mp_config.apicaddr = address;
 
 	set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
+
+	if (bad_ioapic_register(idx)) {
+		clear_fixmap(FIX_IO_APIC_BASE_0 + idx);
+		return;
+	}
+
 	ioapics[idx].mp_config.apicid = io_apic_unique_id(id);
 	ioapics[idx].mp_config.apicver = io_apic_get_version(idx);
 
@@ -4015,10 +4039,10 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 	if (gsi_cfg->gsi_end >= gsi_top)
 		gsi_top = gsi_cfg->gsi_end + 1;
 
-	printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "
-	       "GSI %d-%d\n", idx, mpc_ioapic_id(idx),
-	       mpc_ioapic_ver(idx), mpc_ioapic_addr(idx),
-	       gsi_cfg->gsi_base, gsi_cfg->gsi_end);
+	pr_info("IOAPIC[%d]: apic_id %d, version %d, address 0x%x, GSI %d-%d\n",
+		idx, mpc_ioapic_id(idx),
+		mpc_ioapic_ver(idx), mpc_ioapic_addr(idx),
+		gsi_cfg->gsi_base, gsi_cfg->gsi_end);
 
 	nr_ioapics++;
 }
arch/x86/kernel/entry_32.S +10 -7
index 79d97e6..7b784f4 100644
@@ -98,12 +98,6 @@
 #endif
 .endm
 
-#ifdef CONFIG_VM86
-#define resume_userspace_sig	check_userspace
-#else
-#define resume_userspace_sig	resume_userspace
-#endif
-
 /*
  * User gs save/restore
  *
@@ -327,10 +321,19 @@ ret_from_exception:
 	preempt_stop(CLBR_ANY)
 ret_from_intr:
 	GET_THREAD_INFO(%ebp)
-check_userspace:
+resume_userspace_sig:
+#ifdef CONFIG_VM86
 	movl PT_EFLAGS(%esp), %eax	# mix EFLAGS and CS
 	movb PT_CS(%esp), %al
 	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
+#else
+	/*
+	 * We can be coming here from a syscall done in the kernel space,
+	 * e.g. a failed kernel_execve().
+	 */
+	movl PT_CS(%esp), %eax
+	andl $SEGMENT_RPL_MASK, %eax
+#endif
 	cmpl $USER_RPL, %eax
 	jb resume_kernel		# not returning to v8086 or userspace
 
arch/x86/kernel/tls.c +2 -2
index 6bb7b85..bcfec2d 100644
@@ -163,7 +163,7 @@ int regset_tls_get(struct task_struct *target, const struct user_regset *regset,
 {
 	const struct desc_struct *tls;
 
-	if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+	if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
 	    (pos % sizeof(struct user_desc)) != 0 ||
 	    (count % sizeof(struct user_desc)) != 0)
 		return -EINVAL;
@@ -198,7 +198,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
 	struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
 	const struct user_desc *info;
 
-	if (pos > GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
+	if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
 	    (pos % sizeof(struct user_desc)) != 0 ||
 	    (count % sizeof(struct user_desc)) != 0)
 		return -EINVAL;
arch/x86/kernel/tsc.c +10 -0
index a62c201..6fcfcb3 100644
@@ -932,6 +932,16 @@ static int __init init_tsc_clocksource(void)
 		clocksource_tsc.rating = 0;
 		clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
 	}
+
+	/*
+	 * Trust the results of the earlier calibration on systems
+	 * exporting a reliable TSC.
+	 */
+	if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) {
+		clocksource_register_khz(&clocksource_tsc, tsc_khz);
+		return 0;
+	}
+
 	schedule_delayed_work(&tsc_irqwork, 0);
 	return 0;
 }
arch/x86/kernel/vm86_32.c +2 -0
index b466cab..328cb37 100644
@@ -172,6 +172,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
 	spinlock_t *ptl;
 	int i;
 
+	down_write(&mm->mmap_sem);
 	pgd = pgd_offset(mm, 0xA0000);
 	if (pgd_none_or_clear_bad(pgd))
 		goto out;
@@ -190,6 +191,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
 	}
 	pte_unmap_unlock(pte, ptl);
 out:
+	up_write(&mm->mmap_sem);
 	flush_tlb();
 }
 
arch/x86/net/bpf_jit_comp.c +5 -9
index 7c1b765..5671752 100644
@@ -475,8 +475,10 @@ void bpf_jit_compile(struct sk_filter *fp)
 			case BPF_S_LD_W_ABS:
 				func = sk_load_word;
 common_load:			seen |= SEEN_DATAREF;
-				if ((int)K < 0)
+				if ((int)K < 0) {
+					/* Abort the JIT because __load_pointer() is needed. */
 					goto out;
+				}
 				t_offset = func - (image + addrs[i]);
 				EMIT1_off32(0xbe, K); /* mov imm32,%esi */
 				EMIT1_off32(0xe8, t_offset); /* call */
@@ -489,14 +491,8 @@ common_load:			seen |= SEEN_DATAREF;
 				goto common_load;
 			case BPF_S_LDX_B_MSH:
 				if ((int)K < 0) {
-					if (pc_ret0 > 0) {
-						/* addrs[pc_ret0 - 1] is the start address */
-						EMIT_JMP(addrs[pc_ret0 - 1] - addrs[i]);
-						break;
-					}
-					CLEAR_A();
-					EMIT_JMP(cleanup_addr - addrs[i]);
-					break;
+					/* Abort the JIT because __load_pointer() is needed. */
+					goto out;
 				}
 				seen |= SEEN_DATAREF | SEEN_XREG;
 				t_offset = sk_load_byte_msh - (image + addrs[i]);
arch/x86/syscalls/syscall_32.tbl +1 -1
index ce98e28..e7e67cc 100644
@@ -288,7 +288,7 @@
 279	i386	mq_timedsend		sys_mq_timedsend		compat_sys_mq_timedsend
 280	i386	mq_timedreceive		sys_mq_timedreceive		compat_sys_mq_timedreceive
 281	i386	mq_notify		sys_mq_notify			compat_sys_mq_notify
-282	i386	mq_getsetaddr		sys_mq_getsetattr		compat_sys_mq_getsetattr
+282	i386	mq_getsetattr		sys_mq_getsetattr		compat_sys_mq_getsetattr
 283	i386	kexec_load		sys_kexec_load			compat_sys_kexec_load
 284	i386	waitid			sys_waitid			compat_sys_waitid
 # 285 sys_setaltroot
drivers/ata/ahci.c +0 -2
index d07bf03..ddeb845 100644
@@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p5wdh_ops = {
 	.hardreset		= ahci_p5wdh_hardreset,
 };
 
-#define AHCI_HFLAGS(flags)	.private_data	= (void *)(flags)
-
 static const struct ata_port_info ahci_port_info[] = {
 	/* by features */
 	[board_ahci] =
drivers/ata/ahci.h +6 -0
index b175000..c2594dd 100644
@@ -195,6 +195,9 @@ enum {
 	PORT_FBS_EN		= (1 << 0), /* Enable FBS */
 
 	/* hpriv->flags bits */
+
+#define AHCI_HFLAGS(flags)		.private_data	= (void *)(flags)
+
 	AHCI_HFLAG_NO_NCQ		= (1 << 0),
 	AHCI_HFLAG_IGN_IRQ_IF_ERR	= (1 << 1), /* ignore IRQ_IF_ERR */
 	AHCI_HFLAG_IGN_SERR_INTERNAL	= (1 << 2), /* ignore SERR_INTERNAL */
@@ -210,6 +213,9 @@ enum {
 	AHCI_HFLAG_NO_SNTF		= (1 << 12), /* no sntf */
 	AHCI_HFLAG_NO_FPDMA_AA		= (1 << 13), /* no FPDMA AA */
 	AHCI_HFLAG_YES_FBS		= (1 << 14), /* force FBS cap on */
+	AHCI_HFLAG_DELAY_ENGINE		= (1 << 15), /* do not start engine on
+						        port start (wait until
+						        error-handling stage) */
 
 	/* ap->flags bits */
 
drivers/ata/ahci_platform.c +11 -0
index 48be4e1..0c86c77 100644
@@ -26,6 +26,7 @@
 enum ahci_type {
 	AHCI,		/* standard platform ahci */
 	IMX53_AHCI,	/* ahci on i.mx53 */
+	STRICT_AHCI,	/* delayed DMA engine start */
 };
 
 static struct platform_device_id ahci_devtype[] = {
@@ -36,6 +37,9 @@ static struct platform_device_id ahci_devtype[] = {
 		.name = "imx53-ahci",
 		.driver_data = IMX53_AHCI,
 	}, {
+		.name = "strict-ahci",
+		.driver_data = STRICT_AHCI,
+	}, {
 		/* sentinel */
 	}
 };
@@ -56,6 +60,13 @@ static const struct ata_port_info ahci_port_info[] = {
 		.udma_mask	= ATA_UDMA6,
 		.port_ops	= &ahci_pmp_retry_srst_ops,
 	},
+	[STRICT_AHCI] = {
+		AHCI_HFLAGS	(AHCI_HFLAG_DELAY_ENGINE),
+		.flags		= AHCI_FLAG_COMMON,
+		.pio_mask	= ATA_PIO4,
+		.udma_mask	= ATA_UDMA6,
+		.port_ops	= &ahci_ops,
+	},
 };
 
 static struct scsi_host_template ahci_platform_sht = {
drivers/ata/libahci.c +5 -0
index a72bfd0..f9eaa82 100644
@@ -737,6 +737,7 @@ static void ahci_power_down(struct ata_port *ap)
 
 static void ahci_start_port(struct ata_port *ap)
 {
+	struct ahci_host_priv *hpriv = ap->host->private_data;
 	struct ahci_port_priv *pp = ap->private_data;
 	struct ata_link *link;
 	struct ahci_em_priv *emp;
@@ -746,6 +747,10 @@ static void ahci_start_port(struct ata_port *ap)
 	/* enable FIS reception */
 	ahci_start_fis_rx(ap);
 
+	/* enable DMA */
+	if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE))
+		ahci_start_engine(ap);
+
 	/* turn on LEDs */
 	if (ap->flags & ATA_FLAG_EM) {
 		ata_for_each_link(link, ap, EDGE) {
drivers/ata/pata_legacy.c +1 -2
index 35aca7d..4fe9d21 100644
@@ -401,8 +401,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
 	ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
 
 	active = clamp_val(t.active, 2, 15);
-	recover = clamp_val(t.recover, 2, 16);
-	recover &= 0x15;
+	recover = clamp_val(t.recover, 2, 16) & 0x0F;
 
 	inb(0x3E6);
 	inb(0x3E6);
drivers/base/power/domain.c +52 -15

134 lines not on this page · raw message

drivers/bluetooth/ath3k.c +1 -0
index 07f14d1..4eca6e5 100644
@@ -65,6 +65,7 @@ static struct usb_device_id ath3k_table[] = {
 	{ USB_DEVICE(0x0CF3, 0x3002) },
 	{ USB_DEVICE(0x13d3, 0x3304) },
 	{ USB_DEVICE(0x0930, 0x0215) },
+	{ USB_DEVICE(0x0489, 0xE03D) },
 
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03F0, 0x311D) },
drivers/bluetooth/btusb.c +1 -0
index 789c9b5..1f91da3 100644
@@ -121,6 +121,7 @@ static struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
 
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
drivers/char/tpm/Kconfig +0 -1
index 7fc75e4..a048199 100644
@@ -5,7 +5,6 @@
 menuconfig TCG_TPM
 	tristate "TPM Hardware Support"
 	depends on HAS_IOMEM
-	depends on EXPERIMENTAL
 	select SECURITYFS
 	---help---
 	  If you have a TPM security chip in your system, which
drivers/char/tpm/tpm.c +2 -1
index 32362cf..ad7c732 100644
@@ -1221,12 +1221,13 @@ ssize_t tpm_read(struct file *file, char __user *buf,
 	ret_size = atomic_read(&chip->data_pending);
 	atomic_set(&chip->data_pending, 0);
 	if (ret_size > 0) {	/* relay data */
+		ssize_t orig_ret_size = ret_size;
 		if (size < ret_size)
 			ret_size = size;
 
 		mutex_lock(&chip->buffer_mutex);
 		rc = copy_to_user(buf, chip->data_buffer, ret_size);
-		memset(chip->data_buffer, 0, ret_size);
+		memset(chip->data_buffer, 0, orig_ret_size);
 		if (rc)
 			ret_size = -EFAULT;
 
drivers/clocksource/sh_cmt.c +4 -0
index ca09bc4..32fe9ef 100644
@@ -32,6 +32,7 @@
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_domain.h>
 
 struct sh_cmt_priv {
 	void __iomem *mapbase;
@@ -689,6 +690,9 @@ static int __devinit sh_cmt_probe(struct platform_device *pdev)
 	struct sh_cmt_priv *p = platform_get_drvdata(pdev);
 	int ret;
 
+	if (!is_early_platform_device(pdev))
+		pm_genpd_dev_always_on(&pdev->dev, true);
+
 	if (p) {
 		dev_info(&pdev->dev, "kept as earlytimer\n");
 		return 0;
drivers/clocksource/sh_mtu2.c +4 -0
index db8d595..a2172f6 100644
@@ -31,6 +31,7 @@
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_domain.h>
 
 struct sh_mtu2_priv {
 	void __iomem *mapbase;
@@ -306,6 +307,9 @@ static int __devinit sh_mtu2_probe(struct platform_device *pdev)
 	struct sh_mtu2_priv *p = platform_get_drvdata(pdev);
 	int ret;
 
+	if (!is_early_platform_device(pdev))
+		pm_genpd_dev_always_on(&pdev->dev, true);
+
 	if (p) {
 		dev_info(&pdev->dev, "kept as earlytimer\n");
 		return 0;
drivers/clocksource/sh_tmu.c +4 -0
index 079e96a..97f54b6 100644
@@ -32,6 +32,7 @@
 #include <linux/sh_timer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_domain.h>
 
 struct sh_tmu_priv {
 	void __iomem *mapbase;
@@ -410,6 +411,9 @@ static int __devinit sh_tmu_probe(struct platform_device *pdev)
 	struct sh_tmu_priv *p = platform_get_drvdata(pdev);
 	int ret;
 
+	if (!is_early_platform_device(pdev))
+		pm_genpd_dev_always_on(&pdev->dev, true);
+
 	if (p) {
 		dev_info(&pdev->dev, "kept as earlytimer\n");
 		return 0;
drivers/firewire/ohci.c +2 -3
index 7f5f0da..0a0225a 100644
@@ -2748,7 +2748,7 @@ static int handle_ir_buffer_fill(struct context *context,
 		container_of(context, struct iso_context, context);
 	u32 buffer_dma;
 
-	if (!last->transfer_status)
+	if (last->res_count != 0)
 		/* Descriptor(s) not done yet, stop iteration */
 		return 0;
 
@@ -2762,8 +2762,7 @@ static int handle_ir_buffer_fill(struct context *context,
 	if (le16_to_cpu(last->control) & DESCRIPTOR_IRQ_ALWAYS)
 		ctx->base.callback.mc(&ctx->base,
 				      le32_to_cpu(last->data_address) +
-				      le16_to_cpu(last->req_count) -
-				      le16_to_cpu(last->res_count),
+				      le16_to_cpu(last->req_count),
 				      ctx->base.callback_data);
 
 	return 1;
drivers/gpio/gpio-davinci.c +16 -10
index df0d595..3d00016 100644
@@ -313,10 +313,16 @@ static int gpio_to_irq_unbanked(struct gpio_chip *chip, unsigned offset)
 		return -ENODEV;
 }
 
-static int gpio_irq_type_unbanked(struct irq_data *d, unsigned trigger)
+static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger)
 {
-	struct davinci_gpio_regs __iomem *g = irq2regs(d->irq);
-	u32 mask = (u32) irq_data_get_irq_handler_data(d);
+	struct davinci_gpio_controller *d;
+	struct davinci_gpio_regs __iomem *g;
+	struct davinci_soc_info *soc_info = &davinci_soc_info;
+	u32 mask;
+
+	d = (struct davinci_gpio_controller *)data->handler_data;
+	g = (struct davinci_gpio_regs __iomem *)d->regs;
+	mask = __gpio_mask(data->irq - soc_info->gpio_irq);
 
 	if (trigger & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
 		return -EINVAL;
@@ -380,7 +386,7 @@ static int __init davinci_gpio_irq_setup(void)
 	 * IRQ mux conflicts; gpio_irq_type_unbanked() is only for GPIOs.
 	 */
 	if (soc_info->gpio_unbanked) {
-		static struct irq_chip gpio_irqchip_unbanked;
+		static struct irq_chip_type gpio_unbanked;
 
 		/* pass "bank 0" GPIO IRQs to AINTC */
 		chips[0].chip.to_irq = gpio_to_irq_unbanked;
@@ -388,9 +394,10 @@ static int __init davinci_gpio_irq_setup(void)
 
 		/* AINTC handles mask/unmask; GPIO handles triggering */
 		irq = bank_irq;
-		gpio_irqchip_unbanked = *irq_get_chip(irq);
-		gpio_irqchip_unbanked.name = "GPIO-AINTC";
-		gpio_irqchip_unbanked.irq_set_type = gpio_irq_type_unbanked;
+		gpio_unbanked = *container_of(irq_get_chip(irq),
+					      struct irq_chip_type, chip);
+		gpio_unbanked.chip.name = "GPIO-AINTC";
+		gpio_unbanked.chip.irq_set_type = gpio_irq_type_unbanked;
 
 		/* default trigger: both edges */
 		g = gpio2regs(0);
@@ -399,9 +406,8 @@ static int __init davinci_gpio_irq_setup(void)
 
 		/* set the direct IRQs up to use that irqchip */
 		for (gpio = 0; gpio < soc_info->gpio_unbanked; gpio++, irq++) {
-			irq_set_chip(irq, &gpio_irqchip_unbanked);
-			irq_set_handler_data(irq, (void *)__gpio_mask(gpio));
-			irq_set_chip_data(irq, (__force void *)g);
+			irq_set_chip(irq, &gpio_unbanked.chip);
+			irq_set_handler_data(irq, &chips[gpio / 32]);
 			irq_set_status_flags(irq, IRQ_TYPE_EDGE_BOTH);
 		}
 
drivers/gpio/gpio-omap.c +4 -1
index 0b05629..a6c10e8 100644
@@ -508,7 +508,10 @@ static void _disable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
 
 static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int enable)
 {
-	_enable_gpio_irqbank(bank, GPIO_BIT(bank, gpio));
+	if (enable)
+		_enable_gpio_irqbank(bank, GPIO_BIT(bank, gpio));
+	else
+		_disable_gpio_irqbank(bank, GPIO_BIT(bank, gpio));
 }
 
 /*
drivers/gpu/drm/gma500/framebuffer.c +1 -1
index be61673..5154493 100644
@@ -158,7 +158,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 	unsigned long phys_addr = (unsigned long)dev_priv->stolen_base;
 
 	page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-	address = (unsigned long)vmf->virtual_address;
+	address = (unsigned long)vmf->virtual_address - (vmf->pgoff << PAGE_SHIFT);
 
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
drivers/gpu/drm/i915/i915_drv.c +7 -0
index 308f819..c1043e5 100644
@@ -442,6 +442,10 @@ static int i915_drm_freeze(struct drm_device *dev)
 	/* Modeset on resume, not lid events */
 	dev_priv->modeset_on_lid = 0;
 
+	console_lock();
+	intel_fbdev_set_suspend(dev, 1);
+	console_unlock();
+
 	return 0;
 }
 
@@ -514,6 +518,9 @@ static int i915_drm_thaw(struct drm_device *dev)
 
 	dev_priv->modeset_on_lid = 0;
 
+	console_lock();
+	intel_fbdev_set_suspend(dev, 0);
+	console_unlock();
 	return error;
 }
 
drivers/gpu/drm/i915/i915_gem.c +5 -2
index e55badb..60a84aa 100644
@@ -3084,10 +3084,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
 			return ret;
 	}
 
+	ret = i915_gem_object_wait_rendering(obj);
+	if (ret)
+		return ret;
+
 	/* Ensure that we invalidate the GPU's caches and TLBs. */
 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
-
-	return i915_gem_object_wait_rendering(obj);
+	return 0;
 }
 
 /**
drivers/gpu/drm/i915/intel_drv.h +1 -1
index 1348705..e85f976 100644
@@ -381,7 +381,7 @@ extern int intel_framebuffer_init(struct drm_device *dev,
 				  struct drm_i915_gem_object *obj);
 extern int intel_fbdev_init(struct drm_device *dev);
 extern void intel_fbdev_fini(struct drm_device *dev);
-
+extern void intel_fbdev_set_suspend(struct drm_device *dev, int state);
 extern void intel_prepare_page_flip(struct drm_device *dev, int plane);
 extern void intel_finish_page_flip(struct drm_device *dev, int pipe);
 extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane);
drivers/gpu/drm/i915/intel_fb.c +10 -0
index 571375a..12a04b9 100644
@@ -258,6 +258,16 @@ void intel_fbdev_fini(struct drm_device *dev)
 	kfree(dev_priv->fbdev);
 	dev_priv->fbdev = NULL;
 }
+
+void intel_fbdev_set_suspend(struct drm_device *dev, int state)
+{
+	drm_i915_private_t *dev_priv = dev->dev_private;
+	if (!dev_priv->fbdev)
+		return;
+
+	fb_set_suspend(dev_priv->fbdev->helper.fbdev, state);
+}
+
 MODULE_LICENSE("GPL and additional rights");
 
 void intel_fb_output_poll_changed(struct drm_device *dev)
drivers/gpu/drm/radeon/atombios_crtc.c +5 -3
index 742f17f..24ed306 100644
@@ -550,8 +550,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
 		if (encoder->crtc == crtc) {
 			radeon_encoder = to_radeon_encoder(encoder);
 			connector = radeon_get_connector_for_encoder(encoder);
-			if (connector && connector->display_info.bpc)
-				bpc = connector->display_info.bpc;
+			/* if (connector && connector->display_info.bpc)
+				bpc = connector->display_info.bpc; */
 			encoder_mode = atombios_get_encoder_mode(encoder);
 			is_duallink = radeon_dig_monitor_is_duallink(encoder, mode->clock);
 			if ((radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||
@@ -922,7 +922,9 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
 		struct radeon_connector_atom_dig *dig_connector =
 			radeon_connector->con_priv;
 		int dp_clock;
-		bpc = connector->display_info.bpc;
+
+		/* if (connector->display_info.bpc)
+			bpc = connector->display_info.bpc; */
 
 		switch (encoder_mode) {
 		case ATOM_ENCODER_MODE_DP_MST:
drivers/gpu/drm/radeon/atombios_dp.c +3 -0
index 552b436..0d9abca 100644
@@ -405,10 +405,13 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE],
 /* get bpc from the EDID */
 static int convert_bpc_to_bpp(int bpc)
 {
+#if 0
 	if (bpc == 0)
 		return 24;
 	else
 		return bpc * 3;
+#endif
+	return 24;
 }
 
 /* get the max pix clock supported by the link rate and lane num */
drivers/gpu/drm/radeon/atombios_encoders.c +2 -2
index b88c460..8ed806a 100644
@@ -537,7 +537,7 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo
 		dp_clock = dig_connector->dp_clock;
 		dp_lane_count = dig_connector->dp_lane_count;
 		hpd_id = radeon_connector->hpd.hpd;
-		bpc = connector->display_info.bpc;
+		/* bpc = connector->display_info.bpc; */
 	}
 
 	/* no dig encoder assigned */
@@ -1098,7 +1098,7 @@ atombios_external_encoder_setup(struct drm_encoder *encoder,
 		dp_lane_count = dig_connector->dp_lane_count;
 		connector_object_id =
 			(radeon_connector->connector_object_id & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT;
-		bpc = connector->display_info.bpc;
+		/* bpc = connector->display_info.bpc; */
 	}
 
 	memset(&args, 0, sizeof(args));
drivers/gpu/drm/radeon/radeon_atombios.c +14 -0
index 1f53ae7..7354137 100644
@@ -442,6 +442,20 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
 		struct radeon_device *rdev = dev->dev_private;
 		*i2c_bus = radeon_lookup_i2c_gpio(rdev, 0x93);
 	}
+
+	/* Fujitsu D3003-S2 board lists DVI-I as DVI-D and VGA */
+	if ((dev->pdev->device == 0x9802) &&
+	    (dev->pdev->subsystem_vendor == 0x1734) &&
+	    (dev->pdev->subsystem_device == 0x11bd)) {
+		if (*connector_type == DRM_MODE_CONNECTOR_VGA) {
+			*connector_type = DRM_MODE_CONNECTOR_DVII;
+			*line_mux = 0x3103;
+		} else if (*connector_type == DRM_MODE_CONNECTOR_DVID) {
+			*connector_type = DRM_MODE_CONNECTOR_DVII;
+		}
+	}
+
+
 	return true;
 }
 
drivers/gpu/drm/radeon/radeon_connectors.c +4 -0
index 8c9a811..d2e6144 100644
@@ -946,6 +946,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 
 			encoder = obj_to_encoder(obj);
 
+			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC ||
+			    encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
+				continue;
+
 			encoder_funcs = encoder->helper_private;
 			if (encoder_funcs->detect) {
 				if (ret != connector_status_connected) {
drivers/gpu/drm/radeon/radeon_cursor.c +11 -2
index fde25c0..986d608 100644
@@ -151,7 +151,9 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 			   uint32_t height)
 {
 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+	struct radeon_device *rdev = crtc->dev->dev_private;
 	struct drm_gem_object *obj;
+	struct radeon_bo *robj;
 	uint64_t gpu_addr;
 	int ret;
 
@@ -173,7 +175,15 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 		return -ENOENT;
 	}
 
-	ret = radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &gpu_addr);
+	robj = gem_to_radeon_bo(obj);
+	ret = radeon_bo_reserve(robj, false);
+	if (unlikely(ret != 0))
+		goto fail;
+	/* Only 27 bit offset for legacy cursor */
+	ret = radeon_bo_pin_restricted(robj, RADEON_GEM_DOMAIN_VRAM,
+				       ASIC_IS_AVIVO(rdev) ? 0 : 1 << 27,
+				       &gpu_addr);
+	radeon_bo_unreserve(robj);
 	if (ret)
 		goto fail;
 
@@ -181,7 +191,6 @@ int radeon_crtc_cursor_set(struct drm_crtc *crtc,
 	radeon_crtc->cursor_height = height;
 
 	radeon_lock_cursor(crtc, true);
-	/* XXX only 27 bit offset for legacy cursor */
 	radeon_set_cursor(crtc, obj, gpu_addr);
 	radeon_show_cursor(crtc);
 	radeon_lock_cursor(crtc, false);
drivers/gpu/drm/radeon/radeon_object.c +17 -1
index d45df17..fd2dc0e 100644
@@ -224,7 +224,8 @@ void radeon_bo_unref(struct radeon_bo **bo)
 		*bo = NULL;
 }
 
-int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)
+int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,
+			     u64 *gpu_addr)
 {
 	int r, i;
 
@@ -232,6 +233,7 @@ int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)
 		bo->pin_count++;
 		if (gpu_addr)
 			*gpu_addr = radeon_bo_gpu_offset(bo);
+		WARN_ON_ONCE(max_offset != 0);
 		return 0;
 	}
 	radeon_ttm_placement_from_domain(bo, domain);
@@ -239,6 +241,15 @@ int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)
 		/* force to pin into visible video ram */
 		bo->placement.lpfn = bo->rdev->mc.visible_vram_size >> PAGE_SHIFT;
 	}
+	if (max_offset) {
+		u64 lpfn = max_offset >> PAGE_SHIFT;
+
+		if (!bo->placement.lpfn)
+			bo->placement.lpfn = bo->rdev->mc.gtt_size >> PAGE_SHIFT;
+
+		if (lpfn < bo->placement.lpfn)
+			bo->placement.lpfn = lpfn;
+	}
 	for (i = 0; i < bo->placement.num_placement; i++)
 		bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
 	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false, false);
@@ -252,6 +263,11 @@ int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)
 	return r;
 }
 
+int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr)
+{
+	return radeon_bo_pin_restricted(bo, domain, 0, gpu_addr);
+}
+
 int radeon_bo_unpin(struct radeon_bo *bo)
 {
 	int r, i;
drivers/gpu/drm/radeon/radeon_object.h +2 -0
index cde4303..f9104be 100644
@@ -118,6 +118,8 @@ extern int radeon_bo_kmap(struct radeon_bo *bo, void **ptr);
 extern void radeon_bo_kunmap(struct radeon_bo *bo);
 extern void radeon_bo_unref(struct radeon_bo **bo);
 extern int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr);
+extern int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain,
+				    u64 max_offset, u64 *gpu_addr);
 extern int radeon_bo_unpin(struct radeon_bo *bo);
 extern int radeon_bo_evict_vram(struct radeon_device *rdev);
 extern void radeon_bo_force_delete(struct radeon_device *rdev);
drivers/hid/hid-chicony.c +7 -0
index 8965ad9..b99af34 100644
@@ -45,6 +45,12 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 	case 0xff09: ch_map_key_clear(BTN_9);	break;
 	case 0xff0a: ch_map_key_clear(BTN_A);	break;
 	case 0xff0b: ch_map_key_clear(BTN_B);	break;
+	case 0x00f1: ch_map_key_clear(KEY_WLAN);	break;
+	case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);	break;
+	case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);	break;
+	case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF);	break;
+	case 0x00f7: ch_map_key_clear(KEY_CAMERA);	break;
+	case 0x00f8: ch_map_key_clear(KEY_PROG1);	break;
 	default:
 		return 0;
 	}
@@ -53,6 +59,7 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
 static const struct hid_device_id ch_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, ch_devices);
drivers/hid/hid-core.c +1 -0
index af08ce7..75dbe34 100644
@@ -1396,6 +1396,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },
drivers/hid/hid-ids.h +1 -0
index 63552e3..c7d0aa6 100644
@@ -193,6 +193,7 @@
 #define USB_DEVICE_ID_CHICONY_TACTICAL_PAD	0x0418
 #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d
 #define USB_DEVICE_ID_CHICONY_WIRELESS	0x0618
+#define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123
 
 #define USB_VENDOR_ID_CHUNGHWAT		0x2247
 #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001
drivers/hwmon/fam15h_power.c +1 -1
index 523f8fb..930370d 100644
@@ -60,7 +60,7 @@ static ssize_t show_power(struct device *dev,
 	pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
 				  REG_TDP_RUNNING_AVERAGE, &val);
 	running_avg_capture = (val >> 4) & 0x3fffff;
-	running_avg_capture = sign_extend32(running_avg_capture, 22);
+	running_avg_capture = sign_extend32(running_avg_capture, 21);
 	running_avg_range = val & 0xf;
 
 	pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
drivers/infiniband/ulp/iser/iscsi_iser.c +4 -14
index 9a43cb0..db43b31 100644
@@ -364,6 +364,9 @@ iscsi_iser_conn_bind(struct iscsi_cls_session *cls_session,
 	}
 	ib_conn = ep->dd_data;
 
+	if (iser_alloc_rx_descriptors(ib_conn))
+		return -ENOMEM;
+
 	/* binds the iSER connection retrieved from the previously
 	 * connected ep_handle to the iSCSI layer connection. exchanges
 	 * connection pointers */
@@ -398,19 +401,6 @@ iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
 	iser_conn->ib_conn = NULL;
 }
 
-static int
-iscsi_iser_conn_start(struct iscsi_cls_conn *cls_conn)
-{
-	struct iscsi_conn *conn = cls_conn->dd_data;
-	int err;
-
-	err = iser_conn_set_full_featured_mode(conn);
-	if (err)
-		return err;
-
-	return iscsi_conn_start(cls_conn);
-}
-
 static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session)
 {
 	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
@@ -724,7 +714,7 @@ static struct iscsi_transport iscsi_iser_transport = {
 	.get_conn_param		= iscsi_conn_get_param,
 	.get_ep_param		= iscsi_iser_get_ep_param,
 	.get_session_param	= iscsi_session_get_param,
-	.start_conn             = iscsi_iser_conn_start,
+	.start_conn             = iscsi_conn_start,
 	.stop_conn              = iscsi_iser_conn_stop,
 	/* iscsi host params */
 	.get_host_param		= iscsi_host_get_param,
drivers/infiniband/ulp/iser/iscsi_iser.h +1 -0
index db7ea37..296be43 100644
@@ -366,4 +366,5 @@ int iser_dma_map_task_data(struct iscsi_iser_task *iser_task,
 void iser_dma_unmap_task_data(struct iscsi_iser_task *iser_task);
 int  iser_initialize_task_headers(struct iscsi_task *task,
 			struct iser_tx_desc *tx_desc);
+int iser_alloc_rx_descriptors(struct iser_conn *ib_conn);
 #endif
drivers/infiniband/ulp/iser/iser_initiator.c +17 -13
index a607542..738a149 100644
@@ -170,7 +170,7 @@ static void iser_create_send_desc(struct iser_conn	*ib_conn,
 }
 
 
-static int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
+int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
 {
 	int i, j;
 	u64 dma_addr;
@@ -242,23 +242,24 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn)
 	kfree(ib_conn->rx_descs);
 }
 
-/**
- *  iser_conn_set_full_featured_mode - (iSER API)
- */
-int iser_conn_set_full_featured_mode(struct iscsi_conn *conn)
+static int iser_post_rx_bufs(struct iscsi_conn *conn, struct iscsi_hdr *req)
 {
 	struct iscsi_iser_conn *iser_conn = conn->dd_data;
 
-	iser_dbg("Initially post: %d\n", ISER_MIN_POSTED_RX);
-
-	/* Check that there is no posted recv or send buffers left - */
-	/* they must be consumed during the login phase */
-	BUG_ON(iser_conn->ib_conn->post_recv_buf_count != 0);
-	BUG_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
+	iser_dbg("req op %x flags %x\n", req->opcode, req->flags);
+	/* check if this is the last login - going to full feature phase */
+	if ((req->flags & ISCSI_FULL_FEATURE_PHASE) != ISCSI_FULL_FEATURE_PHASE)
+		return 0;
 
-	if (iser_alloc_rx_descriptors(iser_conn->ib_conn))
-		return -ENOMEM;
+	/*
+	 * Check that there is one posted recv buffer (for the last login
+	 * response) and no posted send buffers left - they must have been
+	 * consumed during previous login phases.
+	 */
+	WARN_ON(iser_conn->ib_conn->post_recv_buf_count != 1);
+	WARN_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);
 
+	iser_dbg("Initially post: %d\n", ISER_MIN_POSTED_RX);
 	/* Initial post receive buffers */
 	if (iser_post_recvm(iser_conn->ib_conn, ISER_MIN_POSTED_RX))
 		return -ENOMEM;
@@ -438,6 +439,9 @@ int iser_send_control(struct iscsi_conn *conn,
 		err = iser_post_recvl(iser_conn->ib_conn);
 		if (err)
 			goto send_control_error;
+		err = iser_post_rx_bufs(conn, task->hdr);
+		if (err)
+			goto send_control_error;
 	}
 
 	err = iser_post_send(iser_conn->ib_conn, mdesc);
drivers/infiniband/ulp/srpt/ib_srpt.c +12 -7
index 2b73d43..3c5c550 100644
@@ -1750,6 +1750,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
 		       srp_cmd->tag);
 		cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
 		cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
 		goto send_sense;
 	}
 
@@ -1757,15 +1758,19 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
 	cmd->data_direction = dir;
 	unpacked_lun = srpt_unpack_lun((uint8_t *)&srp_cmd->lun,
 				       sizeof(srp_cmd->lun));
-	if (transport_lookup_cmd_lun(cmd, unpacked_lun) < 0)
+	if (transport_lookup_cmd_lun(cmd, unpacked_lun) < 0) {
+		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
 		goto send_sense;
+	}
 	ret = transport_generic_allocate_tasks(cmd, srp_cmd->cdb);
-	if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT)
-		srpt_queue_status(cmd);
-	else if (cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION)
-		goto send_sense;
-	else
-		WARN_ON_ONCE(ret);
+	if (ret < 0) {
+		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
+		if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {
+			srpt_queue_status(cmd);
+			return 0;
+		} else
+			goto send_sense;
+	}
 
 	transport_handle_cdb_direct(cmd);
 	return 0;
drivers/iommu/amd_iommu.c +1 -1
index f75e060..ae2ec92 100644
@@ -2804,7 +2804,7 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)
  * we don't need to preallocate the protection domains anymore.
  * For now we have to.
  */
-static void prealloc_protection_domains(void)
+static void __init prealloc_protection_domains(void)
 {
 	struct iommu_dev_data *dev_data;
 	struct dma_ops_domain *dma_dom;
drivers/iommu/amd_iommu_init.c +20 -10
index a35e98a..c94a165 100644
@@ -1131,8 +1131,9 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
 {
 	int r;
 
-	if (pci_enable_msi(iommu->dev))
-		return 1;
+	r = pci_enable_msi(iommu->dev);
+	if (r)
+		return r;
 
 	r = request_threaded_irq(iommu->dev->irq,
 				 amd_iommu_int_handler,
@@ -1142,27 +1143,36 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
 
 	if (r) {
 		pci_disable_msi(iommu->dev);
-		return 1;
+		return r;
 	}
 
 	iommu->int_enabled = true;
-	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
-
-	if (iommu->ppr_log != NULL)
-		iommu_feature_enable(iommu, CONTROL_PPFINT_EN);
 
 	return 0;
 }
 
 static int iommu_init_msi(struct amd_iommu *iommu)
 {
+	int ret;
+
 	if (iommu->int_enabled)
-		return 0;
+		goto enable_faults;
 
 	if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
-		return iommu_setup_msi(iommu);
+		ret = iommu_setup_msi(iommu);
+	else
+		ret = -ENODEV;
 
-	return 1;
+	if (ret)
+		return ret;
+
+enable_faults:
+	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
+
+	if (iommu->ppr_log != NULL)
+		iommu_feature_enable(iommu, CONTROL_PPFINT_EN);
+
+	return 0;
 }
 
 /****************************************************************************
drivers/md/bitmap.c +2 -0
index cdf36b1..239af9a 100644
@@ -1904,6 +1904,8 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
 			if (mddev->pers) {
 				mddev->pers->quiesce(mddev, 1);
 				rv = bitmap_create(mddev);
+				if (!rv)
+					rv = bitmap_load(mddev);
 				if (rv) {
 					bitmap_destroy(mddev);
 					mddev->bitmap_info.offset = 0;
drivers/md/dm-crypt.c +20 -18
index 8c2a000..58d8c6d 100644
@@ -176,7 +176,6 @@ struct crypt_config {
 
 #define MIN_IOS        16
 #define MIN_POOL_PAGES 32
-#define MIN_BIO_PAGES  8
 
 static struct kmem_cache *_crypt_io_pool;
 
@@ -848,12 +847,11 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size,
 		}
 
 		/*
-		 * if additional pages cannot be allocated without waiting,
-		 * return a partially allocated bio, the caller will then try
-		 * to allocate additional bios while submitting this partial bio
+		 * If additional pages cannot be allocated without waiting,
+		 * return a partially-allocated bio.  The caller will then try
+		 * to allocate more bios while submitting this partial bio.
 		 */
-		if (i == (MIN_BIO_PAGES - 1))
-			gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
+		gfp_mask = (gfp_mask | __GFP_NOWARN) & ~__GFP_WAIT;
 
 		len = (size > PAGE_SIZE) ? PAGE_SIZE : size;
 
@@ -1046,16 +1044,14 @@ static void kcryptd_queue_io(struct dm_crypt_io *io)
 	queue_work(cc->io_queue, &io->work);
 }
 
-static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io,
-					  int error, int async)
+static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, int async)
 {
 	struct bio *clone = io->ctx.bio_out;
 	struct crypt_config *cc = io->target->private;
 
-	if (unlikely(error < 0)) {
+	if (unlikely(io->error < 0)) {
 		crypt_free_buffer_pages(cc, clone);
 		bio_put(clone);
-		io->error = -EIO;
 		crypt_dec_pending(io);
 		return;
 	}
@@ -1106,12 +1102,16 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
 		sector += bio_sectors(clone);
 
 		crypt_inc_pending(io);
+
 		r = crypt_convert(cc, &io->ctx);
+		if (r < 0)
+			io->error = -EIO;
+
 		crypt_finished = atomic_dec_and_test(&io->ctx.pending);
 
 		/* Encryption was already finished, submit io now */
 		if (crypt_finished) {
-			kcryptd_crypt_write_io_submit(io, r, 0);
+			kcryptd_crypt_write_io_submit(io, 0);
 
 			/*
 			 * If there was an error, do not try next fragments.
@@ -1162,11 +1162,8 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io)
 	crypt_dec_pending(io);
 }
 
-static void kcryptd_crypt_read_done(struct dm_crypt_io *io, int error)
+static void kcryptd_crypt_read_done(struct dm_crypt_io *io)
 {
-	if (unlikely(error < 0))
-		io->error = -EIO;
-
 	crypt_dec_pending(io);
 }
 
@@ -1181,9 +1178,11 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
 			   io->sector);
 
 	r = crypt_convert(cc, &io->ctx);
+	if (r < 0)
+		io->error = -EIO;
 
 	if (atomic_dec_and_test(&io->ctx.pending))
-		kcryptd_crypt_read_done(io, r);
+		kcryptd_crypt_read_done(io);
 
 	crypt_dec_pending(io);
 }
@@ -1204,15 +1203,18 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
 	if (!error && cc->iv_gen_ops && cc->iv_gen_ops->post)
 		error = cc->iv_gen_ops->post(cc, iv_of_dmreq(cc, dmreq), dmreq);
 
+	if (error < 0)
+		io->error = -EIO;
+
 	mempool_free(req_of_dmreq(cc, dmreq), cc->req_pool);
 
 	if (!atomic_dec_and_test(&ctx->pending))
 		return;
 
 	if (bio_data_dir(io->base_bio) == READ)
-		kcryptd_crypt_read_done(io, error);
+		kcryptd_crypt_read_done(io);
 	else
-		kcryptd_crypt_write_io_submit(io, error, 1);
+		kcryptd_crypt_write_io_submit(io, 1);
 }
 
 static void kcryptd_crypt(struct work_struct *work)
drivers/md/dm-exception-store.c +1 -1
index 042e719..aa70f7d 100644
@@ -283,7 +283,7 @@ int dm_exception_store_init(void)
 	return 0;
 
 persistent_fail:
-	dm_persistent_snapshot_exit();
+	dm_transient_snapshot_exit();
 transient_fail:
 	return r;
 }
drivers/md/dm-thin.c +73 -51

193 lines not on this page · raw message

drivers/md/md.c +17 -23
index ce88755..6acc846 100644
@@ -1805,13 +1805,13 @@ retry:
 						| BB_LEN(internal_bb));
 				*bbp++ = cpu_to_le64(store_bb);
 			}
+			bb->changed = 0;
 			if (read_seqretry(&bb->lock, seq))
 				goto retry;
 
 			bb->sector = (rdev->sb_start +
 				      (int)le32_to_cpu(sb->bblog_offset));
 			bb->size = le16_to_cpu(sb->bblog_size);
-			bb->changed = 0;
 		}
 	}
 
@@ -2366,6 +2366,7 @@ repeat:
 			clear_bit(MD_CHANGE_PENDING, &mddev->flags);
 			list_for_each_entry(rdev, &mddev->disks, same_set) {
 				if (rdev->badblocks.changed) {
+					rdev->badblocks.changed = 0;
 					md_ack_all_badblocks(&rdev->badblocks);
 					md_error(mddev, rdev);
 				}
@@ -8157,30 +8158,23 @@ static int md_notify_reboot(struct notifier_block *this,
 	struct mddev *mddev;
 	int need_delay = 0;
 
-	if ((code == SYS_DOWN) || (code == SYS_HALT) || (code == SYS_POWER_OFF)) {
-
-		printk(KERN_INFO "md: stopping all md devices.\n");
-
-		for_each_mddev(mddev, tmp) {
-			if (mddev_trylock(mddev)) {
-				/* Force a switch to readonly even array
-				 * appears to still be in use.  Hence
-				 * the '100'.
-				 */
-				md_set_readonly(mddev, 100);
-				mddev_unlock(mddev);
-			}
-			need_delay = 1;
+	for_each_mddev(mddev, tmp) {
+		if (mddev_trylock(mddev)) {
+			__md_stop_writes(mddev);
+			mddev->safemode = 2;
+			mddev_unlock(mddev);
 		}
-		/*
-		 * certain more exotic SCSI devices are known to be
-		 * volatile wrt too early system reboots. While the
-		 * right place to handle this issue is the given
-		 * driver, we do want to have a safe RAID driver ...
-		 */
-		if (need_delay)
-			mdelay(1000*1);
+		need_delay = 1;
 	}
+	/*
+	 * certain more exotic SCSI devices are known to be
+	 * volatile wrt too early system reboots. While the
+	 * right place to handle this issue is the given
+	 * driver, we do want to have a safe RAID driver ...
+	 */
+	if (need_delay)
+		mdelay(1000*1);
+
 	return NOTIFY_DONE;
 }
 
drivers/md/persistent-data/dm-btree-remove.c +99 -75

230 lines not on this page · raw message

drivers/md/raid1.c +15 -2
index a0b225e..118e0f6 100644
@@ -737,9 +737,22 @@ static void wait_barrier(struct r1conf *conf)
 	spin_lock_irq(&conf->resync_lock);
 	if (conf->barrier) {
 		conf->nr_waiting++;
-		wait_event_lock_irq(conf->wait_barrier, !conf->barrier,
+		/* Wait for the barrier to drop.
+		 * However if there are already pending
+		 * requests (preventing the barrier from
+		 * rising completely), and the
+		 * pre-process bio queue isn't empty,
+		 * then don't wait, as we need to empty
+		 * that queue to get the nr_pending
+		 * count down.
+		 */
+		wait_event_lock_irq(conf->wait_barrier,
+				    !conf->barrier ||
+				    (conf->nr_pending &&
+				     current->bio_list &&
+				     !bio_list_empty(current->bio_list)),
 				    conf->resync_lock,
-				    );
+			);
 		conf->nr_waiting--;
 	}
 	conf->nr_pending++;
drivers/md/raid10.c +15 -2
index 58c44d6..be7101d 100644
@@ -863,9 +863,22 @@ static void wait_barrier(struct r10conf *conf)
 	spin_lock_irq(&conf->resync_lock);
 	if (conf->barrier) {
 		conf->nr_waiting++;
-		wait_event_lock_irq(conf->wait_barrier, !conf->barrier,
+		/* Wait for the barrier to drop.
+		 * However if there are already pending
+		 * requests (preventing the barrier from
+		 * rising completely), and the
+		 * pre-process bio queue isn't empty,
+		 * then don't wait, as we need to empty
+		 * that queue to get the nr_pending
+		 * count down.
+		 */
+		wait_event_lock_irq(conf->wait_barrier,
+				    !conf->barrier ||
+				    (conf->nr_pending &&
+				     current->bio_list &&
+				     !bio_list_empty(current->bio_list)),
 				    conf->resync_lock,
-				    );
+			);
 		conf->nr_waiting--;
 	}
 	conf->nr_pending++;
drivers/media/dvb/dvb-usb/mxl111sf.c +2 -4
index 38ef025..81305de 100644
@@ -351,15 +351,13 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 					      adap_state->ep6_clockphase,
 					      0, 0);
 		mxl_fail(ret);
+#if 0
 	} else {
 		ret = mxl111sf_disable_656_port(state);
 		mxl_fail(ret);
+#endif
 	}
 
-	mxl111sf_read_reg(state, 0x12, &tmp);
-	tmp &= ~0x04;
-	mxl111sf_write_reg(state, 0x12, tmp);
-
 	return ret;
 }
 
drivers/media/dvb/frontends/au8522_dig.c +5 -5
index c688b95..25f6509 100644
@@ -588,11 +588,6 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
 	    (state->current_modulation == c->modulation))
 		return 0;
 
-	au8522_enable_modulation(fe, c->modulation);
-
-	/* Allow the demod to settle */
-	msleep(100);
-
 	if (fe->ops.tuner_ops.set_params) {
 		if (fe->ops.i2c_gate_ctrl)
 			fe->ops.i2c_gate_ctrl(fe, 1);
@@ -604,6 +599,11 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
 	if (ret < 0)
 		return ret;
 
+	/* Allow the tuner to settle */
+	msleep(100);
+
+	au8522_enable_modulation(fe, c->modulation);
+
 	state->current_frequency = c->frequency;
 
 	return 0;
drivers/media/dvb/frontends/lgdt330x.c +4 -2
index c990d35..e046622 100644
@@ -104,8 +104,8 @@ static int i2c_write_demod_bytes (struct lgdt330x_state* state,
  * then reads the data returned for (len) bytes.
  */
 
-static u8 i2c_read_demod_bytes (struct lgdt330x_state* state,
-			       enum I2C_REG reg, u8* buf, int len)
+static int i2c_read_demod_bytes(struct lgdt330x_state *state,
+				enum I2C_REG reg, u8 *buf, int len)
 {
 	u8 wr [] = { reg };
 	struct i2c_msg msg [] = {
@@ -118,6 +118,8 @@ static u8 i2c_read_demod_bytes (struct lgdt330x_state* state,
 	ret = i2c_transfer(state->i2c, msg, 2);
 	if (ret != 2) {
 		printk(KERN_WARNING "lgdt330x: %s: addr 0x%02x select 0x%02x error (ret == %i)\n", __func__, state->config->demod_address, reg, ret);
+		if (ret >= 0)
+			ret = -EIO;
 	} else {
 		ret = 0;
 	}
drivers/media/dvb/frontends/tda10071.c +1 -1
index a992050..c21bc92 100644
@@ -1215,7 +1215,7 @@ error:
 EXPORT_SYMBOL(tda10071_attach);
 
 static struct dvb_frontend_ops tda10071_ops = {
-	.delsys = { SYS_DVBT, SYS_DVBT2 },
+	.delsys = { SYS_DVBS, SYS_DVBS2 },
 	.info = {
 		.name = "NXP TDA10071",
 		.frequency_min = 950000,
drivers/media/video/pvrusb2/pvrusb2-devattr.c +10 -0
index c6da8f7..d8c8982 100644
@@ -320,7 +320,17 @@ static struct tda829x_config tda829x_no_probe = {
 	.probe_tuner = TDA829X_DONT_PROBE,
 };
 
+static struct tda18271_std_map hauppauge_tda18271_dvbt_std_map = {
+        .dvbt_6   = { .if_freq = 3300, .agc_mode = 3, .std = 4,
+                      .if_lvl = 1, .rfagc_top = 0x37, },
+        .dvbt_7   = { .if_freq = 3800, .agc_mode = 3, .std = 5,
+                      .if_lvl = 1, .rfagc_top = 0x37, },
+        .dvbt_8   = { .if_freq = 4300, .agc_mode = 3, .std = 6,
+                      .if_lvl = 1, .rfagc_top = 0x37, },
+};
+
 static struct tda18271_config hauppauge_tda18271_dvb_config = {
+	.std_map = &hauppauge_tda18271_dvbt_std_map,
 	.gate    = TDA18271_GATE_ANALOG,
 	.output_opt = TDA18271_OUTPUT_LT_OFF,
 };
drivers/mfd/wm8994-core.c +14 -0
index a04b3c1..f04920b 100644
@@ -270,6 +270,20 @@ static int wm8994_suspend(struct device *dev)
 		break;
 	}
 
+	switch (wm8994->type) {
+	case WM1811:
+		ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
+		if (ret < 0) {
+			dev_err(dev, "Failed to read jackdet: %d\n", ret);
+		} else if (ret & WM1811_JACKDET_MODE_MASK) {
+			dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+			return 0;
+		}
+		break;
+	default:
+		break;
+	}
+
 	/* Disable LDO pulldowns while the device is suspended if we
 	 * don't know that something will be driving them. */
 	if (!wm8994->ldo_ena_always_driven)
drivers/mtd/ubi/scan.c +4 -4
index 0cb17d9..b99318e 100644
@@ -1174,7 +1174,7 @@ struct ubi_scan_info *ubi_scan(struct ubi_device *ubi)
 
 	ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL);
 	if (!ech)
-		goto out_slab;
+		goto out_si;
 
 	vidh = ubi_zalloc_vid_hdr(ubi, GFP_KERNEL);
 	if (!vidh)
@@ -1235,8 +1235,6 @@ out_vidh:
 	ubi_free_vid_hdr(ubi, vidh);
 out_ech:
 	kfree(ech);
-out_slab:
-	kmem_cache_destroy(si->scan_leb_slab);
 out_si:
 	ubi_scan_destroy_si(si);
 	return ERR_PTR(err);
@@ -1325,7 +1323,9 @@ void ubi_scan_destroy_si(struct ubi_scan_info *si)
 		}
 	}
 
-	kmem_cache_destroy(si->scan_leb_slab);
+	if (si->scan_leb_slab)
+		kmem_cache_destroy(si->scan_leb_slab);
+
 	kfree(si);
 }
 
drivers/mtd/ubi/wl.c +4 -6
index 0696e36..cf42971 100644
@@ -389,7 +389,7 @@ static struct ubi_wl_entry *find_wl_entry(struct rb_root *root, int max)
  */
 int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
 {
-	int err, medium_ec;
+	int err;
 	struct ubi_wl_entry *e, *first, *last;
 
 	ubi_assert(dtype == UBI_LONGTERM || dtype == UBI_SHORTTERM ||
@@ -427,7 +427,7 @@ retry:
 		 * For unknown data we pick a physical eraseblock with medium
 		 * erase counter. But we by no means can pick a physical
 		 * eraseblock with erase counter greater or equivalent than the
-		 * lowest erase counter plus %WL_FREE_MAX_DIFF.
+		 * lowest erase counter plus %WL_FREE_MAX_DIFF/2.
 		 */
 		first = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry,
 					u.rb);
@@ -436,10 +436,8 @@ retry:
 		if (last->ec - first->ec < WL_FREE_MAX_DIFF)
 			e = rb_entry(ubi->free.rb_node,
 					struct ubi_wl_entry, u.rb);
-		else {
-			medium_ec = (first->ec + WL_FREE_MAX_DIFF)/2;
-			e = find_wl_entry(&ubi->free, medium_ec);
-		}
+		else
+			e = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF/2);
 		break;
 	case UBI_SHORTTERM:
 		/*
drivers/net/ethernet/marvell/sky2.c +11 -0
index 760c2b1..b4a208e 100644
@@ -95,6 +95,10 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
+static int legacy_pme = 0;
+module_param(legacy_pme, int, 0);
+MODULE_PARM_DESC(legacy_pme, "Legacy power management");
+
 static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
@@ -867,6 +871,13 @@ static void sky2_wol_init(struct sky2_port *sky2)
 	/* Disable PiG firmware */
 	sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF);
 
+	/* Needed by some broken BIOSes, use PCI rather than PCI-e for WOL */
+	if (legacy_pme) {
+		u32 reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
+		reg1 |= PCI_Y2_PME_LEGACY;
+		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+	}
+
 	/* block receiver */
 	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
 	sky2_read32(hw, B0_CTST);
drivers/net/ethernet/mellanox/mlx4/main.c +1 -1
index d498f04..8bf22b6 100644
@@ -394,7 +394,7 @@ static int mlx4_how_many_lives_vf(struct mlx4_dev *dev)
 	return ret;
 }
 
-static int mlx4_is_slave_active(struct mlx4_dev *dev, int slave)
+int mlx4_is_slave_active(struct mlx4_dev *dev, int slave)
 {
 	struct mlx4_priv *priv = mlx4_priv(dev);
 	struct mlx4_slave_state *s_slave;
drivers/net/usb/usbnet.c +9 -1
index 59681f0..9611049 100644
@@ -589,6 +589,14 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 		entry = (struct skb_data *) skb->cb;
 		urb = entry->urb;
 
+		/*
+		 * Get reference count of the URB to avoid it to be
+		 * freed during usb_unlink_urb, which may trigger
+		 * use-after-free problem inside usb_unlink_urb since
+		 * usb_unlink_urb is always racing with .complete
+		 * handler(include defer_bh).
+		 */
+		usb_get_urb(urb);
 		spin_unlock_irqrestore(&q->lock, flags);
 		// during some PM-driven resume scenarios,
 		// these (async) unlinks complete immediately
@@ -597,6 +605,7 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 			netdev_dbg(dev->net, "unlink urb err, %d\n", retval);
 		else
 			count++;
+		usb_put_urb(urb);
 		spin_lock_irqsave(&q->lock, flags);
 	}
 	spin_unlock_irqrestore (&q->lock, flags);
@@ -1028,7 +1037,6 @@ static void tx_complete (struct urb *urb)
 	}
 
 	usb_autopm_put_interface_async(dev->intf);
-	urb->dev = NULL;
 	entry->state = tx_done;
 	defer_bh(dev, skb, &dev->txq);
 }
drivers/net/wireless/ath/ath9k/main.c +5 -3
index 4a00806..a09abc2 100644
@@ -118,13 +118,15 @@ void ath9k_ps_restore(struct ath_softc *sc)
 	if (--sc->ps_usecount != 0)
 		goto unlock;
 
-	if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))
+	if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)
+		goto unlock;
+
+	if (sc->ps_idle)
 		mode = ATH9K_PM_FULL_SLEEP;
 	else if (sc->ps_enabled &&
 		 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
 			      PS_WAIT_FOR_CAB |
-			      PS_WAIT_FOR_PSPOLL_DATA |
-			      PS_WAIT_FOR_TX_ACK)))
+			      PS_WAIT_FOR_PSPOLL_DATA)))
 		mode = ATH9K_PM_NETWORK_SLEEP;
 	else
 		goto unlock;
drivers/net/wireless/iwlwifi/iwl-core.c +4 -14
index 7bcfa78..3abe9ed 100644
@@ -1465,20 +1465,10 @@ void iwl_bg_watchdog(unsigned long data)
 	if (timeout == 0)
 		return;
 
-	/* monitor and check for stuck cmd queue */
-	if (iwl_check_stuck_queue(priv, priv->shrd->cmd_queue))
-		return;
-
-	/* monitor and check for other stuck queues */
-	if (iwl_is_any_associated(priv)) {
-		for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++) {
-			/* skip as we already checked the command queue */
-			if (cnt == priv->shrd->cmd_queue)
-				continue;
-			if (iwl_check_stuck_queue(priv, cnt))
-				return;
-		}
-	}
+	/* monitor and check for stuck queues */
+	for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++)
+		if (iwl_check_stuck_queue(priv, cnt))
+			return;
 
 	mod_timer(&priv->watchdog, jiffies +
 		  msecs_to_jiffies(IWL_WD_TICK(timeout)));
drivers/net/wireless/p54/p54spi.c +10 -4
index 7faed62..f792990 100644
@@ -618,19 +618,19 @@ static int __devinit p54spi_probe(struct spi_device *spi)
 	ret = spi_setup(spi);
 	if (ret < 0) {
 		dev_err(&priv->spi->dev, "spi_setup failed");
-		goto err_free_common;
+		goto err_free;
 	}
 
 	ret = gpio_request(p54spi_gpio_power, "p54spi power");
 	if (ret < 0) {
 		dev_err(&priv->spi->dev, "power GPIO request failed: %d", ret);
-		goto err_free_common;
+		goto err_free;
 	}
 
 	ret = gpio_request(p54spi_gpio_irq, "p54spi irq");
 	if (ret < 0) {
 		dev_err(&priv->spi->dev, "irq GPIO request failed: %d", ret);
-		goto err_free_common;
+		goto err_free_gpio_power;
 	}
 
 	gpio_direction_output(p54spi_gpio_power, 0);
@@ -641,7 +641,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
 			  priv->spi);
 	if (ret < 0) {
 		dev_err(&priv->spi->dev, "request_irq() failed");
-		goto err_free_common;
+		goto err_free_gpio_irq;
 	}
 
 	irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
@@ -673,6 +673,12 @@ static int __devinit p54spi_probe(struct spi_device *spi)
 	return 0;
 
 err_free_common:
+	free_irq(gpio_to_irq(p54spi_gpio_irq), spi);
+err_free_gpio_irq:
+	gpio_free(p54spi_gpio_irq);
+err_free_gpio_power:
+	gpio_free(p54spi_gpio_power);
+err_free:
 	p54_free_common(priv->hw);
 	return ret;
 }
drivers/net/wireless/rt2x00/rt2800usb.c +1 -0
index 262ee9e..7ef0b74 100644
@@ -922,6 +922,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
 	{ USB_DEVICE(0x07d1, 0x3c13) },
 	{ USB_DEVICE(0x07d1, 0x3c15) },
 	{ USB_DEVICE(0x07d1, 0x3c16) },
+	{ USB_DEVICE(0x2001, 0x3c1b) },
 	/* Draytek */
 	{ USB_DEVICE(0x07fa, 0x7712) },
 	/* DVICO */
drivers/net/wireless/rtlwifi/base.c +1 -0
index 8d6eb0f..30fc641 100644
@@ -413,6 +413,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)
 
 	wiphy_rfkill_start_polling(hw->wiphy);
 }
+EXPORT_SYMBOL(rtl_init_rfkill);
 
 void rtl_deinit_rfkill(struct ieee80211_hw *hw)
 {
drivers/net/wireless/rtlwifi/core.c +42 -0

50 lines not on this page · raw message

drivers/net/wireless/rtlwifi/core.h +2 -2
index f02824a..5e8482b 100644
@@ -30,8 +30,6 @@
 #ifndef __RTL_CORE_H__
 #define __RTL_CORE_H__
 
-#include <net/mac80211.h>
-
 #define RTL_SUPPORTED_FILTERS		\
 	(FIF_PROMISC_IN_BSS | \
 	FIF_ALLMULTI | FIF_CONTROL | \
@@ -42,4 +40,6 @@
 #define RTL_SUPPORTED_CTRL_FILTER	0xFF
 
 extern const struct ieee80211_ops rtl_ops;
+void rtl_fw_cb(const struct firmware *firmware, void *context);
+
 #endif
drivers/net/wireless/rtlwifi/pci.c +22 -24

131 lines not on this page · raw message

drivers/net/wireless/rtlwifi/pci.h +0 -1
index ebe0b42..0860896 100644
@@ -239,7 +239,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 void rtl_pci_disconnect(struct pci_dev *pdev);
 int rtl_pci_suspend(struct device *dev);
 int rtl_pci_resume(struct device *dev);
-
 static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)
 {
 	return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
drivers/net/wireless/rtlwifi/ps.c +2 -1
index 130fdd9..bc33a61 100644
@@ -47,7 +47,8 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
 			 ("Driver is already down!\n"));
 
 	/*<2> Enable Adapter */
-	rtlpriv->cfg->ops->hw_init(hw);
+	if (rtlpriv->cfg->ops->hw_init(hw))
+		return 1;
 	RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
 
 	/*<3> Enable Interrupt */
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +12 -3
index 72a98ca..a004ad7 100644
@@ -524,6 +524,10 @@ void rtl92c_dm_write_dig(struct ieee80211_hw *hw)
 		  dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
 		  dm_digtable.backoff_val));
 
+	dm_digtable.cur_igvalue += 2;
+	if (dm_digtable.cur_igvalue > 0x3f)
+		dm_digtable.cur_igvalue = 0x3f;
+
 	if (dm_digtable.pre_igvalue != dm_digtable.cur_igvalue) {
 		rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
 			      dm_digtable.cur_igvalue);
@@ -1219,13 +1223,18 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 				 ("PreState = %d, CurState = %d\n",
 				  p_ra->pre_ratr_state, p_ra->ratr_state));
 
-			rcu_read_lock();
-			sta = ieee80211_find_sta(mac->vif, mac->bssid);
+			/* Only the PCI card uses sta in the update rate table
+			 * callback routine */
+			if (rtlhal->interface == INTF_PCI) {
+				rcu_read_lock();
+				sta = ieee80211_find_sta(mac->vif, mac->bssid);
+			}
 			rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
 					p_ra->ratr_state);
 
 			p_ra->pre_ratr_state = p_ra->ratr_state;
-			rcu_read_unlock();
+			if (rtlhal->interface == INTF_PCI)
+				rcu_read_unlock();
 		}
 	}
 }
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +3 -9
index 931d979..a0af233 100644
@@ -262,10 +262,9 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
 	u32 fwsize;
 	enum version_8192c version = rtlhal->version;
 
-	if (!rtlhal->pfirmware)
+	if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
 		return 1;
 
-	pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
 	pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
 	pfwdata = (u8 *) rtlhal->pfirmware;
 	fwsize = rtlhal->fwsize;
@@ -518,15 +517,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
 void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw,
 			 u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
 {
-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 	u32 tmp_cmdbuf[2];
 
-	if (rtlhal->fw_ready == false) {
-		RT_ASSERT(false, ("return H2C cmd because of Fw "
-				  "download fail!!!\n"));
-		return;
-	}
-
 	memset(tmp_cmdbuf, 0, 8);
 	memcpy(tmp_cmdbuf, p_cmdbuffer, cmd_len);
 	_rtl92c_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -788,6 +780,8 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
 
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	memcpy((u8 *) skb_put(skb, totalpacketlen),
 	       &reserved_page_packet, totalpacketlen);
 
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +1 -5
index a3deaef..b603289 100644
@@ -921,10 +921,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
 			 ("Failed to download FW. Init HW "
 			  "without FW now..\n"));
 		err = 1;
-		rtlhal->fw_ready = false;
 		return err;
-	} else {
-		rtlhal->fw_ready = true;
 	}
 
 	rtlhal->last_hmeboxnum = 0;
@@ -1199,7 +1196,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 	u8 u1b_tmp;
 	u32 u4b_tmp;
 
@@ -1210,7 +1206,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
 	rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40);
 	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
 	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0);
-	if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+	if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7))
 		rtl92c_firmware_selfreset(hw);
 	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51);
 	rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +8 -16
index 89ef698..3d3b52c 100644
@@ -92,9 +92,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
 	int err;
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-	const struct firmware *firmware;
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-	char *fw_name = NULL;
 
 	rtl8192ce_bt_reg_init(hw);
 
@@ -166,26 +164,20 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
 	/* request fw */
 	if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
 	    !IS_92C_SERIAL(rtlhal->version))
-		fw_name = "rtlwifi/rtl8192cfwU.bin";
+		rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";
 	else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
-		fw_name = "rtlwifi/rtl8192cfwU_B.bin";
-	else
-		fw_name = rtlpriv->cfg->fw_name;
-	err = request_firmware(&firmware, fw_name, rtlpriv->io.dev);
+		rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";
+
+	rtlpriv->max_fw_size = 0x4000;
+	pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+	err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+				      rtlpriv->io.dev, GFP_KERNEL, hw,
+				      rtl_fw_cb);
 	if (err) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 			 ("Failed to request firmware!\n"));
 		return 1;
 	}
-	if (firmware->size > 0x4000) {
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-			 ("Firmware is too big!\n"));
-		release_firmware(firmware);
-		return 1;
-	}
-	memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-	rtlpriv->rtlhal.fwsize = firmware->size;
-	release_firmware(firmware);
 
 	return 0;
 }
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +14 -19
index 124cf63..d3a9341 100644
@@ -1171,10 +1171,7 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
 			 ("Failed to download FW. Init HW without FW now..\n"));
 		err = 1;
-		rtlhal->fw_ready = false;
 		return err;
-	} else {
-		rtlhal->fw_ready = true;
 	}
 	rtlhal->last_hmeboxnum = 0; /* h2c */
 	_rtl92cu_phy_param_tab_init(hw);
@@ -1270,24 +1267,22 @@ static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
 		if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(1)) {
 			/* reset MCU ready status */
 			rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
-			if (rtlhal->fw_ready) {
-				/* 8051 reset by self */
-				rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
-				while ((retry_cnts++ < 100) &&
-				       (FEN_CPUEN & rtl_read_word(rtlpriv,
-				       REG_SYS_FUNC_EN))) {
-					udelay(50);
-				}
-				if (retry_cnts >= 100) {
-					RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+			/* 8051 reset by self */
+			rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
+			while ((retry_cnts++ < 100) &&
+			       (FEN_CPUEN & rtl_read_word(rtlpriv,
+			       REG_SYS_FUNC_EN))) {
+				udelay(50);
+			}
+			if (retry_cnts >= 100) {
+				RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 						("#####=> 8051 reset failed!.."
 						".......................\n"););
-					/* if 8051 reset fail, reset MAC. */
-					rtl_write_byte(rtlpriv,
-						       REG_SYS_FUNC_EN + 1,
-						       0x50);
-					udelay(100);
-				}
+				/* if 8051 reset fail, reset MAC. */
+				rtl_write_byte(rtlpriv,
+					       REG_SYS_FUNC_EN + 1,
+					       0x50);
+				udelay(100);
 			}
 		}
 		/* Reset MAC and Enable 8051 */
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +10 -19
index 6d2ca77..adf320d 100644
@@ -54,7 +54,6 @@ MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
 static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 {
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	const struct firmware *firmware;
 	int err;
 
 	rtlpriv->dm.dm_initialgain_enable = true;
@@ -62,29 +61,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 	rtlpriv->dm.disable_framebursting = false;
 	rtlpriv->dm.thermalvalue = 0;
 	rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
-	rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
+
+	/* for firmware buf */
+	rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
 	if (!rtlpriv->rtlhal.pfirmware) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 			 ("Can't alloc buffer for fw.\n"));
 		return 1;
 	}
-	/* request fw */
-	err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-			rtlpriv->io.dev);
-	if (err) {
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-			 ("Failed to request firmware!\n"));
-		return 1;
-	}
-	if (firmware->size > 0x4000) {
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-			 ("Firmware is too big!\n"));
-		release_firmware(firmware);
-		return 1;
-	}
-	memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-	rtlpriv->rtlhal.fwsize = firmware->size;
-	release_firmware(firmware);
+
+	pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name);
+	rtlpriv->max_fw_size = 0x4000;
+	err = request_firmware_nowait(THIS_MODULE, 1,
+				      rtlpriv->cfg->fw_name, rtlpriv->io.dev,
+				      GFP_KERNEL, hw, rtl_fw_cb);
+
 
 	return 0;
 }
drivers/net/wireless/rtlwifi/rtl8192de/fw.c +10 -12
index 82f060b..335f582 100644
@@ -257,7 +257,7 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
 	bool fw_downloaded = false, fwdl_in_process = false;
 	unsigned long flags;
 
-	if (!rtlhal->pfirmware)
+	if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
 		return 1;
 	fwsize = rtlhal->fwsize;
 	pfwheader = (u8 *) rtlhal->pfirmware;
@@ -539,14 +539,8 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
 void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw,
 			 u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
-	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 	u32 tmp_cmdbuf[2];
 
-	if (rtlhal->fw_ready == false) {
-		RT_ASSERT(false, ("return H2C cmd because of Fw "
-				  "download fail!!!\n"));
-		return;
-	}
 	memset(tmp_cmdbuf, 0, 8);
 	memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
 	_rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -763,12 +757,16 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
 		      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
 		      u1RsvdPageLoc, 3);
 	skb = dev_alloc_skb(totalpacketlen);
-	memcpy((u8 *) skb_put(skb, totalpacketlen), &reserved_page_packet,
-		totalpacketlen);
-	rtstatus = _rtl92d_cmd_send_packet(hw, skb);
+	if (!skb) {
+		dlok = false;
+	} else {
+		memcpy((u8 *) skb_put(skb, totalpacketlen),
+			&reserved_page_packet, totalpacketlen);
+		rtstatus = _rtl92d_cmd_send_packet(hw, skb);
 
-	if (rtstatus)
-		dlok = true;
+		if (rtstatus)
+			dlok = true;
+	}
 	if (dlok) {
 		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
 			("Set RSVD page location to Fw.\n"));
drivers/net/wireless/rtlwifi/rtl8192de/hw.c +0 -3
index 9d89d7c..e6dabf6 100644
@@ -932,10 +932,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
 			 ("Failed to download FW. Init HW "
 			 "without FW..\n"));
-		rtlhal->fw_ready = false;
 		return 1;
-	} else {
-		rtlhal->fw_ready = true;
 	}
 	rtlhal->last_hmeboxnum = 0;
 	rtlpriv->psc.fw_current_inpsmode = false;
drivers/net/wireless/rtlwifi/rtl8192de/sw.c +17 -21
index 7911c9c..2afcfe3 100644
@@ -94,7 +94,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
 	u8 tid;
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-	const struct firmware *firmware;
 	static int header_print;
 
 	rtlpriv->dm.dm_initialgain_enable = true;
@@ -170,6 +169,15 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
 	else if (rtlpriv->psc.reg_fwctrl_lps == 3)
 		rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
+	/* for early mode */
+	rtlpriv->rtlhal.earlymode_enable = true;
+	for (tid = 0; tid < 8; tid++)
+		skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
+
+	/* Only load firmware for first MAC */
+	if (header_print)
+		return 0;
+
 	/* for firmware buf */
 	rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
 	if (!rtlpriv->rtlhal.pfirmware) {
@@ -178,33 +186,21 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
 		return 1;
 	}
 
-	if (!header_print) {
-		pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
-		pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
-		header_print++;
-	}
+	rtlpriv->max_fw_size = 0x8000;
+	pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
+	pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+	header_print++;
+
 	/* request fw */
-	err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-			       rtlpriv->io.dev);
+	err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+				      rtlpriv->io.dev, GFP_KERNEL, hw,
+				      rtl_fw_cb);
 	if (err) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 			 ("Failed to request firmware!\n"));
 		return 1;
 	}
-	if (firmware->size > 0x8000) {
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-			 ("Firmware is too big!\n"));
-		release_firmware(firmware);
-		return 1;
-	}
-	memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-	rtlpriv->rtlhal.fwsize = firmware->size;
-	release_firmware(firmware);
 
-	/* for early mode */
-	rtlpriv->rtlhal.earlymode_enable = true;
-	for (tid = 0; tid < 8; tid++)
-		skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
 	return 0;
 }
 
drivers/net/wireless/rtlwifi/rtl8192se/fw.c +1 -1
index 3fda6b1..4bb113f 100644
@@ -364,7 +364,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
 	u8 fwstatus = FW_STATUS_INIT;
 	bool rtstatus = true;
 
-	if (!rtlhal->pfirmware)
+	if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
 		return 1;
 
 	firmware = (struct rt_firmware *)rtlhal->pfirmware;
drivers/net/wireless/rtlwifi/rtl8192se/hw.c +10 -6
index c474486..58b1a6a 100644
@@ -952,11 +952,10 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 	if (!rtstatus) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
 			 ("Failed to download FW. "
-			 "Init HW without FW now.., Please copy FW into"
+			 "Init HW without FW now.., "
+			 "Please copy FW into"
 			 "/lib/firmware/rtlwifi\n"));
-		rtlhal->fw_ready = false;
-	} else {
-		rtlhal->fw_ready = true;
+		return 1;
 	}
 
 	/* After FW download, we have to reset MAC register */
@@ -1219,9 +1218,14 @@ void rtl92se_enable_interrupt(struct ieee80211_hw *hw)
 
 void rtl92se_disable_interrupt(struct ieee80211_hw *hw)
 {
-	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+	struct rtl_priv *rtlpriv;
+	struct rtl_pci *rtlpci;
 
+	rtlpriv = rtl_priv(hw);
+	/* if firmware not available, no interrupts */
+	if (!rtlpriv || !rtlpriv->max_fw_size)
+		return;
+	rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 	rtl_write_dword(rtlpriv, INTA_MASK, 0);
 	rtl_write_dword(rtlpriv, INTA_MASK + 4, 0);
 
drivers/net/wireless/rtlwifi/rtl8192se/led.c +4 -1
index e3fe7c9..8b4d56a 100644
@@ -76,10 +76,13 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
 
 void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
-	struct rtl_priv *rtlpriv = rtl_priv(hw);
+	struct rtl_priv *rtlpriv;
 	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
 	u8 ledcfg;
 
+	rtlpriv = rtl_priv(hw);
+	if (!rtlpriv || rtlpriv->max_fw_size)
+		return;
 	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
 		 ("LedAddr:%X ledpin=%d\n", LEDCFG, pled->ledpin));
 
drivers/net/wireless/rtlwifi/rtl8192se/sw.c +50 -15

95 lines not on this page · raw message

drivers/net/wireless/rtlwifi/usb.c +22 -26

93 lines not on this page · raw message

drivers/net/wireless/rtlwifi/wifi.h +3 -1
index cdaf142..cfd8d1c 100644
@@ -36,6 +36,7 @@
 #include <linux/vmalloc.h>
 #include <linux/usb.h>
 #include <net/mac80211.h>
+#include <linux/completion.h>
 #include "debug.h"
 
 #define RF_CHANGE_BY_INIT			0
@@ -1045,7 +1046,6 @@ struct rtl_hal {
 	u16 fw_subversion;
 	bool h2c_setinprogress;
 	u8 last_hmeboxnum;
-	bool fw_ready;
 	/*Reserve page start offset except beacon in TxQ. */
 	u8 fw_rsvdpage_startoffset;
 	u8 h2c_txcmd_seq;
@@ -1591,6 +1591,7 @@ struct rtl_debug {
 };
 
 struct rtl_priv {
+	struct completion firmware_loading_complete;
 	struct rtl_locks locks;
 	struct rtl_works works;
 	struct rtl_mac mac80211;
@@ -1612,6 +1613,7 @@ struct rtl_priv {
 	struct rtl_rate_priv *rate_priv;
 
 	struct rtl_debug dbg;
+	int max_fw_size;
 
 	/*
 	 *hal_cfg : for diff cards
drivers/pci/pcie/aspm.c +10 -3
index 24f049e..2275162 100644
@@ -500,9 +500,6 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 	int pos;
 	u32 reg32;
 
-	if (aspm_disabled)
-		return 0;
-
 	/*
 	 * Some functions in a slot might not all be PCIe functions,
 	 * very strange. Disable ASPM for the whole slot
@@ -511,6 +508,16 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		pos = pci_pcie_cap(child);
 		if (!pos)
 			return -EINVAL;
+
+		/*
+		 * If ASPM is disabled then we're not going to change
+		 * the BIOS state. It's safe to continue even if it's a
+		 * pre-1.1 device
+		 */
+
+		if (aspm_disabled)
+			continue;
+
 		/*
 		 * Disable ASPM for pre-1.1 PCIe device, we follow MS to use
 		 * RBER bit to determine if a function is 1.1 version device
drivers/rtc/interface.c +18 -2
index 8a1c031..565742b 100644
@@ -445,6 +445,11 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled)
 	if (rtc->uie_rtctimer.enabled == enabled)
 		goto out;
 
+	if (rtc->uie_unsupported) {
+		err = -EINVAL;
+		goto out;
+	}
+
 	if (enabled) {
 		struct rtc_time tm;
 		ktime_t now, onesec;
@@ -763,6 +768,14 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
 	return 0;
 }
 
+static void rtc_alarm_disable(struct rtc_device *rtc)
+{
+	if (!rtc->ops || !rtc->ops->alarm_irq_enable)
+		return;
+
+	rtc->ops->alarm_irq_enable(rtc->dev.parent, false);
+}
+
 /**
  * rtc_timer_remove - Removes a rtc_timer from the rtc_device timerqueue
  * @rtc rtc device
@@ -784,8 +797,10 @@ static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer)
 		struct rtc_wkalrm alarm;
 		int err;
 		next = timerqueue_getnext(&rtc->timerqueue);
-		if (!next)
+		if (!next) {
+			rtc_alarm_disable(rtc);
 			return;
+		}
 		alarm.time = rtc_ktime_to_tm(next->expires);
 		alarm.enabled = 1;
 		err = __rtc_set_alarm(rtc, &alarm);
@@ -847,7 +862,8 @@ again:
 		err = __rtc_set_alarm(rtc, &alarm);
 		if (err == -ETIME)
 			goto again;
-	}
+	} else
+		rtc_alarm_disable(rtc);
 
 	mutex_unlock(&rtc->ops_lock);
 }
drivers/rtc/rtc-mpc5121.c +2 -0
index 9d3cacc..613447a 100644
@@ -360,6 +360,8 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
 						&mpc5200_rtc_ops, THIS_MODULE);
 	}
 
+	rtc->rtc->uie_unsupported = 1;
+
 	if (IS_ERR(rtc->rtc)) {
 		err = PTR_ERR(rtc->rtc);
 		goto out_free_irq;
drivers/scsi/scsi_transport_iscsi.c +2 -2
index cfd4914..e3e3c7d 100644
@@ -1941,7 +1941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
 	switch (nlh->nlmsg_type) {
 	case ISCSI_UEVENT_CREATE_SESSION:
 		err = iscsi_if_create_session(priv, ep, ev,
-					      NETLINK_CREDS(skb)->pid,
+					      NETLINK_CB(skb).pid,
 					      ev->u.c_session.initial_cmdsn,
 					      ev->u.c_session.cmds_max,
 					      ev->u.c_session.queue_depth);
@@ -1954,7 +1954,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
 		}
 
 		err = iscsi_if_create_session(priv, ep, ev,
-					NETLINK_CREDS(skb)->pid,
+					NETLINK_CB(skb).pid,
 					ev->u.c_bound_session.initial_cmdsn,
 					ev->u.c_bound_session.cmds_max,
 					ev->u.c_bound_session.queue_depth);
drivers/staging/android/lowmemorykiller.c +7 -7
index efc7dc1..5cd2309 100644
@@ -73,10 +73,10 @@ static int
 task_notify_func(struct notifier_block *self, unsigned long val, void *data)
 {
 	struct task_struct *task = data;
-	if (task == lowmem_deathpending) {
+
+	if (task == lowmem_deathpending)
 		lowmem_deathpending = NULL;
-		task_handoff_unregister(&task_nb);
-	}
+
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/staging/media/as102/as102_fw.h +1 -1
index bd21f05..4bfc684 100644

Lines of this file are not shown. View the raw message.

drivers/staging/media/as102/as10x_cmd.h +40 -40

80 lines not on this page · raw message

drivers/staging/media/as102/as10x_types.h +1 -1
index fde8140..af26e05 100644

Lines of this file are not shown. View the raw message.

drivers/staging/octeon/ethernet-mdio.c +2 -2
index 63800ba..e31949c 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/Kconfig +0 -7
index ea37473..6a43312 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/os_intfs.c +0 -2
index 98a3d68..fb11743 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/rtl871x_ioctl_linux.c +1 -7
index 507584b8..ef35bc2 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/rtl871x_sta_mgt.c +0 -4
index 81bde80..1247b3d 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/sta_info.h +0 -4
index 48d6a14..f8016e9 100644

Lines of this file are not shown. View the raw message.

drivers/staging/vme/devices/vme_pio2.h +2 -2
index 3c59313..72d9ce0 100644

Lines of this file are not shown. View the raw message.

drivers/staging/vme/devices/vme_pio2_gpio.c +2 -2
index dc837de..8584849 100644

Lines of this file are not shown. View the raw message.

drivers/staging/zcache/zcache-main.c +2 -2
index ef7c52b..dce04be 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target.c +6 -8
index 501b27c..97c74ee 100644

Lines of this file are not shown. View the raw message.

drivers/target/iscsi/iscsi_target_configfs.c +2 -4
index 6b35b37..dcef63b 100644

Lines of this file are not shown. View the raw message.

drivers/target/loopback/tcm_loop.c +6 -0
index c47ff7f..92573c9 100644

Lines of this file are not shown. View the raw message.

drivers/target/target_core_alua.c +3 -4
index 01a2691..c7746a3 100644

Lines of this file are not shown. View the raw message.

drivers/target/target_core_cdb.c +46 -124

170 lines not on this page · raw message

drivers/target/target_core_device.c +4 -2
index edbcabb..ce6400d 100644

Lines of this file are not shown. View the raw message.

drivers/target/tcm_fc/tfc_cmd.c +4 -2
index 9e7e26c..ced9e8a 100644

Lines of this file are not shown. View the raw message.

drivers/tty/moxa.c +1 -1
index d15a071..0174d2d 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/omap-serial.c +3 -3
index f809041..0121486 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/sh-sci.c +10 -5
index 61b7fd2..9ec6d4e 100644

Lines of this file are not shown. View the raw message.

drivers/tty/vt/consolemap.c +43 -8

51 lines not on this page · raw message

drivers/usb/class/cdc-wdm.c +11 -6
index d2b3cff..2f085fb 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/core.c +1 -1
index 7c9df63..73df745 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/gadget.c +18 -15
index 064b6e2..acea57a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/amd5536udc.c +1 -0
index c16ff55..18883bd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/at91_udc.c +1 -0
index 143a725..b1f6e43 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/atmel_usba_udc.c +1 -0
index e2fb6d5..5e10f65 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/ci13xxx_udc.c +1 -0
index 27e3137..9e89289 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/f_subset.c +17 -17
index c154064..21ab474 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/fsl_qe_udc.c +1 -0
index b95697c..877a2c4 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/fsl_udc_core.c +9 -10
index b04712f..6b5fdf9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/goku_udc.c +1 -0
index 5af70fc..5977749 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/hid.c +3 -3
index f888c3e..3493adf 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/inode.c +2 -0
index ae04266..4f18a0e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/langwell_udc.c +1 -0
index e2293c1..aca575a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/mv_udc_core.c +1 -0
index f97e737..168fe1f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/omap_udc.c +1 -0
index 576cd85..7d0835e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/pch_udc.c +1 -0
index a3fcaae..2d567ba 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/pxa25x_udc.c +2 -0
index dd47063..33adf38 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/s3c-hsudc.c +2 -0
index df8661d..397d625 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/s3c2410_udc.c +2 -0
index 3f87cb9..ab9c65e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-fsl.c +4 -0
index b556a72..da487fd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ehci-fsl.h +1 -0
index 4918062..bea5013 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/fsl-mph-dr-of.c +0 -1
index 7916e56..ab333ac 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/musb_gadget.c +18 -0
index ac3d2ee..fdc2cdd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/renesas_usbhs/mod_gadget.c +6 -0
index 7542aa9..cc72a8f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/cp210x.c +41 -3

44 lines not on this page · raw message

drivers/usb/serial/ftdi_sio.c +25 -7
index f770415..8aa51d9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio.h +2 -1
index 19584fa..ed58c6f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio_ids.h +16 -3
index 6f6058f..0838baf8 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/generic.c +3 -1
index f740357..e129fcd 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/mos7840.c +57 -26

83 lines not on this page · raw message

drivers/usb/serial/option.c +16 -0
index b54afce..2a54121 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/qcserial.c +62 -43

105 lines not on this page · raw message

drivers/usb/storage/realtek_cr.c +7 -1
index d32f720..eee2a96 100644

Lines of this file are not shown. View the raw message.

drivers/video/backlight/tosa_lcd.c +1 -1
index 772f601..6f54f74 100644

Lines of this file are not shown. View the raw message.

drivers/video/fbmem.c +17 -1
index ac9141b..c6ce416 100644

Lines of this file are not shown. View the raw message.

drivers/video/udlfb.c +1 -1
index a197731..a40c05e 100644

Lines of this file are not shown. View the raw message.

fs/cifs/cifsfs.c +4 -4
index b1fd382..6ee1cb4 100644

Lines of this file are not shown. View the raw message.

fs/cifs/cifsglob.h +3 -7
index 76e7d8b..d47d20a 100644

Lines of this file are not shown. View the raw message.

fs/cifs/cifssmb.c +7 -2
index 8b7794c..cd66b76 100644

Lines of this file are not shown. View the raw message.

fs/cifs/connect.c +6 -8
index 602f77c..0ac595c 100644

Lines of this file are not shown. View the raw message.

fs/cifs/dir.c +4 -2
index bc7e244..d172c8e 100644

Lines of this file are not shown. View the raw message.

fs/cifs/file.c +12 -11
index 5e64748..159fcc5 100644

Lines of this file are not shown. View the raw message.

fs/cifs/transport.c +2 -2
index 0cc9584..99a27cf 100644

Lines of this file are not shown. View the raw message.

fs/dcache.c +2 -1
index bcbdb33..2576d14 100644

Lines of this file are not shown. View the raw message.

fs/ext4/ext4.h +2 -0
index 513004f..3ce6a0c 100644

Lines of this file are not shown. View the raw message.

fs/ext4/ext4_jbd2.h +29 -27

56 lines not on this page · raw message

fs/ext4/extents.c +2 -0
index 74f23c2..4394a757 100644

Lines of this file are not shown. View the raw message.

fs/ext4/fsync.c +2 -0
index 00a2cb7..bb6c7d8 100644

Lines of this file are not shown. View the raw message.

fs/ext4/inode.c +27 -19

46 lines not on this page · raw message

fs/ext4/page-io.c +9 -2
index 4758518..dcdeef1 100644

Lines of this file are not shown. View the raw message.

fs/hugetlbfs/inode.c +9 -16
index 1e85a7a..3645cd3 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/transaction.c +2 -0
index 35ae096..52653306 100644

Lines of this file are not shown. View the raw message.

fs/lockd/svc.c +1 -1
index c061b9a..2444780 100644

Lines of this file are not shown. View the raw message.

fs/nfs/callback_xdr.c +3 -1
index d50b274..2b2d33b 100644

Lines of this file are not shown. View the raw message.

fs/nfs/delegation.c +11 -0
index 7f26540..ac889af 100644

Lines of this file are not shown. View the raw message.

fs/nfs/delegation.h +1 -0
index d9322e4..691a796 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs4_fs.h +3 -0
index 4d7d0ae..8ccaf24 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs4proc.c +46 -18

64 lines not on this page · raw message

fs/nfs/nfs4state.c +29 -4
index 4539203..bacb271 100644

Lines of this file are not shown. View the raw message.

fs/proc/namespaces.c +1 -1
index 27da860..3551f1f 100644

Lines of this file are not shown. View the raw message.

fs/proc/proc_sysctl.c +16 -1
index a6b6217..53c3bce 100644

Lines of this file are not shown. View the raw message.

fs/proc/task_mmu.c +9 -0
index 7dcd2a2..3efa725 100644

Lines of this file are not shown. View the raw message.

fs/sysfs/inode.c +6 -5
index 85eb816..feb2d69 100644

Lines of this file are not shown. View the raw message.

fs/xfs/xfs_iget.c +12 -6
index 8c3e463..9271f4c 100644

Lines of this file are not shown. View the raw message.

fs/xfs/xfs_log_recover.c +11 -22
index 0ed9ee7..a89c2f2 100644

Lines of this file are not shown. View the raw message.

include/asm-generic/pgtable.h +61 -0

61 lines not on this page · raw message

include/asm-generic/unistd.h +1 -1
index 2292d1a..991ef01 100644

Lines of this file are not shown. View the raw message.

include/linux/fb.h +1 -0
index c18122f..a395b8c 100644

Lines of this file are not shown. View the raw message.

include/linux/math64.h +4 -0
index 23fcdfc..b8ba855 100644

Lines of this file are not shown. View the raw message.

include/linux/pm_domain.h +3 -0
index a03a0ad..5a82c09 100644

Lines of this file are not shown. View the raw message.

include/linux/rtc.h +2 -1
index 93f4d03..fcabfb4 100644

Lines of this file are not shown. View the raw message.

include/target/target_core_base.h +1 -1
index dc4e345..fe73eb8 100644

Lines of this file are not shown. View the raw message.

kernel/futex.c +13 -6
index 1614be2..0677023 100644

Lines of this file are not shown. View the raw message.

kernel/irq/chip.c +1 -2
index fb7db75..25784d6 100644

Lines of this file are not shown. View the raw message.

kernel/irq/manage.c +1 -1
index 0f0d470..6ffd419 100644

Lines of this file are not shown. View the raw message.

kernel/module.c +1 -2
index 2c93276..3d56b6f 100644

Lines of this file are not shown. View the raw message.

kernel/power/hibernate.c +4 -3
index 6d6d288..7bef755 100644

Lines of this file are not shown. View the raw message.

kernel/time/ntp.c +1 -1
index f6117a4..4b85a7a 100644

Lines of this file are not shown. View the raw message.

lib/kobject_uevent.c +9 -10
index e66e9b6..75cbdb5 100644

Lines of this file are not shown. View the raw message.

mm/bootmem.c +2 -3
index 668e94d..0131170 100644

Lines of this file are not shown. View the raw message.

mm/memcontrol.c +4 -0
index 58a08fc..cd412fc 100644

Lines of this file are not shown. View the raw message.

mm/memory.c +12 -4
index fa2f04e..10b4dda 100644

Lines of this file are not shown. View the raw message.

mm/mempolicy.c +1 -1
index 47296fe..0a37570 100644

Lines of this file are not shown. View the raw message.

mm/mincore.c +1 -1
index 636a868..936b4ce 100644

Lines of this file are not shown. View the raw message.

mm/pagewalk.c +1 -1
index 2f5cf10..aa9701e 100644

Lines of this file are not shown. View the raw message.

mm/slub.c +2 -1
index 4907563..0342a5d 100644

Lines of this file are not shown. View the raw message.

mm/sparse.c +11 -19
index 61d7cde..a8bc7d3 100644

Lines of this file are not shown. View the raw message.

mm/swapfile.c +1 -3
index d999f09..f31b29d 100644

Lines of this file are not shown. View the raw message.

mm/vmscan.c +29 -13

42 lines not on this page · raw message

net/core/dev.c +2 -1
index 6ca32f6..a4bf943 100644

Lines of this file are not shown. View the raw message.

net/core/rtnetlink.c +2 -0
index f965dce..5c30296 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6_output.c +6 -5
index d97e071..ea58e27a 100644

Lines of this file are not shown. View the raw message.

net/ipv6/route.c +6 -2
index 22b7664..4d5915d 100644

Lines of this file are not shown. View the raw message.

net/l2tp/l2tp_ppp.c +1 -1
index 8a90d75..b1bd16f 100644

Lines of this file are not shown. View the raw message.

net/rds/send.c +0 -1
index e2d63c5..96531d4 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/cache.c +2 -0
index 465df9a..8c6598e 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/sched.c +11 -4
index 3341d89..8efd96c 100644

Lines of this file are not shown. View the raw message.

net/xfrm/xfrm_replay.c +3 -3
index 39e02c5..2f6d11d 100644

Lines of this file are not shown. View the raw message.

security/integrity/ima/Kconfig +1 -1
index 4f554f2..063298a 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/hda_eld.c +2 -2
index c1da422..b58b4b1 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/p1022_ds.c +16 -8
index a5d4e80..dc5764d 100644

Lines of this file are not shown. View the raw message.

sound/soc/pxa/pxa-ssp.c +36 -25

61 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.