Hi Mark, Alex,
Please consider following linaro-android pull request (based on recently tagged android-4.4 stable kernel in AOSP) for "linux-linaro-lsk-v4.4-android" LSK branch.
This pull request is a simple merge of android-4.4 and linux-linaro-lsk-v4.4-android trees with no merge conflict, and it doesn't carry any additional linaro-android fixes for now.
Regards, Amit Pundir
The following changes since commit 34f6d2c9d12a97271d55c7b204443b2da9e6c29e:
Merge tag 'v4.4.1' into linux-linaro-lsk-v4.4 (2016-02-05 19:31:55 +0000)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.4-android
for you to fetch changes up to 02bbd06e489a9f56910973535152d3ec47f3fdcc:
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common (2016-02-18 00:20:12 +0530)
----------------------------------------------------------------
Alex Ray (1): ARM64: add option to build Image.gz/dtb combo
Alistair Strachan (2): video: adf: export the adf_attachment_allow symbol to modules. video: adf: use rb_erase in adf_obj_destroy.
Amit Pundir (40): lowmemorykiller: use module_param_cb instead of __module_param_call net: pppopns: pppolac: fix sendmsg function calls Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: PPPoPNS and PPPoLAC build fixes for 4.4 nf: IDLETIMER: Fix broken uid field in the msg net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled xt_qtaguid: fix broken uid/gid range check xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() netfilter: xt_qtaguid: xt_socket: build fixes netfilter: xt_qtaguid/socket: build fixes for 4.4 net: ipv6: fix virtual tunneling build usb: gadget: check for accessory device before disconnecting HIDs usb: gadget: fix NULL ptr derefer while symlinking PTP func usb: phy: fix dual role sysfs build if kernel modules are supported usb: gadget: configfs: handle gadget reset request for android usb: gadget: build audio_source function only if SND is enabled usb: gadget: cleanup: fix unused variable and function warnings usb: gadget: rndis: use %z format specifier for size_t usb: gadget: rndis: fix broken data aggregation build usb: gadget: rndis: fix broken build for 4.4 usb: gadget: u_ether: use %z format specifier for size_t cpufreq: interactive: replace strict_strtoul() with kstrtoul() cpufreq: interactive: build fixes for 4.4 video: adf: fix memblock build failure video: adf: build fixes for 4.1 misc seq_printf fixes for 4.4 power: wakeup_reason: fix suspend time reporting cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach cgroup: refactor allow_attach handler for 4.4 prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict proc: uid_cputime: create uids from kuids uid_cputime: skip power reporting per uid for now SELinux: build fix for 4.1 ion: fix page pool cache policy mm: private anonymous memory build fixes for 4.4 kbuild: Makefile.clean: make Kbuild and Makefile optional goldfish_bus: switch GOLDFISH_BUS config back to bool android: skip building drivers as modules android: configs: base: enable configfs gadget functions Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
Andrey Konovalov (1): Include if_pppolac.h and if_pppopns.h into header-y target
Anson Jacob (3): usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for acc_write usb: gadget: f_audio_source: change max ISO packet size usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor
Arun Bharadwaj (1): tracing/sched: Add trace events to track cpu hotplug.
Arve Hjønnevåg (24): PM / Sleep: Add wake lock api wrapper on top of wakeup sources staging: android: lowmemorykiller: Add config option to support oom_adj values Input: Generic GPIO Input device. input: Add keyreset driver. netfilter: xt_quota2: 3.10 fixes. netfilter: xt_qtaguid: 3.10 fixes net: activity_stats: Stop using obsolete create_proc_read_entry api usb: otg: otg-wakelock: Fix build for 3.7 usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8 ARM: Add fiq_glue ARM: fiq_debugger: Fix to compile on 3.7 ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs ARM: fiq_debugger: Update tty code for 3.9 ARM: fiq_glue: Add custom fiq return handler api. fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code fiq_debugger: Add fiq_watchdog_triggered api sched: Enable might_sleep before initializing drivers. misc: uidstat: Remove use of obsolete create_proc_read_entry api armv6 dcc tty driver Optionally flush entire dcache from v6_dma_flush_range ARM: Fix "Make low-level printk work" to use a separate config option ARM: decompressor: Flush tlb before swiching domain 0 to client mode pstore/ram: Add ramoops_console_write_buf api android: binder: More offset validation
Ashish Sharma (2): bridge: Have tx_bytes count headers like rx_bytes. android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
Badhri Jagan Sridharan (19): usb: u_ether: Add workqueue as bottom half handler for rx data path USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode RNDIS: Add Data aggregation (multi packet) support ndis: Add debug support to disable RNDIS Multipacket Feature usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION interface usb: gadget: configfs: Add usb_function ptr to fi struct usb: gadget: Add Uevent to notify userspace usb: gadget: f_audio_source:replace deprecated API usb: gadget: Add function devices to the parent usb:gadget:audio_source: Move to USB_FUNCTION API usb: gadget: Move gadget functions code usb: gadget: Accessory:Migrate to USB_FUNCTION API usb: gadget: Relocate f_accessory usb: gadget: Do not disconnect unregistered dev usb:gadget:Add "state" attribute to android_device usb: phy: Dual role sysfs class definition usb: gadget: Add device attribute to determine gadget state ANDROID: usb: gadget: create F_midi device cpufreq: interactive: restructure CPUFREQ_GOV_LIMITS
Benoit Goby (9): usb: gadget: mtp: Add MTP/PTP function usb: gadget: adb: Add ADB function usb: gadget: accessory: Add Android Accessory function usb: gadget: adb: Only enable the gadget when adbd is ready usb: otg: otg-wakelock: Fix build for 3.4 usb: gadget: accessory: Fix section mismatch usb: gadget: Fix android gadget driver build drivers: power: Add watchdog timer to catch drivers which lockup during suspend. ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
Chia-chi Yeh (7): security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). net: Only NET_ADMIN is allowed to fully control TUN interfaces. net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. net: add PPP on PPTP Network Server (PPPoPNS) driver. net: PPPoPNS and PPPoLAC fixes. net: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chih-Wei Huang (1): cpufreq: interactive: fix compiling warnings
Christian Poetzsch (2): Fix generic cgroup subsystem permission checks Fix for in kernel emergency remount when loop mounts are used
Colin Cross (35): lowmemorykiller: make default lowmemorykiller debug message useful input: misc: gpio_event: remove early suspend input: misc: keychord: move header to uapi mmc_block: Allow more than 8 partitions per card mmc: sdio: fix sdio_reset_comm() voltage selection Recreate asm/mach/mmc.h include file net: move PPPoLAC and PPPoPNS headers to uapi usb: otg: otg-wakelock: fix build for 3.3 usb: gadget: adb: allow freezing in adb_read usb: gadget: adb: do not set error flag when dequeuing req usb: gadget: f_mtp: move userspace interface to uapi usb: gadget: f_accessory: move userspace interface to uapi ARM: fiq_debugger: fix compiling for v3.3 ARM: fiq_debugger: add support for reboot commands ARM: fiq_debugger: add debug_putc ARM: fiq_debugger: add support for kgdb kdb: support new lines without carriage returns ARM: fiq_debugger: fix multiple consoles and make it a preferred console ARM: fiq_debugger: add process context reboot command ARM: fiq_debugger: lock between tty and console writes fiq_debugger: move into drivers/staging/android/fiq_debugger/ fiq_debugger: rename debug->fiq_debugger fiq_debugger: allow compiling without CONFIG_FIQ_GLUE fiq_debugger: use pt_regs for registers fiq_debugger: split arm support into fiq_debugger_arm.c fiq_debugger: add ARM64 support cpuidle: governor: menu: don't use loadavg trace: power: add trace_clock_set_parent cgroup: Add generic cgroup subsystem permission checks ARM: convert build of appended dtb zImage to list of dtbs ARM64: copy CONFIG_CMDLINE_EXTEND from ARM of: fix CONFIG_CMDLINE_EXTEND mm: add a field to store names for private anonymous memory hardlockup: detect hard lockups without NMIs using secondary cpus epoll: use freezable blocking call
Cylen Yao (1): cpufreq: interactive: make common_tunables static
Dan Willemsen (1): fixup! proc: make oom adjustment files user read-only
Daniel Chen (1): mmc: sdio: Add high speed support to sdio_reset_comm()
Daniel Rosenberg (5): input: add keycombo, a general key combo driver. input: Changed keyreset to act as a wrapper for keycombo. input: Made keyreset more robust include: linux: cgroup: Fix compiler warning staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
Dima Zavin (2): mtd: nand: Allow NAND chip ids to be included standalone. ARM: add option to flush console before reboot
Dmitry Shmidt (17): mmc: Add sdio_readb_ext() function mmc: sdio: Claim host in sdio_reset_comm() mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm() mmc: Add "ignore mmc pm notify" functionality ARM: Add 'card_present' state to mmc_platfrom_data tcp: fix tcp_default_init_rwnd() for 4.1 net: wireless: Decrease scan entry expiration to avoid stall results wlan: Create generic wlan platform data header network: wireless: Add get_mac_addr functionality to platform net: wireless: Add get_country_code functionality to platform Add flags parameter to get_country_code template wlan: Add get_wake_irq functionality trace: fix compilation for 4.1 power: Add check_wakeup_reason() to verify wakeup source irq cgroup: fix cgroup_taskset_for_each call in allow_attach() for 4.1 userfaultfd: Add missing vma_merge parameter android: configs: remove CONFIG_BATTERY_ANDROID=y
Dmitry Torokhov (4): net: fix iterating over hashtable in tcp_nuke_addr() net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash CHROMIUM: android: fix warning when releasing active sync point
Doug Anderson (1): of: Support CONFIG_CMDLINE_EXTEND config option
Dylan Reid (1): power: Remove HAS_WAKELOCK config and document WAKELOCK
Erik Gilling (2): sync: add Documentation/sync.txt ARM: add config option to build zImage/dtb combo
Fengguang Wu (1): goldfish: pipe: fix platform_no_drv_owner.cocci warnings
Greg Hackmann (38): netfilter: xt_qtaguid: fix memory leak in seq_file handlers netfilter: xt_qtaguid: 64-bit warning fixes drivers: usb: gadget: 64-bit related type fixes cpufreq: interactive: hold reference on global cpufreq kobject if needed video: add atomic display framework video: adf: add memblock helper video: adf: support "simple" buffers video: adf: add supported formats to adf_overlay_engine_data video: adf: add fbdev compatibility helper video: adf: add informational flags to interfaces video: adf: add helpers for validating custom formats video: adf: make dpms_state sysfs attribute writable video: adf: set default interface dpms_state to OFF video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers video: adf: make device node names less hierarchical video: adf: remove PAGE_SIZE from userspace-facing header video: adf: fix ADF_MAX_ATTACHMENTS declaration video: adf: validate dpms state passed to blank video: adf: fix fbdev blank -> dpms state mapping video: adf: define constants for device-custom ioctls video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions video: adf: fix compat ioctls calling ioctl with wrong cmd video: adf: use %zu when printing size_t video: adf: replace fbdev helper's open flag with refcount video: adf: ensure consistent alignment on userspace facing structs video: adf: document adf_format_validate_yuv's origin video: adf: add buffer padding quirk video: adf: adf_memblock_export symbol should be exported video: adf: memblock: map buffer for dma video: adf: fbdev: add stubs for kernels without ADF_FBDEV video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode() power: wakeup_reason: rename irq_count to irqcount arm64: check for upper PAGE_SHIFT bits in pfn_valid() arm64: process: dump memory around registers when displaying regs arch: arm64: force -fno-pic FROMLIST: pstore-ram: add Device Tree bindings android: base-cfg: enable ARMV8_DEPRECATED and subfeatures ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
Hosung Kim (1): mmc: sdio: Fix sdio_reset_comm for sync
Iliyan Malchev (1): ARM: Add generic fiq serial debugger
JP Abgrall (29): input: misc: keychord: log when keychord triggered net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU netfilter: add xt_qtaguid matching module netfilter: adding the original quota2 from xtables-addons netfilter: fixup the quota2, and enable. netfilter: qtaguid: initialize a local var to keep compiler happy. netfilter: xt_qtaguid: fix ipv6 protocol lookup netfilter: xt_IDLETIMER: Add new netlink msg type netfilter: xt_qtaguid: start tracking iface rx/tx at low level netfilter: xt_qtaguid: report only uid tags to non-privileged processes netfilter: xt_qtaguid: fix error exit that would keep a spinlock. netfilter: xt_qtaguid: remove AID_* dependency for access control netfilter: xt_qtaguid: extend iface stat to report protocols netfilter: xt_qtaguid: Allow tracking loopback netfilter: qtaguid: rate limit some of the printks netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling netfilter: ipv6: fix crash caused by ipv6_find_hdr() tcp: add a sysctl to config the tcp_default_init_rwnd misc: uidstat: avoid create_stat() race and blockage. ARM: fault: assume no context when IRQs are disabled during data abort. ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim android: configs: Reorder config fragments android: configs: no MODULES for base, no SIP for recommended android: configs: Reorder config fragments, update README android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS android: configs: add TIMER_STATS back, helps with sysrq t. android: configs: add IPV6 ROUTE INFO android: base-cfg: enable DM_VERITY (used for secureboot) android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
Jamie Gennis (4): trace/events: add gpu trace events trace: Add an option to show tgids in trace output trace: add non-hierarchical function_graph option trace/events: fix gpu event timestamp formatting
Jeff Brown (1): hid-multitouch: Filter collections by application usage.
Jeff Vander Stoep (2): selinux: Android kernel compatibility with M userspace arm64 Kconfig: Move LIST_POISON to a safe value
Jin Qian (3): proc: uid_cputime: fix show_uid_stat permission uid_cputime: fix cputime overflow arm64: pass return address to dma_common_contiguous_remap
John Stultz (10): ashmem: Add shmem_set_file to mm/shmem.c mmc: Extend wakelock if bus is dead mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies net: kuid/kguid build fixes netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk fiq_debugger: Build fixes for 4.1 cpufreq-interactive: Compile fixup arm: dcc_tty: fix armv6 dcc tty build failure of: Fix build warnings pstore: Update Documentation/android.txt
Jon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready
Jon Medhurst (Tixy) (1): xt_qtaguid: Fix boot panic
Jonathan Hamilton (1): video: adf: Cleanup sw_sync timeline at adf_device_destroy
Junjie Wu (4): cpufreq: interactive: Put global cpufreq kobject on failure cpufreq: interactive: Don't set floor_validate_time during boost cpufreq: interactive: Round up timer_rate to match jiffy cpufreq: interactive: Implement cluster-based min_sample_time
Kees Cook (1): HID: steelseries: validate output report details
Ken Sumrall (2): mmc: block: Improve logging of handling emmc timeouts mmc: Add tracepoints of mmc block operations
Kevin Hilman (1): android: configs: base: enable IPV6
Laura Abbott (1): staging: android: ashmem: Avoid deadlock with mmap/shrink
Lianwei Wang (6): cpufreq: interactive: use deferrable timer by default cpufreq: interactive: fix race on governor start/stop cpufreq: interactive: add io_is_busy interface cpufreq: interactive: fix race on cpufreq TRANSITION notifier cpufreq: interactive: resched timer if max freq raised cpufreq: interactive: only boost tunable affected cpus
Lizhe Liu (1): Enable adb with android-pipe in IA image
Lorenzo Colitti (5): net: ipv6: autoconf routes into per-device tables net: core: Support UID-based routing. net: support marking accepting TCP sockets Don't kill IPv4 sockets when killing IPv6 sockets was requested. Make suspend abort reason logging depend on CONFIG_PM_SLEEP
Mark Salyzyn (6): ANDROID: rtc-palmas: correct for bcd year android: base-cfg: disable LOGGER android: base-cfg: turn off /dev/mem and /dev/kmem android: base-cfg: disable ALARM_DEV android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST
Mars (1): ARM: fiq_debugger: fix uninitialised spin_lock.
Martijn Coenen (2): lowmemorykiller: trace kill events. UPSTREAM: memcg: Only free spare array when readers are done
Micha Kalfon (2): prctl: fix misplaced PR_SET_TIMERSLACK_PID case prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Michael Wright (2): android: configs: Add Logitech unifying receivers to recommended android: configs: Add HIDRAW to recommended set
Mike Chan (4): android: Add android config documentation to boot framework. misc: uidstat: Adding uid stat driver to collect network statistics. net: activity_stats: Add statistics for network transmission activity cpufreq: interactive: New 'interactive' governor
Mike Lockwood (5): switch: switch class and GPIO drivers. input: keychord: Add keychord driver USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctl USB: gadget: f_accessory: Add support for HID input devices USB: gadget: f_audio_source: New gadget driver for audio output
Minsung Kim (6): cpufreq: interactive: allow arbitrary speed / delay mappings cpufreq: interactive: fix uninitialized spinlock cpufreq: interactive: avoid underflow on active time calculation cpufreq: interactive: fix show_target_loads and show_above_hispeed_delay cpufreq: interactive: fix NULL pointer dereference at sysfs ops cpufreq: interactive: don't skip waking up speedchange_task if target_freq > policy->cur
Mohamad Ayyash (1): xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
Nick Pelly (1): rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Nishanth Menon (1): panic: Add board ID to panic output
Peter Oh (1): USB: remove duplicate out endpoint creation in MTP mode
Pontus Fuchs (1): netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
Praneeth Bajjuri (1): usb: u_ether: Fix compile errors
Qiao Zhou (1): drivers: switch: remove S_IWUSR from dev_attr
Rajmal Menariya (1): ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool)
Rebecca Schultz Zavin (1): mm: vmscan: Add a debug file for shrinkers
Rik van Riel (1): add extra free kbytes tunable
Riley Andrews (2): sched: add sched blocked tracepoint which dumps out context of sleep. android: drivers: workaround debugfs race in binder
Robert Love (4): Add android_aid.h Paranoid network. sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size net: socket ioctl to reset connections matching local address
Rohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Rom Lemarchand (11): staging: android: ashmem: add missing include cgroup: refactor allow_attach function into common code memcg: add permission check cgroup: Fix issues in allow_attach callback proc: make oom adjustment files user read-only initramfs: Add skip_initramfs command line option kbuild: make it possible to specify the module output dir android: configs: Initial commit of Android config fragments android: configs: Enable KSM support by default android: configs: update 3.10 options android: configs: add systrace support to recommended configs
Ruchi Kandoi (23): nf: IDLETIMER: time-stamp and suspend/resume handling. nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35 nf: IDLETIMER: Adds the uid field in the msg cpufreq: interactive: turn boost_pulse off on boost off cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5 cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency. trace: cpufreq: Add tracing for min/max cpufreq Power: add an API to log wakeup reasons POWER: fix compile warnings in log_wakeup_reason Power: Add guard condition for maximum wakeup reasons Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason power: Avoids bogus error messages for the suspend aborts. power: Adds functionality to log the last suspend abort reason. wakeup: Add last wake up source logging for suspend abort reason. wakeup_reason: use vsnprintf instead of snsprintf for vargs. prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread. prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID. uid_cputime: Extends the cputime functionality to report power per uid uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit. uid_cputime: Iterates over all the threads instead of processes. uid_cputime: Check for the range while removing range of UIDs. Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854" wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current governor
Sami Tolvanen (1): android: add CONFIG_DEBUG_RODATA to recommended config
San Mehat (12): mmc: Add status IRQ and status callback function to mmc platform data mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection mmc: sd: When resuming, try a little harder to init the card mmc: sd: Add retries in re-detection mmc: Add concept of an 'embedded' SDIO device. mmc: core: Hold a wake lock accross delayed work + mmc rescan mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device fs: block_dump: Don't display inode changes if block_dump < 2 block: genhd: Add disk/partition specific uevent callbacks for partition info proc: smaps: Allow smaps access for CAP_SYS_RESOURCE process: Add display of memory around registers when displaying regs. serial_core: Add wake_peer uart operation
Saravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Sherman Yin (1): netfilter: fix seq_printf type mismatch warning
Shridhar Rasal (1): cpufreq: interactive: delete timers for GOV_START
Sreeram Ramachandran (1): net: core: Handle 'sk' being NULL in UID-based routing
Stephen Smalley (2): SELinux: Enable setting security contexts on rootfs inodes. android: configs: Enable SELinux and its dependencies.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
Todd Poynor (55): gpio_input: convert from wakelocks to wakeup sources USB: OTG: Take wakelock when VBUS present usb: otg: Temporarily grab wakelock on charger and disconnect events usb: gadget: accessory: Fix section mismatch (again) ARM: kgdb: ignore breakpoint instructions from user mode Move x86_64 idle notifiers to generic ARM: Call idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not current cpufreq: interactive: set at least hispeed when above hispeed load cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above hispeed cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not actual cpufreq: interactive: Separate speed target revalidate time and initial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from userspace cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each hispeed load cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime task cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load is low cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry cpufreq: interactive: trace actual speed in target speed decisions cpufreq: interactive: change speed according to current speed and target load cpufreq: interactive: apply above_hispeed_delay to each step above hispeed cpufreq: interactive: allow arbitrary speed / target load mappings cpufreq: interactive: remove load since last speed change cpufreq: interactive: adjust load for changes in speed cpufreq: interactive: specify duration of CPU speed boost pulse cpufreq: interactive: add timer slack to limit idle at speed > min cpufreq: interactive: fix boosting logic cpufreq: interactive: fix racy timer stopping cpufreq: interactive: fix race on timer restart on governor start cpufreq: interactive: default go_hispeed_load 99%, doc updates cpufreq: interactive: init default values at compile time cpufreq: interactive: don't handle transition notification if not enabled cpufreq: interactive: fix deadlock on spinlock in timer cpufreq: interactive: fix crash on error paths in get_tokenized_data cpufreq: interactive: base above_hispeed_delay on target freq, not current cpufreq: interactive: handle errors from cpufreq_frequency_table_target cpufreq: interactive: reduce chance of zero time delta on load eval power_supply: Add custom property for USB High Current mode power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order power: power_supply: add POWER_SUPPLY_PROP_USB_OTG power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED PM / Suspend: Print wall time at suspend entry and exit power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties fuse: Freeze client on suspend when request sent to userspace w1: ds2482: Manage SLPZ pin sleep state
Tony Lindgren (1): ARM: Make low-level printk work
Tushar Behera (2): tcp: Fix IPV6 module build errors security: Add proper checks for Android specific capability checks
Ulf Hansson (1): Revert "mmc: block: don't use parameter prefix if built as module"
Vinil Cheeramvelil (1): ion: Handle the memory mapping correctly on x86
Viresh Kumar (4): cpufreq: interactive: Remove unnecessary cpu_online() check cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards cpufreq: Interactive: Implement per policy instances of governor cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()
dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.
jinqian (2): Power: Report suspend times from last_suspend_time proc: uid: Adds accounting for the cputimes per uid.
keunyoung (1): fix false disconnect due to a signal sent to the reading process
liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update
rahul.khandelwal (1): subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
taeju.park (1): usb: gadget: prevent change of Host MAC address of 'usb0' interface
xerox_lin (3): USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG usb: Add support for rndis uplink aggregation USB: gadget: rndis: Add module parameter for DL max packets per xfer
Documentation/ABI/testing/sysfs-class-dual-role-usb | 71 ++ Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + Documentation/android.txt | 121 ++++ Documentation/cgroups/cgroups.txt | 9 + Documentation/cpu-freq/governors.txt | 85 +++ Documentation/devicetree/bindings/misc/ramoops.txt | 43 ++ Documentation/filesystems/proc.txt | 6 + Documentation/networking/ip-sysctl.txt | 10 + Documentation/ramoops.txt | 6 +- Documentation/sync.txt | 75 +++ Documentation/sysctl/vm.txt | 45 ++ Documentation/trace/events-power.txt | 1 + Documentation/trace/ftrace.txt | 29 + android/configs/README | 15 + android/configs/android-base.cfg | 162 +++++ android/configs/android-recommended.cfg | 127 ++++ arch/Kconfig | 68 ++ arch/arm/Kconfig | 33 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 5 + arch/arm/boot/.gitignore | 1 + arch/arm/boot/Makefile | 13 + arch/arm/boot/compressed/head.S | 2 + arch/arm/boot/dts/Makefile | 12 +- arch/arm/common/Kconfig | 4 + arch/arm/common/Makefile | 1 + arch/arm/common/fiq_glue.S | 118 ++++ arch/arm/common/fiq_glue_setup.c | 147 +++++ arch/arm/include/asm/fiq_glue.h | 33 + arch/arm/include/asm/mach/mmc.h | 28 + arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/kgdb.c | 4 + arch/arm/kernel/process.c | 75 +++ arch/arm/kernel/reboot.c | 30 + arch/arm/mm/cache-v6.S | 17 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/mmap.c | 3 +- arch/arm64/Kconfig | 66 ++ arch/arm64/Makefile | 9 + arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 13 + arch/arm64/boot/dts/Makefile | 14 + arch/arm64/kernel/process.c | 66 ++ arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 + arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- arch/x86/mm/mmap.c | 12 +- block/genhd.c | 17 + block/partition-generic.c | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/android/binder.c | 26 +- drivers/base/power/main.c | 48 ++ drivers/base/power/wakeup.c | 32 + drivers/base/syscore.c | 3 + drivers/char/Kconfig | 4 + drivers/char/Makefile | 1 + drivers/char/dcc_tty.c | 326 +++++++++ drivers/cpufreq/Kconfig | 24 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_interactive.c | 1360 ++++++++++++++++++++++++++++++++++++++ drivers/cpuidle/governors/menu.c | 7 +- drivers/dma-buf/fence.c | 6 +- drivers/hid/hid-multitouch.c | 10 + drivers/hid/hid-steelseries.c | 5 + drivers/input/Kconfig | 13 + drivers/input/Makefile | 3 + drivers/input/keycombo.c | 261 ++++++++ drivers/input/keyreset.c | 145 ++++ drivers/input/misc/Kconfig | 16 + drivers/input/misc/Makefile | 2 + drivers/input/misc/gpio_axis.c | 192 ++++++ drivers/input/misc/gpio_event.c | 228 +++++++ drivers/input/misc/gpio_input.c | 390 +++++++++++ drivers/input/misc/gpio_matrix.c | 441 +++++++++++++ drivers/input/misc/gpio_output.c | 97 +++ drivers/input/misc/keychord.c | 391 +++++++++++ drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/uid_cputime.c | 240 +++++++ drivers/misc/uid_stat.c | 153 +++++ drivers/mmc/card/block.c | 25 +- drivers/mmc/core/Kconfig | 15 + drivers/mmc/core/core.c | 54 +- drivers/mmc/core/host.c | 7 +- drivers/mmc/core/sd.c | 83 ++- drivers/mmc/core/sdio.c | 112 +++- drivers/mmc/core/sdio_bus.c | 13 +- drivers/mmc/core/sdio_io.c | 33 + drivers/mtd/nand/Kconfig | 10 +- drivers/net/ppp/Kconfig | 17 + drivers/net/ppp/Makefile | 2 + drivers/net/ppp/pppolac.c | 449 +++++++++++++ drivers/net/ppp/pppopns.c | 428 ++++++++++++ drivers/net/tun.c | 6 + drivers/of/fdt.c | 68 +- drivers/platform/Kconfig | 2 - drivers/platform/goldfish/Kconfig | 18 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 176 +++-- drivers/power/power_supply_sysfs.c | 11 +- drivers/rtc/rtc-palmas.c | 44 +- drivers/staging/android/Kconfig | 11 + drivers/staging/android/Makefile | 1 + drivers/staging/android/ashmem.c | 30 +- drivers/staging/android/fiq_debugger/Kconfig | 49 ++ drivers/staging/android/fiq_debugger/Makefile | 4 + drivers/staging/android/fiq_debugger/fiq_debugger.c | 1212 ++++++++++++++++++++++++++++++++++ drivers/staging/android/fiq_debugger/fiq_debugger.h | 64 ++ drivers/staging/android/fiq_debugger/fiq_debugger_arm.c | 240 +++++++ drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c | 202 ++++++ drivers/staging/android/fiq_debugger/fiq_debugger_priv.h | 37 ++ drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h | 94 +++ drivers/staging/android/fiq_debugger/fiq_watchdog.c | 56 ++ drivers/staging/android/fiq_debugger/fiq_watchdog.h | 20 + drivers/staging/android/ion/Kconfig | 7 + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/ion/ion_page_pool.c | 8 + drivers/staging/android/ion/ion_priv.h | 34 + drivers/staging/android/ion/ion_system_heap.c | 8 +- drivers/staging/android/lowmemorykiller.c | 114 +++- drivers/staging/android/sync.c | 14 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/staging/android/uapi/ashmem.h | 1 + drivers/switch/Kconfig | 15 + drivers/switch/Makefile | 4 + drivers/switch/switch_class.c | 174 +++++ drivers/switch/switch_gpio.c | 172 +++++ drivers/tty/serial/serial_core.c | 3 + drivers/usb/gadget/Kconfig | 50 ++ drivers/usb/gadget/composite.c | 6 + drivers/usb/gadget/configfs.c | 262 +++++++- drivers/usb/gadget/function/Makefile | 8 + drivers/usb/gadget/function/f_accessory.c | 1328 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_audio_source.c | 1054 +++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_midi.c | 65 ++ drivers/usb/gadget/function/f_mtp.c | 1434 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_mtp.h | 18 + drivers/usb/gadget/function/f_ptp.c | 38 ++ drivers/usb/gadget/function/f_rndis.c | 30 + drivers/usb/gadget/function/rndis.c | 112 +++- drivers/usb/gadget/function/rndis.h | 2 + drivers/usb/gadget/function/u_ether.c | 325 +++++++-- drivers/usb/gadget/function/u_ether.h | 3 + drivers/usb/gadget/functions.c | 2 +- drivers/usb/phy/Kconfig | 17 + drivers/usb/phy/Makefile | 2 + drivers/usb/phy/class-dual-role.c | 529 +++++++++++++++ drivers/usb/phy/otg-wakelock.c | 173 +++++ drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/adf/Kconfig | 14 + drivers/video/adf/Makefile | 15 + drivers/video/adf/adf.c | 1188 +++++++++++++++++++++++++++++++++ drivers/video/adf/adf.h | 71 ++ drivers/video/adf/adf_client.c | 811 +++++++++++++++++++++++ drivers/video/adf/adf_fbdev.c | 665 +++++++++++++++++++ drivers/video/adf/adf_fops.c | 957 +++++++++++++++++++++++++++ drivers/video/adf/adf_fops.h | 37 ++ drivers/video/adf/adf_fops32.c | 217 ++++++ drivers/video/adf/adf_fops32.h | 78 +++ drivers/video/adf/adf_format.c | 280 ++++++++ drivers/video/adf/adf_memblock.c | 166 +++++ drivers/video/adf/adf_sysfs.c | 296 +++++++++ drivers/video/adf/adf_sysfs.h | 33 + drivers/video/adf/adf_trace.h | 93 +++ drivers/w1/masters/ds2482.c | 47 +- fs/eventpoll.c | 4 +- fs/ext4/ext4.h | 3 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 28 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 5 +- fs/proc/base.c | 8 +- fs/proc/task_mmu.c | 62 ++ fs/pstore/ram.c | 116 +++- fs/super.c | 2 +- fs/userfaultfd.c | 9 +- include/linux/Kbuild | 2 + include/linux/amba/mmci.h | 13 + include/linux/android_aid.h | 28 + include/linux/cgroup-defs.h | 1 + include/linux/cgroup.h | 14 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/linux/fence.h | 2 + include/linux/gpio_event.h | 170 +++++ include/linux/if_pppolac.h | 23 + include/linux/if_pppopns.h | 23 + include/linux/if_pppox.h | 21 + include/linux/initramfs.h | 32 + include/linux/ipv6.h | 1 + include/linux/kernel.h | 4 + include/linux/keychord.h | 23 + include/linux/keycombo.h | 36 + include/linux/keyreset.h | 29 + include/linux/mm.h | 14 +- include/linux/mm_types.h | 24 +- include/linux/mmc/host.h | 17 + include/linux/mmc/pm.h | 1 + include/linux/mmc/sdio_func.h | 10 + include/linux/netfilter/xt_qtaguid.h | 13 + include/linux/netfilter/xt_quota2.h | 25 + include/linux/nmi.h | 5 +- include/linux/of_fdt.h | 21 + include/linux/platform_data/ds2482.h | 21 + include/linux/power_supply.h | 8 + include/linux/pstore_ram.h | 2 + include/linux/serial_core.h | 1 + include/linux/socket.h | 4 + include/linux/suspend.h | 1 + include/linux/switch.h | 53 ++ include/linux/uid_stat.h | 29 + include/linux/usb/class-dual-role.h | 128 ++++ include/linux/usb/composite.h | 1 + include/linux/usb/f_accessory.h | 23 + include/linux/usb/f_mtp.h | 23 + include/linux/wakelock.h | 67 ++ include/linux/wakeup_reason.h | 27 + include/linux/wlan_plat.h | 30 + include/net/activity_stats.h | 25 + include/net/addrconf.h | 2 + include/net/fib_rules.h | 5 + include/net/flow.h | 9 +- include/net/ip.h | 1 + include/net/ip6_route.h | 2 +- include/net/route.h | 6 +- include/net/tcp.h | 3 + include/trace/events/cpufreq_interactive.h | 112 ++++ include/trace/events/gpu.h | 143 ++++ include/trace/events/mmc.h | 91 +++ include/trace/events/power.h | 44 ++ include/trace/events/sched.h | 51 +- include/uapi/linux/fib_rules.h | 2 + include/uapi/linux/fs.h | 2 + include/uapi/linux/if_pppolac.h | 33 + include/uapi/linux/if_pppopns.h | 32 + include/uapi/linux/if_pppox.h | 6 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/keychord.h | 52 ++ include/uapi/linux/netfilter/xt_IDLETIMER.h | 8 + include/uapi/linux/netfilter/xt_socket.h | 7 + include/uapi/linux/prctl.h | 9 + include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/sockios.h | 1 + include/uapi/linux/usb/f_accessory.h | 146 ++++ include/uapi/linux/usb/f_mtp.h | 61 ++ include/uapi/video/adf.h | 321 +++++++++ include/video/adf.h | 502 ++++++++++++++ include/video/adf_client.h | 61 ++ include/video/adf_fbdev.h | 124 ++++ include/video/adf_format.h | 26 + include/video/adf_memblock.h | 20 + init/Makefile | 3 - init/initramfs.c | 19 +- init/noinitramfs.c | 9 +- kernel/cgroup.c | 59 +- kernel/cpu.c | 24 + kernel/debug/kdb/kdb_io.c | 12 +- kernel/fork.c | 3 +- kernel/panic.c | 8 + kernel/power/Kconfig | 9 + kernel/power/Makefile | 2 + kernel/power/process.c | 22 +- kernel/power/suspend.c | 35 +- kernel/power/wakeup_reason.c | 225 +++++++ kernel/printk/printk.c | 8 + kernel/sched/core.c | 15 +- kernel/sched/fair.c | 1 + kernel/sys.c | 173 +++++ kernel/sysctl.c | 31 + kernel/trace/Kconfig | 3 + kernel/trace/Makefile | 1 + kernel/trace/gpu-traces.c | 23 + kernel/trace/trace.c | 98 ++- kernel/trace/trace.h | 4 +- kernel/trace/trace_functions_graph.c | 43 +- kernel/trace/trace_output.c | 184 +++++- kernel/watchdog.c | 123 +++- lib/Kconfig.debug | 14 +- mm/madvise.c | 2 +- mm/memcontrol.c | 21 +- mm/mempolicy.c | 3 +- mm/mlock.c | 2 +- mm/mmap.c | 51 +- mm/mprotect.c | 2 +- mm/page_alloc.c | 32 +- mm/shmem.c | 13 +- mm/vmscan.c | 43 ++ net/Kconfig | 14 + net/Makefile | 1 + net/activity_stats.c | 118 ++++ net/bluetooth/af_bluetooth.c | 29 + net/bridge/br_device.c | 11 +- net/core/fib_rules.c | 53 +- net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 20 +- net/ipv4/devinet.c | 8 +- net/ipv4/fib_frontend.c | 1 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 3 +- net/ipv4/route.c | 25 +- net/ipv4/syncookies.c | 5 +- net/ipv4/sysctl_net_ipv4.c | 22 + net/ipv4/sysfs_net_ipv4.c | 88 +++ net/ipv4/tcp.c | 133 ++++ net/ipv4/tcp_input.c | 1 + net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 39 +- net/ipv6/af_inet6.c | 38 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 1 + net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 13 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 + net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ping.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/route.c | 83 ++- net/ipv6/syncookies.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 1 + net/netfilter/Kconfig | 42 ++ net/netfilter/Makefile | 2 + net/netfilter/xt_IDLETIMER.c | 243 ++++++- net/netfilter/xt_qtaguid.c | 3033 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/netfilter/xt_qtaguid_internal.h | 352 ++++++++++ net/netfilter/xt_qtaguid_print.c | 566 ++++++++++++++++ net/netfilter/xt_qtaguid_print.h | 120 ++++ net/netfilter/xt_quota2.c | 382 +++++++++++ net/netfilter/xt_socket.c | 31 +- net/rfkill/Kconfig | 5 + net/rfkill/core.c | 4 +- net/wireless/scan.c | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 6 + scripts/Makefile.modinst | 2 +- security/commoncap.c | 11 + security/selinux/hooks.c | 7 + security/selinux/ss/avtab.c | 69 +- 349 files changed, 30285 insertions(+), 550 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-dual-role-usb create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons create mode 100644 Documentation/android.txt create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt create mode 100644 Documentation/sync.txt create mode 100644 android/configs/README create mode 100644 android/configs/android-base.cfg create mode 100644 android/configs/android-recommended.cfg create mode 100644 arch/arm/common/fiq_glue.S create mode 100644 arch/arm/common/fiq_glue_setup.c create mode 100644 arch/arm/include/asm/fiq_glue.h create mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 drivers/char/dcc_tty.c create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 drivers/input/keycombo.c create mode 100644 drivers/input/keyreset.c create mode 100644 drivers/input/misc/gpio_axis.c create mode 100644 drivers/input/misc/gpio_event.c create mode 100644 drivers/input/misc/gpio_input.c create mode 100644 drivers/input/misc/gpio_matrix.c create mode 100644 drivers/input/misc/gpio_output.c create mode 100644 drivers/input/misc/keychord.c create mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_stat.c create mode 100644 drivers/net/ppp/pppolac.c create mode 100644 drivers/net/ppp/pppopns.c create mode 100644 drivers/staging/android/fiq_debugger/Kconfig create mode 100644 drivers/staging/android/fiq_debugger/Makefile create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_priv.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.h create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 drivers/switch/Kconfig create mode 100644 drivers/switch/Makefile create mode 100644 drivers/switch/switch_class.c create mode 100644 drivers/switch/switch_gpio.c create mode 100644 drivers/usb/gadget/function/f_accessory.c create mode 100644 drivers/usb/gadget/function/f_audio_source.c create mode 100644 drivers/usb/gadget/function/f_mtp.c create mode 100644 drivers/usb/gadget/function/f_mtp.h create mode 100644 drivers/usb/gadget/function/f_ptp.c create mode 100644 drivers/usb/phy/class-dual-role.c create mode 100644 drivers/usb/phy/otg-wakelock.c create mode 100644 drivers/video/adf/Kconfig create mode 100644 drivers/video/adf/Makefile create mode 100644 drivers/video/adf/adf.c create mode 100644 drivers/video/adf/adf.h create mode 100644 drivers/video/adf/adf_client.c create mode 100644 drivers/video/adf/adf_fbdev.c create mode 100644 drivers/video/adf/adf_fops.c create mode 100644 drivers/video/adf/adf_fops.h create mode 100644 drivers/video/adf/adf_fops32.c create mode 100644 drivers/video/adf/adf_fops32.h create mode 100644 drivers/video/adf/adf_format.c create mode 100644 drivers/video/adf/adf_memblock.c create mode 100644 drivers/video/adf/adf_sysfs.c create mode 100644 drivers/video/adf/adf_sysfs.h create mode 100644 drivers/video/adf/adf_trace.h create mode 100644 include/linux/Kbuild create mode 100644 include/linux/android_aid.h create mode 100644 include/linux/gpio_event.h create mode 100644 include/linux/if_pppolac.h create mode 100644 include/linux/if_pppopns.h create mode 100644 include/linux/initramfs.h create mode 100644 include/linux/keychord.h create mode 100644 include/linux/keycombo.h create mode 100644 include/linux/keyreset.h create mode 100644 include/linux/netfilter/xt_qtaguid.h create mode 100644 include/linux/netfilter/xt_quota2.h create mode 100644 include/linux/platform_data/ds2482.h create mode 100644 include/linux/switch.h create mode 100644 include/linux/uid_stat.h create mode 100644 include/linux/usb/class-dual-role.h create mode 100644 include/linux/usb/f_accessory.h create mode 100644 include/linux/usb/f_mtp.h create mode 100644 include/linux/wakelock.h create mode 100644 include/linux/wakeup_reason.h create mode 100644 include/linux/wlan_plat.h create mode 100644 include/net/activity_stats.h create mode 100644 include/trace/events/cpufreq_interactive.h create mode 100644 include/trace/events/gpu.h create mode 100644 include/trace/events/mmc.h create mode 100644 include/uapi/linux/if_pppolac.h create mode 100644 include/uapi/linux/if_pppopns.h create mode 100644 include/uapi/linux/keychord.h create mode 100644 include/uapi/linux/usb/f_accessory.h create mode 100644 include/uapi/linux/usb/f_mtp.h create mode 100644 include/uapi/video/adf.h create mode 100644 include/video/adf.h create mode 100644 include/video/adf_client.h create mode 100644 include/video/adf_fbdev.h create mode 100644 include/video/adf_format.h create mode 100644 include/video/adf_memblock.h create mode 100644 kernel/power/wakeup_reason.c create mode 100644 kernel/trace/gpu-traces.c create mode 100644 net/activity_stats.c create mode 100644 net/ipv4/sysfs_net_ipv4.c create mode 100644 net/netfilter/xt_qtaguid.c create mode 100644 net/netfilter/xt_qtaguid_internal.h create mode 100644 net/netfilter/xt_qtaguid_print.c create mode 100644 net/netfilter/xt_qtaguid_print.h create mode 100644 net/netfilter/xt_quota2.c
Thanks Amit, pulled on linux-linaro-lsk-v4.4-android.
BTW, I saw some similar lsk/android related branches on your git tree, like linaro-android-3.14-lsk/lsk-v3.14-android, linux-linaro-lsk-v4.1-android
Is there any rule binds the names? :)
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Thanks! Alex
On 02/18/2016 03:50 AM, Amit Pundir wrote:
Hi Mark, Alex,
Please consider following linaro-android pull request (based on recently tagged android-4.4 stable kernel in AOSP) for "linux-linaro-lsk-v4.4-android" LSK branch.
This pull request is a simple merge of android-4.4 and linux-linaro-lsk-v4.4-android trees with no merge conflict, and it doesn't carry any additional linaro-android fixes for now.
Regards, Amit Pundir
The following changes since commit 34f6d2c9d12a97271d55c7b204443b2da9e6c29e:
Merge tag 'v4.4.1' into linux-linaro-lsk-v4.4 (2016-02-05 19:31:55 +0000)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.4-android
for you to fetch changes up to 02bbd06e489a9f56910973535152d3ec47f3fdcc:
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common (2016-02-18 00:20:12 +0530)
Alex Ray (1): ARM64: add option to build Image.gz/dtb combo
Alistair Strachan (2): video: adf: export the adf_attachment_allow symbol to modules. video: adf: use rb_erase in adf_obj_destroy.
Amit Pundir (40): lowmemorykiller: use module_param_cb instead of __module_param_call net: pppopns: pppolac: fix sendmsg function calls Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: PPPoPNS and PPPoLAC build fixes for 4.4 nf: IDLETIMER: Fix broken uid field in the msg net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled xt_qtaguid: fix broken uid/gid range check xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() netfilter: xt_qtaguid: xt_socket: build fixes netfilter: xt_qtaguid/socket: build fixes for 4.4 net: ipv6: fix virtual tunneling build usb: gadget: check for accessory device before disconnecting HIDs usb: gadget: fix NULL ptr derefer while symlinking PTP func usb: phy: fix dual role sysfs build if kernel modules are supported usb: gadget: configfs: handle gadget reset request for android usb: gadget: build audio_source function only if SND is enabled usb: gadget: cleanup: fix unused variable and function warnings usb: gadget: rndis: use %z format specifier for size_t usb: gadget: rndis: fix broken data aggregation build usb: gadget: rndis: fix broken build for 4.4 usb: gadget: u_ether: use %z format specifier for size_t cpufreq: interactive: replace strict_strtoul() with kstrtoul() cpufreq: interactive: build fixes for 4.4 video: adf: fix memblock build failure video: adf: build fixes for 4.1 misc seq_printf fixes for 4.4 power: wakeup_reason: fix suspend time reporting cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach cgroup: refactor allow_attach handler for 4.4 prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict proc: uid_cputime: create uids from kuids uid_cputime: skip power reporting per uid for now SELinux: build fix for 4.1 ion: fix page pool cache policy mm: private anonymous memory build fixes for 4.4 kbuild: Makefile.clean: make Kbuild and Makefile optional goldfish_bus: switch GOLDFISH_BUS config back to bool android: skip building drivers as modules android: configs: base: enable configfs gadget functions Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
Andrey Konovalov (1): Include if_pppolac.h and if_pppopns.h into header-y target
Anson Jacob (3): usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for acc_write usb: gadget: f_audio_source: change max ISO packet size usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor
Arun Bharadwaj (1): tracing/sched: Add trace events to track cpu hotplug.
Arve Hjønnevåg (24): PM / Sleep: Add wake lock api wrapper on top of wakeup sources staging: android: lowmemorykiller: Add config option to support oom_adj values Input: Generic GPIO Input device. input: Add keyreset driver. netfilter: xt_quota2: 3.10 fixes. netfilter: xt_qtaguid: 3.10 fixes net: activity_stats: Stop using obsolete create_proc_read_entry api usb: otg: otg-wakelock: Fix build for 3.7 usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8 ARM: Add fiq_glue ARM: fiq_debugger: Fix to compile on 3.7 ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs ARM: fiq_debugger: Update tty code for 3.9 ARM: fiq_glue: Add custom fiq return handler api. fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code fiq_debugger: Add fiq_watchdog_triggered api sched: Enable might_sleep before initializing drivers. misc: uidstat: Remove use of obsolete create_proc_read_entry api armv6 dcc tty driver Optionally flush entire dcache from v6_dma_flush_range ARM: Fix "Make low-level printk work" to use a separate config option ARM: decompressor: Flush tlb before swiching domain 0 to client mode pstore/ram: Add ramoops_console_write_buf api android: binder: More offset validation
Ashish Sharma (2): bridge: Have tx_bytes count headers like rx_bytes. android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
Badhri Jagan Sridharan (19): usb: u_ether: Add workqueue as bottom half handler for rx data path USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode RNDIS: Add Data aggregation (multi packet) support ndis: Add debug support to disable RNDIS Multipacket Feature usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION interface usb: gadget: configfs: Add usb_function ptr to fi struct usb: gadget: Add Uevent to notify userspace usb: gadget: f_audio_source:replace deprecated API usb: gadget: Add function devices to the parent usb:gadget:audio_source: Move to USB_FUNCTION API usb: gadget: Move gadget functions code usb: gadget: Accessory:Migrate to USB_FUNCTION API usb: gadget: Relocate f_accessory usb: gadget: Do not disconnect unregistered dev usb:gadget:Add "state" attribute to android_device usb: phy: Dual role sysfs class definition usb: gadget: Add device attribute to determine gadget state ANDROID: usb: gadget: create F_midi device cpufreq: interactive: restructure CPUFREQ_GOV_LIMITS
Benoit Goby (9): usb: gadget: mtp: Add MTP/PTP function usb: gadget: adb: Add ADB function usb: gadget: accessory: Add Android Accessory function usb: gadget: adb: Only enable the gadget when adbd is ready usb: otg: otg-wakelock: Fix build for 3.4 usb: gadget: accessory: Fix section mismatch usb: gadget: Fix android gadget driver build drivers: power: Add watchdog timer to catch drivers which lockup during suspend. ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
Chia-chi Yeh (7): security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). net: Only NET_ADMIN is allowed to fully control TUN interfaces. net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. net: add PPP on PPTP Network Server (PPPoPNS) driver. net: PPPoPNS and PPPoLAC fixes. net: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chih-Wei Huang (1): cpufreq: interactive: fix compiling warnings
Christian Poetzsch (2): Fix generic cgroup subsystem permission checks Fix for in kernel emergency remount when loop mounts are used
Colin Cross (35): lowmemorykiller: make default lowmemorykiller debug message useful input: misc: gpio_event: remove early suspend input: misc: keychord: move header to uapi mmc_block: Allow more than 8 partitions per card mmc: sdio: fix sdio_reset_comm() voltage selection Recreate asm/mach/mmc.h include file net: move PPPoLAC and PPPoPNS headers to uapi usb: otg: otg-wakelock: fix build for 3.3 usb: gadget: adb: allow freezing in adb_read usb: gadget: adb: do not set error flag when dequeuing req usb: gadget: f_mtp: move userspace interface to uapi usb: gadget: f_accessory: move userspace interface to uapi ARM: fiq_debugger: fix compiling for v3.3 ARM: fiq_debugger: add support for reboot commands ARM: fiq_debugger: add debug_putc ARM: fiq_debugger: add support for kgdb kdb: support new lines without carriage returns ARM: fiq_debugger: fix multiple consoles and make it a preferred console ARM: fiq_debugger: add process context reboot command ARM: fiq_debugger: lock between tty and console writes fiq_debugger: move into drivers/staging/android/fiq_debugger/ fiq_debugger: rename debug->fiq_debugger fiq_debugger: allow compiling without CONFIG_FIQ_GLUE fiq_debugger: use pt_regs for registers fiq_debugger: split arm support into fiq_debugger_arm.c fiq_debugger: add ARM64 support cpuidle: governor: menu: don't use loadavg trace: power: add trace_clock_set_parent cgroup: Add generic cgroup subsystem permission checks ARM: convert build of appended dtb zImage to list of dtbs ARM64: copy CONFIG_CMDLINE_EXTEND from ARM of: fix CONFIG_CMDLINE_EXTEND mm: add a field to store names for private anonymous memory hardlockup: detect hard lockups without NMIs using secondary cpus epoll: use freezable blocking call
Cylen Yao (1): cpufreq: interactive: make common_tunables static
Dan Willemsen (1): fixup! proc: make oom adjustment files user read-only
Daniel Chen (1): mmc: sdio: Add high speed support to sdio_reset_comm()
Daniel Rosenberg (5): input: add keycombo, a general key combo driver. input: Changed keyreset to act as a wrapper for keycombo. input: Made keyreset more robust include: linux: cgroup: Fix compiler warning staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
Dima Zavin (2): mtd: nand: Allow NAND chip ids to be included standalone. ARM: add option to flush console before reboot
Dmitry Shmidt (17): mmc: Add sdio_readb_ext() function mmc: sdio: Claim host in sdio_reset_comm() mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm() mmc: Add "ignore mmc pm notify" functionality ARM: Add 'card_present' state to mmc_platfrom_data tcp: fix tcp_default_init_rwnd() for 4.1 net: wireless: Decrease scan entry expiration to avoid stall results wlan: Create generic wlan platform data header network: wireless: Add get_mac_addr functionality to platform net: wireless: Add get_country_code functionality to platform Add flags parameter to get_country_code template wlan: Add get_wake_irq functionality trace: fix compilation for 4.1 power: Add check_wakeup_reason() to verify wakeup source irq cgroup: fix cgroup_taskset_for_each call in allow_attach() for 4.1 userfaultfd: Add missing vma_merge parameter android: configs: remove CONFIG_BATTERY_ANDROID=y
Dmitry Torokhov (4): net: fix iterating over hashtable in tcp_nuke_addr() net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash CHROMIUM: android: fix warning when releasing active sync point
Doug Anderson (1): of: Support CONFIG_CMDLINE_EXTEND config option
Dylan Reid (1): power: Remove HAS_WAKELOCK config and document WAKELOCK
Erik Gilling (2): sync: add Documentation/sync.txt ARM: add config option to build zImage/dtb combo
Fengguang Wu (1): goldfish: pipe: fix platform_no_drv_owner.cocci warnings
Greg Hackmann (38): netfilter: xt_qtaguid: fix memory leak in seq_file handlers netfilter: xt_qtaguid: 64-bit warning fixes drivers: usb: gadget: 64-bit related type fixes cpufreq: interactive: hold reference on global cpufreq kobject if needed video: add atomic display framework video: adf: add memblock helper video: adf: support "simple" buffers video: adf: add supported formats to adf_overlay_engine_data video: adf: add fbdev compatibility helper video: adf: add informational flags to interfaces video: adf: add helpers for validating custom formats video: adf: make dpms_state sysfs attribute writable video: adf: set default interface dpms_state to OFF video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers video: adf: make device node names less hierarchical video: adf: remove PAGE_SIZE from userspace-facing header video: adf: fix ADF_MAX_ATTACHMENTS declaration video: adf: validate dpms state passed to blank video: adf: fix fbdev blank -> dpms state mapping video: adf: define constants for device-custom ioctls video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions video: adf: fix compat ioctls calling ioctl with wrong cmd video: adf: use %zu when printing size_t video: adf: replace fbdev helper's open flag with refcount video: adf: ensure consistent alignment on userspace facing structs video: adf: document adf_format_validate_yuv's origin video: adf: add buffer padding quirk video: adf: adf_memblock_export symbol should be exported video: adf: memblock: map buffer for dma video: adf: fbdev: add stubs for kernels without ADF_FBDEV video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode() power: wakeup_reason: rename irq_count to irqcount arm64: check for upper PAGE_SHIFT bits in pfn_valid() arm64: process: dump memory around registers when displaying regs arch: arm64: force -fno-pic FROMLIST: pstore-ram: add Device Tree bindings android: base-cfg: enable ARMV8_DEPRECATED and subfeatures ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
Hosung Kim (1): mmc: sdio: Fix sdio_reset_comm for sync
Iliyan Malchev (1): ARM: Add generic fiq serial debugger
JP Abgrall (29): input: misc: keychord: log when keychord triggered net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU netfilter: add xt_qtaguid matching module netfilter: adding the original quota2 from xtables-addons netfilter: fixup the quota2, and enable. netfilter: qtaguid: initialize a local var to keep compiler happy. netfilter: xt_qtaguid: fix ipv6 protocol lookup netfilter: xt_IDLETIMER: Add new netlink msg type netfilter: xt_qtaguid: start tracking iface rx/tx at low level netfilter: xt_qtaguid: report only uid tags to non-privileged processes netfilter: xt_qtaguid: fix error exit that would keep a spinlock. netfilter: xt_qtaguid: remove AID_* dependency for access control netfilter: xt_qtaguid: extend iface stat to report protocols netfilter: xt_qtaguid: Allow tracking loopback netfilter: qtaguid: rate limit some of the printks netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling netfilter: ipv6: fix crash caused by ipv6_find_hdr() tcp: add a sysctl to config the tcp_default_init_rwnd misc: uidstat: avoid create_stat() race and blockage. ARM: fault: assume no context when IRQs are disabled during data abort. ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim android: configs: Reorder config fragments android: configs: no MODULES for base, no SIP for recommended android: configs: Reorder config fragments, update README android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS android: configs: add TIMER_STATS back, helps with sysrq t. android: configs: add IPV6 ROUTE INFO android: base-cfg: enable DM_VERITY (used for secureboot) android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
Jamie Gennis (4): trace/events: add gpu trace events trace: Add an option to show tgids in trace output trace: add non-hierarchical function_graph option trace/events: fix gpu event timestamp formatting
Jeff Brown (1): hid-multitouch: Filter collections by application usage.
Jeff Vander Stoep (2): selinux: Android kernel compatibility with M userspace arm64 Kconfig: Move LIST_POISON to a safe value
Jin Qian (3): proc: uid_cputime: fix show_uid_stat permission uid_cputime: fix cputime overflow arm64: pass return address to dma_common_contiguous_remap
John Stultz (10): ashmem: Add shmem_set_file to mm/shmem.c mmc: Extend wakelock if bus is dead mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies net: kuid/kguid build fixes netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk fiq_debugger: Build fixes for 4.1 cpufreq-interactive: Compile fixup arm: dcc_tty: fix armv6 dcc tty build failure of: Fix build warnings pstore: Update Documentation/android.txt
Jon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready
Jon Medhurst (Tixy) (1): xt_qtaguid: Fix boot panic
Jonathan Hamilton (1): video: adf: Cleanup sw_sync timeline at adf_device_destroy
Junjie Wu (4): cpufreq: interactive: Put global cpufreq kobject on failure cpufreq: interactive: Don't set floor_validate_time during boost cpufreq: interactive: Round up timer_rate to match jiffy cpufreq: interactive: Implement cluster-based min_sample_time
Kees Cook (1): HID: steelseries: validate output report details
Ken Sumrall (2): mmc: block: Improve logging of handling emmc timeouts mmc: Add tracepoints of mmc block operations
Kevin Hilman (1): android: configs: base: enable IPV6
Laura Abbott (1): staging: android: ashmem: Avoid deadlock with mmap/shrink
Lianwei Wang (6): cpufreq: interactive: use deferrable timer by default cpufreq: interactive: fix race on governor start/stop cpufreq: interactive: add io_is_busy interface cpufreq: interactive: fix race on cpufreq TRANSITION notifier cpufreq: interactive: resched timer if max freq raised cpufreq: interactive: only boost tunable affected cpus
Lizhe Liu (1): Enable adb with android-pipe in IA image
Lorenzo Colitti (5): net: ipv6: autoconf routes into per-device tables net: core: Support UID-based routing. net: support marking accepting TCP sockets Don't kill IPv4 sockets when killing IPv6 sockets was requested. Make suspend abort reason logging depend on CONFIG_PM_SLEEP
Mark Salyzyn (6): ANDROID: rtc-palmas: correct for bcd year android: base-cfg: disable LOGGER android: base-cfg: turn off /dev/mem and /dev/kmem android: base-cfg: disable ALARM_DEV android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST
Mars (1): ARM: fiq_debugger: fix uninitialised spin_lock.
Martijn Coenen (2): lowmemorykiller: trace kill events. UPSTREAM: memcg: Only free spare array when readers are done
Micha Kalfon (2): prctl: fix misplaced PR_SET_TIMERSLACK_PID case prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Michael Wright (2): android: configs: Add Logitech unifying receivers to recommended android: configs: Add HIDRAW to recommended set
Mike Chan (4): android: Add android config documentation to boot framework. misc: uidstat: Adding uid stat driver to collect network statistics. net: activity_stats: Add statistics for network transmission activity cpufreq: interactive: New 'interactive' governor
Mike Lockwood (5): switch: switch class and GPIO drivers. input: keychord: Add keychord driver USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctl USB: gadget: f_accessory: Add support for HID input devices USB: gadget: f_audio_source: New gadget driver for audio output
Minsung Kim (6): cpufreq: interactive: allow arbitrary speed / delay mappings cpufreq: interactive: fix uninitialized spinlock cpufreq: interactive: avoid underflow on active time calculation cpufreq: interactive: fix show_target_loads and show_above_hispeed_delay cpufreq: interactive: fix NULL pointer dereference at sysfs ops cpufreq: interactive: don't skip waking up speedchange_task if target_freq > policy->cur
Mohamad Ayyash (1): xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
Nick Pelly (1): rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Nishanth Menon (1): panic: Add board ID to panic output
Peter Oh (1): USB: remove duplicate out endpoint creation in MTP mode
Pontus Fuchs (1): netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
Praneeth Bajjuri (1): usb: u_ether: Fix compile errors
Qiao Zhou (1): drivers: switch: remove S_IWUSR from dev_attr
Rajmal Menariya (1): ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool)
Rebecca Schultz Zavin (1): mm: vmscan: Add a debug file for shrinkers
Rik van Riel (1): add extra free kbytes tunable
Riley Andrews (2): sched: add sched blocked tracepoint which dumps out context of sleep. android: drivers: workaround debugfs race in binder
Robert Love (4): Add android_aid.h Paranoid network. sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size net: socket ioctl to reset connections matching local address
Rohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Rom Lemarchand (11): staging: android: ashmem: add missing include cgroup: refactor allow_attach function into common code memcg: add permission check cgroup: Fix issues in allow_attach callback proc: make oom adjustment files user read-only initramfs: Add skip_initramfs command line option kbuild: make it possible to specify the module output dir android: configs: Initial commit of Android config fragments android: configs: Enable KSM support by default android: configs: update 3.10 options android: configs: add systrace support to recommended configs
Ruchi Kandoi (23): nf: IDLETIMER: time-stamp and suspend/resume handling. nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35 nf: IDLETIMER: Adds the uid field in the msg cpufreq: interactive: turn boost_pulse off on boost off cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5 cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency. trace: cpufreq: Add tracing for min/max cpufreq Power: add an API to log wakeup reasons POWER: fix compile warnings in log_wakeup_reason Power: Add guard condition for maximum wakeup reasons Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason power: Avoids bogus error messages for the suspend aborts. power: Adds functionality to log the last suspend abort reason. wakeup: Add last wake up source logging for suspend abort reason. wakeup_reason: use vsnprintf instead of snsprintf for vargs. prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread. prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID. uid_cputime: Extends the cputime functionality to report power per uid uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit. uid_cputime: Iterates over all the threads instead of processes. uid_cputime: Check for the range while removing range of UIDs. Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854" wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current governor
Sami Tolvanen (1): android: add CONFIG_DEBUG_RODATA to recommended config
San Mehat (12): mmc: Add status IRQ and status callback function to mmc platform data mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection mmc: sd: When resuming, try a little harder to init the card mmc: sd: Add retries in re-detection mmc: Add concept of an 'embedded' SDIO device. mmc: core: Hold a wake lock accross delayed work + mmc rescan mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device fs: block_dump: Don't display inode changes if block_dump < 2 block: genhd: Add disk/partition specific uevent callbacks for partition info proc: smaps: Allow smaps access for CAP_SYS_RESOURCE process: Add display of memory around registers when displaying regs. serial_core: Add wake_peer uart operation
Saravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Sherman Yin (1): netfilter: fix seq_printf type mismatch warning
Shridhar Rasal (1): cpufreq: interactive: delete timers for GOV_START
Sreeram Ramachandran (1): net: core: Handle 'sk' being NULL in UID-based routing
Stephen Smalley (2): SELinux: Enable setting security contexts on rootfs inodes. android: configs: Enable SELinux and its dependencies.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
Todd Poynor (55): gpio_input: convert from wakelocks to wakeup sources USB: OTG: Take wakelock when VBUS present usb: otg: Temporarily grab wakelock on charger and disconnect events usb: gadget: accessory: Fix section mismatch (again) ARM: kgdb: ignore breakpoint instructions from user mode Move x86_64 idle notifiers to generic ARM: Call idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not current cpufreq: interactive: set at least hispeed when above hispeed load cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above hispeed cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not actual cpufreq: interactive: Separate speed target revalidate time and initial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from userspace cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each hispeed load cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime task cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load is low cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry cpufreq: interactive: trace actual speed in target speed decisions cpufreq: interactive: change speed according to current speed and target load cpufreq: interactive: apply above_hispeed_delay to each step above hispeed cpufreq: interactive: allow arbitrary speed / target load mappings cpufreq: interactive: remove load since last speed change cpufreq: interactive: adjust load for changes in speed cpufreq: interactive: specify duration of CPU speed boost pulse cpufreq: interactive: add timer slack to limit idle at speed > min cpufreq: interactive: fix boosting logic cpufreq: interactive: fix racy timer stopping cpufreq: interactive: fix race on timer restart on governor start cpufreq: interactive: default go_hispeed_load 99%, doc updates cpufreq: interactive: init default values at compile time cpufreq: interactive: don't handle transition notification if not enabled cpufreq: interactive: fix deadlock on spinlock in timer cpufreq: interactive: fix crash on error paths in get_tokenized_data cpufreq: interactive: base above_hispeed_delay on target freq, not current cpufreq: interactive: handle errors from cpufreq_frequency_table_target cpufreq: interactive: reduce chance of zero time delta on load eval power_supply: Add custom property for USB High Current mode power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order power: power_supply: add POWER_SUPPLY_PROP_USB_OTG power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED PM / Suspend: Print wall time at suspend entry and exit power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties fuse: Freeze client on suspend when request sent to userspace w1: ds2482: Manage SLPZ pin sleep state
Tony Lindgren (1): ARM: Make low-level printk work
Tushar Behera (2): tcp: Fix IPV6 module build errors security: Add proper checks for Android specific capability checks
Ulf Hansson (1): Revert "mmc: block: don't use parameter prefix if built as module"
Vinil Cheeramvelil (1): ion: Handle the memory mapping correctly on x86
Viresh Kumar (4): cpufreq: interactive: Remove unnecessary cpu_online() check cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards cpufreq: Interactive: Implement per policy instances of governor cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()
dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.
jinqian (2): Power: Report suspend times from last_suspend_time proc: uid: Adds accounting for the cputimes per uid.
keunyoung (1): fix false disconnect due to a signal sent to the reading process
liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update
rahul.khandelwal (1): subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
taeju.park (1): usb: gadget: prevent change of Host MAC address of 'usb0' interface
xerox_lin (3): USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG usb: Add support for rndis uplink aggregation USB: gadget: rndis: Add module parameter for DL max packets per xfer
Documentation/ABI/testing/sysfs-class-dual-role-usb | 71 ++ Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + Documentation/android.txt | 121 ++++ Documentation/cgroups/cgroups.txt | 9 + Documentation/cpu-freq/governors.txt | 85 +++ Documentation/devicetree/bindings/misc/ramoops.txt | 43 ++ Documentation/filesystems/proc.txt | 6 + Documentation/networking/ip-sysctl.txt | 10 + Documentation/ramoops.txt | 6 +- Documentation/sync.txt | 75 +++ Documentation/sysctl/vm.txt | 45 ++ Documentation/trace/events-power.txt | 1 + Documentation/trace/ftrace.txt | 29 + android/configs/README | 15 + android/configs/android-base.cfg | 162 +++++ android/configs/android-recommended.cfg | 127 ++++ arch/Kconfig | 68 ++ arch/arm/Kconfig | 33 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 5 + arch/arm/boot/.gitignore | 1 + arch/arm/boot/Makefile | 13 + arch/arm/boot/compressed/head.S | 2 + arch/arm/boot/dts/Makefile | 12 +- arch/arm/common/Kconfig | 4 + arch/arm/common/Makefile | 1 + arch/arm/common/fiq_glue.S | 118 ++++ arch/arm/common/fiq_glue_setup.c | 147 +++++ arch/arm/include/asm/fiq_glue.h | 33 + arch/arm/include/asm/mach/mmc.h | 28 + arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/kgdb.c | 4 + arch/arm/kernel/process.c | 75 +++ arch/arm/kernel/reboot.c | 30 + arch/arm/mm/cache-v6.S | 17 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/mmap.c | 3 +- arch/arm64/Kconfig | 66 ++ arch/arm64/Makefile | 9 + arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 13 + arch/arm64/boot/dts/Makefile | 14 + arch/arm64/kernel/process.c | 66 ++ arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 + arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- arch/x86/mm/mmap.c | 12 +- block/genhd.c | 17 + block/partition-generic.c | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/android/binder.c | 26 +- drivers/base/power/main.c | 48 ++ drivers/base/power/wakeup.c | 32 + drivers/base/syscore.c | 3 + drivers/char/Kconfig | 4 + drivers/char/Makefile | 1 + drivers/char/dcc_tty.c | 326 +++++++++ drivers/cpufreq/Kconfig | 24 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_interactive.c | 1360 ++++++++++++++++++++++++++++++++++++++ drivers/cpuidle/governors/menu.c | 7 +- drivers/dma-buf/fence.c | 6 +- drivers/hid/hid-multitouch.c | 10 + drivers/hid/hid-steelseries.c | 5 + drivers/input/Kconfig | 13 + drivers/input/Makefile | 3 + drivers/input/keycombo.c | 261 ++++++++ drivers/input/keyreset.c | 145 ++++ drivers/input/misc/Kconfig | 16 + drivers/input/misc/Makefile | 2 + drivers/input/misc/gpio_axis.c | 192 ++++++ drivers/input/misc/gpio_event.c | 228 +++++++ drivers/input/misc/gpio_input.c | 390 +++++++++++ drivers/input/misc/gpio_matrix.c | 441 +++++++++++++ drivers/input/misc/gpio_output.c | 97 +++ drivers/input/misc/keychord.c | 391 +++++++++++ drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/uid_cputime.c | 240 +++++++ drivers/misc/uid_stat.c | 153 +++++ drivers/mmc/card/block.c | 25 +- drivers/mmc/core/Kconfig | 15 + drivers/mmc/core/core.c | 54 +- drivers/mmc/core/host.c | 7 +- drivers/mmc/core/sd.c | 83 ++- drivers/mmc/core/sdio.c | 112 +++- drivers/mmc/core/sdio_bus.c | 13 +- drivers/mmc/core/sdio_io.c | 33 + drivers/mtd/nand/Kconfig | 10 +- drivers/net/ppp/Kconfig | 17 + drivers/net/ppp/Makefile | 2 + drivers/net/ppp/pppolac.c | 449 +++++++++++++ drivers/net/ppp/pppopns.c | 428 ++++++++++++ drivers/net/tun.c | 6 + drivers/of/fdt.c | 68 +- drivers/platform/Kconfig | 2 - drivers/platform/goldfish/Kconfig | 18 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 176 +++-- drivers/power/power_supply_sysfs.c | 11 +- drivers/rtc/rtc-palmas.c | 44 +- drivers/staging/android/Kconfig | 11 + drivers/staging/android/Makefile | 1 + drivers/staging/android/ashmem.c | 30 +- drivers/staging/android/fiq_debugger/Kconfig | 49 ++ drivers/staging/android/fiq_debugger/Makefile | 4 + drivers/staging/android/fiq_debugger/fiq_debugger.c | 1212 ++++++++++++++++++++++++++++++++++ drivers/staging/android/fiq_debugger/fiq_debugger.h | 64 ++ drivers/staging/android/fiq_debugger/fiq_debugger_arm.c | 240 +++++++ drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c | 202 ++++++ drivers/staging/android/fiq_debugger/fiq_debugger_priv.h | 37 ++ drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h | 94 +++ drivers/staging/android/fiq_debugger/fiq_watchdog.c | 56 ++ drivers/staging/android/fiq_debugger/fiq_watchdog.h | 20 + drivers/staging/android/ion/Kconfig | 7 + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/ion/ion_page_pool.c | 8 + drivers/staging/android/ion/ion_priv.h | 34 + drivers/staging/android/ion/ion_system_heap.c | 8 +- drivers/staging/android/lowmemorykiller.c | 114 +++- drivers/staging/android/sync.c | 14 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/staging/android/uapi/ashmem.h | 1 + drivers/switch/Kconfig | 15 + drivers/switch/Makefile | 4 + drivers/switch/switch_class.c | 174 +++++ drivers/switch/switch_gpio.c | 172 +++++ drivers/tty/serial/serial_core.c | 3 + drivers/usb/gadget/Kconfig | 50 ++ drivers/usb/gadget/composite.c | 6 + drivers/usb/gadget/configfs.c | 262 +++++++- drivers/usb/gadget/function/Makefile | 8 + drivers/usb/gadget/function/f_accessory.c | 1328 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_audio_source.c | 1054 +++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_midi.c | 65 ++ drivers/usb/gadget/function/f_mtp.c | 1434 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_mtp.h | 18 + drivers/usb/gadget/function/f_ptp.c | 38 ++ drivers/usb/gadget/function/f_rndis.c | 30 + drivers/usb/gadget/function/rndis.c | 112 +++- drivers/usb/gadget/function/rndis.h | 2 + drivers/usb/gadget/function/u_ether.c | 325 +++++++-- drivers/usb/gadget/function/u_ether.h | 3 + drivers/usb/gadget/functions.c | 2 +- drivers/usb/phy/Kconfig | 17 + drivers/usb/phy/Makefile | 2 + drivers/usb/phy/class-dual-role.c | 529 +++++++++++++++ drivers/usb/phy/otg-wakelock.c | 173 +++++ drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/adf/Kconfig | 14 + drivers/video/adf/Makefile | 15 + drivers/video/adf/adf.c | 1188 +++++++++++++++++++++++++++++++++ drivers/video/adf/adf.h | 71 ++ drivers/video/adf/adf_client.c | 811 +++++++++++++++++++++++ drivers/video/adf/adf_fbdev.c | 665 +++++++++++++++++++ drivers/video/adf/adf_fops.c | 957 +++++++++++++++++++++++++++ drivers/video/adf/adf_fops.h | 37 ++ drivers/video/adf/adf_fops32.c | 217 ++++++ drivers/video/adf/adf_fops32.h | 78 +++ drivers/video/adf/adf_format.c | 280 ++++++++ drivers/video/adf/adf_memblock.c | 166 +++++ drivers/video/adf/adf_sysfs.c | 296 +++++++++ drivers/video/adf/adf_sysfs.h | 33 + drivers/video/adf/adf_trace.h | 93 +++ drivers/w1/masters/ds2482.c | 47 +- fs/eventpoll.c | 4 +- fs/ext4/ext4.h | 3 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 28 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 5 +- fs/proc/base.c | 8 +- fs/proc/task_mmu.c | 62 ++ fs/pstore/ram.c | 116 +++- fs/super.c | 2 +- fs/userfaultfd.c | 9 +- include/linux/Kbuild | 2 + include/linux/amba/mmci.h | 13 + include/linux/android_aid.h | 28 + include/linux/cgroup-defs.h | 1 + include/linux/cgroup.h | 14 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/linux/fence.h | 2 + include/linux/gpio_event.h | 170 +++++ include/linux/if_pppolac.h | 23 + include/linux/if_pppopns.h | 23 + include/linux/if_pppox.h | 21 + include/linux/initramfs.h | 32 + include/linux/ipv6.h | 1 + include/linux/kernel.h | 4 + include/linux/keychord.h | 23 + include/linux/keycombo.h | 36 + include/linux/keyreset.h | 29 + include/linux/mm.h | 14 +- include/linux/mm_types.h | 24 +- include/linux/mmc/host.h | 17 + include/linux/mmc/pm.h | 1 + include/linux/mmc/sdio_func.h | 10 + include/linux/netfilter/xt_qtaguid.h | 13 + include/linux/netfilter/xt_quota2.h | 25 + include/linux/nmi.h | 5 +- include/linux/of_fdt.h | 21 + include/linux/platform_data/ds2482.h | 21 + include/linux/power_supply.h | 8 + include/linux/pstore_ram.h | 2 + include/linux/serial_core.h | 1 + include/linux/socket.h | 4 + include/linux/suspend.h | 1 + include/linux/switch.h | 53 ++ include/linux/uid_stat.h | 29 + include/linux/usb/class-dual-role.h | 128 ++++ include/linux/usb/composite.h | 1 + include/linux/usb/f_accessory.h | 23 + include/linux/usb/f_mtp.h | 23 + include/linux/wakelock.h | 67 ++ include/linux/wakeup_reason.h | 27 + include/linux/wlan_plat.h | 30 + include/net/activity_stats.h | 25 + include/net/addrconf.h | 2 + include/net/fib_rules.h | 5 + include/net/flow.h | 9 +- include/net/ip.h | 1 + include/net/ip6_route.h | 2 +- include/net/route.h | 6 +- include/net/tcp.h | 3 + include/trace/events/cpufreq_interactive.h | 112 ++++ include/trace/events/gpu.h | 143 ++++ include/trace/events/mmc.h | 91 +++ include/trace/events/power.h | 44 ++ include/trace/events/sched.h | 51 +- include/uapi/linux/fib_rules.h | 2 + include/uapi/linux/fs.h | 2 + include/uapi/linux/if_pppolac.h | 33 + include/uapi/linux/if_pppopns.h | 32 + include/uapi/linux/if_pppox.h | 6 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/keychord.h | 52 ++ include/uapi/linux/netfilter/xt_IDLETIMER.h | 8 + include/uapi/linux/netfilter/xt_socket.h | 7 + include/uapi/linux/prctl.h | 9 + include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/sockios.h | 1 + include/uapi/linux/usb/f_accessory.h | 146 ++++ include/uapi/linux/usb/f_mtp.h | 61 ++ include/uapi/video/adf.h | 321 +++++++++ include/video/adf.h | 502 ++++++++++++++ include/video/adf_client.h | 61 ++ include/video/adf_fbdev.h | 124 ++++ include/video/adf_format.h | 26 + include/video/adf_memblock.h | 20 + init/Makefile | 3 - init/initramfs.c | 19 +- init/noinitramfs.c | 9 +- kernel/cgroup.c | 59 +- kernel/cpu.c | 24 + kernel/debug/kdb/kdb_io.c | 12 +- kernel/fork.c | 3 +- kernel/panic.c | 8 + kernel/power/Kconfig | 9 + kernel/power/Makefile | 2 + kernel/power/process.c | 22 +- kernel/power/suspend.c | 35 +- kernel/power/wakeup_reason.c | 225 +++++++ kernel/printk/printk.c | 8 + kernel/sched/core.c | 15 +- kernel/sched/fair.c | 1 + kernel/sys.c | 173 +++++ kernel/sysctl.c | 31 + kernel/trace/Kconfig | 3 + kernel/trace/Makefile | 1 + kernel/trace/gpu-traces.c | 23 + kernel/trace/trace.c | 98 ++- kernel/trace/trace.h | 4 +- kernel/trace/trace_functions_graph.c | 43 +- kernel/trace/trace_output.c | 184 +++++- kernel/watchdog.c | 123 +++- lib/Kconfig.debug | 14 +- mm/madvise.c | 2 +- mm/memcontrol.c | 21 +- mm/mempolicy.c | 3 +- mm/mlock.c | 2 +- mm/mmap.c | 51 +- mm/mprotect.c | 2 +- mm/page_alloc.c | 32 +- mm/shmem.c | 13 +- mm/vmscan.c | 43 ++ net/Kconfig | 14 + net/Makefile | 1 + net/activity_stats.c | 118 ++++ net/bluetooth/af_bluetooth.c | 29 + net/bridge/br_device.c | 11 +- net/core/fib_rules.c | 53 +- net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 20 +- net/ipv4/devinet.c | 8 +- net/ipv4/fib_frontend.c | 1 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 3 +- net/ipv4/route.c | 25 +- net/ipv4/syncookies.c | 5 +- net/ipv4/sysctl_net_ipv4.c | 22 + net/ipv4/sysfs_net_ipv4.c | 88 +++ net/ipv4/tcp.c | 133 ++++ net/ipv4/tcp_input.c | 1 + net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 39 +- net/ipv6/af_inet6.c | 38 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 1 + net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 13 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 + net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ping.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/route.c | 83 ++- net/ipv6/syncookies.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 1 + net/netfilter/Kconfig | 42 ++ net/netfilter/Makefile | 2 + net/netfilter/xt_IDLETIMER.c | 243 ++++++- net/netfilter/xt_qtaguid.c | 3033 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/netfilter/xt_qtaguid_internal.h | 352 ++++++++++ net/netfilter/xt_qtaguid_print.c | 566 ++++++++++++++++ net/netfilter/xt_qtaguid_print.h | 120 ++++ net/netfilter/xt_quota2.c | 382 +++++++++++ net/netfilter/xt_socket.c | 31 +- net/rfkill/Kconfig | 5 + net/rfkill/core.c | 4 +- net/wireless/scan.c | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 6 + scripts/Makefile.modinst | 2 +- security/commoncap.c | 11 + security/selinux/hooks.c | 7 + security/selinux/ss/avtab.c | 69 +- 349 files changed, 30285 insertions(+), 550 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-dual-role-usb create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons create mode 100644 Documentation/android.txt create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt create mode 100644 Documentation/sync.txt create mode 100644 android/configs/README create mode 100644 android/configs/android-base.cfg create mode 100644 android/configs/android-recommended.cfg create mode 100644 arch/arm/common/fiq_glue.S create mode 100644 arch/arm/common/fiq_glue_setup.c create mode 100644 arch/arm/include/asm/fiq_glue.h create mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 drivers/char/dcc_tty.c create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 drivers/input/keycombo.c create mode 100644 drivers/input/keyreset.c create mode 100644 drivers/input/misc/gpio_axis.c create mode 100644 drivers/input/misc/gpio_event.c create mode 100644 drivers/input/misc/gpio_input.c create mode 100644 drivers/input/misc/gpio_matrix.c create mode 100644 drivers/input/misc/gpio_output.c create mode 100644 drivers/input/misc/keychord.c create mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_stat.c create mode 100644 drivers/net/ppp/pppolac.c create mode 100644 drivers/net/ppp/pppopns.c create mode 100644 drivers/staging/android/fiq_debugger/Kconfig create mode 100644 drivers/staging/android/fiq_debugger/Makefile create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_priv.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.h create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 drivers/switch/Kconfig create mode 100644 drivers/switch/Makefile create mode 100644 drivers/switch/switch_class.c create mode 100644 drivers/switch/switch_gpio.c create mode 100644 drivers/usb/gadget/function/f_accessory.c create mode 100644 drivers/usb/gadget/function/f_audio_source.c create mode 100644 drivers/usb/gadget/function/f_mtp.c create mode 100644 drivers/usb/gadget/function/f_mtp.h create mode 100644 drivers/usb/gadget/function/f_ptp.c create mode 100644 drivers/usb/phy/class-dual-role.c create mode 100644 drivers/usb/phy/otg-wakelock.c create mode 100644 drivers/video/adf/Kconfig create mode 100644 drivers/video/adf/Makefile create mode 100644 drivers/video/adf/adf.c create mode 100644 drivers/video/adf/adf.h create mode 100644 drivers/video/adf/adf_client.c create mode 100644 drivers/video/adf/adf_fbdev.c create mode 100644 drivers/video/adf/adf_fops.c create mode 100644 drivers/video/adf/adf_fops.h create mode 100644 drivers/video/adf/adf_fops32.c create mode 100644 drivers/video/adf/adf_fops32.h create mode 100644 drivers/video/adf/adf_format.c create mode 100644 drivers/video/adf/adf_memblock.c create mode 100644 drivers/video/adf/adf_sysfs.c create mode 100644 drivers/video/adf/adf_sysfs.h create mode 100644 drivers/video/adf/adf_trace.h create mode 100644 include/linux/Kbuild create mode 100644 include/linux/android_aid.h create mode 100644 include/linux/gpio_event.h create mode 100644 include/linux/if_pppolac.h create mode 100644 include/linux/if_pppopns.h create mode 100644 include/linux/initramfs.h create mode 100644 include/linux/keychord.h create mode 100644 include/linux/keycombo.h create mode 100644 include/linux/keyreset.h create mode 100644 include/linux/netfilter/xt_qtaguid.h create mode 100644 include/linux/netfilter/xt_quota2.h create mode 100644 include/linux/platform_data/ds2482.h create mode 100644 include/linux/switch.h create mode 100644 include/linux/uid_stat.h create mode 100644 include/linux/usb/class-dual-role.h create mode 100644 include/linux/usb/f_accessory.h create mode 100644 include/linux/usb/f_mtp.h create mode 100644 include/linux/wakelock.h create mode 100644 include/linux/wakeup_reason.h create mode 100644 include/linux/wlan_plat.h create mode 100644 include/net/activity_stats.h create mode 100644 include/trace/events/cpufreq_interactive.h create mode 100644 include/trace/events/gpu.h create mode 100644 include/trace/events/mmc.h create mode 100644 include/uapi/linux/if_pppolac.h create mode 100644 include/uapi/linux/if_pppopns.h create mode 100644 include/uapi/linux/keychord.h create mode 100644 include/uapi/linux/usb/f_accessory.h create mode 100644 include/uapi/linux/usb/f_mtp.h create mode 100644 include/uapi/video/adf.h create mode 100644 include/video/adf.h create mode 100644 include/video/adf_client.h create mode 100644 include/video/adf_fbdev.h create mode 100644 include/video/adf_format.h create mode 100644 include/video/adf_memblock.h create mode 100644 kernel/power/wakeup_reason.c create mode 100644 kernel/trace/gpu-traces.c create mode 100644 net/activity_stats.c create mode 100644 net/ipv4/sysfs_net_ipv4.c create mode 100644 net/netfilter/xt_qtaguid.c create mode 100644 net/netfilter/xt_qtaguid_internal.h create mode 100644 net/netfilter/xt_qtaguid_print.c create mode 100644 net/netfilter/xt_qtaguid_print.h create mode 100644 net/netfilter/xt_quota2.c
On 18 February 2016 at 19:59, Alex Shi alex.shi@linaro.org wrote:
Thanks Amit, pulled on linux-linaro-lsk-v4.4-android.
Thanks Alex.
BTW, I saw some similar lsk/android related branches on your git tree, like linaro-android-3.14-lsk/lsk-v3.14-android, linux-linaro-lsk-v4.1-android
Is there any rule binds the names? :)
ahh you saw that too :). I thought I'll get away with that this time, one last time.
There are few original branches which other teams are pulling in their trees directly but they can not be cleanly updated and pulled into LSK. So I end up creating new branches for pull requests. But then some branch names are just too big to be put in single line for pull requests and hence breaking the pull requests. So I have to come up with a shorter name. To cut a long story short, I'll be using lsk-vX.YZ-android branch names for all future pull requests.
Regards, Amit Pundir
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Thanks! Alex
On 02/18/2016 03:50 AM, Amit Pundir wrote:
Hi Mark, Alex,
Please consider following linaro-android pull request (based on recently tagged android-4.4 stable kernel in AOSP) for "linux-linaro-lsk-v4.4-android" LSK branch.
This pull request is a simple merge of android-4.4 and linux-linaro-lsk-v4.4-android trees with no merge conflict, and it doesn't carry any additional linaro-android fixes for now.
Regards, Amit Pundir
The following changes since commit 34f6d2c9d12a97271d55c7b204443b2da9e6c29e:
Merge tag 'v4.4.1' into linux-linaro-lsk-v4.4 (2016-02-05 19:31:55 +0000)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.4-android
for you to fetch changes up to 02bbd06e489a9f56910973535152d3ec47f3fdcc:
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common (2016-02-18 00:20:12 +0530)
Alex Ray (1): ARM64: add option to build Image.gz/dtb combo
Alistair Strachan (2): video: adf: export the adf_attachment_allow symbol to modules. video: adf: use rb_erase in adf_obj_destroy.
Amit Pundir (40): lowmemorykiller: use module_param_cb instead of __module_param_call net: pppopns: pppolac: fix sendmsg function calls Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: PPPoPNS and PPPoLAC build fixes for 4.4 nf: IDLETIMER: Fix broken uid field in the msg net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled xt_qtaguid: fix broken uid/gid range check xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() netfilter: xt_qtaguid: xt_socket: build fixes netfilter: xt_qtaguid/socket: build fixes for 4.4 net: ipv6: fix virtual tunneling build usb: gadget: check for accessory device before disconnecting HIDs usb: gadget: fix NULL ptr derefer while symlinking PTP func usb: phy: fix dual role sysfs build if kernel modules are supported usb: gadget: configfs: handle gadget reset request for android usb: gadget: build audio_source function only if SND is enabled usb: gadget: cleanup: fix unused variable and function warnings usb: gadget: rndis: use %z format specifier for size_t usb: gadget: rndis: fix broken data aggregation build usb: gadget: rndis: fix broken build for 4.4 usb: gadget: u_ether: use %z format specifier for size_t cpufreq: interactive: replace strict_strtoul() with kstrtoul() cpufreq: interactive: build fixes for 4.4 video: adf: fix memblock build failure video: adf: build fixes for 4.1 misc seq_printf fixes for 4.4 power: wakeup_reason: fix suspend time reporting cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach cgroup: refactor allow_attach handler for 4.4 prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict proc: uid_cputime: create uids from kuids uid_cputime: skip power reporting per uid for now SELinux: build fix for 4.1 ion: fix page pool cache policy mm: private anonymous memory build fixes for 4.4 kbuild: Makefile.clean: make Kbuild and Makefile optional goldfish_bus: switch GOLDFISH_BUS config back to bool android: skip building drivers as modules android: configs: base: enable configfs gadget functions Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
Andrey Konovalov (1): Include if_pppolac.h and if_pppopns.h into header-y target
Anson Jacob (3): usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for acc_write usb: gadget: f_audio_source: change max ISO packet size usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor
Arun Bharadwaj (1): tracing/sched: Add trace events to track cpu hotplug.
Arve Hjønnevåg (24): PM / Sleep: Add wake lock api wrapper on top of wakeup sources staging: android: lowmemorykiller: Add config option to support oom_adj values Input: Generic GPIO Input device. input: Add keyreset driver. netfilter: xt_quota2: 3.10 fixes. netfilter: xt_qtaguid: 3.10 fixes net: activity_stats: Stop using obsolete create_proc_read_entry api usb: otg: otg-wakelock: Fix build for 3.7 usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8 ARM: Add fiq_glue ARM: fiq_debugger: Fix to compile on 3.7 ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs ARM: fiq_debugger: Update tty code for 3.9 ARM: fiq_glue: Add custom fiq return handler api. fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code fiq_debugger: Add fiq_watchdog_triggered api sched: Enable might_sleep before initializing drivers. misc: uidstat: Remove use of obsolete create_proc_read_entry api armv6 dcc tty driver Optionally flush entire dcache from v6_dma_flush_range ARM: Fix "Make low-level printk work" to use a separate config option ARM: decompressor: Flush tlb before swiching domain 0 to client mode pstore/ram: Add ramoops_console_write_buf api android: binder: More offset validation
Ashish Sharma (2): bridge: Have tx_bytes count headers like rx_bytes. android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
Badhri Jagan Sridharan (19): usb: u_ether: Add workqueue as bottom half handler for rx data path USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode RNDIS: Add Data aggregation (multi packet) support ndis: Add debug support to disable RNDIS Multipacket Feature usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION interface usb: gadget: configfs: Add usb_function ptr to fi struct usb: gadget: Add Uevent to notify userspace usb: gadget: f_audio_source:replace deprecated API usb: gadget: Add function devices to the parent usb:gadget:audio_source: Move to USB_FUNCTION API usb: gadget: Move gadget functions code usb: gadget: Accessory:Migrate to USB_FUNCTION API usb: gadget: Relocate f_accessory usb: gadget: Do not disconnect unregistered dev usb:gadget:Add "state" attribute to android_device usb: phy: Dual role sysfs class definition usb: gadget: Add device attribute to determine gadget state ANDROID: usb: gadget: create F_midi device cpufreq: interactive: restructure CPUFREQ_GOV_LIMITS
Benoit Goby (9): usb: gadget: mtp: Add MTP/PTP function usb: gadget: adb: Add ADB function usb: gadget: accessory: Add Android Accessory function usb: gadget: adb: Only enable the gadget when adbd is ready usb: otg: otg-wakelock: Fix build for 3.4 usb: gadget: accessory: Fix section mismatch usb: gadget: Fix android gadget driver build drivers: power: Add watchdog timer to catch drivers which lockup during suspend. ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
Chia-chi Yeh (7): security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). net: Only NET_ADMIN is allowed to fully control TUN interfaces. net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. net: add PPP on PPTP Network Server (PPPoPNS) driver. net: PPPoPNS and PPPoLAC fixes. net: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chih-Wei Huang (1): cpufreq: interactive: fix compiling warnings
Christian Poetzsch (2): Fix generic cgroup subsystem permission checks Fix for in kernel emergency remount when loop mounts are used
Colin Cross (35): lowmemorykiller: make default lowmemorykiller debug message useful input: misc: gpio_event: remove early suspend input: misc: keychord: move header to uapi mmc_block: Allow more than 8 partitions per card mmc: sdio: fix sdio_reset_comm() voltage selection Recreate asm/mach/mmc.h include file net: move PPPoLAC and PPPoPNS headers to uapi usb: otg: otg-wakelock: fix build for 3.3 usb: gadget: adb: allow freezing in adb_read usb: gadget: adb: do not set error flag when dequeuing req usb: gadget: f_mtp: move userspace interface to uapi usb: gadget: f_accessory: move userspace interface to uapi ARM: fiq_debugger: fix compiling for v3.3 ARM: fiq_debugger: add support for reboot commands ARM: fiq_debugger: add debug_putc ARM: fiq_debugger: add support for kgdb kdb: support new lines without carriage returns ARM: fiq_debugger: fix multiple consoles and make it a preferred console ARM: fiq_debugger: add process context reboot command ARM: fiq_debugger: lock between tty and console writes fiq_debugger: move into drivers/staging/android/fiq_debugger/ fiq_debugger: rename debug->fiq_debugger fiq_debugger: allow compiling without CONFIG_FIQ_GLUE fiq_debugger: use pt_regs for registers fiq_debugger: split arm support into fiq_debugger_arm.c fiq_debugger: add ARM64 support cpuidle: governor: menu: don't use loadavg trace: power: add trace_clock_set_parent cgroup: Add generic cgroup subsystem permission checks ARM: convert build of appended dtb zImage to list of dtbs ARM64: copy CONFIG_CMDLINE_EXTEND from ARM of: fix CONFIG_CMDLINE_EXTEND mm: add a field to store names for private anonymous memory hardlockup: detect hard lockups without NMIs using secondary cpus epoll: use freezable blocking call
Cylen Yao (1): cpufreq: interactive: make common_tunables static
Dan Willemsen (1): fixup! proc: make oom adjustment files user read-only
Daniel Chen (1): mmc: sdio: Add high speed support to sdio_reset_comm()
Daniel Rosenberg (5): input: add keycombo, a general key combo driver. input: Changed keyreset to act as a wrapper for keycombo. input: Made keyreset more robust include: linux: cgroup: Fix compiler warning staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
Dima Zavin (2): mtd: nand: Allow NAND chip ids to be included standalone. ARM: add option to flush console before reboot
Dmitry Shmidt (17): mmc: Add sdio_readb_ext() function mmc: sdio: Claim host in sdio_reset_comm() mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm() mmc: Add "ignore mmc pm notify" functionality ARM: Add 'card_present' state to mmc_platfrom_data tcp: fix tcp_default_init_rwnd() for 4.1 net: wireless: Decrease scan entry expiration to avoid stall results wlan: Create generic wlan platform data header network: wireless: Add get_mac_addr functionality to platform net: wireless: Add get_country_code functionality to platform Add flags parameter to get_country_code template wlan: Add get_wake_irq functionality trace: fix compilation for 4.1 power: Add check_wakeup_reason() to verify wakeup source irq cgroup: fix cgroup_taskset_for_each call in allow_attach() for 4.1 userfaultfd: Add missing vma_merge parameter android: configs: remove CONFIG_BATTERY_ANDROID=y
Dmitry Torokhov (4): net: fix iterating over hashtable in tcp_nuke_addr() net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash CHROMIUM: android: fix warning when releasing active sync point
Doug Anderson (1): of: Support CONFIG_CMDLINE_EXTEND config option
Dylan Reid (1): power: Remove HAS_WAKELOCK config and document WAKELOCK
Erik Gilling (2): sync: add Documentation/sync.txt ARM: add config option to build zImage/dtb combo
Fengguang Wu (1): goldfish: pipe: fix platform_no_drv_owner.cocci warnings
Greg Hackmann (38): netfilter: xt_qtaguid: fix memory leak in seq_file handlers netfilter: xt_qtaguid: 64-bit warning fixes drivers: usb: gadget: 64-bit related type fixes cpufreq: interactive: hold reference on global cpufreq kobject if needed video: add atomic display framework video: adf: add memblock helper video: adf: support "simple" buffers video: adf: add supported formats to adf_overlay_engine_data video: adf: add fbdev compatibility helper video: adf: add informational flags to interfaces video: adf: add helpers for validating custom formats video: adf: make dpms_state sysfs attribute writable video: adf: set default interface dpms_state to OFF video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers video: adf: make device node names less hierarchical video: adf: remove PAGE_SIZE from userspace-facing header video: adf: fix ADF_MAX_ATTACHMENTS declaration video: adf: validate dpms state passed to blank video: adf: fix fbdev blank -> dpms state mapping video: adf: define constants for device-custom ioctls video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions video: adf: fix compat ioctls calling ioctl with wrong cmd video: adf: use %zu when printing size_t video: adf: replace fbdev helper's open flag with refcount video: adf: ensure consistent alignment on userspace facing structs video: adf: document adf_format_validate_yuv's origin video: adf: add buffer padding quirk video: adf: adf_memblock_export symbol should be exported video: adf: memblock: map buffer for dma video: adf: fbdev: add stubs for kernels without ADF_FBDEV video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode() power: wakeup_reason: rename irq_count to irqcount arm64: check for upper PAGE_SHIFT bits in pfn_valid() arm64: process: dump memory around registers when displaying regs arch: arm64: force -fno-pic FROMLIST: pstore-ram: add Device Tree bindings android: base-cfg: enable ARMV8_DEPRECATED and subfeatures ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
Hosung Kim (1): mmc: sdio: Fix sdio_reset_comm for sync
Iliyan Malchev (1): ARM: Add generic fiq serial debugger
JP Abgrall (29): input: misc: keychord: log when keychord triggered net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU netfilter: add xt_qtaguid matching module netfilter: adding the original quota2 from xtables-addons netfilter: fixup the quota2, and enable. netfilter: qtaguid: initialize a local var to keep compiler happy. netfilter: xt_qtaguid: fix ipv6 protocol lookup netfilter: xt_IDLETIMER: Add new netlink msg type netfilter: xt_qtaguid: start tracking iface rx/tx at low level netfilter: xt_qtaguid: report only uid tags to non-privileged processes netfilter: xt_qtaguid: fix error exit that would keep a spinlock. netfilter: xt_qtaguid: remove AID_* dependency for access control netfilter: xt_qtaguid: extend iface stat to report protocols netfilter: xt_qtaguid: Allow tracking loopback netfilter: qtaguid: rate limit some of the printks netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling netfilter: ipv6: fix crash caused by ipv6_find_hdr() tcp: add a sysctl to config the tcp_default_init_rwnd misc: uidstat: avoid create_stat() race and blockage. ARM: fault: assume no context when IRQs are disabled during data abort. ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim android: configs: Reorder config fragments android: configs: no MODULES for base, no SIP for recommended android: configs: Reorder config fragments, update README android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS android: configs: add TIMER_STATS back, helps with sysrq t. android: configs: add IPV6 ROUTE INFO android: base-cfg: enable DM_VERITY (used for secureboot) android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
Jamie Gennis (4): trace/events: add gpu trace events trace: Add an option to show tgids in trace output trace: add non-hierarchical function_graph option trace/events: fix gpu event timestamp formatting
Jeff Brown (1): hid-multitouch: Filter collections by application usage.
Jeff Vander Stoep (2): selinux: Android kernel compatibility with M userspace arm64 Kconfig: Move LIST_POISON to a safe value
Jin Qian (3): proc: uid_cputime: fix show_uid_stat permission uid_cputime: fix cputime overflow arm64: pass return address to dma_common_contiguous_remap
John Stultz (10): ashmem: Add shmem_set_file to mm/shmem.c mmc: Extend wakelock if bus is dead mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies net: kuid/kguid build fixes netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk fiq_debugger: Build fixes for 4.1 cpufreq-interactive: Compile fixup arm: dcc_tty: fix armv6 dcc tty build failure of: Fix build warnings pstore: Update Documentation/android.txt
Jon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready
Jon Medhurst (Tixy) (1): xt_qtaguid: Fix boot panic
Jonathan Hamilton (1): video: adf: Cleanup sw_sync timeline at adf_device_destroy
Junjie Wu (4): cpufreq: interactive: Put global cpufreq kobject on failure cpufreq: interactive: Don't set floor_validate_time during boost cpufreq: interactive: Round up timer_rate to match jiffy cpufreq: interactive: Implement cluster-based min_sample_time
Kees Cook (1): HID: steelseries: validate output report details
Ken Sumrall (2): mmc: block: Improve logging of handling emmc timeouts mmc: Add tracepoints of mmc block operations
Kevin Hilman (1): android: configs: base: enable IPV6
Laura Abbott (1): staging: android: ashmem: Avoid deadlock with mmap/shrink
Lianwei Wang (6): cpufreq: interactive: use deferrable timer by default cpufreq: interactive: fix race on governor start/stop cpufreq: interactive: add io_is_busy interface cpufreq: interactive: fix race on cpufreq TRANSITION notifier cpufreq: interactive: resched timer if max freq raised cpufreq: interactive: only boost tunable affected cpus
Lizhe Liu (1): Enable adb with android-pipe in IA image
Lorenzo Colitti (5): net: ipv6: autoconf routes into per-device tables net: core: Support UID-based routing. net: support marking accepting TCP sockets Don't kill IPv4 sockets when killing IPv6 sockets was requested. Make suspend abort reason logging depend on CONFIG_PM_SLEEP
Mark Salyzyn (6): ANDROID: rtc-palmas: correct for bcd year android: base-cfg: disable LOGGER android: base-cfg: turn off /dev/mem and /dev/kmem android: base-cfg: disable ALARM_DEV android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST
Mars (1): ARM: fiq_debugger: fix uninitialised spin_lock.
Martijn Coenen (2): lowmemorykiller: trace kill events. UPSTREAM: memcg: Only free spare array when readers are done
Micha Kalfon (2): prctl: fix misplaced PR_SET_TIMERSLACK_PID case prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Michael Wright (2): android: configs: Add Logitech unifying receivers to recommended android: configs: Add HIDRAW to recommended set
Mike Chan (4): android: Add android config documentation to boot framework. misc: uidstat: Adding uid stat driver to collect network statistics. net: activity_stats: Add statistics for network transmission activity cpufreq: interactive: New 'interactive' governor
Mike Lockwood (5): switch: switch class and GPIO drivers. input: keychord: Add keychord driver USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctl USB: gadget: f_accessory: Add support for HID input devices USB: gadget: f_audio_source: New gadget driver for audio output
Minsung Kim (6): cpufreq: interactive: allow arbitrary speed / delay mappings cpufreq: interactive: fix uninitialized spinlock cpufreq: interactive: avoid underflow on active time calculation cpufreq: interactive: fix show_target_loads and show_above_hispeed_delay cpufreq: interactive: fix NULL pointer dereference at sysfs ops cpufreq: interactive: don't skip waking up speedchange_task if target_freq > policy->cur
Mohamad Ayyash (1): xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
Nick Pelly (1): rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Nishanth Menon (1): panic: Add board ID to panic output
Peter Oh (1): USB: remove duplicate out endpoint creation in MTP mode
Pontus Fuchs (1): netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
Praneeth Bajjuri (1): usb: u_ether: Fix compile errors
Qiao Zhou (1): drivers: switch: remove S_IWUSR from dev_attr
Rajmal Menariya (1): ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool)
Rebecca Schultz Zavin (1): mm: vmscan: Add a debug file for shrinkers
Rik van Riel (1): add extra free kbytes tunable
Riley Andrews (2): sched: add sched blocked tracepoint which dumps out context of sleep. android: drivers: workaround debugfs race in binder
Robert Love (4): Add android_aid.h Paranoid network. sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size net: socket ioctl to reset connections matching local address
Rohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Rom Lemarchand (11): staging: android: ashmem: add missing include cgroup: refactor allow_attach function into common code memcg: add permission check cgroup: Fix issues in allow_attach callback proc: make oom adjustment files user read-only initramfs: Add skip_initramfs command line option kbuild: make it possible to specify the module output dir android: configs: Initial commit of Android config fragments android: configs: Enable KSM support by default android: configs: update 3.10 options android: configs: add systrace support to recommended configs
Ruchi Kandoi (23): nf: IDLETIMER: time-stamp and suspend/resume handling. nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35 nf: IDLETIMER: Adds the uid field in the msg cpufreq: interactive: turn boost_pulse off on boost off cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5 cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency. trace: cpufreq: Add tracing for min/max cpufreq Power: add an API to log wakeup reasons POWER: fix compile warnings in log_wakeup_reason Power: Add guard condition for maximum wakeup reasons Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason power: Avoids bogus error messages for the suspend aborts. power: Adds functionality to log the last suspend abort reason. wakeup: Add last wake up source logging for suspend abort reason. wakeup_reason: use vsnprintf instead of snsprintf for vargs. prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread. prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID. uid_cputime: Extends the cputime functionality to report power per uid uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit. uid_cputime: Iterates over all the threads instead of processes. uid_cputime: Check for the range while removing range of UIDs. Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854" wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current governor
Sami Tolvanen (1): android: add CONFIG_DEBUG_RODATA to recommended config
San Mehat (12): mmc: Add status IRQ and status callback function to mmc platform data mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection mmc: sd: When resuming, try a little harder to init the card mmc: sd: Add retries in re-detection mmc: Add concept of an 'embedded' SDIO device. mmc: core: Hold a wake lock accross delayed work + mmc rescan mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device fs: block_dump: Don't display inode changes if block_dump < 2 block: genhd: Add disk/partition specific uevent callbacks for partition info proc: smaps: Allow smaps access for CAP_SYS_RESOURCE process: Add display of memory around registers when displaying regs. serial_core: Add wake_peer uart operation
Saravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Sherman Yin (1): netfilter: fix seq_printf type mismatch warning
Shridhar Rasal (1): cpufreq: interactive: delete timers for GOV_START
Sreeram Ramachandran (1): net: core: Handle 'sk' being NULL in UID-based routing
Stephen Smalley (2): SELinux: Enable setting security contexts on rootfs inodes. android: configs: Enable SELinux and its dependencies.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
Todd Poynor (55): gpio_input: convert from wakelocks to wakeup sources USB: OTG: Take wakelock when VBUS present usb: otg: Temporarily grab wakelock on charger and disconnect events usb: gadget: accessory: Fix section mismatch (again) ARM: kgdb: ignore breakpoint instructions from user mode Move x86_64 idle notifiers to generic ARM: Call idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not current cpufreq: interactive: set at least hispeed when above hispeed load cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above hispeed cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not actual cpufreq: interactive: Separate speed target revalidate time and initial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from userspace cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each hispeed load cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime task cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load is low cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry cpufreq: interactive: trace actual speed in target speed decisions cpufreq: interactive: change speed according to current speed and target load cpufreq: interactive: apply above_hispeed_delay to each step above hispeed cpufreq: interactive: allow arbitrary speed / target load mappings cpufreq: interactive: remove load since last speed change cpufreq: interactive: adjust load for changes in speed cpufreq: interactive: specify duration of CPU speed boost pulse cpufreq: interactive: add timer slack to limit idle at speed > min cpufreq: interactive: fix boosting logic cpufreq: interactive: fix racy timer stopping cpufreq: interactive: fix race on timer restart on governor start cpufreq: interactive: default go_hispeed_load 99%, doc updates cpufreq: interactive: init default values at compile time cpufreq: interactive: don't handle transition notification if not enabled cpufreq: interactive: fix deadlock on spinlock in timer cpufreq: interactive: fix crash on error paths in get_tokenized_data cpufreq: interactive: base above_hispeed_delay on target freq, not current cpufreq: interactive: handle errors from cpufreq_frequency_table_target cpufreq: interactive: reduce chance of zero time delta on load eval power_supply: Add custom property for USB High Current mode power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order power: power_supply: add POWER_SUPPLY_PROP_USB_OTG power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED PM / Suspend: Print wall time at suspend entry and exit power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties fuse: Freeze client on suspend when request sent to userspace w1: ds2482: Manage SLPZ pin sleep state
Tony Lindgren (1): ARM: Make low-level printk work
Tushar Behera (2): tcp: Fix IPV6 module build errors security: Add proper checks for Android specific capability checks
Ulf Hansson (1): Revert "mmc: block: don't use parameter prefix if built as module"
Vinil Cheeramvelil (1): ion: Handle the memory mapping correctly on x86
Viresh Kumar (4): cpufreq: interactive: Remove unnecessary cpu_online() check cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards cpufreq: Interactive: Implement per policy instances of governor cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()
dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.
jinqian (2): Power: Report suspend times from last_suspend_time proc: uid: Adds accounting for the cputimes per uid.
keunyoung (1): fix false disconnect due to a signal sent to the reading process
liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update
rahul.khandelwal (1): subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
taeju.park (1): usb: gadget: prevent change of Host MAC address of 'usb0' interface
xerox_lin (3): USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG usb: Add support for rndis uplink aggregation USB: gadget: rndis: Add module parameter for DL max packets per xfer
Documentation/ABI/testing/sysfs-class-dual-role-usb | 71 ++ Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + Documentation/android.txt | 121 ++++ Documentation/cgroups/cgroups.txt | 9 + Documentation/cpu-freq/governors.txt | 85 +++ Documentation/devicetree/bindings/misc/ramoops.txt | 43 ++ Documentation/filesystems/proc.txt | 6 + Documentation/networking/ip-sysctl.txt | 10 + Documentation/ramoops.txt | 6 +- Documentation/sync.txt | 75 +++ Documentation/sysctl/vm.txt | 45 ++ Documentation/trace/events-power.txt | 1 + Documentation/trace/ftrace.txt | 29 + android/configs/README | 15 + android/configs/android-base.cfg | 162 +++++ android/configs/android-recommended.cfg | 127 ++++ arch/Kconfig | 68 ++ arch/arm/Kconfig | 33 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 5 + arch/arm/boot/.gitignore | 1 + arch/arm/boot/Makefile | 13 + arch/arm/boot/compressed/head.S | 2 + arch/arm/boot/dts/Makefile | 12 +- arch/arm/common/Kconfig | 4 + arch/arm/common/Makefile | 1 + arch/arm/common/fiq_glue.S | 118 ++++ arch/arm/common/fiq_glue_setup.c | 147 +++++ arch/arm/include/asm/fiq_glue.h | 33 + arch/arm/include/asm/mach/mmc.h | 28 + arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/kgdb.c | 4 + arch/arm/kernel/process.c | 75 +++ arch/arm/kernel/reboot.c | 30 + arch/arm/mm/cache-v6.S | 17 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/mmap.c | 3 +- arch/arm64/Kconfig | 66 ++ arch/arm64/Makefile | 9 + arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 13 + arch/arm64/boot/dts/Makefile | 14 + arch/arm64/kernel/process.c | 66 ++ arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 + arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- arch/x86/mm/mmap.c | 12 +- block/genhd.c | 17 + block/partition-generic.c | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/android/binder.c | 26 +- drivers/base/power/main.c | 48 ++ drivers/base/power/wakeup.c | 32 + drivers/base/syscore.c | 3 + drivers/char/Kconfig | 4 + drivers/char/Makefile | 1 + drivers/char/dcc_tty.c | 326 +++++++++ drivers/cpufreq/Kconfig | 24 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_interactive.c | 1360 ++++++++++++++++++++++++++++++++++++++ drivers/cpuidle/governors/menu.c | 7 +- drivers/dma-buf/fence.c | 6 +- drivers/hid/hid-multitouch.c | 10 + drivers/hid/hid-steelseries.c | 5 + drivers/input/Kconfig | 13 + drivers/input/Makefile | 3 + drivers/input/keycombo.c | 261 ++++++++ drivers/input/keyreset.c | 145 ++++ drivers/input/misc/Kconfig | 16 + drivers/input/misc/Makefile | 2 + drivers/input/misc/gpio_axis.c | 192 ++++++ drivers/input/misc/gpio_event.c | 228 +++++++ drivers/input/misc/gpio_input.c | 390 +++++++++++ drivers/input/misc/gpio_matrix.c | 441 +++++++++++++ drivers/input/misc/gpio_output.c | 97 +++ drivers/input/misc/keychord.c | 391 +++++++++++ drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/uid_cputime.c | 240 +++++++ drivers/misc/uid_stat.c | 153 +++++ drivers/mmc/card/block.c | 25 +- drivers/mmc/core/Kconfig | 15 + drivers/mmc/core/core.c | 54 +- drivers/mmc/core/host.c | 7 +- drivers/mmc/core/sd.c | 83 ++- drivers/mmc/core/sdio.c | 112 +++- drivers/mmc/core/sdio_bus.c | 13 +- drivers/mmc/core/sdio_io.c | 33 + drivers/mtd/nand/Kconfig | 10 +- drivers/net/ppp/Kconfig | 17 + drivers/net/ppp/Makefile | 2 + drivers/net/ppp/pppolac.c | 449 +++++++++++++ drivers/net/ppp/pppopns.c | 428 ++++++++++++ drivers/net/tun.c | 6 + drivers/of/fdt.c | 68 +- drivers/platform/Kconfig | 2 - drivers/platform/goldfish/Kconfig | 18 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 176 +++-- drivers/power/power_supply_sysfs.c | 11 +- drivers/rtc/rtc-palmas.c | 44 +- drivers/staging/android/Kconfig | 11 + drivers/staging/android/Makefile | 1 + drivers/staging/android/ashmem.c | 30 +- drivers/staging/android/fiq_debugger/Kconfig | 49 ++ drivers/staging/android/fiq_debugger/Makefile | 4 + drivers/staging/android/fiq_debugger/fiq_debugger.c | 1212 ++++++++++++++++++++++++++++++++++ drivers/staging/android/fiq_debugger/fiq_debugger.h | 64 ++ drivers/staging/android/fiq_debugger/fiq_debugger_arm.c | 240 +++++++ drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c | 202 ++++++ drivers/staging/android/fiq_debugger/fiq_debugger_priv.h | 37 ++ drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h | 94 +++ drivers/staging/android/fiq_debugger/fiq_watchdog.c | 56 ++ drivers/staging/android/fiq_debugger/fiq_watchdog.h | 20 + drivers/staging/android/ion/Kconfig | 7 + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/ion/ion_page_pool.c | 8 + drivers/staging/android/ion/ion_priv.h | 34 + drivers/staging/android/ion/ion_system_heap.c | 8 +- drivers/staging/android/lowmemorykiller.c | 114 +++- drivers/staging/android/sync.c | 14 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/staging/android/uapi/ashmem.h | 1 + drivers/switch/Kconfig | 15 + drivers/switch/Makefile | 4 + drivers/switch/switch_class.c | 174 +++++ drivers/switch/switch_gpio.c | 172 +++++ drivers/tty/serial/serial_core.c | 3 + drivers/usb/gadget/Kconfig | 50 ++ drivers/usb/gadget/composite.c | 6 + drivers/usb/gadget/configfs.c | 262 +++++++- drivers/usb/gadget/function/Makefile | 8 + drivers/usb/gadget/function/f_accessory.c | 1328 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_audio_source.c | 1054 +++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_midi.c | 65 ++ drivers/usb/gadget/function/f_mtp.c | 1434 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_mtp.h | 18 + drivers/usb/gadget/function/f_ptp.c | 38 ++ drivers/usb/gadget/function/f_rndis.c | 30 + drivers/usb/gadget/function/rndis.c | 112 +++- drivers/usb/gadget/function/rndis.h | 2 + drivers/usb/gadget/function/u_ether.c | 325 +++++++-- drivers/usb/gadget/function/u_ether.h | 3 + drivers/usb/gadget/functions.c | 2 +- drivers/usb/phy/Kconfig | 17 + drivers/usb/phy/Makefile | 2 + drivers/usb/phy/class-dual-role.c | 529 +++++++++++++++ drivers/usb/phy/otg-wakelock.c | 173 +++++ drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/adf/Kconfig | 14 + drivers/video/adf/Makefile | 15 + drivers/video/adf/adf.c | 1188 +++++++++++++++++++++++++++++++++ drivers/video/adf/adf.h | 71 ++ drivers/video/adf/adf_client.c | 811 +++++++++++++++++++++++ drivers/video/adf/adf_fbdev.c | 665 +++++++++++++++++++ drivers/video/adf/adf_fops.c | 957 +++++++++++++++++++++++++++ drivers/video/adf/adf_fops.h | 37 ++ drivers/video/adf/adf_fops32.c | 217 ++++++ drivers/video/adf/adf_fops32.h | 78 +++ drivers/video/adf/adf_format.c | 280 ++++++++ drivers/video/adf/adf_memblock.c | 166 +++++ drivers/video/adf/adf_sysfs.c | 296 +++++++++ drivers/video/adf/adf_sysfs.h | 33 + drivers/video/adf/adf_trace.h | 93 +++ drivers/w1/masters/ds2482.c | 47 +- fs/eventpoll.c | 4 +- fs/ext4/ext4.h | 3 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 28 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 5 +- fs/proc/base.c | 8 +- fs/proc/task_mmu.c | 62 ++ fs/pstore/ram.c | 116 +++- fs/super.c | 2 +- fs/userfaultfd.c | 9 +- include/linux/Kbuild | 2 + include/linux/amba/mmci.h | 13 + include/linux/android_aid.h | 28 + include/linux/cgroup-defs.h | 1 + include/linux/cgroup.h | 14 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/linux/fence.h | 2 + include/linux/gpio_event.h | 170 +++++ include/linux/if_pppolac.h | 23 + include/linux/if_pppopns.h | 23 + include/linux/if_pppox.h | 21 + include/linux/initramfs.h | 32 + include/linux/ipv6.h | 1 + include/linux/kernel.h | 4 + include/linux/keychord.h | 23 + include/linux/keycombo.h | 36 + include/linux/keyreset.h | 29 + include/linux/mm.h | 14 +- include/linux/mm_types.h | 24 +- include/linux/mmc/host.h | 17 + include/linux/mmc/pm.h | 1 + include/linux/mmc/sdio_func.h | 10 + include/linux/netfilter/xt_qtaguid.h | 13 + include/linux/netfilter/xt_quota2.h | 25 + include/linux/nmi.h | 5 +- include/linux/of_fdt.h | 21 + include/linux/platform_data/ds2482.h | 21 + include/linux/power_supply.h | 8 + include/linux/pstore_ram.h | 2 + include/linux/serial_core.h | 1 + include/linux/socket.h | 4 + include/linux/suspend.h | 1 + include/linux/switch.h | 53 ++ include/linux/uid_stat.h | 29 + include/linux/usb/class-dual-role.h | 128 ++++ include/linux/usb/composite.h | 1 + include/linux/usb/f_accessory.h | 23 + include/linux/usb/f_mtp.h | 23 + include/linux/wakelock.h | 67 ++ include/linux/wakeup_reason.h | 27 + include/linux/wlan_plat.h | 30 + include/net/activity_stats.h | 25 + include/net/addrconf.h | 2 + include/net/fib_rules.h | 5 + include/net/flow.h | 9 +- include/net/ip.h | 1 + include/net/ip6_route.h | 2 +- include/net/route.h | 6 +- include/net/tcp.h | 3 + include/trace/events/cpufreq_interactive.h | 112 ++++ include/trace/events/gpu.h | 143 ++++ include/trace/events/mmc.h | 91 +++ include/trace/events/power.h | 44 ++ include/trace/events/sched.h | 51 +- include/uapi/linux/fib_rules.h | 2 + include/uapi/linux/fs.h | 2 + include/uapi/linux/if_pppolac.h | 33 + include/uapi/linux/if_pppopns.h | 32 + include/uapi/linux/if_pppox.h | 6 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/keychord.h | 52 ++ include/uapi/linux/netfilter/xt_IDLETIMER.h | 8 + include/uapi/linux/netfilter/xt_socket.h | 7 + include/uapi/linux/prctl.h | 9 + include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/sockios.h | 1 + include/uapi/linux/usb/f_accessory.h | 146 ++++ include/uapi/linux/usb/f_mtp.h | 61 ++ include/uapi/video/adf.h | 321 +++++++++ include/video/adf.h | 502 ++++++++++++++ include/video/adf_client.h | 61 ++ include/video/adf_fbdev.h | 124 ++++ include/video/adf_format.h | 26 + include/video/adf_memblock.h | 20 + init/Makefile | 3 - init/initramfs.c | 19 +- init/noinitramfs.c | 9 +- kernel/cgroup.c | 59 +- kernel/cpu.c | 24 + kernel/debug/kdb/kdb_io.c | 12 +- kernel/fork.c | 3 +- kernel/panic.c | 8 + kernel/power/Kconfig | 9 + kernel/power/Makefile | 2 + kernel/power/process.c | 22 +- kernel/power/suspend.c | 35 +- kernel/power/wakeup_reason.c | 225 +++++++ kernel/printk/printk.c | 8 + kernel/sched/core.c | 15 +- kernel/sched/fair.c | 1 + kernel/sys.c | 173 +++++ kernel/sysctl.c | 31 + kernel/trace/Kconfig | 3 + kernel/trace/Makefile | 1 + kernel/trace/gpu-traces.c | 23 + kernel/trace/trace.c | 98 ++- kernel/trace/trace.h | 4 +- kernel/trace/trace_functions_graph.c | 43 +- kernel/trace/trace_output.c | 184 +++++- kernel/watchdog.c | 123 +++- lib/Kconfig.debug | 14 +- mm/madvise.c | 2 +- mm/memcontrol.c | 21 +- mm/mempolicy.c | 3 +- mm/mlock.c | 2 +- mm/mmap.c | 51 +- mm/mprotect.c | 2 +- mm/page_alloc.c | 32 +- mm/shmem.c | 13 +- mm/vmscan.c | 43 ++ net/Kconfig | 14 + net/Makefile | 1 + net/activity_stats.c | 118 ++++ net/bluetooth/af_bluetooth.c | 29 + net/bridge/br_device.c | 11 +- net/core/fib_rules.c | 53 +- net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 20 +- net/ipv4/devinet.c | 8 +- net/ipv4/fib_frontend.c | 1 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 3 +- net/ipv4/route.c | 25 +- net/ipv4/syncookies.c | 5 +- net/ipv4/sysctl_net_ipv4.c | 22 + net/ipv4/sysfs_net_ipv4.c | 88 +++ net/ipv4/tcp.c | 133 ++++ net/ipv4/tcp_input.c | 1 + net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 39 +- net/ipv6/af_inet6.c | 38 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 1 + net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 13 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 + net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ping.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/route.c | 83 ++- net/ipv6/syncookies.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 1 + net/netfilter/Kconfig | 42 ++ net/netfilter/Makefile | 2 + net/netfilter/xt_IDLETIMER.c | 243 ++++++- net/netfilter/xt_qtaguid.c | 3033 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/netfilter/xt_qtaguid_internal.h | 352 ++++++++++ net/netfilter/xt_qtaguid_print.c | 566 ++++++++++++++++ net/netfilter/xt_qtaguid_print.h | 120 ++++ net/netfilter/xt_quota2.c | 382 +++++++++++ net/netfilter/xt_socket.c | 31 +- net/rfkill/Kconfig | 5 + net/rfkill/core.c | 4 +- net/wireless/scan.c | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 6 + scripts/Makefile.modinst | 2 +- security/commoncap.c | 11 + security/selinux/hooks.c | 7 + security/selinux/ss/avtab.c | 69 +- 349 files changed, 30285 insertions(+), 550 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-dual-role-usb create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons create mode 100644 Documentation/android.txt create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt create mode 100644 Documentation/sync.txt create mode 100644 android/configs/README create mode 100644 android/configs/android-base.cfg create mode 100644 android/configs/android-recommended.cfg create mode 100644 arch/arm/common/fiq_glue.S create mode 100644 arch/arm/common/fiq_glue_setup.c create mode 100644 arch/arm/include/asm/fiq_glue.h create mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 drivers/char/dcc_tty.c create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 drivers/input/keycombo.c create mode 100644 drivers/input/keyreset.c create mode 100644 drivers/input/misc/gpio_axis.c create mode 100644 drivers/input/misc/gpio_event.c create mode 100644 drivers/input/misc/gpio_input.c create mode 100644 drivers/input/misc/gpio_matrix.c create mode 100644 drivers/input/misc/gpio_output.c create mode 100644 drivers/input/misc/keychord.c create mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_stat.c create mode 100644 drivers/net/ppp/pppolac.c create mode 100644 drivers/net/ppp/pppopns.c create mode 100644 drivers/staging/android/fiq_debugger/Kconfig create mode 100644 drivers/staging/android/fiq_debugger/Makefile create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_priv.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.h create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 drivers/switch/Kconfig create mode 100644 drivers/switch/Makefile create mode 100644 drivers/switch/switch_class.c create mode 100644 drivers/switch/switch_gpio.c create mode 100644 drivers/usb/gadget/function/f_accessory.c create mode 100644 drivers/usb/gadget/function/f_audio_source.c create mode 100644 drivers/usb/gadget/function/f_mtp.c create mode 100644 drivers/usb/gadget/function/f_mtp.h create mode 100644 drivers/usb/gadget/function/f_ptp.c create mode 100644 drivers/usb/phy/class-dual-role.c create mode 100644 drivers/usb/phy/otg-wakelock.c create mode 100644 drivers/video/adf/Kconfig create mode 100644 drivers/video/adf/Makefile create mode 100644 drivers/video/adf/adf.c create mode 100644 drivers/video/adf/adf.h create mode 100644 drivers/video/adf/adf_client.c create mode 100644 drivers/video/adf/adf_fbdev.c create mode 100644 drivers/video/adf/adf_fops.c create mode 100644 drivers/video/adf/adf_fops.h create mode 100644 drivers/video/adf/adf_fops32.c create mode 100644 drivers/video/adf/adf_fops32.h create mode 100644 drivers/video/adf/adf_format.c create mode 100644 drivers/video/adf/adf_memblock.c create mode 100644 drivers/video/adf/adf_sysfs.c create mode 100644 drivers/video/adf/adf_sysfs.h create mode 100644 drivers/video/adf/adf_trace.h create mode 100644 include/linux/Kbuild create mode 100644 include/linux/android_aid.h create mode 100644 include/linux/gpio_event.h create mode 100644 include/linux/if_pppolac.h create mode 100644 include/linux/if_pppopns.h create mode 100644 include/linux/initramfs.h create mode 100644 include/linux/keychord.h create mode 100644 include/linux/keycombo.h create mode 100644 include/linux/keyreset.h create mode 100644 include/linux/netfilter/xt_qtaguid.h create mode 100644 include/linux/netfilter/xt_quota2.h create mode 100644 include/linux/platform_data/ds2482.h create mode 100644 include/linux/switch.h create mode 100644 include/linux/uid_stat.h create mode 100644 include/linux/usb/class-dual-role.h create mode 100644 include/linux/usb/f_accessory.h create mode 100644 include/linux/usb/f_mtp.h create mode 100644 include/linux/wakelock.h create mode 100644 include/linux/wakeup_reason.h create mode 100644 include/linux/wlan_plat.h create mode 100644 include/net/activity_stats.h create mode 100644 include/trace/events/cpufreq_interactive.h create mode 100644 include/trace/events/gpu.h create mode 100644 include/trace/events/mmc.h create mode 100644 include/uapi/linux/if_pppolac.h create mode 100644 include/uapi/linux/if_pppopns.h create mode 100644 include/uapi/linux/keychord.h create mode 100644 include/uapi/linux/usb/f_accessory.h create mode 100644 include/uapi/linux/usb/f_mtp.h create mode 100644 include/uapi/video/adf.h create mode 100644 include/video/adf.h create mode 100644 include/video/adf_client.h create mode 100644 include/video/adf_fbdev.h create mode 100644 include/video/adf_format.h create mode 100644 include/video/adf_memblock.h create mode 100644 kernel/power/wakeup_reason.c create mode 100644 kernel/trace/gpu-traces.c create mode 100644 net/activity_stats.c create mode 100644 net/ipv4/sysfs_net_ipv4.c create mode 100644 net/netfilter/xt_qtaguid.c create mode 100644 net/netfilter/xt_qtaguid_internal.h create mode 100644 net/netfilter/xt_qtaguid_print.c create mode 100644 net/netfilter/xt_qtaguid_print.h create mode 100644 net/netfilter/xt_quota2.c
There are few original branches which other teams are pulling in their trees directly but they can not be cleanly updated and pulled into LSK. So I end up creating new branches for pull requests. But then some branch names are just too big to be put in single line for pull requests and hence breaking the pull requests. So I have to come up with a shorter name. To cut a long story short, I'll be using lsk-vX.YZ-android branch names for all future pull requests.
Thanks for explanations! :)
Amit, Just find some extra error which seems introduced by this new android branch, A build error on x86 with allmodconfig + CONFI_OF=n. Anyway it isn't critical. https://kernelci.org/build/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489a/defco...
But we have 5/118 boot errors, while the last time lsk-4.4-android just has none failure. Could you like to look into them?
https://kernelci.org/boot/all/job/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489...
For all lsk testing: https://kernelci.org/job/lsk/
Regards ALex
Ping...
Amit, Just find some extra error which seems introduced by this new android branch, A build error on x86 with allmodconfig + CONFI_OF=n. Anyway it isn't critical. https://kernelci.org/build/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489a/defco...
But we have 5/118 boot errors, while the last time lsk-4.4-android just has none failure. Could you like to look into them?
https://kernelci.org/boot/all/job/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489...
For all lsk testing: https://kernelci.org/job/lsk/
Regards ALex
+ John and Sumit
On 24 February 2016 at 20:18, Alex Shi alex.shi@linaro.org wrote:
Ping...
Hi Alex,
Sorry I was stuck in other work items so did not really had enough time to look at it.
Amit, Just find some extra error which seems introduced by this new android branch, A build error on x86 with allmodconfig + CONFI_OF=n. Anyway it isn't critical. https://kernelci.org/build/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489a/defco...
Yes these build errors are there for a long time now. I'll look at these soon.
But we have 5/118 boot errors, while the last time lsk-4.4-android just has none failure. Could you like to look into them?
https://kernelci.org/boot/all/job/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489...
A quick look at some of the failed jobs on the above dashboard did not really help. Some failed due to wrong/unknown ramdisk images, some might be due to wrong console/tty settings. Also the number of failed jobs are way more than just 5, so I might be looking at the wrong jobs. Can you please point me to the 5/118 boot errors you mentioned?
Thanks, Amit Pundir
For all lsk testing: https://kernelci.org/job/lsk/
Regards ALex
Just find some extra error which seems introduced by this new android branch, A build error on x86 with allmodconfig + CONFI_OF=n. Anyway it isn't critical. https://kernelci.org/build/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489a/defco...
Yes these build errors are there for a long time now. I'll look at these soon.
Thanks!
But we have 5/118 boot errors, while the last time lsk-4.4-android just has none failure. Could you like to look into them?
https://kernelci.org/boot/all/job/lsk/kernel/lsk-v4.4-16.01-546-g02bbd06e489...
A quick look at some of the failed jobs on the above dashboard did not really help. Some failed due to wrong/unknown ramdisk images, some might be due to wrong console/tty settings. Also the number of failed jobs are way more than just 5, so I might be looking at the wrong jobs. Can you please point me to the 5/118 boot errors you mentioned?
CC Kevin, since some of boot failure looks more like a framework issue.
Thanks for response, Amit! Seems the kernelci.org is not so reliable on error report. Some of them are clearly failed in bootldr, like highbank in cambridge lab or am335x and qcom in Kevin's lab.
https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_... https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_... https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_...
BTW, would we set some filter to block such failure which even have no 'Starting kernel ...' words? We can add framework suspicious category, that's just for lab owner eyes?
However, there are still few error which may failed on board or framework or real kernel issue, like the following: Kernel just print out " Starting kernel ..." and then failed.
https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_... https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_... https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_... https://storage.kernelci.org/lsk/lsk-v4.4-16.01-546-g02bbd06e489a/arm-multi_...
=========== Starting kernel ...
ErrorMessage: Failed to boot test image. Lava failed at action boot_linaro_image with error:Failed to boot test image.
If QA/Lava/lab owner could figure the reasons and filter them automaticly, that would help us a lot.
Thanks, Amit Pundir
For all lsk testing: https://kernelci.org/job/lsk/
Regards ALex
On 18 Feb 2016 3:48 p.m., "Amit Pundir" amit.pundir@linaro.org wrote:
On 18 February 2016 at 19:59, Alex Shi alex.shi@linaro.org wrote:
Thanks Amit, pulled on linux-linaro-lsk-v4.4-android.
Thanks Alex.
BTW, I saw some similar lsk/android related branches on your git tree, like linaro-android-3.14-lsk/lsk-v3.14-android, linux-linaro-lsk-v4.1-android
Is there any rule binds the names? :)
ahh you saw that too :). I thought I'll get away with that this time, one last time.
There are few original branches which other teams are pulling in their trees directly but they can not be cleanly updated and pulled into LSK. So I end up creating new branches for pull requests. But then some branch names are just too big to be put in single line for pull requests and hence breaking the pull requests. So I have to come up with a shorter name. To cut a long story short, I'll be using lsk-vX.YZ-android branch names for all future pull requests.
Might be worth considering using tags? That also means you can carry on working on the branch even if the pull request is still being reviewed.
Regards, Amit Pundir
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Thanks! Alex
On 02/18/2016 03:50 AM, Amit Pundir wrote:
Hi Mark, Alex,
Please consider following linaro-android pull request (based on recently tagged android-4.4 stable kernel in AOSP) for "linux-linaro-lsk-v4.4-android" LSK branch.
This pull request is a simple merge of android-4.4 and linux-linaro-lsk-v4.4-android trees with no merge conflict, and it doesn't carry any additional linaro-android fixes for now.
Regards, Amit Pundir
The following changes since commit
34f6d2c9d12a97271d55c7b204443b2da9e6c29e:
Merge tag 'v4.4.1' into linux-linaro-lsk-v4.4 (2016-02-05 19:31:55
+0000)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.4-android
for you to fetch changes up to
02bbd06e489a9f56910973535152d3ec47f3fdcc:
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common (2016-02-18 00:20:12 +0530)
Alex Ray (1): ARM64: add option to build Image.gz/dtb combo
Alistair Strachan (2): video: adf: export the adf_attachment_allow symbol to modules. video: adf: use rb_erase in adf_obj_destroy.
Amit Pundir (40): lowmemorykiller: use module_param_cb instead of
__module_param_call
net: pppopns: pppolac: fix sendmsg function calls Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: PPPoPNS and PPPoLAC build fixes for 4.4 nf: IDLETIMER: Fix broken uid field in the msg net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled xt_qtaguid: fix broken uid/gid range check xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() netfilter: xt_qtaguid: xt_socket: build fixes netfilter: xt_qtaguid/socket: build fixes for 4.4 net: ipv6: fix virtual tunneling build usb: gadget: check for accessory device before disconnecting HIDs usb: gadget: fix NULL ptr derefer while symlinking PTP func usb: phy: fix dual role sysfs build if kernel modules are
supported
usb: gadget: configfs: handle gadget reset request for android usb: gadget: build audio_source function only if SND is enabled usb: gadget: cleanup: fix unused variable and function warnings usb: gadget: rndis: use %z format specifier for size_t usb: gadget: rndis: fix broken data aggregation build usb: gadget: rndis: fix broken build for 4.4 usb: gadget: u_ether: use %z format specifier for size_t cpufreq: interactive: replace strict_strtoul() with kstrtoul() cpufreq: interactive: build fixes for 4.4 video: adf: fix memblock build failure video: adf: build fixes for 4.1 misc seq_printf fixes for 4.4 power: wakeup_reason: fix suspend time reporting cgroup: memcg: pass correct argument to
subsys_cgroup_allow_attach
cgroup: refactor allow_attach handler for 4.4 prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict proc: uid_cputime: create uids from kuids uid_cputime: skip power reporting per uid for now SELinux: build fix for 4.1 ion: fix page pool cache policy mm: private anonymous memory build fixes for 4.4 kbuild: Makefile.clean: make Kbuild and Makefile optional goldfish_bus: switch GOLDFISH_BUS config back to bool android: skip building drivers as modules android: configs: base: enable configfs gadget functions Merge branch 'android-4.4' ofhttps://android.googlesource.com/kernel/common
Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in
sync_fence_free()
Andrey Konovalov (1): Include if_pppolac.h and if_pppopns.h into header-y target
Anson Jacob (3): usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for
acc_write
usb: gadget: f_audio_source: change max ISO packet size usb: gadget: f_audio_source: Fixed USB Audio Class Interface
Descriptor
Arun Bharadwaj (1): tracing/sched: Add trace events to track cpu hotplug.
Arve Hjønnevåg (24): PM / Sleep: Add wake lock api wrapper on top of wakeup sources staging: android: lowmemorykiller: Add config option to support oom_adj values Input: Generic GPIO Input device. input: Add keyreset driver. netfilter: xt_quota2: 3.10 fixes. netfilter: xt_qtaguid: 3.10 fixes net: activity_stats: Stop using obsolete create_proc_read_entry
api
usb: otg: otg-wakelock: Fix build for 3.7 usb: gadget: android: Fixes and hacks to make android usb gadgetcompile on 3.8 ARM: Add fiq_glue ARM: fiq_debugger: Fix to compile on 3.7 ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs ARM: fiq_debugger: Update tty code for 3.9 ARM: fiq_glue: Add custom fiq return handler api. fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code fiq_debugger: Add fiq_watchdog_triggered api sched: Enable might_sleep before initializing drivers. misc: uidstat: Remove use of obsolete create_proc_read_entry api armv6 dcc tty driver Optionally flush entire dcache from v6_dma_flush_range ARM: Fix "Make low-level printk work" to use a separate config
option
ARM: decompressor: Flush tlb before swiching domain 0 to client
mode
pstore/ram: Add ramoops_console_write_buf api android: binder: More offset validationAshish Sharma (2): bridge: Have tx_bytes count headers like rx_bytes. android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
Badhri Jagan Sridharan (19): usb: u_ether: Add workqueue as bottom half handler for rx data
path
USB: gadget: u_ether: Fix data stall issue in RNDIS tethering
mode
RNDIS: Add Data aggregation (multi packet) support ndis: Add debug support to disable RNDIS Multipacket Feature usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION
interface
usb: gadget: configfs: Add usb_function ptr to fi struct usb: gadget: Add Uevent to notify userspace usb: gadget: f_audio_source:replace deprecated API usb: gadget: Add function devices to the parent usb:gadget:audio_source: Move to USB_FUNCTION API usb: gadget: Move gadget functions code usb: gadget: Accessory:Migrate to USB_FUNCTION API usb: gadget: Relocate f_accessory usb: gadget: Do not disconnect unregistered dev usb:gadget:Add "state" attribute to android_device usb: phy: Dual role sysfs class definition usb: gadget: Add device attribute to determine gadget state ANDROID: usb: gadget: create F_midi device cpufreq: interactive: restructure CPUFREQ_GOV_LIMITSBenoit Goby (9): usb: gadget: mtp: Add MTP/PTP function usb: gadget: adb: Add ADB function usb: gadget: accessory: Add Android Accessory function usb: gadget: adb: Only enable the gadget when adbd is ready usb: otg: otg-wakelock: Fix build for 3.4 usb: gadget: accessory: Fix section mismatch usb: gadget: Fix android gadget driver build drivers: power: Add watchdog timer to catch drivers which lockup during suspend. ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
Chia-chi Yeh (7): security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). net: Only NET_ADMIN is allowed to fully control TUN interfaces. net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. net: add PPP on PPTP Network Server (PPPoPNS) driver. net: PPPoPNS and PPPoLAC fixes. net: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chih-Wei Huang (1): cpufreq: interactive: fix compiling warnings
Christian Poetzsch (2): Fix generic cgroup subsystem permission checks Fix for in kernel emergency remount when loop mounts are used
Colin Cross (35): lowmemorykiller: make default lowmemorykiller debug message
useful
input: misc: gpio_event: remove early suspend input: misc: keychord: move header to uapi mmc_block: Allow more than 8 partitions per card mmc: sdio: fix sdio_reset_comm() voltage selection Recreate asm/mach/mmc.h include file net: move PPPoLAC and PPPoPNS headers to uapi usb: otg: otg-wakelock: fix build for 3.3 usb: gadget: adb: allow freezing in adb_read usb: gadget: adb: do not set error flag when dequeuing req usb: gadget: f_mtp: move userspace interface to uapi usb: gadget: f_accessory: move userspace interface to uapi ARM: fiq_debugger: fix compiling for v3.3 ARM: fiq_debugger: add support for reboot commands ARM: fiq_debugger: add debug_putc ARM: fiq_debugger: add support for kgdb kdb: support new lines without carriage returns ARM: fiq_debugger: fix multiple consoles and make it a preferred
console
ARM: fiq_debugger: add process context reboot command ARM: fiq_debugger: lock between tty and console writes fiq_debugger: move into drivers/staging/android/fiq_debugger/ fiq_debugger: rename debug->fiq_debugger fiq_debugger: allow compiling without CONFIG_FIQ_GLUE fiq_debugger: use pt_regs for registers fiq_debugger: split arm support into fiq_debugger_arm.c fiq_debugger: add ARM64 support cpuidle: governor: menu: don't use loadavg trace: power: add trace_clock_set_parent cgroup: Add generic cgroup subsystem permission checks ARM: convert build of appended dtb zImage to list of dtbs ARM64: copy CONFIG_CMDLINE_EXTEND from ARM of: fix CONFIG_CMDLINE_EXTEND mm: add a field to store names for private anonymous memory hardlockup: detect hard lockups without NMIs using secondary cpus epoll: use freezable blocking callCylen Yao (1): cpufreq: interactive: make common_tunables static
Dan Willemsen (1): fixup! proc: make oom adjustment files user read-only
Daniel Chen (1): mmc: sdio: Add high speed support to sdio_reset_comm()
Daniel Rosenberg (5): input: add keycombo, a general key combo driver. input: Changed keyreset to act as a wrapper for keycombo. input: Made keyreset more robust include: linux: cgroup: Fix compiler warning staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
Dima Zavin (2): mtd: nand: Allow NAND chip ids to be included standalone. ARM: add option to flush console before reboot
Dmitry Shmidt (17): mmc: Add sdio_readb_ext() function mmc: sdio: Claim host in sdio_reset_comm() mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm() mmc: Add "ignore mmc pm notify" functionality ARM: Add 'card_present' state to mmc_platfrom_data tcp: fix tcp_default_init_rwnd() for 4.1 net: wireless: Decrease scan entry expiration to avoid stall
results
wlan: Create generic wlan platform data header network: wireless: Add get_mac_addr functionality to platform net: wireless: Add get_country_code functionality to platform Add flags parameter to get_country_code template wlan: Add get_wake_irq functionality trace: fix compilation for 4.1 power: Add check_wakeup_reason() to verify wakeup source irq cgroup: fix cgroup_taskset_for_each call in allow_attach() for
4.1
userfaultfd: Add missing vma_merge parameter android: configs: remove CONFIG_BATTERY_ANDROID=yDmitry Torokhov (4): net: fix iterating over hashtable in tcp_nuke_addr() net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash CHROMIUM: android: fix warning when releasing active sync point
Doug Anderson (1): of: Support CONFIG_CMDLINE_EXTEND config option
Dylan Reid (1): power: Remove HAS_WAKELOCK config and document WAKELOCK
Erik Gilling (2): sync: add Documentation/sync.txt ARM: add config option to build zImage/dtb combo
Fengguang Wu (1): goldfish: pipe: fix platform_no_drv_owner.cocci warnings
Greg Hackmann (38): netfilter: xt_qtaguid: fix memory leak in seq_file handlers netfilter: xt_qtaguid: 64-bit warning fixes drivers: usb: gadget: 64-bit related type fixes cpufreq: interactive: hold reference on global cpufreq kobject
if needed
video: add atomic display framework video: adf: add memblock helper video: adf: support "simple" buffers video: adf: add supported formats to adf_overlay_engine_data video: adf: add fbdev compatibility helper video: adf: add informational flags to interfaces video: adf: add helpers for validating custom formats video: adf: make dpms_state sysfs attribute writable video: adf: set default interface dpms_state to OFF video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers video: adf: make device node names less hierarchical video: adf: remove PAGE_SIZE from userspace-facing header video: adf: fix ADF_MAX_ATTACHMENTS declaration video: adf: validate dpms state passed to blank video: adf: fix fbdev blank -> dpms state mapping video: adf: define constants for device-custom ioctls video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions video: adf: fix compat ioctls calling ioctl with wrong cmd video: adf: use %zu when printing size_t video: adf: replace fbdev helper's open flag with refcount video: adf: ensure consistent alignment on userspace facing
structs
video: adf: document adf_format_validate_yuv's origin video: adf: add buffer padding quirk video: adf: adf_memblock_export symbol should be exported video: adf: memblock: map buffer for dma video: adf: fbdev: add stubs for kernels without ADF_FBDEV video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode() power: wakeup_reason: rename irq_count to irqcount arm64: check for upper PAGE_SHIFT bits in pfn_valid() arm64: process: dump memory around registers when displaying regs arch: arm64: force -fno-pic FROMLIST: pstore-ram: add Device Tree bindings android: base-cfg: enable ARMV8_DEPRECATED and subfeatures ANDROID: android: base-cfg: disable CONFIG_SYSVIPCHosung Kim (1): mmc: sdio: Fix sdio_reset_comm for sync
Iliyan Malchev (1): ARM: Add generic fiq serial debugger
JP Abgrall (29): input: misc: keychord: log when keychord triggered net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU netfilter: add xt_qtaguid matching module netfilter: adding the original quota2 from xtables-addons netfilter: fixup the quota2, and enable. netfilter: qtaguid: initialize a local var to keep compiler
happy.
netfilter: xt_qtaguid: fix ipv6 protocol lookup netfilter: xt_IDLETIMER: Add new netlink msg type netfilter: xt_qtaguid: start tracking iface rx/tx at low level netfilter: xt_qtaguid: report only uid tags to non-privileged
processes
netfilter: xt_qtaguid: fix error exit that would keep a spinlock. netfilter: xt_qtaguid: remove AID_* dependency for access control netfilter: xt_qtaguid: extend iface stat to report protocols netfilter: xt_qtaguid: Allow tracking loopback netfilter: qtaguid: rate limit some of the printks netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling netfilter: ipv6: fix crash caused by ipv6_find_hdr() tcp: add a sysctl to config the tcp_default_init_rwnd misc: uidstat: avoid create_stat() race and blockage. ARM: fault: assume no context when IRQs are disabled during data
abort.
ext4: Add support for FIDTRIM, a best-effort ioctl for deep
discard trim
android: configs: Reorder config fragments android: configs: no MODULES for base, no SIP for recommended android: configs: Reorder config fragments, update README android: configs: require TCPMSS, remove SCHED_TRACER and
TIMER_STATS
android: configs: add TIMER_STATS back, helps with sysrq t. android: configs: add IPV6 ROUTE INFO android: base-cfg: enable DM_VERITY (used for secureboot) android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)Jamie Gennis (4): trace/events: add gpu trace events trace: Add an option to show tgids in trace output trace: add non-hierarchical function_graph option trace/events: fix gpu event timestamp formatting
Jeff Brown (1): hid-multitouch: Filter collections by application usage.
Jeff Vander Stoep (2): selinux: Android kernel compatibility with M userspace arm64 Kconfig: Move LIST_POISON to a safe value
Jin Qian (3): proc: uid_cputime: fix show_uid_stat permission uid_cputime: fix cputime overflow arm64: pass return address to dma_common_contiguous_remap
John Stultz (10): ashmem: Add shmem_set_file to mm/shmem.c mmc: Extend wakelock if bus is dead mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies net: kuid/kguid build fixes netfilter: Build fixups - kuid/kguid changes &
xt_socket_get/put_sk
fiq_debugger: Build fixes for 4.1 cpufreq-interactive: Compile fixup arm: dcc_tty: fix armv6 dcc tty build failure of: Fix build warnings pstore: Update Documentation/android.txtJon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready
Jon Medhurst (Tixy) (1): xt_qtaguid: Fix boot panic
Jonathan Hamilton (1): video: adf: Cleanup sw_sync timeline at adf_device_destroy
Junjie Wu (4): cpufreq: interactive: Put global cpufreq kobject on failure cpufreq: interactive: Don't set floor_validate_time during boost cpufreq: interactive: Round up timer_rate to match jiffy cpufreq: interactive: Implement cluster-based min_sample_time
Kees Cook (1): HID: steelseries: validate output report details
Ken Sumrall (2): mmc: block: Improve logging of handling emmc timeouts mmc: Add tracepoints of mmc block operations
Kevin Hilman (1): android: configs: base: enable IPV6
Laura Abbott (1): staging: android: ashmem: Avoid deadlock with mmap/shrink
Lianwei Wang (6): cpufreq: interactive: use deferrable timer by default cpufreq: interactive: fix race on governor start/stop cpufreq: interactive: add io_is_busy interface cpufreq: interactive: fix race on cpufreq TRANSITION notifier cpufreq: interactive: resched timer if max freq raised cpufreq: interactive: only boost tunable affected cpus
Lizhe Liu (1): Enable adb with android-pipe in IA image
Lorenzo Colitti (5): net: ipv6: autoconf routes into per-device tables net: core: Support UID-based routing. net: support marking accepting TCP sockets Don't kill IPv4 sockets when killing IPv6 sockets was requested. Make suspend abort reason logging depend on CONFIG_PM_SLEEP
Mark Salyzyn (6): ANDROID: rtc-palmas: correct for bcd year android: base-cfg: disable LOGGER android: base-cfg: turn off /dev/mem and /dev/kmem android: base-cfg: disable ALARM_DEV android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST
Mars (1): ARM: fiq_debugger: fix uninitialised spin_lock.
Martijn Coenen (2): lowmemorykiller: trace kill events. UPSTREAM: memcg: Only free spare array when readers are done
Micha Kalfon (2): prctl: fix misplaced PR_SET_TIMERSLACK_PID case prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Michael Wright (2): android: configs: Add Logitech unifying receivers to recommended android: configs: Add HIDRAW to recommended set
Mike Chan (4): android: Add android config documentation to boot framework. misc: uidstat: Adding uid stat driver to collect network
statistics.
net: activity_stats: Add statistics for network transmission
activity
cpufreq: interactive: New 'interactive' governorMike Lockwood (5): switch: switch class and GPIO drivers. input: keychord: Add keychord driver USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and
ioctl
USB: gadget: f_accessory: Add support for HID input devices USB: gadget: f_audio_source: New gadget driver for audio outputMinsung Kim (6): cpufreq: interactive: allow arbitrary speed / delay mappings cpufreq: interactive: fix uninitialized spinlock cpufreq: interactive: avoid underflow on active time calculation cpufreq: interactive: fix show_target_loads and
show_above_hispeed_delay
cpufreq: interactive: fix NULL pointer dereference at sysfs ops cpufreq: interactive: don't skip waking up speedchange_task iftarget_freq > policy->cur
Mohamad Ayyash (1): xt_qtaguid: Use sk_callback_lock read locks before reading
sk->sk_socket
Nick Pelly (1): rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Nishanth Menon (1): panic: Add board ID to panic output
Peter Oh (1): USB: remove duplicate out endpoint creation in MTP mode
Pontus Fuchs (1): netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
Praneeth Bajjuri (1): usb: u_ether: Fix compile errors
Qiao Zhou (1): drivers: switch: remove S_IWUSR from dev_attr
Rajmal Menariya (1): ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool)
Rebecca Schultz Zavin (1): mm: vmscan: Add a debug file for shrinkers
Rik van Riel (1): add extra free kbytes tunable
Riley Andrews (2): sched: add sched blocked tracepoint which dumps out context of
sleep.
android: drivers: workaround debugfs race in binderRobert Love (4): Add android_aid.h Paranoid network. sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window
size
net: socket ioctl to reset connections matching local addressRohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Rom Lemarchand (11): staging: android: ashmem: add missing include cgroup: refactor allow_attach function into common code memcg: add permission check cgroup: Fix issues in allow_attach callback proc: make oom adjustment files user read-only initramfs: Add skip_initramfs command line option kbuild: make it possible to specify the module output dir android: configs: Initial commit of Android config fragments android: configs: Enable KSM support by default android: configs: update 3.10 options android: configs: add systrace support to recommended configs
Ruchi Kandoi (23): nf: IDLETIMER: time-stamp and suspend/resume handling. nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35 nf: IDLETIMER: Adds the uid field in the msg cpufreq: interactive: turn boost_pulse off on boost off cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5 cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency. trace: cpufreq: Add tracing for min/max cpufreq Power: add an API to log wakeup reasons POWER: fix compile warnings in log_wakeup_reason Power: Add guard condition for maximum wakeup reasons Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason power: Avoids bogus error messages for the suspend aborts. power: Adds functionality to log the last suspend abort reason. wakeup: Add last wake up source logging for suspend abort reason. wakeup_reason: use vsnprintf instead of snsprintf for vargs. prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread. prctl: adds the capable(CAP_SYS_NICE) check to
PR_SET_TIMERSLACK_PID.
uid_cputime: Extends the cputime functionality to report power
per uid
uid_cputime: Avoids double accounting of process stime, utimeand cpu_power in task exit. uid_cputime: Iterates over all the threads instead of processes. uid_cputime: Check for the range while removing range of UIDs. Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854" wakeup: Add the guard condition for len in
pm_get_active_wakeup_sources
Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current
governor
Sami Tolvanen (1): android: add CONFIG_DEBUG_RODATA to recommended config
San Mehat (12): mmc: Add status IRQ and status callback function to mmc platform
data
mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enablingretries during SD detection mmc: sd: When resuming, try a little harder to init the card mmc: sd: Add retries in re-detection mmc: Add concept of an 'embedded' SDIO device. mmc: core: Hold a wake lock accross delayed work + mmc rescan mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device fs: block_dump: Don't display inode changes if block_dump < 2 block: genhd: Add disk/partition specific uevent callbacks for partition info proc: smaps: Allow smaps access for CAP_SYS_RESOURCE process: Add display of memory around registers when displaying
regs.
serial_core: Add wake_peer uart operationSaravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Sherman Yin (1): netfilter: fix seq_printf type mismatch warning
Shridhar Rasal (1): cpufreq: interactive: delete timers for GOV_START
Sreeram Ramachandran (1): net: core: Handle 'sk' being NULL in UID-based routing
Stephen Smalley (2): SELinux: Enable setting security contexts on rootfs inodes. android: configs: Enable SELinux and its dependencies.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
Todd Poynor (55): gpio_input: convert from wakelocks to wakeup sources USB: OTG: Take wakelock when VBUS present usb: otg: Temporarily grab wakelock on charger and disconnect
events
usb: gadget: accessory: Fix section mismatch (again) ARM: kgdb: ignore breakpoint instructions from user mode Move x86_64 idle notifiers to generic ARM: Call idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not
current
cpufreq: interactive: set at least hispeed when above hispeed
load
cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above
hispeed
cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not
actual
cpufreq: interactive: Separate speed target revalidate time andinitial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from
userspace
cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each
hispeed load
cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime
task
cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load
is low
cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry cpufreq: interactive: trace actual speed in target speed
decisions
cpufreq: interactive: change speed according to current speedand target load cpufreq: interactive: apply above_hispeed_delay to each step
above hispeed
cpufreq: interactive: allow arbitrary speed / target load
mappings
cpufreq: interactive: remove load since last speed change cpufreq: interactive: adjust load for changes in speed cpufreq: interactive: specify duration of CPU speed boost pulse cpufreq: interactive: add timer slack to limit idle at speed >
min
cpufreq: interactive: fix boosting logic cpufreq: interactive: fix racy timer stopping cpufreq: interactive: fix race on timer restart on governor start cpufreq: interactive: default go_hispeed_load 99%, doc updates cpufreq: interactive: init default values at compile time cpufreq: interactive: don't handle transition notification if
not enabled
cpufreq: interactive: fix deadlock on spinlock in timer cpufreq: interactive: fix crash on error paths in
get_tokenized_data
cpufreq: interactive: base above_hispeed_delay on target freq,
not current
cpufreq: interactive: handle errors from
cpufreq_frequency_table_target
cpufreq: interactive: reduce chance of zero time delta on load
eval
power_supply: Add custom property for USB High Current mode power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int'
order
power: power_supply: add POWER_SUPPLY_PROP_USB_OTG power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED PM / Suspend: Print wall time at suspend entry and exit power: Add property CHARGE_COUNTER_EXT and 64-bit precision
properties
fuse: Freeze client on suspend when request sent to userspace w1: ds2482: Manage SLPZ pin sleep stateTony Lindgren (1): ARM: Make low-level printk work
Tushar Behera (2): tcp: Fix IPV6 module build errors security: Add proper checks for Android specific capability
checks
Ulf Hansson (1): Revert "mmc: block: don't use parameter prefix if built as
module"
Vinil Cheeramvelil (1): ion: Handle the memory mapping correctly on x86
Viresh Kumar (4): cpufreq: interactive: Remove unnecessary cpu_online() check cpufreq: interactive: Move definition of cpufreq_gov_interactive
downwards
cpufreq: Interactive: Implement per policy instances of governor cpufreq: interactive: Use generic get_cpu_idle_time() from
cpufreq.c
Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()
dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.
jinqian (2): Power: Report suspend times from last_suspend_time proc: uid: Adds accounting for the cputimes per uid.
keunyoung (1): fix false disconnect due to a signal sent to the reading process
liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update
rahul.khandelwal (1): subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
taeju.park (1): usb: gadget: prevent change of Host MAC address of 'usb0'
interface
xerox_lin (3): USB: rndis: Free the rndis response queue during
REMOTE_NDIS_RESET_MSG
usb: Add support for rndis uplink aggregation USB: gadget: rndis: Add module parameter for DL max packets per
xfer
Documentation/ABI/testing/sysfs-class-dual-role-usb | 71 ++ Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + Documentation/android.txt | 121
++++
Documentation/cgroups/cgroups.txt | 9 + Documentation/cpu-freq/governors.txt | 85 +++ Documentation/devicetree/bindings/misc/ramoops.txt | 43 ++ Documentation/filesystems/proc.txt | 6 + Documentation/networking/ip-sysctl.txt | 10 + Documentation/ramoops.txt | 6 +- Documentation/sync.txt | 75 +++ Documentation/sysctl/vm.txt | 45 ++ Documentation/trace/events-power.txt | 1 + Documentation/trace/ftrace.txt | 29 + android/configs/README | 15 + android/configs/android-base.cfg | 162
+++++
android/configs/android-recommended.cfg | 127
++++
arch/Kconfig | 68 ++ arch/arm/Kconfig | 33 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 5 + arch/arm/boot/.gitignore | 1 + arch/arm/boot/Makefile | 13 + arch/arm/boot/compressed/head.S | 2 + arch/arm/boot/dts/Makefile | 12 +- arch/arm/common/Kconfig | 4 + arch/arm/common/Makefile | 1 + arch/arm/common/fiq_glue.S | 118
++++
arch/arm/common/fiq_glue_setup.c | 147
+++++
arch/arm/include/asm/fiq_glue.h | 33 + arch/arm/include/asm/mach/mmc.h | 28 + arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/kgdb.c | 4 + arch/arm/kernel/process.c | 75 +++ arch/arm/kernel/reboot.c | 30 + arch/arm/mm/cache-v6.S | 17 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/mmap.c | 3 +- arch/arm64/Kconfig | 66 ++ arch/arm64/Makefile | 9 + arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 13 + arch/arm64/boot/dts/Makefile | 14 + arch/arm64/kernel/process.c | 66 ++ arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 + arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- arch/x86/mm/mmap.c | 12 +- block/genhd.c | 17 + block/partition-generic.c | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/android/binder.c | 26 +- drivers/base/power/main.c | 48 ++ drivers/base/power/wakeup.c | 32 + drivers/base/syscore.c | 3 + drivers/char/Kconfig | 4 + drivers/char/Makefile | 1 + drivers/char/dcc_tty.c | 326
+++++++++
drivers/cpufreq/Kconfig | 24 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_interactive.c | 1360 ++++++++++++++++++++++++++++++++++++++ drivers/cpuidle/governors/menu.c | 7 +- drivers/dma-buf/fence.c | 6 +- drivers/hid/hid-multitouch.c | 10 + drivers/hid/hid-steelseries.c | 5 + drivers/input/Kconfig | 13 + drivers/input/Makefile | 3 + drivers/input/keycombo.c | 261
++++++++
drivers/input/keyreset.c | 145
++++
drivers/input/misc/Kconfig | 16 + drivers/input/misc/Makefile | 2 + drivers/input/misc/gpio_axis.c | 192
++++++
drivers/input/misc/gpio_event.c | 228
+++++++
drivers/input/misc/gpio_input.c | 390
+++++++++++
drivers/input/misc/gpio_matrix.c | 441 +++++++++++++ drivers/input/misc/gpio_output.c | 97 +++ drivers/input/misc/keychord.c | 391
+++++++++++
drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/uid_cputime.c | 240
+++++++
drivers/misc/uid_stat.c | 153
+++++
drivers/mmc/card/block.c | 25 +- drivers/mmc/core/Kconfig | 15 + drivers/mmc/core/core.c | 54 +- drivers/mmc/core/host.c | 7 +- drivers/mmc/core/sd.c | 83 ++- drivers/mmc/core/sdio.c | 112
+++-
drivers/mmc/core/sdio_bus.c | 13 +- drivers/mmc/core/sdio_io.c | 33 + drivers/mtd/nand/Kconfig | 10 +- drivers/net/ppp/Kconfig | 17 + drivers/net/ppp/Makefile | 2 + drivers/net/ppp/pppolac.c | 449 +++++++++++++ drivers/net/ppp/pppopns.c | 428
++++++++++++
drivers/net/tun.c | 6 + drivers/of/fdt.c | 68 +- drivers/platform/Kconfig | 2 - drivers/platform/goldfish/Kconfig | 18 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 176
+++--
drivers/power/power_supply_sysfs.c | 11 +- drivers/rtc/rtc-palmas.c | 44 +- drivers/staging/android/Kconfig | 11 + drivers/staging/android/Makefile | 1 + drivers/staging/android/ashmem.c | 30 +- drivers/staging/android/fiq_debugger/Kconfig | 49 ++ drivers/staging/android/fiq_debugger/Makefile | 4 + drivers/staging/android/fiq_debugger/fiq_debugger.c | 1212 ++++++++++++++++++++++++++++++++++ drivers/staging/android/fiq_debugger/fiq_debugger.h | 64 ++ drivers/staging/android/fiq_debugger/fiq_debugger_arm.c | 240
+++++++
drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c | 202
++++++
drivers/staging/android/fiq_debugger/fiq_debugger_priv.h | 37 ++ drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h | 94 +++ drivers/staging/android/fiq_debugger/fiq_watchdog.c | 56 ++ drivers/staging/android/fiq_debugger/fiq_watchdog.h | 20 + drivers/staging/android/ion/Kconfig | 7 + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/ion/ion_page_pool.c | 8 + drivers/staging/android/ion/ion_priv.h | 34 + drivers/staging/android/ion/ion_system_heap.c | 8 +- drivers/staging/android/lowmemorykiller.c | 114
+++-
drivers/staging/android/sync.c | 14 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/staging/android/uapi/ashmem.h | 1 + drivers/switch/Kconfig | 15 + drivers/switch/Makefile | 4 + drivers/switch/switch_class.c | 174
+++++
drivers/switch/switch_gpio.c | 172
+++++
drivers/tty/serial/serial_core.c | 3 + drivers/usb/gadget/Kconfig | 50 ++ drivers/usb/gadget/composite.c | 6 + drivers/usb/gadget/configfs.c | 262
+++++++-
drivers/usb/gadget/function/Makefile | 8 + drivers/usb/gadget/function/f_accessory.c | 1328 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_audio_source.c | 1054 +++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_midi.c | 65 ++ drivers/usb/gadget/function/f_mtp.c | 1434 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_mtp.h | 18 + drivers/usb/gadget/function/f_ptp.c | 38 ++ drivers/usb/gadget/function/f_rndis.c | 30 + drivers/usb/gadget/function/rndis.c | 112
+++-
drivers/usb/gadget/function/rndis.h | 2 + drivers/usb/gadget/function/u_ether.c | 325
+++++++--
drivers/usb/gadget/function/u_ether.h | 3 + drivers/usb/gadget/functions.c | 2 +- drivers/usb/phy/Kconfig | 17 + drivers/usb/phy/Makefile | 2 + drivers/usb/phy/class-dual-role.c | 529 +++++++++++++++ drivers/usb/phy/otg-wakelock.c | 173
+++++
drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/adf/Kconfig | 14 + drivers/video/adf/Makefile | 15 + drivers/video/adf/adf.c | 1188 +++++++++++++++++++++++++++++++++ drivers/video/adf/adf.h | 71 ++ drivers/video/adf/adf_client.c | 811 +++++++++++++++++++++++ drivers/video/adf/adf_fbdev.c | 665 +++++++++++++++++++ drivers/video/adf/adf_fops.c | 957 +++++++++++++++++++++++++++ drivers/video/adf/adf_fops.h | 37 ++ drivers/video/adf/adf_fops32.c | 217
++++++
drivers/video/adf/adf_fops32.h | 78 +++ drivers/video/adf/adf_format.c | 280
++++++++
drivers/video/adf/adf_memblock.c | 166
+++++
drivers/video/adf/adf_sysfs.c | 296
+++++++++
drivers/video/adf/adf_sysfs.h | 33 + drivers/video/adf/adf_trace.h | 93 +++ drivers/w1/masters/ds2482.c | 47 +- fs/eventpoll.c | 4 +- fs/ext4/ext4.h | 3 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 28 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 5 +- fs/proc/base.c | 8 +- fs/proc/task_mmu.c | 62 ++ fs/pstore/ram.c | 116
+++-
fs/super.c | 2 +- fs/userfaultfd.c | 9 +- include/linux/Kbuild | 2 + include/linux/amba/mmci.h | 13 + include/linux/android_aid.h | 28 + include/linux/cgroup-defs.h | 1 + include/linux/cgroup.h | 14 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/linux/fence.h | 2 + include/linux/gpio_event.h | 170
+++++
include/linux/if_pppolac.h | 23 + include/linux/if_pppopns.h | 23 + include/linux/if_pppox.h | 21 + include/linux/initramfs.h | 32 + include/linux/ipv6.h | 1 + include/linux/kernel.h | 4 + include/linux/keychord.h | 23 + include/linux/keycombo.h | 36 + include/linux/keyreset.h | 29 + include/linux/mm.h | 14 +- include/linux/mm_types.h | 24 +- include/linux/mmc/host.h | 17 + include/linux/mmc/pm.h | 1 + include/linux/mmc/sdio_func.h | 10 + include/linux/netfilter/xt_qtaguid.h | 13 + include/linux/netfilter/xt_quota2.h | 25 + include/linux/nmi.h | 5 +- include/linux/of_fdt.h | 21 + include/linux/platform_data/ds2482.h | 21 + include/linux/power_supply.h | 8 + include/linux/pstore_ram.h | 2 + include/linux/serial_core.h | 1 + include/linux/socket.h | 4 + include/linux/suspend.h | 1 + include/linux/switch.h | 53 ++ include/linux/uid_stat.h | 29 + include/linux/usb/class-dual-role.h | 128
++++
include/linux/usb/composite.h | 1 + include/linux/usb/f_accessory.h | 23 + include/linux/usb/f_mtp.h | 23 + include/linux/wakelock.h | 67 ++ include/linux/wakeup_reason.h | 27 + include/linux/wlan_plat.h | 30 + include/net/activity_stats.h | 25 + include/net/addrconf.h | 2 + include/net/fib_rules.h | 5 + include/net/flow.h | 9 +- include/net/ip.h | 1 + include/net/ip6_route.h | 2 +- include/net/route.h | 6 +- include/net/tcp.h | 3 + include/trace/events/cpufreq_interactive.h | 112
++++
include/trace/events/gpu.h | 143
++++
include/trace/events/mmc.h | 91 +++ include/trace/events/power.h | 44 ++ include/trace/events/sched.h | 51 +- include/uapi/linux/fib_rules.h | 2 + include/uapi/linux/fs.h | 2 + include/uapi/linux/if_pppolac.h | 33 + include/uapi/linux/if_pppopns.h | 32 + include/uapi/linux/if_pppox.h | 6 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/keychord.h | 52 ++ include/uapi/linux/netfilter/xt_IDLETIMER.h | 8 + include/uapi/linux/netfilter/xt_socket.h | 7 + include/uapi/linux/prctl.h | 9 + include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/sockios.h | 1 + include/uapi/linux/usb/f_accessory.h | 146
++++
include/uapi/linux/usb/f_mtp.h | 61 ++ include/uapi/video/adf.h | 321
+++++++++
include/video/adf.h | 502 ++++++++++++++ include/video/adf_client.h | 61 ++ include/video/adf_fbdev.h | 124
++++
include/video/adf_format.h | 26 + include/video/adf_memblock.h | 20 + init/Makefile | 3 - init/initramfs.c | 19 +- init/noinitramfs.c | 9 +- kernel/cgroup.c | 59 +- kernel/cpu.c | 24 + kernel/debug/kdb/kdb_io.c | 12 +- kernel/fork.c | 3 +- kernel/panic.c | 8 + kernel/power/Kconfig | 9 + kernel/power/Makefile | 2 + kernel/power/process.c | 22 +- kernel/power/suspend.c | 35 +- kernel/power/wakeup_reason.c | 225
+++++++
kernel/printk/printk.c | 8 + kernel/sched/core.c | 15 +- kernel/sched/fair.c | 1 + kernel/sys.c | 173
+++++
kernel/sysctl.c | 31 + kernel/trace/Kconfig | 3 + kernel/trace/Makefile | 1 + kernel/trace/gpu-traces.c | 23 + kernel/trace/trace.c | 98 ++- kernel/trace/trace.h | 4 +- kernel/trace/trace_functions_graph.c | 43 +- kernel/trace/trace_output.c | 184
+++++-
kernel/watchdog.c | 123
+++-
lib/Kconfig.debug | 14 +- mm/madvise.c | 2 +- mm/memcontrol.c | 21 +- mm/mempolicy.c | 3 +- mm/mlock.c | 2 +- mm/mmap.c | 51 +- mm/mprotect.c | 2 +- mm/page_alloc.c | 32 +- mm/shmem.c | 13 +- mm/vmscan.c | 43 ++ net/Kconfig | 14 + net/Makefile | 1 + net/activity_stats.c | 118
++++
net/bluetooth/af_bluetooth.c | 29 + net/bridge/br_device.c | 11 +- net/core/fib_rules.c | 53 +- net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 20 +- net/ipv4/devinet.c | 8 +- net/ipv4/fib_frontend.c | 1 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 3 +- net/ipv4/route.c | 25 +- net/ipv4/syncookies.c | 5 +- net/ipv4/sysctl_net_ipv4.c | 22 + net/ipv4/sysfs_net_ipv4.c | 88 +++ net/ipv4/tcp.c | 133
++++
net/ipv4/tcp_input.c | 1 + net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 39 +- net/ipv6/af_inet6.c | 38 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 1 + net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 13 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 + net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ping.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/route.c | 83 ++- net/ipv6/syncookies.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 1 + net/netfilter/Kconfig | 42 ++ net/netfilter/Makefile | 2 + net/netfilter/xt_IDLETIMER.c | 243
++++++-
net/netfilter/xt_qtaguid.c | 3033
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
net/netfilter/xt_qtaguid_internal.h | 352
++++++++++
net/netfilter/xt_qtaguid_print.c | 566 ++++++++++++++++ net/netfilter/xt_qtaguid_print.h | 120
++++
net/netfilter/xt_quota2.c | 382
+++++++++++
net/netfilter/xt_socket.c | 31 +- net/rfkill/Kconfig | 5 + net/rfkill/core.c | 4 +- net/wireless/scan.c | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 6 + scripts/Makefile.modinst | 2 +- security/commoncap.c | 11 + security/selinux/hooks.c | 7 + security/selinux/ss/avtab.c | 69 +- 349 files changed, 30285 insertions(+), 550 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-dual-role-usb create mode 100644
Documentation/ABI/testing/sysfs-kernel-wakeup_reasons
create mode 100644 Documentation/android.txt create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt create mode 100644 Documentation/sync.txt create mode 100644 android/configs/README create mode 100644 android/configs/android-base.cfg create mode 100644 android/configs/android-recommended.cfg create mode 100644 arch/arm/common/fiq_glue.S create mode 100644 arch/arm/common/fiq_glue_setup.c create mode 100644 arch/arm/include/asm/fiq_glue.h create mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 drivers/char/dcc_tty.c create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 drivers/input/keycombo.c create mode 100644 drivers/input/keyreset.c create mode 100644 drivers/input/misc/gpio_axis.c create mode 100644 drivers/input/misc/gpio_event.c create mode 100644 drivers/input/misc/gpio_input.c create mode 100644 drivers/input/misc/gpio_matrix.c create mode 100644 drivers/input/misc/gpio_output.c create mode 100644 drivers/input/misc/keychord.c create mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_stat.c create mode 100644 drivers/net/ppp/pppolac.c create mode 100644 drivers/net/ppp/pppopns.c create mode 100644 drivers/staging/android/fiq_debugger/Kconfig create mode 100644 drivers/staging/android/fiq_debugger/Makefile create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.h create mode 100644
drivers/staging/android/fiq_debugger/fiq_debugger_arm.c
create mode 100644
drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c
create mode 100644
drivers/staging/android/fiq_debugger/fiq_debugger_priv.h
create mode 100644
drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h
create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.h create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 drivers/switch/Kconfig create mode 100644 drivers/switch/Makefile create mode 100644 drivers/switch/switch_class.c create mode 100644 drivers/switch/switch_gpio.c create mode 100644 drivers/usb/gadget/function/f_accessory.c create mode 100644 drivers/usb/gadget/function/f_audio_source.c create mode 100644 drivers/usb/gadget/function/f_mtp.c create mode 100644 drivers/usb/gadget/function/f_mtp.h create mode 100644 drivers/usb/gadget/function/f_ptp.c create mode 100644 drivers/usb/phy/class-dual-role.c create mode 100644 drivers/usb/phy/otg-wakelock.c create mode 100644 drivers/video/adf/Kconfig create mode 100644 drivers/video/adf/Makefile create mode 100644 drivers/video/adf/adf.c create mode 100644 drivers/video/adf/adf.h create mode 100644 drivers/video/adf/adf_client.c create mode 100644 drivers/video/adf/adf_fbdev.c create mode 100644 drivers/video/adf/adf_fops.c create mode 100644 drivers/video/adf/adf_fops.h create mode 100644 drivers/video/adf/adf_fops32.c create mode 100644 drivers/video/adf/adf_fops32.h create mode 100644 drivers/video/adf/adf_format.c create mode 100644 drivers/video/adf/adf_memblock.c create mode 100644 drivers/video/adf/adf_sysfs.c create mode 100644 drivers/video/adf/adf_sysfs.h create mode 100644 drivers/video/adf/adf_trace.h create mode 100644 include/linux/Kbuild create mode 100644 include/linux/android_aid.h create mode 100644 include/linux/gpio_event.h create mode 100644 include/linux/if_pppolac.h create mode 100644 include/linux/if_pppopns.h create mode 100644 include/linux/initramfs.h create mode 100644 include/linux/keychord.h create mode 100644 include/linux/keycombo.h create mode 100644 include/linux/keyreset.h create mode 100644 include/linux/netfilter/xt_qtaguid.h create mode 100644 include/linux/netfilter/xt_quota2.h create mode 100644 include/linux/platform_data/ds2482.h create mode 100644 include/linux/switch.h create mode 100644 include/linux/uid_stat.h create mode 100644 include/linux/usb/class-dual-role.h create mode 100644 include/linux/usb/f_accessory.h create mode 100644 include/linux/usb/f_mtp.h create mode 100644 include/linux/wakelock.h create mode 100644 include/linux/wakeup_reason.h create mode 100644 include/linux/wlan_plat.h create mode 100644 include/net/activity_stats.h create mode 100644 include/trace/events/cpufreq_interactive.h create mode 100644 include/trace/events/gpu.h create mode 100644 include/trace/events/mmc.h create mode 100644 include/uapi/linux/if_pppolac.h create mode 100644 include/uapi/linux/if_pppopns.h create mode 100644 include/uapi/linux/keychord.h create mode 100644 include/uapi/linux/usb/f_accessory.h create mode 100644 include/uapi/linux/usb/f_mtp.h create mode 100644 include/uapi/video/adf.h create mode 100644 include/video/adf.h create mode 100644 include/video/adf_client.h create mode 100644 include/video/adf_fbdev.h create mode 100644 include/video/adf_format.h create mode 100644 include/video/adf_memblock.h create mode 100644 kernel/power/wakeup_reason.c create mode 100644 kernel/trace/gpu-traces.c create mode 100644 net/activity_stats.c create mode 100644 net/ipv4/sysfs_net_ipv4.c create mode 100644 net/netfilter/xt_qtaguid.c create mode 100644 net/netfilter/xt_qtaguid_internal.h create mode 100644 net/netfilter/xt_qtaguid_print.c create mode 100644 net/netfilter/xt_qtaguid_print.h create mode 100644 net/netfilter/xt_quota2.c
On 19 February 2016 at 14:32, Mark Brown mark.brown@linaro.org wrote:
On 18 Feb 2016 3:48 p.m., "Amit Pundir" amit.pundir@linaro.org wrote:
On 18 February 2016 at 19:59, Alex Shi alex.shi@linaro.org wrote:
Thanks Amit, pulled on linux-linaro-lsk-v4.4-android.
Thanks Alex.
BTW, I saw some similar lsk/android related branches on your git tree, like linaro-android-3.14-lsk/lsk-v3.14-android, linux-linaro-lsk-v4.1-android
Is there any rule binds the names? :)
ahh you saw that too :). I thought I'll get away with that this time, one last time.
There are few original branches which other teams are pulling in their trees directly but they can not be cleanly updated and pulled into LSK. So I end up creating new branches for pull requests. But then some branch names are just too big to be put in single line for pull requests and hence breaking the pull requests. So I have to come up with a shorter name. To cut a long story short, I'll be using lsk-vX.YZ-android branch names for all future pull requests.
Might be worth considering using tags? That also means you can carry on working on the branch even if the pull request is still being reviewed.
Thanks Mark. That does make sense. I'll do that if I run into such issues again.
Regards, Amit Pundir
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Thanks! Alex
On 02/18/2016 03:50 AM, Amit Pundir wrote:
Hi Mark, Alex,
Please consider following linaro-android pull request (based on recently tagged android-4.4 stable kernel in AOSP) for "linux-linaro-lsk-v4.4-android" LSK branch.
This pull request is a simple merge of android-4.4 and linux-linaro-lsk-v4.4-android trees with no merge conflict, and it doesn't carry any additional linaro-android fixes for now.
Regards, Amit Pundir
The following changes since commit 34f6d2c9d12a97271d55c7b204443b2da9e6c29e:
Merge tag 'v4.4.1' into linux-linaro-lsk-v4.4 (2016-02-05 19:31:55 +0000)
are available in the git repository at:
git://android.git.linaro.org/kernel/linaro-android.git lsk-v4.4-android
for you to fetch changes up to 02bbd06e489a9f56910973535152d3ec47f3fdcc:
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common (2016-02-18 00:20:12 +0530)
Alex Ray (1): ARM64: add option to build Image.gz/dtb combo
Alistair Strachan (2): video: adf: export the adf_attachment_allow symbol to modules. video: adf: use rb_erase in adf_obj_destroy.
Amit Pundir (40): lowmemorykiller: use module_param_cb instead of __module_param_call net: pppopns: pppolac: fix sendmsg function calls Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1 net: PPPoPNS and PPPoLAC build fixes for 4.4 nf: IDLETIMER: Fix broken uid field in the msg net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled xt_qtaguid: fix broken uid/gid range check xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() netfilter: xt_qtaguid: xt_socket: build fixes netfilter: xt_qtaguid/socket: build fixes for 4.4 net: ipv6: fix virtual tunneling build usb: gadget: check for accessory device before disconnecting HIDs usb: gadget: fix NULL ptr derefer while symlinking PTP func usb: phy: fix dual role sysfs build if kernel modules are supported usb: gadget: configfs: handle gadget reset request for android usb: gadget: build audio_source function only if SND is enabled usb: gadget: cleanup: fix unused variable and function warnings usb: gadget: rndis: use %z format specifier for size_t usb: gadget: rndis: fix broken data aggregation build usb: gadget: rndis: fix broken build for 4.4 usb: gadget: u_ether: use %z format specifier for size_t cpufreq: interactive: replace strict_strtoul() with kstrtoul() cpufreq: interactive: build fixes for 4.4 video: adf: fix memblock build failure video: adf: build fixes for 4.1 misc seq_printf fixes for 4.4 power: wakeup_reason: fix suspend time reporting cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach cgroup: refactor allow_attach handler for 4.4 prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict proc: uid_cputime: create uids from kuids uid_cputime: skip power reporting per uid for now SELinux: build fix for 4.1 ion: fix page pool cache policy mm: private anonymous memory build fixes for 4.4 kbuild: Makefile.clean: make Kbuild and Makefile optional goldfish_bus: switch GOLDFISH_BUS config back to bool android: skip building drivers as modules android: configs: base: enable configfs gadget functions Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
Andrew Bresticker (1): CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free()
Andrey Konovalov (1): Include if_pppolac.h and if_pppopns.h into header-y target
Anson Jacob (3): usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for acc_write usb: gadget: f_audio_source: change max ISO packet size usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor
Arun Bharadwaj (1): tracing/sched: Add trace events to track cpu hotplug.
Arve Hjønnevåg (24): PM / Sleep: Add wake lock api wrapper on top of wakeup sources staging: android: lowmemorykiller: Add config option to support oom_adj values Input: Generic GPIO Input device. input: Add keyreset driver. netfilter: xt_quota2: 3.10 fixes. netfilter: xt_qtaguid: 3.10 fixes net: activity_stats: Stop using obsolete create_proc_read_entry api usb: otg: otg-wakelock: Fix build for 3.7 usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8 ARM: Add fiq_glue ARM: fiq_debugger: Fix to compile on 3.7 ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs ARM: fiq_debugger: Update tty code for 3.9 ARM: fiq_glue: Add custom fiq return handler api. fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code fiq_debugger: Add fiq_watchdog_triggered api sched: Enable might_sleep before initializing drivers. misc: uidstat: Remove use of obsolete create_proc_read_entry api armv6 dcc tty driver Optionally flush entire dcache from v6_dma_flush_range ARM: Fix "Make low-level printk work" to use a separate config option ARM: decompressor: Flush tlb before swiching domain 0 to client mode pstore/ram: Add ramoops_console_write_buf api android: binder: More offset validation
Ashish Sharma (2): bridge: Have tx_bytes count headers like rx_bytes. android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
Badhri Jagan Sridharan (19): usb: u_ether: Add workqueue as bottom half handler for rx data path USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode RNDIS: Add Data aggregation (multi packet) support ndis: Add debug support to disable RNDIS Multipacket Feature usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION interface usb: gadget: configfs: Add usb_function ptr to fi struct usb: gadget: Add Uevent to notify userspace usb: gadget: f_audio_source:replace deprecated API usb: gadget: Add function devices to the parent usb:gadget:audio_source: Move to USB_FUNCTION API usb: gadget: Move gadget functions code usb: gadget: Accessory:Migrate to USB_FUNCTION API usb: gadget: Relocate f_accessory usb: gadget: Do not disconnect unregistered dev usb:gadget:Add "state" attribute to android_device usb: phy: Dual role sysfs class definition usb: gadget: Add device attribute to determine gadget state ANDROID: usb: gadget: create F_midi device cpufreq: interactive: restructure CPUFREQ_GOV_LIMITS
Benoit Goby (9): usb: gadget: mtp: Add MTP/PTP function usb: gadget: adb: Add ADB function usb: gadget: accessory: Add Android Accessory function usb: gadget: adb: Only enable the gadget when adbd is ready usb: otg: otg-wakelock: Fix build for 3.4 usb: gadget: accessory: Fix section mismatch usb: gadget: Fix android gadget driver build drivers: power: Add watchdog timer to catch drivers which lockup during suspend. ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
Chia-chi Yeh (7): security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). net: Only NET_ADMIN is allowed to fully control TUN interfaces. net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. net: add PPP on PPTP Network Server (PPPoPNS) driver. net: PPPoPNS and PPPoLAC fixes. net: Reorder incoming packets in PPPoLAC and PPPoPNS.
Chih-Wei Huang (1): cpufreq: interactive: fix compiling warnings
Christian Poetzsch (2): Fix generic cgroup subsystem permission checks Fix for in kernel emergency remount when loop mounts are used
Colin Cross (35): lowmemorykiller: make default lowmemorykiller debug message useful input: misc: gpio_event: remove early suspend input: misc: keychord: move header to uapi mmc_block: Allow more than 8 partitions per card mmc: sdio: fix sdio_reset_comm() voltage selection Recreate asm/mach/mmc.h include file net: move PPPoLAC and PPPoPNS headers to uapi usb: otg: otg-wakelock: fix build for 3.3 usb: gadget: adb: allow freezing in adb_read usb: gadget: adb: do not set error flag when dequeuing req usb: gadget: f_mtp: move userspace interface to uapi usb: gadget: f_accessory: move userspace interface to uapi ARM: fiq_debugger: fix compiling for v3.3 ARM: fiq_debugger: add support for reboot commands ARM: fiq_debugger: add debug_putc ARM: fiq_debugger: add support for kgdb kdb: support new lines without carriage returns ARM: fiq_debugger: fix multiple consoles and make it a preferred console ARM: fiq_debugger: add process context reboot command ARM: fiq_debugger: lock between tty and console writes fiq_debugger: move into drivers/staging/android/fiq_debugger/ fiq_debugger: rename debug->fiq_debugger fiq_debugger: allow compiling without CONFIG_FIQ_GLUE fiq_debugger: use pt_regs for registers fiq_debugger: split arm support into fiq_debugger_arm.c fiq_debugger: add ARM64 support cpuidle: governor: menu: don't use loadavg trace: power: add trace_clock_set_parent cgroup: Add generic cgroup subsystem permission checks ARM: convert build of appended dtb zImage to list of dtbs ARM64: copy CONFIG_CMDLINE_EXTEND from ARM of: fix CONFIG_CMDLINE_EXTEND mm: add a field to store names for private anonymous memory hardlockup: detect hard lockups without NMIs using secondary cpus epoll: use freezable blocking call
Cylen Yao (1): cpufreq: interactive: make common_tunables static
Dan Willemsen (1): fixup! proc: make oom adjustment files user read-only
Daniel Chen (1): mmc: sdio: Add high speed support to sdio_reset_comm()
Daniel Rosenberg (5): input: add keycombo, a general key combo driver. input: Changed keyreset to act as a wrapper for keycombo. input: Made keyreset more robust include: linux: cgroup: Fix compiler warning staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
Dima Zavin (2): mtd: nand: Allow NAND chip ids to be included standalone. ARM: add option to flush console before reboot
Dmitry Shmidt (17): mmc: Add sdio_readb_ext() function mmc: sdio: Claim host in sdio_reset_comm() mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm() mmc: Add "ignore mmc pm notify" functionality ARM: Add 'card_present' state to mmc_platfrom_data tcp: fix tcp_default_init_rwnd() for 4.1 net: wireless: Decrease scan entry expiration to avoid stall results wlan: Create generic wlan platform data header network: wireless: Add get_mac_addr functionality to platform net: wireless: Add get_country_code functionality to platform Add flags parameter to get_country_code template wlan: Add get_wake_irq functionality trace: fix compilation for 4.1 power: Add check_wakeup_reason() to verify wakeup source irq cgroup: fix cgroup_taskset_for_each call in allow_attach() for 4.1 userfaultfd: Add missing vma_merge parameter android: configs: remove CONFIG_BATTERY_ANDROID=y
Dmitry Torokhov (4): net: fix iterating over hashtable in tcp_nuke_addr() net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash CHROMIUM: android: fix warning when releasing active sync point
Doug Anderson (1): of: Support CONFIG_CMDLINE_EXTEND config option
Dylan Reid (1): power: Remove HAS_WAKELOCK config and document WAKELOCK
Erik Gilling (2): sync: add Documentation/sync.txt ARM: add config option to build zImage/dtb combo
Fengguang Wu (1): goldfish: pipe: fix platform_no_drv_owner.cocci warnings
Greg Hackmann (38): netfilter: xt_qtaguid: fix memory leak in seq_file handlers netfilter: xt_qtaguid: 64-bit warning fixes drivers: usb: gadget: 64-bit related type fixes cpufreq: interactive: hold reference on global cpufreq kobject if needed video: add atomic display framework video: adf: add memblock helper video: adf: support "simple" buffers video: adf: add supported formats to adf_overlay_engine_data video: adf: add fbdev compatibility helper video: adf: add informational flags to interfaces video: adf: add helpers for validating custom formats video: adf: make dpms_state sysfs attribute writable video: adf: set default interface dpms_state to OFF video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers video: adf: make device node names less hierarchical video: adf: remove PAGE_SIZE from userspace-facing header video: adf: fix ADF_MAX_ATTACHMENTS declaration video: adf: validate dpms state passed to blank video: adf: fix fbdev blank -> dpms state mapping video: adf: define constants for device-custom ioctls video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions video: adf: fix compat ioctls calling ioctl with wrong cmd video: adf: use %zu when printing size_t video: adf: replace fbdev helper's open flag with refcount video: adf: ensure consistent alignment on userspace facing structs video: adf: document adf_format_validate_yuv's origin video: adf: add buffer padding quirk video: adf: adf_memblock_export symbol should be exported video: adf: memblock: map buffer for dma video: adf: fbdev: add stubs for kernels without ADF_FBDEV video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode() power: wakeup_reason: rename irq_count to irqcount arm64: check for upper PAGE_SHIFT bits in pfn_valid() arm64: process: dump memory around registers when displaying regs arch: arm64: force -fno-pic FROMLIST: pstore-ram: add Device Tree bindings android: base-cfg: enable ARMV8_DEPRECATED and subfeatures ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
Hosung Kim (1): mmc: sdio: Fix sdio_reset_comm for sync
Iliyan Malchev (1): ARM: Add generic fiq serial debugger
JP Abgrall (29): input: misc: keychord: log when keychord triggered net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU netfilter: add xt_qtaguid matching module netfilter: adding the original quota2 from xtables-addons netfilter: fixup the quota2, and enable. netfilter: qtaguid: initialize a local var to keep compiler happy. netfilter: xt_qtaguid: fix ipv6 protocol lookup netfilter: xt_IDLETIMER: Add new netlink msg type netfilter: xt_qtaguid: start tracking iface rx/tx at low level netfilter: xt_qtaguid: report only uid tags to non-privileged processes netfilter: xt_qtaguid: fix error exit that would keep a spinlock. netfilter: xt_qtaguid: remove AID_* dependency for access control netfilter: xt_qtaguid: extend iface stat to report protocols netfilter: xt_qtaguid: Allow tracking loopback netfilter: qtaguid: rate limit some of the printks netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling netfilter: ipv6: fix crash caused by ipv6_find_hdr() tcp: add a sysctl to config the tcp_default_init_rwnd misc: uidstat: avoid create_stat() race and blockage. ARM: fault: assume no context when IRQs are disabled during data abort. ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim android: configs: Reorder config fragments android: configs: no MODULES for base, no SIP for recommended android: configs: Reorder config fragments, update README android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS android: configs: add TIMER_STATS back, helps with sysrq t. android: configs: add IPV6 ROUTE INFO android: base-cfg: enable DM_VERITY (used for secureboot) android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
Jamie Gennis (4): trace/events: add gpu trace events trace: Add an option to show tgids in trace output trace: add non-hierarchical function_graph option trace/events: fix gpu event timestamp formatting
Jeff Brown (1): hid-multitouch: Filter collections by application usage.
Jeff Vander Stoep (2): selinux: Android kernel compatibility with M userspace arm64 Kconfig: Move LIST_POISON to a safe value
Jin Qian (3): proc: uid_cputime: fix show_uid_stat permission uid_cputime: fix cputime overflow arm64: pass return address to dma_common_contiguous_remap
John Stultz (10): ashmem: Add shmem_set_file to mm/shmem.c mmc: Extend wakelock if bus is dead mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies net: kuid/kguid build fixes netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk fiq_debugger: Build fixes for 4.1 cpufreq-interactive: Compile fixup arm: dcc_tty: fix armv6 dcc tty build failure of: Fix build warnings pstore: Update Documentation/android.txt
Jon Medhurst (1): net: PPPoPNS: Remove length argument from data_ready
Jon Medhurst (Tixy) (1): xt_qtaguid: Fix boot panic
Jonathan Hamilton (1): video: adf: Cleanup sw_sync timeline at adf_device_destroy
Junjie Wu (4): cpufreq: interactive: Put global cpufreq kobject on failure cpufreq: interactive: Don't set floor_validate_time during boost cpufreq: interactive: Round up timer_rate to match jiffy cpufreq: interactive: Implement cluster-based min_sample_time
Kees Cook (1): HID: steelseries: validate output report details
Ken Sumrall (2): mmc: block: Improve logging of handling emmc timeouts mmc: Add tracepoints of mmc block operations
Kevin Hilman (1): android: configs: base: enable IPV6
Laura Abbott (1): staging: android: ashmem: Avoid deadlock with mmap/shrink
Lianwei Wang (6): cpufreq: interactive: use deferrable timer by default cpufreq: interactive: fix race on governor start/stop cpufreq: interactive: add io_is_busy interface cpufreq: interactive: fix race on cpufreq TRANSITION notifier cpufreq: interactive: resched timer if max freq raised cpufreq: interactive: only boost tunable affected cpus
Lizhe Liu (1): Enable adb with android-pipe in IA image
Lorenzo Colitti (5): net: ipv6: autoconf routes into per-device tables net: core: Support UID-based routing. net: support marking accepting TCP sockets Don't kill IPv4 sockets when killing IPv6 sockets was requested. Make suspend abort reason logging depend on CONFIG_PM_SLEEP
Mark Salyzyn (6): ANDROID: rtc-palmas: correct for bcd year android: base-cfg: disable LOGGER android: base-cfg: turn off /dev/mem and /dev/kmem android: base-cfg: disable ALARM_DEV android: recommended.cfg: enable taskstats android: base-cfg: Add CONFIG_IP_MULTICAST
Mars (1): ARM: fiq_debugger: fix uninitialised spin_lock.
Martijn Coenen (2): lowmemorykiller: trace kill events. UPSTREAM: memcg: Only free spare array when readers are done
Micha Kalfon (2): prctl: fix misplaced PR_SET_TIMERSLACK_PID case prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Michael Wright (2): android: configs: Add Logitech unifying receivers to recommended android: configs: Add HIDRAW to recommended set
Mike Chan (4): android: Add android config documentation to boot framework. misc: uidstat: Adding uid stat driver to collect network statistics. net: activity_stats: Add statistics for network transmission activity cpufreq: interactive: New 'interactive' governor
Mike Lockwood (5): switch: switch class and GPIO drivers. input: keychord: Add keychord driver USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctl USB: gadget: f_accessory: Add support for HID input devices USB: gadget: f_audio_source: New gadget driver for audio output
Minsung Kim (6): cpufreq: interactive: allow arbitrary speed / delay mappings cpufreq: interactive: fix uninitialized spinlock cpufreq: interactive: avoid underflow on active time calculation cpufreq: interactive: fix show_target_loads and show_above_hispeed_delay cpufreq: interactive: fix NULL pointer dereference at sysfs ops cpufreq: interactive: don't skip waking up speedchange_task if target_freq > policy->cur
Mohamad Ayyash (1): xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
Nick Pelly (1): rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
Nishanth Menon (1): panic: Add board ID to panic output
Peter Oh (1): USB: remove duplicate out endpoint creation in MTP mode
Pontus Fuchs (1): netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
Praneeth Bajjuri (1): usb: u_ether: Fix compile errors
Qiao Zhou (1): drivers: switch: remove S_IWUSR from dev_attr
Rajmal Menariya (1): ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool)
Rebecca Schultz Zavin (1): mm: vmscan: Add a debug file for shrinkers
Rik van Riel (1): add extra free kbytes tunable
Riley Andrews (2): sched: add sched blocked tracepoint which dumps out context of sleep. android: drivers: workaround debugfs race in binder
Robert Love (4): Add android_aid.h Paranoid network. sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size net: socket ioctl to reset connections matching local address
Rohit Gupta (1): cpufreq: interactive: Rearm governor timer at max freq
Rom Lemarchand (11): staging: android: ashmem: add missing include cgroup: refactor allow_attach function into common code memcg: add permission check cgroup: Fix issues in allow_attach callback proc: make oom adjustment files user read-only initramfs: Add skip_initramfs command line option kbuild: make it possible to specify the module output dir android: configs: Initial commit of Android config fragments android: configs: Enable KSM support by default android: configs: update 3.10 options android: configs: add systrace support to recommended configs
Ruchi Kandoi (23): nf: IDLETIMER: time-stamp and suspend/resume handling. nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35 nf: IDLETIMER: Adds the uid field in the msg cpufreq: interactive: turn boost_pulse off on boost off cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5 cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency. trace: cpufreq: Add tracing for min/max cpufreq Power: add an API to log wakeup reasons POWER: fix compile warnings in log_wakeup_reason Power: Add guard condition for maximum wakeup reasons Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason power: Avoids bogus error messages for the suspend aborts. power: Adds functionality to log the last suspend abort reason. wakeup: Add last wake up source logging for suspend abort reason. wakeup_reason: use vsnprintf instead of snsprintf for vargs. prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread. prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID. uid_cputime: Extends the cputime functionality to report power per uid uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit. uid_cputime: Iterates over all the threads instead of processes. uid_cputime: Check for the range while removing range of UIDs. Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854" wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current governor
Sami Tolvanen (1): android: add CONFIG_DEBUG_RODATA to recommended config
San Mehat (12): mmc: Add status IRQ and status callback function to mmc platform data mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection mmc: sd: When resuming, try a little harder to init the card mmc: sd: Add retries in re-detection mmc: Add concept of an 'embedded' SDIO device. mmc: core: Hold a wake lock accross delayed work + mmc rescan mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device fs: block_dump: Don't display inode changes if block_dump < 2 block: genhd: Add disk/partition specific uevent callbacks for partition info proc: smaps: Allow smaps access for CAP_SYS_RESOURCE process: Add display of memory around registers when displaying regs. serial_core: Add wake_peer uart operation
Saravana Kannan (1): cpufreq: interactive: Exercise hispeed settings at a policy level
Sherman Yin (1): netfilter: fix seq_printf type mismatch warning
Shridhar Rasal (1): cpufreq: interactive: delete timers for GOV_START
Sreeram Ramachandran (1): net: core: Handle 'sk' being NULL in UID-based routing
Stephen Smalley (2): SELinux: Enable setting security contexts on rootfs inodes. android: configs: Enable SELinux and its dependencies.
Tobias Lindskog (1): Shrink ashmem directly through shmem_fallocate
Todd Poynor (55): gpio_input: convert from wakelocks to wakeup sources USB: OTG: Take wakelock when VBUS present usb: otg: Temporarily grab wakelock on charger and disconnect events usb: gadget: accessory: Fix section mismatch (again) ARM: kgdb: ignore breakpoint instructions from user mode Move x86_64 idle notifiers to generic ARM: Call idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not current cpufreq: interactive: set at least hispeed when above hispeed load cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above hispeed cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not actual cpufreq: interactive: Separate speed target revalidate time and initial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from userspace cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each hispeed load cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime task cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load is low cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry cpufreq: interactive: trace actual speed in target speed decisions cpufreq: interactive: change speed according to current speed and target load cpufreq: interactive: apply above_hispeed_delay to each step above hispeed cpufreq: interactive: allow arbitrary speed / target load mappings cpufreq: interactive: remove load since last speed change cpufreq: interactive: adjust load for changes in speed cpufreq: interactive: specify duration of CPU speed boost pulse cpufreq: interactive: add timer slack to limit idle at speed > min cpufreq: interactive: fix boosting logic cpufreq: interactive: fix racy timer stopping cpufreq: interactive: fix race on timer restart on governor start cpufreq: interactive: default go_hispeed_load 99%, doc updates cpufreq: interactive: init default values at compile time cpufreq: interactive: don't handle transition notification if not enabled cpufreq: interactive: fix deadlock on spinlock in timer cpufreq: interactive: fix crash on error paths in get_tokenized_data cpufreq: interactive: base above_hispeed_delay on target freq, not current cpufreq: interactive: handle errors from cpufreq_frequency_table_target cpufreq: interactive: reduce chance of zero time delta on load eval power_supply: Add custom property for USB High Current mode power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order power: power_supply: add POWER_SUPPLY_PROP_USB_OTG power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED PM / Suspend: Print wall time at suspend entry and exit power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties fuse: Freeze client on suspend when request sent to userspace w1: ds2482: Manage SLPZ pin sleep state
Tony Lindgren (1): ARM: Make low-level printk work
Tushar Behera (2): tcp: Fix IPV6 module build errors security: Add proper checks for Android specific capability checks
Ulf Hansson (1): Revert "mmc: block: don't use parameter prefix if built as module"
Vinil Cheeramvelil (1): ion: Handle the memory mapping correctly on x86
Viresh Kumar (4): cpufreq: interactive: Remove unnecessary cpu_online() check cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards cpufreq: Interactive: Implement per policy instances of governor cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
Yevgeny Pats (1): UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()
dcashman (4): FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS.
jinqian (2): Power: Report suspend times from last_suspend_time proc: uid: Adds accounting for the cputimes per uid.
keunyoung (1): fix false disconnect due to a signal sent to the reading process
liping.zhang (1): xt_qtaguid: fix a race condition in if_tag_stat_update
rahul.khandelwal (1): subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
taeju.park (1): usb: gadget: prevent change of Host MAC address of 'usb0' interface
xerox_lin (3): USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG usb: Add support for rndis uplink aggregation USB: gadget: rndis: Add module parameter for DL max packets per xfer
Documentation/ABI/testing/sysfs-class-dual-role-usb | 71 ++ Documentation/ABI/testing/sysfs-kernel-wakeup_reasons | 16 + Documentation/android.txt | 121 ++++ Documentation/cgroups/cgroups.txt | 9 + Documentation/cpu-freq/governors.txt | 85 +++ Documentation/devicetree/bindings/misc/ramoops.txt | 43 ++ Documentation/filesystems/proc.txt | 6 + Documentation/networking/ip-sysctl.txt | 10 + Documentation/ramoops.txt | 6 +- Documentation/sync.txt | 75 +++ Documentation/sysctl/vm.txt | 45 ++ Documentation/trace/events-power.txt | 1 + Documentation/trace/ftrace.txt | 29 + android/configs/README | 15 + android/configs/android-base.cfg | 162 +++++ android/configs/android-recommended.cfg | 127 ++++ arch/Kconfig | 68 ++ arch/arm/Kconfig | 33 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 5 + arch/arm/boot/.gitignore | 1 + arch/arm/boot/Makefile | 13 + arch/arm/boot/compressed/head.S | 2 + arch/arm/boot/dts/Makefile | 12 +- arch/arm/common/Kconfig | 4 + arch/arm/common/Makefile | 1 + arch/arm/common/fiq_glue.S | 118 ++++ arch/arm/common/fiq_glue_setup.c | 147 +++++ arch/arm/include/asm/fiq_glue.h | 33 + arch/arm/include/asm/mach/mmc.h | 28 + arch/arm/kernel/asm-offsets.c | 12 +- arch/arm/kernel/kgdb.c | 4 + arch/arm/kernel/process.c | 75 +++ arch/arm/kernel/reboot.c | 30 + arch/arm/mm/cache-v6.S | 17 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/mmap.c | 3 +- arch/arm64/Kconfig | 66 ++ arch/arm64/Makefile | 9 + arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 13 + arch/arm64/boot/dts/Makefile | 14 + arch/arm64/kernel/process.c | 66 ++ arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 +- arch/arm64/mm/mmap.c | 8 +- arch/x86/Kconfig | 16 + arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- arch/x86/mm/mmap.c | 12 +- block/genhd.c | 17 + block/partition-generic.c | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/android/binder.c | 26 +- drivers/base/power/main.c | 48 ++ drivers/base/power/wakeup.c | 32 + drivers/base/syscore.c | 3 + drivers/char/Kconfig | 4 + drivers/char/Makefile | 1 + drivers/char/dcc_tty.c | 326 +++++++++ drivers/cpufreq/Kconfig | 24 + drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_interactive.c | 1360 ++++++++++++++++++++++++++++++++++++++ drivers/cpuidle/governors/menu.c | 7 +- drivers/dma-buf/fence.c | 6 +- drivers/hid/hid-multitouch.c | 10 + drivers/hid/hid-steelseries.c | 5 + drivers/input/Kconfig | 13 + drivers/input/Makefile | 3 + drivers/input/keycombo.c | 261 ++++++++ drivers/input/keyreset.c | 145 ++++ drivers/input/misc/Kconfig | 16 + drivers/input/misc/Makefile | 2 + drivers/input/misc/gpio_axis.c | 192 ++++++ drivers/input/misc/gpio_event.c | 228 +++++++ drivers/input/misc/gpio_input.c | 390 +++++++++++ drivers/input/misc/gpio_matrix.c | 441 +++++++++++++ drivers/input/misc/gpio_output.c | 97 +++ drivers/input/misc/keychord.c | 391 +++++++++++ drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/uid_cputime.c | 240 +++++++ drivers/misc/uid_stat.c | 153 +++++ drivers/mmc/card/block.c | 25 +- drivers/mmc/core/Kconfig | 15 + drivers/mmc/core/core.c | 54 +- drivers/mmc/core/host.c | 7 +- drivers/mmc/core/sd.c | 83 ++- drivers/mmc/core/sdio.c | 112 +++- drivers/mmc/core/sdio_bus.c | 13 +- drivers/mmc/core/sdio_io.c | 33 + drivers/mtd/nand/Kconfig | 10 +- drivers/net/ppp/Kconfig | 17 + drivers/net/ppp/Makefile | 2 + drivers/net/ppp/pppolac.c | 449 +++++++++++++ drivers/net/ppp/pppopns.c | 428 ++++++++++++ drivers/net/tun.c | 6 + drivers/of/fdt.c | 68 +- drivers/platform/Kconfig | 2 - drivers/platform/goldfish/Kconfig | 18 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 176 +++-- drivers/power/power_supply_sysfs.c | 11 +- drivers/rtc/rtc-palmas.c | 44 +- drivers/staging/android/Kconfig | 11 + drivers/staging/android/Makefile | 1 + drivers/staging/android/ashmem.c | 30 +- drivers/staging/android/fiq_debugger/Kconfig | 49 ++ drivers/staging/android/fiq_debugger/Makefile | 4 + drivers/staging/android/fiq_debugger/fiq_debugger.c | 1212 ++++++++++++++++++++++++++++++++++ drivers/staging/android/fiq_debugger/fiq_debugger.h | 64 ++ drivers/staging/android/fiq_debugger/fiq_debugger_arm.c | 240 +++++++ drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c | 202 ++++++ drivers/staging/android/fiq_debugger/fiq_debugger_priv.h | 37 ++ drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h | 94 +++ drivers/staging/android/fiq_debugger/fiq_watchdog.c | 56 ++ drivers/staging/android/fiq_debugger/fiq_watchdog.h | 20 + drivers/staging/android/ion/Kconfig | 7 + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- drivers/staging/android/ion/ion_page_pool.c | 8 + drivers/staging/android/ion/ion_priv.h | 34 + drivers/staging/android/ion/ion_system_heap.c | 8 +- drivers/staging/android/lowmemorykiller.c | 114 +++- drivers/staging/android/sync.c | 14 +- drivers/staging/android/trace/lowmemorykiller.h | 41 ++ drivers/staging/android/uapi/ashmem.h | 1 + drivers/switch/Kconfig | 15 + drivers/switch/Makefile | 4 + drivers/switch/switch_class.c | 174 +++++ drivers/switch/switch_gpio.c | 172 +++++ drivers/tty/serial/serial_core.c | 3 + drivers/usb/gadget/Kconfig | 50 ++ drivers/usb/gadget/composite.c | 6 + drivers/usb/gadget/configfs.c | 262 +++++++- drivers/usb/gadget/function/Makefile | 8 + drivers/usb/gadget/function/f_accessory.c | 1328 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_audio_source.c | 1054 +++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_midi.c | 65 ++ drivers/usb/gadget/function/f_mtp.c | 1434 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/function/f_mtp.h | 18 + drivers/usb/gadget/function/f_ptp.c | 38 ++ drivers/usb/gadget/function/f_rndis.c | 30 + drivers/usb/gadget/function/rndis.c | 112 +++- drivers/usb/gadget/function/rndis.h | 2 + drivers/usb/gadget/function/u_ether.c | 325 +++++++-- drivers/usb/gadget/function/u_ether.h | 3 + drivers/usb/gadget/functions.c | 2 +- drivers/usb/phy/Kconfig | 17 + drivers/usb/phy/Makefile | 2 + drivers/usb/phy/class-dual-role.c | 529 +++++++++++++++ drivers/usb/phy/otg-wakelock.c | 173 +++++ drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/adf/Kconfig | 14 + drivers/video/adf/Makefile | 15 + drivers/video/adf/adf.c | 1188 +++++++++++++++++++++++++++++++++ drivers/video/adf/adf.h | 71 ++ drivers/video/adf/adf_client.c | 811 +++++++++++++++++++++++ drivers/video/adf/adf_fbdev.c | 665 +++++++++++++++++++ drivers/video/adf/adf_fops.c | 957 +++++++++++++++++++++++++++ drivers/video/adf/adf_fops.h | 37 ++ drivers/video/adf/adf_fops32.c | 217 ++++++ drivers/video/adf/adf_fops32.h | 78 +++ drivers/video/adf/adf_format.c | 280 ++++++++ drivers/video/adf/adf_memblock.c | 166 +++++ drivers/video/adf/adf_sysfs.c | 296 +++++++++ drivers/video/adf/adf_sysfs.h | 33 + drivers/video/adf/adf_trace.h | 93 +++ drivers/w1/masters/ds2482.c | 47 +- fs/eventpoll.c | 4 +- fs/ext4/ext4.h | 3 +- fs/ext4/ioctl.c | 6 +- fs/ext4/mballoc.c | 28 +- fs/fs-writeback.c | 2 +- fs/fuse/dev.c | 5 +- fs/proc/base.c | 8 +- fs/proc/task_mmu.c | 62 ++ fs/pstore/ram.c | 116 +++- fs/super.c | 2 +- fs/userfaultfd.c | 9 +- include/linux/Kbuild | 2 + include/linux/amba/mmci.h | 13 + include/linux/android_aid.h | 28 + include/linux/cgroup-defs.h | 1 + include/linux/cgroup.h | 14 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/linux/fence.h | 2 + include/linux/gpio_event.h | 170 +++++ include/linux/if_pppolac.h | 23 + include/linux/if_pppopns.h | 23 + include/linux/if_pppox.h | 21 + include/linux/initramfs.h | 32 + include/linux/ipv6.h | 1 + include/linux/kernel.h | 4 + include/linux/keychord.h | 23 + include/linux/keycombo.h | 36 + include/linux/keyreset.h | 29 + include/linux/mm.h | 14 +- include/linux/mm_types.h | 24 +- include/linux/mmc/host.h | 17 + include/linux/mmc/pm.h | 1 + include/linux/mmc/sdio_func.h | 10 + include/linux/netfilter/xt_qtaguid.h | 13 + include/linux/netfilter/xt_quota2.h | 25 + include/linux/nmi.h | 5 +- include/linux/of_fdt.h | 21 + include/linux/platform_data/ds2482.h | 21 + include/linux/power_supply.h | 8 + include/linux/pstore_ram.h | 2 + include/linux/serial_core.h | 1 + include/linux/socket.h | 4 + include/linux/suspend.h | 1 + include/linux/switch.h | 53 ++ include/linux/uid_stat.h | 29 + include/linux/usb/class-dual-role.h | 128 ++++ include/linux/usb/composite.h | 1 + include/linux/usb/f_accessory.h | 23 + include/linux/usb/f_mtp.h | 23 + include/linux/wakelock.h | 67 ++ include/linux/wakeup_reason.h | 27 + include/linux/wlan_plat.h | 30 + include/net/activity_stats.h | 25 + include/net/addrconf.h | 2 + include/net/fib_rules.h | 5 + include/net/flow.h | 9 +- include/net/ip.h | 1 + include/net/ip6_route.h | 2 +- include/net/route.h | 6 +- include/net/tcp.h | 3 + include/trace/events/cpufreq_interactive.h | 112 ++++ include/trace/events/gpu.h | 143 ++++ include/trace/events/mmc.h | 91 +++ include/trace/events/power.h | 44 ++ include/trace/events/sched.h | 51 +- include/uapi/linux/fib_rules.h | 2 + include/uapi/linux/fs.h | 2 + include/uapi/linux/if_pppolac.h | 33 + include/uapi/linux/if_pppopns.h | 32 + include/uapi/linux/if_pppox.h | 6 +- include/uapi/linux/ipv6.h | 1 + include/uapi/linux/keychord.h | 52 ++ include/uapi/linux/netfilter/xt_IDLETIMER.h | 8 + include/uapi/linux/netfilter/xt_socket.h | 7 + include/uapi/linux/prctl.h | 9 + include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/sockios.h | 1 + include/uapi/linux/usb/f_accessory.h | 146 ++++ include/uapi/linux/usb/f_mtp.h | 61 ++ include/uapi/video/adf.h | 321 +++++++++ include/video/adf.h | 502 ++++++++++++++ include/video/adf_client.h | 61 ++ include/video/adf_fbdev.h | 124 ++++ include/video/adf_format.h | 26 + include/video/adf_memblock.h | 20 + init/Makefile | 3 - init/initramfs.c | 19 +- init/noinitramfs.c | 9 +- kernel/cgroup.c | 59 +- kernel/cpu.c | 24 + kernel/debug/kdb/kdb_io.c | 12 +- kernel/fork.c | 3 +- kernel/panic.c | 8 + kernel/power/Kconfig | 9 + kernel/power/Makefile | 2 + kernel/power/process.c | 22 +- kernel/power/suspend.c | 35 +- kernel/power/wakeup_reason.c | 225 +++++++ kernel/printk/printk.c | 8 + kernel/sched/core.c | 15 +- kernel/sched/fair.c | 1 + kernel/sys.c | 173 +++++ kernel/sysctl.c | 31 + kernel/trace/Kconfig | 3 + kernel/trace/Makefile | 1 + kernel/trace/gpu-traces.c | 23 + kernel/trace/trace.c | 98 ++- kernel/trace/trace.h | 4 +- kernel/trace/trace_functions_graph.c | 43 +- kernel/trace/trace_output.c | 184 +++++- kernel/watchdog.c | 123 +++- lib/Kconfig.debug | 14 +- mm/madvise.c | 2 +- mm/memcontrol.c | 21 +- mm/mempolicy.c | 3 +- mm/mlock.c | 2 +- mm/mmap.c | 51 +- mm/mprotect.c | 2 +- mm/page_alloc.c | 32 +- mm/shmem.c | 13 +- mm/vmscan.c | 43 ++ net/Kconfig | 14 + net/Makefile | 1 + net/activity_stats.c | 118 ++++ net/bluetooth/af_bluetooth.c | 29 + net/bridge/br_device.c | 11 +- net/core/fib_rules.c | 53 +- net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 20 +- net/ipv4/devinet.c | 8 +- net/ipv4/fib_frontend.c | 1 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv4/ping.c | 3 +- net/ipv4/raw.c | 3 +- net/ipv4/route.c | 25 +- net/ipv4/syncookies.c | 5 +- net/ipv4/sysctl_net_ipv4.c | 22 + net/ipv4/sysfs_net_ipv4.c | 88 +++ net/ipv4/tcp.c | 133 ++++ net/ipv4/tcp_input.c | 1 + net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 3 +- net/ipv6/addrconf.c | 39 +- net/ipv6/af_inet6.c | 38 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 1 + net/ipv6/esp6.c | 2 +- net/ipv6/exthdrs_core.c | 13 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 2 + net/ipv6/ip6_vti.c | 2 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ping.c | 1 + net/ipv6/raw.c | 1 + net/ipv6/route.c | 83 ++- net/ipv6/syncookies.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/ipv6/udp.c | 1 + net/netfilter/Kconfig | 42 ++ net/netfilter/Makefile | 2 + net/netfilter/xt_IDLETIMER.c | 243 ++++++- net/netfilter/xt_qtaguid.c | 3033
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/netfilter/xt_qtaguid_internal.h | 352 ++++++++++ net/netfilter/xt_qtaguid_print.c | 566 ++++++++++++++++ net/netfilter/xt_qtaguid_print.h | 120 ++++ net/netfilter/xt_quota2.c | 382 +++++++++++ net/netfilter/xt_socket.c | 31 +- net/rfkill/Kconfig | 5 + net/rfkill/core.c | 4 +- net/wireless/scan.c | 2 +- scripts/Makefile.clean | 2 +- scripts/Makefile.lib | 6 + scripts/Makefile.modinst | 2 +- security/commoncap.c | 11 + security/selinux/hooks.c | 7 + security/selinux/ss/avtab.c | 69 +- 349 files changed, 30285 insertions(+), 550 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-dual-role-usb create mode 100644 Documentation/ABI/testing/sysfs-kernel-wakeup_reasons create mode 100644 Documentation/android.txt create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt create mode 100644 Documentation/sync.txt create mode 100644 android/configs/README create mode 100644 android/configs/android-base.cfg create mode 100644 android/configs/android-recommended.cfg create mode 100644 arch/arm/common/fiq_glue.S create mode 100644 arch/arm/common/fiq_glue_setup.c create mode 100644 arch/arm/include/asm/fiq_glue.h create mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 drivers/char/dcc_tty.c create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 drivers/input/keycombo.c create mode 100644 drivers/input/keyreset.c create mode 100644 drivers/input/misc/gpio_axis.c create mode 100644 drivers/input/misc/gpio_event.c create mode 100644 drivers/input/misc/gpio_input.c create mode 100644 drivers/input/misc/gpio_matrix.c create mode 100644 drivers/input/misc/gpio_output.c create mode 100644 drivers/input/misc/keychord.c create mode 100644 drivers/misc/uid_cputime.c create mode 100644 drivers/misc/uid_stat.c create mode 100644 drivers/net/ppp/pppolac.c create mode 100644 drivers/net/ppp/pppopns.c create mode 100644 drivers/staging/android/fiq_debugger/Kconfig create mode 100644 drivers/staging/android/fiq_debugger/Makefile create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_priv.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_debugger_ringbuf.h create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.c create mode 100644 drivers/staging/android/fiq_debugger/fiq_watchdog.h create mode 100644 drivers/staging/android/trace/lowmemorykiller.h create mode 100644 drivers/switch/Kconfig create mode 100644 drivers/switch/Makefile create mode 100644 drivers/switch/switch_class.c create mode 100644 drivers/switch/switch_gpio.c create mode 100644 drivers/usb/gadget/function/f_accessory.c create mode 100644 drivers/usb/gadget/function/f_audio_source.c create mode 100644 drivers/usb/gadget/function/f_mtp.c create mode 100644 drivers/usb/gadget/function/f_mtp.h create mode 100644 drivers/usb/gadget/function/f_ptp.c create mode 100644 drivers/usb/phy/class-dual-role.c create mode 100644 drivers/usb/phy/otg-wakelock.c create mode 100644 drivers/video/adf/Kconfig create mode 100644 drivers/video/adf/Makefile create mode 100644 drivers/video/adf/adf.c create mode 100644 drivers/video/adf/adf.h create mode 100644 drivers/video/adf/adf_client.c create mode 100644 drivers/video/adf/adf_fbdev.c create mode 100644 drivers/video/adf/adf_fops.c create mode 100644 drivers/video/adf/adf_fops.h create mode 100644 drivers/video/adf/adf_fops32.c create mode 100644 drivers/video/adf/adf_fops32.h create mode 100644 drivers/video/adf/adf_format.c create mode 100644 drivers/video/adf/adf_memblock.c create mode 100644 drivers/video/adf/adf_sysfs.c create mode 100644 drivers/video/adf/adf_sysfs.h create mode 100644 drivers/video/adf/adf_trace.h create mode 100644 include/linux/Kbuild create mode 100644 include/linux/android_aid.h create mode 100644 include/linux/gpio_event.h create mode 100644 include/linux/if_pppolac.h create mode 100644 include/linux/if_pppopns.h create mode 100644 include/linux/initramfs.h create mode 100644 include/linux/keychord.h create mode 100644 include/linux/keycombo.h create mode 100644 include/linux/keyreset.h create mode 100644 include/linux/netfilter/xt_qtaguid.h create mode 100644 include/linux/netfilter/xt_quota2.h create mode 100644 include/linux/platform_data/ds2482.h create mode 100644 include/linux/switch.h create mode 100644 include/linux/uid_stat.h create mode 100644 include/linux/usb/class-dual-role.h create mode 100644 include/linux/usb/f_accessory.h create mode 100644 include/linux/usb/f_mtp.h create mode 100644 include/linux/wakelock.h create mode 100644 include/linux/wakeup_reason.h create mode 100644 include/linux/wlan_plat.h create mode 100644 include/net/activity_stats.h create mode 100644 include/trace/events/cpufreq_interactive.h create mode 100644 include/trace/events/gpu.h create mode 100644 include/trace/events/mmc.h create mode 100644 include/uapi/linux/if_pppolac.h create mode 100644 include/uapi/linux/if_pppopns.h create mode 100644 include/uapi/linux/keychord.h create mode 100644 include/uapi/linux/usb/f_accessory.h create mode 100644 include/uapi/linux/usb/f_mtp.h create mode 100644 include/uapi/video/adf.h create mode 100644 include/video/adf.h create mode 100644 include/video/adf_client.h create mode 100644 include/video/adf_fbdev.h create mode 100644 include/video/adf_format.h create mode 100644 include/video/adf_memblock.h create mode 100644 kernel/power/wakeup_reason.c create mode 100644 kernel/trace/gpu-traces.c create mode 100644 net/activity_stats.c create mode 100644 net/ipv4/sysfs_net_ipv4.c create mode 100644 net/netfilter/xt_qtaguid.c create mode 100644 net/netfilter/xt_qtaguid_internal.h create mode 100644 net/netfilter/xt_qtaguid_print.c create mode 100644 net/netfilter/xt_qtaguid_print.h create mode 100644 net/netfilter/xt_quota2.c
Hi Alex,
On 18 February 2016 at 06:29, Alex Shi alex.shi@linaro.org wrote:
Thanks Amit, pulled on linux-linaro-lsk-v4.4-android.
BTW, I saw some similar lsk/android related branches on your git tree, like linaro-android-3.14-lsk/lsk-v3.14-android, linux-linaro-lsk-v4.1-android
Is there any rule binds the names? :)
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Looks like we already have these branches[1] setup for kernelci.org. Let us know if you need anything else!
Cheers,
Tyler or Milosz, Would you like to add new test branches on kernelci for lsk: linux-linaro-lsk-v4.4-android-test linux-linaro-lsk-v4.4-rt-test linux-linaro-lsk-v4.4-test
Looks like we already have these branches[1] setup for kernelci.org. Let us know if you need anything else!
Thanks Tyler, I have this question since I put a new lsk-4.4-android-test branch into LSK tree, but didn't find testing result on https://kernelci.org/job/lsk/
Could you like to double check this problem?
Thanks
linaro-kernel@lists.linaro.org
-
Alex Shi -
Amit Pundir -
Mark Brown -
Tyler Baker