Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 29 Jun 2018 08:36:59 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992747AbeF2GhBsbBtg/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Jun 29 08:35:21 2018 +0200 Commit: 1f1f27bd25f767f1bcc96c8a36bc368d0366ecd6 Gitweb: https://git.linux-mips.org/g/ralf/linux/1f1f27bd25f7 Branch: master --- Documentation/filesystems/Locking | 7 -- Documentation/filesystems/vfs.txt | 13 --- MAINTAINERS | 9 ++ arch/x86/kernel/e820.c | 15 +++ crypto/af_alg.c | 13 ++- crypto/algif_aead.c | 4 - crypto/algif_skcipher.c | 4 - drivers/char/random.c | 29 +++---- drivers/isdn/mISDN/socket.c | 2 drivers/mtd/chips/cfi_cmdset_0002.c | 19 +++- drivers/mtd/devices/mtd_dataflash.c | 4 - drivers/mtd/nand/raw/denali_dt.c | 6 + drivers/mtd/nand/raw/mxc_nand.c | 5 + drivers/mtd/nand/raw/nand_base.c | 2 drivers/mtd/nand/raw/nand_macronix.c | 48 ++++++++--- drivers/mtd/nand/raw/nand_micron.c | 2 drivers/net/ppp/pppoe.c | 2 fs/aio.c | 148 ---------------------------------- fs/eventfd.c | 19 +--- fs/eventpoll.c | 15 +-- fs/pipe.c | 22 ++--- fs/select.c | 23 ----- fs/timerfd.c | 22 +++-- include/crypto/if_alg.h | 3 - include/linux/dax.h | 2 include/linux/fs.h | 2 include/linux/net.h | 1 include/linux/poll.h | 12 +-- include/linux/skbuff.h | 3 - include/linux/slub_def.h | 4 + include/net/bluetooth/bluetooth.h | 2 include/net/iucv/af_iucv.h | 2 include/net/sctp/sctp.h | 3 - include/net/tcp.h | 3 - include/net/tls.h | 6 + include/net/udp.h | 2 include/uapi/linux/aio_abi.h | 8 +- lib/Kconfig.kasan | 1 lib/percpu_ida.c | 2 lib/test_printf.c | 7 -- mm/slab_common.c | 4 + mm/slub.c | 7 +- mm/vmstat.c | 2 net/appletalk/ddp.c | 2 net/atm/common.c | 11 ++- net/atm/common.h | 2 net/atm/pvc.c | 2 net/atm/svc.c | 2 net/ax25/af_ax25.c | 2 net/bluetooth/af_bluetooth.c | 7 +- net/bluetooth/hci_sock.c | 2 net/bluetooth/l2cap_sock.c | 2 net/bluetooth/rfcomm/sock.c | 2 net/bluetooth/sco.c | 2 net/caif/caif_socket.c | 12 ++- net/can/bcm.c | 2 net/can/raw.c | 2 net/core/datagram.c | 13 ++- net/dccp/dccp.h | 3 - net/dccp/ipv4.c | 2 net/dccp/ipv6.c | 2 net/dccp/proto.c | 13 +++ net/decnet/af_decnet.c | 6 + net/ieee802154/socket.c | 4 - net/ipv4/af_inet.c | 8 +- net/ipv4/tcp.c | 23 ++++- net/ipv4/udp.c | 10 +- net/ipv6/af_inet6.c | 4 - net/ipv6/raw.c | 4 - net/iucv/af_iucv.c | 7 +- net/kcm/kcmsock.c | 10 +- net/key/af_key.c | 2 net/l2tp/l2tp_ip.c | 2 net/l2tp/l2tp_ip6.c | 2 net/l2tp/l2tp_ppp.c | 2 net/llc/af_llc.c | 2 net/netlink/af_netlink.c | 2 net/netrom/af_netrom.c | 2 net/nfc/llcp_sock.c | 9 +- net/nfc/rawsock.c | 4 - net/packet/af_packet.c | 9 +- net/phonet/socket.c | 9 +- net/qrtr/qrtr.c | 2 net/rose/af_rose.c | 2 net/rxrpc/af_rxrpc.c | 10 ++ net/sctp/ipv6.c | 2 net/sctp/protocol.c | 2 net/sctp/socket.c | 4 + net/smc/af_smc.c | 12 ++- net/socket.c | 48 +---------- net/tipc/socket.c | 14 ++- net/tls/tls_main.c | 2 net/tls/tls_sw.c | 19 ++-- net/unix/af_unix.c | 30 ++++--- net/vmw_vsock/af_vsock.c | 19 +++- net/x25/af_x25.c | 2 net/xdp/xsk.c | 7 +- sound/core/seq/seq_clientmgr.c | 3 - sound/core/timer.c | 2 sound/pci/hda/hda_codec.c | 5 + sound/pci/hda/hda_codec.h | 1 sound/pci/hda/patch_ca0132.c | 64 +++++---------- sound/pci/hda/patch_hdmi.c | 5 + sound/pci/hda/patch_realtek.c | 20 ++++- sound/pci/lx6464es/lx6464es.c | 1 105 files changed, 453 insertions(+), 538 deletions(-)