| Message ID | 1418074889-24888-3-git-send-email-richard.kunze@web.de |
|---|---|
| State | Accepted |
| Headers | show |
Hi Richard, On Mon, Dec 08, 2014 at 10:41:29PM +0100, Richard Kunze wrote: > Signed-off-by: Richard Kunze <richard.kunze@web.de> > --- > .../kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > create mode 100644 target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch Applied with minor changes in r43590. Thank you! Luka
On 10/12/2014 00:32, Luka Perkov wrote: > Hi Richard, > > On Mon, Dec 08, 2014 at 10:41:29PM +0100, Richard Kunze wrote: >> Signed-off-by: Richard Kunze <richard.kunze@web.de> --- >> .../kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch | 13 >> +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 >> target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch > >> > Applied with minor changes in r43590. Thank you! > > Luka ______________ why can this be merged without upstream first and the power off button patch cannot ? this seems totally inconsistent. John
On Wed, Dec 10, 2014 at 07:16:20AM +0100, John Crispin wrote: > > On Mon, Dec 08, 2014 at 10:41:29PM +0100, Richard Kunze wrote: > >> Signed-off-by: Richard Kunze <richard.kunze@web.de> --- > >> .../kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch | 13 > >> +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 > >> target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch > > > >> > > Applied with minor changes in r43590. Thank you! > > > > Luka ______________ > > why can this be merged without upstream first and the power off button > patch cannot ? this seems totally inconsistent. The second one won't be accepted upstream because it is OpenWrt specific, while the first one can and should be sent upstream. Luka
On 10/12/2014 11:19, Luka Perkov wrote: > On Wed, Dec 10, 2014 at 07:16:20AM +0100, John Crispin wrote: >>> On Mon, Dec 08, 2014 at 10:41:29PM +0100, Richard Kunze wrote: >>>> Signed-off-by: Richard Kunze <richard.kunze@web.de> --- >>>> .../kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch | 13 >>>> +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 >>>> target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch >>> >>>> >>> Applied with minor changes in r43590. Thank you! >>> >>> Luka ______________ >> >> why can this be merged without upstream first and the power off button >> patch cannot ? this seems totally inconsistent. > > The second one won't be accepted upstream because it is OpenWrt > specific, while the first one can and should be sent upstream. > > Luka > for trivial stuff we never had a upstream first policy. maybe it was decided to put one in place and i missed it. in general it is much better to ask people to send it upstream in parallel. consider the case where contributor might not know how to do so or runs into some other problem. this would result in the feature not hitting openwrt. personally i merge ask for upstream and when i bump the next time i see if it happened or i will do so myself. the last years have shown that only 50% of the "please send it upstream" will reach upstream.
On Wed, Dec 10, 2014 at 11:30:24AM +0100, John Crispin wrote: > > The second one won't be accepted upstream because it is OpenWrt > > specific, while the first one can and should be sent upstream. > > for trivial stuff we never had a upstream first policy. maybe it was > decided to put one in place and i missed it. in general it is much > better to ask people to send it upstream in parallel. > > consider the case where contributor might not know how to do so or runs > into some other problem. this would result in the feature not hitting > openwrt. > > personally i merge ask for upstream and when i bump the next time i see > if it happened or i will do so myself. Sounds reasonable. Lets give Richard a day or two to reply. I still need to finish kirkwood 3.18 bump and will put the patch there too... Luka
diff --git a/target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch b/target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch new file mode 100644 index 0000000..46005c5 --- /dev/null +++ b/target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch @@ -0,0 +1,13 @@ +--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts ++++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +@@ -195,8 +195,8 @@ + }; + + partition@400000 { +- label = "uInitrd"; +- reg = <0x540000 0x1000000>; ++ label = "rootfs"; ++ reg = <0x400000 0x1C00000>; + }; + }; +
Signed-off-by: Richard Kunze <richard.kunze@web.de> --- .../kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 target/linux/kirkwood/patches-3.14/172-ix2_200-fix-mtd-layout.patch