linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Oct 15
@ 2013-10-15 14:02 Thierry Reding
  2013-10-15 14:02 ` linux-next: manual merge of the trivial tree Thierry Reding
                   ` (4 more replies)
  0 siblings, 5 replies; 23+ messages in thread
From: Thierry Reding @ 2013-10-15 14:02 UTC (permalink / raw)
  To: linux-next, linux-kernel; +Cc: Mark Brown

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

        git://gitorious.org/thierryreding/linux-next.git

A next-20131015 tag is also provided for convenience.

Gained a new conflict, but nothing too exciting. x86 and ARM default
configurations build fine. I've also used an x86 allmodconfig build to
check for build errors. Mark fixed most of those in the trees that he
created last Thursday and Friday, so I've cherry-picked them on top of
the final merge. There was one new build failure in the staging tree
that was trivial to fix so I added a patch to the tree as well.

Thierry

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree
@ 2008-11-03  3:48 Stephen Rothwell
  2008-11-12 17:48 ` Jesper Juhl
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-11-03  3:48 UTC (permalink / raw)
  To: Jesper Juhl; +Cc: linux-next

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

Hi Jesper,

Given that you have had to give up producing the trivial tree and that it
has conflicts against Linus' tree, I will remove it permanently from
linux-next.

Thanks for your work over time.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree
@ 2008-07-28  3:37 Stephen Rothwell
  2008-07-28  9:41 ` Nick Andrew
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-07-28  3:37 UTC (permalink / raw)
  To: Jesper Juhl; +Cc: linux-next, Arthur Jones, Nick Andrew

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Hi Jesper,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/edac.txt between commit
327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
controls to parameters") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.

The former removed the whole section of the file in which the latter had
fixed a spelling mistake.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the trivial tree
@ 2008-07-07 15:39 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-07-07 15:39 UTC (permalink / raw)
  To: Jesper Juhl; +Cc: linux-next, Andrew G. Morgan, Nick Andrew

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

Hi Jesper,

Today's linux-next merge of the trivial tree got a tivial conflict in
include/linux/securebits.h between commit
086f7316f0d400806d76323beefae996bb3849b1 ("security: filesystem
capabilities: fix fragile setuid fixup code") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.

This was a trivial conflict (by definition of the tree :-)) the former
commit changed a comment and fixed the instance of loose to lose, so I
used that version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2013-10-19 17:07 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-15 14:02 linux-next: Tree for Oct 15 Thierry Reding
2013-10-15 14:02 ` linux-next: manual merge of the trivial tree Thierry Reding
2013-10-16  9:12   ` Jozsef Kadlecsik
2013-10-16  9:20     ` Jiri Kosina
2013-10-16 14:56       ` Pablo Neira Ayuso
2013-10-16 20:10         ` Jozsef Kadlecsik
2013-10-15 14:02 ` [PATCH] [media] staging: media: Fix build for iMON LIRC driver Thierry Reding
2013-10-16  7:03   ` Dan Carpenter
2013-10-16 14:12     ` Greg Kroah-Hartman
2013-10-15 19:50 ` linux-next: Tree for Oct 15 (usb gadget f_mass_storage and storage_common) Randy Dunlap
2013-10-15 22:43 ` linux-next: Tree for Oct 15 (asymmetric keys) Randy Dunlap
2013-10-16 15:52   ` Thierry Reding
2013-10-19 17:07   ` Randy Dunlap
2013-10-16  5:21 ` linux-next: Tree for Oct 15 Guenter Roeck
2013-10-16 15:50   ` Thierry Reding
2013-10-16 16:37     ` Guenter Roeck
2013-10-16 16:43       ` Thierry Reding
  -- strict thread matches above, loose matches on Subject: below --
2008-11-03  3:48 linux-next: manual merge of the trivial tree Stephen Rothwell
2008-11-12 17:48 ` Jesper Juhl
2008-07-28  3:37 Stephen Rothwell
2008-07-28  9:41 ` Nick Andrew
2008-08-27  5:19   ` Stephen Rothwell
2008-07-07 15:39 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).