author | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 6 Jan 2015 23:43:49 +0000 (17:43 -0600) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 6 Jan 2015 23:43:49 +0000 (17:43 -0600) |
p-android-3.14 : forked from google android-3.14 and maintained in omapzoom
p-ti-linux-3.14.y-android : Integration branch of p-ti-linux-3.14.y-common
and p-android-3.14
* p-android-3.14: (351 commits)
xt_qtaguid: Fix boot panic
netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk
net: kuid/kguid build fixes
cpufreq: interactive: hold reference on global cpufreq kobject if needed
futex: Ensure get_futex_key_refs() always implies a barrier
cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
fix sdio.c
video: adf: export the adf_attachment_allow symbol to modules.
power: wakeup_reason: rename irq_count to irqcount
Power: Add guard condition for maximum wakeup reasons
android: base-cfg: enable DM_VERITY (used for secureboot)
drivers: usb: gadget: 64-bit related type fixes
netfilter: xt_qtaguid: 64-bit warning fixes
Staging: android: binder: More offset validation.
POWER: fix compile warnings in log_wakeup_reason
Power: add an API to log wakeup reasons
android: configs: add systrace support to recommended configs
video: adf: use %zu when printing size_t
video: adf: fix compat ioctls calling ioctl with wrong cmd
video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions
...
Conflicts:
drivers/video/Kconfig
net/Makefile
Change-Id: I9a9d8928c23e94456ef650ede4177b74535561c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
p-ti-linux-3.14.y-android : Integration branch of p-ti-linux-3.14.y-common
and p-android-3.14
* p-android-3.14: (351 commits)
xt_qtaguid: Fix boot panic
netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk
net: kuid/kguid build fixes
cpufreq: interactive: hold reference on global cpufreq kobject if needed
futex: Ensure get_futex_key_refs() always implies a barrier
cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
fix sdio.c
video: adf: export the adf_attachment_allow symbol to modules.
power: wakeup_reason: rename irq_count to irqcount
Power: Add guard condition for maximum wakeup reasons
android: base-cfg: enable DM_VERITY (used for secureboot)
drivers: usb: gadget: 64-bit related type fixes
netfilter: xt_qtaguid: 64-bit warning fixes
Staging: android: binder: More offset validation.
POWER: fix compile warnings in log_wakeup_reason
Power: add an API to log wakeup reasons
android: configs: add systrace support to recommended configs
video: adf: use %zu when printing size_t
video: adf: fix compat ioctls calling ioctl with wrong cmd
video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions
...
Conflicts:
drivers/video/Kconfig
net/Makefile
Change-Id: I9a9d8928c23e94456ef650ede4177b74535561c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
66 files changed:
diff --cc Documentation/sysctl/vm.txt
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/compressed/head.S
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm/kernel/process.c
Simple merge
diff --cc block/genhd.c
Simple merge
diff --cc block/partition-generic.c
Simple merge
diff --cc drivers/Makefile
Simple merge
diff --cc drivers/base/power/main.c
Simple merge
diff --cc drivers/cpufreq/Kconfig
Simple merge
diff --cc drivers/cpufreq/Makefile
Simple merge
diff --cc drivers/iio/industrialio-event.c
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
diff --cc drivers/mmc/core/core.c
Simple merge
diff --cc drivers/mmc/core/host.c
Simple merge
diff --cc drivers/mmc/core/sdio_bus.c
Simple merge
diff --cc drivers/net/tun.c
Simple merge
diff --cc drivers/tty/serial/serial_core.c
Simple merge
diff --cc drivers/usb/gadget/Kconfig
Simple merge
diff --cc drivers/usb/gadget/composite.c
Simple merge
diff --cc drivers/usb/gadget/f_fs.c
Simple merge
diff --cc drivers/usb/gadget/u_serial.c
Simple merge
diff --cc drivers/usb/gadget/udc-core.c
Simple merge
diff --cc drivers/usb/phy/Kconfig
Simple merge
diff --cc drivers/usb/phy/Makefile
Simple merge
diff --cc drivers/video/Makefile
index aaaa78753a4a157aaa86b070756d5520b67ea611,accf67ae97b8b21f6b210c7a0320926d78bc47a2..bd7ba07c6da2a4c927beb49bc1d92af12dcfcc95
+++ b/drivers/video/Makefile
-# Makefile for the Linux video drivers.
-# 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
-# Rewritten to use lists instead of if-statements.
-
-# Each configuration option enables a list of files.
-
obj-$(CONFIG_VGASTATE) += vgastate.o
obj-$(CONFIG_HDMI) += hdmi.o
-obj-y += fb_notify.o
-obj-$(CONFIG_FB) += fb.o
-fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
- modedb.o fbcvt.o
-fb-objs := $(fb-y)
+ obj-$(CONFIG_ADF) += adf/
obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
obj-y += backlight/
diff --cc fs/eventpoll.c
Simple merge
diff --cc fs/fs-writeback.c
Simple merge
diff --cc fs/proc/task_mmu.c
Simple merge
diff --cc include/linux/cpufreq.h
Simple merge
diff --cc include/linux/hid.h
Simple merge
diff --cc include/linux/mm.h
index d5039daf1e1ce744af678087d0cb556471b5271d,5352fa9f4ded22460c2636833227702d82e80162..8a0e4c5c1d345aadbcc30c45b217c9d6973bfff9
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
extern void show_free_areas(unsigned int flags);
extern bool skip_free_areas_node(unsigned int flags, int nid);
+ void shmem_set_file(struct vm_area_struct *vma, struct file *file);
int shmem_zero_setup(struct vm_area_struct *);
+#ifdef CONFIG_SHMEM
+bool shmem_mapping(struct address_space *mapping);
+#else
+static inline bool shmem_mapping(struct address_space *mapping)
+{
+ return false;
+}
+#endif
extern int can_do_mlock(void);
extern int user_shm_lock(size_t, struct user_struct *);
diff --cc include/linux/mm_types.h
Simple merge
diff --cc include/linux/mmc/host.h
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc include/linux/serial_core.h
Simple merge
diff --cc include/net/tcp.h
Simple merge
diff --cc include/uapi/linux/input.h
Simple merge
diff --cc include/uapi/linux/sockios.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc kernel/cpu.c
Simple merge
diff --cc kernel/debug/debug_core.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/power/suspend.c
Simple merge
diff --cc kernel/printk/printk.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
diff --cc kernel/trace/trace.c
index 71136720ffa189ea63c4bfea23b6fab884b9650b,f03bde8a44b86a2e17becf3c499cf65a881381a6..5010917a93cdd1916fa25cb0e191967100ef1268
+++ b/kernel/trace/trace.c
}
memcpy(&saved_cmdlines[idx], tsk->comm, TASK_COMM_LEN);
+ saved_tgids[idx] = tsk->tgid;
arch_spin_unlock(&trace_cmdline_lock);
+
+ return 1;
}
void trace_find_cmdline(int pid, char comm[])
diff --cc kernel/trace/trace.h
Simple merge
diff --cc kernel/watchdog.c
Simple merge
diff --cc mm/madvise.c
Simple merge
diff --cc mm/mempolicy.c
Simple merge
diff --cc mm/mlock.c
Simple merge
diff --cc mm/mmap.c
Simple merge
diff --cc mm/page_alloc.c
index 4b258297cc7c9890567897d8d2420dfba297b1e5,2be8811e57f72dc1a486f86bafb1bca393a7158a..8c5ba3fe94316eb31080ddb12662c33d75a22db0
--- 1/mm/page_alloc.c
--- 2/mm/page_alloc.c
+++ b/mm/page_alloc.c
* If it's a lowmem zone, reserve a number of pages
* proportionate to the zone's size.
*/
- zone->watermark[WMARK_MIN] = tmp;
+ zone->watermark[WMARK_MIN] = min;
}
- zone->watermark[WMARK_LOW] = min_wmark_pages(zone) + (tmp >> 2);
- zone->watermark[WMARK_HIGH] = min_wmark_pages(zone) + (tmp >> 1);
+ zone->watermark[WMARK_LOW] = min_wmark_pages(zone) +
+ low + (min >> 2);
+ zone->watermark[WMARK_HIGH] = min_wmark_pages(zone) +
+ low + (min >> 1);
__mod_zone_page_state(zone, NR_ALLOC_BATCH,
- high_wmark_pages(zone) -
- low_wmark_pages(zone) -
- zone_page_state(zone, NR_ALLOC_BATCH));
+ high_wmark_pages(zone) - low_wmark_pages(zone) -
+ atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
setup_zone_migrate_reserve(zone);
spin_unlock_irqrestore(&zone->lock, flags);
diff --cc mm/shmem.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
diff --cc net/Makefile
index 902436fb3e99b0bc55c6a7e425f8c3d9ce75a628,74862871aa13e23010eca6fad8f32fc132d33edd..f9be789e92b78886c132c23f52df7d8f208bbbaf
--- 1/net/Makefile
--- 2/net/Makefile
+++ b/net/Makefile
obj-$(CONFIG_VSOCKETS) += vmw_vsock/
obj-$(CONFIG_NET_MPLS_GSO) += mpls/
obj-$(CONFIG_HSR) += hsr/
+obj-$(CONFIG_RPMSG) += rpmsg/
+ obj-$(CONFIG_NET_ACTIVITY_STATS) += activity_stats.o
diff --cc net/ipv4/af_inet.c
Simple merge
diff --cc net/ipv4/tcp.c
index 29d240b87af1a3b84774873ab24e6a6af546189c,40a2a2a3f53a5b20da1086771cbdccbfae6c2111..f40013ba47d4b4ff9bdadf335b6e9d48c7234e58
--- 1/net/ipv4/tcp.c
--- 2/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
out:
if (copied)
tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
+out_nopush:
release_sock(sk);
+
+ if (copied + copied_syn)
+ uid_stat_tcp_snd(from_kuid(&init_user_ns, current_uid()),
+ copied + copied_syn);
return copied + copied_syn;
do_fault:
diff --cc net/ipv4/tcp_input.c
Simple merge
diff --cc net/ipv4/tcp_output.c
Simple merge
diff --cc net/wireless/scan.c
Simple merge
diff --cc security/commoncap.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge