Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Feb 25, 2014
  1. @torvalds

    Merge branch 'akpm' (patches from Andrew Morton)

    torvalds authored
    Merge misc fixes from Andrew Morton.
    
    * emailed patches from Andrew Morton akpm@linux-foundation.org>:
      MAINTAINERS: change mailing list address for Altera UART drivers
      Makefile: fix build with make 3.80 again
      MAINTAINERS: update L: misuses
      Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled
      ipc,mqueue: remove limits for the amount of system-wide queues
      memcg: change oom_info_lock to mutex
      mm, thp: fix infinite loop on memcg OOM
      drivers/fmc/fmc-write-eeprom.c: fix decimal permissions
      drivers/iommu/omap-iommu-debug.c: fix decimal permissions
      mm, hwpoison: release page on PageHWPoison() in __do_fault()
  2. @tklauser @torvalds

    MAINTAINERS: change mailing list address for Altera UART drivers

    tklauser authored torvalds committed
    The nios2-dev list has been moved to the RocketBoards infrastructure, so
    adjust the address accordingly.
    
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @jbeulich @torvalds

    Makefile: fix build with make 3.80 again

    jbeulich authored torvalds committed
    According to Documentation/Changes, make 3.80 is still being supported
    for building the kernel, hence make files must not make (unconditional)
    use of features introduced only in newer versions.  Commit 8779657
    ("stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG") however
    introduced an "else ifdef" construct which make 3.80 doesn't understand.
    
    Also correct a warning message still referencing the old config option
    name.
    
    Apart from that I question the use of "ifdef" here (but it was used that
    way already prior to said commit): ifeq (,y) would seem more to the
    point.
    
    Signed-off-by: Jan Beulich <jbeulich@suse.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    MAINTAINERS: update L: misuses

    Joe Perches authored torvalds committed
    L: lines are for the email addresses of traditional mailing lists.
    W: lines are for URLs.
    
    Convert two L: misuses to W: links.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Reported-by: Paul Bolle <pebolle@tiscali.nl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @fboudra @torvalds

    Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR i…

    fboudra authored torvalds committed
    …s enabled
    
    An extra parenthesis typo introduced in 19952a9 ("stackprotector:
    Unify the HAVE_CC_STACKPROTECTOR logic between architectures") is
    causing the following error when CONFIG_CC_STACKPROTECTOR_REGULAR is
    enabled:
    
      Makefile:608: Cannot use CONFIG_CC_STACKPROTECTOR: -fstack-protector not supported by compiler
      Makefile:608: *** missing separator.  Stop.
    
    Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    ipc,mqueue: remove limits for the amount of system-wide queues

    Davidlohr Bueso authored torvalds committed
    Commit 93e6f11 ("ipc/mqueue: cleanup definition names and
    locations") added global hardcoded limits to the amount of message
    queues that can be created.  While these limits are per-namespace,
    reality is that it ends up breaking userspace applications.
    Historically users have, at least in theory, been able to create up to
    INT_MAX queues, and limiting it to just 1024 is way too low and dramatic
    for some workloads and use cases.  For instance, Madars reports:
    
     "This update imposes bad limits on our multi-process application.  As
      our app uses approaches that each process opens its own set of queues
      (usually something about 3-5 queues per process).  In some scenarios
      we might run up to 3000 processes or more (which of-course for linux
      is not a problem).  Thus we might need up to 9000 queues or more.  All
      processes run under one user."
    
    Other affected users can be found in launchpad bug #1155695:
      https://bugs.launchpad.net/ubuntu/+source/manpages/+bug/1155695
    
    Instead of increasing this limit, revert it entirely and fallback to the
    original way of dealing queue limits -- where once a user's resource
    limit is reached, and all memory is used, new queues cannot be created.
    
    Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
    Reported-by: Madars Vitolins <m@silodev.com>
    Acked-by: Doug Ledford <dledford@redhat.com>
    Cc: Manfred Spraul <manfred@colorfullife.com>
    Cc: <stable@vger.kernel.org>	[3.5+]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    memcg: change oom_info_lock to mutex

    Michal Hocko authored torvalds committed
    Kirill has reported the following:
    
      Task in /test killed as a result of limit of /test
      memory: usage 10240kB, limit 10240kB, failcnt 51
      memory+swap: usage 10240kB, limit 10240kB, failcnt 0
      kmem: usage 0kB, limit 18014398509481983kB, failcnt 0
      Memory cgroup stats for /test:
    
      BUG: sleeping function called from invalid context at kernel/cpu.c:68
      in_atomic(): 1, irqs_disabled(): 0, pid: 66, name: memcg_test
      2 locks held by memcg_test/66:
       #0:  (memcg_oom_lock#2){+.+...}, at: [<ffffffff81131014>] pagefault_out_of_memory+0x14/0x90
       #1:  (oom_info_lock){+.+...}, at: [<ffffffff81197b2a>] mem_cgroup_print_oom_info+0x2a/0x390
      CPU: 2 PID: 66 Comm: memcg_test Not tainted 3.14.0-rc1-dirty #745
      Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Bochs 01/01/2011
      Call Trace:
        __might_sleep+0x16a/0x210
        get_online_cpus+0x1c/0x60
        mem_cgroup_read_stat+0x27/0xb0
        mem_cgroup_print_oom_info+0x260/0x390
        dump_header+0x88/0x251
        ? trace_hardirqs_on+0xd/0x10
        oom_kill_process+0x258/0x3d0
        mem_cgroup_oom_synchronize+0x656/0x6c0
        ? mem_cgroup_charge_common+0xd0/0xd0
        pagefault_out_of_memory+0x14/0x90
        mm_fault_error+0x91/0x189
        __do_page_fault+0x48e/0x580
        do_page_fault+0xe/0x10
        page_fault+0x22/0x30
    
    which complains that mem_cgroup_read_stat cannot be called from an atomic
    context but mem_cgroup_print_oom_info takes a spinlock.  Change
    oom_info_lock to a mutex.
    
    This was introduced by 947b3dd ("memcg, oom: lock
    mem_cgroup_print_oom_info").
    
    Signed-off-by: Michal Hocko <mhocko@suse.cz>
    Reported-by: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    mm, thp: fix infinite loop on memcg OOM

    Kirill A. Shutemov authored torvalds committed
    Masayoshi Mizuma reported a bug with the hang of an application under
    the memcg limit.  It happens on write-protection fault to huge zero page
    
    If we successfully allocate a huge page to replace zero page but hit the
    memcg limit we need to split the zero page with split_huge_page_pmd()
    and fallback to small pages.
    
    The other part of the problem is that VM_FAULT_OOM has special meaning
    in do_huge_pmd_wp_page() context.  __handle_mm_fault() expects the page
    to be split if it sees VM_FAULT_OOM and it will will retry page fault
    handling.  This causes an infinite loop if the page was not split.
    
    do_huge_pmd_wp_zero_page_fallback() can return VM_FAULT_OOM if it failed
    to allocate one small page, so fallback to small pages will not help.
    
    The solution for this part is to replace VM_FAULT_OOM with
    VM_FAULT_FALLBACK is fallback required.
    
    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Reported-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
    Reviewed-by: Michal Hocko <mhocko@suse.cz>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: David Rientjes <rientjes@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    drivers/fmc/fmc-write-eeprom.c: fix decimal permissions

    Joe Perches authored torvalds committed
    This 444 should have been octal.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Alessandro Rubini <rubini@gnudd.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @torvalds

    drivers/iommu/omap-iommu-debug.c: fix decimal permissions

    Joe Perches authored torvalds committed
    These should have been octal.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Cc: Joerg Roedel <joro@8bytes.org>
    Cc: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    mm, hwpoison: release page on PageHWPoison() in __do_fault()

    Kirill A. Shutemov authored torvalds committed
    It seems we forget to release page after detecting HW error.
    
    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    Merge tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/djbw/dmaengine
    
    Pull dmaengine fixes from Dan Williams:
     "Fix tasklet lifetime management in the ioat driver causing ksoftirqd
      to spin indefinitely.
    
        References:
        https://lkml.org/lkml/2014/1/27/282
        https://lkml.org/lkml/2014/2/19/672"
    
    * tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
      ioat: fix tasklet tear down
  13. @torvalds

    Merge tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd

    torvalds authored
    Pull MTD fixes from Brian Norris:
     "Two main MTD fixes:
    
      1. Read retry counting was off by one, so if we had a true ECC error
         (i.e., no retry voltage threshold would give a clean read), we
         would end up returning -EINVAL on the Nth mode instead of -EBADMSG
         after then (N-1)th mode
    
      2. The OMAP NAND driver had some of its ECC layouts wrong when
         introduced in 3.13, causing incompatibilities between the
         bootloader on-flash layout and the layout expected in Linux.  The
         expected layouts are now documented in the commit messages, and we
         plan to add this under Documentation/mtd/nand/ eventually"
    
    * tag 'for-linus-20140225' of git://git.infradead.org/linux-mtd:
      mtd: nand: omap: fix ecclayout->oobfree->length
      mtd: nand: omap: fix ecclayout->oobfree->offset
      mtd: nand: omap: fix ecclayout to be in sync with u-boot NAND driver
      mtd: nand: fix off-by-one read retry mode counting
  14. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/geert/linux-m68k
    
    Pull m68k update from Geert Uytterhoeven:
      - More barrier.h consolidation
      - Sched_[gs]etattr() syscalls
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: Wire up sched_setattr and sched_getattr
      m68k: Switch to asm-generic/barrier.h
      m68k: Sort arch/m68k/include/asm/Kbuild
  15. @torvalds

    Merge tag 'xtensa-next-20140224' of git://github.com/czankel/xtensa-l…

    torvalds authored
    …inux
    
    Pull tensa fixes from Chris Zankel:
     "This series includes fixes for potentially serious bugs in the
      routines spilling processor registers to stack, as well as other
      issues and compiler errors and warnings.
    
       - allow booting xtfpga on boards with new uBoot and >128MBytes memory
       - drop nonexistent GPIO32 support from fsf variant
       - don't select USE_GENERIC_SMP_HELPERS
       - enable common clock framework support, set up ethoc clock on xtfpga
       - wire up sched_setattr and sched_getattr syscalls.
       - fix system call to spill the processor registers to stack.
       - improve kernel macro to spill the processor registers
       - export ccount_freq symbol
       - fix undefined symbol warning"
    
    * tag 'xtensa-next-20140224' of git://github.com/czankel/xtensa-linux:
      xtensa: wire up sched_setattr and sched_getattr syscalls
      xtensa: xtfpga: set ethoc clock frequency
      xtensa: xtfpga: use common clock framework
      xtensa: support common clock framework
      xtensa: no need to select USE_GENERIC_SMP_HELPERS
      xtensa: fsf: drop nonexistent GPIO32 support
      xtensa: don't pass high memory to bootmem allocator
      xtensa: fix fast_syscall_spill_registers
      xtensa: fix fast_syscall_spill_registers
      xtensa: save current register frame in fast_syscall_spill_registers_fixup
      xtensa: introduce spill_registers_kernel macro
      xtensa: export ccount_freq
      xtensa: fix warning '"CONFIG_OF" is not defined'
  16. @djbw

    ioat: fix tasklet tear down

    djbw authored
    Since commit 7787380 "net_dma: mark broken" we no longer pin dma
    engines active for the network-receive-offload use case.  As a result
    the ->free_chan_resources() that occurs after the driver self test no
    longer has a NET_DMA induced ->alloc_chan_resources() to back it up.  A
    late firing irq can lead to ksoftirqd spinning indefinitely due to the
    tasklet_disable() performed by ->free_chan_resources().  Only
    ->alloc_chan_resources() can clear this condition in affected kernels.
    
    This problem has been present since commit 3e03745 "I/OAT: Add
    support for MSI and MSI-X" in 2.6.24, but is now exposed. Given the
    NET_DMA use case is deprecated we can revisit moving the driver to use
    threaded irqs.  For now, just tear down the irq and tasklet properly by:
    
    1/ Disable the irq from triggering the tasklet
    
    2/ Disable the irq from re-arming
    
    3/ Flush inflight interrupts
    
    4/ Flush the timer
    
    5/ Flush inflight tasklets
    
    References:
    https://lkml.org/lkml/2014/1/27/282
    https://lkml.org/lkml/2014/2/19/672
    
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: <stable@vger.kernel.org>
    Reported-by: Mike Galbraith <bitbucket@online.de>
    Reported-by: Stanislav Fomichev <stfomichev@yandex-team.ru>
    Tested-by: Mike Galbraith <bitbucket@online.de>
    Tested-by: Stanislav Fomichev <stfomichev@yandex-team.ru>
    Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Commits on Feb 24, 2014
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/linux-security
    
    Pull SELinux endianness fix from James Morris.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      SELinux: bigendian problems with filename trans rules
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/s390/linux
    
    Pull s390 bug fixes from Martin Schwidefsky:
     "A couple of s390 bug fixes.  The PCI segment boundary issue is a nasty
      one as it can lead to data corruption"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390/cio: Fix missing subchannels after CHPID configure on
      s390/pci/dma: use correct segment boundary size
      s390/compat: fix sys_sched_getattr compat wrapper
      s390/zcrypt: additional check to avoid overflow in msg-type 6 requests
  3. @czankel

    Merge tag 'xtensa-for-next-20140221-1' into for_next

    czankel authored
    Xtensa fixes for 3.14:
    - allow booting xtfpga on boards with new uBoot and >128MBytes memory;
    - drop nonexistent GPIO32 support from fsf variant;
    - don't select USE_GENERIC_SMP_HELPERS;
    - enable common clock framework support, set up ethoc clock on xtfpga;
    - wire up sched_setattr and sched_getattr syscalls.
    
    Signed-off-by: Chris Zankel <chris@zankel.net>
  4. Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/s…

    James Morris authored
    …elinux into for-linus
  5. @torvalds

    Linux 3.14-rc4

    torvalds authored
  6. @torvalds

    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/arm/arm-soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "A collection of fixes for ARM platforms.  Most are fixes for DTS
      files, mostly from DT conversion on OMAP which is still finding a few
      issues here and there.
    
      There's a couple of small stale code removal patches that we usually
      queue for the next release instead, but they seemed harmless enough to
      bring in now.
    
      Also, a fix for backlight on some PXA platforms, and a cache
      configuration fix for Tegra, etc"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
      MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer
      ARM: tegra: only run PL310 init on systems with one
      ARM: tegra: Add head numbers to display controllers
      ARM: imx6: build pm-imx6q.c independently of CONFIG_PM
      ARM: tegra: fix RTC0 alias for Cardhu
      ARM: dove: dt: revert PMU interrupt controller node
      Documentation: dt: OMAP: Update Overo/Tobi
      ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
      ARM: dts: omap3-tobi: Use the correct vendor prefix
      ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
      ARM: OMAP2+: Remove legacy macros for zoom platforms
      ARM: OMAP2+: Remove MACH_NOKIA_N800
      ARM: dts: N900: add missing compatible property
      ARM: dts: N9/N950: fix boot hang with 3.14-rc1
      ARM: OMAP1: nokia770: enable tahvo-usb
      ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
      ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
      ARM: dts: omap3-gta04: Fix mmc1 properties.
      ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
      ARM: OMAP2+: add missing ARCH_HAS_OPP
      ...
  7. @torvalds

    Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux…

    torvalds authored
    …/kernel/git/broonie/regulator
    
    Pull regulator fixes from Mark Brown:
     "Mostly unexciting driver fixes, plus one fix to lower the severity of
      the log message when we don't use an optional regulator - the fixes
      for ACPI system made this come up more often and it was correctly
      observed that it was causing undue concern for users"
    
    * tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: max14577: Fix invalid return value on DT parse success
      regulator: core: Change dummy supplies error message to a warning
      regulator: s5m8767: Add missing of_node_put
      regulator: s5m8767: Use of_get_child_by_name
      regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
Commits on Feb 23, 2014
  1. @pekongupta @computersforpeace

    mtd: nand: omap: fix ecclayout->oobfree->length

    pekongupta authored computersforpeace committed
    This patch excludes reserved-marker byte-position from oobfree->length
    calculation. Thus all bytes from oobfree->offset till end of OOB are free.
    
    CC: <stable@vger.kernel.org> # 3.13.x+
    Signed-off-by: Pekon Gupta <pekon@ti.com>
    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  2. @pekongupta @computersforpeace

    mtd: nand: omap: fix ecclayout->oobfree->offset

    pekongupta authored computersforpeace committed
    1) In current implementation, ecclayout->oobfree->offset is calculated with
     respect to ecclayout->eccpos[0] which is incorrect because ECC bytes may not
     be stored contiguously in OOB.
     So, this patch calculates ecclayout->oobfree->offset with respect to last
     ECC byte-position 'eccpos[ecclayout->eccbytes-1]'.
    
    2) ECC layout of some ecc-schemes expects reserved-markers at specific eccpos[]
     which should not be over-written by any file-system metadata.
     So this patch aligns oobfree->offset taking into account of such markers.
    
    CC: <stable@vger.kernel.org> # 3.13.x+
    Tested-by: Enric Balletbo i Serra <eballetbo@gmail.com>
    Tested-by: Stefan Roese <sr@denx.de>
    Signed-off-by: Pekon Gupta <pekon@ti.com>
    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  3. @pekongupta @computersforpeace

    mtd: nand: omap: fix ecclayout to be in sync with u-boot NAND driver

    pekongupta authored computersforpeace committed
    Fixes: commit a919e51
           mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe
    
    Fixes ecclayout mismatch introduced in above commit for following ecc-schemes:
     - OMAP_ECC_BCH4_CODE_HW_DETECTION_SW
     - OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
     However, this patch also touches other ecc-schemes as the fix required
     refactoring common code, into ecc-scheme specific code.
    
    This patch aligns ecc-layout for below ecc-schemes as per reference [1],[2],[3]
    
     +---+------------+-------------++-------------+-------------+
     |OOB|BCH8_CODE_HW|BCH8_CODE_HW_||HAM1_CODE_HW |HAM1_CODE_HW |
     |pos|            | DETECTION_SW||(x8 device)  |(x16 device) |
     +---+------------+-------------++-------------+-------------+
     | 0 |BADBLK_MARK | BADBLK_MARK || BADBLK_MARK | BADBLK_MARK |
     | 1 |BADBLK_MARK | BADBLK_MARK || eccpos[0]   | BADBLK_MARK |
     | 2 | eccpos[0]  | eccpos[0]   || eccpos[1]   | eccpos[0]   |
     | 3 | eccpos[1]  | eccpos[1]   || eccpos[2]   | eccpos[1]   |
     | 4 | eccpos[2]  | eccpos[2]   || eccpos[3]   | eccpos[2]   |
     | 5 | eccpos[3]  | eccpos[3]   || eccpos[4]   | eccpos[3]   |
     | 6 | eccpos[4]  | eccpos[4]   || eccpos[5]   | eccpos[4]   |
     | 7 | eccpos[5]  | eccpos[5]   || eccpos[6]   | eccpos[5]   |
     | 8 | eccpos[6]  | eccpos[6]   || eccpos[7]   | eccpos[6]   |
     | 9 | eccpos[7]  | eccpos[7]   || eccpos[8]   | eccpos[7]   |
     |10 | eccpos[8]  | eccpos[8]   || eccpos[9]   | eccpos[8]   |
     |11 | eccpos[9]  | eccpos[9]   || eccpos[10]  | eccpos[9]   |
     |12 | eccpos[10] | eccpos[10]  || eccpos[11]  | eccpos[10]  |
     |13 | eccpos[11] | eccpos[11]  || oobfree[0]  | eccpos[11]  |
     |14 | eccpos[12] | eccpos[12]  || oobfree[1]  | oobfree[0]  |
     |15 | eccpos[13] | <reserved>  || oobfree[2]  | oobfree[1]  |
     +---+------------+-------------++-------------+-------------+
     |16 | eccpos[14] | eccpos[13]  || oobfree[3]  | oobfree[2]  |
     |...| [...]      | [...]       || [...]       | [...]       |
     |56 | eccpos[54] | eccpos[51]  || oobfree[43] | oobfree[42] |
     |57 | eccpos[55] | <reserved>  || oobfree[44] | oobfree[43] |
     +===+============+=============+==============+=============+
     |58 | oobfree[0] | oobfree[0]  || oobfree[45] | oobfree[44] |
     |59 | oobfree[1] | oobfree[1]  || oobfree[46] | oobfree[45] |
     |60 | oobfree[2] | oobfree[2]  || oobfree[47] | oobfree[46] |
     |61 | oobfree[3] | oobfree[3]  || oobfree[48] | oobfree[47] |
     |62 | oobfree[4] | oobfree[4]  || oobfree[49] | oobfree[48] |
     |63 | oobfree[5] | oobfree[5]  || oobfree[50] | oobfree[49] |
     +---+------------+-------------+--------------+-------------+
    
    [1] ecc-layout expected by ROM code, as specified in SoC TRM under:
          Chapter="Initialization"
            Section="Device Initialization by ROM code"
                Sub-Section="Memory Booting"
                    Heading="NAND"
                    Figure="ECC Locations in NAND Spare Areas"
    
    [2] ecc-layout updates in u-boot
        http://lists.denx.de/pipermail/u-boot/2013-November/167551.html
    
    [3] u-boot configurations to match above ecc-layout are documented at
        https://processors.wiki.ti.com/index.php/Linux_Core_NAND_User%27s_Guide
    
    CC: <stable@vger.kernel.org> # 3.13.x+
    Reported-by: Enric Balletbo Serra <eballetbo@iseebcn.com>
    Tested-by: Enric Balletbo i Serra <eballetbo@gmail.com>
    Tested-by: Stefan Roese <sr@denx.de>
    Signed-off-by: Pekon Gupta <pekon@ti.com>
    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  4. @torvalds

    Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/tip
    
    Pull timer fix from Thomas Gleixner:
     "Serialize the registration of a new sched_clock in the currently ARM
      only generic sched_clock facilty to avoid sched_clock havoc"
    
    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      sched_clock: Prevent callers from seeing half-updated data
  5. @torvalds

    Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/tip
    
    Pull x86 fixes from Thomas Gleixner:
    
     - a bugfix which prevents a divide by 0 panic when the newly introduced
       try_msr_calibrate_tsc() fails
    
     - enablement of the Baytrail platform to utilize the newfangled msr
       based calibration
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86: tsc: Add missing Baytrail frequency to the table
      x86, tsc: Fallback to normal calibration if fast MSR calibration fails
  6. @torvalds

    Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/tip
    
    Pull irq fixes from Thomas Gleixner:
     "Another four fixlets to tame the ARM orion irq chip"
    
    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      irqchip: orion: Fix getting generic chip pointer.
      irqchip: orion: clear stale interrupts in irq_startup
      irqchip: orion: use handle_edge_irq on bridge irqs
      irqchip: orion: clear bridge cause register on init
  7. @torvalds

    Merge tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/gregkh/usb
    
    Pull USB fixes from Greg KH:
     "Here are a number of USB fixes for reported issues for 3.14-rc4
    
      The majority of these are for USB gadget, phy, and musb driver issues.
      And there's a few new device ids thrown in for good measure"
    
    * tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
      usb: chipidea: need to mask when writting endptflush and endptprime
      usb: musb: correct use of schedule_delayed_work()
      usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
      usb: gadget: fix NULL pointer dereference
      usb: gadget: printer: using gadget_is_otg to check otg support at runtime
      phy: let phy_provider_register be the last step in registering PHY
      phy-core: Don't allow building phy-core as a module
      phy-core: Don't propagate -ENOSUPP from phy_pm_runtime_get_sync to caller
      phy-core: phy_get: Leave error logging to the caller
      phy,phy-bcm-kona-usb2.c: Add dependency on HAS_IOMEM
      usb: musb: correct use of schedule_delayed_work()
      usb: musb: do not sleep in atomic context
      USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
      USB: EHCI: add delay during suspend to prevent erroneous wakeups
      usb: gadget: bcm63xx_udc: fix build failure on DMA channel code
      usb: musb: do not sleep in atomic context
      usb: gadget: s3c2410_udc: Fix build error
      usb: musb: core: Fix remote-wakeup resume
      usb: musb: host: Fix SuperSpeed hub enumeration
      usb: musb: fix obex in g_nokia.ko causing kernel panic
  8. @torvalds

    Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/gregkh/tty
    
    Pull TTY revert from Greg KH:
     "Here is a single commit, a revert of a sysfs file change that ended up
      breaking a userspace tool"
    
    * tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      Revert "tty: Set correct tty name in 'active' sysfs attribute"
  9. @torvalds

    Merge tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/gregkh/staging
    
    Pull staging tree fix from Greg KH:
     "Here is a single android driver fix for 3.14-rc4 that fixes a reported
      problem in the binder driver"
    
    * tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      staging: binder: Fix death notifications
  10. @torvalds

    Merge tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/gregkh/char-misc
    
    Pull char/misc fix from Greg KH:
     "Here is a single commit, to fix a reported problem in the mei driver"
    
    * tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
      mei: set client's read_cb to NULL when flow control fails
  11. @ohporter @olofj

    MAINTAINERS: add additional ARM BCM281xx/BCM11xxx maintainer

    ohporter authored olofj committed
    Add myself as an additional maintainer for the Broadcom mobile
    SoCs.
    
    Signed-off-by: Matt Porter <mporter@linaro.org>
    Acked-by: Christian Daudt <bcm@fixthebug.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
  12. @broonie

    Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix…

    broonie authored
    …/max14577' and 'regulator/fix/s5m8767' into regulator-linus
Something went wrong with that request. Please try again.