public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2014-05-22 20:28 Richard Farina
  0 siblings, 0 replies; 7+ messages in thread
From: Richard Farina @ 2014-05-22 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     eabddaa666050589b296041714d69d6af9feefb5
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 20:30:02 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu May 22 20:30:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=eabddaa6

Merged master into aufs

While doing it there were some odd permissions issues in the area so I
fixed them to be more sane.

Merge branch 'aufs' of git+ssh://git.overlays.gentoo.org/proj/genkernel into aufs

Conflicts:
	defaults/linuxrc



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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2014-06-23 23:09 Robin H. Johnson
  0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson @ 2014-06-23 23:09 UTC (permalink / raw
  To: gentoo-commits

commit:     80eb6e77440abece3306d5e06a979d72a4dcc14e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 23 23:08:59 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 23:08:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=80eb6e77

Merge branch 'master' into aufs


 arch/alpha/kernel-config  |  2 +-
 arch/x86/kernel-config    |  2 +-
 arch/x86_64/kernel-config |  2 +-
 defaults/kernel-config    |  2 +-
 gen_cmdline.sh            |  5 ++++-
 gen_configkernel.sh       | 20 ++++++++++----------
 gen_determineargs.sh      |  2 +-
 gen_initramfs.sh          |  4 ++--
 gen_package.sh            | 28 ++++++++++++++++++++++------
 genkernel                 | 14 +++++++-------
 genkernel.conf            |  2 +-
 11 files changed, 51 insertions(+), 32 deletions(-)


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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2014-09-05 16:09 Richard Farina
  0 siblings, 0 replies; 7+ messages in thread
From: Richard Farina @ 2014-09-05 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     be040f3cab1457638b9c7aa48e2716be66832e28
Author:     Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Sun Jun 29 21:24:53 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 21:24:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=be040f3c

fixed merged conflicts



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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2014-09-05 16:09 Richard Farina
  0 siblings, 0 replies; 7+ messages in thread
From: Richard Farina @ 2014-09-05 16:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a3702a25188312f16841623ab1f6294137705bca
Author:     Fernando Reyes <fernando.r <AT> weboperative <DOT> com>
AuthorDate: Fri Sep  5 02:57:17 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Sep  5 02:57:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=a3702a25

Merge branch 'aufs-new' into master-test


 defaults/initrd.defaults |   8 ++
 defaults/initrd.scripts  | 289 +++++++++++++++++++++++++++++++++++++++++++----
 defaults/linuxrc         | 267 +++++++++++++++++++++++++++----------------
 3 files changed, 447 insertions(+), 117 deletions(-)


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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2015-04-29 19:04 Richard Farina
  0 siblings, 0 replies; 7+ messages in thread
From: Richard Farina @ 2015-04-29 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     cd5c71745ff543d1bad376fb647e3b4a94451f3c
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 19:03:59 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 19:03:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cd5c7174

Merge branch 'aufs' of git+ssh://git.gentoo.org/proj/genkernel into aufs



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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2016-01-05 19:40 Robin H. Johnson
  0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson @ 2016-01-05 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5a448b4fe1e088e012f57d2a3151b6c77b6654f3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:40:01 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:40:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5a448b4f

Merge branch 'aufs' of git+ssh://git.gentoo.org/proj/genkernel into aufs



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

* [gentoo-commits] proj/genkernel:aufs commit in: /
@ 2016-01-05 19:40 Robin H. Johnson
  0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson @ 2016-01-05 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b33fa5c2b6145e422ef01a889a2b2e9b04fbe00b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 16:11:21 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 16:11:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b33fa5c2

Merge branch 'master' into aufs

 arch/alpha/config.sh              |    3 +-
 arch/arm/config.sh                |    3 +-
 arch/ia64/config.sh               |    3 +-
 arch/mips/config.sh               |    2 +
 arch/parisc/config.sh             |    3 +-
 arch/parisc64/config.sh           |    3 +-
 arch/ppc/config.sh                |    3 +-
 arch/ppc64/config.sh              |    3 +-
 arch/{ia64 => s390}/config.sh     |    5 +-
 arch/s390/kernel-config           | 1155 +++++++++++++++++++++++++++++++++++++
 arch/{alpha => s390}/modules_load |    0
 arch/sparc/config.sh              |    3 +-
 arch/sparc64/config.sh            |    5 +-
 arch/um/config.sh                 |    3 +-
 arch/x86/config.sh                |    3 +-
 arch/x86_64/config.sh             |    3 +-
 defaults/config.sh                |    4 +-
 defaults/initrd.scripts           |    2 +-
 doc/genkernel.8.txt               |    5 +
 gen_cmdline.sh                    |    8 +-
 gen_compile.sh                    |    2 +-
 gen_determineargs.sh              |    1 +
 gen_initramfs.sh                  |   10 +
 genkernel.conf                    |   16 +-
 24 files changed, 1226 insertions(+), 22 deletions(-)


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

end of thread, other threads:[~2016-01-05 19:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-05 16:09 [gentoo-commits] proj/genkernel:aufs commit in: / Richard Farina
  -- strict thread matches above, loose matches on Subject: below --
2016-01-05 19:40 Robin H. Johnson
2016-01-05 19:40 Robin H. Johnson
2015-04-29 19:04 Richard Farina
2014-09-05 16:09 Richard Farina
2014-06-23 23:09 Robin H. Johnson
2014-05-22 20:28 Richard Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox