Re: linux-next: manual merge of the net tree with Linus' tree

2021-03-21 Thread Leon Romanovsky
On Sat, Mar 20, 2021 at 12:42:06PM -0700, Linus Torvalds wrote: > On Sat, Mar 20, 2021 at 12:28 PM Marc Kleine-Budde > wrote: > > > > Good idea. I'll send a pull request to David and Jakub. > > I don't think the revert is necessary. The conflict is so trivial that > it doesn't really matter.

Re: linux-next: manual merge of the net tree with Linus' tree

2021-03-20 Thread Linus Torvalds
On Sat, Mar 20, 2021 at 12:28 PM Marc Kleine-Budde wrote: > > Good idea. I'll send a pull request to David and Jakub. I don't think the revert is necessary. The conflict is so trivial that it doesn't really matter. Conflicts like this that are local and obvious aren't really problematic. Any

Re: linux-next: manual merge of the net tree with Linus' tree

2021-03-20 Thread Marc Kleine-Budde
On 3/19/21 4:55 PM, Leon Romanovsky wrote: > On Fri, Mar 19, 2021 at 08:29:39AM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the net tree got a conflict in: >> >> drivers/net/can/usb/peak_usb/pcan_usb_fd.c >> >> between commit: >> >> 6417f03132a6 ("module: remove

Re: linux-next: manual merge of the net tree with Linus' tree

2021-03-19 Thread Leon Romanovsky
On Fri, Mar 19, 2021 at 08:29:39AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in: > > drivers/net/can/usb/peak_usb/pcan_usb_fd.c > > between commit: > > 6417f03132a6 ("module: remove never implemented MODULE_SUPPORTED_DEVICE") > >

linux-next: manual merge of the net tree with Linus' tree

2021-03-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net tree got a conflict in: drivers/net/can/usb/peak_usb/pcan_usb_fd.c between commit: 6417f03132a6 ("module: remove never implemented MODULE_SUPPORTED_DEVICE") from Linus' tree and commit: 59ec7b89ed3e ("can: peak_usb: add forgotten supported

Re: linux-next: manual merge of the net tree with Linus' tree

2020-06-09 Thread Arjun Roy
Ack, and thank you very much for the fix. -Arjun On Tue, Jun 9, 2020 at 4:30 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net tree got a conflict in: > > net/ipv4/tcp.c > > between commit: > > d8ed45c5dcd4 ("mmap locking API: use coccinelle to convert mmap_sem

linux-next: manual merge of the net tree with Linus' tree

2020-06-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net tree got a conflict in: net/ipv4/tcp.c between commit: d8ed45c5dcd4 ("mmap locking API: use coccinelle to convert mmap_sem rwsem call sites") from Linus' tree and commit: 3763a24c727e ("net-zerocopy: use vm_insert_pages() for tcp rcv

linux-next: manual merge of the net tree with Linus' tree

2019-07-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net tree got a conflict in: include/Kbuild between commit: 67bf47452ea0 ("kbuild: update compile-test header list for v5.3-rc1") from Linus' tree and commit: 408d2bbbfd46 ("kbuild: add net/netfilter/nf_tables_offload.h to header-test

linux-next: manual merge of the net tree with Linus' tree

2018-06-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net tree got a conflict in: net/smc/af_smc.c between commit: a11e1d432b51 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL") from Linus' tree and commit: 24ac3a08e658 ("net/smc: rebuild nonblocking connect") from the net tree.

linux-next: manual merge of the net tree with Linus' tree

2018-06-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net tree got a conflict in: net/smc/af_smc.c between commit: a11e1d432b51 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL") from Linus' tree and commit: 24ac3a08e658 ("net/smc: rebuild nonblocking connect") from the net tree.

linux-next: manual merge of the net tree with Linus' tree

2017-11-26 Thread Stephen Rothwell
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

linux-next: manual merge of the net tree with Linus' tree

2017-11-26 Thread Stephen Rothwell
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

Re: linux-next: manual merge of the net tree with Linus' tree

2016-10-17 Thread Mintz, Yuval
> 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

Re: linux-next: manual merge of the net tree with Linus' tree

2016-10-17 Thread Mintz, Yuval
> 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

linux-next: manual merge of the net tree with Linus' tree

2016-10-15 Thread Stephen Rothwell
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.

linux-next: manual merge of the net tree with Linus' tree

2016-10-15 Thread Stephen Rothwell
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.