linux-next: manual merge of the net tree with Linus' tree
Hi all, Today's linux-next merge of the net tree got a conflict in: net/rxrpc/call_object.c between commit: e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()") from Linus' tree and commit: 9faaff593404 ("rxrpc: Provide a different lockdep key for call->user_mutex for kernel calls") from the net 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/rxrpc/call_object.c index 994dc2df57e4,7ee3d6ce5aa2.. --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@@ -114,7 -118,16 +118,15 @@@ struct rxrpc_call *rxrpc_alloc_call(str goto nomem_2; mutex_init(>user_mutex); + + /* Prevent lockdep reporting a deadlock false positive between the afs +* filesystem and sys_sendmsg() via the mmap sem. +*/ + if (rx->sk.sk_kern_sock) + lockdep_set_class(>user_mutex, + _call_user_mutex_lock_class_key); + - setup_timer(>timer, rxrpc_call_timer_expired, - (unsigned long)call); + timer_setup(>timer, rxrpc_call_timer_expired, 0); INIT_WORK(>processor, _process_call); INIT_LIST_HEAD(>link); INIT_LIST_HEAD(>chan_wait_link);
Re: linux-next: manual merge of the net tree with Linus' tree
> Today's linux-next merge of the net tree got a conflict in: > drivers/net/ethernet/qlogic/Kconfig > between commit: > 2e0cbc4dd077 ("qedr: Add RoCE driver framework") > from Linus' tree and commit: > 0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR") > from the net 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. My bad; I've sent the fix to 'net' and was not aware that the qedr submission was already accepted in linux-rdma. > I also added this merge fix patch: > From: Stephen Rothwell> Date: Sun, 16 Oct 2016 08:09:42 +1100 > Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move > Signed-off-by: Stephen Rothwell > --- > drivers/infiniband/hw/qedr/Kconfig | 1 + > 1 file changed, 1 insertion(+) > diff --git a/drivers/infiniband/hw/qedr/Kconfig > b/drivers/infiniband/hw/qedr/Kconfig > index 7c06d85568d4..6c9f3923e838 100644 > --- a/drivers/infiniband/hw/qedr/Kconfig > +++ b/drivers/infiniband/hw/qedr/Kconfig > @@ -2,6 +2,7 @@ config INFINIBAND_QEDR > tristate "QLogic RoCE driver" > depends on 64BIT && QEDE > select QED_LL2 > + select QED_RDMA > ---help--- > This driver provides low-level InfiniBand over Ethernet > support for QLogic QED host channel adapters (HCAs). > -- > 2.8.1 Looks good; Thanks.
linux-next: manual merge of the net tree with Linus' tree
Hi all, Today's linux-next merge of the net tree got a conflict in: drivers/net/ethernet/qlogic/Kconfig between commit: 2e0cbc4dd077 ("qedr: Add RoCE driver framework") from Linus' tree and commit: 0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR") from the net 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. I also added this merge fix patch: From: Stephen RothwellDate: Sun, 16 Oct 2016 08:09:42 +1100 Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move Signed-off-by: Stephen Rothwell --- drivers/infiniband/hw/qedr/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig index 7c06d85568d4..6c9f3923e838 100644 --- a/drivers/infiniband/hw/qedr/Kconfig +++ b/drivers/infiniband/hw/qedr/Kconfig @@ -2,6 +2,7 @@ config INFINIBAND_QEDR tristate "QLogic RoCE driver" depends on 64BIT && QEDE select QED_LL2 + select QED_RDMA ---help--- This driver provides low-level InfiniBand over Ethernet support for QLogic QED host channel adapters (HCAs). -- 2.8.1 -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/qlogic/Kconfig index 1e8339a67f6e,77567727528a.. --- a/drivers/net/ethernet/qlogic/Kconfig +++ b/drivers/net/ethernet/qlogic/Kconfig @@@ -107,4 -107,19 +107,7 @@@ config QED ---help--- This enables the support for ... + config QED_RDMA + bool + -config INFINIBAND_QEDR - tristate "QLogic qede RoCE sources [debug]" - depends on QEDE && 64BIT - select QED_LL2 - select QED_RDMA - default n - ---help--- -This provides a temporary node that allows the compilation -and logical testing of the InfiniBand over Ethernet support -for QLogic QED. This would be replaced by the 'real' option -once the QEDR driver is added [+relocated]. - endif # NET_VENDOR_QLOGIC