summaryrefslogtreecommitdiff
path: root/fs/nilfs2/cpfile.h
diff options
context:
space:
mode:
authorSrinivasarao P <spathi@codeaurora.org>2017-12-26 19:12:47 +0530
committerSrinivasarao P <spathi@codeaurora.org>2017-12-26 19:13:02 +0530
commit00a5539a807c39d9051cf71056350b7615e4af21 (patch)
treeac47f357266b85c866f07bbc8b23a15ddfbe6105 /fs/nilfs2/cpfile.h
parentf373da7543ac64952bc98652646712a694b942ac (diff)
parentf0b9d2d0acea78a0d77181974f94d595df58aa88 (diff)
Merge android-4.4.101 (f0b9d2d) into msm-4.4
* refs/heads/tmp-f0b9d2d Linux 4.4.101 mm/pagewalk.c: report holes in hugetlb ranges mm/page_ext.c: check if page_ext is not prepared mm: check the return value of lookup_page_ext for all call sites coda: fix 'kernel memory exposure attempt' in fsync mm/page_alloc.c: broken deferred calculation ipmi: fix unsigned long underflow ocfs2: should wait dio before inode lock in ocfs2_setattr() nvme: Fix memory order on async queue deletion arm64: fix dump_instr when PAN and UAO are in use serial: omap: Fix EFR write on RTS deassertion ima: do not update security.ima if appraisal status is not INTEGRITY_PASS net/sctp: Always set scope_id in sctp_inet6_skb_msgname fealnx: Fix building error on MIPS sctp: do not peel off an assoc from one netns to another one af_netlink: ensure that NLMSG_DONE never fails in dumps vlan: fix a use-after-free in vlan_device_event() bonding: discard lowest hash bit for 802.3ad layer3+4 netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed tcp: do not mangle skb->cb[] in tcp_make_synack() Conflicts: mm/debug-pagealloc.c mm/page_ext.c mm/page_owner.c Change-Id: I551aff1b4c8a0d72f64a234abb8ac88990fbc9e5 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'fs/nilfs2/cpfile.h')
0 files changed, 0 insertions, 0 deletions