Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.. #2

Merged
merged 12 commits into from
Dec 17, 2016
Merged

.. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8312548
ARM: dts: msm: Move vddmx voting to corner base voting for msm8939
May 6, 2015
3d95864
defconfig: enable NF_MATCH_RPFILTER
intervigilium Dec 8, 2016
ae92c20
eCryptfs: Remove buggy and unnecessary write in file name decode routine
mhalcrow-google Nov 26, 2014
9416794
mnt: Only change user settable mount flags in remount
ebiederm Jul 28, 2014
f42e15b
vfs: read file_handle only once in handle_to_path
sashalevin Jan 29, 2015
30ccaa1
mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support
kiryl Dec 20, 2013
b01a156
net: llc: use correct size for sysctl timeout entries
sashalevin Jan 24, 2015
2c191f4
KEYS: Fix short sprintf buffer in /proc/keys show function
dhowells Sep 6, 2016
407faa5
fs: ext4: disable support for fallocate FALLOC_FL_PUNCH_HOLE
nickdesaulniers Jul 18, 2016
a96e11d
Revert "msm: mdss: Port HBM fixes"
Alberto97 Dec 10, 2016
551e714
perf: protect group_leader from races that cause ctx double-free
Oct 10, 2016
1483a74
BACKPORT: perf: Fix event->ctx locking
Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom/msm8939-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
interrupts = <0 145 0 0 146 0>;
interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";

qcom,pronto-vddmx-supply = <&pm8916_l3>;
qcom,pronto-vddmx-supply = <&pm8916_l3_corner_ao>;
qcom,pronto-vddcx-supply = <&pm8916_s2_corner>;
qcom,pronto-vddpx-supply = <&pm8916_l7>;
qcom,iris-vddxo-supply = <&pm8916_l7>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/configs/harpia_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_RPFILTER is not set
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
Expand Down Expand Up @@ -912,7 +912,7 @@ CONFIG_IP6_NF_IPTABLES=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
# CONFIG_IP6_NF_MATCH_RPFILTER is not set
CONFIG_IP6_NF_MATCH_RPFILTER=y
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=y
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/configs/lux_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_RPFILTER is not set
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
Expand Down Expand Up @@ -910,7 +910,7 @@ CONFIG_IP6_NF_IPTABLES=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
# CONFIG_IP6_NF_MATCH_RPFILTER is not set
CONFIG_IP6_NF_MATCH_RPFILTER=y
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=y
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/configs/merlin_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_RPFILTER is not set
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
Expand Down Expand Up @@ -910,7 +910,7 @@ CONFIG_IP6_NF_IPTABLES=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
# CONFIG_IP6_NF_MATCH_RPFILTER is not set
CONFIG_IP6_NF_MATCH_RPFILTER=y
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=y
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/configs/osprey_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_RPFILTER is not set
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
Expand Down Expand Up @@ -912,7 +912,7 @@ CONFIG_IP6_NF_IPTABLES=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
# CONFIG_IP6_NF_MATCH_RPFILTER is not set
CONFIG_IP6_NF_MATCH_RPFILTER=y
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=y
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/configs/surnia_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
# CONFIG_IP_NF_MATCH_RPFILTER is not set
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
Expand Down Expand Up @@ -910,7 +910,7 @@ CONFIG_IP6_NF_IPTABLES=y
# CONFIG_IP6_NF_MATCH_HL is not set
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
# CONFIG_IP6_NF_MATCH_MH is not set
# CONFIG_IP6_NF_MATCH_RPFILTER is not set
CONFIG_IP6_NF_MATCH_RPFILTER=y
# CONFIG_IP6_NF_MATCH_RT is not set
# CONFIG_IP6_NF_TARGET_HL is not set
CONFIG_IP6_NF_FILTER=y
Expand Down
29 changes: 2 additions & 27 deletions drivers/video/msm/mdss/mdss_fb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,36 +1034,11 @@ static void mdss_fb_restore_param(struct msm_fb_data_type *mfd)
mutex_unlock(&mfd->param_lock);
}

static ssize_t sre_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
const char *name;
ssize_t ret;

ret = mdss_fb_get_param(dev, PARAM_HBM_ID, &name);
if (ret < 0)
return ret;

return snprintf(buf, PAGE_SIZE, "%s\n", name);
}
static ssize_t sre_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
ssize_t ret;

if (!strcmp(buf, "2")) {
buf = "1";
}

ret = mdss_fb_set_param(dev, PARAM_HBM_ID, buf);
return ret ? ret : count;
}

__PARAM_SYSFS_DEFINITION(hbm, PARAM_HBM_ID)
__PARAM_SYSFS_DEFINITION(cabc, PARAM_CABC_ID)

static struct device_attribute param_attrs[PARAM_ID_NUM] = {
__ATTR(sre, S_IWUSR | S_IWGRP | S_IRUSR | S_IRGRP, sre_show, sre_store),
__ATTR(hbm, S_IWUSR | S_IWGRP | S_IRUSR | S_IRGRP, hbm_show, hbm_store),
__ATTR(cabc_mode, S_IWUSR | S_IWGRP | S_IRUSR | S_IRGRP,
cabc_show, cabc_store),
};
Expand Down
1 change: 0 additions & 1 deletion fs/ecryptfs/crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,6 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size,
break;
case 2:
dst[dst_byte_offset++] |= (src_byte);
dst[dst_byte_offset] = 0;
current_bit_offset = 0;
break;
}
Expand Down
7 changes: 7 additions & 0 deletions fs/ext4/inode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3574,6 +3574,7 @@ int ext4_can_truncate(struct inode *inode)

int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
{
#if 0
struct inode *inode = file_inode(file);
struct super_block *sb = inode->i_sb;
ext4_lblk_t first_block, stop_block;
Expand Down Expand Up @@ -3759,6 +3760,12 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
out_mutex:
mutex_unlock(&inode->i_mutex);
return ret;
#else
/*
* Disabled as per b/28760453
*/
return -EOPNOTSUPP;
#endif
}

/*
Expand Down
5 changes: 3 additions & 2 deletions fs/fhandle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
goto out_err;
}
/* copy the full handle */
if (copy_from_user(handle, ufh,
sizeof(struct file_handle) +
*handle = f_handle;
if (copy_from_user(&handle->f_handle,
&ufh->f_handle,
f_handle.handle_bytes)) {
retval = -EFAULT;
goto out_handle;
Expand Down
2 changes: 1 addition & 1 deletion fs/namespace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
err = do_remount_sb(sb, flags, data, 0);
if (!err) {
br_write_lock(&vfsmount_lock);
mnt_flags |= mnt->mnt.mnt_flags & MNT_PROPAGATION_MASK;
mnt_flags |= mnt->mnt.mnt_flags & ~MNT_USER_SETTABLE_MASK;
mnt->mnt.mnt_flags = mnt_flags;
br_write_unlock(&vfsmount_lock);
}
Expand Down
5 changes: 2 additions & 3 deletions include/asm-generic/pgtable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,11 +550,10 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
barrier();
#endif
if (pmd_none(pmdval))
if (pmd_none(pmdval) || pmd_trans_huge(pmdval))
return 1;
if (unlikely(pmd_bad(pmdval))) {
if (!pmd_trans_huge(pmdval))
pmd_clear_bad(pmd);
pmd_clear_bad(pmd);
return 1;
}
return 0;
Expand Down
4 changes: 3 additions & 1 deletion include/linux/mount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ struct mnt_namespace;
* flag, consider how it interacts with shared mounts.
*/
#define MNT_SHARED_MASK (MNT_UNBINDABLE)
#define MNT_PROPAGATION_MASK (MNT_SHARED | MNT_UNBINDABLE)
#define MNT_USER_SETTABLE_MASK (MNT_NOSUID | MNT_NODEV | MNT_NOEXEC \
| MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME \
| MNT_READONLY)


#define MNT_INTERNAL 0x4000
Expand Down
6 changes: 6 additions & 0 deletions include/linux/perf_event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,12 @@ struct perf_event {
int nr_siblings;
int group_flags;
struct perf_event *group_leader;

/*
* Protect the pmu, attributes and context of a group leader.
* Note: does not protect the pointer to the group_leader.
*/
struct mutex group_leader_mutex;
struct pmu *pmu;

enum perf_event_active_state state;
Expand Down
Loading