Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
  1. Jun 25, 2015
  2. Jun 23, 2015
  3. Jun 10, 2015
    • Kevin Hilman's avatar
      Merge branch 'linaro-android-3.14-lsk' of... · 2528dbd3
      Kevin Hilman authored
      Merge branch 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.14-android
      
      * 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android:
        fix: align closely to AOSP.
        sched: cpufreq: update power usage only if cpufreq_stat is enabled
        uid_cputime: Extends the cputime functionality to report power per uid
        sched: cpufreq: Adds a field cpu_power in the task_struct
        cpufreq_stats: Adds the fucntionality to load current values for each frequency for all the cores.
        New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
        net/unix: sk_socket can disappear when state is unlocked
        selinux: enable genfscon labeling for sysfs and pstore files
        ext4: don't save the error information if the block device is read-only
        selinux: enable per-file labeling for debugfs files.
        cpufreq: interactive: Rearm governor timer at max freq
        cpufreq: interactive: Implement cluster-based min_sample_time
        cpufreq: interactive: Exercise hispeed settings at a policy level
        suspend: Return error when pending wakeup source is found.
        proc: uid_cputime: fix show_uid_stat permission
        nf: IDLETIMER: Fix broken uid field in the msg
    • Kevin Hilman's avatar
      Merge branch 'linux-3.14.y' of... · 1787a2cb
      Kevin Hilman authored
      Merge branch 'linux-3.14.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14
      
      * 'linux-3.14.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (63 commits)
        Linux 3.14.44
        fs/binfmt_elf.c:load_elf_binary(): return -EINVAL on zero-length mappings
        vfs: read file_handle only once in handle_to_path
        drm/radeon: partially revert "fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling"
        drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling
        drm/radeon: add new bonaire pci id
        ACPI / init: Fix the ordering of acpi_reserve_resources()
        sd: Disable support for 256 byte/sector disks
        storvsc: Set the SRB flags correctly when no data transfer is needed
        Input: elantech - fix semi-mt protocol for v3 HW
        rtlwifi: rtl8192cu: Fix kernel deadlock
        md/raid0: fix restore to sector variable in raid0_make_request
        md/raid5: don't record new size if resize_stripes fails.
        thermal: step_wise: Revert optimization
        svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures
        mm, numa: really disable NUMA balancing by default on single node machines
        tools/vm: fix page-flags build
        ARM: fix missing syscall trace exit
        ARM: dts: imx27: only map 4 Kbyte for fec registers
        mac80211: move WEP tailroom size check
        ...
  4. Jun 08, 2015
    • Sumit Semwal's avatar
      fix: align closely to AOSP. · 17b3b28b
      Sumit Semwal authored
      To support Android on a member platform, LMG carry forwarded
      quiet a few (200+) aosp/android-3.10 patches to
      linaro-android-3.14-lsk tree when aosp/android-3.14 was not
      announced. There are few gaps in our forward-ported branch
      from 3.10->3.14, and how AOSP is maintaining the patches.
      
      This consolidated patch help align our tree with AOSP, unless
      we've added some fixes. Listed below are file-wise changes
      and rationale behind them:
      
      - arch/arm/Kconfig: c0cc1d84: seccomp revert is missing from AOSP,
        potentially because of cleaner seccomp patches
       => Align with AOSP.
      
      - arch/arm/mm/mmu.c: 97b095e5: "ARM: mm: Split memory banks that span
        multiple sections when sparsemem is enabled" doesn't seem required
        anymore, and isn't added to AOSP
       => Align with AOSP.
      
      - arch/arm64/Kconfig:
      	27aa5398: "arm64: a backwards compatible config option", and
       	8354fc2d: "arm64: cpuinfo: ARMv7 compatable cpuinfo option" are
        reverted in AOSP trees
       => Remove and align with AOSP
      
      - arch/arm64/include/asm/debug-monitors.h: Minor differences with AOSP
        merge v/s ours
       => Align with AOSP
      
      - arch/mips/include/uapi/asm/unistd.h: 598966eb MIPS: add seccomp
        syscall  has merge differences between AOSP and ours
       => Align with AOSP.
      
      - drivers/mmc/core/core.c:
        drivers/mmc/core/host.c:
        include/linux/mmc/host.h:
       	2f76feb8 mmc: core: host: only use wakelock for detect work by
         Colin Cross: was present in 3.10,and so in fwd-port; Missing from
         3.14/3.18; it als introduced a memory leak w/ TI
       => Align with AOSP by reverting the above commit
      
      - drivers/usb/gadget/f_accessory.c: feee075e: "usb: gadget:
        f_accessory: fix missing NULL pointer check" by Amit Pundir that was
        being carried in linaro-fixes isn't required anymore due to the AOSP
        merged fix.
       => Align with AOSP.
      
      - drivers/usb/gadget/u_ether.c: minor code rearrangement during our
        merge
       => ALIGN with AOSP.
      
      - include/net/bluetooth/hci.h:
        include/net/bluetooth/hci_core.h:
        net/bluetooth/hci_conn.c:
        net/bluetooth/hci_event.c:
        net/bluetooth/rfcomm/core.c:
       => BT Patches not in 3.14/3.18; ALIGN with AOSP.
      
      - include/net/netfilter/ipv4/nf_reject.h:
        include/net/netfilter/ipv6/nf_reject.h:
        net/ipv4/netfilter/Kconfig:
        net/ipv6/netfilter/Kconfig:
      	8d83a897: netfilter: have ip*t REJECT set the sock err when
         an icmp is to be sent: NOT in 3.14/3.18
       => ALIGN with AOSP
      
      - include/uapi/asm-generic/unistd.h: 08f6b117: seccomp: add "seccomp"
        syscall has merge differences between our merge and AOSP's
       => ALIGN with AOSP
      
      - kernel/irq/pm.c: c2d35c68  irq: pm: Remove unused variable by Dmitry
        Shmidt
       => ALIGN with AOSP.
      
      - kernel/power/wakelock.c: 11388c87  PM / Sleep: Require
        CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock by Rafael J. Wysocki
        has merge differences between our merge and AOSP's
       => ALIGN with AOSP
      
      - kernel/sys.c: 77d83f8d
      
      : prctl: adds PR_SET_TIMERSLACK_PID for setting
        timer slack of an arbitrary thread has merge differences between our
        merge and AOSP's
       => ALIGN with AOSP
      
      - net/wireless/Kconfig:
        net/wireless/sme.c:
          CONFIG_CFG80211 related patches are not in 3.14/3.18 AOSP
       => ALIGN with AOSP
      
      Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
      Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
      17b3b28b
  5. Jun 06, 2015