linux-next: manual merge of the wireless tree with the net tree
in [Kernel]
|
Prev: Warning message when using sparse
Next: [RFC][PATCH 05/11] blkiocg async: __set_page_dirty_nobuffer not to record process info
From: Stephen Rothwell on 8 Jul 2010 22:00 Hi John, Today's linux-next merge of the wireless tree got a conflict in drivers/net/wireless/wl12xx/wl1271_cmd.h between commit ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed annotation") from the net tree and commit 34dd2aaac4a4b908c093980a9894fd878aeb6deb ("wl1271: moved scan operations to a separate file") from the wireless tree. I didn't bother changing __attribute((packed)) to __packed where this code has been moved to. Maybe someone could write a patch to do that ... -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Luciano Coelho on 9 Jul 2010 06:10
Hi Stephen, On Fri, 2010-07-09 at 03:51 +0200, ext Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > drivers/net/wireless/wl12xx/wl1271_cmd.h between commit > ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed > annotation") from the net tree and commit > 34dd2aaac4a4b908c093980a9894fd878aeb6deb ("wl1271: moved scan operations > to a separate file") from the wireless tree. > > I didn't bother changing __attribute((packed)) to __packed where this > code has been moved to. Maybe someone could write a patch to do that ... I'll submit a patch to change all the instances of __attribute((packed)) to __packed in the wl1271 driver. -- Cheers, Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |