As you didn't include James in the header patch [0/13], he didn't see you say:
"Two patches changed compilation on scsi subsystem, it should go through to SCSI tree." In the future, send them as a separate patch series. There's no dependencies on these patches with the rest of the series. They should have been sent directly to James, with me as the Cc. -- Steve On Mon, 2013-03-11 at 15:14 +0800, zhangwei(Jovi) wrote: > scsi_trace.c just export function scsi_trace_parse_cdb to > event tracing infrastructure, It's not necessary to > include trace/events/scsi.h > > Signed-off-by: zhangwei(Jovi) <[email protected]> > --- > drivers/scsi/scsi_trace.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/scsi_trace.c b/drivers/scsi/scsi_trace.c > index 2bea4f0..b703256 100644 > --- a/drivers/scsi/scsi_trace.c > +++ b/drivers/scsi/scsi_trace.c > @@ -17,7 +17,7 @@ > */ > #include <linux/kernel.h> > #include <linux/trace_seq.h> > -#include <trace/events/scsi.h> > +#include <scsi/scsi.h> > > #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f) > #define SERVICE_ACTION32(cdb) ((cdb[8] << 8) | cdb[9]) -- 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/
