Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 849e96f3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-5.2-20190528' of... 

Merge tag 'perf-urgent-for-mingo-5.2-20190528' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes:

BPF:

  Jiri Olsa:

  - Fixup determination of end of kernel map, to avoid having BPF programs,
    that are after the kernel headers and just before module texts mixed up in
    the kernel map.

tools UAPI header copies:

  Arnaldo Carvalho de Melo:

  - Update copy of files related to new fspick, fsmount, fsconfig, fsopen,
    move_mount and open_tree syscalls.

  - Sync cpufeatures.h, sched.h, fs.h, drm.h, i915_drm.h and kvm.h headers.

Namespaces:

  Namhyung Kim:

  - Add missing byte swap ops for namespace events when processing records from
    perf.data files that could have been recorded in a arch with a different
    endianness.

  - Fix access to the thread namespaces list by using the namespaces_lock.

perf data:

  Shawn Landden:

  - Fix 'strncat may truncate' build failure with recent gcc.

s/390

  Thomas Richter:

  - Fix s390 missing module symbol and warning for non-root users in 'perf record'.

arm64:

  Vitaly Chikunov:

  - Fix mksyscalltbl when system kernel headers are ahead of the kernel.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5322ea58 a7350998

Documentation/bpf/btf.rst

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ The following sections detail encoding of each kind. 
``btf_type`` is followed by a ``u32`` with the following bits arrangement::



  #define BTF_INT_ENCODING(VAL)   (((VAL) & 0x0f000000) >> 24)

  #define BTF_INT_OFFSET(VAL)     (((VAL  & 0x00ff0000)) >> 16)

  #define BTF_INT_OFFSET(VAL)     (((VAL) & 0x00ff0000) >> 16)

  #define BTF_INT_BITS(VAL)       ((VAL)  & 0x000000ff)



The ``BTF_INT_ENCODING`` has the following attributes::

Documentation/kbuild/makefiles.txt

+0 −14
Original line number Diff line number Diff line
@@ -437,20 +437,6 @@ more details, with real examples. 
	The second argument is optional, and if supplied will be used

	if first argument is not supported.



    cc-ldoption

	cc-ldoption is used to check if $(CC) when used to link object files

	supports the given option.  An optional second option may be

	specified if first option are not supported.



	Example:

		#arch/x86/kernel/Makefile

		vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)



	In the above example, vsyscall-flags will be assigned the option

	-Wl$(comma)--hash-style=sysv if it is supported by $(CC).

	The second argument is optional, and if supplied will be used

	if first argument is not supported.



    as-instr

	as-instr checks if the assembler reports a specific instruction

	and then outputs either option1 or option2

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -11068,10 +11068,8 @@ S: Supported 
F:	drivers/net/ethernet/qlogic/netxen/



NFC SUBSYSTEM

M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (subscribers-only)

S:	Supported

L:	netdev@vger.kernel.org

S:	Orphan

F:	net/nfc/

F:	include/net/nfc/

F:	include/uapi/linux/nfc.h

drivers/atm/iphase.c

+0 −6
Original line number Diff line number Diff line
@@ -2767,12 +2767,6 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
   case MEMDUMP:

   {

	switch (ia_cmds.sub_cmd) {

       	  case MEMDUMP_DEV:     

	     if (!capable(CAP_NET_ADMIN)) return -EPERM;

	     if (copy_to_user(ia_cmds.buf, iadev, sizeof(IADEV)))

                return -EFAULT;

             ia_cmds.status = 0;

             break;

          case MEMDUMP_SEGREG:

	     if (!capable(CAP_NET_ADMIN)) return -EPERM;

             tmps = (u16 __user *)ia_cmds.buf;

drivers/infiniband/hw/mlx5/ib_rep.c

+7 −6
Original line number Diff line number Diff line
@@ -109,15 +109,15 @@ u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw) 
}



struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_IB);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_IB);

}



struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

					  int vport_index)

					  u16 vport_num)

{

	return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_ETH);

	return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_ETH);

}



struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
@@ -125,9 +125,10 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw) 
	return mlx5_eswitch_uplink_get_proto_dev(esw, REP_IB);

}



struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, int vport)

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   u16 vport_num)

{

	return mlx5_eswitch_vport_rep(esw, vport);

	return mlx5_eswitch_vport_rep(esw, vport_num);

}



struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,