Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-02-01 Thread Rodrigo Vivi
On Wed, Feb 01, 2023 at 10:37:06AM -0800, John Harrison wrote: > On 2/1/2023 07:31, Rodrigo Vivi wrote: > > On Wed, Feb 01, 2023 at 03:11:31PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison > > > wrote: > > > > On 1/31/2023 04:44, Andy S

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-02-01 Thread John Harrison
On 2/1/2023 07:31, Rodrigo Vivi wrote: On Wed, Feb 01, 2023 at 03:11:31PM +1100, Stephen Rothwell wrote: Hi all, On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison wrote: On 1/31/2023 04:44, Andy Shevchenko wrote: On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: Today's linu

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-02-01 Thread Rodrigo Vivi
On Wed, Feb 01, 2023 at 03:11:31PM +1100, Stephen Rothwell wrote: > Hi all, > > On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison > wrote: > > > > On 1/31/2023 04:44, Andy Shevchenko wrote: > > > On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > > >> > > >> Today's linux-next

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-01-31 Thread Stephen Rothwell
Hi all, On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison wrote: > > On 1/31/2023 04:44, Andy Shevchenko wrote: > > On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > >> > >> Today's linux-next merge of the usb tree got a conflict in: > >> > >>drivers/gpu/drm/i915/gt/intel_

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-01-31 Thread John Harrison
On 1/31/2023 04:44, Andy Shevchenko wrote: On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/gpu/drm/i915/gt/intel_engine_cs.c between commit: 5bc4b43d5c6c ("drm/i915: Fix up locking around dump

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-01-31 Thread Andy Shevchenko
On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/gpu/drm/i915/gt/intel_engine_cs.c > > between commit: > > 5bc4b43d5c6c ("drm/i915: Fix up locking around dumping requests lists") > > from

Re: linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-01-30 Thread Greg KH
On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/gpu/drm/i915/gt/intel_engine_cs.c > > between commit: > > 5bc4b43d5c6c ("drm/i915: Fix up locking around dumping requests lists") > > from

linux-next: manual merge of the usb tree with the drm-intel-fixes tree

2023-01-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the usb tree got a conflict in: drivers/gpu/drm/i915/gt/intel_engine_cs.c between commit: 5bc4b43d5c6c ("drm/i915: Fix up locking around dumping requests lists") from the drm-intel-fixes tree and commit: 4d70c74659d9 ("i915: Move list_count() to list.