1. 26 Oct, 2011 15 commits
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8a4a8918
      Linus Torvalds authored
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
        llist: Add back llist_add_batch() and llist_del_first() prototypes
        sched: Don't use tasklist_lock for debug prints
        sched: Warn on rt throttling
        sched: Unify the ->cpus_allowed mask copy
        sched: Wrap scheduler p->cpus_allowed access
        sched: Request for idle balance during nohz idle load balance
        sched: Use resched IPI to kick off the nohz idle balance
        sched: Fix idle_cpu()
        llist: Remove cpu_relax() usage in cmpxchg loops
        sched: Convert to struct llist
        llist: Add llist_next()
        irq_work: Use llist in the struct irq_work logic
        llist: Return whether list is empty before adding in llist_add()
        llist: Move cpu_relax() to after the cmpxchg()
        llist: Remove the platform-dependent NMI checks
        llist: Make some llist functions inline
        sched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch
        sched: Remove redundant test in check_preempt_tick()
        sched: Add documentation for bandwidth control
        sched: Return unused runtime on group dequeue
        ...
      8a4a8918
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8686a0e2
      Linus Torvalds authored
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix insn decoder for longer instruction
      8686a0e2
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7115e3fc
      Linus Torvalds authored
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)
        perf symbols: Increase symbol KSYM_NAME_LEN size
        perf hists browser: Refuse 'a' hotkey on non symbolic views
        perf ui browser: Use libslang to read keys
        perf tools: Fix tracing info recording
        perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads
        perf hists: Don't consider filtered entries when calculating column widths
        perf hists: Don't decay total_period for filtered entries
        perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}
        perf hists browser: Do not exit on tab key with single event
        perf annotate browser: Don't change selection line when returning from callq
        perf tools: handle endianness of feature bitmap
        perf tools: Add prelink suggestion to dso update message
        perf script: Fix unknown feature comment
        perf hists browser: Apply the dso and thread filters when merging new batches
        perf hists: Move the dso and thread filters from hist_browser
        perf ui browser: Honour the xterm colors
        perf top tui: Give color hints just on the percentage, like on --stdio
        perf ui browser: Make the colors configurable and change the defaults
        perf tui: Remove unneeded call to newtCls on startup
        perf hists: Don't format the percentage on hist_entry__snprintf
        ...
      
      Fix up conflicts in arch/x86/kernel/kprobes.c manually.
      
      Ingo's tree did the insane "add volatile to const array", which just
      doesn't make sense ("volatile const"?).  But we could remove the const
      *and* make the array volatile to make doubly sure that gcc doesn't
      optimize it away..
      
      Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the
      reader_lock has been turned into a raw lock by the core locking merge,
      and there was a new user of it introduced in this perf core merge.  Make
      sure that new use also uses the raw accessor functions.
      7115e3fc
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1f6e0517
      Linus Torvalds authored
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
        genirq: Fix fatfinered fixup really
        genirq: percpu: allow interrupt type to be set at enable time
        genirq: Add support for per-cpu dev_id interrupts
        genirq: Add IRQCHIP_SKIP_SET_WAKE flag
      1f6e0517
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 19b4a8d5
      Linus Torvalds authored
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
        rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()
        rcu: Remove rcu_needs_cpu_flush() to avoid false quiescent states
        rcu: Wire up RCU_BOOST_PRIO for rcutree
        rcu: Make rcu_torture_boost() exit loops at end of test
        rcu: Make rcu_torture_fqs() exit loops at end of test
        rcu: Permit rt_mutex_unlock() with irqs disabled
        rcu: Avoid having just-onlined CPU resched itself when RCU is idle
        rcu: Suppress NMI backtraces when stall ends before dump
        rcu: Prohibit grace periods during early boot
        rcu: Simplify unboosting checks
        rcu: Prevent early boot set_need_resched() from __rcu_pending()
        rcu: Dump local stack if cannot dump all CPUs' stacks
        rcu: Move __rcu_read_unlock()'s barrier() within if-statement
        rcu: Improve rcu_assign_pointer() and RCU_INIT_POINTER() documentation
        rcu: Make rcu_assign_pointer() unconditionally insert a memory barrier
        rcu: Make rcu_implicit_dynticks_qs() locals be correct size
        rcu: Eliminate in_irq() checks in rcu_enter_nohz()
        nohz: Remove nohz_cpu_mask
        rcu: Document interpretation of RCU-lockdep splats
        rcu: Allow rcutorture's stat_interval parameter to be changed at runtime
        ...
      19b4a8d5
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3cfef952
      Linus Torvalds authored
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
        rtmutex: Add missing rcu_read_unlock() in debug_rt_mutex_print_deadlock()
        lockdep: Comment all warnings
        lib: atomic64: Change the type of local lock to raw_spinlock_t
        locking, lib/atomic64: Annotate atomic64_lock::lock as raw
        locking, x86, iommu: Annotate qi->q_lock as raw
        locking, x86, iommu: Annotate irq_2_ir_lock as raw
        locking, x86, iommu: Annotate iommu->register_lock as raw
        locking, dma, ipu: Annotate bank_lock as raw
        locking, ARM: Annotate low level hw locks as raw
        locking, drivers/dca: Annotate dca_lock as raw
        locking, powerpc: Annotate uic->lock as raw
        locking, x86: mce: Annotate cmci_discover_lock as raw
        locking, ACPI: Annotate c3_lock as raw
        locking, oprofile: Annotate oprofilefs lock as raw
        locking, video: Annotate vga console lock as raw
        locking, latencytop: Annotate latency_lock as raw
        locking, timer_stats: Annotate table_lock as raw
        locking, rwsem: Annotate inner lock as raw
        locking, semaphores: Annotate inner lock as raw
        locking, sched: Annotate thread_group_cputimer as raw
        ...
      
      Fix up conflicts in kernel/posix-cpu-timers.c manually: making
      cputimer->cputime a raw lock conflicted with the ABBA fix in commit
      bcd5cff7 ("cputimer: Cure lock inversion").
      3cfef952
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98265300
      Linus Torvalds authored
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, ioapic: Consolidate the explicit EOI code
        x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
        x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
        iommu: Rename the DMAR and INTR_REMAP config options
        x86, ioapic: Define irq_remap_modify_chip_defaults()
        x86, msi, intr-remap: Use the ioapic set affinity routine
        iommu: Cleanup ifdefs in detect_intel_iommu()
        iommu: No need to set dmar_disabled in check_zero_address()
        iommu: Move IOMMU specific code to intel-iommu.c
        intr_remap: Call dmar_dev_scope_init() explicitly
        x86, x2apic: Enable the bios request for x2apic optout
      98265300
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 37d96c28
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        caif: Fix BUG() with network namespaces
        net: make bonding slaves honour master's skb->priority
        net: Unlock sock before calling sk_free()
      37d96c28
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · aa77677e
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
        staging: et131x: Remove redundant check and return statement
        staging: et131x: Mainly whitespace changes to appease checkpatch
        staging: et131x: Remove last of the forward declarations
        staging: et131x: Remove even more forward declarations
        staging: et131x: Remove yet more forward declarations
        staging: et131x: Remove more forward declarations
        staging: et131x: Remove forward declaration of et131x_adapter_setup
        staging: et131x: Remove some forward declarations
        staging: et131x: Remove unused rx_ring.recv_packet_pool
        staging: et131x: Remove call to find pci pm capability
        staging: et131x: Remove redundant et131x_reset_recv() call
        staging: et131x: Remove unused rx_ring.recv_buffer_pool
        Staging: bcm: Fix three initialization errors in InterfaceDld.c
        Staging: bcm: Fix coding style issues in InterfaceDld.c
        staging:iio:dac: Add AD5360 driver
        staging:iio:trigger:bfin-timer: Fix compile error
        Staging: vt6655: add some range checks before memcpy()
        Staging: vt6655: whitespace fixes to iotcl.c
        Staging: vt6656: add some range checks before memcpy()
        Staging: vt6656: whitespace cleanups in ioctl.c
        ...
      
      Fix up conflicts in:
       - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
      	vg driver movement
       - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
      	driver removal vs now stale changes
       - drivers/staging/rtl8192e/r8192E_core.c:
      	driver removal vs now stale changes
       - drivers/staging/et131x/et131*:
      	driver consolidation into one file, tried to do fixups
      aa77677e
    • Linus Torvalds's avatar
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · efb8d21b
      Linus Torvalds authored
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
        TTY: serial_core: Fix crash if DCD drop during suspend
        tty/serial: atmel_serial: bootconsole removed from auto-enumerates
        Revert "TTY: call tty_driver_lookup_tty unconditionally"
        tty/serial: atmel_serial: add device tree support
        tty/serial: atmel_serial: auto-enumerate ports
        tty/serial: atmel_serial: whitespace and braces modifications
        tty/serial: atmel_serial: change platform_data variable name
        tty/serial: RS485 bindings for device tree
        TTY: call tty_driver_lookup_tty unconditionally
        TTY: pty, release tty in all ptmx_open fail paths
        TTY: make tty_add_file non-failing
        TTY: drop driver reference in tty_open fail path
        8250_pci: Fix kernel panic when pch_uart is disabled
        h8300: drivers/serial/Kconfig was moved
        parport_pc: release IO region properly if unsupported ITE887x card is found
        tty: Support compat_ioctl get/set termios_locked
        hvc_console: display printk messages on console.
        TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
        tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
        tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
        ...
      
      Fix up Conflicts in:
       - drivers/tty/serial/8250_pci.c
      	Trivial conflict with removed duplicate device ID
       - drivers/tty/serial/atmel_serial.c
      	Annoying silly conflict between "specify the port num via
      	platform_data" and other changes to atmel_console_init
      efb8d21b
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of... · 3cb60328
      Linus Torvalds authored
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (26 commits)
        hwmon: (w83627ehf) Better fix for negative temperature values
        hwmon: (w83627ehf) Uninline is_word_sized
        hwmon: (lm75) Document why clones are not detected
        hwmon: (w83627ehf) Move fan pins check to a separate function
        hwmon: (w83627ehf) Skip reading unused voltage registers
        hwmon: (lm75) Add support for Analog Devices ADT75
        hwmon: (pmbus_core) Simplify sign extensions
        hwmon: (pmbus) Add support for Lineage Power DC-DC converters
        hwmon: (pmbus/ltc2978) Add support for LTC3880 to LTC2978 driver
        hwmon: (pmbus/ltc2978) Explicit driver for LTC2978
        hwmon: (pmbus) Add support for TEMP2 peak attributes
        hwmon: AD7314 driver (ported from IIO)
        hwmon: (pmbus) Add support for Intersil power management chips
        hwmon: (pmbus) Always call _pmbus_read_byte in core driver
        hwmon: (pmbus) Replace EINVAL return codes with more appropriate errors
        hwmon: (pmbus) Provide more documentation
        hwmon/f71882fg: Make the decision wether to register fan attr. per fan
        hwmon/f71882fg: Add a f71882fg_create_fan_sysfs_files helper function
        hwmon/f71882fg: Make all fan/pwm attr tables 2 dimensional
        hwmon: (exynos4_tmu) Remove IRQF_DISABLED
        ...
      3cb60328
    • Linus Torvalds's avatar
      Merge git://github.com/rustyrussell/linux · 2355e429
      Linus Torvalds authored
      * git://github.com/rustyrussell/linux:
        params: make dashes and underscores in parameter names truly equal
        kmod: prevent kmod_loop_msg overflow in __request_module()
      2355e429
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://github.com/ericvh/linux · e33bae14
      Linus Torvalds authored
      * 'for-linus' of git://github.com/ericvh/linux:
        9p: fix 9p.txt to advertise msize instead of maxdata
        net/9p: Convert net/9p protocol dumps to tracepoints
        fs/9p: change an int to unsigned int
        fs/9p: Cleanup option parsing in 9p
        9p: move dereference after NULL check
        fs/9p: inode file operation is properly initialized init_special_inode
        fs/9p: Update zero-copy implementation in 9p
      e33bae14
    • Michal Schmidt's avatar
      params: make dashes and underscores in parameter names truly equal · b1e4d20c
      Michal Schmidt authored
      The user may use "foo-bar" for a kernel parameter defined as "foo_bar".
      Make sure it works the other way around too.
      
      Apply the equality of dashes and underscores on early_params and __setup
      params as well.
      
      The example given in Documentation/kernel-parameters.txt indicates that
      this is the intended behaviour.
      
      With the patch the kernel accepts "log-buf-len=1M" as expected.
      https://bugzilla.redhat.com/show_bug.cgi?id=744545Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (neatened implementations)
      b1e4d20c
    • Jiri Kosina's avatar
      kmod: prevent kmod_loop_msg overflow in __request_module() · 37252db6
      Jiri Kosina authored
      Due to post-increment in condition of kmod_loop_msg in __request_module(),
      the system log can be spammed by much more than 5 instances of the 'runaway
      loop' message if the number of events triggering it makes the kmod_loop_msg
      to overflow.
      
      Fix that by making sure we never increment it past the threshold.
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      CC: stable@kernel.org
      37252db6
  2. 25 Oct, 2011 25 commits
    • David Woodhouse's avatar
      caif: Fix BUG() with network namespaces · 08613e46
      David Woodhouse authored
      The caif code will register its own pernet_operations, and then register
      a netdevice_notifier. Each time the netdevice_notifier is triggered,
      it'll do some stuff... including a lookup of its own pernet stuff with
      net_generic().
      
      If the net_generic() call ever returns NULL, the caif code will BUG().
      That doesn't seem *so* unreasonable, I suppose — it does seem like it
      should never happen.
      
      However, it *does* happen. When we clone a network namespace,
      setup_net() runs through all the pernet_operations one at a time. It
      gets to loopback before it gets to caif. And loopback_net_init()
      registers a netdevice... while caif hasn't been initialised. So the caif
      netdevice notifier triggers, and immediately goes BUG().
      
      We could imagine a complex and overengineered solution to this generic
      class of problems, but this patch takes the simple approach. It just
      makes caif_device_notify() *not* go looking for its pernet data
      structures if the device it's being notified about isn't a caif device
      in the first place.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Acked-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      08613e46
    • Maciej Żenczykowski's avatar
    • Thomas Gleixner's avatar
      b0691c8e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu · 7670c701
      Linus Torvalds authored
      * 'for-linus' of git://github.com/gregungerer/m68knommu:
        m68k: drop unused Kconfig symbols
        m68k: drop unused Kconfig symbols
        m68knommu: create common externs for _ram* vars
        m68knommu: remove extern declarations of memory_start/memory_end from mm/init
        m68knommu: use generic section names in mm/init code
        m68knommu: use generic section names in setup code
        m68k: merge the mmu and non-mmu traps.c files
        m68k: move hardware vector setting from traps.c to its own file
        m68k: merge mmu and non-mmu include/asm/entry.h files
        m68k: merge the mmu and non-mmu kernel/Makefiles
        m68k: merge mmu and non-mmu arch Makefiles
        m68k: reorganize Kconfig options to improve mmu/non-mmu selections
        m68knommu: fix problems with SPI/GPIO on ColdFire 520x
        m68k: fix memcpy to unmatched/unaligned source and dest on 68000
      7670c701
    • Eric Dumazet's avatar
      ehea: fix skb_frag_size typo · 0110bba5
      Eric Dumazet authored
      Commit 9e903e08 ("net: add skb frag size accessors") introduced a
      typo in ehea driver.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0110bba5
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · ef78cc75
      Linus Torvalds authored
      * 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (26 commits)
        Check validity of cl_rpcclient in nfs_server_list_show
        NFS: Get rid of the nfs_rdata_mempool
        NFS: Don't rely on PageError in nfs_readpage_release_partial
        NFS: Get rid of unnecessary calls to ClearPageError() in read code
        NFS: Get rid of nfs_restart_rpc()
        NFS: Get rid of the unused nfs_write_data->flags field
        NFS: Get rid of the unused nfs_read_data->flags field
        NFSv4: Translate NFS4ERR_BADNAME into ENOENT when applied to a lookup
        NFS: Remove the unused "lookupfh()" version of nfs4_proc_lookup()
        NFS: Use the inode->i_version to cache NFSv4 change attribute information
        SUNRPC: Remove unnecessary export of rpc_sockaddr2uaddr
        SUNRPC: Fix rpc_sockaddr2uaddr
        nfs/super.c: local functions should be static
        pnfsblock: fix writeback deadlock
        pnfsblock: fix NULL pointer dereference
        pnfs: recoalesce when ld read pagelist fails
        pnfs: recoalesce when ld write pagelist fails
        pnfs: make _set_lo_fail generic
        pnfsblock: add missing rpc_put_mount and path_put
        SUNRPC/NFS: make rpc pipe upcall generic
        ...
      ef78cc75
    • Linus Torvalds's avatar
      Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux · 1442d167
      Linus Torvalds authored
      * 'for-3.2' of git://linux-nfs.org/~bfields/linux: (103 commits)
        nfs41: implement DESTROY_CLIENTID operation
        nfsd4: typo logical vs bitwise negate for want_mask
        nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED
        nfsd4: seq->status_flags may be used unitialized
        nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid
        nfsd4: implement new 4.1 open reclaim types
        nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround
        nfsd4: warn on open failure after create
        nfsd4: preallocate open stateid in process_open1()
        nfsd4: do idr preallocation with stateid allocation
        nfsd4: preallocate nfs4_file in process_open1()
        nfsd4: clean up open owners on OPEN failure
        nfsd4: simplify process_open1 logic
        nfsd4: make is_open_owner boolean
        nfsd4: centralize renew_client() calls
        nfsd4: typo logical vs bitwise negate
        nfs: fix bug about IPv6 address scope checking
        nfsd4: more robust ignoring of WANT bits in OPEN
        nfsd4: move name-length checks to xdr
        nfsd4: move access/deny validity checks to xdr code
        ...
      1442d167
    • Linus Torvalds's avatar
      Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7e0bb71e
      Linus Torvalds authored
      * 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
        PM / Clocks: Remove redundant NULL checks before kfree()
        PM / Documentation: Update docs about suspend and CPU hotplug
        ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
        ARM: mach-shmobile: sh7372 A4R support (v4)
        ARM: mach-shmobile: sh7372 A3SP support (v4)
        PM / Sleep: Mark devices involved in wakeup signaling during suspend
        PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
        PM / Hibernate: Do not initialize static and extern variables to 0
        PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
        PM / Hibernate: Add resumedelay kernel param in addition to resumewait
        MAINTAINERS: Update linux-pm list address
        PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
        PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
        PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
        PM / Hibernate: Fix typo in a kerneldoc comment
        PM / Hibernate: Freeze kernel threads after preallocating memory
        PM: Update the policy on default wakeup settings
        PM / VT: Cleanup #if defined uglyness and fix compile error
        PM / Suspend: Off by one in pm_suspend()
        PM / Hibernate: Include storage keys in hibernation image on s390
        ...
      7e0bb71e
    • Eric W. Biederman's avatar
      sysfs: Remove support for tagged directories with untagged members (again) · b9e2780d
      Eric W. Biederman authored
      In commit 8a9ea323 ("Merge git://.../davem/net-next") where my sysfs
      changes from the net tree merged with the sysfs rbtree changes from
      Mickulas Patocka the conflict resolution failed to preserve the
      simplified property that was the point of my changes.
      
      That is sysfs_find_dirent can now say something is a match if and only
      s_name and s_ns match what we are looking for, and sysfs_readdir can
      simply return all of the directory entries where s_ns matches the
      directory that we should be returning.
      
      Now that we are back to exact matches we can tweak sysfs_find_dirent and
      the name rb_tree to order sysfs_dirents by s_ns s_name and remove the
      second loop in sysfs_find_dirent.  However that change seems a bit much
      for a conflict resolution so it can come later.
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b9e2780d
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl · c9d6329c
      Linus Torvalds authored
      * 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl:
        pinctrl/sirf: fix sirfsoc_get_group_pins prototype
        pinctrl: Don't copy function name when requesting a pin
        pinctrl: Don't copy pin names when registering them
        pinctrl: Remove unsafe __refdata
        pinctrl: get_group_pins() const fixes
        pinctrl: add a driver for the CSR SiRFprimaII pinmux
        pinctrl: add a driver for the U300 pinmux
        drivers: create a pin control subsystem
      c9d6329c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap · 4e7e2a20
      Linus Torvalds authored
      * 'for-linus' of git://opensource.wolfsonmicro.com/regmap: (62 commits)
        mfd: Enable rbtree cache for wm831x devices
        regmap: Support some block operations on cached devices
        regmap: Allow caches for devices with no defaults
        regmap: Ensure rbtree syncs registers set to zero properly
        regmap: Allow rbtree to cache zero default values
        regmap: Warn on raw I/O as well as bulk reads that bypass cache
        regmap: Return a sensible error code if we fail to read the cache
        regmap: Use bsearch() to search the register defaults
        regmap: Fix doc comment
        regmap: Optimize the lookup path to use binary search
        regmap: Ensure we scream if we enable cache bypass/only at the same time
        regmap: Implement regcache_cache_bypass helper function
        regmap: Save/restore the bypass state upon syncing
        regmap: Lock the sync path, ensure we use the lockless _regmap_write()
        regmap: Fix apostrophe usage
        regmap: Make _regmap_write() global
        regmap: Fix lock used for regcache_cache_only()
        regmap: Grab the lock in regcache_cache_only()
        regmap: Modify map->cache_bypass directly
        regmap: Fix regcache_sync generic implementation
        ...
      4e7e2a20
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 8a9ea323
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
        dp83640: free packet queues on remove
        dp83640: use proper function to free transmit time stamping packets
        ipv6: Do not use routes from locally generated RAs
        |PATCH net-next] tg3: add tx_dropped counter
        be2net: don't create multiple RX/TX rings in multi channel mode
        be2net: don't create multiple TXQs in BE2
        be2net: refactor VF setup/teardown code into be_vf_setup/clear()
        be2net: add vlan/rx-mode/flow-control config to be_setup()
        net_sched: cls_flow: use skb_header_pointer()
        ipv4: avoid useless call of the function check_peer_pmtu
        TCP: remove TCP_DEBUG
        net: Fix driver name for mdio-gpio.c
        ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
        rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
        ipv4: fix ipsec forward performance regression
        jme: fix irq storm after suspend/resume
        route: fix ICMP redirect validation
        net: hold sock reference while processing tx timestamps
        tcp: md5: add more const attributes
        Add ethtool -g support to virtio_net
        ...
      
      Fix up conflicts in:
       - drivers/net/Kconfig:
      	The split-up generated a trivial conflict with removal of a
      	stale reference to Documentation/networking/net-modules.txt.
      	Remove it from the new location instead.
       - fs/sysfs/dir.c:
      	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
      	with Eric Biederman's changes for tagged directories.
      8a9ea323
    • Linus Torvalds's avatar
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1be025d3
      Linus Torvalds authored
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
        usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
        usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
        USB: gadget: midi: memory leak in f_midi_bind_config()
        USB: gadget: midi: fix range check in f_midi_out_open()
        QE/FHCI: fixed the CONTROL bug
        usb: renesas_usbhs: tidyup for smatch warnings
        USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
        EHCI: workaround for MosChip controller bug
        usb: gadget: file_storage: fix race on unloading
        USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
        USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
        USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
        USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
        usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
        USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
        USB: Fix runtime wakeup on OHCI
        xHCI/USB: Make xHCI driver have a BOS descriptor.
        usb: gadget: add new usb gadget for ACM and mass storage
        ...
      1be025d3
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 2d03423b
      Linus Torvalds authored
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
        mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
        Revert "memory hotplug: Correct page reservation checking"
        Update email address for stable patch submission
        dynamic_debug: fix undefined reference to `__netdev_printk'
        dynamic_debug: use a single printk() to emit messages
        dynamic_debug: remove num_enabled accounting
        dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
        uio: Support physical addresses >32 bits on 32-bit systems
        sysfs: add unsigned long cast to prevent compile warning
        drivers: base: print rejected matches with DEBUG_DRIVER
        memory hotplug: Correct page reservation checking
        memory hotplug: Refuse to add unaligned memory regions
        remove the messy code file Documentation/zh_CN/SubmitChecklist
        ARM: mxc: convert device creation to use platform_device_register_full
        new helper to create platform devices with dma mask
        docs/driver-model: Update device class docs
        docs/driver-model: Document device.groups
        kobj_uevent: Ignore if some listeners cannot handle message
        dynamic_debug: make netif_dbg() call __netdev_printk()
        dynamic_debug: make netdev_dbg() call __netdev_printk()
        ...
      2d03423b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 59e52534
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
        MAINTAINERS: linux-m32r is moderated for non-subscribers
        linux@lists.openrisc.net is moderated for non-subscribers
        Drop default from "DM365 codec select" choice
        parisc: Kconfig: cleanup Kernel page size default
        Kconfig: remove redundant CONFIG_ prefix on two symbols
        cris: remove arch/cris/arch-v32/lib/nand_init.S
        microblaze: add missing CONFIG_ prefixes
        h8300: drop puzzling Kconfig dependencies
        MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
        tty: drop superfluous dependency in Kconfig
        ARM: mxc: fix Kconfig typo 'i.MX51'
        Fix file references in Kconfig files
        aic7xxx: fix Kconfig references to READMEs
        Fix file references in drivers/ide/
        thinkpad_acpi: Fix printk typo 'bluestooth'
        bcmring: drop commented out line in Kconfig
        btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
        doc: raw1394: Trivial typo fix
        CIFS: Don't free volume_info->UNC until we are entirely done with it.
        treewide: Correct spelling of successfully in comments
        ...
      59e52534
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · 73692d9b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()
      73692d9b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 31dced41
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
        HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
        HID: Add device IDs for more SJOY adapters
        HID: primax: remove spurious dependency
        HID: support primax keyboards violating USB HID spec
        HID: usbhid: cancel timer for retry synchronously
        HID: wacom: Set input bits before registration
        HID: consolidate MacbookAir 4,1 mappings
        HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
        HID: Add support MacbookAir 4,1 keyboard
        HID: hidraw: open count should not increase if error
        HID: hiddev: potential info leak in hiddev_ioctl()
        HID: multitouch: decide if hid-multitouch needs to handle mt devices
        HID: add autodetection of multitouch devices
        HID: "hid-logitech" driver with Logitech Driving Force GT
        HID: hid-logitech-dj: fix off by one
        HID: hidraw: protect hidraw_disconnect() better
        HID: hid-multitouch: add support for the IDEACOM 6650 chip
        HID: Add full support for Logitech Unifying receivers
        HID: hidraw: free list for all error in hidraw_open
        HID: roccat: Kone now reports external profile changes via roccat device
        ...
      31dced41
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 7c1953dd
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (62 commits)
        target: Fix compile warning w/ missing module.h include
        target: Remove legacy se_task->task_timer and associated logic
        target: Fix incorrect transport_sent usage
        target: re-use the command S/G list for single-task commands
        target: Fix BIDI t_task_cdb handling in transport_generic_new_cmd
        target: remove transport_allocate_tasks
        target: merge transport_new_cmd_obj into transport_generic_new_cmd
        target: remove the task_sg_bidi field se_task and pSCSI BIDI support
        target: transport_subsystem_check_init cleanups
        target: use a workqueue for I/O completions
        target: remove unused TRANSPORT_ states
        target: remove TRANSPORT_DEFERRED_CMD state
        target: remove the TRANSPORT_REMOVE state
        target: move depth_left manipulation out of transport_generic_request_failure
        target: stop task timers earlier
        target: remove TF_TIMER_STOP
        target: factor some duplicate code for stopping a task
        target: fix list walking in transport_free_dev_tasks
        target: use transport_cmd_check_stop_to_fabric consistently
        target: do not pass the queue object to transport_remove_cmd_from_queue
        ...
      7c1953dd
    • Jean-Christophe PLAGNIOL-VILLARD's avatar
      pinctrl/sirf: fix sirfsoc_get_group_pins prototype · ad7761ab
      Jean-Christophe PLAGNIOL-VILLARD authored
      fix sirfsoc_get_group_pins prototype introduced in 7e570f97, we
      missed to de-constify a pointer.
      Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      Acked-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      ad7761ab
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 1bc67188
      Linus Torvalds authored
      * 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (81 commits)
        ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online
        ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY
        ARM: 7136/1: pl330: Fix a race condition
        ARM: smp: fix clipping of number of CPUs
        ARM: 7137/1: Fix error upon adding LL debug
        ARM: Add a few machine types to mach-types
        ARM: 7130/1: dev_archdata: add private iommu extension
        ARM: 7125/1: Add unwinding annotations for 64bit division functions
        ARM: 7120/1: remove bashism in check for multiple zreladdrs
        ARM: 7118/1: rename temp variable in read*_relaxed()
        ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom
        ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage
        ARM: 7062/1: cache: detect PIPT I-cache using CTR
        ARM: platform fixups: remove mdesc argument to fixup function
        ARM: 7017/1: Use generic BUG() handler
        ARM: 7102/1: mach-integrator: update defconfig
        ARM: 7087/2: mach-integrator: get timer frequency from clock
        ARM: 7086/2: mach-integrator: modernize clock event registration
        ARM: 7085/2: mach-integrator: clockevent supports oneshot mode
        ARM: 7084/1: mach-integrator: retire some timer macros
        ...
      1bc67188
    • Jiri Kosina's avatar
      Merge branch 'upstream' into for-linus · b3aec7b6
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-core.c
      	drivers/hid/hid-ids.h
      b3aec7b6
    • Jiri Kosina's avatar
      Merge branch 'upstream-fixes' into for-linus · f6f12427
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-wacom.c
      f6f12427
    • Jiri Kosina's avatar
    • Linus Torvalds's avatar
      Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security · 36b8d186
      Linus Torvalds authored
      * 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
        TOMOYO: Fix incomplete read after seek.
        Smack: allow to access /smack/access as normal user
        TOMOYO: Fix unused kernel config option.
        Smack: fix: invalid length set for the result of /smack/access
        Smack: compilation fix
        Smack: fix for /smack/access output, use string instead of byte
        Smack: domain transition protections (v3)
        Smack: Provide information for UDS getsockopt(SO_PEERCRED)
        Smack: Clean up comments
        Smack: Repair processing of fcntl
        Smack: Rule list lookup performance
        Smack: check permissions from user space (v2)
        TOMOYO: Fix quota and garbage collector.
        TOMOYO: Remove redundant tasklist_lock.
        TOMOYO: Fix domain transition failure warning.
        TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
        TOMOYO: Simplify garbage collector.
        TOMOYO: Fix make namespacecheck warnings.
        target: check hex2bin result
        encrypted-keys: check hex2bin result
        ...
      36b8d186
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · cd85b557
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Finally remove leftover markers sections
        m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
        m68k/mac: Fix compiler warning in via_read_time()
        zorro: Fix four checkpatch warnings
      cd85b557