linux-next: manual merge of the akpm-current tree with the net-next tree

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/net/inet_sock.h

between commit:

  60e2a7780793 ("tcp: TCP experimental option for SMC")

from the net-next tree and commit:

  8a3e1a11b8af ("kmemcheck: remove annotations")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/net/inet_sock.h
index 2135c9ba6ac3,21c3e4d73b88..000000000000
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@@ -92,12 -90,10 +90,11 @@@ struct inet_request_sock 
  				wscale_ok  : 1,
  				ecn_ok	   : 1,
  				acked	   : 1,
 -				no_srccheck: 1;
 +				no_srccheck: 1,
 +				smc_ok	   : 1;
- 	kmemcheck_bitfield_end(flags);
  	u32                     ir_mark;
  	union {
 -		struct ip_options_rcu	*opt;
 +		struct ip_options_rcu __rcu	*ireq_opt;
  #if IS_ENABLED(CONFIG_IPV6)
  		struct {
  			struct ipv6_txoptions	*ipv6_opt;

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  mm/filemap.c

between commit:

  76cd61739fd1 ("mm/error_inject: Fix allow_error_inject function signatures.")

from the net-next tree and commit:

  2cb138387ead ("mm/filemap: fix storing to a THP shadow entry")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/filemap.c
index 78d07a712112,054d93a86f8a..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -827,10 -827,10 +827,10 @@@ int replace_page_cache_page(struct pag
  }
  EXPORT_SYMBOL_GPL(replace_page_cache_page);
  
- static int __add_to_page_cache_locked(struct page *page,
- 				      struct address_space *mapping,
- 				      pgoff_t offset, gfp_t gfp,
- 				      void **shadowp)
+ noinline int __add_to_page_cache_locked(struct page *page,
+ 					struct address_space *mapping,
 -					pgoff_t offset, gfp_t gfp_mask,
++					pgoff_t offset, gfp_t gfp,
+ 					void **shadowp)
  {
  	XA_STATE(xas, &mapping->i_pages, offset);
  	int huge = PageHuge(page);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 865 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  net/sctp/socket.c

between commits:

  89fae01eef8b ("sctp: switch sctp_setsockopt_auth_key to use memzero_explicit")
  534d13d07e77 ("sctp: pass a kernel pointer to sctp_setsockopt_auth_key")

from the net-next tree and commit:

  f08cd4915bb1 ("mm, treewide: rename kzfree() to kfree_sensitive()")

from the akpm-current tree.

I fixed it up (I just used the net-next tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  mm/cma.h

between commit:

  a2b992c828f7 ("debugfs: make sure we can remove u32_array files cleanly")

from the net-next tree and commit:

  bc7212aceef6 ("mm: cma: fix the name of CMA areas")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/cma.h
index 6698fa63279b,27d3f0e9f68f..000000000000
--- a/mm/cma.h
+++ b/mm/cma.h
@@@ -2,8 -2,8 +2,10 @@@
  #ifndef __MM_CMA_H__
  #define __MM_CMA_H__
  
 +#include <linux/debugfs.h>
 +
+ #define CMA_MAX_NAME 64
+ 
  struct cma {
  	unsigned long   base_pfn;
  	unsigned long   count;
@@@ -13,9 -13,8 +15,9 @@@
  #ifdef CONFIG_CMA_DEBUGFS
  	struct hlist_head mem_head;
  	spinlock_t mem_head_lock;
 +	struct debugfs_u32_array dfs_bitmap;
  #endif
- 	const char *name;
+ 	char name[CMA_MAX_NAME];
  };
  
  extern struct cma cma_areas[MAX_CMA_AREAS];

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/Makefile

between commit:

  509e56b37cc3 ("blackhole_dev: add a selftest")

from the net-next tree and commit:

  c86f3a66de9a ("lib: introduce test_meminit module")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/Makefile
index 0c3c197a7801,05980c802500..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -91,7 -91,7 +91,8 @@@ obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += tes
  obj-$(CONFIG_TEST_MEMCAT_P) += test_memcat_p.o
  obj-$(CONFIG_TEST_OBJAGG) += test_objagg.o
  obj-$(CONFIG_TEST_STACKINIT) += test_stackinit.o
 +obj-$(CONFIG_TEST_BLACKHOLE_DEV) += test_blackhole_dev.o
+ obj-$(CONFIG_TEST_MEMINIT) += test_meminit.o
  
  obj-$(CONFIG_TEST_LIVEPATCH) += livepatch/
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  net/ipv6/sysctl_net_ipv6.c

between commit:

  323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets")

from the net-next tree and commit:

  f4e7c821eda5 ("proc/sysctl: add shared variables for range check")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/ipv6/sysctl_net_ipv6.c
index 6d86fac472e7,4c6adfccc3d2..000000000000
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@@ -21,9 -21,6 +21,7 @@@
  #include <net/calipso.h>
  #endif
  
- static int zero;
- static int one = 1;
 +static int three = 3;
  static int auto_flowlabels_min;
  static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
  
@@@ -115,8 -112,6 +113,8 @@@ static struct ctl_table ipv6_table_temp
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
- 		.extra1		= &zero,
++		.extra1		= SYSCTL_ZERO,
 +		.extra2		= &three,
  	},
  	{
  		.procname	= "max_dst_opts_number",

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the akpm-current tree with the net-next tree

[Andy Shevchenko]

On Mon, May 06, 2019 at 08:43:03PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   lib/Makefile
> 
> between commit:
> 
>   554aae35007e ("lib: Add support for generic packing operations")
> 
> from the net-next tree and commit:
> 
>   1a1e7f563bd5 ("lib: Move mathematic helpers to separate folder")
> 
> from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Seems correct to me.
Thanks!

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc lib/Makefile
> index 83d7df2661ff,4eeb814eee2e..000000000000
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@@ -17,20 -17,9 +17,20 @@@ KCOV_INSTRUMENT_list_debug.o := 
>   KCOV_INSTRUMENT_debugobjects.o := n
>   KCOV_INSTRUMENT_dynamic_debug.o := n
>   
>  +# Early boot use of cmdline, don't instrument it
>  +ifdef CONFIG_AMD_MEM_ENCRYPT
>  +KASAN_SANITIZE_string.o := n
>  +
>  +ifdef CONFIG_FUNCTION_TRACER
>  +CFLAGS_REMOVE_string.o = -pg
>  +endif
>  +
>  +CFLAGS_string.o := $(call cc-option, -fno-stack-protector)
>  +endif
>  +
>   lib-y := ctype.o string.o vsprintf.o cmdline.o \
>   	 rbtree.o radix-tree.o timerqueue.o xarray.o \
> - 	 idr.o int_sqrt.o extable.o \
> + 	 idr.o extable.o \
>   	 sha1.o chacha.o irq_regs.o argv_split.o \
>   	 flex_proportions.o ratelimit.o show_mem.o \
>   	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
> @@@ -120,8 -110,6 +122,7 @@@ obj-$(CONFIG_DEBUG_LIST) += list_debug.
>   obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
>   
>   obj-$(CONFIG_BITREVERSE) += bitrev.o
>  +obj-$(CONFIG_PACKING)	+= packing.o
> - obj-$(CONFIG_RATIONAL)	+= rational.o
>   obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
>   obj-$(CONFIG_CRC16)	+= crc16.o
>   obj-$(CONFIG_CRC_T10DIF)+= crc-t10dif.o



-- 
With Best Regards,
Andy Shevchenko

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1950 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/Makefile

between commit:

  554aae35007e ("lib: Add support for generic packing operations")

from the net-next tree and commit:

  1a1e7f563bd5 ("lib: Move mathematic helpers to separate folder")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/Makefile
index 83d7df2661ff,4eeb814eee2e..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -17,20 -17,9 +17,20 @@@ KCOV_INSTRUMENT_list_debug.o := 
  KCOV_INSTRUMENT_debugobjects.o := n
  KCOV_INSTRUMENT_dynamic_debug.o := n
  
 +# Early boot use of cmdline, don't instrument it
 +ifdef CONFIG_AMD_MEM_ENCRYPT
 +KASAN_SANITIZE_string.o := n
 +
 +ifdef CONFIG_FUNCTION_TRACER
 +CFLAGS_REMOVE_string.o = -pg
 +endif
 +
 +CFLAGS_string.o := $(call cc-option, -fno-stack-protector)
 +endif
 +
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
  	 rbtree.o radix-tree.o timerqueue.o xarray.o \
- 	 idr.o int_sqrt.o extable.o \
+ 	 idr.o extable.o \
  	 sha1.o chacha.o irq_regs.o argv_split.o \
  	 flex_proportions.o ratelimit.o show_mem.o \
  	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
@@@ -120,8 -110,6 +122,7 @@@ obj-$(CONFIG_DEBUG_LIST) += list_debug.
  obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
  
  obj-$(CONFIG_BITREVERSE) += bitrev.o
 +obj-$(CONFIG_PACKING)	+= packing.o
- obj-$(CONFIG_RATIONAL)	+= rational.o
  obj-$(CONFIG_CRC_CCITT)	+= crc-ccitt.o
  obj-$(CONFIG_CRC16)	+= crc16.o
  obj-$(CONFIG_CRC_T10DIF)+= crc-t10dif.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/net/ethernet/netronome/nfp/nfp_net_common.c

between commits:

  5f0ca2fb71e2 ("nfp: handle page allocation failures")
  790a39917183 ("nfp: switch to dev_alloc_page()")
  16f50cda06ae ("nfp: use a counter instead of log message for allocation failures")

from the net-next tree and commit:

  0432d14c45bb ("mm: remove __GFP_COLD")

from the akpm-current tree.

I fixed it up (the former series removes the use of alloc_page() from
nfp_net_napi_alloc_one()) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/sh/configs/se7751_defconfig

between commit:

  9efdb14f76f4 ("net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.")

from the net-next tree and commit:

  a83883ff2285 ("sh: defconfig: cleanup from old Kconfig options")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/sh/configs/se7751_defconfig
index 56b5e4ce8d4a,153e1d3c8be5..000000000000
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_defconfig
@@@ -25,12 -24,10 +24,9 @@@ CONFIG_IP_PNP=
  CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y
  CONFIG_IP_PNP_RARP=y
- # CONFIG_INET_LRO is not set
  # CONFIG_IPV6 is not set
  CONFIG_NETFILTER=y
- CONFIG_IP_NF_QUEUE=y
 -CONFIG_NETFILTER_DEBUG=y
  CONFIG_MTD=y
- CONFIG_MTD_PARTITIONS=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
  CONFIG_MTD_CFI_AMDSTD=y

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/net/sock.h
  net/ipv4/tcp_ipv4.c

between commit:

  64be0aed59ad ("net: diag: Add the ability to destroy a socket.")

from the net-next tree and commit:

  0e2cde9cf7b6 ("net: tcp_memcontrol: simplify linkage between socket and page counter")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/net/sock.h
index f772b8245cae,edd552ef8e38..000000000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -309,8 -292,8 +293,8 @@@ struct cg_proto
    *	@sk_send_head: front of stuff to transmit
    *	@sk_security: used by security modules
    *	@sk_mark: generic packet mark
 -  *	@sk_classid: this socket's cgroup classid
 +  *	@sk_cgrp_data: cgroup data for this cgroup
-   *	@sk_cgrp: this socket's cgroup-specific proto data
+   *	@sk_memcg: this socket's memory cgroup association
    *	@sk_write_pending: a write to stream socket waits to start
    *	@sk_state_change: callback to indicate change in the state of the sock
    *	@sk_data_ready: callback to indicate there is data to be processed
@@@ -444,8 -428,11 +428,8 @@@ struct sock 
  #ifdef CONFIG_SECURITY
  	void			*sk_security;
  #endif
 -	__u32			sk_mark;
 -#ifdef CONFIG_CGROUP_NET_CLASSID
 -	u32			sk_classid;
 -#endif
 +	struct sock_cgroup_data	sk_cgrp_data;
- 	struct cg_proto		*sk_cgrp;
+ 	struct mem_cgroup	*sk_memcg;
  	void			(*sk_state_change)(struct sock *sk);
  	void			(*sk_data_ready)(struct sock *sk);
  	void			(*sk_write_space)(struct sock *sk);
@@@ -1051,19 -1036,6 +1035,7 @@@ struct proto 
  #ifdef SOCK_REFCNT_DEBUG
  	atomic_t		socks;
  #endif
- #ifdef CONFIG_MEMCG_KMEM
- 	/*
- 	 * cgroup specific init/deinit functions. Called once for all
- 	 * protocols that implement it, from cgroups populate function.
- 	 * This function has to setup any files the protocol want to
- 	 * appear in the kmem cgroup filesystem.
- 	 */
- 	int			(*init_cgroup)(struct mem_cgroup *memcg,
- 					       struct cgroup_subsys *ss);
- 	void			(*destroy_cgroup)(struct mem_cgroup *memcg);
- 	struct cg_proto		*(*proto_cgroup)(struct mem_cgroup *memcg);
- #endif
 +	int			(*diag_destroy)(struct sock *sk, int err);
  };
  
  int proto_register(struct proto *prot, int alloc_slab);
diff --cc net/ipv4/tcp_ipv4.c
index 205e6745393f,34c26782e114..000000000000
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -2336,12 -2339,6 +2338,7 @@@ struct proto tcp_prot = 
  	.compat_setsockopt	= compat_tcp_setsockopt,
  	.compat_getsockopt	= compat_tcp_getsockopt,
  #endif
- #ifdef CONFIG_MEMCG_KMEM
- 	.init_cgroup		= tcp_init_cgroup,
- 	.destroy_cgroup		= tcp_destroy_cgroup,
- 	.proto_cgroup		= tcp_proto_cgroup,
- #endif
 +	.diag_destroy		= tcp_abort,
  };
  EXPORT_SYMBOL(tcp_prot);
  

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/net/sock.h

between commits:

  297dbde19cf6 ("netprio_cgroup: limit the maximum css->id to USHRT_MAX")
  2a56a1fec290 ("net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct")

from the net-next tree and commit:

  c4b672bd7b34 ("net: tcp_memcontrol: simplify linkage between socket and page counter")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/net/sock.h
index c57e7ce0d097,edd552ef8e38..000000000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -309,8 -292,8 +293,8 @@@ struct cg_proto
    *	@sk_send_head: front of stuff to transmit
    *	@sk_security: used by security modules
    *	@sk_mark: generic packet mark
 -  *	@sk_classid: this socket's cgroup classid
 +  *	@sk_cgrp_data: cgroup data for this cgroup
-   *	@sk_cgrp: this socket's cgroup-specific proto data
+   *	@sk_memcg: this socket's memory cgroup association
    *	@sk_write_pending: a write to stream socket waits to start
    *	@sk_state_change: callback to indicate change in the state of the sock
    *	@sk_data_ready: callback to indicate there is data to be processed
@@@ -443,8 -428,11 +427,8 @@@ struct sock 
  #ifdef CONFIG_SECURITY
  	void			*sk_security;
  #endif
 -	__u32			sk_mark;
 -#ifdef CONFIG_CGROUP_NET_CLASSID
 -	u32			sk_classid;
 -#endif
 +	struct sock_cgroup_data	sk_cgrp_data;
- 	struct cg_proto		*sk_cgrp;
+ 	struct mem_cgroup	*sk_memcg;
  	void			(*sk_state_change)(struct sock *sk);
  	void			(*sk_data_ready)(struct sock *sk);
  	void			(*sk_write_space)(struct sock *sk);

linux-next: manual merge of the akpm-current tree with the net-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
lib/Makefile between commits 9d6dbe1bbaf8 ("rhashtable: Make selftest
modular") and 57dd8a0735aa ("vhost: vhost_scsi_handle_vq() should just
use copy_from_user()") from the net-next tree and commits f3d593d650ec
("hexdump: introduce test suite") and ("lib: add kasan test module")
from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/Makefile
index 25c061f77df7,87e55a1219bd..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -23,8 -23,8 +23,8 @@@ lib-y	+= kobject.o klist.
  obj-y	+= lockref.o
  
  obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
- 	 bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
+ 	 bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
 -	 gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \
 +	 gcd.o lcm.o list_sort.o uuid.o flex_array.o clz_ctz.o \
  	 bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
  	 percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
  obj-y += string_helpers.o
@@@ -35,7 -37,7 +37,8 @@@ obj-$(CONFIG_TEST_LKM) += test_module.
  obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o
  obj-$(CONFIG_TEST_BPF) += test_bpf.o
  obj-$(CONFIG_TEST_FIRMWARE) += test_firmware.o
 +obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
+ obj-$(CONFIG_TEST_KASAN) += test_kasan.o
  
  ifeq ($(CONFIG_DEBUG_KOBJECT),y)
  CFLAGS_kobject.o += -DDEBUG

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]