1. 21 Jan, 2015 23 commits
  2. 06 Jan, 2015 1 commit
    • Hans de Goede's avatar
      ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias · 6ba8bbe8
      Hans de Goede authored
      The Ippo q8h has its serial console connected to the r-uart. Adjust the
      serial0 alias to match.
      
      This fixes the kernel serial console no longer working since 3.19-rc1, because
      8250_dw.c now honors dt aliases, causing the serial console to be ttyS5 rather
      then being ttyS0, as it was in 3.18 and before.
      
      Note that adjusting bootargs instead is not an acceptable fix, because
      console=ttyS0,115200 is used by a lot of bootscripts, etc. and this should
      continue to work.
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      6ba8bbe8
  3. 21 Dec, 2014 4 commits
    • Chen-Yu Tsai's avatar
      ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i · 4dba4185
      Chen-Yu Tsai authored
      usbphy0 support in the sunxi usb-phy driver has been merged, but the
      dtsi's for sun4i/sun5i haven't been updated. This results in the phy
      driver failing to load, breaking usb support.
      
      Fixes: 6827a46f ('phy: sun4i: add support for USB phy0')
      Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
      Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      4dba4185
    • Linus Torvalds's avatar
      Linux 3.19-rc1 · 97bf6af1
      Linus Torvalds authored
      97bf6af1
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux · 60815cf2
      Linus Torvalds authored
      Pull ACCESS_ONCE cleanup preparation from Christian Borntraeger:
       "kernel: Provide READ_ONCE and ASSIGN_ONCE
      
        As discussed on LKML http://marc.info/?i=54611D86.4040306%40de.ibm.com
        ACCESS_ONCE might fail with specific compilers for non-scalar
        accesses.
      
        Here is a set of patches to tackle that problem.
      
        The first patch introduce READ_ONCE and ASSIGN_ONCE.  If the data
        structure is larger than the machine word size memcpy is used and a
        warning is emitted.  The next patches fix up several in-tree users of
        ACCESS_ONCE on non-scalar types.
      
        This does not yet contain a patch that forces ACCESS_ONCE to work only
        on scalar types.  This is targetted for the next merge window as Linux
        next already contains new offenders regarding ACCESS_ONCE vs.
        non-scalar types"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux:
        s390/kvm: REPLACE barrier fixup with READ_ONCE
        arm/spinlock: Replace ACCESS_ONCE with READ_ONCE
        arm64/spinlock: Replace ACCESS_ONCE READ_ONCE
        mips/gup: Replace ACCESS_ONCE with READ_ONCE
        x86/gup: Replace ACCESS_ONCE with READ_ONCE
        x86/spinlock: Replace ACCESS_ONCE with READ_ONCE
        mm: replace ACCESS_ONCE with READ_ONCE or barriers
        kernel: Provide READ_ONCE and ASSIGN_ONCE
      60815cf2
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux · bfc7249c
      Linus Torvalds authored
      Pull clk framework updates from Mike Turquette:
       "This is much later than usual due to several last minute bugs that had
        to be addressed.  As usual the majority of changes are new drivers and
        modifications to existing drivers.  The core recieved many fixes along
        with the groundwork for several large changes coming in the future
        which will better parition clock providers from clock consumers"
      
      * tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
        clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated
        ARM: OMAP3: clock: fix boot breakage in legacy mode
        ARM: OMAP2+: clock: fix DPLL code to use new determine rate APIs
        clk: Really fix deadlock with mmap_sem
        clk: mmp: fix sparse non static symbol warning
        clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
        clk: change clk_debugfs_add_file to take a struct clk_hw
        clk: Don't expose __clk_get_accuracy
        clk: Don't try to use a struct clk* after it could have been freed
        clk: Remove unused function __clk_get_prepare_count
        clk: samsung: Fix double add of syscore ops after driver rebind
        clk: samsung: exynos4: set parent of sclk_hdmiphy to hdmi
        clk: samsung: exynos4415: Fix build with PM_SLEEP disabled
        clk: samsung: remove unnecessary inclusion of header files from clk.h
        clk: samsung: remove unnecessary CONFIG_OF from clk.c
        clk: samsung: Spelling s/bwtween/between/
        clk: rockchip: Add support for the mmc clock phases using the framework
        clk: rockchip: add bindings for the mmc clocks
        clk: rockchip: rk3288 export i2s0_clkout for use in DT
        clk: rockchip: use clock ID for DMC (memory controller) on rk3288
        ...
      bfc7249c
  4. 20 Dec, 2014 12 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · a4e1328a
      Linus Torvalds authored
      Pull more i2c updates from Wolfram Sang:
       "Included are two bugfixes needing some bigger refactoring (sh_mobile:
        deferred probe with DMA, mv64xxx: fix offload support) and one
        deprecated driver removal I thought would go in via ppc but I
        misunderstood.  It has a proper ack from BenH"
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: sh_mobile: fix uninitialized var when debug is enabled
        macintosh: therm_pm72: delete deprecated driver
        i2c: sh_mobile: I2C_SH_MOBILE should depend on HAS_DMA
        i2c: sh_mobile: rework deferred probing
        i2c: sh_mobile: refactor DMA setup
        i2c: mv64xxx: rework offload support to fix several problems
        i2c: mv64xxx: use BIT() macro for register value definitions
      a4e1328a
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · cdce6ac2
      Linus Torvalds authored
      Pull SCSI update from James Bottomley:
       "This is a much shorter set of patches that were on the go but didn't
        make it in to the early pull request for the merge window.  It's
        really a set of bug fixes plus some final cleanup work on the new tag
        queue API"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        storvsc: ring buffer failures may result in I/O freeze
        ipr: set scsi_level correctly for disk arrays
        ipr: add support for async scanning to speed up boot
        scsi_debug: fix missing "break;" in SDEBUG_UA_CAPACITY_CHANGED case
        scsi_debug: take sdebug_host_list_lock when changing capacity
        scsi_debug: improve driver description in Kconfig
        scsi_debug: fix compare and write errors
        qla2xxx: fix race in handling rport deletion during recovery causes panic
        scsi: blacklist RSOC for Microsoft iSCSI target devices
        scsi: fix random memory corruption with scsi-mq + T10 PI
        Revert "[SCSI] mpt3sas: Remove phys on topology change"
        Revert "[SCSI] mpt2sas: Remove phys on topology change."
        esas2r: Correct typos of "validate" in a comment
        fc: FCP_PTA_SIMPLE is 0
        ibmvfc: remove unused tag variable
        scsi: remove MSG_*_TAG defines
        scsi: remove scsi_set_tag_type
        scsi: remove scsi_get_tag_type
        scsi: never drop to untagged mode during queue ramp down
        scsi: remove ->change_queue_type method
      cdce6ac2
    • Linus Torvalds's avatar
      Merge tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 5d6a5468
      Linus Torvalds authored
      Pull CONFIG_PM_RUNTIME elimination from Rafael Wysocki:
       "This removes the last few uses of CONFIG_PM_RUNTIME introduced
        recently and makes that config option finally go away.
      
        CONFIG_PM will be available directly from the menu now and also it
        will be selected automatically if CONFIG_SUSPEND or CONFIG_HIBERNATION
        is set"
      
      * tag 'pm-config-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM: Eliminate CONFIG_PM_RUNTIME
        tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
        sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
        spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
      5d6a5468
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 787140ad
      Linus Torvalds authored
      Pull misc kbuild changes from Michal Marek:
       "There are only a few things in the misc branch:
      
         - Fix for bugon.cocci semantic patch
         - Kdevelop4 files are .gitignored
         - Put make binrpm-pkg on diet"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/package: binrpm-pkg do not create source and devel package
        .gitignore: Add Kdevelop4 project files
        bugon.cocci: fix Options at the macro
      787140ad
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · d08372ca
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
       "Here are the kbuild changes for v3.19-rc1:
      
         - Cleanups and deduplication in the main Makefile and
           scripts/Makefile.*
         - Sort the output of *config targets in make help
         - Old <linux/version.h> is always removed to avoid a surprise during
           bisecting
         - Warning fix in kconfig"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: remove redundant -rR flag of hdr-inst
        kbuild: Fix make help-<board series> on powerpc
        kbuild: Automatically remove stale <linux/version.h> file
        kconfig: Fix warning "‘jump’ may be used uninitialized"
        Makefile: sort list of defconfig targets in make help output
        kbuild: Remove duplicate $(cmd) definition in Makefile.clean
        kbuild: collect shorthands into scripts/Kbuild.include
      d08372ca
    • Wolfram Sang's avatar
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · ecb5ec04
      Linus Torvalds authored
      Pull vfs pile #3 from Al Viro:
       "Assorted fixes and patches from the last cycle"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        [regression] chunk lost from bd9b51
        vfs: make mounts and mountstats honor root dir like mountinfo does
        vfs: cleanup show_mountinfo
        init: fix read-write root mount
        unfuck binfmt_misc.c (broken by commit e6084d4a)
        vm_area_operations: kill ->migrate()
        new helper: iter_is_iovec()
        move_extent_per_page(): get rid of unused w_flags
        lustre: get rid of playing with ->fs
        btrfs: filp_open() returns ERR_PTR() on failure, not NULL...
      ecb5ec04
    • Linus Torvalds's avatar
      Merge tag 'ecryptfs-3.19-rc1-fixes' of... · 298647e3
      Linus Torvalds authored
      Merge tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull eCryptfs fixes from Tyler Hicks:
       "Fixes for filename decryption and encrypted view plus a cleanup
      
         - The filename decryption routines were, at times, writing a zero
           byte one character past the end of the filename buffer
      
         - The encrypted view feature attempted, and failed, to roll its own
           form of enforcing a read-only mount instead of letting the VFS
           enforce it"
      
      * tag 'ecryptfs-3.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        eCryptfs: Remove buggy and unnecessary write in file name decode routine
        eCryptfs: Remove unnecessary casts when parsing packet lengths
        eCryptfs: Force RO mount when encrypted view is enabled
      298647e3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 5c68eac6
      Linus Torvalds authored
      Pull more btrfs updates from Chris Mason:
       "This is part two of our merge window patches.
      
        These are all from Filipe, and fix some really hard to find races that
        can cause corruptions.  Most of them involved block group removal
        (balance) or discard"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: remove non-sense btrfs_error_discard_extent() function
        Btrfs: fix fs corruption on transaction abort if device supports discard
        Btrfs: always clear a block group node when removing it from the tree
        Btrfs: ensure deletion from pinned_chunks list is protected
      5c68eac6
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 20e471fd
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a few fixes that have landed after the previous pull request.
        All are driver specific fixes including:
      
         - error/int value fixes in OXFW,
         - Intel Skylake HD-audio HDMI codec support,
         - Additional HD-audio Realtek codecs and AD1986A codec fixes/quirks,
         - a few more DSD support and a quirk for Arcam rPAC in usb-audio,
         - a typo fix for Scarlett 6i6,
         - fixes for new ASIHPI firmware,
         - ASoC Exynos7 cleanups,
         - Intel ACPI support, and
         - a fix for PCM512 register cache sync"
      
      * tag 'sound-fix-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
        ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
        ALSA: hda/realtek - New codec support for ALC298
        ALSA: asihpi: update to HPI version 4.14
        ALSA: asihpi: increase tuner pad cache size
        ALSA: asihpi: relax firmware version check
        ALSA: usb-audio: Fix Scarlett 6i6 initialization typo
        ALSA: hda - Add quirk for Packard Bell EasyNote MX65
        ALSA: usb-audio: add native DSD support for Matrix Audio DACs
        ALSA: hda/realtek - New codec support for ALC256
        ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode
        ASoC: Intel: fix possible acpi enumeration panic
        ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
        ASoC: Intel: fix return value check in sst_acpi_probe()
        ALSA: hda - Make add_stereo_mix_input flag tristate
        ALSA: hda - Create capture source ctls when stereo mix input is added
        ALSA: hda - Fix typos in snd_hda_get_int_hint() kerneldoc comments
        ALSA: hda - add codec ID for Skylake display audio codec
        ALSA: oxfw: some signedness bugs
        ALSA: oxfw: fix detect_loud_models() return value
        ASoC: rt5677: add REGMAP_I2C and REGMAP_IRQ dependency
        ...
      20e471fd
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · ed55635e
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "The highlights this merge window include:
      
         - Allow target fabric drivers to function as built-in.  (Roland)
         - Fix tcm_loop multi-TPG endpoint nexus bug.  (Hannes)
         - Move per device config_item_type into se_subsystem_api, allowing
           configfs attributes to be defined at module_init time.  (Jerome +
           nab)
         - Convert existing IBLOCK/FILEIO/RAMDISK/PSCSI/TCMU drivers to use
           external configfs attributes.  (nab)
         - A number of iser-target fixes related to active session + network
           portal shutdown stability during extended stress testing.  (Sagi +
           Slava)
         - Dynamic allocation of T10-PI contexts for iser-target, fixing a
           potentially bogus iscsi_np->tpg_np pointer reference in >= v3.14
           code.  (Sagi)
         - iser-target performance + scalability improvements.  (Sagi)
         - Fixes for SPC-4 Persistent Reservation AllRegistrants spec
           compliance.  (Ilias + James + nab)
         - Avoid potential short kern_sendmsg() in iscsi-target for now until
           Al's conversion to use msghdr iteration is merged post -rc1.
           (Viro)
      
        Also, Sagi has requested a number of iser-target patches (9) that
        address stability issues he's encountered during extended stress
        testing be considered for v3.10.y + v3.14.y code.  Given the amount of
        LOC involved, it will certainly require extra backporting effort.
      
        Apologies in advance to Greg-KH & Co on this.  Sagi and I will be
        working post-merge to ensure they each get applied correctly"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (53 commits)
        target: Allow AllRegistrants to re-RESERVE existing reservation
        uapi/linux/target_core_user.h: fix headers_install.sh badness
        iscsi-target: Fail connection on short sendmsg writes
        iscsi-target: nullify session in failed login sequence
        target: Avoid dropping AllRegistrants reservation during unregister
        target: Fix R_HOLDER bit usage for AllRegistrants
        iscsi-target: Drop left-over bogus iscsi_np->tpg_np
        iser-target: Fix wc->wr_id cast warning
        iser-target: Remove code duplication
        iser-target: Adjust log levels and prettify some prints
        iser-target: Use debug_level parameter to control logging level
        iser-target: Fix logout sequence
        iser-target: Don't wait for session commands from completion context
        iser-target: Reduce CQ lock contention by batch polling
        iser-target: Introduce isert_poll_budget
        iser-target: Remove an atomic operation from the IO path
        iser-target: Remove redundant call to isert_conn_terminate
        iser-target: Use single CQ for TX and RX
        iser-target: Centralize completion elements to a context
        iser-target: Cast wr_id with uintptr_t instead of unsinged long
        ...
      ed55635e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · 5be95b7e
      Linus Torvalds authored
      Pull arch/hexagon updates from Richard Kuo:
       "Build cleanup and a few misc fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        Hexagon: fix signal delivery for debug traps
        Hexagon: set ARCH_DMA_MINALIGN
        Hexagon: fix alignment of init_task in RW_DATA_SECTION
        hexagon: Fix build failures in linux-next
      5be95b7e