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.
<.
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 mai
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
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")
>
> f
> 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 t
