On 07/17/2014 10:52 AM, Lennox Wu wrote: > Yes, you might miss something. Some patches were merged once I > acknowledged them,and some were missed. > So I am not sure the rule, if someone will merge these patches once > them are acknowledged, it is redundant that I issue a > PULL request again. >
I guess, we need consult another version merging members (e.g Stephen Rothwell), they may provide more useful suggestions or ideas. For me, if the patch is mainly under "arch/*/*", it need be applied by related architecture members. And these architecture related patches can be merged into linux-next tree firstly, then to upstream main line. Thanks. > > > 2014-07-17 10:30 GMT+08:00 Guenter Roeck <[email protected]>: >> On 07/16/2014 07:14 PM, Lennox Wu wrote: >>> >>> Actually, I don't know the rule for merging patches. Some patches will >>> be merge,and some will be miss. If the patch is missed, we will merge >>> it into our git. >>> >> Unless I am missing something, this patch is in arch/score, so the >> expectation would be for you to pick it up and send it to Linus. >> >> Guenter >> >> >>> Best, >>> Lennox >>> >>> 2014-07-17 9:49 GMT+08:00 David Rientjes <[email protected]>: >>>> >>>> On Thu, 26 Jun 2014, David Rientjes wrote: >>>> >>>>> On Thu, 26 Jun 2014, Chen Gang wrote: >>>>> >>>>>> 'COUNTER' and other same kind macros are too common to use, and easy to >>>>>> get conflict with other modules. >>>>>> >>>>>> At present, they are not used, so it is OK to simply remove them. And >>>>>> the >>>>>> related warning (allmodconfig with score): >>>>>> >>>>>> CC [M] drivers/md/raid1.o >>>>>> In file included from drivers/md/raid1.c:42:0: >>>>>> drivers/md/bitmap.h:93:0: warning: "COUNTER" redefined >>>>>> #define COUNTER(x) (((bitmap_counter_t) x) & COUNTER_MAX) >>>>>> ^ >>>>>> In file included from ./arch/score/include/asm/ptrace.h:4:0, >>>>>> from include/linux/sched.h:31, >>>>>> from include/linux/blkdev.h:4, >>>>>> from drivers/md/raid1.c:36: >>>>>> ./arch/score/include/uapi/asm/ptrace.h:13:0: note: this is the >>>>>> location of the previous definition >>>>>> #define COUNTER 38 >>>>>> >>>>>> >>>>>> Signed-off-by: Chen Gang <[email protected]> >>>>> >>>>> >>>>> Acked-by: David Rientjes <[email protected]> >>>>> >>>> >>>> Lennox or Liqin, could you please queue this patch for 3.17? >>> >>> >>> >> -- Chen Gang Open, share, and attitude like air, water, and life which God blessed -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
