ce that would make me search for
> the problem/a mail from Stephen.
Well,
wget -q -O-
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/Next/SHA1s
| sed -n 's/^battery\t\t*//p'
will get you the SHA1 of the top of your branch that I merged into the
latest release
h. I reported this to Sebastian on
Sept 29, Oct 2 , Oct 8, Oct 16, and Oct 21. The only response I got
was from Marek Belisko on Oct 8 and 21. I have been using the battery
tree (git://git.infradead.org/battery-2.6.git#master) from Sept 25, so
none of the commits after that have been in
is kernel/time/hrtimer.c: restart_syscall: use freezable
blocking call and, indeed, it was removed from linux-next and Andrew's
tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpIg8zTIDw_X.pgp
Description: OpenPGP digital signature
maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s
Hi Paul,
On Fri, 26 Dec 2014 15:38:22 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
On Fri, 19 Dec 2014 19:28:08 + (UTC) Paul Walmsley p...@pwsan.com wrote:
Might you be willing to include this branch in your linux-next builds?
git://git.kernel.org/pub/scm/linux/kernel/git
.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
pgp0B4RsFPBy4.pgp
Description: OpenPGP digital signature
-by: Hugh Dickins hu...@google.com
I assume that this is a fix for commit 89f7ca1af15b (vfs: Keep a list
of mounts on a mount point) that is currently i the vfs tree. I will
apply this patch as a fix up for the vfs tree in linux-next today.
--
Cheers,
Stephen Rothwell
signature.asc
Description: PGP
be (M/y/?).
That's certainly not expected considering it wasn't like that before.
That commit has been reverted in today's kbuild tree and thus in today's
linux-next.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp12d6AjrONU.pgp
Description: PGP signature
Hi balbi,
On Thu, 27 Jun 2013 10:04:24 +0300 Felipe Balbi ba...@ti.com wrote:
On Thu, Jun 27, 2013 at 04:36:55PM +1000, Stephen Rothwell wrote:
That commit has been reverted in today's kbuild tree and thus in today's
linux-next.
thanks, I should fetch again :-)
Let me finish first
Hi Ohad,
On Tue, 16 Apr 2013 20:51:13 +0300 Ohad Ben-Cohen o...@wizery.com wrote:
On Tue, Apr 16, 2013 at 3:07 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
On Mon, 15 Apr 2013 09:28:17 +0300 Ohad Ben-Cohen o...@wizery.com wrote:
Could you please add:
git://git.kernel.org/pub/scm
is in it and how
it will be merged up to Linus. Does this have anything to do with the
remoteproc tree I already include? Who is the official maintainer (there
is no mention of drivers/rpmsg in the MAINTAINERS file).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
(or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen
subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s
/kernel/git/lethal/sh-2.6.git#sh-latest
vfs-scale
git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working
xtensa
git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master
--
Cheers,
Stephen Rothwells
merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public
maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen
for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree
(git://gitorious.org...).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpY6TXVPfNGS.pgp
Description: PGP signature
until after -rc1
to save false problems with the stuff that has still not been sent to
Linus.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpvjAHilnK97.pgp
Description: PGP signature
save/restore API) from the usb tree.
The latter removed the code modified by the former, so I did that.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpf7xGfMRraO.pgp
Description: PGP signature
common
enums and structures for ehci and ohci) from the usb tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgptHViV7ZL3r.pgp
Description: PGP signature
181b250cf53233a7a7c6d7e1e9df402506712e93
(arm: omap: usb: create common enums and structures for ehci and ohci)
from the usb tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch
in the version of that file in the usb tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/usb-musb.c
index a9d4d14,241fc94..000
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@@ -132,35 -212,12 +132,39 @@@ void
: clock entries
for omap3 and omap4) from the usb tree.
Just context changes. I have fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index f43e7ec,fbb1e30..000
--- a/arch
be
semantically correct, sorry.
Do these trees get merged separately by Linus? If not, then maybe I
should just be merging the one tree that combines all the omap work and
let you guys figure out the merge mess.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch
files:
replace platform_device_register with omap_display_init()) from the
omap_dss2 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-am3517evm.c
index
data: add DSS
DISPC RFBI VENC) from the omap_dss2 tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 60fe4aa,1ef3f3f..000
--- a/arch/arm/mach-omap2
data: add DSS
DISPC RFBI VENC) from the omap_dss2 tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 7fffd34,21014de..000
--- a/arch/arm/mach-omap2
OMAP2PLUS select
OMAP_DM_TIMER) from the omap tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/plat-omap/Kconfig
index c940843,bc0c7aa..000
--- a/arch/arm/plat-omap
).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index 9ab817e,0579604..000
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@@ -3275,17 -3267,18 +3275,18 @@@ static struct omap_clk
Hi Jiri,
On Mon, 13 Dec 2010 11:01:59 +0100 (CET) Jiri Kosina jkos...@suse.cz wrote:
Thank you Stephen. If you could carry this fixup patch, then it seems best
option for me. This conflict is trivial enough to be resolved later during
merge.
Yep, no worries.
--
Cheers,
Stephen Rothwell
(suspend: constify
platform_suspend_ops) from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/pm24xx.c
index aaeea49,aa9764e..000
--- a/arch/arm/mach-omap2/pm24xx.c
: add dsp platform
device) from the staging-next tree.
Just overlapping removal/additions (I think). I fixed it up (see below)
and can carry the changes as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/plat-omap/devices.c
index 1e2383e,4c8f9b9
b642fde7f137566c993991fd2e7bf6b8274bf625 (omap: zoom: add fixed
regulator device for wlan) and 80b517f362605f2b6a6cfe086604534290aab2de
(omap: zoom: add mmc3/wl1271 device support) from the net tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell
to enable omap
aes) from the crypto tree.
Two versions of the same patch. The version in the omap tree has been
updated, so I used that.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpS6ky6MgbAv.pgp
Description: PGP signature
to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail
. Is there no way that the latter
commit can be broken up into smaller self contained pieces?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpUQjm8YJEsP.pgp
Description: PGP signature
this
merge window, your best bet is to convince Russell and/or Tony.
Having your tree in linux-next may be useful for ongoing development
unless Tony thinks it may be better for you to just submit your code
through his omap tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http
) and can carry the fix as
necessary.
P.S. Tony, that omap tree commit has a fairly unuseful changelog and no
SOB from its purported author ...
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-3430sdp.c
index dd9c031,e51f8e3..000
,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpHYOCEKkRlX.pgp
Description: PGP signature
CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6) from the omap
tree.
Just context changes (I think). I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/kernel/entry-armv.S
index 2d14081
a693839eab0292aa234d7a6f48d40389389baebb (OMAP: RX51: Add vdds_sdi
supply voltage for SDI) from the omap_dss2 tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
56213ca4e440c0b6e56a48f5901c55c4ce3cf1ba (omap2/3:
Multiboot compile fixes to compile in omap2 and omap3) and
a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (omap3: Replace ARCH_OMAP34XX
with ARCH_OMAP3) from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells
?
If a patch goes through your tree, you are supposed to add a Signed-off-by
line. See Documentation/SubmittingPatches section called Sign your
work.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgppYyj7SvyEB.pgp
Description: PGP
DSS2 for
AM3517EVM board) from the omap_dss2 tree.
Juts overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
P.S. Tomi, this omap_dss2 commit only has your Acked-by not Signed-off-by.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc
and commit
209f5d2d2c8e385834d138ac593df86504a28ffe (omap: Make
uncompress code and DEBUG_LL code generic) from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap1/include
Hi Tony,
On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren t...@atomide.com wrote:
Thanks, I'll sort it out in omap for-next tree so they merge
cleanly.
Thanks
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpV7BlwoG9sN.pgp
Description
aacb4387a1e6f3b57977375532c6d8e47fcd5652 (OMAP: pandora: add DSS2
support and related regulators) from the omap_dss2 tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 9967b5d,bd3e577
themselves. Maybe we could propogate a suggested (or mandatory) set of
hooks?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpzkZc5XWODv.pgp
Description: PGP signature
Hi Tony,
On Tue, 15 Dec 2009 09:27:17 -0800 Tony Lindgren t...@atomide.com wrote:
* Mark Brown broo...@opensource.wolfsonmicro.com [091215 06:52]:
On Tue, Dec 15, 2009 at 04:41:08PM +1100, Stephen Rothwell wrote:
I have applied this patch for today (please check):
Looks good to me
On Tue, 15 Dec 2009 15:02:17 -0800 (PST) Linus Torvalds
torva...@linux-foundation.org wrote:
I think maybe Tony was being ironic, exactly because of this.
Yeah, that occurred to me just after sending the email.
Sorry, Tony.
(/me is grumpy and tired :-))
--
Cheers,
Stephen Rothwell
for today (please check):
From: Stephen Rothwell s...@canb.auug.org.au
Date: Tue, 15 Dec 2009 16:33:10 +1100
Subject: [PATCH] mfd: fix for twl4030 renaming
Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
drivers/mfd/twl4030-codec.c | 10 +-
1 files changed, 5 insertions(+), 5
with the input tree
as this made for a strange looking conflict.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgp5PVhymRpil.pgp
Description: PGP signature
OMAP3: RX-51 board - add
initialization of gpio keys) from the input tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index
patch attached.
Thanks, updated. Now I'm able to merge linux-omap/for-next and
dss/for-next without conflicts.
Great, thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgptnHK7MbGr0.pgp
Description: PGP signature
merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public
instead of
rebasing on top of it (which ever is easiest).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpUPgc9VLLlG.pgp
Description: PGP signature
/usb.h).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgp0G6FqkJUS5.pgp
Description: PGP signature
as we don't forget the necessary updates when
these are all integrated into Linus' tree. Some conflicts in linux-next
are not a bad thing for that reason.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpttxZabKZBE.pgp
Description: PGP
are dependent on other stuff in the omap tree,
then this is probably the best plan.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpmmDEFQPCte.pgp
Description: PGP signature
: Platform support for
twl4030_codec MFD) from the sound tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 660ef8c,d9a6103
Hi Tony,
On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren t...@atomide.com wrote:
Thanks, will rebase omap for-next patches today.
Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...
But thanks either way.
--
Cheers,
Stephen Rothwell
Hi Tony,
On Fri, 30 Oct 2009 07:46:04 -0700 Tony Lindgren t...@atomide.com wrote:
Thanks, will clear this too today.
OK, thanks.
[Please don't quote unnecessary parts of the emails that you respond to]
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http
84f90c9cc81d8db172d4f768fc4010f508897366 (omap: Change low-level
serial init to use ioremap) and acb1aed4a5f23c545073b0d65302e5949f239fa0
(omap: Eliminate OMAP_MAX_NR_PORTS) from the omap tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc
headers from include/mach to include/plat) from the omap tree.
I fixed them up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 0acb556,607845b..000
--- a/arch/arm/mach-omap2
, thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpGe5BQj5ePJ.pgp
Description: PGP signature
the omap tree.
Just context changes (I think). I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index 1b22307,646079f..000
--- a/arch/arm/mach-omap2/board-4430sdp.c
, this is a diff of a git merge. The ++ just means it was added on
neither side of the merge - I modified the change from the omap tree
slightly to fit in better with the cleanups from the arm tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr
) from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/Makefile
index e97c21b,676d10d..000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -99,72 -99,65 +99,73
69 matches
Mail list logo
