Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/habanalabs/gaudi/gaudi.c
between commit:
e38bfd30e088 ("habanalabs: set clock gating per engine")
from Linus' tree and commits:
0b168c8f1d21 ("habanalabs: remove rate limiters from GAUDI")
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/habanalabs/common/command_submission.c
between commit:
cea7a0449ea3 ("habanalabs: prevent possible out-of-bounds array access")
from Linus' tree and commit:
3abc99bb7dcb ("habanalabs: configure
On Tue, Jul 30, 2013 at 10:27:54AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Mon, 29 Jul 2013 12:26:49 -0700 Greg KH wrote:
> >
> > On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the char-misc tree got a conflict in
> > >
Hi Greg,
On Mon, 29 Jul 2013 12:26:49 -0700 Greg KH wrote:
>
> On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the char-misc tree got a conflict in
> > drivers/misc/mei/init.c between commit 99f22c4ef24c ("mei: don't have to
> > clean the
On Tue, Jul 30, 2013 at 01:16:38AM +0300, Tomas Winkler wrote:
> >> (Unrelated white space changes are a pest :-()
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this
> >
>> (Unrelated white space changes are a pest :-()
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this
> merge problem should no longer be there.
I've preferred the blank line there
On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/misc/mei/init.c between commit 99f22c4ef24c ("mei: don't have to
> clean the state on power up") from Linus' tree and commit b950ac1dabfc
>
On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/mei/init.c between commit 99f22c4ef24c (mei: don't have to
clean the state on power up) from Linus' tree and commit b950ac1dabfc
(mei:
(Unrelated white space changes are a pest :-()
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this
merge problem should no longer be there.
I've preferred the blank line there as these
On Tue, Jul 30, 2013 at 01:16:38AM +0300, Tomas Winkler wrote:
(Unrelated white space changes are a pest :-()
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Thanks, I've merged the char-misc-next branch into 3.11-rc3, so this
merge problem
Hi Greg,
On Mon, 29 Jul 2013 12:26:49 -0700 Greg KH g...@kroah.com wrote:
On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/mei/init.c between commit 99f22c4ef24c (mei: don't have to
clean the
On Tue, Jul 30, 2013 at 10:27:54AM +1000, Stephen Rothwell wrote:
Hi Greg,
On Mon, 29 Jul 2013 12:26:49 -0700 Greg KH g...@kroah.com wrote:
On Mon, Jul 29, 2013 at 03:01:29PM +1000, Stephen Rothwell wrote:
Today's linux-next merge of the char-misc tree got a conflict in
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/mei/init.c between commit 99f22c4ef24c ("mei: don't have to
clean the state on power up") from Linus' tree and commit b950ac1dabfc
("mei: don't get stuck in select during reset") from the char-misc tree.
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
drivers/misc/mei/init.c between commit 99f22c4ef24c (mei: don't have to
clean the state on power up) from Linus' tree and commit b950ac1dabfc
(mei: don't get stuck in select during reset) from the char-misc tree.
(Unrelated
14 matches
Mail list logo
