summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'work.sys_wait' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2017-07-056-259/+187
|\
| * osf_wait4: switch to kernel_wait4()Al Viro2017-05-213-41/+18
| * waitid(): switch copyout of siginfo to unsafe_put_user()Al Viro2017-05-211-15/+25
| * wait_task_zombie: consolidate info logicsAl Viro2017-05-211-29/+16
| * kill wait_noreap_copyout()Al Viro2017-05-211-40/+25
| * lift getrusage() from wait_noreap_copyout()Al Viro2017-05-211-7/+6
| * waitid(2): leave copyout of siginfo to syscall itselfAl Viro2017-05-211-104/+64
| * kernel_wait4()/kernel_waitid(): delay copying status to userlandAl Viro2017-05-211-12/+8
| * wait4(2)/waitid(2): separate copying rusage to userlandAl Viro2017-05-213-48/+59
| * move compat wait4 and waitid next to native variantsAl Viro2017-05-212-66/+69
* | Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2017-07-0512-271/+220
|\ \
| * | Switch flock copyin/copyout primitives to copy_{from,to}_user()Al Viro2017-06-271-30/+29
| * | Merge remote-tracking branch 'jl/locks-4.13' into work.misc-set_fsAl Viro2017-06-27599-3372/+7122
| |\ \
| | * | fs/fcntl: return -ESRCH in f_setown when pid/pgid can't be foundJeff Layton2017-06-141-5/+13
| | * | fs/fcntl: f_setown, avoid undefined behaviourJiri Slaby2017-06-141-0/+4
| | * | fs/fcntl: f_setown, allow returning errorJiri Slaby2017-06-143-6/+6
| | * | fs/locks: don't mess with the address limit in compat_fcntl64Christoph Hellwig2017-06-011-51/+67
| | * | fs/locks: pass kernel struct flock to fcntl_getlk/setlkChristoph Hellwig2017-05-273-66/+48
| | * | fs: locks: Fix some troubles at kernel-doc commentsMauro Carvalho Chehab2017-05-271-10/+8
| * | | lpfc debugfs: get rid of pointless access_ok()Al Viro2017-06-041-20/+0
| * | | adb: get rid of pointless access_ok()Al Viro2017-06-041-4/+0
| * | | isdn: get rid of pointless access_ok()Al Viro2017-06-043-26/+0
| * | | compat statfs: switch to copy_to_user()Al Viro2017-06-041-28/+30
| * | | nfsd_readlink(): switch to vfs_get_link()Al Viro2017-05-271-23/+16
| * | | drbd: ->sendpage() never needed set_fs()Al Viro2017-05-271-3/+0
* | | | Cavium CNN55XX: fix broken default Kconfig entryLinus Torvalds2017-07-051-1/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-07-051901-35701/+98363
|\ \ \ \
| * \ \ \ Merge branch 'phy-dp83867-workaround-incorrect-RX_CTRL-pin-strap'David S. Miller2017-07-052-0/+18
| |\ \ \ \
| | * | | | net: phy: dp83867: add workaround for incorrect RX_CTRL pin strapMurali Karicheri2017-07-051-0/+11
| | * | | | dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strapMurali Karicheri2017-07-051-0/+7
| |/ / / /
| * | | | Merge branch 'cxgb4-ptp'David S. Miller2017-07-0510-14/+900
| |\ \ \ \
| | * | | | cxgb4: Support for get_ts_info ethtool methodAtul Gupta2017-07-051-1/+18
| | * | | | cxgb4: Add PTP Hardware Clock (PHC) supportAtul Gupta2017-07-052-0/+287
| | * | | | cxgb4: time stamping interface for PTPAtul Gupta2017-07-059-13/+595
| |/ / / /
| * | | | Merge branch 'nfp-port-enumeration-change-and-FW-ABI-adjustment'David S. Miller2017-07-056-49/+28
| |\ \ \ \
| | * | | | nfp: default to chained metadata prepend formatJakub Kicinski2017-07-051-1/+8
| | * | | | nfp: remove legacy MAC address lookupJakub Kicinski2017-07-054-34/+8
| | * | | | nfp: improve order of interfaces in breakout modeJakub Kicinski2017-07-053-14/+12
| |/ / / /
| * | | | net: macb: remove extraneous return when MACB_EXT_DESC is definedColin Ian King2017-07-051-1/+0
| * | | | bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP caseColin Ian King2017-07-051-0/+1
| * | | | bpf: fix return in load_bpf_fileLawrence Brakmo2017-07-051-2/+6
| * | | | mpls: fix rtm policy in mpls_getrouteRoopa Prabhu2017-07-052-2/+1
| * | | | Merge branch 'net-subsystem-misc-refcounter-conversions'David S. Miller2017-07-0461-209/+223
| |\ \ \ \
| | * | | | net, ax25: convert ax25_cb.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * | | | net, ax25: convert ax25_route.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * | | | net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+5
| | * | | | net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-7/+7
| | * | | | net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+5
| | * | | | net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * | | | net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4