On Fri, Nov 15, 2013 at 09:32:55AM -0500, John W. Linville wrote: > On Thu, Nov 14, 2013 at 03:22:18PM -0800, Tony Lindgren wrote: > > * Sebastian Reichel <sre@xxxxxxxxxx> [131114 15:04]: > > > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote: > > > > [...] > > > > > > > > If this is not going into v3.13, these will cause conflicts > > > > with the mach-omap2/board-*.c files for v3.14. > > > > > > > > So it might be best to do a minimal header patch first that > > > > can be merged in by both linux-omap and wireless trees. > > > > > > I guess this patch is pretty minimal. It also seems to be acked by > > > the involved Maintainers, so maybe just merge Patch 1 without the > > > other patches? > > > > > > This does not solve the problem with the struct modification from > > > the second patch, but I guess it's the more intrusive patch. > > > > Once at least the first two patches are ready, how about I queue > > them after -rc1 and set up an immutable branch that can be merged > > in by linux-omap tree and the wireless tree? > > That sounds reasonable to me. So what changes do you request for those patches? I will try to update them as soon as possible. -- Sebastian
Attachment:
signature.asc
Description: Digital signature
