* linux-next: manual merge of the staging tree with the trivial tree
@ 2011-07-16 12:53 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-07-16 12:53 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Joe Perches, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
("treewide: Convert uses of struct resource to resource_size(ptr)") from
the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
drivers") from the staging tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial tree
2011-07-16 12:53 linux-next: manual merge of the staging tree with the trivial tree Stephen Rothwell
@ 2011-07-17 9:16 ` Greg KH
2011-07-20 10:01 ` Jiri Kosina
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2011-07-17 9:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Joe Perches, Jiri Kosina
On Sat, Jul 16, 2011 at 10:53:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
> ("treewide: Convert uses of struct resource to resource_size(ptr)") from
> the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
> drivers") from the staging tree.
>
> The latter removes the file, so I did that.
Thank you, that is the correct fix :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial tree
2011-07-17 9:16 ` Greg KH
@ 2011-07-20 10:01 ` Jiri Kosina
0 siblings, 0 replies; 9+ messages in thread
From: Jiri Kosina @ 2011-07-20 10:01 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel, Joe Perches
On Sun, 17 Jul 2011, Greg KH wrote:
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
> > ("treewide: Convert uses of struct resource to resource_size(ptr)") from
> > the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
> > drivers") from the staging tree.
> >
> > The latter removes the file, so I did that.
>
> Thank you, that is the correct fix :)
I have dropped the conflicting hunks now (and the same for the other
trivial/staging conflict).
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial tree
2012-06-29 5:57 Stephen Rothwell
@ 2012-06-29 15:55 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2012-06-29 15:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paul Bolle, Jiri Kosina, H Hartley Sweeten
On Fri, Jun 29, 2012 at 03:57:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
> ("treewide: Put a space between #include and FILE") from the trivial tree
> and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
> macro") from the staging tree.
>
> Just context changes. I fixed it up and can carry the fix as necessary.
Sounds fine with me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the staging tree with the trivial tree
@ 2012-06-29 5:57 Stephen Rothwell
2012-06-29 15:55 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2012-06-29 5:57 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Paul Bolle, Jiri Kosina, H Hartley Sweeten
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
("treewide: Put a space between #include and FILE") from the trivial tree
and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
macro") from the staging tree.
Just context changes. I fixed it up and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial tree
2011-07-16 12:56 Stephen Rothwell
@ 2011-07-17 9:16 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2011-07-17 9:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Vitaliy Ivanov, Jiri Kosina
On Sat, Jul 16, 2011 at 10:56:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
> drivers/staging/westbridge/astoria/gadget/cyasgadget.h between commit
> e44ba033c565 ("treewide: remove duplicate includes") from the trivial
> tree and commit 78f23926dff9 ("Staging: delete westbridge code") from the
> staging tree.
>
> The latter removes the files, so I did that.
Thanks, that is correct.
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the staging tree with the trivial tree
@ 2011-07-16 12:56 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2011-07-16 12:56 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Vitaliy Ivanov, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
drivers/staging/westbridge/astoria/gadget/cyasgadget.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and commit 78f23926dff9 ("Staging: delete westbridge code") from the
staging tree.
The latter removes the files, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the staging tree with the trivial tree
@ 2011-06-21 5:10 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-06-21 5:10 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Vitaliy Ivanov, Jiri Kosina, Roland Vossen
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c and
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and various commits from the staging tree.
I think the final versions in the staging tree supercedes the change in
the trivial tree, so I used the staging tree versions.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the staging tree with the trivial tree
@ 2011-06-21 5:10 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-06-21 5:10 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, matt mooney, Vitaliy Ivanov, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/userspace/src/utils.h between commit e44ba033c565
("treewide: remove duplicate includes") from the trivial tree and commit
4cbab52d18fc ("staging: usbip: userspace: move header includes out
utils.h") from the staging tree.
The latter supercedes the former, so I used it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-06-29 15:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-16 12:53 linux-next: manual merge of the staging tree with the trivial tree Stephen Rothwell
2011-07-17 9:16 ` Greg KH
2011-07-20 10:01 ` Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2012-06-29 5:57 Stephen Rothwell
2012-06-29 15:55 ` Greg KH
2011-07-16 12:56 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
2011-06-21 5:10 Stephen Rothwell
2011-06-21 5:10 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).