diff for duplicates of <1492011029.2764.3.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index 895322f..16f1146 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,14 +8,12 @@ diff --git a/block/Makefile b/block/Makefile index 546066ee7fa6..b3711af6b637 100644 --- a/block/Makefile +++ b/block/Makefile -@@ -20,7 +20,8 @@ obj-$(CONFIG_IOSCHED_NOOP) =A0=A0=A0+=3D noop-iosched.o -=A0obj-$(CONFIG_IOSCHED_DEADLINE) +=3D deadline-iosched.o -=A0obj-$(CONFIG_IOSCHED_CFQ) =A0=A0=A0=A0=A0+=3D cfq-iosched.o -=A0obj-$(CONFIG_MQ_IOSCHED_DEADLINE) =A0=A0=A0=A0=A0+=3D mq-deadline.o --obj-$(CONFIG_IOSCHED_BFQ) =A0=A0=A0=A0=A0+=3D bfq-iosched.o bfq-wf2q.o bfq= --cgroup.o -+bfq-y =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= -=A0=A0=A0:=3D bfq-iosched.o bfq-wf2q.o bfq-cgroup.o -+obj-$(CONFIG_IOSCHED_BFQ) =A0=A0=A0=A0=A0+=3D bfq.o -=A0=A0=A0obj-$(CONFIG_BLOCK_COMPAT) =A0=A0=A0=A0+=3D compat_ioctl.o -=A0obj-$(CONFIG_BLK_CMDLINE_PARSER) =A0=A0=A0=A0=A0=A0+=3D cmdline-parser.o +@@ -20,7 +20,8 @@ obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o + obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o + obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o + obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o +-obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o bfq-wf2q.o bfq-cgroup.o ++bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o ++obj-$(CONFIG_IOSCHED_BFQ) += bfq.o + obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o + obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o diff --git a/a/content_digest b/N1/content_digest index 3b838f9..9eea875 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -28,16 +28,14 @@ "index 546066ee7fa6..b3711af6b637 100644\n" "--- a/block/Makefile\n" "+++ b/block/Makefile\n" - "@@ -20,7 +20,8 @@ obj-$(CONFIG_IOSCHED_NOOP) =A0=A0=A0+=3D noop-iosched.o\n" - "=A0obj-$(CONFIG_IOSCHED_DEADLINE) +=3D deadline-iosched.o\n" - "=A0obj-$(CONFIG_IOSCHED_CFQ) =A0=A0=A0=A0=A0+=3D cfq-iosched.o\n" - "=A0obj-$(CONFIG_MQ_IOSCHED_DEADLINE) =A0=A0=A0=A0=A0+=3D mq-deadline.o\n" - "-obj-$(CONFIG_IOSCHED_BFQ) =A0=A0=A0=A0=A0+=3D bfq-iosched.o bfq-wf2q.o bfq=\n" - "-cgroup.o\n" - "+bfq-y =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=\n" - "=A0=A0=A0:=3D bfq-iosched.o bfq-wf2q.o bfq-cgroup.o\n" - "+obj-$(CONFIG_IOSCHED_BFQ) =A0=A0=A0=A0=A0+=3D bfq.o\n" - "=A0=A0=A0obj-$(CONFIG_BLOCK_COMPAT) =A0=A0=A0=A0+=3D compat_ioctl.o\n" - =A0obj-$(CONFIG_BLK_CMDLINE_PARSER) =A0=A0=A0=A0=A0=A0+=3D cmdline-parser.o + "@@ -20,7 +20,8 @@ obj-$(CONFIG_IOSCHED_NOOP) \302\240\302\240\302\240+= noop-iosched.o\n" + "\302\240obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o\n" + "\302\240obj-$(CONFIG_IOSCHED_CFQ) \302\240\302\240\302\240\302\240\302\240+= cfq-iosched.o\n" + "\302\240obj-$(CONFIG_MQ_IOSCHED_DEADLINE) \302\240\302\240\302\240\302\240\302\240+= mq-deadline.o\n" + "-obj-$(CONFIG_IOSCHED_BFQ) \302\240\302\240\302\240\302\240\302\240+= bfq-iosched.o bfq-wf2q.o bfq-cgroup.o\n" + "+bfq-y \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240:= bfq-iosched.o bfq-wf2q.o bfq-cgroup.o\n" + "+obj-$(CONFIG_IOSCHED_BFQ) \302\240\302\240\302\240\302\240\302\240+= bfq.o\n" + "\302\240\302\240\302\240obj-$(CONFIG_BLOCK_COMPAT) \302\240\302\240\302\240\302\240+= compat_ioctl.o\n" + "\302\240obj-$(CONFIG_BLK_CMDLINE_PARSER) \302\240\302\240\302\240\302\240\302\240\302\240+= cmdline-parser.o" -59456db07ae2d33298bb12089544c317f3220d44093ef7420a57fa12de685c95 +86b79a9ef91501a8d58ec58de94d5f40106d626645933376fe1e082aebdacc5f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.