1. 17 11月, 2013 10 次提交
    • L
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 1213959d
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "A set of cifs fixes most important of which is Pavel's fix for some
        problems with handling Windows reparse points and also the security
        fix for setfacl over a cifs mount to Samba removing part of the ACL.
        Both of these fixes are for stable as well.
      
        Also added most of copychunk (copy offload) support to cifs although I
        expect a final patch in that series (to fix handling of larger files)
        in a few days (had to hold off on that in order to incorporate some
        additional code review feedback).
      
        Also added support for O_DIRECT on forcedirectio mounts (needed in
        order to run some of the server benchmarks over cifs and smb2/smb3
        mounts)"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        [CIFS] Warn if SMB3 encryption required by server
        setfacl removes part of ACL when setting POSIX ACLs to Samba
        [CIFS] Set copychunk defaults
        CIFS: SMB2/SMB3 Copy offload support (refcopy) phase 1
        cifs: Use data structures to compute NTLMv2 response offsets
        [CIFS] O_DIRECT opens should work on directio mounts
        cifs: don't spam the logs on unexpected lookup errors
        cifs: change ERRnomem error mapping from ENOMEM to EREMOTEIO
        CIFS: Fix symbolic links usage
      1213959d
    • L
      Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 673fdfe3
      Linus Torvalds 提交于
      Pull NFS client bugfixes:
       - Stable fix for data corruption when retransmitting O_DIRECT writes
       - Stable fix for a deep recursion/stack overflow bug in rpc_release_client
       - Stable fix for infinite looping when mounting a NFSv4.x volume
       - Fix a typo in the nfs mount option parser
       - Allow pNFS layouts to be compiled into the kernel when NFSv4.1 is
      
      * tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: fix pnfs Kconfig defaults
        NFS: correctly report misuse of "migration" mount option.
        nfs: don't retry detect_trunking with RPC_AUTH_UNIX more than once
        SUNRPC: Avoid deep recursion in rpc_release_client
        SUNRPC: Fix a data corruption issue when retransmitting RPC calls
      673fdfe3
    • L
      Merge tag 'sound-fix-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 73d75ba9
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Two peaks in diffstat are for the audio EQ init of IDT codecs and the
        EMU2004 usb mixer addition, both of which are pretty device-specific,
        so safe to apply.  The rest are a bunch of small fixes, most of them
        are regression fixes"
      
      * tag 'sound-fix-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
        ALSA: hda - load EQ params into IDT codec on HP bNB13 systems
        ASoC: cs42l52: Correct MIC CTL mask
        ASoC: wm8962: Turn on regcache_cache_only before disabling regulator
        ALSA: jack: Unregister input device at disconnection
        ALSA: pcsp: Fix the order of input device unregistration
        ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations
        ASoC: blackfin: Fix missing break
        ALSA: usb-audio: add front jack channel selector for EMU0204
        ALSA: hda - Don't clear the power state at snd_hda_codec_reset()
        ASoC: arizona: Fix typo in name of EQ coefficient controls
        ALSA: hda - Control EAPD for Master volume on Lenovo N100
        ALSA: hda - Don't turn off EAPD for headphone on Lenovo N100
        ALSA: isa: not allocating enough space
        ALSA: snd-aoa: two copy and paste bugs
        ASoC: wm8997: Correct typo in ISRC mux routes
        ALSA: hda - Check keep_eapd_on before inv_eapd
        ALSA: hda - Fix Line Out automute on Realtek multifunction jacks
        ALSA: msnd: Avoid duplicated driver name
        ALSA: compress_core: don't return -EBADFD from poll if paused
        ALSA: hda - hdmi: Fix wrong baseline length in ATI/AMD generated ELD
        ...
      73d75ba9
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 71f777ed
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A first set of batches of fixes for 3.13.  The diffstat is large
        mostly because we're adding a defconfig for a family that's been
        lacking it, and there's some missing clock information added for i.MX
        and OMAP.
      
        The at91 new code is around dealing with RTC/RTT reset at boot to fix
        possible hangs due to pending wakeup interrupts coming in during early
        boot"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
        ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
        ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
        doc: devicetree: Add bindings documentation for omap-des driver
        ARM: dts: doc: Document missing compatible property for omap-sham driver
        ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
        ARM: at91: fix hanged boot due to early rtt-interrupt
        ARM: at91: fix hanged boot due to early rtc-interrupt
        video: exynos_mipi_dsim: Remove unused variable
        ARM: highbank: only select errata 764369 if SMP
        ARM: sti: only select errata 764369 if SMP
        ARM: tegra: init fuse before setting reset handler
        ARM: vt8500: add defconfig for v6/v7 chips
        ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
        ARM: OMAP: devicetree: fix SPI node compatible property syntax items
        pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
        ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
        MAINTAINERS: drop discontinued mailing list
        ARM: dts: i.MX51: Fix OTG PHY clock
        ARM: imx: set up pllv3 POWER and BYPASS sequentially
        ARM: imx: pllv3 needs relock in .set_rate() call
        ...
      71f777ed
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · dd3190ee
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "Tooling changes only: it includes the ARM tooling fixlets, various
        other fixes, smaller updates, minor cleanups"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf record: Add an option to force per-cpu mmaps
        perf probe: Add '--demangle'/'--no-demangle'
        perf ui browser: Fix segfault caused by off by one handling END key
        perf symbols: Limit max callchain using max_stack on DWARF unwinding too
        perf evsel: Introduce perf_evsel__prev() method
        perf tools: Use perf_evlist__{first,last}, perf_evsel__next
        perf tools: Synthesize anon MMAP records again
        perf top: Add missing newline if the 'uid' is invalid
        perf tools: Remove trivial extra semincolon
        perf trace: Tweak summary output
        tools/perf/build: Fix feature-libunwind-debug-frame handling
        tools/perf/build: Fix timerfd feature check
      dd3190ee
    • L
      Merge tag 'trace-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · b29c8306
      Linus Torvalds 提交于
      Pull tracing update from Steven Rostedt:
       "This batch of changes is mostly clean ups and small bug fixes.  The
        only real feature that was added this release is from Namhyung Kim,
        who introduced "set_graph_notrace" filter that lets you run the
        function graph tracer and not trace particular functions and their
        call chain.
      
        Tom Zanussi added some updates to the ftrace multibuffer tracing that
        made it more consistent with the top level tracing.
      
        One of the fixes for perf function tracing required an API change in
        RCU; the addition of "rcu_is_watching()".  As Paul McKenney is pushing
        that change in this release too, he gave me a branch that included all
        the changes to get that working, and I pulled that into my tree in
        order to complete the perf function tracing fix"
      
      * tag 'trace-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Add rcu annotation for syscall trace descriptors
        tracing: Do not use signed enums with unsigned long long in fgragh output
        tracing: Remove unused function ftrace_off_permanent()
        tracing: Do not assign filp->private_data to freed memory
        tracing: Add helper function tracing_is_disabled()
        tracing: Open tracer when ftrace_dump_on_oops is used
        tracing: Add support for SOFT_DISABLE to syscall events
        tracing: Make register/unregister_ftrace_command __init
        tracing: Update event filters for multibuffer
        recordmcount.pl: Add support for __fentry__
        ftrace: Have control op function callback only trace when RCU is watching
        rcu: Do not trace rcu_is_watching() functions
        ftrace/x86: skip over the breakpoint for ftrace caller
        trace/trace_stat: use rbtree postorder iteration helper instead of opencoding
        ftrace: Add set_graph_notrace filter
        ftrace: Narrow down the protected area of graph_lock
        ftrace: Introduce struct ftrace_graph_data
        ftrace: Get rid of ftrace_graph_filter_enabled
        tracing: Fix potential out-of-bounds in trace_get_user()
        tracing: Show more exact help information about snapshot
      b29c8306
    • L
      Merge tag 'pwm/for-3.13-rc1' of... · 0bde7294
      Linus Torvalds 提交于
      Merge tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm changes from Thierry Reding:
       "Mostly bug fixes and clean up.  There is a new driver, which is
        actually moving a custom PWM driver from drivers/misc.
      
        The majority of the patches are enhancements to the device tree
        support in the pwm-backlight driver.  Backlights can now additionally
        be powered using a regulator and enabled using a GPIO in addition to
        just the PWM input"
      
      * tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (30 commits)
        Documentation/pwm: Update supported SoC name for pwm-samsung
        pwm: samsung: Fix kernel warning while unexporting a channel
        MAINTAINERS: Move PWM subsystem tree to kernel.org
        Documentation/pwm: Fix trivial typos
        pwm-backlight: Remove unused variable
        pwm_backlight: avoid short blank screen while doing hibernation
        pwm-backlight: Fix brightness adjustment
        pwm: add ep93xx PWM support
        pwm-backlight: Allow for non-increasing brightness levels
        pwm-backlight: Add power supply support
        pwm-backlight: Use new enable_gpio field
        unicore32: Initialize PWM backlight enable_gpio field
        ARM: shmobile: Initialize PWM backlight enable_gpio field
        ARM: SAMSUNG: Initialize PWM backlight enable_gpio field
        ARM: pxa: Initialize PWM backlight enable_gpio field
        ARM: OMAP: Initialize PWM backlight enable_gpio field
        pwm-backlight: Add optional enable GPIO
        pwm-backlight: Track enable state
        pwm-backlight: Refactor backlight power on/off
        pwm-backlight: Improve readability
        ...
      0bde7294
    • L
      Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux · 449bf8d0
      Linus Torvalds 提交于
      Pull nfsd changes from Bruce Fields:
       "This includes miscellaneous bugfixes and cleanup and a performance fix
        for write-heavy NFSv4 workloads.
      
        (The most significant nfsd-relevant change this time is actually in
        the delegation patches that went through Viro, fixing a long-standing
        bug that can cause NFSv4 clients to miss updates made by non-nfs users
        of the filesystem.  Those enable some followup nfsd patches which I
        have queued locally, but those can wait till 3.14)"
      
      * 'nfsd-next' of git://linux-nfs.org/~bfields/linux: (24 commits)
        nfsd: export proper maximum file size to the client
        nfsd4: improve write performance with better sendspace reservations
        svcrpc: remove an unnecessary assignment
        sunrpc: comment typo fix
        Revert "nfsd: remove_stid can be incorporated into nfs4_put_delegation"
        nfsd4: fix discarded security labels on setattr
        NFSD: Add support for NFS v4.2 operation checking
        nfsd4: nfsd_shutdown_net needs state lock
        NFSD: Combine decode operations for v4 and v4.1
        nfsd: -EINVAL on invalid anonuid/gid instead of silent failure
        nfsd: return better errors to exportfs
        nfsd: fh_update should error out in unexpected cases
        nfsd4: need to destroy revoked delegations in destroy_client
        nfsd: no need to unhash_stid before free
        nfsd: remove_stid can be incorporated into nfs4_put_delegation
        nfsd: nfs4_open_delegation needs to remove_stid rather than unhash_stid
        nfsd: nfs4_free_stid
        nfsd: fix Kconfig syntax
        sunrpc: trim off EC bytes in GSSAPI v2 unwrap
        gss_krb5: document that we ignore sequence number
        ...
      449bf8d0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ffd3c026
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "This pull fixes the empty_zero_page bug that Heiko reported, and
        includes one more cleanup from Al Viro"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: get rid of fdentry()
        btrfs: fix empty_zero_page misusage
      ffd3c026
    • L
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 0891ad82
      Linus Torvalds 提交于
      Pull /dev/random changes from Ted Ts'o:
       "The /dev/random changes for 3.13 including a number of improvements in
        the following areas: performance, avoiding waste of entropy, better
        tracking of entropy estimates, support for non-x86 platforms that have
        a register which can't be used for fine-grained timekeeping, but which
        might be good enough for the random driver.
      
        Also add some printk's so that we can see how quickly /dev/urandom can
        get initialized, and when programs try to use /dev/urandom before it
        is fully initialized (since this could be a security issue).  This
        shouldn't be an issue on x86 desktop/laptops --- a test on my Lenovo
        T430s laptop shows that /dev/urandom is getting fully initialized
        approximately two seconds before the root file system is mounted
        read/write --- this may be an issue with ARM and MIPS embedded/mobile
        systems, though.  These printk's will be a useful canary before
        potentially adding a future change to start blocking processes which
        try to read from /dev/urandom before it is initialized, which is
        something FreeBSD does already for security reasons, and which
        security folks have been agitating for Linux to also adopt"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: add debugging code to detect early use of get_random_bytes()
        random: initialize the last_time field in struct timer_rand_state
        random: don't zap entropy count in rand_initialize()
        random: printk notifications for urandom pool initialization
        random: make add_timer_randomness() fill the nonblocking pool first
        random: convert DEBUG_ENT to tracepoints
        random: push extra entropy to the output pools
        random: drop trickle mode
        random: adjust the generator polynomials in the mixing function slightly
        random: speed up the fast_mix function by a factor of four
        random: cap the rate which the /dev/urandom pool gets reseeded
        random: optimize the entropy_store structure
        random: optimize spinlock use in add_device_randomness()
        random: fix the tracepoint for get_random_bytes(_arch)
        random: account for entropy loss due to overwrites
        random: allow fractional bits to be tracked
        random: statically compute poolbitshift, poolbytes, poolbits
        random: mix in architectural randomness earlier in extract_buf()
      0891ad82
  2. 16 11月, 2013 24 次提交
    • T
      Merge tag 'asoc-v3.13-4' of... · abfe69dd
      Takashi Iwai 提交于
      Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v3.13
      
      A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty
      issues for users of those drivers if they run into them.
      abfe69dd
    • S
      [CIFS] Warn if SMB3 encryption required by server · 0cbaa53c
      Steve French 提交于
      We do not support SMB3 encryption yet, warn if server responds
      that SMB3 encryption is mandatory.
      Signed-off-by: NSteve French <smfrench@gmail.com>
      0cbaa53c
    • L
      Don't try to compile shmobile-iommu outside of ARM · f63c4824
      Linus Torvalds 提交于
      Commit 7d02c4d6 ("iommu/shmobile: Enable the driver on all ARM
      platforms") completely brokenly enabled the shmobile-iommu driver under
      COMPILE_TEST.
      
      It's bogus, because it won't compile anywhere else than ARM, since it
      tries to include <asm/dma-iommu.h>, which is very much ARM-only.
      
      So remove the bogus COMPILE_TEST dependency, which just causes
      allmodconfig to fail on non-ARM platforms.
      
      Cc: Joerg Roedel <joro@8bytes.org>
      Cc: iommu@lists.linux-foundation.org
      Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      Cc: Simon Horman <horms@verge.net.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f63c4824
    • S
      setfacl removes part of ACL when setting POSIX ACLs to Samba · b1d93356
      Steve French 提交于
      setfacl over cifs mounts can remove the default ACL when setting the
      (non-default part of) the ACL and vice versa (we were leaving at 0
      rather than setting to -1 the count field for the unaffected
      half of the ACL.  For example notice the setfacl removed
      the default ACL in this sequence:
      
      steven@steven-GA-970A-DS3:~/cifs-2.6$ getfacl /mnt/test-dir ; setfacl
      -m default:user:test:rwx,user:test:rwx /mnt/test-dir
      getfacl: Removing leading '/' from absolute path names
      user::rwx
      group::r-x
      other::r-x
      default:user::rwx
      default:user:test:rwx
      default:group::r-x
      default:mask::rwx
      default:other::r-x
      
      steven@steven-GA-970A-DS3:~/cifs-2.6$ getfacl /mnt/test-dir
      getfacl: Removing leading '/' from absolute path names
      user::rwx
      user:test:rwx
      group::r-x
      mask::rwx
      other::r-x
      
      CC: Stable <stable@kernel.org>
      Signed-off-by: NSteve French <smfrench@gmail.com>
      Acked-by: NJeremy Allison <jra@samba.org>
      b1d93356
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · e0da5c9a
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
       - i2c-hid is not querying init reports any more, as it's not mandated
         by the spec, and annoys quite a few devices during enumeration, by
         Bibek Basu
       - a lot of fixes for Logitech devices, by Simon Wood
       - hid-apple now has an option to switch between Option and Command
         mode, by Nanno Langstraat
       - Some more workarounds for severely broken ELO devices, by Oliver
         Neukum
       - more devm conversions, by Benjamin Tissoires
       - wiimote correctness fixes, by David Herrmann
       - a lot of added support for various new device IDs and random small
         fixes here and there"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
        HID: enable Mayflash USB Gamecube Adapter
        HID: sony: Add force feedback support for Dualshock3 USB
        Input: usbtouchscreen: ignore eGalax/D-Wav/EETI HIDs
        HID: don't ignore eGalax/D-Wav/EETI HIDs
        HID: roccat: add missing special driver declarations
        HID:hid-lg4ff: Correct Auto-center strength for wheels other than MOMO and MOMO2
        HID:hid-lg4ff: Initialize device properties before we touch autocentering.
        HID:hid-lg4ff: ensure ConstantForce is disabled when set to 0
        HID:hid-lg4ff: Switch autocentering off when strength is set to zero.
        HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel
        HID: roccat: fix Coverity CID 141438
        HID: multitouch: add manufacturer to Kconfig help text
        HID: logitech-dj: small cleanup in rdcat()
        HID: remove self-assignment from hid_input_report
        HID: hid-sensor-hub: fix report size
        HID: i2c-hid: Stop querying for init reports
        HID: roccat: add support for Ryos MK keyboards
        HID: roccat: generalize some common code
        HID: roccat: add new device return value
        HID: wiimote: add pro-controller analog stick calibration
        ...
      e0da5c9a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 9073e1a8
      Linus Torvalds 提交于
      Pull trivial tree updates from Jiri Kosina:
       "Usual earth-shaking, news-breaking, rocket science pile from
        trivial.git"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
        doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
        doc: add missing files to timers/00-INDEX
        timekeeping: Fix some trivial typos in comments
        mm: Fix some trivial typos in comments
        irq: Fix some trivial typos in comments
        NUMA: fix typos in Kconfig help text
        mm: update 00-INDEX
        doc: Documentation/DMA-attributes.txt fix typo
        DRM: comment: `halve' -> `half'
        Docs: Kconfig: `devlopers' -> `developers'
        doc: typo on word accounting in kprobes.c in mutliple architectures
        treewide: fix "usefull" typo
        treewide: fix "distingush" typo
        mm/Kconfig: Grammar s/an/a/
        kexec: Typo s/the/then/
        Documentation/kvm: Update cpuid documentation for steal time and pv eoi
        treewide: Fix common typo in "identify"
        __page_to_pfn: Fix typo in comment
        Correct some typos for word frequency
        clk: fixed-factor: Fix a trivial typo
        ...
      9073e1a8
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4937e2a6
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Updates for the input subsystem.  You will get an new drivers for
        Hyper-V synthetic keyboard and for Neonode zForce touchscreens, plus a
        bunch of driver fixes and cleanups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (49 commits)
        Revert "Input: ALPS - add support for model found on Dell XT2"
        arm: dts: am335x sk: add touchscreen support
        Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
        Input: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
        Input: mma8450 - add missing i2c_set_clientdata() in mma8450_probe()
        Input: mpu3050 - add missing i2c_set_clientdata() in mpu3050_probe()
        Input: tnetv107x-keypad - make irqs signed for error handling
        Input: add driver for Neonode zForce based touchscreens
        Input: sh_keysc - enable the driver on all ARM platforms
        Input: remove a redundant max() call
        Input: mousedev - allow disabling even without CONFIG_EXPERT
        Input: allow deselecting serio drivers even without CONFIG_EXPERT
        Input: i8042 - add PNP modaliases
        Input: evdev - fall back to vmalloc for client event buffer
        Input: cypress_ps2 - do not consider data bad if palm is detected
        Input: cypress_ps2 - remove useless cast
        Input: fix PWM-related undefined reference errors
        Input: ALPS - change secondary device's name
        Input: wacom - not all multi-interface devices support touch
        Input: nspire-keypad - add missing clk_disable_unprepare() on error path
        ...
      4937e2a6
    • L
      Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next · db0b2d01
      Linus Torvalds 提交于
      Pull MFD updates from Samuel Ortiz:
       "For the 3.13 merge window we have a couple of new drivers for the AMS
        AS3722 PMIC and for STMicroelectronics STw481x PMIC.
      
        Although this is a smaller update than usual, we also have:
      
         - Device tree support for the max77693 driver
      
         - linux/of.h inclusion for all DT compatible MFD drivers, to avoid
           build breakage in the future
      
         - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver
      
         - A small arizona update for new wm5110 DSP registers and a few fixes
      
         - A small palmas update as well, including an of_device table
           addition and a few minor fixes
      
         - Two small mfd-core changes, one including a memory leak fix for
           when mfd_add_device() fails
      
         - Our usual round of minor cleanups and janitorial fixes"
      
      * tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (63 commits)
        Documentation: mfd: Update s2mps11.txt
        mfd: pm8921: Potential NULL dereference in pm8921_remove()
        mfd: Fix memory leak in mfd_add_devices()
        mfd: Stop setting refcounting pointers in original mfd_cell arrays
        mfd: wm5110: Enable micd clamp functionality
        mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH
        mfd: max77693: Fix up bug of wrong interrupt number
        mfd: as3722: Don't export the regmap config
        mfd: twl6040: Remove obsolete cleanup for i2c clientdata
        mfd: tps65910: Remove warning during dt node parsing
        mfd: lpc_sch: Ignore resource conflicts when adding mfd cells
        mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock
        mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
        mfd: Add support for ams AS3722 PMIC
        mfd: max77693: Include linux/of.h header
        mfd: tc3589x: Detect the precise version
        mfd: omap-usb: prepare/unprepare clock while enable/disable
        mfd: max77686: Include linux/of.h header
        mfd: max8907: Include linux/of.h header
        mfd: max8997: Include linux/of.h header
        ...
      db0b2d01
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 16cd9d1c
      Linus Torvalds 提交于
      Pull hwmon fixes and updates from Jean Delvare:
       "All lm90 driver fixes and improvements"
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        Documentation: dt: hwmon: Add OF document for LM90
        hwmon: (lm90) Add power control
        hwmon: (lm90) Add support for TI TMP451
        hwmon: (lm90) Use enums for the indexes of temp8 and temp11
        hwmon: (lm90) Add support to handle IRQ
        hwmon: (lm90) Define status bits
        hwmon: (lm90) Fix max6696 alarm handling
      16cd9d1c
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · f412f2c6
      Linus Torvalds 提交于
      Pull second round of block driver updates from Jens Axboe:
       "As mentioned in the original pull request, the bcache bits were pulled
        because of their dependency on the immutable bio vecs.  Kent re-did
        this part and resubmitted it, so here's the 2nd round of (mostly)
        driver updates for 3.13.  It contains:
      
       - The bcache work from Kent.
      
       - Conversion of virtio-blk to blk-mq.  This removes the bio and request
         path, and substitutes with the blk-mq path instead.  The end result
         almost 200 deleted lines.  Patch is acked by Asias and Christoph, who
         both did a bunch of testing.
      
       - A removal of bootmem.h include from Grygorii Strashko, part of a
         larger series of his killing the dependency on that header file.
      
       - Removal of __cpuinit from blk-mq from Paul Gortmaker"
      
      * 'for-linus' of git://git.kernel.dk/linux-block: (56 commits)
        virtio_blk: blk-mq support
        blk-mq: remove newly added instances of __cpuinit
        bcache: defensively handle format strings
        bcache: Bypass torture test
        bcache: Delete some slower inline asm
        bcache: Use ida for bcache block dev minor
        bcache: Fix sysfs splat on shutdown with flash only devs
        bcache: Better full stripe scanning
        bcache: Have btree_split() insert into parent directly
        bcache: Move spinlock into struct time_stats
        bcache: Kill sequential_merge option
        bcache: Kill bch_next_recurse_key()
        bcache: Avoid deadlocking in garbage collection
        bcache: Incremental gc
        bcache: Add make_btree_freeing_key()
        bcache: Add btree_node_write_sync()
        bcache: PRECEDING_KEY()
        bcache: bch_(btree|extent)_ptr_invalid()
        bcache: Don't bother with bucket refcount for btree node allocations
        bcache: Debug code improvements
        ...
      f412f2c6
    • O
      Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of... · 6886059f
      Olof Johansson 提交于
      Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Few clock fixes, a runtime PM fix, and pinctrl-single fix along
      with few other fixes that popped up during the merge window.
      
      * tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
        ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
        doc: devicetree: Add bindings documentation for omap-des driver
        ARM: dts: doc: Document missing compatible property for omap-sham driver
        ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
        ARM: OMAP: devicetree: fix SPI node compatible property syntax items
        pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
        ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
        + sync with newer trunk
      6886059f
    • J
      Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek',... · 7f9cc24a
      Jiri Kosina 提交于
      Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hid', 'for-3.13/logitech', 'for-3.13/multitouch', 'for-3.13/roccat', 'for-3.13/upstream' and 'for-3.13/wiimote' into for-linus
      7f9cc24a
    • L
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · cd1177f2
      Linus Torvalds 提交于
      Pull drm regression fix from Dave Airlie:
       "Forgot this one liner was necessary to fix module reload issues
        introduced earlier in the drm pull"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
        drm: check for !kdev in drm_unplug_minor()
      cd1177f2
    • L
      Merge tag 'blackfin-for-linus' of... · 6c0514dd
      Linus Torvalds 提交于
      Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      
      Pull blackfin updates from Steven Miao:
       "Blackfin gpio changes, add adi pinctrl driver, and bug fixes"
      
      * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        blackfin: fix build warning for unused variable
        smp: bf561: and smb_wmb()/smp_rmb() at ipi send/receive
        pm: use GFP_ATOMIC when pm core call this function
        blackfin: serial: Add serial port_fer and port_mux early platform resources.
        blackfin: pinctrl-adi2: code cleanup after using pinctrl-adi2
        blackfin: adi gpio driver and pinctrl driver support
        bf609: update default config for spi
        Blackfin: bfin_gpio: Use proper mask for comparing pfunc
      6c0514dd
    • L
      Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux · 98d38dd2
      Linus Torvalds 提交于
      Pull OpenRISC updates from Jonas Bonn:
       - small cleanups to make allmodconfig pass
       - defconfig refresh
       - a handful of code sanitization patches
      
      * tag 'for-3.13' of git://git.openrisc.net/~jonas/linux:
        openrisc: Refactor or32_early_setup()
        openrisc: Remove unused declaration of __initramfs_start
        openrisc: Use the declarations provided by <asm/sections.h>
        openrisc: Refresh or1ksim_defconfig for v3.12
        openrisc: Refactor 16-bit constant relocation
        openrisc: include: asm: Kbuild: add default "vga.h"
        openrisc: Makefile: append "-D__linux__" to KBUILD_CFLAGS
      98d38dd2
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · e4528d69
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       - make tags fixes again
       - scripts/show_delta fix for newer python
       - scripts/kernel-doc does not fail on unknown function prototype
       - one less coccinelle check this time
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/tags.sh: remove obsolete __devinit[const|data]
        scripts/kernel-doc: make unknown function prototype a Warning instead of an Error
        show_delta: Update script to support python versions 2.5 through 3.3
        scripts/coccinelle/api: remove devm_request_and_ioremap.cocci
        scripts/tags.sh: Increase identifier list
      e4528d69
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · d72681d7
      Linus Torvalds 提交于
      Pull kconfig changes from Michal Marek:
       - xconfig stores its setting in a meaningful path
         (~/.config/kernel.org/qconf.conf)
       - kconfig symbol search fix
       - documentation fixes
       - cleanup & comment update
       - fix warning when a kconfig symbol is defined with two different types
       - Yann is now officially listed as maintainer of kconfig, but he
         prefers me to send pull requests for now
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        MAINTAINERS: New kconfig maintainer
        xconfig: Fix the filename for GUI settings
        kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len
        kconfig: remove unused definition from scanner
        kconfig: adjust warning message for conflicting types
        kconfig: fix trivial typos and update mconf documentation
        kconfig: add short explanation to SYMBOL_WRITE
        Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig
      d72681d7
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 762fb1dd
      Linus Torvalds 提交于
      Pull kbuild changes from Michal Marek:
       - LTO fixes, but the kallsyms part had to be reverted
       - Pass -Werror=implicit-int and -Werror=strict-prototypes to the
         compiler by default
       - snprintf fix in modpost
       - remove GREP_OPTIONS from the environment to be immune against exotic
         grep option settings
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kallsyms: Revert back to 128 max symbol length
        Kbuild: Ignore GREP_OPTIONS env variable
        scripts: kallsyms: Use %zu to print 'size_t'
        scripts/bloat-o-meter: use .startswith rather than fragile slicing
        scripts/bloat-o-meter: ignore changes in the size of linux_banner
        kbuild: replace unbounded sprintf call in modpost
        kbuild, bloat-o-meter: fix static detection
        Kbuild: Handle longer symbols in kallsyms.c
        kbuild: Increase kallsyms max symbol length
        Makefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default
      762fb1dd
    • L
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · f13399f0
      Linus Torvalds 提交于
      Pull Kconfig cleanups from Mark Salter:
       "Remove some unused config options from C6X and clean up PC_PARPORT
        dependencies.  The latter was discussed here:
      
          https://lkml.org/lkml/2013/10/8/12"
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        c6x: remove unused COMMON_CLKDEV Kconfig parameter
        Kconfig cleanup (PARPORT_PC dependencies)
        x86: select ARCH_MIGHT_HAVE_PC_PARPORT
        unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
        sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
        sh: select ARCH_MIGHT_HAVE_PC_PARPORT
        powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
        parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
        mips: select ARCH_MIGHT_HAVE_PC_PARPORT
        microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
        m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
        ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
        arm: select ARCH_MIGHT_HAVE_PC_PARPORT
        alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
        c6x: remove unused parameter in Kconfig
      f13399f0
    • S
      [CIFS] Set copychunk defaults · de9f68df
      Steve French 提交于
      Patch 2 of the copy chunk series (the final patch will
      use these to handle copies of files larger than the chunk size.
      
      We set the same defaults that Windows and Samba expect for
      CopyChunk.
      Signed-off-by: NSteve French <smfrench@gmail.com>
      Reviewed-by: NDavid Disseldorp <ddiss@samba.org>
      de9f68df
    • O
      Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into fixes · ca439c9b
      Olof Johansson 提交于
      From Nicolas Ferre, fixes for early boot hangs on at91:
      
      Fixes for RTT & RTC interrupts that can fire early during boot process
      and kill the system.
      
      * tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
        ARM: at91: fix hanged boot due to early rtt-interrupt
        ARM: at91: fix hanged boot due to early rtc-interrupt
      ca439c9b
    • C
      nfs: fix pnfs Kconfig defaults · 8c2fabc6
      Christoph Hellwig 提交于
      Defaulting to m seem to prevent building the pnfs layout modules into the
      kernel.  Default to the value of CONFIG_NFS_V4 make sure they are
      built in for built-in NFSv4 support and modular for a modular NFSv4.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      8c2fabc6
    • N
      NFS: correctly report misuse of "migration" mount option. · 9e08ef1a
      NeilBrown 提交于
      The current test on valid use of the "migration" mount option can never
      report an error as it will only do so if
          mnt->version !=4 && mnt->minor_version != 0
      (and some other condition), but if that test would succeed, then the previous
      test has already gone-to  out_minorversion_mismatch.
      
      So change the && to an || to get correct semantics.
      Signed-off-by: NNeilBrown <neilb@suse.de>
      Acked-by: NChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      9e08ef1a
    • T
      ARM: OMAP2+: Fix build for dra7xx without omap4 and 5 · 26273e02
      Tony Lindgren 提交于
      Otherwise we can get errors like:
      
      arch/arm/mach-omap2/prm44xx.c:274: error: redefinition of ‘omap44xx_prm_reconfigure_io_chain’
      arch/arm/mach-omap2/built-in.o: In function `default_finish_suspend':
      arch/arm/mach-omap2/omap-mpuss-lowpower.c:95: undefined reference to `omap_do_wfi'
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      26273e02
  3. 15 11月, 2013 6 次提交