Prev: [BUGFIX] kprobes/x86: Fix removed int3 checking order
Next: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
From: Greg KH on 28 Apr 2010 11:50
On Wed, Apr 28, 2010 at 04:11:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/netwave/netwave_cs.c between commit
> c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
> trailing whitespace style issue in netwave_cs.c") from the staging-next
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Fix looks fine, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 28 Apr 2010 12:00
On Wed, Apr 28, 2010 at 04:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/comedi/drivers/cb_das16_cs.c between commitc
> 8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and
> commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi:
> cb_das16_cs: fixed multiple brace coding style issues") from the
> staging-next tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Looks great, thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 12 May 2010 16:00
On Wed, May 12, 2010 at 04:03:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit ("") from the
> staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Heh, I just hacked that driver up to build properly, odds are it doesn't
run :)

But your fix looks fine, thanks for it.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 17 May 2010 14:30
On Mon, May 17, 2010 at 03:49:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> eb14120f743d29744d9475bffec56ff4ad43a749 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 93822ad193f1b1d92422dc3d539456acbe1a85ef ("Staging: wlags49_hs2: Fix
> wlags49_hs2 driver after build fixes broke it") from the staging-next
> tree.
>
> I fixed it up (see below - basically the staging-next version) and can
> carry the fix as necessary.

Looks good to me, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [BUGFIX] kprobes/x86: Fix removed int3 checking order
Next: linux-next: manual merge of the staging-next tree with the v4l-dvb tree