1. 13 Apr, 2012 1 commit
    • Paul Gortmaker's avatar
      kconfig: fix IS_ENABLED to not require all options to be defined · 69349c2d
      Paul Gortmaker authored
      Using IS_ENABLED() within C (vs.  within CPP #if statements) in its
      current form requires us to actually define every possible bool/tristate
      Kconfig option twice (__enabled_* and __enabled_*_MODULE variants).
      
      This results in a huge autoconf.h file, on the order of 16k lines for a
      x86_64 defconfig.
      
      Fixing IS_ENABLED to be able to work on the smaller subset of just
      things that we really have defined is step one to fixing this.  Which
      means it has to not choke when fed non-enabled options, such as:
      
        include/linux/netdevice.h:964:1: warning: "__enabled_CONFIG_FCOE_MODULE" is not defined [-Wundef]
      
      The original prototype of how to implement a C and preprocessor
      compatible way of doing this came from the Google+ user "comex ." in
      response to Linus' crowdsourcing challenge for a possible improvement on
      his earlier C specific solution:
      
      	#define config_enabled(x)       (__stringify(x)[0] == '1')
      
      In this implementation, I've chosen variable names that hopefully make
      how it works more understandable.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      69349c2d
  2. 12 Apr, 2012 39 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 7c427f45
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a number of fixes for the USB core and drivers for 3.4-rc2
      
        Lots of tiny xhci fixes here, a few usb-serial driver fixes and new
        device ids, and a smattering of other minor fixes in different USB
        drivers.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'usb-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (30 commits)
        USB: update usbtmc api documentation
        xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI
        xHCI: use gfp flags from caller instead of GFP_ATOMIC
        xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host
        USB: fix bug of device descriptor got from superspeed device
        xhci: Fix register save/restore order.
        xhci: Restore event ring dequeue pointer on resume.
        xhci: Don't write zeroed pointers to xHC registers.
        xhci: Warn when hosts don't halt.
        xhci: don't re-enable IE constantly
        usb: xhci: fix section mismatch in linux-next
        xHCI: correct to print the true HSEE of USBCMD
        USB: serial: fix race between probe and open
        UHCI: hub_status_data should indicate if ports are resuming
        EHCI: keep track of ports being resumed and indicate in hub_status_data
        USB: fix race between root-hub suspend and remote wakeup
        USB: sierra: add support for Sierra Wireless MC7710
        USB: ftdi_sio: fix race condition in TIOCMIWAIT, and abort of TIOCMIWAIT when the device is removed
        USB: ftdi_sio: fix status line change handling for TIOCMIWAIT and TIOCGICOUNT
        USB: don't ignore suspend errors for root hubs
        ...
      7c427f45
    • Linus Torvalds's avatar
      Merge tag 'tty-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · f4f9c1ac
      Linus Torvalds authored
      Pull tty and serial fixes from Greg KH:
       "Here are some tty and serial fixes for 3.4-rc2.
      
        Most important here is the pl011 fix, which has been reported by about
        100 different people, which means more people use it than I expected
        :)
      
        There are also some 8250 driver reverts due to some problems reported
        by them.  And other minor fixes as well.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        pch_uart: Add Kontron COMe-mTT10 uart clock quirk
        pch_uart: Fix MSI setting issue
        serial/8250_pci: add a "force background timer" flag and use it for the "kt" serial port
        Revert "serial/8250_pci: setup-quirk workaround for the kt serial controller"
        Revert "serial/8250_pci: init-quirk msi support for kt serial controller"
        tty/serial/omap: console can only be built-in
        serial: samsung: fix omission initialize ulcon in reset port fn()
        printk(): add KERN_CONT where needed in hpet and vt code
        tty/serial: atmel_serial: fix RS485 half-duplex problem
        tty: serial: altera_uart: Check for NULL platform_data in probe.
        isdn/gigaset: use gig_dbg() for debugging output
        omap-serial: Fix the error handling in the omap_serial probe
        serial: PL011: move interrupt clearing
      f4f9c1ac
    • Linus Torvalds's avatar
      Merge tag 'staging-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 3dbc35a3
      Linus Torvalds authored
      Pull staging tree fixes from Greg KH:
       "Here are a number of bugfixes for the drivers/staging/ portion of the
        kernel that have been reported recently.
      
        Nothing major here, with maybe the exception of the ramster code can
        now be built so it is enabled in the build again, and lots of memory
        leaks that people like to have fixed on their systems.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: android: fix mem leaks in __persistent_ram_init()
        staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()
        staging: iio: hmc5843: Fix crash in probe function.
        staging/xgifb: fix display on XGI Volari Z11m cards
        Staging: android: timed_gpio: Fix resource leak in timed_gpio_probe error paths
        android: make persistent_ram based drivers depend on HAVE_MEMBLOCK
        staging: iio: ak8975: Remove i2c client data corruption
        staging: drm/omap: move where DMM driver is registered
        staging: zsmalloc: fix memory leak
        Staging: rts_pstor: off by one in for loop
        staging: ozwpan: Added new maintainer for ozwpan
        staging:rts_pstor:Avoid "Bad target number" message when probing driver
        staging:rts_pstor:Fix possible panic by NULL pointer dereference
        Staging: vt6655-6: check keysize before memcpy()
        staging/media/as102: Don't call release_firmware() on uninitialized variable
        staging:iio:core add missing increment of loop index in iio_map_array_unregister()
        staging: ramster: unbreak my heart
        staging/vme: Fix module parameters
        staging: sep: Fix sign of error
      3dbc35a3
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · f5ad5010
      Linus Torvalds authored
      Pull driver core and kobject fixes from Greg KH:
       "Here are some minor fixes for the driver core and kobjects that people
        have reported recently.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        kobject: provide more diagnostic info for kobject_add_internal() failures
        sysfs: handle 'parent deleted before child added'
        sysfs: Prevent crash on unset sysfs group attributes
        sysfs: Update the name hash for an entry after changing the namespace
        drivers/base: fix compiler warning in SoC export driver - idr should be ida
        drivers/base: Remove unneeded spin_lock_init call for soc_lock
      f5ad5010
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 · b3dfd76c
      Linus Torvalds authored
      Pull a fix for the recent irqdomain bug fixes from Grant Likely:
       "I flubbed one patch in the last pull request which broke a format
        string on 64 bit platforms.  Here's the fix."
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        irq_domain: fix type mismatch in debugfs output format
      b3dfd76c
    • Grant Likely's avatar
      irq_domain: fix type mismatch in debugfs output format · 5269a9ab
      Grant Likely authored
      sizeof(void*) returns an unsigned long, but it was being used as a width parameter to a "%-*s" format string which requires an int.  On 64 bit platforms this causes a type mismatch:
      
          linux/kernel/irq/irqdomain.c:575: warning: field width should have type
          'int', but argument 6 has type 'long unsigned int'
      
      This change casts the size to an int so printf gets the right data type.
      Reported-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Cc: David Daney <david.daney@cavium.com>
      5269a9ab
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9b1ef1de
      Linus Torvalds authored
      Pull trivial perf build failure fix from Thomas Gleixner.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Fix getrusage() related build failure on glibc trunk
      9b1ef1de
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ccb1ec95
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "The itimer removal one is not strictly a fix, but I really wanted to
        avoid a rebase of the urgent ones."
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "clocksource: Load the ACPI PM clocksource asynchronously"
        clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()
        itimer: Use printk_once instead of WARN_ONCE
        nohz: Fix stale jiffies update in tick_nohz_restart()
        tick: Document TICK_ONESHOT config option
        proc: stats: Use arch_idle_time for idle and iowait times if available
        itimer: Schedule silent NULL pointer fixup in setitimer() for removal
      ccb1ec95
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4a1d7544
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Use correct byte-sized register constraint in __add()
        x86: Use correct byte-sized register constraint in __xchg_op()
        x86: vsyscall: Use NULL instead 0 for a pointer argument
      4a1d7544
    • Jesper Juhl's avatar
      staging: android: fix mem leaks in __persistent_ram_init() · 474a8988
      Jesper Juhl authored
      If, in __persistent_ram_init(), the call to
      persistent_ram_buffer_init() fails or the call to
      persistent_ram_init_ecc() fails then we fail to free the memory we
      allocated to 'prz' with kzalloc() - thus leaking it.
      
      To prevent the leaks I consolidated all error exits from the function
      at a 'err:' label at the end and made all error cases jump to that
      label where we can then make sure we always free 'prz'. This is safe
      since all the situations where the code bails out happen before 'prz'
      has been stored anywhere and although we'll do a redundant kfree(NULL)
      call in the case of kzalloc() itself failing that's OK since kfree()
      deals gracefully with NULL pointers and I felt it was more important
      to keep all error exits at a single location than to avoid that one
      harmless/redundant kfree() on a error path.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Acked-by: default avatarColin Cross <ccross@android.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      474a8988
    • Jesper Juhl's avatar
      staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl() · 17b7e1ba
      Jesper Juhl authored
      If copy_to_user() fails in the WLAN_CMD_GET_NODE_LIST case of the
      switch in drivers/staging/vt6656/ioctl.c::private_ioctl() we'll leak
      the memory allocated to 'pNodeList'. Fix that by kfree'ing the memory
      in the failure case.
      Also remove a pointless cast (to type 'PSNodeList') of a kmalloc()
      return value - kmalloc() returns a void pointer that is implicitly
      converted, so there is no need for an explicit cast.
      Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      17b7e1ba
    • Marek Belisko's avatar
      staging: iio: hmc5843: Fix crash in probe function. · 62d2feb9
      Marek Belisko authored
      Fix crash after issuing:
      	echo hmc5843 0x1e > /sys/class/i2c-dev/i2c-2/device/new_device
      
      	[   37.180999] device: '2-001e': device_add
      	[   37.188293] bus: 'i2c': add device 2-001e
      	[   37.194549] PM: Adding info for i2c:2-001e
      	[   37.200958] bus: 'i2c': driver_probe_device: matched device 2-001e with driver hmc5843
      	[   37.210815] bus: 'i2c': really_probe: probing driver hmc5843 with device 2-001e
      	[   37.224884] HMC5843 initialized
      	[   37.228759] ------------[ cut here ]------------
      	[   37.233612] kernel BUG at mm/slab.c:505!
      	[   37.237701] Internal error: Oops - BUG: 0 [#1] PREEMPT
      	[   37.243103] Modules linked in:
      	[   37.246337] CPU: 0    Not tainted  (3.3.1-gta04+ #28)
      	[   37.251647] PC is at kfree+0x84/0x144
      	[   37.255493] LR is at kfree+0x20/0x144
      	[   37.259338] pc : [<c00b408c>]    lr : [<c00b4028>]    psr: 40000093
      	[   37.259368] sp : de249cd8  ip : 0000000c  fp : 00000090
      	[   37.271362] r10: 0000000a  r9 : de229eac  r8 : c0236274
      	[   37.276855] r7 : c09d6490  r6 : a0000013  r5 : de229c00  r4 : de229c10
      	[   37.283691] r3 : c0f00218  r2 : 00000400  r1 : c0eea000  r0 : c00b4028
      	[   37.290527] Flags: nZcv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment user
      	[   37.298095] Control: 10c5387d  Table: 9e1d0019  DAC: 00000015
      	[   37.304107] Process sh (pid: 91, stack limit = 0xde2482f0)
      	[   37.309844] Stack: (0xde249cd8 to 0xde24a000)
      	[   37.314422] 9cc0:                                                       de229c10 de229c00
      	[   37.322998] 9ce0: de229c10 ffffffea 00000005 c0236274 de140a80 c00b4798 dec00080 de140a80
      	[   37.331573] 9d00: c032f37c dec00080 000080d0 00000001 de229c00 de229c10 c048d578 00000005
      	[   37.340148] 9d20: de229eac 0000000a 00000090 c032fa40 00000001 00000000 00000001 de229c10
      	[   37.348724] 9d40: de229eac 00000029 c075b558 00000001 00000003 00000004 de229c10 c048d594
      	[   37.357299] 9d60: 00000000 60000013 00000018 205b0007 37332020 3432322e 5d343838 c0060020
      	[   37.365905] 9d80: de251600 00000001 00000000 de251600 00000001 c0065a84 de229c00 de229c48
      	[   37.374481] 9da0: 00000006 0048d62c de229c38 de229c00 de229c00 de1f6c00 de1f6c20 00000001
      	[   37.383056] 9dc0: 00000000 c048d62c 00000000 de229c00 de229c00 de1f6c00 de1f6c20 00000001
      	[   37.391632] 9de0: 00000000 c048d62c 00000000 c0330164 00000000 de1f6c20 c048d62c de1f6c00
      	[   37.400207] 9e00: c0330078 de1f6c04 c078d714 de189b58 00000000 c02ccfd8 de1f6c20 c0795f40
      	[   37.408782] 9e20: c0238330 00000000 00000000 c02381a8 de1b9fc0 de1f6c20 de1f6c20 de249e48
      	[   37.417358] 9e40: c0238330 c0236bb0 decdbed8 de7d0f14 de1f6c20 de1f6c20 de1f6c54 de1f6c20
      	[   37.425933] 9e60: 00000000 c0238030 de1f6c20 c078d7bc de1f6c20 c02377ec de1f6c20 de1f6c28
      	[   37.434509] 9e80: dee64cb0 c0236138 c047c554 de189b58 00000000 c004b45c de1f6c20 de1f6cd8
      	[   37.443084] 9ea0: c0edfa6c de1f6c00 dee64c68 de1f6c04 de1f6c20 dee64cb8 c047c554 de189b58
      	[   37.451690] 9ec0: 00000000 c02cd634 dee64c68 de249ef4 de23b008 dee64cb0 0000000d de23b000
      	[   37.460266] 9ee0: de23b007 c02cd78c 00000002 00000000 00000000 35636d68 00333438 00000000
      	[   37.468841] 9f00: 00000000 00000000 001e0000 00000000 00000000 00000000 00000000 0a10cec0
      	[   37.477416] 9f20: 00000002 de249f80 0000000d dee62990 de189b40 c0234d88 0000000d c010c354
      	[   37.485992] 9f40: 0000000d de210f28 000acc88 de249f80 0000000d de248000 00000000 c00b7bf8
      	[   37.494567] 9f60: de210f28 000acc88 de210f28 000acc88 00000000 00000000 0000000d c00b7ed8
      	[   37.503143] 9f80: 00000000 00000000 0000000d 00000000 0007fa28 0000000d 000acc88 00000004
      	[   37.511718] 9fa0: c000e544 c000e380 0007fa28 0000000d 00000001 000acc88 0000000d 00000000
      	[   37.520294] 9fc0: 0007fa28 0000000d 000acc88 00000004 00000001 00000020 00000002 00000000
      	[   37.528869] 9fe0: 00000000 beab8624 0000ea05 b6eaebac 600d0010 00000001 00000000 00000000
      	[   37.537475] [<c00b408c>] (kfree+0x84/0x144) from [<c0236274>] (device_add+0x530/0x57c)
      	[   37.545806] [<c0236274>] (device_add+0x530/0x57c) from [<c032fa40>] (iio_device_register+0x8c8/0x990)
      	[   37.555480] [<c032fa40>] (iio_device_register+0x8c8/0x990) from [<c0330164>] (hmc5843_probe+0xec/0x114)
      	[   37.565338] [<c0330164>] (hmc5843_probe+0xec/0x114) from [<c02ccfd8>] (i2c_device_probe+0xc4/0xf8)
      	[   37.574737] [<c02ccfd8>] (i2c_device_probe+0xc4/0xf8) from [<c02381a8>] (driver_probe_device+0x118/0x218)
      	[   37.584777] [<c02381a8>] (driver_probe_device+0x118/0x218) from [<c0236bb0>] (bus_for_each_drv+0x4c/0x84)
      	[   37.594818] [<c0236bb0>] (bus_for_each_drv+0x4c/0x84) from [<c0238030>] (device_attach+0x78/0xa4)
      	[   37.604125] [<c0238030>] (device_attach+0x78/0xa4) from [<c02377ec>] (bus_probe_device+0x28/0x9c)
      	[   37.613433] [<c02377ec>] (bus_probe_device+0x28/0x9c) from [<c0236138>] (device_add+0x3f4/0x57c)
      	[   37.622650] [<c0236138>] (device_add+0x3f4/0x57c) from [<c02cd634>] (i2c_new_device+0xf8/0x19c)
      	[   37.631805] [<c02cd634>] (i2c_new_device+0xf8/0x19c) from [<c02cd78c>] (i2c_sysfs_new_device+0xb4/0x130)
      	[   37.641754] [<c02cd78c>] (i2c_sysfs_new_device+0xb4/0x130) from [<c0234d88>] (dev_attr_store+0x18/0x24)
      	[   37.651611] [<c0234d88>] (dev_attr_store+0x18/0x24) from [<c010c354>] (sysfs_write_file+0x10c/0x140)
      	[   37.661193] [<c010c354>] (sysfs_write_file+0x10c/0x140) from [<c00b7bf8>] (vfs_write+0xb0/0x178)
      	[   37.670410] [<c00b7bf8>] (vfs_write+0xb0/0x178) from [<c00b7ed8>] (sys_write+0x3c/0x68)
      	[   37.678833] [<c00b7ed8>] (sys_write+0x3c/0x68) from [<c000e380>] (ret_fast_syscall+0x0/0x3c)
      	[   37.687683] Code: 1593301c e5932000 e3120080 1a000000 (e7f001f2)
      	[   37.700775] ---[ end trace aaf805debdb69390 ]---
      
      Client data was assigned to iio_dev structure in probe but in
      hmc5843_init_client function casted to private driver data structure which
      is wrong. Possibly calling mutex_init(&data->lock); corrupt data
      which the lead to above crash.
      Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
      Cc: stable <stable@vger.kernel.org>
      Acked-by: default avatarJonathan Cameron <jic23@kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      62d2feb9
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Andrew's patch-bomb) · ecca5c3a
      Linus Torvalds authored
      Merge fixes from Andrew Morton.
      
      * emailed from Andrew Morton <akpm@linux-foundation.org>: (14 patches)
        panic: fix stack dump print on direct call to panic()
        drivers/rtc/rtc-pl031.c: enable clock on all ST variants
        Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
        hugetlb: fix race condition in hugetlb_fault()
        drivers/rtc/rtc-twl.c: use static register while reading time
        drivers/rtc/rtc-s3c.c: add placeholder for driver private data
        drivers/rtc/rtc-s3c.c: fix compilation error
        MAINTAINERS: add PCDP console maintainer
        memcg: do not open code accesses to res_counter members
        drivers/rtc/rtc-efi.c: fix section mismatch warning
        drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected
        drivers/char/random.c: fix boot id uniqueness race
        memcg: fix broken boolen expression
        memcg: fix up documentation on global LRU
      ecca5c3a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 174808af
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix bluetooth userland regression reported by Keith Packard, from
          Gustavo Padovan.
      
       2) Revert ath9k PS idle change, from Sujith Manoharan.
      
       3) Correct default TCP memory limits (again), from Eric Dumazet.
      
       4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal
          Cardwell.
      
       5) We made a facility for layers like wireless to say how much tailroom
          they need in the SKB for link layer stuff such as wireless
          encryption etc., but TCP works hard to fill every SKB out to the end
          defeating this specification.
      
          This leads to every TCP packet getting reallocated by the wireless
          code in order to have the right amount of tailroom available.
      
          Fix TCP to only fill SKBs out to the real amount of data area it
          asked for during the allocation, this way it won't eat into the
          slack added for the device's tailroom needs.
      
          Reported by Marc Merlin and fixed by Eric Dumazet.
      
       6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh
          Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,
          AceLan Kao, and Andrei Emeltchenko.
      
       7) OOPS on tty_close fix in bluetooth's hci_ldisc from Johan Hovold.
      
       8) netfilter erroneously scales TCP window twice, fix from Changli Gao.
      
       9) Memleak fix in wext-core from Julia Lawall.
      
      10) Consistently handle invalid TCP packets in ipv4 vs.  ipv6 conntrack,
          from Jozsef Kadlecsik.
      
      11) Validate IP header length properly in netfilter conntrack's
          ipv4_get_l4proto().
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
        NFC: Fix the LLCP Tx fragmentation loop
        rtlwifi: Add missing DMA buffer unmapping for PCI drivers
        rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine
        tcp: avoid order-1 allocations on wifi and tx path
        net: allow pskb_expand_head() to get maximum tailroom
        bridge: Do not send queries on multicast group leaves
        MAINTAINERS: Mark NATSEMI driver as orphan'd.
        tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample
        tcp: restore correct limit
        Revert "ath9k: fix going to full-sleep on PS idle"
        rt2x00: Fix rfkill_polling register function.
        bcma: fix build error on MIPS; implicit pcibios_enable_device
        netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
        netfilter: nf_ct_ipv4: packets with wrong ihl are invalid
        netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently
        net/wireless/wext-core.c: add missing kfree
        rtlwifi: Fix oops on rate-control failure
        mac80211: Convert WARN_ON to WARN_ON_ONCE
        rtlwifi: rtl8192de: Fix firmware initialization
        nl80211: ensure interface is up in various APIs
        ...
      174808af
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 778c2dee
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Mostly exynos and intel.
      
        Intel has 3 regression fixers (more info in intel merge commit), along
        with some other make hw work fixes, exynos has some cleanups and an
        ioctl fix.
      
        A couple of radeon fixes, couple of build fixes, and a savage
        userspace interface possible overflow fix."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        drm/exynos: fixed exynos broken ioctl
        drm/i915: clear fencing tracking state when retiring requests
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/radeon: only add the mm i2c bus if the hw_i2c module param is set
        vgaarb.h: fix build warnings
        drm/i915: properly compute dp dithering for user-created modes
        drm/radeon/kms: fix DVO setup on some r4xx chips
        drm/savage: fix integer overflows in savage_bci_cmdbuf()
        drm/radeon: replace udelay with mdelay for long timeouts
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
        ...
      778c2dee
    • Linus Torvalds's avatar
      Merge tag 'md-3.4-fixes' of git://neil.brown.name/md · e42bd6e4
      Linus Torvalds authored
      Pull a few more fixes for md from NeilBrown:
       "Two are tagged for -stable.  They can cause an oops, but very rarely."
      
      * tag 'md-3.4-fixes' of git://neil.brown.name/md:
        md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
        md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.
        MD: Bitmap version cleanup.
      e42bd6e4
    • Jason Wessel's avatar
      panic: fix stack dump print on direct call to panic() · 026ee1f6
      Jason Wessel authored
      Commit 6e6f0a1f ("panic: don't print redundant backtraces on oops")
      causes a regression where no stack trace will be printed at all for the
      case where kernel code calls panic() directly while not processing an
      oops, and of course there are 100's of instances of this type of call.
      
      The original commit executed the check (!oops_in_progress), but this will
      always be false because just before the dump_stack() there is a call to
      bust_spinlocks(1), which does the following:
      
        void __attribute__((weak)) bust_spinlocks(int yes)
        {
      	if (yes) {
      		++oops_in_progress;
      
      The proper way to resolve the problem that original commit tried to
      solve is to avoid printing a stack dump from panic() when the either of
      the following conditions is true:
      
        1) TAINT_DIE has been set (this is done by oops_end())
           This indicates and oops has already been printed.
        2) oops_in_progress > 1
           This guards against the rare case where panic() is invoked
           a second time, or in between oops_begin() and oops_end()
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: <stable@vger.kernel.org>	[3.3+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      026ee1f6
    • Linus Walleij's avatar
      drivers/rtc/rtc-pl031.c: enable clock on all ST variants · 2f397216
      Linus Walleij authored
      The ST variants of the PL031 all require bit 26 in the control register
      to be set before they work properly.  Discovered this when testing on
      the Nomadik board where it would suprisingly just stand still.
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Cc: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
      Cc: Alessandro Rubini <rubini@unipv.it>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2f397216
    • Ying Han's avatar
      Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()" · 41c93088
      Ying Han authored
      This reverts commit c38446cc.
      
      Before the commit, the code makes senses to me but not after the commit.
      The "nr_reclaimed" is the number of pages reclaimed by scanning through
      the memcg's lru lists.  The "nr_to_reclaim" is the target value for the
      whole function.  For example, we like to early break the reclaim if
      reclaimed 32 pages under direct reclaim (not DEF_PRIORITY).
      
      After the reverted commit, the target "nr_to_reclaim" is decremented each
      time by "nr_reclaimed" but we still use it to compare the "nr_reclaimed".
      It just doesn't make sense to me...
      Signed-off-by: default avatarYing Han <yinghan@google.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Hillf Danton <dhillf@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      41c93088
    • Chris Metcalf's avatar
      hugetlb: fix race condition in hugetlb_fault() · 66aebce7
      Chris Metcalf authored
      The race is as follows:
      
      Suppose a multi-threaded task forks a new process (on cpu A), thus
      bumping up the ref count on all the pages.  While the fork is occurring
      (and thus we have marked all the PTEs as read-only), another thread in
      the original process (on cpu B) tries to write to a huge page, taking an
      access violation from the write-protect and calling hugetlb_cow().  Now,
      suppose the fork() fails.  It will undo the COW and decrement the ref
      count on the pages, so the ref count on the huge page drops back to 1.
      Meanwhile hugetlb_cow() also decrements the ref count by one on the
      original page, since the original address space doesn't need it any
      more, having copied a new page to replace the original page.  This
      leaves the ref count at zero, and when we call unlock_page(), we panic.
      
      	fork on CPU A				fault on CPU B
      	=============				==============
      	...
      	down_write(&parent->mmap_sem);
      	down_write_nested(&child->mmap_sem);
      	...
      	while duplicating vmas
      		if error
      			break;
      	...
      	up_write(&child->mmap_sem);
      	up_write(&parent->mmap_sem);		...
      						down_read(&parent->mmap_sem);
      						...
      						lock_page(page);
      						handle COW
      						page_mapcount(old_page) == 2
      						alloc and prepare new_page
      	...
      	handle error
      	page_remove_rmap(page);
      	put_page(page);
      	...
      						fold new_page into pte
      						page_remove_rmap(page);
      						put_page(page);
      						...
      				oops ==>	unlock_page(page);
      						up_read(&parent->mmap_sem);
      
      The solution is to take an extra reference to the page while we are
      holding the lock on it.
      Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
      Cc: Hillf Danton <dhillf@gmail.com>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      66aebce7
    • Konstantin Shlyakhovoy's avatar
      drivers/rtc/rtc-twl.c: use static register while reading time · f3ec434c
      Konstantin Shlyakhovoy authored
      RTC stores time and date in several registers.  Due to the fact that
      these registers can't be read instantaneously, there is a chance that
      reading from counting registers gives an error of one minute, one hour,
      one day, etc.
      
      To address this issue, the RTC has hardware support to copy the RTC
      counting registers to static shadowed registers.  The current
      implementation does not use this feature, and in a stress test, we can
      reproduce this error at a rate of around two times per 300000 readings.
      
      Fix the implementation to ensure that the right snapshot of time is
      captured.
      Signed-off-by: default avatarKonstantin Shlyakhovoy <x0155534@ti.com>
      Signed-off-by: default avatarNishanth Menon <nm@ti.com>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Benoit Cousson <b-cousson@ti.com>
      Cc: linux-omap <linux-omap@vger.kernel.org>
      Acked-by: default avatarMykola Oleksiienko <x0174904@ti.com>
      Acked-by: default avatarOleksandr Dmytryshyn <oleksandr.dmytryshyn@ti.com>
      Acked-by: default avatarGraeme Gregory <gg@slimlogic.co.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f3ec434c
    • Tushar Behera's avatar
      drivers/rtc/rtc-s3c.c: add placeholder for driver private data · c3cba928
      Tushar Behera authored
      Driver data field is a pointer, hence assigning that to an integer results
      in compilation warnings.
      
      Fixes following compilation warnings:
      
        drivers/rtc/rtc-s3c.c: In function `s3c_rtc_get_driver_data':
        drivers/rtc/rtc-s3c.c:452:3: warning: return makes integer from pointer without a cast [enabled by default]
        drivers/rtc/rtc-s3c.c: At top level:
        drivers/rtc/rtc-s3c.c:674:3: warning: initialization makes pointer from integer without a cast [enabled by default]
        drivers/rtc/rtc-s3c.c:674:3: warning: (near initialization for `s3c_rtc_dt_match[1].data') [enabled by default]
        drivers/rtc/rtc-s3c.c:677:3: warning: initialization makes pointer from integer without a cast [enabled by default]
        drivers/rtc/rtc-s3c.c:677:3: warning: (near initialization for `s3c_rtc_dt_match[2].data') [enabled by default]
        drivers/rtc/rtc-s3c.c:680:3: warning: initialization makes pointer from integer without a cast [enabled by default]
        drivers/rtc/rtc-s3c.c:680:3: warning: (near initialization for `s3c_rtc_dt_match[3].data') [enabled by default]
      Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
      Cc: Heiko Stuebner <heiko@sntech.de>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c3cba928
    • Tushar Behera's avatar
      drivers/rtc/rtc-s3c.c: fix compilation error · cd1e6f9e
      Tushar Behera authored
      Fix this error:
      
        drivers/rtc/rtc-s3c.c: At top level:
        drivers/rtc/rtc-s3c.c:671:3: error: request for member `data' in something not a structure or union
        drivers/rtc/rtc-s3c.c:674:3: error: request for member `data' in something not a structure or union
        drivers/rtc/rtc-s3c.c:677:3: error: request for member `data' in something not a structure or union
        drivers/rtc/rtc-s3c.c:680:3: error: request for member `data' in something not a structure or union
      Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
      Cc: Heiko Stuebner <heiko@sntech.de>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cd1e6f9e
    • Khalid Aziz's avatar
      MAINTAINERS: add PCDP console maintainer · 3971dae5
      Khalid Aziz authored
      Add missing maintainer info for PCDP console code.
      Signed-off-by: default avatarKhalid Aziz <khalid.aziz@hp.com>
      Cc: Joe Perches <joe@perches.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3971dae5
    • Glauber Costa's avatar
      memcg: do not open code accesses to res_counter members · 569530fb
      Glauber Costa authored
      We should use the accessor res_counter_read_u64 for that.
      
      Although a purely cosmetic change is sometimes better delayed, to avoid
      conflicting with other people's work, we are starting to have people
      touching this code as well, and reproducing the open code behavior
      because that's the standard =)
      
      Time to fix it, then.
      Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      569530fb
    • Jan Beulich's avatar
      drivers/rtc/rtc-efi.c: fix section mismatch warning · 32050017
      Jan Beulich authored
      efi_rtc_init() uses platform_driver_probe(), so there's no need to also
      set efi_rtc_driver's probe member (as it won't be used anyway).  This
      fixes a modpost section mismatch warning (as efi_rtc_probe() validly is
      __init).
      Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
      Cc: Matthew Garrett <mjg@redhat.com>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      32050017
    • Andreas Dumberger's avatar
      drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected · bb58da08
      Andreas Dumberger authored
      hwclock refuses to set date/time if RTC registers contain invalid
      values.  Check the date/time register values at probe time and
      initialize them to make hwclock happy.
      Signed-off-by: default avatarAndreas Dumberger <andreas.dumberger@tqs.de>
      Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb58da08
    • Mathieu Desnoyers's avatar
      drivers/char/random.c: fix boot id uniqueness race · 44e4360f
      Mathieu Desnoyers authored
      /proc/sys/kernel/random/boot_id can be read concurrently by userspace
      processes.  If two (or more) user-space processes concurrently read
      boot_id when sysctl_bootid is not yet assigned, a race can occur making
      boot_id differ between the reads.  Because the whole point of the boot id
      is to be unique across a kernel execution, fix this by protecting this
      operation with a spinlock.
      
      Given that this operation is not frequently used, hitting the spinlock
      on each call should not be an issue.
      Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Cc: "Theodore Ts'o" <tytso@mit.edu>
      Cc: Matt Mackall <mpm@selenic.com>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Cc: Greg Kroah-Hartman <greg@kroah.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      44e4360f
    • Kirill A. Shutemov's avatar
      memcg: fix broken boolen expression · d833049b
      Kirill A. Shutemov authored
      action != CPU_DEAD || action != CPU_DEAD_FROZEN is always true.
      Signed-off-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
      Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d833049b
    • Ying Han's avatar
      memcg: fix up documentation on global LRU · 6252efcc
      Ying Han authored
      In v3.3-rc1, the global LRU was removed in commit 925b7673 ("mm:
      make per-memcg LRU lists exclusive").  The patch fixes up the memcg
      docs.
      
      I left the swap session to someone who has better understanding of
      'memory+swap'.
      Signed-off-by: default avatarYing Han <yinghan@google.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6252efcc
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 7e066489
      Linus Torvalds authored
      Pull irqdomain bug fixes from Grant Likely:
       "This branch fixes a bug in irq_create_mapping() where an error return
        from irq_alloc_desc_from() gets ignored.
      
        It also removes irq_virq_count to fix a bug on powerpc where the
        irqdomain code does not find irqs allocated above the CONFIG_NR_IRQS
        boundary.
      
        The remaining patches get rid of an completely pointless export and
        fix some minor bugs in the irqdomain debug output."
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        irq_domain: Move irq_virq_count into NOMAP revmap
        irqdomain: Fix debugfs formatting
        irq_domain: correct the debugfs file name
        irq: Kill pointless irqd_to_hw export
        irq/irq_domain: Quit ignoring error returns from irq_alloc_desc_from().
      7e066489
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4abb663b
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Just a few small fixes..."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: da9052 - fix memory leak in da9052_onkey_probe()
        Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h
        Input: trackpoint - use psmouse_fmt() for messages
        Input: elantech - v4 is a clickpad, with only one button
        Input: elantech - reset touchpad before configuring it
        Input: sentelic - filter taps in absolute mode
        Input: tps6507x-ts - fix MODULE_ALIAS to match driver name
      4abb663b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 5ba7026b
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "Regression fix in mtdchar_open(), fix for a really old leak
        (almost never hit in practice - it's a b0rken failure exit in
        simple_fill_super()) and a typo fix in vfs.txt (misspelled
        method type)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        typo fix in Documentation/filesystems/vfs.txt
        dentry leak in simple_fill_super() failure exit
        fix breakage in mtdchar_open(), sanitize failure exits
      5ba7026b
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · 173fa4ec
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
      
      * 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung:
        drm/exynos: fixed exynos broken ioctl
        drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv
        drm/exynos: fix struct for operation callback functions to driver name
        drm/exynos: use define instead of default_win member in struct mixer_context
        drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
        drm/exynos: remove unused codes in hdmi and mixer
        drm/exynos: remove unnecessary type conversion of hdmi and mixer
        drm/exynos: add format list of plane
        drm/exynos: fixed duplicated page allocation bug.
        drm/exynos: fixed page align and code clean.
      173fa4ec
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of... · 19e5c4e7
      Dave Airlie authored
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes
      
      Daniel Vetter writes:
      3 regression fixes:
      - disable gmbus again, too broken for 3.4, we'll try again for 3.5
      - dp bandwidth computation fix, we've lost the 6bpc dithering flag
       sometimes, this is a 3.3 regression (maybe even earlier for some
       configurations).
      - fix resume regression caused by the gen2/3 fencing fix merged into -rc2.
      
      And a few other fixes:
      - gpu hang fix for i845 (Chris)
      - sprite fix (Armin Reese)
      - crtc disable vs. scanlinewait race fix (Chris)
      - rc6 module option read-only, it confused testers (Jesse)
      - fbc related blitter death hw workaround, note that we disable fbc on snb
       by default anyway.
      
      With these fixes we have one 3.4 regression outstanding: One of the
      cleanup patches for the interlaced support managed to confuse the lvds
      panel fitter when upscaling. The root-cause is still unclear, but test
      patches are awaiting feedback from the reporter.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: clear fencing tracking state when retiring requests
        drm/i915: make rc6 module parameter read-only
        drm/i915: implement ColorBlt w/a
        drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
        Revert "drm/i915: reenable gmbus on gen3+ again"
        drm/i915: properly compute dp dithering for user-created modes
        drm/i915: Finish any pending operations on the framebuffer before disabling
        drm/i915: Removed IVB forced enable of sprite dest key.
      19e5c4e7
    • Stephen Lewis's avatar
      USB: update usbtmc api documentation · 9de29225
      Stephen Lewis authored
      Correct path names in API documentation for usbtmc
      Signed-off-by: default avatarStephen Lewis <lewis@sdf.lonestar.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      9de29225
    • Greg Kroah-Hartman's avatar
      Merge tag 'for-usb-linus-2012-04-11' of... · 5c15c9a6
      Greg Kroah-Hartman authored
      Merge tag 'for-usb-linus-2012-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus
      
      Hi Greg,
      
      Here's 11 xHCI bug fixes for 3.4.
      
      Some of the patches fix issues with crashes on system resume related to
      VIA xHCI host controllers accessing bad memory addresses.  The patches
      change the register restore ordering, so I had several vendors confirm
      that the patches don't break their xHCI hosts.
      
      Elric Fu confirms this patchset fixes the VIA issue, Alex He confirms
      the changes does not break suspend/resume on AMD xHCI systems, and I've
      made sure it doesn't break Intel host controllers.  I have not heard
      back from Felipe about the TI host, so at this point, I'm just going to
      send them off.
      
      Several of the patches are marked for stable.  Please pull.
      
      Sarah Sharp
      5c15c9a6
    • John W. Linville's avatar
      Merge branch 'master' of... · 5d949944
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      5d949944
    • Inki Dae's avatar
      drm/exynos: fixed exynos broken ioctl · 490aa60e
      Inki Dae authored
      this patch removes the pointer of uint64_t *edid. it should be just
      a uint64_t.
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      490aa60e