* linux-next: manual merge of the staging tree with the pcmcia tree
@ 2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-11-09 7:15 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Bart Massey, Dominik Brodowski
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_labpc_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commits
c22f24e5f0ed5a45e4b339577a1151c4bbb8977a ("Staging: comedi: ni_labpc_cs:
added mandatory whitespace to comparison") and
f195fbc2466c79cda709074fdbb969079e0787e0 ("Staging: comedi: ni_labpc_cs:
wrapped long comments") from the staging tree.
I fixed it up (using the pcmcia tree version where there was a clash) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the staging tree with the pcmcia tree
2009-11-09 7:15 linux-next: manual merge of the staging tree with the pcmcia tree Stephen Rothwell
@ 2009-11-20 18:29 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2009-11-20 18:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Bart Massey, Dominik Brodowski
On Mon, Nov 09, 2009 at 06:15:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/ni_labpc_cs.c between commit
> 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
> drivers") from the pcmcia tree and commits
> c22f24e5f0ed5a45e4b339577a1151c4bbb8977a ("Staging: comedi: ni_labpc_cs:
> added mandatory whitespace to comparison") and
> f195fbc2466c79cda709074fdbb969079e0787e0 ("Staging: comedi: ni_labpc_cs:
> wrapped long comments") from the staging tree.
>
> I fixed it up (using the pcmcia tree version where there was a clash) and
> can carry the fix as necessary.
Thanks for the fixup.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the staging tree with the pcmcia tree
@ 2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-11-09 7:15 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Dominik Brodowski, Vadim Mutilin
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/cb_das16_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commit
e18c724339a542aac71d1d47b0695bf7b4a5c3a3 ("STAGING: comedi: cb_das16_cs:
fixing coding style errors") from the staging tree.
I fixed it up (using the pcmcia tree version when there is a clash) and
can carry the fix as necessary.
[Greg, that staging tree commit has no SOB from its author ...]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the staging tree with the pcmcia tree
2009-11-09 7:15 Stephen Rothwell
@ 2009-11-20 18:29 ` Greg KH
2009-11-21 1:34 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2009-11-20 18:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Dominik Brodowski, Vadim Mutilin
On Mon, Nov 09, 2009 at 06:15:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/cb_das16_cs.c between commit
> 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
> drivers") from the pcmcia tree and commit
> e18c724339a542aac71d1d47b0695bf7b4a5c3a3 ("STAGING: comedi: cb_das16_cs:
> fixing coding style errors") from the staging tree.
>
> I fixed it up (using the pcmcia tree version when there is a clash) and
> can carry the fix as necessary.
>
> [Greg, that staging tree commit has no SOB from its author ...]
Good catch, I missed that :(
I've now dropped this patch from my tree, so it should be fine now.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the staging tree with the pcmcia tree
2009-11-20 18:29 ` Greg KH
@ 2009-11-21 1:34 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2009-11-21 1:34 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Dominik Brodowski, Vadim Mutilin
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hi Greg,
On Fri, 20 Nov 2009 10:29:03 -0800 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Nov 09, 2009 at 06:15:44PM +1100, Stephen Rothwell wrote:
> >
> > I fixed it up (using the pcmcia tree version when there is a clash) and
> > can carry the fix as necessary.
> >
> > [Greg, that staging tree commit has no SOB from its author ...]
>
> Good catch, I missed that :(
>
> I've now dropped this patch from my tree, so it should be fine now.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the staging tree with the pcmcia tree
@ 2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:27 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-11-09 7:15 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Daniel Patrick Johnson, Dominik Brodowski
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_mio_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commit
bd7881ee58045b4b684f4400b24081656e0c6986 ("Staging: comedi: ni_mio_cs.c:
coding style cleanup") from the staging tree.
I fixed it up (mainly using the pcmcia tree version when there was a
clash) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the staging tree with the pcmcia tree
2009-11-09 7:15 Stephen Rothwell
@ 2009-11-20 18:27 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2009-11-20 18:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Daniel Patrick Johnson, Dominik Brodowski
On Mon, Nov 09, 2009 at 06:15:27PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/ni_mio_cs.c between commit
> 4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
> drivers") from the pcmcia tree and commit
> bd7881ee58045b4b684f4400b24081656e0c6986 ("Staging: comedi: ni_mio_cs.c:
> coding style cleanup") from the staging tree.
>
> I fixed it up (mainly using the pcmcia tree version when there was a
> clash) and can carry the fix as necessary.
Thanks for the fix.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-11-21 1:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-09 7:15 linux-next: manual merge of the staging tree with the pcmcia tree Stephen Rothwell
2009-11-20 18:29 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:29 ` Greg KH
2009-11-21 1:34 ` Stephen Rothwell
2009-11-09 7:15 Stephen Rothwell
2009-11-20 18:27 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.