On 05/21/15 12:16, Kalle Valo wrote:
Arend van Spriel<arend@xxxxxxxxxxxx> writes:
On 05/21/15 10:28, Rafał Miłecki wrote:
On 20 May 2015 at 16:33, Rafał Miłecki<zajec5@xxxxxxxxx> wrote:
I think the best way for achieving this is to rework your patch to
modify include/linux/bcm47xx_nvram.h. You could modify it the same way
you did in your patch for MIPS tree, except for
bcm47xx_nvram_get_contents. Don't implement this function for real (in
.c file), but instead make in dummy inline in a bcm47xx_nvram.h like:
static inline char *bcm47xx_nvram_get_contents(size_t *val_len)
{
/* TODO: Implement in .c file */
return NULL;
}
One more note.
This of course will lead to conflict at some point, but I believe
Linus will handle it.
I prefer to avoid tricks so I will ask to drop this patch and wait for
it to land in the next kernel, ie. 4.2, and resubmit this patch for
4.3. I am not in a hurry.
Yes, please :) Let's try to avoid conflicts as much as possible.
Ok. Let's make it official. Kalle, can you drop patch 6 from the series
(if not already done so ;-) ).
Regards,
Arend
