ba45a7f1d3
* remotes/origin/tmp-c3a2eda:
Linux 4.14.16
nfsd: auth: Fix gid sorting when rootsquash enabled
cpufreq: governor: Ensure sufficiently large sampling intervals
bpf, arm64: fix stack_depth tracking in combination with tail calls
bpf: reject stores into ctx via st and xadd
bpf: fix 32-bit divide by zero
bpf: fix divides by zero
bpf: avoid false sharing of map refcount with max_entries
bpf: introduce BPF_JIT_ALWAYS_ON config
hrtimer: Reset hrtimer cpu base proper on CPU hotplug
x86/mm/64: Fix vmapped stack syncing on very-large-memory 4-level systems
x86/microcode: Fix again accessing initrd after having been freed
x86/microcode/intel: Extend BDW late-loading further with LLC size check
perf/x86/amd/power: Do not load AMD power module on !AMD platforms
vmxnet3: repair memory leak
net: ipv4: Make "ip route get" match iif lo rules again.
tls: reset crypto_info when do_tls_setsockopt_tx fails
tls: return -EBUSY if crypto_info is already set
tls: fix sw_ctx leak
net/tls: Only attach to sockets in ESTABLISHED state
netlink: reset extack earlier in netlink_rcv_skb
nfp: use the correct index for link speed table
net/mlx5e: Fix fixpoint divide exception in mlx5e_am_stats_compare
netlink: extack needs to be reset each time through loop
sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
flow_dissector: properly cap thoff field
tun: fix a memory leak for tfile->tx_array
mlxsw: spectrum_router: Don't log an error on missing neighbor
gso: validate gso_type in GSO handlers
ip6_gre: init dev->mtu and dev->hard_header_len correctly
be2net: restore properly promisc mode after queues reconfiguration
ppp: unlock all_ppp_mutex before registering device
net/mlx5: Fix get vector affinity helper function
{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed
tipc: fix a memory leak in tipc_nl_node_get_link()
sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf
sctp: do not allow the v4 socket to bind a v4mapped v6 address
r8169: fix memory corruption on retrieval of hardware statistics.
pppoe: take ->needed_headroom of lower device into account on xmit
net: vrf: Add support for sends to local broadcast address
net/tls: Fix inverted error codes to avoid endless loop
net: tcp: close sock if net namespace is exiting
net: qdisc_pkt_len_init() should be more robust
net: igmp: fix source address check for IGMPv3 reports
lan78xx: Fix failure in USB Full Speed
ipv6: ip6_make_skb() needs to clear cork.base.dst
ipv6: fix udpv6 sendmsg crash caused by too small MTU
ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL
dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
net: Allow neigh contructor functions ability to modify the primary_key
drm/vc4: Fix NULL pointer dereference in vc4_save_hang_state()
ARM: net: bpf: clarify tail_call index
ARM: net: bpf: fix LDX instructions
ARM: net: bpf: fix register saving
ARM: net: bpf: correct stack layout documentation
ARM: net: bpf: move stack documentation
ARM: net: bpf: fix stack alignment
ARM: net: bpf: fix tail call jumps
ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs
orangefs: fix deadlock; do not write i_size in read_iter
KVM: s390: add proper locking for CMMA migration bitmap
Btrfs: fix stale entries in readdir
Input: trackpoint - only expose supported controls for Elan, ALPS and NXP
Input: trackpoint - force 3 buttons if 0 button is reported
Input: xpad - add support for PDP Xbox One controllers
Revert "module: Add retpoline tag to VERMAGIC"
xfrm: Fix a race in the xdst pcpu cache.
netfilter: xt_osf: Add missing permission checks
netfilter: nfnetlink_cthelper: Add missing permission checks
mm, page_alloc: fix potential false positive in __zone_watermark_ok
orangefs: initialize op on loop restart in orangefs_devreq_read
orangefs: use list_for_each_entry_safe in purge_waiting_ops
ANDROID: Revert "fs: unexport vfs_read and vfs_write"
ANDROID: sdcardfs: port to 4.14
ANDROID: fs: Export vfs_rmdir2
ANDROID: mm: Export do_munmap
ANDROID: fs: Export d_absolute_path
ANDROID: fs: Export free_fs_struct and set_fs_pwd
ANDROID: export security_path_chown
ANDROID: sdcardfs: Add default_normal option
ANDROID: sdcardfs: notify lower file of opens
ANDROID: Sdcardfs: Move gid derivation under flag
ANDROID: sdcardfs: override credential for ioctl to lower fs
ANDROID: sdcardfs: Remove unnecessary lock
ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb
ANDROID: sdcardfs: remove dead function open_flags_to_access_mode()
ANDROID: sdcardfs: d_splice_alias can return error values
ANDROID: sdcardfs: Check for NULL in revalidate
ANDROID: sdcardfs: Move top to its own struct
ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach
ANDROID: sdcardfs: Don't iput if we didn't igrab
ANDROID: sdcardfs: Call lower fs's revalidate
ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
ANDROID: sdcardfs: Copy meta-data from lower inode
ANDROID: sdcardfs: Use filesystem specific hash
ANDROID: sdcardfs: Don't complain in fixup_lower_ownership
ANDROID: sdcardfs: Don't do d_add for lower fs
ANDROID: sdcardfs: ->iget fixes
ANDROID: sdcardfs: Change cache GID value
ANDROID: sdcardfs: Directly pass lower file for mmap
ANDROID: sdcardfs: update module info
ANDROID: sdcardfs: use d_splice_alias
ANDROID: sdcardfs: add read_iter/write_iter opeations
ANDROID: sdcardfs: fix ->llseek to update upper and lower offset
ANDROID: sdcardfs: copy lower inode attributes in ->ioctl
ANDROID: sdcardfs: remove unnecessary call to do_munmap
ANDROID: sdcardfs: Fix style issues in macros
ANDROID: sdcardfs: Use seq_puts over seq_printf
ANDROID: sdcardfs: Use to kstrout
ANDROID: sdcardfs: Use pr_[...] instead of printk
ANDROID: sdcardfs: remove unneeded null check
ANDROID: sdcardfs: Fix style issues with comments
ANDROID: sdcardfs: Fix formatting
ANDROID: sdcardfs: correct order of descriptors
ANDROID: sdcardfs: Fix gid issue
ANDROID: sdcardfs: Remove uninformative prints
ANDROID: sdcardfs: move path_put outside of spinlock
ANDROID: sdcardfs: Use case insensitive hash function
ANDROID: sdcardfs: declare MODULE_ALIAS_FS
ANDROID: sdcardfs: Get the blocksize from the lower fs
ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve
ANDROID: sdcardfs: Switch to internal case insensitive compare
ANDROID: sdcardfs: Use spin_lock_nested
ANDROID: sdcardfs: Replace get/put with d_lock
ANDROID: sdcardfs: rate limit warning print
ANDROID: sdcardfs: Fix case insensitive lookup
ANDROID: sdcardfs: support direct-IO (DIO) operations
ANDROID: sdcardfs: implement vm_ops->page_mkwrite
ANDROID: sdcardfs: Don't bother deleting freelist
ANDROID: sdcardfs: Add missing path_put
ANDROID: sdcardfs: Fix incorrect hash
ANDROID: sdcardfs: Switch strcasecmp for internal call
ANDROID: sdcardfs: switch to full_name_hash and qstr
ANDROID: sdcardfs: Add GID Derivation to sdcardfs
ANDROID: sdcardfs: Remove redundant operation
ANDROID: sdcardfs: add support for user permission isolation
ANDROID: sdcardfs: Refactor configfs interface
ANDROID: sdcardfs: Allow non-owners to touch
ANDROID: sdcardfs: eliminate the offset argument to ->direct_IO
ANDROID: sdcardfs: make it use new .rename i_op
ANDROID: sdcardfs: Propagate dentry down to inode_change_ok()
ANDROID: sdcardfs: get rid of 'parent' argument of ->d_compare()
ANDROID: sdcardfs: add parent pointer into dentry name hash
ANDROID: sdcardfs: use wrappers to access i_mutex
ANDROID: sdcardfs: Fix locking issue with permision fix up
ANDROID: sdcardfs: Switch ->d_inode to d_inode()
ANDROID: sdcardfs: Change magic value
ANDROID: sdcardfs: Use per mount permissions
ANDROID: sdcardfs: Add gid and mask to private mount data
ANDROID: sdcardfs: User new permission2 functions
ANDROID: sdcardfs: Move directory unlock before touch
ANDROID: sdcardfs: fix external storage exporting incorrect uid
ANDROID: sdcardfs: Added top to sdcardfs_inode_info
ANDROID: sdcardfs: Switch package list to RCU
ANDROID: sdcardfs: Fix locking for permission fix up
ANDROID: sdcardfs: Check for other cases on path lookup
ANDROID: sdcardfs: override umask on mkdir and create
ANDROID: sdcardfs: fix itnull.cocci warnings
ANDROID: sdcardfs: Truncate packages_gid.list on overflow
ANDROID: sdcardfs: remove unneeded __init and __exit
ANDROID: sdcardfs: Remove unused code
ANDROID: sdcardfs: remove effectless config option
ANDROID: sdcardfs: Add support for d_canonical_path
ANDROID: sdcardfs: Bring up to date with Android M permissions:
ANDROID: Changed type-casting in packagelist management
ANDROID: Port of sdcardfs to 4.4
ANDROID: xattr: Pass EOPNOTSUPP to permission2
ANDROID: vfs: Add permission2 for filesystems with per mount permissions
ANDROID: vfs: Add setattr2 for filesystems with per mount permissions
ANDROID: vfs: Allow filesystems to access their private mount data
ANDROID: fuse: Add support for d_canonical_path
ANDROID: mnt: Add filesystem private data to mount points
ANDROID: vfs: add d_canonical_path for stacked filesystem support
ANDROID: Included sdcardfs source code for kernel 3.0
BACKPORT: thermal/drivers/hisi: Add support for hi3660 SoC
BACKPORT: thermal/drivers/hisi: Prepare to add support for other hisi platforms
BACKPORT: thermal/drivers/hisi: Add platform prefix to function name
BACKPORT: thermal/drivers/hisi: Put platform code together
BACKPORT: thermal/drivers/hisi: Use round up step value
BACKPORT: thermal/drivers/hisi: Move the clk setup in the corresponding functions
BACKPORT: thermal/drivers/hisi: Remove mutex_lock in the code
BACKPORT: thermal/drivers/hisi: Remove thermal data back pointer
BACKPORT: thermal/drivers/hisi: Convert long to int
BACKPORT: thermal/drivers/hisi: Rename and remove unused field
BACKPORT: thermal/drivers/hisi: Remove costly sensor inspection
BACKPORT: thermal/drivers/hisi: Fix configuration register setting
BACKPORT: thermal/drivers/hisi: Encapsulate register writes into helpers
BACKPORT: thermal/drivers/hisi: Remove pointless lock
BACKPORT: thermal/drivers/hisi: Remove the multiple sensors support
ANDROID: Fix script to fetch android kernel config fragments for 4.14
Conflicts:
fs/namei.c
fs/namespace.c
fs/open.c
fs/pnode.c
fs/sdcardfs/inode.c
fs/sdcardfs/lookup.c
include/linux/fs.h
Change-Id: I10679bc0171d61332f99d43b73820c91ae883336
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
The android-*.config files in this directory are meant to be used as a base
for an Android kernel config. All devices should have the options in
android-base.config enabled. While not mandatory, the options in
android-recommended.config enable advanced Android features.
Assuming you already have a minimalist defconfig for your device, a possible
way to enable these options would be:
ARCH=<arch> scripts/kconfig/merge_config.sh <path_to>/<device>_defconfig kernel/configs/android-base.config kernel/configs/android-recommended.config
This will generate a .config that can then be used to save a new defconfig or
compile a new kernel with Android features enabled.
Because there is no tool to consistently generate these config fragments,
lets keep them alphabetically sorted instead of random.